diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 3f31a9b628c..41b79cd7c8e 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -288,16 +288,16 @@ MAIN_SMS_SENDMODE=Method to use to send SMS MAIN_MAIL_SMS_FROM=Default sender phone number for SMS sending MAIN_MAIL_DEFAULT_FROMTYPE=Default sender email for manual sending (User email or Company email) UserEmail=User email -CompanyEmail=Company email +CompanyEmail=Company Email FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your sendmail program locally. SubmitTranslation=If the translation for this language is not complete or you find errors, you can correct this by editing files in directory langs/%s and submit your change to www.transifex.com/dolibarr-association/dolibarr/ SubmitTranslationENUS=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 dolibarr.org/forum or for developers on github.com/Dolibarr/dolibarr. ModuleSetup=Module setup ModulesSetup=Modules/Application setup ModuleFamilyBase=System -ModuleFamilyCrm=Customer Relation Management (CRM) -ModuleFamilySrm=Supplier Relation Management (VRM) -ModuleFamilyProducts=Products Management (PM) +ModuleFamilyCrm=Customer Relationship Management (CRM) +ModuleFamilySrm=Vendor Relationship Management (VRM) +ModuleFamilyProducts=Product Management (PM) ModuleFamilyHr=Human Resource Management (HR) ModuleFamilyProjects=Projects/Collaborative work ModuleFamilyOther=Other @@ -374,7 +374,7 @@ ResponseTimeout=Response timeout SmsTestMessage=Test message from __PHONEFROM__ to __PHONETO__ ModuleMustBeEnabledFirst=Module %s must be enabled first if you need this feature. SecurityToken=Key to secure URLs -NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external supplier, but you can find some on %s +NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s PDF=PDF PDFDesc=You can set each global option related to the PDF generation PDFAddressForging=Rules to forge address boxes @@ -452,7 +452,7 @@ DisplayCompanyManagers=Display manager names DisplayCompanyInfoAndManagers=Display company address and manager names EnableAndSetupModuleCron=If you want to have this recurring invoice generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template using the *Create* button. Note that even if you enabled automatic generation, you can still safely launch manual generation. Generation of duplicates for the same period is not possible. ModuleCompanyCodeCustomerAquarium=%s followed by customer code for a customer accounting code -ModuleCompanyCodeSupplierAquarium=%s followed by supplier code for a supplier accounting code +ModuleCompanyCodeSupplierAquarium=%s followed by vendor code for a vendor accounting code ModuleCompanyCodePanicum=Return an empty accounting code. ModuleCompanyCodeDigitaria=Accounting code depends on third-party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third-party code. Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).
Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required. @@ -477,10 +477,10 @@ WatermarkOnDraftExpenseReports=Watermark on draft expense reports AttachMainDocByDefault=Set this to 1 if you want to attach main document to email by default (if applicable) FilesAttachedToEmail=Attach file SendEmailsReminders=Send agenda reminders by emails -davDescription=Add a component to be a DAV server +davDescription=Setup a WebDAV server DAVSetup=Setup of module DAV -DAV_ALLOW_PUBLIC_DIR=Enable the public directory (WebDav directory - no login required) -DAV_ALLOW_PUBLIC_DIRTooltip=The WebDav public directory is a WebDAV directory anybody can access (in read and write mode), with no authorization required (login/password account). +DAV_ALLOW_PUBLIC_DIR=Enable the public directory (WebDAV directory - no login required) +DAV_ALLOW_PUBLIC_DIRTooltip=The WebDAV public directory is a WebDAV directory anybody can access (in read and write mode), with no authorization required (login/password account). DAV_ALLOW_ECM_DIR=Enable the private directory (root directory of the DMS/ECM module - login required) DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploaded when using the DMS/ECM module. Similarly as access from the web interface, you will need a valid login/password with adecuate permissions to access it. # Modules @@ -494,28 +494,28 @@ Module10Name=Accounting Module10Desc=Simple accounting reports (journals, turnover) based on database content. Does not use any ledger table. Module20Name=Proposals Module20Desc=Commercial proposal management -Module22Name=Mass E-mailings -Module22Desc=Mass E-mailing management +Module22Name=Mass Emailings +Module22Desc=Manage bulk emailing Module23Name=Energy Module23Desc=Monitoring the consumption of energies Module25Name=Customer Orders Module25Desc=Customer order management Module30Name=Invoices Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers -Module40Name=Suppliers -Module40Desc=Suppliers and purchase management (purchase orders and billing) +Module40Name=Vendors +Module40Desc=Vendors and purchase management (purchase orders and billing) Module42Name=Debug Logs Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes. Module49Name=Editors Module49Desc=Editor management Module50Name=Products -Module50Desc=Product management +Module50Desc=Management of Products Module51Name=Mass mailings Module51Desc=Mass paper mailing management Module52Name=Stocks -Module52Desc=Stock management (products) +Module52Desc=Stock management (for products only) Module53Name=Services -Module53Desc=Service management +Module53Desc=Management of Services Module54Name=Contracts/Subscriptions Module54Desc=Management of contracts (services or recurring subscriptions) Module55Name=Barcodes @@ -533,8 +533,8 @@ 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 +Module80Desc=Shipments and delivery note management +Module85Name=Banks & Cash Module85Desc=Management of bank or cash accounts Module100Name=External Site Module100Desc=Add external website link into Dolibarr menus to view it in a Dolibarr frame @@ -551,18 +551,18 @@ Module250Desc=Tool to import data into Dolibarr (with assistants) Module310Name=Members Module310Desc=Foundation members management Module320Name=RSS Feed -Module320Desc=Add RSS feed inside Dolibarr screen pages +Module320Desc=Add a RSS feed to Dolibarr pages Module330Name=Bookmarks and shortcuts -Module330Desc=Create shortcuts, always accessible, to the internal or external pages which you frequently access +Module330Desc=Create admin menu shortcuts to internal/external pages Module400Name=Projects or Leads Module400Desc=Management of projects, leads/opportunities and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Webcalendar Module410Desc=Webcalendar integration -Module500Name=Taxes and Special expenses +Module500Name=Taxes & Special Expenses Module500Desc=Management of other expenses (sale taxes, social or fiscal taxes, dividends, ...) -Module510Name=Payment of employee wages +Module510Name=Salaries Module510Desc=Record and track employee payments -Module520Name=Loan +Module520Name=Loans Module520Desc=Management of loans Module600Name=Notifications Module600Desc=Send email notifications triggered by a business event: per user (setup defined on each user), per third-party contacts (setup defined on each third party) or by specific emails @@ -571,24 +571,24 @@ Module610Name=Product Variants Module610Desc=Creation of product variants (color, size etc.) Module700Name=Donations Module700Desc=Donation management -Module770Name=Expense reports -Module770Desc=Manage and claim expense reports (transportation, meal, ...) -Module1120Name=Supplier commercial proposal -Module1120Desc=Request supplier commercial proposal and prices +Module770Name=Expense Reports +Module770Desc=Manage expense reports claims (transportation, meal, ...) +Module1120Name=Vendor Commercial Proposals +Module1120Desc=Request vendor commercial proposal and prices Module1200Name=Mantis Module1200Desc=Mantis integration Module1520Name=Document Generation -Module1520Desc=Mass mail document generation +Module1520Desc=Mass email document generation Module1780Name=Tags/Categories Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members) Module2000Name=WYSIWYG editor -Module2000Desc=Allow text fields to be edited using CKEditor +Module2000Desc=Allow text fields to be edited/formatted using CKEditor (html) Module2200Name=Dynamic Prices -Module2200Desc=Enable the usage of math expressions for prices +Module2200Desc=Use maths expressions for auto-generation of prices Module2300Name=Scheduled jobs Module2300Desc=Scheduled jobs management (alias cron or chrono table) Module2400Name=Events/Agenda -Module2400Desc=Track events. Let Dolibarr log automatic events for tracking purposes or record manual events or meetings. This is the principal module for good Customer or Supplier Relationship Management. +Module2400Desc=Track events. Log automatic events for tracking purposes or record manual events or meetings. This is the principal module for good Customer or Vendor Relationship Management. Module2500Name=DMS / ECM Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need. Module2600Name=API/Web services (SOAP server) @@ -596,14 +596,14 @@ Module2600Desc=Enable the Dolibarr SOAP server providing API services Module2610Name=API/Web services (REST server) Module2610Desc=Enable the Dolibarr REST server providing API services Module2660Name=Call WebServices (SOAP client) -Module2660Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Only Supplier orders are currently supported.) +Module2660Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Only Vendor orders are currently supported.) Module2700Name=Gravatar Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Needs Internet access Module2800Desc=FTP Client Module2900Name=GeoIPMaxmind Module2900Desc=GeoIP Maxmind conversions capabilities Module3100Name=Skype -Module3100Desc=Add a Skype button into users / third parties / contacts / members cards +Module3100Desc=Add a Skype button to cards for users/third parties/contacts/members Module3200Name=Unalterable Archives Module3200Desc=Enable an unalterable log of business events. Events are archived in real-time. The log is a read-only table of chained events that can be exported. This module may be mandatory for some countries. Module4000Name=HRM @@ -613,27 +613,29 @@ Module5000Desc=Allows you to manage multiple companies Module6000Name=Workflow Module6000Desc=Workflow management (automatic creation of object and/or automatic status change) Module10000Name=Websites -Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the Internet with your own domain name. -Module20000Name=Leave Requests management -Module20000Desc=Declare and track employees leave requests -Module39000Name=Products lots -Module39000Desc=Lot or serial number, eat-by and sell-by date management on products +Module10000Desc=Create websites (public) with a WYSIWYG editor. Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the internet with your own domain name. +Module20000Name=Leave Request Management +Module20000Desc=Define and track employee leave requests +Module39000Name=Product Lots +Module39000Desc=Lots, serial numbers, eat-by/sell-by date management for products Module40000Name=Multicurrency Module40000Desc=Use alternative currencies in prices and documents Module50000Name=PayBox -Module50000Desc=Offer customers a PayBox online payment page (credit/debit cards). This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...) -Module50100Name=Point of sales -Module50100Desc=Point of sales module (POS). +Module50000Desc=Offer customers a PayBox online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...) +Module50100Name=POS +Module50100Desc=Point of Sale module (POS). Module50150Name=Point of Sale Module50150Desc=Point of Sale module (Touch screen POS). Module50200Name=Paypal -Module50200Desc=Offer customers a PayPal online payment page (PayPal account or credit/debit cards). This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...) +Module50200Desc=Offer customers a PayPal online payment page (PayPal account or credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...) +Module50300Name=Stripe +Module50300Desc=Offer customers a Stripe online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...) Module50400Name=Accounting (advanced) Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software formats. Module54000Name=PrintIPP Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installed on server). Module55000Name=Poll, Survey or Vote -Module55000Desc=Module to create online polls, surveys or votes (like Doodle, Studs, Rdvz, ...) +Module55000Desc=Create online polls, surveys or votes (like Doodle, Studs, RDVz etc...) Module59000Name=Margins Module59000Desc=Module to manage margins Module60000Name=Commissions @@ -641,7 +643,7 @@ Module60000Desc=Module to manage commissions Module62000Name=Incoterms Module62000Desc=Add features to manage Incoterms Module63000Name=Resources -Module63000Desc=Manage resources (printers, cars, room, ...) you can then share into events +Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events Permission11=Read customer invoices Permission12=Create/modify customer invoices Permission13=Unvalidate customer invoices @@ -725,14 +727,14 @@ Permission173=Delete trips and expenses Permission174=Read all trips and expenses Permission178=Export trips and expenses Permission180=Read suppliers -Permission181=Read supplier orders -Permission182=Create/modify supplier orders -Permission183=Validate supplier orders -Permission184=Approve supplier orders -Permission185=Order or cancel supplier orders -Permission186=Receive supplier orders -Permission187=Close supplier orders -Permission188=Cancel supplier orders +Permission181=Read vendor orders +Permission182=Create/modify vendor orders +Permission183=Validate vendor orders +Permission184=Approve vendor orders +Permission185=Order or cancel vendor orders +Permission186=Receive vendor orders +Permission187=Close vendor orders +Permission188=Cancel vendor orders Permission192=Create lines Permission193=Cancel lines Permission194=Read the bandwidth lines @@ -831,23 +833,23 @@ Permission1102=Create/modify delivery orders Permission1104=Validate delivery orders Permission1109=Delete delivery orders Permission1181=Read suppliers -Permission1182=Read supplier orders -Permission1183=Create/modify supplier orders -Permission1184=Validate supplier orders -Permission1185=Approve supplier orders -Permission1186=Order supplier orders -Permission1187=Acknowledge receipt of supplier orders -Permission1188=Delete supplier orders -Permission1190=Approve (second approval) supplier orders +Permission1182=Read vendor orders +Permission1183=Create/modify vendor orders +Permission1184=Validate vendor orders +Permission1185=Approve vendor orders +Permission1186=Order vendor orders +Permission1187=Acknowledge receipt of vendor orders +Permission1188=Delete vendor orders +Permission1190=Approve (second approval) vendor orders Permission1201=Get result of an export Permission1202=Create/Modify an export -Permission1231=Read supplier invoices -Permission1232=Create/modify supplier invoices -Permission1233=Validate supplier invoices -Permission1234=Delete supplier invoices -Permission1235=Send supplier invoices by email -Permission1236=Export supplier invoices, attributes and payments -Permission1237=Export supplier orders and their details +Permission1231=Read vendor invoices +Permission1232=Create/modify vendor invoices +Permission1233=Validate vendor invoices +Permission1234=Delete vendor invoices +Permission1235=Send vendor invoices by email +Permission1236=Export vendor invoices, attributes and payments +Permission1237=Export vendor orders and their details Permission1251=Run mass imports of external data into database (data load) Permission1321=Export customer invoices, attributes and payments Permission1322=Reopen a paid bill @@ -875,7 +877,7 @@ Permission2503=Submit or delete documents Permission2515=Setup documents directories Permission2801=Use FTP client in read mode (browse and download only) Permission2802=Use FTP client in write mode (delete or upload files) -Permission50101=Use Point of sales +Permission50101=Use Point of Sale Permission50201=Read transactions Permission50202=Import transactions Permission54001=Print @@ -1042,7 +1044,7 @@ Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Delay (in days) before alert on proposals to Delays_MAIN_DELAY_PROPALS_TO_BILL=Delay (in days) before alert on proposals not billed Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Delay (in days) before alert on services to activate Delays_MAIN_DELAY_RUNNING_SERVICES=Delay (in days) before alert on expired services -Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Delay (in days) before alert on unpaid supplier invoices +Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Delay (in days) before alert on unpaid vendor invoices Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Delay (in days) before alert on unpaid client invoices Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Delay (in days) before alert on pending bank reconciliation Delays_MAIN_DELAY_MEMBERS=Delay (in days) before alert on delayed membership fee @@ -1185,8 +1187,8 @@ BrowserIsOK=You are using the %s web browser. This browser is ok for security an BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari. XDebugInstalled=XDebug is loaded. XCacheInstalled=XCache is loaded. -AddRefInList=Display Customer/Supplier ref. info list (select list or combobox) and most of hyperlink.
Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp". -AddAdressInList=Display Customer/Supplier adress info list (select list or combobox)
Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp". +AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.
Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp". +AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)
Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp". AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties. FieldEdition=Edition of field %s FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced) @@ -1201,13 +1203,13 @@ PasswordPatternDesc=Password pattern description RuleForGeneratedPasswords=Rule to generate suggested passwords or validate passwords DisableForgetPasswordLinkOnLogonPage=Do not show the link "Forget password" on login page UsersSetup=Users module setup -UserMailRequired=EMail required to create a new user +UserMailRequired=Email required to create a new user ##### HRM setup ##### HRMSetup=HRM module setup ##### Company setup ##### CompanySetup=Companies module setup -CompanyCodeChecker=Options for automatic generation of customer/supplier codes -AccountCodeManager=Options for automatic generation of customer/supplier accounting codes +CompanyCodeChecker=Options for automatic generation of customer/vendor codes +AccountCodeManager=Options for automatic generation of customer/vendor accounting codes NotificationsDesc=EMais notification feature allows you to silently send automatic mails for some Dolibarr events. Recipients of notifications can be defined: NotificationsDescUser=* per user, one user at time. NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time. @@ -1222,7 +1224,7 @@ MustBeMandatory=Mandatory to create third parties (if VAT number or type of comp MustBeInvoiceMandatory=Mandatory to validate invoices? TechnicalServicesProvided=Technical services provided #####DAV ##### -WebDAVSetupDesc=This is the link to access the WebDAV directory. It contains a "public" dir open to any user knowing the URL (if public directory access allowed) and a "private" directory that need an existing login account/password for access. +WebDAVSetupDesc=This is the link to access the WebDAV directory. It contains a "public" dir open to any user knowing the URL (if public directory access allowed) and a "private" directory that needs an existing login account/password for access. WebDavServer=Root URL of %s server: %s ##### Webcal setup ##### WebCalUrlForVCalExport=An export link to %s format is available at following link: %s @@ -1241,8 +1243,8 @@ SuggestPaymentByChequeToAddress=Suggest payment by check to FreeLegalTextOnInvoices=Free text on invoices WatermarkOnDraftInvoices=Watermark on draft invoices (none if empty) PaymentsNumberingModule=Payments numbering model -SuppliersPayment=Suppliers payments -SupplierPaymentSetup=Suppliers payments setup +SuppliersPayment=Vendors payments +SupplierPaymentSetup=Vendors payments setup ##### Proposals ##### PropalSetup=Commercial proposals module setup ProposalsNumberingModules=Commercial proposal numbering models @@ -1284,7 +1286,7 @@ WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty) MembersSetup=Members module setup MemberMainOptions=Main options AdherentLoginRequired= Manage a Login for each member -AdherentMailRequired=EMail required to create a new member +AdherentMailRequired=Email required to create a new member MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes MEMBER_REMINDER_EMAIL=Enable automatic reminder by email of expired subscriptions. Note: Module %s must be enabled and correctly setup to send reminders. @@ -1506,7 +1508,7 @@ RSSUrlExample=An interesting RSS feed ##### Mailing ##### MailingSetup=EMailing module setup MailingEMailFrom=Sender email (From) for emails sent by emailing module -MailingEMailError=Return EMail (Errors-to) for emails with errors +MailingEMailError=Return Email (Errors-to) for emails with errors MailingDelay=Seconds to wait after sending next message ##### Notification ##### NotificationSetup=Email Notification module setup @@ -1609,9 +1611,9 @@ ClickToDialUrlDesc=Url called when a click on phone picto is done. In URL, you ClickToDialDesc=This module makea phone numbers clickable links. A click on the icon will make your phone call the number. This can be used to call a call-center system from Dolibarr that can call the phone number on a SIP system for example. ClickToDialUseTelLink=Use just a link "tel:" on phone numbers ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field. -##### Point Of Sales (CashDesk) ##### -CashDesk=Point of sales -CashDeskSetup=Point of sales module setup +##### Point Of Sale (CashDesk) ##### +CashDesk=Point of Sale +CashDeskSetup=Point of Sales module setup CashDeskThirdPartyForSell=Default generic third party to use for sales CashDeskBankAccountForSell=Default account to use to receive cash payments CashDeskBankAccountForCheque= Default account to use to receive payments by check @@ -1650,10 +1652,10 @@ ChequeReceiptsNumberingModule=Check Receipts Numbering Module ##### Multicompany ##### MultiCompanySetup=Multi-company module setup ##### Suppliers ##### -SuppliersSetup=Supplier module setup +SuppliersSetup=Vendor module setup SuppliersCommandModel=Complete template of purchase order (logo...) -SuppliersInvoiceModel=Complete template of supplier invoice (logo...) -SuppliersInvoiceNumberingModel=Supplier invoices numbering models +SuppliersInvoiceModel=Complete template of vendor invoice (logo...) +SuppliersInvoiceNumberingModel=Vendor invoices numbering models IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval ##### GeoIPMaxmind ##### GeoIPMaxmindSetup=GeoIP Maxmind module setup @@ -1689,7 +1691,7 @@ NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0"," SalariesSetup=Setup of module salaries SortOrder=Sort order Format=Format -TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type +TypePaymentDesc=0:Customer payment type, 1:Vendor 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 @@ -1751,7 +1753,7 @@ MailToSendShipment=Shipments MailToSendIntervention=Interventions MailToSendSupplierRequestForQuotation=Quotation request MailToSendSupplierOrder=Purchase orders -MailToSendSupplierInvoice=Supplier invoices +MailToSendSupplierInvoice=Vendor invoices MailToSendContract=Contracts MailToThirdparty=Third parties MailToMember=Members diff --git a/htdocs/langs/en_US/agenda.lang b/htdocs/langs/en_US/agenda.lang index 90a62526e4d..09bb0364333 100644 --- a/htdocs/langs/en_US/agenda.lang +++ b/htdocs/langs/en_US/agenda.lang @@ -69,15 +69,15 @@ OrderBilledInDolibarr=Order %s classified billed OrderApprovedInDolibarr=Order %s approved OrderRefusedInDolibarr=Order %s refused OrderBackToDraftInDolibarr=Order %s go back to draft status -ProposalSentByEMail=Commercial proposal %s sent by EMail -ContractSentByEMail=Contract %s sent by EMail -OrderSentByEMail=Customer order %s sent by EMail -InvoiceSentByEMail=Customer invoice %s sent by EMail -SupplierOrderSentByEMail=Supplier order %s sent by EMail -SupplierInvoiceSentByEMail=Supplier invoice %s sent by EMail -ShippingSentByEMail=Shipment %s sent by EMail +ProposalSentByEMail=Commercial proposal %s sent by email +ContractSentByEMail=Contract %s sent by email +OrderSentByEMail=Customer order %s sent by email +InvoiceSentByEMail=Customer invoice %s sent by email +SupplierOrderSentByEMail=Vendor order %s sent by email +SupplierInvoiceSentByEMail=Vendor invoice %s sent by email +ShippingSentByEMail=Shipment %s sent by email ShippingValidated= Shipment %s validated -InterventionSentByEMail=Intervention %s sent by EMail +InterventionSentByEMail=Intervention %s sent by email ProposalDeleted=Proposal deleted OrderDeleted=Order deleted InvoiceDeleted=Invoice deleted diff --git a/htdocs/langs/en_US/assets.lang b/htdocs/langs/en_US/assets.lang index b780fb6fcba..6fb40755fdb 100644 --- a/htdocs/langs/en_US/assets.lang +++ b/htdocs/langs/en_US/assets.lang @@ -22,7 +22,7 @@ AccountancyCodeAsset = Accounting code (asset) AccountancyCodeDepreciationAsset = Accounting code (depreciation asset account) AccountancyCodeDepreciationExpense = Accounting code (depreciation expense account) NewAssetType=New asset type -AssetsTypeSetup=Assets type setup +AssetsTypeSetup=Asset type setup AssetTypeModified=Asset type modified AssetType=Asset type AssetsLines=Assets @@ -42,7 +42,7 @@ ModuleAssetsDesc = Assets description AssetsSetup = Assets setup Settings = Settings AssetsSetupPage = Assets setup page -ExtraFieldsAssetsType = Complementary attributes (Assets type) +ExtraFieldsAssetsType = Complementary attributes (Asset type) AssetsType=Asset type AssetsTypeId=Asset type id AssetsTypeLabel=Asset type label diff --git a/htdocs/langs/en_US/banks.lang b/htdocs/langs/en_US/banks.lang index 76ec51174f0..84f011ea35e 100644 --- a/htdocs/langs/en_US/banks.lang +++ b/htdocs/langs/en_US/banks.lang @@ -98,7 +98,7 @@ BankLineConciliated=Entry reconciled Reconciled=Reconciled NotReconciled=Not reconciled CustomerInvoicePayment=Customer payment -SupplierInvoicePayment=Supplier payment +SupplierInvoicePayment=Vendor payment SubscriptionPayment=Subscription payment WithdrawalPayment=Withdrawal payment SocialContributionPayment=Social/fiscal tax payment diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang index f755aada646..1d870ced25b 100644 --- a/htdocs/langs/en_US/bills.lang +++ b/htdocs/langs/en_US/bills.lang @@ -106,7 +106,7 @@ DeleteBill=Delete invoice SearchACustomerInvoice=Search for a customer invoice SearchASupplierInvoice=Search for a vendor invoice CancelBill=Cancel an invoice -SendRemindByMail=Send reminder by EMail +SendRemindByMail=Send reminder by email DoPayment=Enter payment DoPaymentBack=Enter refund ConvertToReduc=Mark as credit available @@ -302,7 +302,7 @@ DiscountOfferedBy=Granted by DiscountStillRemaining=Discounts or credits available DiscountAlreadyCounted=Discounts or credits already consumed CustomerDiscounts=Customer discounts -SupplierDiscounts=Suppliers discounts +SupplierDiscounts=Vendors discounts BillAddress=Bill address HelpEscompte=This discount is a discount granted to customer because payment was made before term. HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loss. diff --git a/htdocs/langs/en_US/boxes.lang b/htdocs/langs/en_US/boxes.lang index bbb79f99bb0..c11e6c6e782 100644 --- a/htdocs/langs/en_US/boxes.lang +++ b/htdocs/langs/en_US/boxes.lang @@ -4,10 +4,10 @@ BoxLastRssInfos=Rss information BoxLastProducts=Latest %s products/services BoxProductsAlertStock=Stock alerts for products BoxLastProductsInContract=Latest %s contracted products/services -BoxLastSupplierBills=Latest supplier invoices +BoxLastSupplierBills=Latest vendor invoices BoxLastCustomerBills=Latest customer invoices BoxOldestUnpaidCustomerBills=Oldest unpaid customer invoices -BoxOldestUnpaidSupplierBills=Oldest unpaid supplier invoices +BoxOldestUnpaidSupplierBills=Oldest unpaid vendor invoices BoxLastProposals=Latest commercial proposals BoxLastProspects=Latest modified prospects BoxLastCustomers=Latest modified customers @@ -23,16 +23,16 @@ BoxTitleLastRssInfos=Latest %s news from %s BoxTitleLastProducts=Products/Services: last %s modified BoxTitleProductsAlertStock=Products: stock alert BoxTitleLastSuppliers=Latest %s recorded suppliers -BoxTitleLastModifiedSuppliers=Suppliers: last %s modified +BoxTitleLastModifiedSuppliers=Vendors: last %s modified BoxTitleLastModifiedCustomers=Customers: last %s modified BoxTitleLastCustomersOrProspects=Latest %s customers or prospects BoxTitleLastCustomerBills=Latest %s customer invoices -BoxTitleLastSupplierBills=Latest %s supplier invoices +BoxTitleLastSupplierBills=Latest %s vendor invoices BoxTitleLastModifiedProspects=Prospects: last %s modified BoxTitleLastModifiedMembers=Latest %s members BoxTitleLastFicheInter=Latest %s modified interventions BoxTitleOldestUnpaidCustomerBills=Customer Invoices: oldest %s unpaid -BoxTitleOldestUnpaidSupplierBills=Supplier Invoices: oldest %s unpaid +BoxTitleOldestUnpaidSupplierBills=Vendor Invoices: oldest %s unpaid BoxTitleCurrentAccounts=Open Accounts: balances BoxTitleLastModifiedContacts=Contacts/Addresses: last %s modified BoxMyLastBookmarks=Bookmarks: last %s @@ -56,25 +56,25 @@ NoRecordedOrders=No recorded customer orders NoRecordedProposals=No recorded proposals NoRecordedInvoices=No recorded customer invoices NoUnpaidCustomerBills=No unpaid customer invoices -NoUnpaidSupplierBills=No unpaid supplier invoices -NoModifiedSupplierBills=No recorded supplier invoices +NoUnpaidSupplierBills=No unpaid vendor invoices +NoModifiedSupplierBills=No recorded vendor invoices NoRecordedProducts=No recorded products/services NoRecordedProspects=No recorded prospects NoContractedProducts=No products/services contracted NoRecordedContracts=No recorded contracts NoRecordedInterventions=No recorded interventions -BoxLatestSupplierOrders=Latest supplier orders -NoSupplierOrder=No recorded supplier order +BoxLatestSupplierOrders=Latest vendor orders +NoSupplierOrder=No recorded vendor order BoxCustomersInvoicesPerMonth=Customer Invoices per month -BoxSuppliersInvoicesPerMonth=Supplier Invoices per month +BoxSuppliersInvoicesPerMonth=Vendor Invoices per month BoxCustomersOrdersPerMonth=Customer Orders per month -BoxSuppliersOrdersPerMonth=Supplier Orders per month +BoxSuppliersOrdersPerMonth=Vendor Orders per month BoxProposalsPerMonth=Proposals per month NoTooLowStockProducts=No products are under the low stock limit BoxProductDistribution=Products/Services Distribution BoxProductDistributionFor=Distribution of %s by %s -BoxTitleLastModifiedSupplierBills=Supplier Invoices: last %s modified -BoxTitleLatestModifiedSupplierOrders=Supplier Orders: last %s modified +BoxTitleLastModifiedSupplierBills=Vendor Invoices: last %s modified +BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified BoxTitleLastModifiedCustomerOrders=Customer Orders: last %s modified BoxTitleLastModifiedPropals=Latest %s modified proposals diff --git a/htdocs/langs/en_US/categories.lang b/htdocs/langs/en_US/categories.lang index 897e05bfd30..eb34e302cad 100644 --- a/htdocs/langs/en_US/categories.lang +++ b/htdocs/langs/en_US/categories.lang @@ -63,14 +63,14 @@ AccountsCategoriesShort=Accounts tags/categories ProjectsCategoriesShort=Projects tags/categories UsersCategoriesShort=Users tags/categories ThisCategoryHasNoProduct=This category does not contain any product. -ThisCategoryHasNoSupplier=This category does not contain any supplier. +ThisCategoryHasNoSupplier=This category does not contain any vendor. ThisCategoryHasNoCustomer=This category does not contain any customer. ThisCategoryHasNoMember=This category does not contain any member. ThisCategoryHasNoContact=This category does not contain any contact. ThisCategoryHasNoAccount=This category does not contain any account. ThisCategoryHasNoProject=This category does not contain any project. CategId=Tag/category id -CatSupList=List of supplier tags/categories +CatSupList=List of vendor tags/categories CatCusList=List of customer/prospect tags/categories CatProdList=List of products tags/categories CatMemberList=List of members tags/categories diff --git a/htdocs/langs/en_US/commercial.lang b/htdocs/langs/en_US/commercial.lang index 9600e5fa987..96b8abbb937 100644 --- a/htdocs/langs/en_US/commercial.lang +++ b/htdocs/langs/en_US/commercial.lang @@ -62,7 +62,7 @@ ActionAC_EMAILING=Send mass email ActionAC_COM=Send customer order by mail ActionAC_SHIP=Send shipping by mail ActionAC_SUP_ORD=Send purchase order by mail -ActionAC_SUP_INV=Send supplier invoice by mail +ActionAC_SUP_INV=Send vendor invoice by mail ActionAC_OTH=Other ActionAC_OTH_AUTO=Automatically inserted events ActionAC_MANUAL=Manually inserted events diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang index 1510e350b90..a60e2e3adfa 100644 --- a/htdocs/langs/en_US/companies.lang +++ b/htdocs/langs/en_US/companies.lang @@ -29,7 +29,7 @@ AliasNameShort=Alias Name Companies=Companies CountryIsInEEC=Country is inside the European Economic Community ThirdPartyName=Third-Party Name -ThirdPartyEmail=Third-party email +ThirdPartyEmail=Third-party Email ThirdParty=Third Party ThirdParties=Third Parties ThirdPartyProspects=Prospects @@ -37,7 +37,7 @@ ThirdPartyProspectsStats=Prospects ThirdPartyCustomers=Customers ThirdPartyCustomersStats=Customers ThirdPartyCustomersWithIdProf12=Customers with %s or %s -ThirdPartySuppliers=Suppliers +ThirdPartySuppliers=Vendors ThirdPartyType=Third-Party Type Individual=Private individual ToCreateContactWithSameName=Will automatically create a contact/address with same information as the third party under the third party. In most cases, even if your third party is a physical person, creating a third party alone is enough. @@ -69,7 +69,7 @@ Chat=Chat PhonePro=Prof. phone PhonePerso=Pers. phone PhoneMobile=Mobile -No_Email=Refuse mass e-mailings +No_Email=Refuse bulk emailings Fax=Fax Zip=Zip Code Town=City diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang index cdebceb656b..95fda9d3255 100644 --- a/htdocs/langs/en_US/compta.lang +++ b/htdocs/langs/en_US/compta.lang @@ -82,12 +82,12 @@ AccountancyTreasuryArea=Billing and payment area NewPayment=New payment Payments=Payments PaymentCustomerInvoice=Customer invoice payment -PaymentSupplierInvoice=supplier invoice payment +PaymentSupplierInvoice=vendor invoice payment PaymentSocialContribution=Social/fiscal tax payment PaymentVat=VAT payment ListPayment=List of payments ListOfCustomerPayments=List of customer payments -ListOfSupplierPayments=List of supplier payments +ListOfSupplierPayments=List of vendor payments DateStartPeriod=Date start period DateEndPeriod=Date end period newLT1Payment=New tax 2 payment @@ -113,7 +113,7 @@ ShowVatPayment=Show VAT payment TotalToPay=Total to pay BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account CustomerAccountancyCode=Customer accounting code -SupplierAccountancyCode=supplier accounting code +SupplierAccountancyCode=vendor accounting code CustomerAccountancyCodeShort=Cust. account. code SupplierAccountancyCodeShort=Sup. account. code AccountNumber=Account number @@ -220,7 +220,7 @@ LinkedOrder=Link to order Mode1=Method 1 Mode2=Method 2 CalculationRuleDesc=To calculate total VAT, there is two methods:
Method 1 is rounding vat on each line, then summing them.
Method 2 is summing all vat on each line, then rounding result.
Final result may differs from few cents. Default mode is mode %s. -CalculationRuleDescSupplier=According to supplier, choose appropriate method to apply same calculation rule and get same result expected by your supplier. +CalculationRuleDescSupplier=According to vendor, choose appropriate method to apply same calculation rule and get same result expected by your vendor. TurnoverPerProductInCommitmentAccountingNotRelevant=The report of Turnover collected per product is not available. This report is only available for turnover invoiced. TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=The report of Turnover collected per sale tax rate is not available. This report is only available for turnover invoiced. CalculationMode=Calculation mode @@ -230,8 +230,8 @@ ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (u ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accounting account on third party is not defined. -ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties -ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated supplier accounting account on third party is not defined. +ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties +ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated vendor accounting account on third party is not defined. CloneTax=Clone a social/fiscal tax ConfirmCloneTax=Confirm the clone of a social/fiscal tax CloneTaxForNextMonth=Clone it for next month diff --git a/htdocs/langs/en_US/ecm.lang b/htdocs/langs/en_US/ecm.lang index 43ddd3bf36f..369ac6dfdfa 100644 --- a/htdocs/langs/en_US/ecm.lang +++ b/htdocs/langs/en_US/ecm.lang @@ -35,7 +35,7 @@ ECMDocsByUsers=Documents linked to users ECMDocsByInterventions=Documents linked to interventions ECMDocsByExpenseReports=Documents linked to expense reports ECMDocsByHolidays=Documents linked to holidays -ECMDocsBySupplierProposals=Documents linked to supplier proposals +ECMDocsBySupplierProposals=Documents linked to vendor proposals ECMNoDirectoryYet=No directory created ShowECMSection=Show directory DeleteSection=Remove directory diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang index 3a60fbfe98d..b869847efb6 100644 --- a/htdocs/langs/en_US/errors.lang +++ b/htdocs/langs/en_US/errors.lang @@ -4,7 +4,7 @@ NoErrorCommitIsDone=No error, we commit # Errors ErrorButCommitIsDone=Errors found but we validate despite this -ErrorBadEMail=EMail %s is wrong +ErrorBadEMail=Email %s is wrong ErrorBadUrl=Url %s is wrong ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing. ErrorLoginAlreadyExists=Login %s already exists. @@ -32,9 +32,9 @@ ErrorBarCodeRequired=Barcode required ErrorCustomerCodeAlreadyUsed=Customer code already used ErrorBarCodeAlreadyUsed=Barcode already used ErrorPrefixRequired=Prefix required -ErrorBadSupplierCodeSyntax=Bad syntax for supplier code -ErrorSupplierCodeRequired=Supplier code required -ErrorSupplierCodeAlreadyUsed=Supplier code already used +ErrorBadSupplierCodeSyntax=Bad syntax for vendor code +ErrorSupplierCodeRequired=Vendor code required +ErrorSupplierCodeAlreadyUsed=Vendor code already used ErrorBadParameters=Bad parameters ErrorBadValueForParameter=Wrong value '%s' for parameter '%s' ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format) @@ -88,7 +88,7 @@ ErrorsOnXLines=%s errors found ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the file (file might be infected by a virus) ErrorSpecialCharNotAllowedForField=Special characters are not allowed for field "%s" ErrorNumRefModel=A reference exists into database (%s) and is not compatible with this numbering rule. Remove record or renamed reference to activate this module. -ErrorQtyTooLowForThisSupplier=Quantity too low for this supplier or no price defined on this product for this supplier +ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this vendor ErrorOrdersNotCreatedQtyTooLow=Some orders haven't been created because of too-low quantities ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete. ErrorBadMask=Error on mask @@ -180,7 +180,7 @@ ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In ErrorSavingChanges=An error has occurred when saving the changes ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship ErrorFileMustHaveFormat=File must have format %s -ErrorSupplierCountryIsNotDefined=Country for this supplier is not defined. Correct this first. +ErrorSupplierCountryIsNotDefined=Country for this vendor is not defined. Correct this first. ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled. ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enough for product %s to add it into a new order. ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enough for product %s to add it into a new invoice. diff --git a/htdocs/langs/en_US/install.lang b/htdocs/langs/en_US/install.lang index 05659204af5..bf382a32d62 100644 --- a/htdocs/langs/en_US/install.lang +++ b/htdocs/langs/en_US/install.lang @@ -148,7 +148,7 @@ NothingToDo=Nothing to do # upgrade MigrationFixData=Fix for denormalized data MigrationOrder=Data migration for customer's orders -MigrationSupplierOrder=Data migration for supplier's orders +MigrationSupplierOrder=Data migration for vendor's orders MigrationProposal=Data migration for commercial proposals MigrationInvoice=Data migration for customer's invoices MigrationContract=Data migration for contracts diff --git a/htdocs/langs/en_US/interventions.lang b/htdocs/langs/en_US/interventions.lang index 8b751e4a3cb..2025fb03181 100644 --- a/htdocs/langs/en_US/interventions.lang +++ b/htdocs/langs/en_US/interventions.lang @@ -30,13 +30,13 @@ InterventionClassifyUnBilled=Classify "Unbilled" InterventionClassifyDone=Classify "Done" StatusInterInvoiced=Billed SendInterventionRef=Submission of intervention %s -SendInterventionByMail=Send intervention by Email +SendInterventionByMail=Send intervention by email InterventionCreatedInDolibarr=Intervention %s created InterventionValidatedInDolibarr=Intervention %s validated InterventionModifiedInDolibarr=Intervention %s modified InterventionClassifiedBilledInDolibarr=Intervention %s set as billed InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled -InterventionSentByEMail=Intervention %s sent by EMail +InterventionSentByEMail=Intervention %s sent by email InterventionDeletedInDolibarr=Intervention %s deleted InterventionsArea=Interventions area DraftFichinter=Draft interventions diff --git a/htdocs/langs/en_US/mails.lang b/htdocs/langs/en_US/mails.lang index a7160d321eb..b055b38268a 100644 --- a/htdocs/langs/en_US/mails.lang +++ b/htdocs/langs/en_US/mails.lang @@ -15,10 +15,10 @@ MailToUsers=To user(s) MailCC=Copy to MailToCCUsers=Copy to users(s) MailCCC=Cached copy to -MailTopic=EMail topic +MailTopic=Email topic MailText=Message MailFile=Attached files -MailMessage=EMail body +MailMessage=Email body ShowEMailing=Show emailing ListOfEMailings=List of emailings NewMailing=New emailing @@ -57,7 +57,7 @@ YouCanAddYourOwnPredefindedListHere=To create your email selector module, see ht EMailTestSubstitutionReplacedByGenericValues=When using test mode, substitutions variables are replaced by generic values MailingAddFile=Attach this file NoAttachedFiles=No attached files -BadEMail=Bad value for EMail +BadEMail=Bad value for Email CloneEMailing=Clone Emailing ConfirmCloneEMailing=Are you sure you want to clone this emailing? CloneContent=Clone message @@ -68,15 +68,15 @@ SentTo=Sent to %s MailingStatusRead=Read YourMailUnsubcribeOK=The email %s is correctly unsubscribe from mailing list ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubscribe" feature -EMailSentToNRecipients=EMail sent to %s recipients. -EMailSentForNElements=EMail sent for %s elements. +EMailSentToNRecipients=Email sent to %s recipients. +EMailSentForNElements=Email sent for %s elements. XTargetsAdded=%s recipients added into target list OnlyPDFattachmentSupported=If the PDF documents were already generated for the objects to send, they will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachments in mass sending in this version). AllRecipientSelected=The recipients of the %s record selected (if their email is known). GroupEmails=Group emails OneEmailPerRecipient=One email per recipient (by default, one email per record selected) WarningIfYouCheckOneRecipientPerEmail=Warning, if you check this box, it means only one email will be sent for several different record selected, so, if your message contains substitution variables that refers to data of a record, it becomes not possible to replace them. -ResultOfMailSending=Result of mass EMail sending +ResultOfMailSending=Result of mass Email sending NbSelected=No. selected NbIgnored=No. ignored NbSent=No. sent @@ -119,8 +119,8 @@ YouCanUseCommaSeparatorForSeveralRecipients=You can use the comma separat TagCheckMail=Track mail opening TagUnsubscribe=Unsubscribe link TagSignature=Signature of sending user -EMailRecipient=Recipient EMail -TagMailtoEmail=Recipient EMail (including html "mailto:" link) +EMailRecipient=Recipient Email +TagMailtoEmail=Recipient Email (including html "mailto:" link) NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile. # Module Notifications Notifications=Notifications diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index b696ee5ba5f..838365d99fe 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -629,12 +629,12 @@ FeatureNotYetSupported=Feature not yet supported CloseWindow=Close window Response=Response Priority=Priority -SendByMail=Send by EMail +SendByMail=Send by email MailSentBy=Email sent by TextUsedInTheMessageBody=Email body SendAcknowledgementByMail=Send confirmation email SendMail=Send email -EMail=E-mail +Email=Email NoEMail=No email Email=Email AlreadyRead=Already read diff --git a/htdocs/langs/en_US/margins.lang b/htdocs/langs/en_US/margins.lang index 9c3a2b4d09c..d4545b8e75f 100644 --- a/htdocs/langs/en_US/margins.lang +++ b/htdocs/langs/en_US/margins.lang @@ -28,10 +28,10 @@ UseDiscountAsService=As a service UseDiscountOnTotal=On subtotal MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation. MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation -MargeType1=Margin on Best supplier price +MargeType1=Margin on Best vendor price MargeType2=Margin on Weighted Average Price (WAP) MargeType3=Margin on Cost Price -MarginTypeDesc=* Margin on best buying price = Selling price - Best supplier price defined on product card
* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined
* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined +MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card
* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best vendor price if WAP not yet defined
* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best vendor price if WAP not yet defined CostPrice=Cost price UnitCharges=Unit charges Charges=Charges diff --git a/htdocs/langs/en_US/members.lang b/htdocs/langs/en_US/members.lang index 47d9889cd85..d93d329ab23 100644 --- a/htdocs/langs/en_US/members.lang +++ b/htdocs/langs/en_US/members.lang @@ -67,11 +67,11 @@ Subscriptions=Subscriptions SubscriptionLate=Late SubscriptionNotReceived=Subscription never received ListOfSubscriptions=List of subscriptions -SendCardByMail=Send card by Email +SendCardByMail=Send card by email AddMember=Create member NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types" NewMemberType=New member type -WelcomeEMail=Welcome e-mail +WelcomeEMail=Welcome email SubscriptionRequired=Subscription required DeleteType=Delete VoteAllowed=Vote allowed @@ -126,14 +126,14 @@ ThisIsContentOfYourMembershipWasValidated=We want to let you know that your memb ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.

ThisIsContentOfSubscriptionReminderEmail=We want to let you know that your subscription is about to expire or has already expired (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). We hope you will renew it.

ThisIsContentOfYourCard=This is a summary of the information we have about you. Please contact us if anything is incorrect.

-DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest -DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest -DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription -DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation -DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording -DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire -DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation -DescADHERENT_MAIL_FROM=Sender EMail for automatic emails +DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the email received in case of auto-inscription of a guest +DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Email received in case of auto-inscription of a guest +DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Email template to use to send email to a member on member autosubscription +DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send email to a member on member validation +DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording +DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire +DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation +DescADHERENT_MAIL_FROM=Sender Email for automatic emails DescADHERENT_ETIQUETTE_TYPE=Format of labels page DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets DescADHERENT_CARD_TYPE=Format of cards page diff --git a/htdocs/langs/en_US/orders.lang b/htdocs/langs/en_US/orders.lang index 3eb868d340f..8097b8ba240 100644 --- a/htdocs/langs/en_US/orders.lang +++ b/htdocs/langs/en_US/orders.lang @@ -101,8 +101,8 @@ DraftSuppliersOrders=Draft purchase orders OnProcessOrders=In process orders RefOrder=Ref. order RefCustomerOrder=Ref. order for customer -RefOrderSupplier=Ref. order for supplier -RefOrderSupplierShort=Ref. order supplier +RefOrderSupplier=Ref. order for vendor +RefOrderSupplierShort=Ref. order vendor SendOrderByMail=Send order by mail ActionsOnOrder=Events on order NoArticleOfTypeProduct=No article of type 'product' so no shippable article for this order @@ -112,7 +112,7 @@ UserWithApproveOrderGrant=Users granted with "approve orders" permission. PaymentOrderRef=Payment of order %s CloneOrder=Clone order ConfirmCloneOrder=Are you sure you want to clone this order %s? -DispatchSupplierOrder=Receiving supplier order %s +DispatchSupplierOrder=Receiving vendor order %s FirstApprovalAlreadyDone=First approval already done SecondApprovalAlreadyDone=Second approval already done SupplierOrderReceivedInDolibarr=Purchase Order %s received %s @@ -127,16 +127,16 @@ TypeContact_commande_external_SHIPPING=Customer shipping contact TypeContact_commande_external_CUSTOMER=Customer contact following-up order TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up purchase order TypeContact_order_supplier_internal_SHIPPING=Representative following-up shipping -TypeContact_order_supplier_external_BILLING=Supplier invoice contact -TypeContact_order_supplier_external_SHIPPING=Supplier shipping contact -TypeContact_order_supplier_external_CUSTOMER=Supplier contact following-up order +TypeContact_order_supplier_external_BILLING=Vendor invoice contact +TypeContact_order_supplier_external_SHIPPING=Vendor shipping contact +TypeContact_order_supplier_external_CUSTOMER=Vendor contact following-up order Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined Error_OrderNotChecked=No orders to invoice selected # Order modes (how we receive order). Not the "why" are keys stored into dict.lang OrderByMail=Mail OrderByFax=Fax -OrderByEMail=EMail +OrderByEMail=Email OrderByWWW=Online OrderByPhone=Phone # Documents models diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang index 080ff89eb96..0bf32789c30 100644 --- a/htdocs/langs/en_US/other.lang +++ b/htdocs/langs/en_US/other.lang @@ -33,10 +33,10 @@ DateNextInvoiceAfterGen=Date of next invoice (after generation) Notify_ORDER_VALIDATE=Customer order validated Notify_ORDER_SENTBYMAIL=Customer order sent by mail -Notify_ORDER_SUPPLIER_SENTBYMAIL=Supplier order sent by mail -Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded -Notify_ORDER_SUPPLIER_APPROVE=Supplier order approved -Notify_ORDER_SUPPLIER_REFUSE=Supplier order refused +Notify_ORDER_SUPPLIER_SENTBYMAIL=Vendor order sent by mail +Notify_ORDER_SUPPLIER_VALIDATE=Vendor order recorded +Notify_ORDER_SUPPLIER_APPROVE=Vendor order approved +Notify_ORDER_SUPPLIER_REFUSE=Vendor order refused Notify_PROPAL_VALIDATE=Customer proposal validated Notify_PROPAL_CLOSE_SIGNED=Customer proposal closed signed Notify_PROPAL_CLOSE_REFUSED=Customer proposal closed refused @@ -51,10 +51,10 @@ Notify_BILL_UNVALIDATE=Customer invoice unvalidated Notify_BILL_PAYED=Customer invoice paid Notify_BILL_CANCEL=Customer invoice canceled Notify_BILL_SENTBYMAIL=Customer invoice sent by mail -Notify_BILL_SUPPLIER_VALIDATE=Supplier invoice validated -Notify_BILL_SUPPLIER_PAYED=Supplier invoice paid -Notify_BILL_SUPPLIER_SENTBYMAIL=Supplier invoice sent by mail -Notify_BILL_SUPPLIER_CANCELED=Supplier invoice cancelled +Notify_BILL_SUPPLIER_VALIDATE=Vendor invoice validated +Notify_BILL_SUPPLIER_PAYED=Vendor invoice paid +Notify_BILL_SUPPLIER_SENTBYMAIL=Vendor invoice sent by mail +Notify_BILL_SUPPLIER_CANCELED=Vendor invoice cancelled Notify_CONTRACT_VALIDATE=Contract validated Notify_FICHEINTER_VALIDATE=Intervention validated Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention @@ -181,15 +181,15 @@ StatsByNumberOfEntities=Statistics in number of referring entities (no. of invoi NumberOfProposals=Number of proposals NumberOfCustomerOrders=Number of customer orders NumberOfCustomerInvoices=Number of customer invoices -NumberOfSupplierProposals=Number of supplier proposals -NumberOfSupplierOrders=Number of supplier orders -NumberOfSupplierInvoices=Number of supplier invoices +NumberOfSupplierProposals=Number of vendor proposals +NumberOfSupplierOrders=Number of vendor orders +NumberOfSupplierInvoices=Number of vendor invoices NumberOfUnitsProposals=Number of units on proposals NumberOfUnitsCustomerOrders=Number of units on customer orders NumberOfUnitsCustomerInvoices=Number of units on customer invoices -NumberOfUnitsSupplierProposals=Number of units on supplier proposals -NumberOfUnitsSupplierOrders=Number of units on supplier orders -NumberOfUnitsSupplierInvoices=Number of units on supplier invoices +NumberOfUnitsSupplierProposals=Number of units on vendor proposals +NumberOfUnitsSupplierOrders=Number of units on vendor orders +NumberOfUnitsSupplierInvoices=Number of units on vendor invoices EMailTextInterventionAddedContact=A new intervention %s has been assigned to you. EMailTextInterventionValidated=The intervention %s has been validated. EMailTextInvoiceValidated=Invoice %s has been validated. diff --git a/htdocs/langs/en_US/paybox.lang b/htdocs/langs/en_US/paybox.lang index 1f3a5b0cdbe..4f2fd7e6288 100644 --- a/htdocs/langs/en_US/paybox.lang +++ b/htdocs/langs/en_US/paybox.lang @@ -29,11 +29,11 @@ AccountParameter=Account parameters UsageParameter=Usage parameters InformationToFindParameters=Help to find your %s account information PAYBOX_CGI_URL_V2=Url of Paybox CGI module for payment -VendorName=Name of supplier +VendorName=Name of vendor CSSUrlForPaymentForm=CSS style sheet url for payment form 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_PAYONLINE_SENDEMAIL=Email notification after payment attempt (success or fail) PAYBOX_PBX_SITE=Value for PBX SITE PAYBOX_PBX_RANG=Value for PBX Rang PAYBOX_PBX_IDENTIFIANT=Value for PBX ID diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang index 8dba81f3a58..bd495ae6693 100644 --- a/htdocs/langs/en_US/projects.lang +++ b/htdocs/langs/en_US/projects.lang @@ -84,8 +84,8 @@ ListProposalsAssociatedProject=List of the commercial proposals related to the p ListOrdersAssociatedProject=List of customer orders related to the project ListInvoicesAssociatedProject=List of customer invoices related to the project ListPredefinedInvoicesAssociatedProject=List of customer template invoices related to the project -ListSupplierOrdersAssociatedProject=List of supplier orders related to the project -ListSupplierInvoicesAssociatedProject=List of supplier invoices related to the project +ListSupplierOrdersAssociatedProject=List of vendor orders related to the project +ListSupplierInvoicesAssociatedProject=List of vendor invoices related to the project ListContractAssociatedProject=List of contracts related to the project ListShippingAssociatedProject=List of shippings related to the project ListFichinterAssociatedProject=List of interventions related to the project @@ -225,7 +225,7 @@ AllowToLinkFromOtherCompany=Allow to link project from other company

S LatestProjects=Latest %s projects LatestModifiedProjects=Latest %s modified projects OtherFilteredTasks=Other filtered tasks -NoAssignedTasks=No assigned tasks found (assign project/tasks the current user from the top select box to enter time on it) +NoAssignedTasks=No assigned tasks found (assign project/tasks to the current user from the top select box to enter time on it) # Comments trans AllowCommentOnTask=Allow user comments on tasks AllowCommentOnProject=Allow user comments on projects diff --git a/htdocs/langs/en_US/propal.lang b/htdocs/langs/en_US/propal.lang index abaddec403d..44da81357ef 100644 --- a/htdocs/langs/en_US/propal.lang +++ b/htdocs/langs/en_US/propal.lang @@ -83,4 +83,4 @@ DefaultModelPropalCreate=Default model creation DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced) DefaultModelPropalClosed=Default template when closing a business proposal (unbilled) ProposalCustomerSignature=Written acceptance, company stamp, date and signature -ProposalsStatisticsSuppliers=Supplier proposals statistics +ProposalsStatisticsSuppliers=Vendor proposals statistics diff --git a/htdocs/langs/en_US/sendings.lang b/htdocs/langs/en_US/sendings.lang index 188533894e1..49085d66ece 100644 --- a/htdocs/langs/en_US/sendings.lang +++ b/htdocs/langs/en_US/sendings.lang @@ -46,7 +46,7 @@ DateDeliveryPlanned=Planned date of delivery RefDeliveryReceipt=Ref delivery receipt StatusReceipt=Status delivery receipt DateReceived=Date delivery received -SendShippingByEMail=Send shipment by EMail +SendShippingByEMail=Send shipment by email SendShippingRef=Submission of shipment %s ActionsOnShipping=Events on shipment LinkToTrackYourPackage=Link to track your package diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang index bb15ffdf910..0dd0af1ec97 100644 --- a/htdocs/langs/en_US/stocks.lang +++ b/htdocs/langs/en_US/stocks.lang @@ -65,9 +65,9 @@ DeStockOnBill=Decrease real stocks on validation of customer invoice/credit note DeStockOnValidateOrder=Decrease real stocks on validation of customer order DeStockOnShipment=Decrease real stocks on shipping validation DeStockOnShipmentOnClosing=Decrease real stocks on shipping classification closed -ReStockOnBill=Increase real stocks on validation of supplier invoice/credit note +ReStockOnBill=Increase real stocks on validation of vendor invoice/credit note ReStockOnValidateOrder=Increase real stocks on purchase order approval -ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouse, after supplier order receipt of goods +ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouse, after vendor order receipt of goods OrderStatusNotReadyToDispatch=Order has not yet or no more a status that allows dispatching of products in stock warehouses. StockDiffPhysicTeoric=Explanation for difference between physical and virtual stock NoPredefinedProductToDispatch=No predefined products for this object. So no dispatching in stock is required. @@ -80,7 +80,7 @@ RealStock=Real Stock RealStockDesc=Physical/real stock is the stock currently in the warehouses. RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module): VirtualStock=Virtual stock -VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (supplier orders received, customer orders shipped etc.) +VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (vendor orders received, customer orders shipped etc.) IdWarehouse=Id warehouse DescWareHouse=Description warehouse LieuWareHouse=Localisation warehouse @@ -113,13 +113,13 @@ CurentSelectionMode=Current selection mode CurentlyUsingVirtualStock=Virtual stock CurentlyUsingPhysicalStock=Physical stock RuleForStockReplenishment=Rule for stocks replenishment -SelectProductWithNotNullQty=Select at least one product with a qty not null and a supplier +SelectProductWithNotNullQty=Select at least one product with a qty not null and a vendor AlertOnly= Alerts only WarehouseForStockDecrease=The warehouse %s will be used for stock decrease WarehouseForStockIncrease=The warehouse %s will be used for stock increase ForThisWarehouse=For this warehouse -ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create supplier orders to fill the difference. -ReplenishmentOrdersDesc=This is a list of all open supplier orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here. +ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create vendor orders to fill the difference. +ReplenishmentOrdersDesc=This is a list of all open vendor orders including predefined products. Only open orders with predefined products, so orders 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) @@ -143,11 +143,11 @@ ShowWarehouse=Show warehouse MovementCorrectStock=Stock correction for product %s MovementTransferStock=Stock transfer of product %s into another warehouse InventoryCodeShort=Inv./Mov. code -NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order +NoPendingReceptionOnSupplierOrder=No pending reception due to open vendor order ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (%s) already exists but with different eatby or sellby date (found %s but you enter %s). OpenAll=Open for all actions OpenInternal=Open only for internal actions -UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on supplier order reception +UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on vendor order reception OptionMULTIPRICESIsOn=Option "several prices per segment" is on. It means a product has several selling price so value for sell can't be calculated ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock correctly created ProductStockWarehouseUpdated=Stock limit for alert and desired optimal stock correctly updated @@ -176,7 +176,7 @@ inventoryErrorQtyAdd=Error: one quantity is less than zero inventoryMvtStock=By inventory inventoryWarningProductAlreadyExists=This product is already into list SelectCategory=Category filter -SelectFournisseur=Supplier filter +SelectFournisseur=Vendor filter inventoryOnDate=Inventory INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found diff --git a/htdocs/langs/en_US/stripe.lang b/htdocs/langs/en_US/stripe.lang index 37dfe689463..2bf1fb00849 100644 --- a/htdocs/langs/en_US/stripe.lang +++ b/htdocs/langs/en_US/stripe.lang @@ -1,6 +1,6 @@ # Dolibarr language file - Source file is en_US - stripe StripeSetup=Stripe module setup -StripeDesc=Module to offer an online payment page accepting payments with Credit/Debit card via Stripe. This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...) +StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via Stripe. This can be used to allow your customers to make ad-hoc payments or for payments related to a particular Dolibarr object (invoice, order, ...) StripeOrCBDoPayment=Pay with credit card or Stripe FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects PaymentForm=Payment form @@ -9,7 +9,7 @@ ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s. ThisIsInformationOnPayment=This is information on payment to do ToComplete=To complete YourEMail=Email to receive payment confirmation -STRIPE_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or not) +STRIPE_PAYONLINE_SENDEMAIL=Email notification after a payment attempt (success or fail) Creditor=Creditor PaymentCode=Payment code StripeDoPayment=Pay with Credit or Debit Card (Stripe) diff --git a/htdocs/langs/en_US/supplier_proposal.lang b/htdocs/langs/en_US/supplier_proposal.lang index d5b51978920..501b6d907e3 100644 --- a/htdocs/langs/en_US/supplier_proposal.lang +++ b/htdocs/langs/en_US/supplier_proposal.lang @@ -1,22 +1,22 @@ # Dolibarr language file - Source file is en_US - supplier_proposal -SupplierProposal=Supplier commercial proposals +SupplierProposal=Vendor commercial proposals supplier_proposalDESC=Manage price requests to suppliers SupplierProposalNew=New price request CommRequest=Price request CommRequests=Price requests SearchRequest=Find a request DraftRequests=Draft requests -SupplierProposalsDraft=Draft supplier proposals +SupplierProposalsDraft=Draft vendor proposals LastModifiedRequests=Latest %s modified price requests RequestsOpened=Open price requests -SupplierProposalArea=Supplier proposals area -SupplierProposalShort=Supplier proposal -SupplierProposals=Supplier proposals -SupplierProposalsShort=Supplier proposals +SupplierProposalArea=Vendor proposals area +SupplierProposalShort=Vendor proposal +SupplierProposals=Vendor proposals +SupplierProposalsShort=Vendor proposals NewAskPrice=New price request ShowSupplierProposal=Show price request AddSupplierProposal=Create a price request -SupplierProposalRefFourn=Supplier ref +SupplierProposalRefFourn=Vendor ref SupplierProposalDate=Delivery date SupplierProposalRefFournNotice=Before closing to "Accepted", think to grasp suppliers references. ConfirmValidateAsk=Are you sure you want to validate this price request under name %s? @@ -47,9 +47,9 @@ CommercialAsk=Price request DefaultModelSupplierProposalCreate=Default model creation DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted) DefaultModelSupplierProposalClosed=Default template when closing a price request (refused) -ListOfSupplierProposals=List of supplier proposal requests -ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project -SupplierProposalsToClose=Supplier proposals to close -SupplierProposalsToProcess=Supplier proposals to process +ListOfSupplierProposals=List of vendor proposal requests +ListSupplierProposalsAssociatedProject=List of vendor proposals associated with project +SupplierProposalsToClose=Vendor proposals to close +SupplierProposalsToProcess=Vendor proposals to process LastSupplierProposals=Latest %s price requests AllPriceRequests=All requests diff --git a/htdocs/langs/en_US/users.lang b/htdocs/langs/en_US/users.lang index 70ca225670d..33ebaa66edd 100644 --- a/htdocs/langs/en_US/users.lang +++ b/htdocs/langs/en_US/users.lang @@ -69,8 +69,8 @@ InternalUser=Internal user ExportDataset_user_1=Users and their properties DomainUser=Domain user %s Reactivate=Reactivate -CreateInternalUserDesc=This form allows you to create an user internal to your company/organization. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third-party's contact card. -InternalExternalDesc=An internal user is a user that is part of your company/organization.
An external user is a customer, supplier or other.

In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display) +CreateInternalUserDesc=This form allows you to create an user internal to your company/organization. To create an external user (customer, vendor, ...), use the button 'Create Dolibarr user' from third-party's contact card. +InternalExternalDesc=An internal user is a user that is part of your company/organization.
An external user is a customer, vendor or other.

In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display) PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group. Inherited=Inherited UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party) diff --git a/htdocs/langs/en_US/workflow.lang b/htdocs/langs/en_US/workflow.lang index 0927cdd5f70..ca8b5e8f4c9 100644 --- a/htdocs/langs/en_US/workflow.lang +++ b/htdocs/langs/en_US/workflow.lang @@ -13,8 +13,8 @@ descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as b descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order) descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order as billed when customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked order) descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update) -# Autoclassify supplier order -descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source supplier proposal as billed when supplier invoice is validated (and if the amount of the invoice is the same as the total amount of the linked proposal) -descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order as billed when supplier invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order) +# Autoclassify vendor order +descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked proposal) +descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order) AutomaticCreation=Automatic creation AutomaticClassification=Automatic classification