From a54dd15afb770c688b9881d3db86d7ecb10362e2 Mon Sep 17 00:00:00 2001 From: faust Date: Sat, 18 Apr 2015 00:04:09 +0200 Subject: [PATCH 1/3] fixed typos in trips.lang --- htdocs/langs/en_US/trips.lang | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/htdocs/langs/en_US/trips.lang b/htdocs/langs/en_US/trips.lang index 1c74dd3588d..aaff4cf8e96 100644 --- a/htdocs/langs/en_US/trips.lang +++ b/htdocs/langs/en_US/trips.lang @@ -7,7 +7,7 @@ TripsAndExpenses=Expenses reports TripsAndExpensesStatistics=Expense reports statistics TripCard=Expense report card AddTrip=Create expense report -ListOfTrips=List of expense report +ListOfTrips=List of expense reports ListOfFees=List of fees NewTrip=New expense report CompanyVisited=Company/foundation visited @@ -27,7 +27,7 @@ AnyOtherInThisListCanValidate=Person to inform for validation. TripSociete=Information company TripSalarie=Informations user TripNDF=Informations expense report -DeleteLine=Delete a ligne of the expense report +DeleteLine=Delete a line of the expense report ConfirmDeleteLine=Are you sure you want to delete this line ? PDFStandardExpenseReports=Standard template to generate a PDF document for expense report ExpenseReportLine=Expense report line @@ -40,7 +40,7 @@ TF_BUS=Bus TF_CAR=Car TF_PEAGE=Toll TF_ESSENCE=Fuel -TF_HOTEL=Hostel +TF_HOTEL=Hotel TF_TAXI=Taxi ErrorDoubleDeclaration=You have declared another expense report into a similar date range. @@ -56,12 +56,12 @@ ModePaiement=Payment mode Note=Note Project=Project -VALIDATOR=User to inform for approbation +VALIDATOR=User responsible for validation VALIDOR=Approved by AUTHOR=Recorded by -AUTHORPAIEMENT=Paied by +AUTHORPAIEMENT=Paid by REFUSEUR=Denied by -CANCEL_USER=Canceled by +CANCEL_USER=Deleted by MOTIF_REFUS=Reason MOTIF_CANCEL=Reason @@ -74,7 +74,7 @@ DATE_PAIEMENT=Payment date TO_PAID=Pay BROUILLONNER=Reopen -SendToValid=Sent to approve +SendToValid=Sent on approval ModifyInfoGen=Edit ValidateAndSubmit=Validate and submit for approval @@ -104,7 +104,7 @@ Synchro_Compta=NDF <-> Compte TripSynch=Synchronisation : Notes de frais <-> Compte courant TripToSynch=Notes de frais à intégrer dans la compta AucuneTripToSynch=Aucune note de frais n'est en statut "Payée". -ViewAccountSynch=Voir le compte +ViewAccountSynch=View account ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant? ndfToAccount=Note de frais - Intégration @@ -112,13 +112,13 @@ ndfToAccount=Note de frais - Intégration ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant? AccountToNdf=Note de frais - Retrait -LINE_NOT_ADDED=Ligne non ajoutée : -NO_PROJECT=Aucun projet sélectionné. -NO_DATE=Aucune date sélectionnée. -NO_PRICE=Aucun prix indiqué. +LINE_NOT_ADDED=Line not added : +NO_PROJECT=No project selected. +NO_DATE=No date selected. +NO_PRICE=No price defined. -TripForValid=à Valider -TripForPaid=à Payer -TripPaid=Payée +TripForValid=To be validated +TripForPaid=To be paid +TripPaid=Paid NoTripsToExportCSV=No expense report to export for this period. From 066e05a8ef9fe2fafd1aaa263077d7a6194a69ed Mon Sep 17 00:00:00 2001 From: faust Date: Sat, 18 Apr 2015 00:21:25 +0200 Subject: [PATCH 2/3] another typo --- htdocs/langs/en_US/trips.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/langs/en_US/trips.lang b/htdocs/langs/en_US/trips.lang index aaff4cf8e96..dabe8452332 100644 --- a/htdocs/langs/en_US/trips.lang +++ b/htdocs/langs/en_US/trips.lang @@ -93,7 +93,7 @@ ConfirmPaidTrip=Are you sure you want to change status of this expense report to CancelTrip=Cancel an expense report ConfirmCancelTrip=Are you sure you want to cancel this expense report ? -BrouillonnerTrip=Move back expense report to status "Draft"n +BrouillonnerTrip=Move back expense report to status "Draft" ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ? SaveTrip=Validate expense report From c21961c4d8b5241152dc7570e9786de8b0283bf4 Mon Sep 17 00:00:00 2001 From: faust Date: Sat, 18 Apr 2015 00:50:32 +0200 Subject: [PATCH 3/3] word order in workflow.lang --- htdocs/langs/en_US/workflow.lang | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/htdocs/langs/en_US/workflow.lang b/htdocs/langs/en_US/workflow.lang index e08c88a9170..84b245fd77c 100644 --- a/htdocs/langs/en_US/workflow.lang +++ b/htdocs/langs/en_US/workflow.lang @@ -1,11 +1,11 @@ # Dolibarr language file - Source file is en_US - admin WorkflowSetup=Workflow module setup -WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is opened (you make thing in order you want). You can activate the automatic actions that you are interesting in. -ThereIsNoWorkflowToModify=There is no workflow you can modify for module you have activated. -descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Create a customer order automatically after a commercial proposal is signed -descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Create a customer invoice automatically after a commercial proposal is signed -descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Create a customer invoice automatically after a contract is validated -descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Create a customer invoice automatically after a customer order is closed +WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is opened (you make thing in order you want). You can activate the automatic actions that you are interested in. +ThereIsNoWorkflowToModify=There is no workflow to modify for the activated module. +descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed +descWORKFLOW_PROPAL_AUTOCREATE_INVOICEAutomatically create a customer invoice after a commercial proposal is signed +descWORKFLOW_CONTRACT_AUTOCREATE_INVOICEAutomatically create a customer invoice after a contract is validated +descWORKFLOW_ORDER_AUTOCREATE_INVOICEAutomatically create a customer invoice after a customer order is closed descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer order is set to paid descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated