diff --git a/dev/translation/dynamic_translation_keys.lst b/dev/translation/dynamic_translation_keys.lst index 6fcfefcc05e..843f639118b 100644 --- a/dev/translation/dynamic_translation_keys.lst +++ b/dev/translation/dynamic_translation_keys.lst @@ -2245,358 +2245,6 @@ PaymentTypeVIR PaypalImportPayment PaypalOrCBDoPayment PermanentLeftSearchForm -Permission10001 -Permission10002 -Permission10003 -Permission10005 -Permission1001 -Permission1002 -Permission1003 -Permission1004 -Permission1005 -Permission101 -Permission1011 -Permission1012 -Permission1014 -Permission1015 -Permission1016 -Permission102 -Permission104 -Permission105 -Permission106 -Permission109 -Permission11 -Permission1101 -Permission1102 -Permission1104 -Permission1109 -Permission111 -Permission112 -Permission1121 -Permission1122 -Permission1123 -Permission1124 -Permission1125 -Permission1126 -Permission113 -Permission114 -Permission115 -Permission116 -Permission117 -Permission1181 -Permission1182 -Permission1183 -Permission1184 -Permission1185 -Permission1186 -Permission1187 -Permission1188 -Permission1189 -Permission1191 -Permission12 -Permission1201 -Permission1202 -Permission121 -Permission122 -Permission1231 -Permission1232 -Permission1233 -Permission1234 -Permission1235 -Permission1236 -Permission1237 -Permission125 -Permission1251 -Permission126 -Permission13 -Permission130 -Permission1321 -Permission1322 -Permission14 -Permission141 -Permission142 -Permission1421 -Permission144 -Permission145 -Permission146 -Permission147 -Permission15 -Permission151 -Permission152 -Permission1521 -Permission1522 -Permission153 -Permission154 -Permission16 -Permission161 -Permission162 -Permission163 -Permission164 -Permission165 -Permission167 -Permission171 -Permission172 -Permission173 -Permission174 -Permission178 -Permission180 -Permission181 -Permission182 -Permission183 -Permission184 -Permission185 -Permission186 -Permission187 -Permission188 -Permission19 -Permission192 -Permission193 -Permission194 -Permission20001 -Permission20002 -Permission20003 -Permission20004 -Permission20005 -Permission20006 -Permission20007 -Permission202 -Permission203 -Permission204 -Permission205 -Permission206 -Permission21 -Permission211 -Permission212 -Permission213 -Permission214 -Permission215 -Permission22 -Permission221 -Permission222 -Permission223 -Permission229 -Permission23001 -Permission23002 -Permission23003 -Permission23004 -Permission23101 -Permission23102 -Permission23103 -Permission23104 -Permission237 -Permission238 -Permission239 -Permission24 -Permission2401 -Permission2402 -Permission2403 -Permission241 -Permission2411 -Permission2412 -Permission2413 -Permission2414 -Permission242 -Permission243 -Permission244 -Permission25 -Permission2501 -Permission2502 -Permission2503 -Permission251 -Permission2515 -Permission252 -Permission253 -Permission254 -Permission255 -Permission256 -Permission26 -Permission2610 -Permission262 -Permission263 -Permission27 -Permission271 -Permission272 -Permission273 -Permission28 -Permission2801 -Permission2802 -Permission281 -Permission282 -Permission283 -Permission286 -Permission291 -Permission292 -Permission293 -Permission301 -Permission304 -Permission305 -Permission31 -Permission311 -Permission312 -Permission32 -Permission3200 -Permission33 -Permission3301 -Permission331 -Permission332 -Permission333 -Permission34 -Permission341 -Permission342 -Permission343 -Permission344 -Permission351 -Permission352 -Permission353 -Permission354 -Permission358 -Permission36 -Permission38 -Permission39 -Permission40001 -Permission40002 -Permission40003 -Permission4001 -Permission4002 -Permission4003 -Permission401 -Permission402 -Permission4021 -Permission4022 -Permission4023 -Permission4025 -Permission4028 -Permission403 -Permission4031 -Permission4032 -Permission4033 -Permission404 -Permission41 -Permission42 -Permission430 -Permission44 -Permission45 -Permission50101 -Permission50151 -Permission50152 -Permission50153 -Permission50201 -Permission50202 -Permission50330 -Permission50331 -Permission50332 -Permission50401 -Permission50411 -Permission50412 -Permission50414 -Permission50415 -Permission50418 -Permission50420 -Permission50430 -Permission50440 -Permission51001 -Permission51002 -Permission51003 -Permission51005 -Permission511 -Permission512 -Permission514 -Permission517 -Permission519 -Permission520 -Permission522 -Permission524 -Permission525 -Permission527 -Permission531 -Permission532 -Permission533 -Permission534 -Permission536 -Permission538 -Permission54001 -Permission55001 -Permission55002 -Permission56001 -Permission56002 -Permission56003 -Permission56004 -Permission56005 -Permission56006 -Permission561 -Permission562 -Permission563 -Permission564 -Permission59001 -Permission59002 -Permission59003 -Permission601 -Permission602 -Permission609 -Permission61 -Permission611 -Permission612 -Permission613 -Permission62 -Permission63001 -Permission63002 -Permission63003 -Permission63004 -Permission64 -Permission64001 -Permission650 -Permission651 -Permission652 -Permission660 -Permission661 -Permission662 -Permission67 -Permission67000 -Permission68 -Permission68001 -Permission68002 -Permission68004 -Permission69 -Permission70 -Permission701 -Permission702 -Permission703 -Permission71 -Permission72 -Permission74 -Permission75 -Permission76 -Permission771 -Permission772 -Permission773 -Permission775 -Permission776 -Permission777 -Permission778 -Permission779 -Permission78 -Permission79 -Permission81 -Permission82 -Permission84 -Permission85 -Permission86 -Permission87 -Permission88 -Permission89 -Permission91 -Permission92 -Permission93 -Permission94 -Permission941601 -Permission941602 -Permission941603 -Permission941604 -Permission941605 -Permission941606 -Permission95 -PermissionAdvanced251 -PermissionAdvanced253 PhoneNumber PhpWebLink PointOfSale diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang index 7eaf12381d0..2f01b7550a0 100644 --- a/htdocs/langs/en_US/accountancy.lang +++ b/htdocs/langs/en_US/accountancy.lang @@ -168,7 +168,7 @@ ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account descri ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts (If you set value to 6 here, the account '706' will appear like '706000' on screen) ACCOUNTING_LENGTH_AACCOUNT=Length of the third-party accounting accounts (If you set value to 6 here, the account '401' will appear like '401000' on screen) ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of an accounting account. Needed by some countries (like Switzerland). If set to off (default), you can set the following two parameters to ask the application to add virtual zeros. -ACCOUNTING_BANK_CONCILIATED=Transfert into accounting only reconciliated lines from bank statementsby default (could be unchecked on each transfert) +ACCOUNTING_BANK_CONCILIATED=Transfer into accounting only the lines reconciliated in bank statements (by default, could be unchecked on each transfer) BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account ACCOUNTANCY_ER_DATE_RECORD=Use the end date of the period of an expense report as the date for the transfer to accounting, instead of the date of the expense ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal @@ -240,7 +240,6 @@ AccountingAccountGroupsDesc=You can define here some groups of accounting accoun ByAccounts=By accounts ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups -ByYear=By year NotMatch=Not Set DeleteMvt=Delete some lines from accounting DelMonth=Month to delete diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 56c83797895..6f32c7e5cd6 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -896,13 +896,13 @@ Permission401=Read discounts Permission402=Create/modify discounts Permission403=Validate discounts Permission404=Delete discounts -Permission430=Use Debug Bar +Permission431=Use Debug Bar Permission511=Read salaries and payments (yours and subordinates) Permission512=Create/modify salaries and payments Permission514=Delete salaries and payments Permission517=Read salaries and payments everybody Permission519=Export salaries -Permission520=Read Loans +Permission521=Read Loans Permission522=Create/modify loans Permission524=Delete loans Permission525=Access loan calculator @@ -923,12 +923,12 @@ Permission609=Delete stickers Permission611=Read attributes of variants Permission612=Create/Update attributes of variants Permission613=Delete attributes of variants -Permission650=Read Bills of Materials -Permission651=Create/Update Bills of Materials -Permission652=Delete Bills of Materials -Permission660=Read Manufacturing Order (MO) -Permission661=Create/Update Manufacturing Order (MO) -Permission662=Delete Manufacturing Order (MO) +Permission651=Read Bills of Materials +Permission652=Create/Update Bills of Materials +Permission653=Delete Bills of Materials +Permission661=Read Manufacturing Order (MO) +Permission662=Create/Update Manufacturing Order (MO) +Permission663=Delete Manufacturing Order (MO) Permission701=Read donations Permission702=Create/modify donations Permission703=Delete donations @@ -1000,7 +1000,7 @@ Permission2515=Setup documents directories Permission2610=Generate/modify users API key Permission2801=Use FTP client in read mode (browse and download only) Permission2802=Use FTP client in write mode (delete or upload files) -Permission3200=Read archived events and fingerprints +Permission3201=Read archived events and fingerprints Permission3301=Generate new modules Permission4001=Read skill/job/position Permission4002=Create/modify skill/job/position @@ -1037,9 +1037,9 @@ Permission50152=Edit sales lines Permission50153=Edit ordered sales lines Permission50201=Read transactions Permission50202=Import transactions -Permission50330=Read objects of Zapier -Permission50331=Create/Update objects of Zapier -Permission50332=Delete objects of Zapier +Permission50331=Read objects of Zapier +Permission50332=Create/Update objects of Zapier +Permission50333=Delete objects of Zapier Permission50401=Bind products and invoices with accounting accounts Permission50411=Read operations in ledger Permission50412=Write/Edit operations in ledger @@ -1064,7 +1064,7 @@ Permission63002=Create/modify resources Permission63003=Delete resources Permission63004=Link resources to agenda events Permission64001=Allow direct printing -Permission67000=Allow printing of receipts +Permission67001=Allow printing of receipts Permission68001=Read intracomm report Permission68002=Create/modify intracomm report Permission68004=Delete intracomm report diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang index 31b2655f403..01c9c27ecac 100644 --- a/htdocs/langs/en_US/bills.lang +++ b/htdocs/langs/en_US/bills.lang @@ -649,8 +649,7 @@ MentionCategoryOfOperations0=Delivery of goods MentionCategoryOfOperations1=Provision of services MentionCategoryOfOperations2=Mixed - Delivery of goods & provision of services Salaries=Salaries -InvoiceSubtype=Invoice Subtype -SalaryInvoice=Salary +SalaryInvoice=Salary BillsAndSalaries=Bills & Salaries CreateCreditNoteWhenClientInvoiceExists=This option is enabled only when validated invoice(s) exist for a customer or when constant INVOICE_CREDIT_NOTE_STANDALONE is used(useful for some countries) SearchUnpaidSupplierInvoicesWithDueDate=Search unpaid supplier invoices with a due date = %s diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang index e16093e5a98..df8c1370a0d 100644 --- a/htdocs/langs/en_US/compta.lang +++ b/htdocs/langs/en_US/compta.lang @@ -65,7 +65,6 @@ LT2SupplierES=IRPF purchases LT2CustomerIN=SGST sales LT2SupplierIN=SGST purchases VATCollected=VAT collected -StatusToPay=To pay SpecialExpensesArea=Area for all special payments VATExpensesArea=Area for all TVA payments SocialContribution=Social or fiscal tax diff --git a/htdocs/langs/en_US/interventions.lang b/htdocs/langs/en_US/interventions.lang index 92ab1d5a236..753bb7837f7 100644 --- a/htdocs/langs/en_US/interventions.lang +++ b/htdocs/langs/en_US/interventions.lang @@ -29,7 +29,6 @@ InterventionCardsAndInterventionLines=Interventions and lines of interventions InterventionClassifyBilled=Classify "Billed" InterventionClassifyUnBilled=Classify "Unbilled" InterventionClassifyDone=Classify "Done" -StatusInterInvoiced=Billed SendInterventionRef=Submission of intervention %s SendInterventionByMail=Send intervention by email InterventionCreatedInDolibarr=Intervention %s created diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang index df2e4ebdd02..10e476478e4 100644 --- a/htdocs/langs/en_US/stocks.lang +++ b/htdocs/langs/en_US/stocks.lang @@ -255,7 +255,6 @@ ChooseFileToImport=Upload file then click on the %s icon to select file as sourc SelectAStockMovementFileToImport=select a stock movement file to import InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):
Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number
CSV character separator must be "%s" LabelOfInventoryMovemement=Inventory %s -ReOpen=Reopen ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock to the real qty you entered into the inventory. ObjectNotFound=%s not found MakeMovementsAndClose=Generate movements and close diff --git a/htdocs/langs/en_US/supplier_proposal.lang b/htdocs/langs/en_US/supplier_proposal.lang index 9dcb20ba1b4..c651d8b0c86 100644 --- a/htdocs/langs/en_US/supplier_proposal.lang +++ b/htdocs/langs/en_US/supplier_proposal.lang @@ -35,7 +35,6 @@ SupplierProposalStatusSignedShort=Accepted SupplierProposalStatusNotSignedShort=Refused CopyAskFrom=Create a price request by copying an existing request CreateEmptyAsk=Create blank request -ConfirmCloneAsk=Are you sure you want to clone the price request %s? ConfirmReOpenAsk=Are you sure you want to open back the price request %s? SendAskByMail=Send price request by mail SendAskRef=Sending the price request %s diff --git a/htdocs/langs/en_US/ticket.lang b/htdocs/langs/en_US/ticket.lang index ac537b7eaa7..442ecf3608c 100644 --- a/htdocs/langs/en_US/ticket.lang +++ b/htdocs/langs/en_US/ticket.lang @@ -74,7 +74,7 @@ SolvedClosed=Solved Deleted=Deleted # Dict -Type=Type +TicketType=Type Severity=Severity TicketGroupIsPublic=Group is public TicketGroupIsPublicDesc=If a ticket group is public, it will be visible in the form when creating a ticket from the public interface diff --git a/htdocs/langs/en_US/withdrawals.lang b/htdocs/langs/en_US/withdrawals.lang index 8b9153c81cd..63d15e7a3a7 100644 --- a/htdocs/langs/en_US/withdrawals.lang +++ b/htdocs/langs/en_US/withdrawals.lang @@ -39,7 +39,6 @@ WithdrawalsSetup=Direct debit payment setup CreditTransferSetup=Credit transfer setup WithdrawStatistics=Direct debit payment statistics CreditTransferStatistics=Credit transfer statistics -Rejects=Rejects LastWithdrawalReceipt=Latest %s direct debit receipts MakeWithdrawRequest=Make a direct debit payment request MakeWithdrawRequestStripe=Make a direct debit payment request via Stripe @@ -171,4 +170,3 @@ SalaryWaitingWithdraw=Salaries waiting for payment by credit transfer RefSalary=Salary NoSalaryInvoiceToWithdraw=No salary waiting for a '%s'. Go on tab '%s' on salary card to make a request. SalaryInvoiceWaitingWithdraw=Salaries waiting for payment by credit transfer -