Skip to content

Commit

Permalink
Merge pull request #5275 from novalore/develop
Browse files Browse the repository at this point in the history
Miscellaneous typos and errors in en_US lang files
  • Loading branch information
eldy committed Jun 3, 2016
2 parents 1f65ca1 + e2ba9c7 commit b51c4ab
Show file tree
Hide file tree
Showing 27 changed files with 143 additions and 143 deletions.
2 changes: 1 addition & 1 deletion htdocs/adherents/admin/public.php
Expand Up @@ -200,7 +200,7 @@ function initfields()
print '<tr '.$bc[$var].' id="tremail"><td>';
print $langs->trans("MEMBER_PAYONLINE_SENDEMAIL");
print '</td><td align="right">';
print '<input type="text" id="MEMBER_PAYONLINE_SENDEMAIL" name="MEMBER_PAYONLINE_SENDEMAIL" size="24" value="'.(! empty($conf->global->MEMBER_PAYONLINE_SENDEMAIL)?$conf->global->MEMBER_PAYONLINE_SENDEMAIL:'').'">';
print '<input type="text" id="MEMBER_PAYONLINE_SENDEMAIL" name="MEMBER_PAYONLINE_SENDEMAIL" size="24" value="'.(! empty($conf->global->MEMBER_PAYONLINE_SENDEMAIL)?$conf->global->MEMBER_PAYONLINE_SENDEMAIL:'').'">';
print "</td></tr>\n";
}

Expand Down
8 changes: 4 additions & 4 deletions htdocs/langs/en_US/admin.lang
Expand Up @@ -993,9 +993,9 @@ Delays_MAIN_DELAY_MEMBERS=Tolerance delay (in days) before alert on delayed memb
Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance delay (in days) before alert for cheques deposit to do
Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
SetupDescription1=All parameters available in the setup area allow you to setup Dolibarr before starting using it.
SetupDescription2=The 2 most important setup steps are the 2 first ones in the left setup menu, this means Company/foundation setup page and Modules setup page:
SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because input information is used on Dolibarr displays and to modify Dolibarr behaviour (for example for features related to your country).
SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a fixed ERP/CRM but a sum of several modules, all more or less independant. It's only after activating modules you're interesting in that you will see features appeared in menus.
SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/foundation setup page and Modules setup page:
SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
SetupDescription5=Other menu entries manage optional parameters.
EventsSetup=Setup for events logs
LogEvents=Security audit events
Expand Down Expand Up @@ -1750,4 +1750,4 @@ AddModels=Add document or numbering templates
AddSubstitutions=Add keys substitutions
DetectionNotPossible=Detection not possible
UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received it is saved on database user table and will be checked on each future access)
ListOfAvailableAPIs=List of available APIs
ListOfAvailableAPIs=List of available APIs
4 changes: 2 additions & 2 deletions htdocs/langs/en_US/banks.lang
Expand Up @@ -141,9 +141,9 @@ ExportDataset_banque_1=Bank transactions and account statement
ExportDataset_banque_2=Deposit slip
TransactionOnTheOtherAccount=Transaction on the other account
TransactionWithOtherAccount=Account transfer
PaymentNumberUpdateSucceeded=Payment number updated succesfully
PaymentNumberUpdateSucceeded=Payment number updated successfully
PaymentNumberUpdateFailed=Payment number could not be updated
PaymentDateUpdateSucceeded=Payment date update succesfully
PaymentDateUpdateSucceeded=Payment date updated successfully
PaymentDateUpdateFailed=Payment date could not be updated
Transactions=Transactions
BankTransactionLine=Bank transaction
Expand Down
26 changes: 13 additions & 13 deletions htdocs/langs/en_US/bills.lang
Expand Up @@ -11,7 +11,7 @@ BillsSuppliersUnpaidForCompany=Unpaid supplier's invoices for %s
BillsLate=Late payments
BillsStatistics=Customers invoices statistics
BillsStatisticsSuppliers=Suppliers invoices statistics
DisabledBecauseNotErasable=Disabled because can not be erased
DisabledBecauseNotErasable=Disabled because cannot be erased
InvoiceStandard=Standard invoice
InvoiceStandardAsk=Standard invoice
InvoiceStandardDesc=This kind of invoice is the common invoice.
Expand Down Expand Up @@ -322,24 +322,24 @@ NextDateToExecution=Date for next invoice generation
DateLastGeneration=Date of last generation
MaxPeriodNumber=Max nb of invoice generation
NbOfGenerationDone=Nb of invoice generation already done
InvoiceAutoValidate=Automatically validate invoice
InvoiceAutoValidate=Validate invoices automatically
GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
DateIsNotEnough=Date not yet reached
DateIsNotEnough=Date not reached yet
InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
# PaymentConditions
PaymentConditionShortRECEP=Immediate
PaymentConditionRECEP=Immediate
PaymentConditionShort30D=30 days
PaymentCondition30D=30 days
PaymentConditionShort30DENDMONTH=30 days end of month
PaymentCondition30DENDMONTH=30 days end of month
PaymentConditionShort30DENDMONTH=30 days of month-end
PaymentCondition30DENDMONTH=Within 30 days following the end of the month
PaymentConditionShort60D=60 days
PaymentCondition60D=60 days
PaymentConditionShort60DENDMONTH=60 days end of month
PaymentCondition60DENDMONTH=60 days end of month
PaymentConditionShort60DENDMONTH=60 days of month-end
PaymentCondition60DENDMONTH=Within 60 days following the end of the month
PaymentConditionShortPT_DELIVERY=Delivery
PaymentConditionPT_DELIVERY=On delivery
PaymentConditionShortPT_ORDER=On order
PaymentConditionShortPT_ORDER=Order
PaymentConditionPT_ORDER=On order
PaymentConditionShortPT_5050=50-50
PaymentConditionPT_5050=50%% in advance, 50%% on delivery
Expand All @@ -360,16 +360,16 @@ PaymentTypeTIP=Interbank Payment
PaymentTypeShortTIP=Interbank Payment
PaymentTypeVAD=On line payment
PaymentTypeShortVAD=On line payment
PaymentTypeTRA=Traite
PaymentTypeShortTRA=Traite
PaymentTypeTRA=Bank draft
PaymentTypeShortTRA=Draft
PaymentTypeFAC=Factor
PaymentTypeShortFAC=Factor
BankDetails=Bank details
BankCode=Bank code
DeskCode=Desk code
BankAccountNumber=Account number
BankAccountNumberKey=Key
Residence=Domiciliation
Residence=Direct debit
IBANNumber=IBAN number
IBAN=IBAN
BIC=BIC/SWIFT
Expand Down Expand Up @@ -425,7 +425,7 @@ ExpectedToPay=Expected payment
CantRemoveConciliatedPayment=Can't remove conciliated payment
PayedByThisPayment=Paid by this payment
ClosePaidInvoicesAutomatically=Classify "Paid" all standard, situation or replacement invoices entirely paid.
ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back.
ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back.
AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remain to pay will be automatically closed to status "Paid".
ToMakePayment=Pay
ToMakePaymentBack=Pay back
Expand Down Expand Up @@ -459,7 +459,7 @@ SituationDeduction=Situation subtraction
Progress=Progress
ModifyAllLines=Modify all lines
CreateNextSituationInvoice=Create next situation
NotLastInCycle=This invoice in not the last in cycle and must not be modified.
NotLastInCycle=This invoice is not the latest in cycle and must not be modified.
DisabledBecauseNotLastInCycle=The next situation already exists.
DisabledBecauseFinal=This situation is final.
CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
Expand Down
100 changes: 50 additions & 50 deletions htdocs/langs/en_US/boxes.lang
@@ -1,69 +1,69 @@
# Dolibarr language file - Source file is en_US - boxes
BoxLastRssInfos=Rss information
BoxLastProducts=Last %s products/services
BoxLastProducts=Latest %s products/services
BoxProductsAlertStock=Products in stock alert
BoxLastProductsInContract=Last %s contracted products/services
BoxLastSupplierBills=Last supplier's invoices
BoxLastCustomerBills=Last customer's invoices
BoxOldestUnpaidCustomerBills=Oldest unpaid customer's invoices
BoxOldestUnpaidSupplierBills=Oldest unpaid supplier's invoices
BoxLastProposals=Last commercial proposals
BoxLastProspects=Last modified prospects
BoxLastCustomers=Last modified customers
BoxLastSuppliers=Last modified suppliers
BoxLastCustomerOrders=Last customer orders
BoxLastValidatedCustomerOrders=Last validated customer orders
BoxLastBooks=Last books
BoxLastActions=Last actions
BoxLastContracts=Last contracts
BoxLastContacts=Last contacts/addresses
BoxLastMembers=Last members
BoxFicheInter=Last interventions
BoxLastProductsInContract=Latest %s contracted products/services
BoxLastSupplierBills=Latest supplier invoices
BoxLastCustomerBills=Latest customer invoices
BoxOldestUnpaidCustomerBills=Oldest unpaid customer invoices
BoxOldestUnpaidSupplierBills=Oldest unpaid supplier invoices
BoxLastProposals=Latest commercial proposals
BoxLastProspects=Latest modified prospects
BoxLastCustomers=Latest modified customers
BoxLastSuppliers=Latest modified suppliers
BoxLastCustomerOrders=Latest customer orders
BoxLastValidatedCustomerOrders=Latest validated customer orders
BoxLastBooks=Latest bookmarks
BoxLastActions=Latest actions
BoxLastContracts=Latest contracts
BoxLastContacts=Latest contacts/addresses
BoxLastMembers=Latest members
BoxFicheInter=Latest interventions
BoxCurrentAccounts=Open accounts balance
BoxSalesTurnover=Sales turnover
BoxTotalUnpaidCustomerBills=Total unpaid customer's invoices
BoxTotalUnpaidSuppliersBills=Total unpaid supplier's invoices
BoxTitleLastBooks=Last %s recorded books
BoxTitleLastBooks=Latest %s recorded bookmarks
BoxTitleNbOfCustomers=Number of clients
BoxTitleLastRssInfos=Last %s news from %s
BoxTitleLastProducts=Last %s modified products/services
BoxTitleLastRssInfos=Latest %s news from %s
BoxTitleLastProducts=Latest %s modified products/services
BoxTitleProductsAlertStock=Products in stock alert
BoxTitleLastCustomerOrders=Last %s customer orders
BoxTitleLastModifiedCustomerOrders=Last %s modified customer orders
BoxTitleLastSuppliers=Last %s recorded suppliers
BoxTitleLastCustomers=Last %s recorded customers
BoxTitleLastModifiedSuppliers=Last %s modified suppliers
BoxTitleLastModifiedCustomers=Last %s modified customers
BoxTitleLastCustomersOrProspects=Last %s customers or prospects
BoxTitleLastPropals=Last %s proposals
BoxTitleLastModifiedPropals=Last %s modified proposals
BoxTitleLastCustomerBills=Last %s customer's invoices
BoxTitleLastModifiedCustomerBills=Last %s modified customer invoices
BoxTitleLastSupplierBills=Last %s supplier's invoices
BoxTitleLastModifiedSupplierBills=Last %s modified supplier invoices
BoxTitleLastModifiedProspects=Last %s modified prospects
BoxTitleLastProductsInContract=Last %s products/services in a contract
BoxTitleLastModifiedMembers=Last %s members
BoxTitleLastFicheInter=Last %s modified intervention
BoxTitleLastCustomerOrders=Latest %s customer orders
BoxTitleLastModifiedCustomerOrders=Latest %s modified customer orders
BoxTitleLastSuppliers=Latest %s recorded suppliers
BoxTitleLastCustomers=Latest %s recorded customers
BoxTitleLastModifiedSuppliers=Latest %s modified suppliers
BoxTitleLastModifiedCustomers=Latest %s modified customers
BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
BoxTitleLastPropals=Latest %s proposals
BoxTitleLastModifiedPropals=Latest %s modified proposals
BoxTitleLastCustomerBills=Latest %s customer's invoices
BoxTitleLastModifiedCustomerBills=Latest %s modified customer invoices
BoxTitleLastSupplierBills=Latest %s supplier's invoices
BoxTitleLastModifiedSupplierBills=Latest %s modified supplier invoices
BoxTitleLastModifiedProspects=Latest %s modified prospects
BoxTitleLastProductsInContract=Latest %s products/services in a contract
BoxTitleLastModifiedMembers=Latest %s members
BoxTitleLastFicheInter=Latest %s modified intervention
BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer invoices
BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier invoices
BoxTitleCurrentAccounts=Open accounts balances
BoxTitleSalesTurnover=Sales turnover
BoxTitleTotalUnpaidCustomerBills=Unpaid customer invoices
BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier invoices
BoxTitleLastModifiedContacts=Last %s modified contacts/addresses
BoxMyLastBookmarks=My last %s bookmarks
BoxTitleLastModifiedContacts=Latest %s modified contacts/addresses
BoxMyLastBookmarks=My latest %s bookmarks
BoxOldestExpiredServices=Oldest active expired services
BoxLastExpiredServices=Last %s oldest contacts with active expired services
BoxTitleLastActionsToDo=Last %s actions to do
BoxTitleLastContracts=Last %s contracts
BoxTitleLastModifiedDonations=Last %s modified donations
BoxTitleLastModifiedExpenses=Last %s modified expense reports
BoxLastExpiredServices=Latest %s oldest contacts with active expired services
BoxTitleLastActionsToDo=Latest %s actions to do
BoxTitleLastContracts=Latest %s contracts
BoxTitleLastModifiedDonations=Latest %s modified donations
BoxTitleLastModifiedExpenses=Latest %s modified expense reports
BoxGlobalActivity=Global activity (invoices, proposals, orders)
BoxGoodCustomers=Good customers
BoxTitleGoodCustomers=%s Good customers
FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Last successfull refresh date: %s
LastRefreshDate=Last refresh date
FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successfull refresh date: %s
LastRefreshDate=Latest refresh date
NoRecordedBookmarks=No bookmarks defined.
ClickToAdd=Click here to add.
NoRecordedCustomers=No recorded customers
Expand All @@ -82,8 +82,8 @@ NoContractedProducts=No products/services contracted
NoRecordedContracts=No recorded contracts
NoRecordedInterventions=No recorded interventions
BoxLatestSupplierOrders=Latest supplier orders
BoxTitleLatestSupplierOrders=Last %s supplier orders
BoxTitleLatestModifiedSupplierOrders=Last %s modified supplier orders
BoxTitleLatestSupplierOrders=Latest %s supplier orders
BoxTitleLatestModifiedSupplierOrders=Latest %s modified supplier orders
NoSupplierOrder=No recorded supplier order
BoxCustomersInvoicesPerMonth=Customer invoices per month
BoxSuppliersInvoicesPerMonth=Supplier invoices per month
Expand All @@ -96,5 +96,5 @@ BoxProductDistributionFor=Distribution of %s for %s
ForCustomersInvoices=Customers invoices
ForCustomersOrders=Customers orders
ForProposals=Proposals
LastXMonthRolling=The last %s month rolling
LastXMonthRolling=The latest %s month rolling
ChooseBoxToAdd=Add widget to your dashboard...
8 changes: 4 additions & 4 deletions htdocs/langs/en_US/commercial.lang
Expand Up @@ -35,9 +35,9 @@ ShowCustomer=Show customer
ShowProspect=Show prospect
ListOfProspects=List of prospects
ListOfCustomers=List of customers
LastDoneTasks=Last %s completed tasks
LastRecordedTasks=Last recorded tasks
LastActionsToDo=Last %s oldest actions not completed
LastDoneTasks=Latest %s completed tasks
LastRecordedTasks=Latest recorded tasks
LastActionsToDo=Oldest %s not completed actions
DoneAndToDoActionsFor=Completed and To do events for %s
DoneAndToDoActions=Completed and To do events
DoneActions=Completed events
Expand Down Expand Up @@ -94,4 +94,4 @@ StatusProsp=Prospect status
DraftPropals=Draft commercial proposals
SearchPropal=Search a commercial proposal
CommercialDashboard=Commercial summary
NoLimit=No limit
NoLimit=No limit
10 changes: 5 additions & 5 deletions htdocs/langs/en_US/companies.lang
Expand Up @@ -302,7 +302,7 @@ RequiredIfCustomer=Required if third party is a customer or prospect
RequiredIfSupplier=Required if third party is a supplier
ValidityControledByModule=Validity controled by module
ThisIsModuleRules=This is rules for this module
LastProspect=Last
LastProspect=Latest
ProspectToContact=Prospect to contact
CompanyDeleted=Company "%s" deleted from database.
ListOfContacts=List of contacts/addresses
Expand All @@ -328,7 +328,7 @@ NoContactForAnyContract=This contact is not a contact for any contract
NoContactForAnyInvoice=This contact is not a contact for any invoice
NewContact=New contact
NewContactAddress=New contact/address
LastContacts=Last contacts
LastContacts=Latest contacts
MyContacts=My contacts
Phones=Phones
Capital=Capital
Expand Down Expand Up @@ -421,7 +421,7 @@ ListSuppliersShort=List of suppliers
ListProspectsShort=List of prospects
ListCustomersShort=List of customers
ThirdPartiesArea=Third parties and contact area
LastModifiedThirdParties=Last %s modified third parties
LastModifiedThirdParties=Latest %s modified third parties
UniqueThirdParties=Total of unique third parties
InActivity=Open
ActivityCeased=Closed
Expand All @@ -441,7 +441,7 @@ ConfirmMergeThirdparties=Are you sure you want to merge this third party into th
ThirdpartiesMergeSuccess=Thirdparties have been merged
ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
SaleRepresentativeLogin=Login of sale representative
SaleRepresentativeFirstname=Firstname of sale representative
SaleRepresentativeLastname=Lastname of sale representative
SaleRepresentativeFirstname=Firstname of sales representative
SaleRepresentativeLastname=Lastname of sales representative
ModelModulesContact=Document Models of contact
ModelModulesThirdParties=Document models of third party
4 changes: 2 additions & 2 deletions htdocs/langs/en_US/compta.lang
Expand Up @@ -121,7 +121,7 @@ ErrorWrongAccountancyCodeForCompany=Bad customer accountancy code for %s
SuppliersProductsSellSalesTurnover=The generated turnover by the sales of supplier's products.
CheckReceipt=Check deposit
CheckReceiptShort=Check deposit
LastCheckReceiptShort=Last %s check receipts
LastCheckReceiptShort=Latest %s check receipts
NewCheckReceipt=New discount
NewCheckDeposit=New check deposit
NewCheckDepositOn=Create receipt for deposit on account: %s
Expand Down Expand Up @@ -225,4 +225,4 @@ BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Based on t
SameCountryCustomersWithVAT=National customers report
BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Based on the two first letters of the VAT number being the same as your own company's country code
LinkedFichinter=Link to an intervention
ImportDataset_tax_1=Import social/fiscal taxes
ImportDataset_tax_1=Import social/fiscal taxes
8 changes: 4 additions & 4 deletions htdocs/langs/en_US/contracts.lang
@@ -1,7 +1,7 @@
# Dolibarr language file - Source file is en_US - contracts
ContractsArea=Contracts area
ListOfContracts=List of contracts
LastModifiedContracts=Last %s modified contracts
LastModifiedContracts=Latest %s modified contracts
AllContracts=All contracts
ContractCard=Contract card
ContractStatus=Contract status
Expand Down Expand Up @@ -58,9 +58,9 @@ ListOfRunningContractsLines=List of running contract lines
ListOfRunningServices=List of running services
NotActivatedServices=Inactive services (among validated contracts)
BoardNotActivatedServices=Services to activate among validated contracts
LastContracts=Last %s contracts
LastActivatedServices=Last %s activated services
LastModifiedServices=Last %s modified services
LastContracts=Latest %s contracts
LastActivatedServices=Latest %s activated services
LastModifiedServices=Latest %s modified services
EditServiceLine=Edit service line
ContractStartDate=Start date
ContractEndDate=End date
Expand Down
2 changes: 1 addition & 1 deletion htdocs/langs/en_US/cron.lang
Expand Up @@ -63,7 +63,7 @@ CronHourStart= Start hour and date of job
CronEvery=Execute job each
CronObject=Instance/Object to create
CronArgs=Parameters
CronSaveSucess=Save succesfully
CronSaveSucess=Save successfully
CronNote=Comment
CronFieldMandatory=Fields %s is mandatory
CronErrEndDateStartDt=End date cannot be before start date
Expand Down
2 changes: 1 addition & 1 deletion htdocs/langs/en_US/donations.lang
Expand Up @@ -29,7 +29,7 @@ ValidPromess=Validate promise
DonationReceipt=Donation receipt
BuildDonationReceipt=Build receipt
DonationsModels=Documents models for donation receipts
LastModifiedDonations=Last %s modified donations
LastModifiedDonations=Latest %s modified donations
SearchADonation=Search a donation
DonationRecipient=Donation recipient
ThankYou=Thank You
Expand Down

0 comments on commit b51c4ab

Please sign in to comment.