From a6bae97826ec2b1bb96c7181d48587c2dca779b5 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 12 Jan 2020 21:28:09 +0100 Subject: [PATCH] Sync from transifex --- dev/translation/txpull.sh | 2 +- htdocs/langs/en_GB/accountancy.lang | 1 - htdocs/langs/en_GB/supplier_proposal.lang | 1 - htdocs/langs/en_US/accountancy.lang | 4 ++-- htdocs/langs/en_US/admin.lang | 8 ++++---- htdocs/langs/en_US/cashdesk.lang | 2 ++ htdocs/langs/en_US/categories.lang | 2 +- htdocs/langs/en_US/companies.lang | 2 +- htdocs/langs/en_US/compta.lang | 2 +- htdocs/langs/en_US/errors.lang | 10 +++++----- htdocs/langs/en_US/exports.lang | 2 +- htdocs/langs/en_US/ftp.lang | 2 +- htdocs/langs/en_US/modulebuilder.lang | 4 ++-- htdocs/langs/en_US/mrp.lang | 6 +++--- htdocs/langs/en_US/paybox.lang | 2 +- htdocs/langs/en_US/products.lang | 8 ++++---- htdocs/langs/en_US/projects.lang | 2 +- htdocs/langs/en_US/receptions.lang | 6 +++--- htdocs/langs/en_US/resource.lang | 2 +- htdocs/langs/en_US/stocks.lang | 1 + htdocs/langs/en_US/stripe.lang | 4 ++-- htdocs/langs/en_US/supplier_proposal.lang | 2 +- htdocs/langs/en_US/website.lang | 6 +++--- htdocs/langs/en_US/zapier.lang | 2 +- htdocs/langs/es_CL/accountancy.lang | 1 - htdocs/langs/es_MX/accountancy.lang | 1 - htdocs/langs/es_PE/accountancy.lang | 1 - htdocs/langs/fr_BE/accountancy.lang | 1 - htdocs/langs/fr_CA/accountancy.lang | 1 - htdocs/langs/nl_BE/accountancy.lang | 1 - 30 files changed, 42 insertions(+), 47 deletions(-) diff --git a/dev/translation/txpull.sh b/dev/translation/txpull.sh index c940f38e8ba..a958be60673 100755 --- a/dev/translation/txpull.sh +++ b/dev/translation/txpull.sh @@ -16,7 +16,7 @@ then echo "This pull remote transifex files to local dir." echo "Note: If you pull a language file (not source), file will be skipped if local file is newer." echo " Using -f will overwrite local file (does not work with 'all')." - echo " Using en_US as language parameter will update source language from transifex (en_US is excluded frol 'all')." + echo " Using en_US as language parameter will update source language from transifex (en_US is excluded from 'all')." echo "Usage: ./dev/translation/txpull.sh (all|en_US|xx_XX) [-r dolibarr.file] [-f] [-s]" exit fi diff --git a/htdocs/langs/en_GB/accountancy.lang b/htdocs/langs/en_GB/accountancy.lang index 0fb3d7cb4d5..81560a258ea 100644 --- a/htdocs/langs/en_GB/accountancy.lang +++ b/htdocs/langs/en_GB/accountancy.lang @@ -73,7 +73,6 @@ AccountingCategory=Personalised groups GroupByAccountAccounting=Group by finance account AccountingAccountGroupsDesc=Here you can define some groups of financial accounts. They will be used for personalised accounting reports. ByPersonalizedAccountGroups=By personalised groups -ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger. ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to this transaction will be deleted) DescJournalOnlyBindedVisible=This is a view of records that are linked to a finance account and can be posted into the Ledger. FeeAccountNotDefined=Account for fees not defined diff --git a/htdocs/langs/en_GB/supplier_proposal.lang b/htdocs/langs/en_GB/supplier_proposal.lang index 7aac46af69e..aaa6cb73ec3 100644 --- a/htdocs/langs/en_GB/supplier_proposal.lang +++ b/htdocs/langs/en_GB/supplier_proposal.lang @@ -6,7 +6,6 @@ SupplierProposalShort=Vendor quote SupplierProposals=Vendor quotes SupplierProposalsShort=Vendor quotes SupplierProposalRefFournNotice=Before closing as "Accepted", think of obtaining suppliers references. -CopyAskFrom=Create a price request by copying an existing request ConfirmReOpenAsk=Are you sure you want to reopen the price request %s? ActionsOnSupplierProposal=Actions on price request DocModelAuroreDescription=A complete request example (logo...) diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang index bb98e38cb09..336bf2a35cd 100644 --- a/htdocs/langs/en_US/accountancy.lang +++ b/htdocs/langs/en_US/accountancy.lang @@ -160,7 +160,7 @@ ACCOUNTING_RESULT_PROFIT=Result accounting account (Profit) ACCOUNTING_RESULT_LOSS=Result accounting account (Loss) ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Journal of closure -ACCOUNTING_ACCOUNT_TRANSFER_CASH=Accounting account of transitional bank transfer +ACCOUNTING_ACCOUNT_TRANSFER_CASH=Accounting account of transitional bank transfer TransitionalAccount=Transitional bank transfer account ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait @@ -200,7 +200,7 @@ DeleteMvt=Delete Ledger lines DelMonth=Month to delete DelYear=Year to delete DelJournal=Journal to delete -ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration inaccounting' to have the deleted record back in the ledger. +ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger. ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted) FinanceJournal=Finance journal ExpenseReportsJournal=Expense reports journal diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 602cc65522e..4be8392bdce 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -561,9 +561,9 @@ Module200Desc=LDAP directory synchronization Module210Name=PostNuke Module210Desc=PostNuke integration Module240Name=Data exports -Module240Desc=Tool to export Dolibarr data (with assistants) +Module240Desc=Tool to export Dolibarr data (with assistance) Module250Name=Data imports -Module250Desc=Tool to import data into Dolibarr (with assistants) +Module250Desc=Tool to import data into Dolibarr (with assistance) Module310Name=Members Module310Desc=Foundation members management Module320Name=RSS Feed @@ -1763,7 +1763,7 @@ ListOfNotificationsPerUser=List of automatic notifications per user* ListOfNotificationsPerUserOrContact=List of possible automatic notifications (on business event) available per user* or per contact** ListOfFixedNotifications=List of automatic fixed notifications GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users -GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses +GoOntoContactCardToAddMore=Go to the tab "Notifications" of a third party to add or remove notifications for contacts/addresses Threshold=Threshold BackupDumpWizard=Wizard to build the backup file SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason: @@ -1965,4 +1965,4 @@ BaseOnSabeDavVersion=Based on the library SabreDAV version NotAPublicIp=Not a public IP MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation. FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled -EmailTemplate=Template for email \ No newline at end of file +EmailTemplate=Template for email diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang index e33d1112deb..964bd7c436c 100644 --- a/htdocs/langs/en_US/cashdesk.lang +++ b/htdocs/langs/en_US/cashdesk.lang @@ -79,3 +79,5 @@ InvoiceIsAlreadyValidated=Invoice is already validated NoLinesToBill=No lines to bill CustomReceipt=Custom Receipt ReceiptName=Receipt Name +ProductSupplements=Product Supplements +SupplementCategory=Supplement category diff --git a/htdocs/langs/en_US/categories.lang b/htdocs/langs/en_US/categories.lang index d5a4ba16bf0..b6f64d8fbb8 100644 --- a/htdocs/langs/en_US/categories.lang +++ b/htdocs/langs/en_US/categories.lang @@ -90,4 +90,4 @@ ShowCategory=Show tag/category ByDefaultInList=By default in list ChooseCategory=Choose category StocksCategoriesArea=Warehouses Categories Area -UseOrOperatorForCategories=Use or operator for categories \ No newline at end of file +UseOrOperatorForCategories=Use or operator for categories diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang index 7439972e906..d95cdc0772e 100644 --- a/htdocs/langs/en_US/companies.lang +++ b/htdocs/langs/en_US/companies.lang @@ -339,7 +339,7 @@ MyContacts=My contacts Capital=Capital CapitalOf=Capital of %s EditCompany=Edit company -ThisUserIsNot=This user is not a prospect, customer nor vendor +ThisUserIsNot=This user is not a prospect, customer or vendor VATIntraCheck=Check VATIntraCheckDesc=The VAT ID must include the country prefix. The link %s uses the European VAT checker service (VIES) which requires internet access from the Dolibarr server. VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang index eb76d9c64a2..91de8ebf212 100644 --- a/htdocs/langs/en_US/compta.lang +++ b/htdocs/langs/en_US/compta.lang @@ -253,4 +253,4 @@ PaidDuringThisPeriod=Paid during this period ByVatRate=By sale tax rate TurnoverbyVatrate=Turnover invoiced by sale tax rate TurnoverCollectedbyVatrate=Turnover collected by sale tax rate -PurchasebyVatrate=Purchase by sale tax rate \ No newline at end of file +PurchasebyVatrate=Purchase by sale tax rate diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang index acb2ae6e5ae..7aafdfbbd65 100644 --- a/htdocs/langs/en_US/errors.lang +++ b/htdocs/langs/en_US/errors.lang @@ -117,7 +117,7 @@ ErrorLoginDoesNotExists=User with login %s could not be found. ErrorLoginHasNoEmail=This user has no email address. Process aborted. ErrorBadValueForCode=Bad value for security code. Try again with new value... ErrorBothFieldCantBeNegative=Fields %s and %s can't be both negative -ErrorFieldCantBeNegativeOnInvoice=Field %s cannot be negative on this type of invoice. If you want to add a discount line, just create the discount first with link %s on screen and apply it to the invoice. You can also ask your admin to set option FACTURE_ENABLE_NEGATIVE_LINES to 1 to allow the old behaviour. +ErrorFieldCantBeNegativeOnInvoice=Field %s cannot be negative on this type of invoice. If you want to add a discount line, just create the discount first with link %s on screen and apply it to the invoice. You can also ask your admin to set option FACTURE_ENABLE_NEGATIVE_LINES to 1 to allow the old behaviour. ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative ErrorWebServerUserHasNotPermission=User account %s used to execute web server has no permission for that ErrorNoActivatedBarcode=No barcode type activated @@ -222,15 +222,15 @@ ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked ErrorSearchCriteriaTooSmall=Search criteria too small. ErrorObjectMustHaveStatusActiveToBeDisabled=Objects must have status 'Active' to be disabled ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Objects must have status 'Draft' or 'Disabled' to be enabled -ErrorNoFieldWithAttributeShowoncombobox=No fields has property 'showoncombobox' into definition of object '%s'. No way to show the combolist. +ErrorNoFieldWithAttributeShowoncombobox=No fields has property 'showoncombobox' into definition of object '%s'. No way to show the combolist. ErrorFieldRequiredForProduct=Field '%s' is required for product %s ProblemIsInSetupOfTerminal=Problem is in setup of terminal %s. -ErrorAddAtLeastOneLineFirst=Add at least one line first +ErrorAddAtLeastOneLineFirst=Add at least one line first # Warnings WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup. WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user. WarningMandatorySetupNotComplete=Click here to setup mandatory parameters -WarningEnableYourModulesApplications=Click here to enable your modules and applications +WarningEnableYourModulesApplications=Click here to enable your modules and applications WarningSafeModeOnCheckExecDir=Warning, PHP option safe_mode is on so command must be stored inside a directory declared by php parameter safe_mode_exec_dir. WarningBookmarkAlreadyExists=A bookmark with this title or this target (URL) already exists. WarningPassIsEmpty=Warning, database password is empty. This is a security hole. You should add a password to your database and change your conf.php file to reflect this. @@ -251,4 +251,4 @@ WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translatio WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to %s when using the mass actions on lists WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report WarningProjectClosed=Project is closed. You must re-open it first. -WarningSomeBankTransactionByChequeWereRemovedAfter=Some bank transaction were removed after that the receipt including them were generated. So nb of cheques and total of receipt may differ from number and total in list. \ No newline at end of file +WarningSomeBankTransactionByChequeWereRemovedAfter=Some bank transaction were removed after that the receipt including them were generated. So nb of cheques and total of receipt may differ from number and total in list. diff --git a/htdocs/langs/en_US/exports.lang b/htdocs/langs/en_US/exports.lang index 691a1770ac8..ef5ff029c78 100644 --- a/htdocs/langs/en_US/exports.lang +++ b/htdocs/langs/en_US/exports.lang @@ -130,4 +130,4 @@ FormatControlRule=Format control rule KeysToUseForUpdates=Key (column) to use for updating existing data NbInsert=Number of inserted lines: %s NbUpdate=Number of updated lines: %s -MultipleRecordFoundWithTheseFilters=Multiple records have been found with these filters: %s \ No newline at end of file +MultipleRecordFoundWithTheseFilters=Multiple records have been found with these filters: %s diff --git a/htdocs/langs/en_US/ftp.lang b/htdocs/langs/en_US/ftp.lang index 81b3d319341..d80b87c2715 100644 --- a/htdocs/langs/en_US/ftp.lang +++ b/htdocs/langs/en_US/ftp.lang @@ -11,4 +11,4 @@ FTPFailedToRemoveFile=Failed to remove file %s. FTPFailedToRemoveDir=Failed to remove directory %s: check permissions and that the directory is empty. FTPPassiveMode=Passive mode ChooseAFTPEntryIntoMenu=Choose a FTP site from the menu... -FailedToGetFile=Failed to get files %s \ No newline at end of file +FailedToGetFile=Failed to get files %s diff --git a/htdocs/langs/en_US/modulebuilder.lang b/htdocs/langs/en_US/modulebuilder.lang index 1ab43331d07..67002f622f9 100644 --- a/htdocs/langs/en_US/modulebuilder.lang +++ b/htdocs/langs/en_US/modulebuilder.lang @@ -67,7 +67,7 @@ ChangeLog=ChangeLog file TestClassFile=File for PHP Unit Test class SqlFile=Sql file PageForLib=File for the common PHP library -PageForObjLib=File for the PHP library dedicated to object +PageForObjLib=File for the PHP library dedicated to object SqlFileExtraFields=Sql file for complementary attributes SqlFileKey=Sql file for keys SqlFileKeyExtraFields=Sql file for keys of complementary attributes @@ -134,4 +134,4 @@ KeyForTooltip=Key for tooltip CSSClass=CSS Class NotEditable=Not editable ForeignKey=Foreign key -TypeOfFieldsHelp=Type of fields:
varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example) \ No newline at end of file +TypeOfFieldsHelp=Type of fields:
varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example) diff --git a/htdocs/langs/en_US/mrp.lang b/htdocs/langs/en_US/mrp.lang index faec35f6d46..e4034426e9a 100644 --- a/htdocs/langs/en_US/mrp.lang +++ b/htdocs/langs/en_US/mrp.lang @@ -5,7 +5,7 @@ MRPArea=MRP Area MrpSetupPage=Setup of module MRP MenuBOM=Bills of material LatestBOMModified=Latest %s Bills of materials modified -LatestMOModified=Latest %s Manufacturing Orders modified +LatestMOModified=Latest %s Manufacturing Orders modified Bom=Bills of Material BillOfMaterials=Bill of Material BOMsSetup=Setup of module BOM @@ -62,5 +62,5 @@ ForAQuantityOf1=For a quantity to produce of 1 ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order? ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements. ProductionForRef=Production of %s -AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached -NoStockChangeOnServices=No stock change on services \ No newline at end of file +AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached +NoStockChangeOnServices=No stock change on services diff --git a/htdocs/langs/en_US/paybox.lang b/htdocs/langs/en_US/paybox.lang index f70b3ee92eb..1bbbef4017b 100644 --- a/htdocs/langs/en_US/paybox.lang +++ b/htdocs/langs/en_US/paybox.lang @@ -28,4 +28,4 @@ PAYBOX_PAYONLINE_SENDEMAIL=Email notification after payment attempt (success or PAYBOX_PBX_SITE=Value for PBX SITE PAYBOX_PBX_RANG=Value for PBX Rang PAYBOX_PBX_IDENTIFIANT=Value for PBX ID -PAYBOX_HMAC_KEY=HMAC key \ No newline at end of file +PAYBOX_HMAC_KEY=HMAC key diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang index 7c68fd5c821..b9293b6187c 100644 --- a/htdocs/langs/en_US/products.lang +++ b/htdocs/langs/en_US/products.lang @@ -201,23 +201,23 @@ unitM3=Cubic meter unitL=Liter unitT=ton unitKG=kg -unitG=g +unitG=Gram unitMG=mg unitLB=pound unitOZ=ounce -unitM=m +unitM=Meter unitDM=dm unitCM=cm unitMM=mm unitFT=ft unitIN=in -unitM2=m² +unitM2=Square meter unitDM2=dm² unitCM2=cm² unitMM2=mm² unitFT2=ft² unitIN2=in² -unitM3=m³ +unitM3=Cubic meter unitDM3=dm³ unitCM3=cm³ unitMM3=mm³ diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang index dd81928c134..6d062056d4d 100644 --- a/htdocs/langs/en_US/projects.lang +++ b/htdocs/langs/en_US/projects.lang @@ -254,4 +254,4 @@ ProjectFollowOpportunity=Follow opportunity ProjectFollowTasks=Follow tasks UsageOpportunity=Usage: Opportunity UsageTasks=Usage: Tasks -UsageBillTimeShort=Usage: Bill time \ No newline at end of file +UsageBillTimeShort=Usage: Bill time diff --git a/htdocs/langs/en_US/receptions.lang b/htdocs/langs/en_US/receptions.lang index 0847d7550fc..010a7521846 100644 --- a/htdocs/langs/en_US/receptions.lang +++ b/htdocs/langs/en_US/receptions.lang @@ -4,8 +4,8 @@ RefReception=Ref. reception Reception=Reception Receptions=Receptions AllReceptions=All Receptions -Reception=Product reception -Receptions=Reception +Reception=Reception +Receptions=Receptions ShowReception=Show Receptions ReceptionsArea=Receptions area ListOfReceptions=List of receptions @@ -42,4 +42,4 @@ ProductQtyInReceptionAlreadySent=Product quantity from open sales order already ProductQtyInSuppliersReceptionAlreadyRecevied=Product quantity from open supplier order already received ValidateOrderFirstBeforeReception=You must first validate the order before being able to make receptions. ReceptionsNumberingModules=Numbering module for receptions -ReceptionsReceiptModel=Document templates for receptions \ No newline at end of file +ReceptionsReceiptModel=Document templates for receptions diff --git a/htdocs/langs/en_US/resource.lang b/htdocs/langs/en_US/resource.lang index c4953c460da..e8574dc680f 100644 --- a/htdocs/langs/en_US/resource.lang +++ b/htdocs/langs/en_US/resource.lang @@ -36,4 +36,4 @@ ResourceTypeCode=Resource type code ImportDataset_resource_1=Resources ErrorResourcesAlreadyInUse=Some resources are in use -ErrorResourceUseInEvent=%s used in %s event \ No newline at end of file +ErrorResourceUseInEvent=%s used in %s event diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang index bcdaabb7f6e..fb3806cc0ef 100644 --- a/htdocs/langs/en_US/stocks.lang +++ b/htdocs/langs/en_US/stocks.lang @@ -216,3 +216,4 @@ StockDecrease=Stock decrease InventoryForASpecificWarehouse=Inventory for a specific warehouse InventoryForASpecificProduct=Inventory for a specific product StockIsRequiredToChooseWhichLotToUse=Stock is required to choose which lot to use +ForceTo=Force to diff --git a/htdocs/langs/en_US/stripe.lang b/htdocs/langs/en_US/stripe.lang index 92fe1051f08..cfc0620db5c 100644 --- a/htdocs/langs/en_US/stripe.lang +++ b/htdocs/langs/en_US/stripe.lang @@ -22,7 +22,7 @@ ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment page ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment page of any amount with no existing object ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment page for a member subscription ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment page for payment of a donation -YouCanAddTagOnUrl=You can also add url parameter &tag=value to any of those URL (mandatory only for payment not linked to an object) to add your own payment comment tag.
For the URL of payments with no existing object, you may also add the parameter &noidempotency=1 so the same link with same tag can be used several times (some payment mode may limit the payment to 1 for each different link without this parameter) +YouCanAddTagOnUrl=You can also add url parameter &tag=value to any of those URL (mandatory only for payment not linked to an object) to add your own payment comment tag.
For the URL of payments with no existing object, you may also add the parameter &noidempotency=1 so the same link with same tag can be used several times (some payment mode may limit the payment to 1 for each different link without this parameter) SetupStripeToHavePaymentCreatedAutomatically=Setup your Stripe with url %s to have payment created automatically when validated by Stripe. AccountParameter=Account parameters UsageParameter=Usage parameters @@ -67,4 +67,4 @@ StripePayoutList=List of Stripe payouts ToOfferALinkForTestWebhook=Link to setup Stripe WebHook to call the IPN (test mode) ToOfferALinkForLiveWebhook=Link to setup Stripe WebHook to call the IPN (live mode) PaymentWillBeRecordedForNextPeriod=Payment will be recorded for the next period. -ClickHereToTryAgain=Click here to try again... \ No newline at end of file +ClickHereToTryAgain=Click here to try again... diff --git a/htdocs/langs/en_US/supplier_proposal.lang b/htdocs/langs/en_US/supplier_proposal.lang index ff738a949a6..ce5bdf0425a 100644 --- a/htdocs/langs/en_US/supplier_proposal.lang +++ b/htdocs/langs/en_US/supplier_proposal.lang @@ -32,7 +32,7 @@ SupplierProposalStatusValidatedShort=Validated SupplierProposalStatusClosedShort=Closed SupplierProposalStatusSignedShort=Accepted SupplierProposalStatusNotSignedShort=Refused -CopyAskFrom=Create price request by copying existing a request +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? diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang index 4a578b53b72..1d31a763523 100644 --- a/htdocs/langs/en_US/website.lang +++ b/htdocs/langs/en_US/website.lang @@ -2,7 +2,7 @@ Shortname=Code WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them. DeleteWebsite=Delete website -ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. The files uploaded (like into the medias directory, the ECM module, ...) will remain. +ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. The files uploaded (like into the medias directory, the ECM module, ...) will remain. WEBSITE_TYPE_CONTAINER=Type of page/container WEBSITE_PAGE_EXAMPLE=Web page to use as example WEBSITE_PAGENAME=Page name/alias @@ -113,11 +113,11 @@ ReplaceString=New string CSSContentTooltipHelp=Enter here CSS content. To avoid any conflict with the CSS of the application, be sure to prepend all declaration with the .bodywebsite class. For example:

#mycssselector, input.myclass:hover { ... }
must be
.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }

Note: If you have a large file without this prefix, you can use 'lessc' to convert it to append the .bodywebsite prefix everywhere. LinkAndScriptsHereAreNotLoadedInEditor=Warning: This content is output only when site is accessed from a server. It is not used in Edit mode so if you need to load javascript files also in edit mode, just add your tag 'script src=...' into the page. Dynamiccontent=Sample of a page with dynamic content -ImportSite=Import site +ImportSite=Import website EditInLineOnOff=Mode 'Edit inline' is %s ShowSubContainersOnOff=Mode to execute 'dynamic content' is %s GlobalCSSorJS=Global CSS/JS/Header file of web site BackToHomePage=Back to home page... TranslationLinks=Translation links YouTryToAccessToAFileThatIsNotAWebsitePage=You try to access to a page that is not a website page -UseTextBetween5And70Chars=For good SEO practices, use a text between 5 and 70 characters \ No newline at end of file +UseTextBetween5And70Chars=For good SEO practices, use a text between 5 and 70 characters diff --git a/htdocs/langs/en_US/zapier.lang b/htdocs/langs/en_US/zapier.lang index 07eb8460efa..6d6eda71313 100644 --- a/htdocs/langs/en_US/zapier.lang +++ b/htdocs/langs/en_US/zapier.lang @@ -25,4 +25,4 @@ ModuleZapierForDolibarrDesc = Zapier for Dolibarr module # # Admin page # -ZapierForDolibarrSetup = Setup of Zapier for Dolibarr \ No newline at end of file +ZapierForDolibarrSetup = Setup of Zapier for Dolibarr diff --git a/htdocs/langs/es_CL/accountancy.lang b/htdocs/langs/es_CL/accountancy.lang index 19aeadebdd8..74fd60bf0a0 100644 --- a/htdocs/langs/es_CL/accountancy.lang +++ b/htdocs/langs/es_CL/accountancy.lang @@ -139,7 +139,6 @@ AccountingAccountGroupsDesc=Puede definir aquí algunos grupos de cuentas contab DeleteMvt=Eliminar líneas de libro mayor DelYear=Año para borrar DelJournal=Diario para eliminar -ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger. FinanceJournal=Diario de finanzas ExpenseReportsJournal=Diario de informes de gastos DescFinanceJournal=Diario financiero que incluye todos los tipos de pagos por cuenta bancaria diff --git a/htdocs/langs/es_MX/accountancy.lang b/htdocs/langs/es_MX/accountancy.lang index 1c306bfed30..67b69798051 100644 --- a/htdocs/langs/es_MX/accountancy.lang +++ b/htdocs/langs/es_MX/accountancy.lang @@ -39,7 +39,6 @@ LabelAccount=Descripción de la cuenta Sens=Significado DelYear=Año a borrar DelJournal=Diario a borrar -ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger. DescFinanceJournal=Diario financiero incluyendo todos los tipos de pagos por cuenta bancaria CustomerInvoicePayment=Pago de factura de cliente NewAccountingMvt=Nueva transacción diff --git a/htdocs/langs/es_PE/accountancy.lang b/htdocs/langs/es_PE/accountancy.lang index c823dca787f..d6c4ce35cbc 100644 --- a/htdocs/langs/es_PE/accountancy.lang +++ b/htdocs/langs/es_PE/accountancy.lang @@ -41,6 +41,5 @@ ACCOUNTING_SOCIAL_JOURNAL=Diario Social ACCOUNTING_ACCOUNT_SUSPENSE=Cuenta contable de espera Sens=Significado Codejournal=Periódico -ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger. FinanceJournal=Periodo Financiero TotalMarge=Margen total de ventas diff --git a/htdocs/langs/fr_BE/accountancy.lang b/htdocs/langs/fr_BE/accountancy.lang index 355cc9b9a5e..1071dd5c68b 100644 --- a/htdocs/langs/fr_BE/accountancy.lang +++ b/htdocs/langs/fr_BE/accountancy.lang @@ -3,7 +3,6 @@ ConfigAccountingExpert=Configuration du module de compta expert Processing=Exécution Lineofinvoice=Lignes de facture Doctype=Type de document -ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger. ErrorDebitCredit=Débit et crédit ne peuvent pas être non-nuls en même temps TotalMarge=Marge de ventes totale Selectmodelcsv=Sélectionnez un modèle d'export diff --git a/htdocs/langs/fr_CA/accountancy.lang b/htdocs/langs/fr_CA/accountancy.lang index 3f89b3f7260..9b0cca731d1 100644 --- a/htdocs/langs/fr_CA/accountancy.lang +++ b/htdocs/langs/fr_CA/accountancy.lang @@ -107,7 +107,6 @@ ACCOUNTING_SERVICE_SOLD_ACCOUNT=Compte comptable par défaut pour les services v GroupByAccountAccounting=Groupe par compte comptable NotMatch=Pas encore défini DeleteMvt=Effacer les lignes du grand livre -ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger. FinanceJournal=Journal des finances ExpenseReportsJournal=Journal des rapports de dépenses DescFinanceJournal=Journal de banque comprenant tous les types de règlements autres que espèce\t diff --git a/htdocs/langs/nl_BE/accountancy.lang b/htdocs/langs/nl_BE/accountancy.lang index f7b32208cd8..ead8a057ebb 100644 --- a/htdocs/langs/nl_BE/accountancy.lang +++ b/htdocs/langs/nl_BE/accountancy.lang @@ -23,7 +23,6 @@ EndProcessing=Verwerking beëindigd Lineofinvoice=Factuur lijn Docdate=Datum Docref=Artikelcode -ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger. TotalVente=Totaal omzet voor belastingen AccountingJournalType2=Verkoop AccountingJournalType3=Inkoop