lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2020-01-10 19:51:26 +01:00
commit e03bff87e5
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/langs/en_US/agenda.lang
View File

@ -60,7 +60,7 @@ MemberSubscriptionModifiedInDolibarr=Subscription %s for member %s modified
MemberSubscriptionDeletedInDolibarr=Subscription %s for member %s deleted MemberSubscriptionDeletedInDolibarr=Subscription %s for member %s deleted
ShipmentValidatedInDolibarr=Shipment %s validated ShipmentValidatedInDolibarr=Shipment %s validated
ShipmentClassifyClosedInDolibarr=Shipment %s classified billed ShipmentClassifyClosedInDolibarr=Shipment %s classified billed
ShipmentUnClassifyCloseddInDolibarr=Shipment %s classified reopened ShipmentUnClassifyCloseddInDolibarr=Shipment %s classified re-open
ShipmentBackToDraftInDolibarr=Shipment %s go back to draft status ShipmentBackToDraftInDolibarr=Shipment %s go back to draft status
ShipmentDeletedInDolibarr=Shipment %s deleted ShipmentDeletedInDolibarr=Shipment %s deleted
OrderCreatedInDolibarr=Order %s created OrderCreatedInDolibarr=Order %s created

2
htdocs/langs/en_US/banks.lang
View File

@ -154,7 +154,7 @@ RejectCheck=Check returned
ConfirmRejectCheck=Are you sure you want to mark this check as rejected? ConfirmRejectCheck=Are you sure you want to mark this check as rejected?
RejectCheckDate=Date the check was returned RejectCheckDate=Date the check was returned
CheckRejected=Check returned CheckRejected=Check returned
CheckRejectedAndInvoicesReopened=Check returned and invoices reopened CheckRejectedAndInvoicesReopened=Check returned and invoices re-open
BankAccountModelModule=Document templates for bank accounts BankAccountModelModule=Document templates for bank accounts
DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only. DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
DocumentModelBan=Template to print a page with BAN information. DocumentModelBan=Template to print a page with BAN information.

2
htdocs/langs/en_US/main.lang
View File

@ -471,7 +471,7 @@ TotalDuration=Total duration
Summary=Summary Summary=Summary
DolibarrStateBoard=Database Statistics DolibarrStateBoard=Database Statistics
DolibarrWorkBoard=Open Items DolibarrWorkBoard=Open Items
NoOpenedElementToProcess=No opened element to process NoOpenedElementToProcess=No open element to process
Available=Available Available=Available
NotYetAvailable=Not yet available NotYetAvailable=Not yet available
NotAvailable=Not available NotAvailable=Not available

2
htdocs/langs/en_US/orders.lang
View File

@ -69,7 +69,7 @@ ValidateOrder=Validate order
UnvalidateOrder=Unvalidate order UnvalidateOrder=Unvalidate order
DeleteOrder=Delete order DeleteOrder=Delete order
CancelOrder=Cancel order CancelOrder=Cancel order
OrderReopened= Order %s Reopened OrderReopened= Order %s re-open
AddOrder=Create order AddOrder=Create order
AddPurchaseOrder=Create purchase order AddPurchaseOrder=Create purchase order
AddToDraftOrders=Add to draft order AddToDraftOrders=Add to draft order

2
htdocs/langs/en_US/projects.lang
View File

@ -77,7 +77,7 @@ MyProjectsArea=My projects Area
DurationEffective=Effective duration DurationEffective=Effective duration
ProgressDeclared=Declared progress ProgressDeclared=Declared progress
TaskProgressSummary=Task progress TaskProgressSummary=Task progress
CurentlyOpenedTasks=Curently opened tasks CurentlyOpenedTasks=Curently open tasks
TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
ProgressCalculated=Calculated progress ProgressCalculated=Calculated progress

2
htdocs/langs/en_US/propal.lang
View File

@ -28,7 +28,7 @@ ShowPropal=Show proposal
PropalsDraft=Drafts PropalsDraft=Drafts
PropalsOpened=Open PropalsOpened=Open
PropalStatusDraft=Draft (needs to be validated) PropalStatusDraft=Draft (needs to be validated)
PropalStatusValidated=Validated (proposal is opened) PropalStatusValidated=Validated (proposal is open)
PropalStatusSigned=Signed (needs billing) PropalStatusSigned=Signed (needs billing)
PropalStatusNotSigned=Not signed (closed) PropalStatusNotSigned=Not signed (closed)
PropalStatusBilled=Billed PropalStatusBilled=Billed

2
htdocs/langs/en_US/ticket.lang
View File

@ -241,7 +241,7 @@ NoLogForThisTicket=No log for this ticket yet
TicketLogAssignedTo=Ticket %s assigned to %s TicketLogAssignedTo=Ticket %s assigned to %s
TicketLogPropertyChanged=Ticket %s modified: classification from %s to %s TicketLogPropertyChanged=Ticket %s modified: classification from %s to %s
TicketLogClosedBy=Ticket %s closed by %s TicketLogClosedBy=Ticket %s closed by %s
TicketLogReopen=Ticket %s re-opened TicketLogReopen=Ticket %s re-open
# #
# Public pages # Public pages