diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 55bfaef9806a1b960a84fa848ee828d87b1884f5..e87d7922bda378d013a9310527dbe933f062ee88 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -49,7 +49,7 @@ UseSearchToSelectCompany=Use autocompletion fields to choose third parties (inst ActivityStateToSelectCompany= Add a filter option to show/hide thirdparties which are currently in activity or has ceased it SearchFilter=Search filters options NumberOfKeyToSearch=Nbr of characters to trigger search: %s -ViewFullDateActions=Show full dates actions in the third sheet +ViewFullDateActions=Show full dates events in the third sheet NotAvailableWhenAjaxDisabled=Not available when Ajax disabled JavascriptDisabled=JavaScript disabled UsePopupCalendar=Use popup for dates input @@ -413,7 +413,7 @@ Module2200Desc=Lending rights management Module2300Name=Menus Module2300Desc=Menu's management Module2400Name=Agenda -Module2400Desc=Actions/tasks and agenda management +Module2400Desc=Events/tasks and agenda management Module2500Name=Electronic Content Management Module2500Desc=Save and share documents Module2600Name= WebServices @@ -767,7 +767,7 @@ DelayBeforeWarning=Delay before warning DelaysBeforeWarning=Delays before warning DelaysOfToleranceBeforeWarning=Tolerance delays before warning DelaysOfToleranceDesc=This screen allows you to define the tolerated delays before an alert is reported on screen with picto %s for each late element. -DelaysOfToleranceActionsToDo=Delay tolerance (in days) before alert on planned actions not yet realised +DelaysOfToleranceActionsToDo=Delay tolerance (in days) before alert on planned events not yet realised DelaysOfToleranceOrdersToProcess=Delay tolerance (in days) before alert on orders not yet processed DelaysOfToleranceSuppliersOrdersToProcess=Delay tolerance (in days) before alert on suppliers orders not yet processed DelaysOfTolerancePropalsToClose=Delay tolerance (in days) before alert on proposals to close @@ -1244,7 +1244,7 @@ InvoiceDateUsed=Invoice date used YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Foundation), so there is no VAT options to setup. AccountancyCode=Accountancy Code ##### Agenda ##### -AgendaSetup=Actions and agenda module setup +AgendaSetup=Events and agenda module setup PasswordTogetVCalExport=Key to authorize export link PastDelayVCalExport=Do not export event older than ##### ClickToDial ##### diff --git a/htdocs/langs/en_US/agenda.lang b/htdocs/langs/en_US/agenda.lang index b831de8e4c824122867e71680afad9576f4a87e0..eafcd84db7682fec11ace85c1c77dc181a7f4b29 100644 --- a/htdocs/langs/en_US/agenda.lang +++ b/htdocs/langs/en_US/agenda.lang @@ -12,13 +12,13 @@ Events= Events ListOfActions=List of events Location=Location EventOnFullDay=Event on full day -SearchAnAction= Search an action/task +SearchAnAction= Search an event/task MenuToDoActions= All incomplete events MenuDoneActions= All terminated events MenuToDoMyActions= My incomplete events MenuDoneMyActions= My terminated events ListOfEvents= List of Dolibarr events -ActionsAskedBy=Events recorded by +ActionsAskedBy=Events reported by ActionsToDoBy=Events affected to ActionsDoneBy=Events done by AllMyActions= All my events/tasks @@ -29,7 +29,7 @@ ViewDay=Day view ViewWeek=Week view ViewWithPredefinedFilters= View with predefined filters AutoActions= Automatic filling of agenda -AgendaAutoActionDesc= Define here events for which you want Dolibarr to create automatically an action in agenda. If nothing is checked (by default), only manual actions will be included in agenda. +AgendaAutoActionDesc= Define here events for which you want Dolibarr to create automatically an event in agenda. If nothing is checked (by default), only manual actions will be included in agenda. AgendaSetupOtherDesc= This page provides options to allow export of your Dolibarr events into an external calendar (thunderbird, google calendar, ...) AgendaExtSitesDesc=This page allows to declare external sources of calendars to see their events into Dolibarr agenda. ActionsEvents= Events for which Dolibarr will create an action in agenda automatically diff --git a/htdocs/langs/en_US/commercial.lang b/htdocs/langs/en_US/commercial.lang index 07667ed4a150b07411668f627886f53f52af27a4..95a3287915e3cb9acc7bf8840b2713cbe151a929 100644 --- a/htdocs/langs/en_US/commercial.lang +++ b/htdocs/langs/en_US/commercial.lang @@ -8,22 +8,22 @@ Customer=Customer Customers=Customers Prospect=Prospect Prospects=Prospects -DeleteAction=Delete an action/task -NewAction=New action/task -AddAction=Add action/task -AddAnAction=Add an action/task -AddActionRendezVous=Add a Rendezvous task +DeleteAction=Delete an event/task +NewAction=New event/task +AddAction=Add event/task +AddAnAction=Add an event/task +AddActionRendezVous=Add a Rendez-vous event Rendez-Vous=Rendezvous -ConfirmDeleteAction=Are you sure you want to delete this task ? -CardAction=Action card +ConfirmDeleteAction=Are you sure you want to delete this event/task ? +CardAction=Event card PercentDone=Percentage complete ActionOnCompany=Task about company ActionOnContact=Task about contact TaskRDV=Meetings TaskRDVWith=Meeting with %s ShowTask=Show task -ShowAction=Show action -ActionsReport=Actions report +ShowAction=Show event +ActionsReport=Events report SalesRepresentative=Sales representative SalesRepresentatives=Sales representatives SalesRepresentativeFollowUp=Sales representative (follow-up) @@ -49,22 +49,22 @@ SendOrderRef=Send order %s StatusNotApplicable=Not applicable StatusActionToDo=To do StatusActionDone=Complete -MyActionsAsked=Actions I have recorded -MyActionsToDo=Actions I have to do -MyActionsDone=Actions affected to me +MyActionsAsked=Events I have recorded +MyActionsToDo=Events I have to do +MyActionsDone=Events affected to me StatusActionInProcess=In process -TasksHistoryForThisContact=Actions for this contact +TasksHistoryForThisContact=Events for this contact LastProspectDoNotContact=Do not contact LastProspectNeverContacted=Never contacted LastProspectToContact=To contact LastProspectContactInProcess=Contact in process LastProspectContactDone=Contact done -DateActionPlanned=Date action planned for -DateActionDone=Date action done -ActionAskedBy=Action asked by -ActionAffectedTo=Action affected to -ActionDoneBy=Action done by -ActionUserAsk=Recorded by +DateActionPlanned=Date event planned for +DateActionDone=Date event done +ActionAskedBy=Event reported by +ActionAffectedTo=Event affected to +ActionDoneBy=Event done by +ActionUserAsk=Reported by ErrorStatusCantBeZeroIfStarted=If field '<b>Date done</b>' is filled, action is started (or finished), so field '<b>Status</b>' can't be 0%%. ActionAC_TEL=Phone call ActionAC_FAX=Send fax diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index 73c0b56a8c8569a125d70cb9b9bb91180bf56a22..167dae2d2be7f16119ea08eda972bfda9cc00b76 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -109,8 +109,8 @@ Disabled=Disabled Add=Add AddLink=Add link Update=Update -AddActionToDo=Add action to do -AddActionDone=Add action done +AddActionToDo=Add event to do +AddActionDone=Add event done Close=Close Close2=Close Confirm=Confirm @@ -176,7 +176,7 @@ Description=Description Designation=Description Model=Model DefaultModel=Default model -Action=Action +Action=Event About=About Number=Number NumberByMonth=Number by month @@ -317,8 +317,8 @@ RefPayment=Ref. payment CommercialProposals=Commercial proposals Comment=Comment Comments=Comments -ActionsToDo=Actions to do -ActionsDone=Actions done +ActionsToDo=Events to do +ActionsDone=Events done ActionsToDoShort=To do ActionsRunningshort=Started ActionsDoneShort=Done @@ -328,8 +328,8 @@ ActionRunningShort=Started ActionDoneShort=Finished CompanyFoundation=Company/Foundation ContactsForCompany=Contacts/adresses for this third party -ActionsOnCompany=Actions about this third party -NActions=%s actions +ActionsOnCompany=Events about this third party +NActions=%s events NActionsLate=%s late Filter=Filter RemoveFilter=Remove filter diff --git a/htdocs/langs/en_US/orders.lang b/htdocs/langs/en_US/orders.lang index 57f6ffb7de9639ee2d7c88a42fcc3ba7d691b296..0ce6f1462f6916c0316a97d531a607f3b0e907ff 100644 --- a/htdocs/langs/en_US/orders.lang +++ b/htdocs/langs/en_US/orders.lang @@ -99,7 +99,7 @@ RefCustomerOrder=Ref. customer order CustomerOrder=Customer order RefCustomerOrderShort=Ref. cust. order SendOrderByMail=Send order by mail -ActionsOnOrder=Actions on order +ActionsOnOrder=Events on order NoArticleOfTypeProduct=No article of type 'product' so no shippable article for this order OrderMode=Order method AuthorRequest=Request author diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang index 0fc1d175c08081063d268461cfc87e5c45e1f412..ead787d3d841886522fdc112a559cff8d9cfbb17 100644 --- a/htdocs/langs/en_US/projects.lang +++ b/htdocs/langs/en_US/projects.lang @@ -71,7 +71,7 @@ ConfirmCloseAProject=Are you sure you want to close this project ? ReOpenAProject=Open project ConfirmReOpenAProject=Are you sure you want to re-open this project ? ProjectContact=Project contacts -ActionsOnProject=Actions on project +ActionsOnProject=Events on project YouAreNotContactOfProject=You are not a contact of this private project DeleteATimeSpent=Delete time spent ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent ? diff --git a/htdocs/langs/en_US/propal.lang b/htdocs/langs/en_US/propal.lang index 7beda932e108fccf0fd9b4abd1001f4c81698bfc..ac4e125eeb5b090e66d4c4b7ab2fce555b99083d 100644 --- a/htdocs/langs/en_US/propal.lang +++ b/htdocs/langs/en_US/propal.lang @@ -52,7 +52,7 @@ PropalStatusBilledShort=Billed PropalsToClose=Commercial proposals to close PropalsToBill=Signed commercial proposals to bill ListOfProposals=List of commercial proposals -ActionsOnPropal=Actions on proposal +ActionsOnPropal=Events on proposal NoOpenedPropals=No opened commercial proposals NoOtherOpenedPropals=No other opened commercial proposals RefProposal=Commercial proposal ref diff --git a/htdocs/langs/en_US/sendings.lang b/htdocs/langs/en_US/sendings.lang index 03be27c2d7b3396d3420bdb3cd55ff7012fff7f8..de1af6be401f73c54652c390dea2850deae60c0a 100644 --- a/htdocs/langs/en_US/sendings.lang +++ b/htdocs/langs/en_US/sendings.lang @@ -50,9 +50,9 @@ WarningNoQtyLeftToSend=Warning, no products waiting to be shipped. StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated DateDeliveryPlanned=Planed date of delivery DateReceived=Date delivery received -SendShippingByEMail=Send shipping by EMail -SendShippingRef=Send shipping %s -ActionsOnShipping=Acions on shipping +SendShippingByEMail=Send shipment by EMail +SendShippingRef=Send shipment %s +ActionsOnShipping=Events on shipment LinkToTrackYourPackage=Link to track your package ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the order card.