diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang index 0480d8a25daefb58d6b798e71e38a3e81b3f869e..c8dabf0dc2efd5d2bebbd8a7b67b0fb17ae34448 100644 --- a/htdocs/langs/en_US/accountancy.lang +++ b/htdocs/langs/en_US/accountancy.lang @@ -51,8 +51,8 @@ Bookkeeping=General ledger AccountBalance=Account balance CAHTF=Total purchase supplier before tax -InvoiceLines=Lines of invoice to bind -InvoiceLinesDone=Binded lines of invoice +InvoiceLines=Lines of invoices to bind +InvoiceLinesDone=Binded lines of invoices IntoAccount=Bind line with the accounting account Ventilate=Bind @@ -115,7 +115,7 @@ FinanceJournal=Finance journal DescFinanceJournal=Finance journal including all the types of payments by bank account DescJournalOnlyBindedVisible=This is a view of records that are bound to products/services accountancy account and can be recorded into the General Ledger. VATAccountNotDefined=Account for VAT not defined -ThirdpartyAccountNotDefined=Account for thirdparty not defined +ThirdpartyAccountNotDefined=Account for third party not defined ProductAccountNotDefined=Account for product not defined BankAccountNotDefined=Account for bank not defined CustomerInvoicePayment=Payment of invoice customer @@ -125,8 +125,8 @@ NumMvts=Numero of transaction ListeMvts=List of movements ErrorDebitCredit=Debit and Credit cannot have a value at the same time -ReportThirdParty=List thirdparty account -DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts +ReportThirdParty=List third party account +DescThirdPartyReport=Consult here the list of the third party customers and the suppliers and their accounting accounts ListAccounts=List of the accounting accounts diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 0acf8faf9dd9539777a22db8a9cb6c820bd3b14c..0384e063a91c03c2db581e850dd44ab49771083c 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -64,7 +64,7 @@ DelaiedFullListToSelectCompany=Wait you press a key before loading content of th DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact) NumberOfKeyToSearch=Nbr of characters to trigger search: %s NotAvailableWhenAjaxDisabled=Not available when Ajax disabled -AllowToSelectProjectFromOtherCompany=On document of a thirdparty, can choose a project linked to another thirdparty +AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party JavascriptDisabled=JavaScript disabled UsePreviewTabs=Use preview tabs ShowPreview=Show preview @@ -282,7 +282,7 @@ LastStableVersion=Latest stable version LastActivationDate=Last activation date UpdateServerOffline=Update server offline GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> 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. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br> -GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of thirdparty type on n characters (see dictionary-thirdparty types).<br> +GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br> GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br> GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany done 2007-01-31:</u><br> GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br> @@ -482,7 +482,7 @@ Module510Desc=Management of employees contracts, salaries and payments Module520Name=Loan Module520Desc=Management of loans Module600Name=Notifications -Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each thirdparty) or fixed emails +Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails Module700Name=Donations Module700Desc=Donation management Module770Name=Expense reports @@ -1318,7 +1318,7 @@ ProductServiceSetup=Products and Services modules setup NumberOfProductShowInSelect=Max number of products in combos select lists (0=no limit) ViewProductDescInFormAbility=Visualization of product descriptions in the forms (otherwise as popup tooltip) MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal -ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the thirdparty language +ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the third party language UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list). SetDefaultBarcodeTypeProducts=Default barcode type to use for products @@ -1552,7 +1552,7 @@ ListOfNotificationsPerUser=List of notifications per user* ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact** ListOfFixedNotifications=List of fixed notifications GoOntoUserCardToAddMore=Go on the tab "Notifications" of a user to add or remove notifications for users -GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty to add or remove notifications for contacts/addresses +GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses Threshold=Threshold BackupDumpWizard=Wizard to build database backup dump file SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason: @@ -1596,7 +1596,7 @@ MailToSendIntervention=To send intervention MailToSendSupplierRequestForQuotation=To send quotation request to supplier MailToSendSupplierOrder=To send supplier order MailToSendSupplierInvoice=To send supplier invoice -MailToThirdparty=To send email from thirdparty page +MailToThirdparty=To send email from third party page ByDefaultInList=Show by default on list view YouUseLastStableVersion=You use the last stable version TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites) @@ -1628,7 +1628,7 @@ ListOfAvailableAPIs=List of available APIs activateModuleDependNotSatisfied=Module "%s" depends on module "%s" that is missing, so module "%1$s" may not work correclty. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise CommandIsNotInsideAllowedCommands=The command you try to run is not inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <strong>conf.php</strong> file. LandingPage=Landing page -SamePriceAlsoForSharedCompanies=If you use the multicompany module, with the choice "Single price", price will be also the same for all companies if products are shared between environments +SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", price will be also the same for all companies if products are shared between environments ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users manually if necessary. UserHasNoPermissions=This user has no permission defined TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days") \ No newline at end of file diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang index ce839d04eedb8ec7e6a14a835bbefdcf34729937..03ad28e0a2dd9a51057e517bded569676710a14a 100644 --- a/htdocs/langs/en_US/bills.lang +++ b/htdocs/langs/en_US/bills.lang @@ -437,8 +437,8 @@ ToMakePaymentBack=Pay back ListOfYourUnpaidInvoices=List of unpaid invoices NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative. RevenueStamp=Revenue stamp -YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of thirdparty -YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of thirdparty +YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party +YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (recommended Template) PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices diff --git a/htdocs/langs/en_US/categories.lang b/htdocs/langs/en_US/categories.lang index 1008cd5bd6873787b1064f5f3b227a08dd3bdb1f..1615697ed9decf8d8cc64e02768dc409b23f6c84 100644 --- a/htdocs/langs/en_US/categories.lang +++ b/htdocs/langs/en_US/categories.lang @@ -34,7 +34,7 @@ CompanyIsInSuppliersCategories=This third party is linked to following suppliers MemberIsInCategories=This member is linked to following members tags/categories ContactIsInCategories=This contact is linked to following contacts tags/categories ProductHasNoCategory=This product/service is not in any tags/categories -CompanyHasNoCategory=This thirdparty is not in any tags/categories +CompanyHasNoCategory=This third party is not in any tags/categories MemberHasNoCategory=This member is not in any tags/categories ContactHasNoCategory=This contact is not in any tags/categories ProjectHasNoCategory=This project is not in any tags/categories diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang index 8ceec37d856a1b9a909fa948a606038f42cc9417..f57b02d87bdecede1f4ac94bfd3d6a9b98e79dfe 100644 --- a/htdocs/langs/en_US/companies.lang +++ b/htdocs/langs/en_US/companies.lang @@ -14,7 +14,7 @@ NewCompany=New company (prospect, customer, supplier) NewThirdParty=New third party (prospect, customer, supplier) CreateDolibarrThirdPartySupplier=Create a third party (supplier) CreateThirdPartyOnly=Create thirdpary -CreateThirdPartyAndContact=Create a thirdparty + a child contact +CreateThirdPartyAndContact=Create a third party + a child contact ProspectionArea=Prospection area IdThirdParty=Id third party IdCompany=Company Id @@ -40,7 +40,7 @@ ThirdPartySuppliers=Suppliers ThirdPartyType=Third party type Company/Fundation=Company/Foundation Individual=Private individual -ToCreateContactWithSameName=Will create automatically a contact/address with same information than thirdparty under the thirdparty. In most cases, even if your thirdparty is a physical people, creating a thirdparty alone is enough. +ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough. ParentCompany=Parent company Subsidiaries=Subsidiaries ReportByCustomers=Report by customers @@ -75,7 +75,7 @@ Poste= Position DefaultLang=Language by default VATIsUsed=VAT is used VATIsNotUsed=VAT is not used -CopyAddressFromSoc=Fill address with thirdparty address +CopyAddressFromSoc=Fill address with third party address ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects ##### Local Taxes ##### LocalTax1IsUsed=Use second tax @@ -287,7 +287,7 @@ CompanyDeleted=Company "%s" deleted from database. ListOfContacts=List of contacts/addresses ListOfContactsAddresses=List of contacts/adresses ListOfThirdParties=List of third parties -ShowCompany=Show thirdparty +ShowCompany=Show third party ShowContact=Show contact ContactsAllShort=All (No filter) ContactType=Contact type @@ -398,4 +398,4 @@ SaleRepresentativeLogin=Login of sales representative SaleRepresentativeFirstname=Firstname of sales representative SaleRepresentativeLastname=Lastname of sales representative ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted. -NewCustomerSupplierCodeProposed=New customer or supplier proposed on duplicate code +NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang index 8c40a8080749f3cfbfc59b92db614a06b6f771d3..debc51fead21b64acfcc97fec3dd50ec73bf9154 100644 --- a/htdocs/langs/en_US/errors.lang +++ b/htdocs/langs/en_US/errors.lang @@ -129,7 +129,7 @@ ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use t ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s ErrorWarehouseMustDiffers=Source and target warehouses must differs ErrorBadFormat=Bad format! -ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice. +ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any third party. Link member to an existing third party or create a new third party before creating subscription with invoice. ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed diff --git a/htdocs/langs/en_US/mails.lang b/htdocs/langs/en_US/mails.lang index 104d5d3e657b16597008e3ece8f372425e48bb11..649bf9359a207c95cb0efc73f4e5eaa143685176 100644 --- a/htdocs/langs/en_US/mails.lang +++ b/htdocs/langs/en_US/mails.lang @@ -128,7 +128,7 @@ AdvTgtMaxVal=Maximum value AdvTgtSearchDtHelp=Use interval to select date value AdvTgtStartDt=Start dt. AdvTgtEndDt=End dt. -AdvTgtTypeOfIncudeHelp=Target Email of thirdparty and email of contact of the thridparty, or just thridparty email or just contact email +AdvTgtTypeOfIncudeHelp=Target Email of third party and email of contact of the third party, or just third party email or just contact email AdvTgtTypeOfIncude=Type of targeted email AdvTgtContactHelp=Use only if you target contact into "Type of targeted email" AddAll=Add all diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang index d2b771cf52c25ea2677acdf54373ea696895a8cf..66643a65f76a94ed8dc8ab2d501c22252d611fb0 100644 --- a/htdocs/langs/en_US/products.lang +++ b/htdocs/langs/en_US/products.lang @@ -199,11 +199,11 @@ PrintsheetForOneBarCode=Print several stickers for one barcode BuildPageToPrint=Generate page to print FillBarCodeTypeAndValueManually=Fill barcode type and value manually. FillBarCodeTypeAndValueFromProduct=Fill barcode type and value from barcode of a product. -FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a thirdparty. +FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a third party. DefinitionOfBarCodeForProductNotComplete=Definition of type or value of bar code not complete for product %s. -DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for thirdparty %s. +DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for third party %s. BarCodeDataForProduct=Barcode information of product %s : -BarCodeDataForThirdparty=Barcode information of thirdparty %s : +BarCodeDataForThirdparty=Barcode information of third party %s : ResetBarcodeForAllRecords=Define barcode value for all records (this will also reset barcode value already defined with new values) PriceByCustomer=Different prices for each customer PriceCatalogue=A single sell price per product/service