From f4f2db33f014669edd2df550d4f65b308e9076af Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 17 Jul 2012 15:30:52 +0200 Subject: [PATCH] Better translation Conflicts: htdocs/langs/en_US/workflow.lang htdocs/langs/fr_FR/workflow.lang --- htdocs/langs/en_US/orders.lang | 3 ++- htdocs/langs/en_US/workflow.lang | 4 ++-- htdocs/langs/fr_FR/orders.lang | 3 ++- htdocs/langs/fr_FR/workflow.lang | 4 ++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/htdocs/langs/en_US/orders.lang b/htdocs/langs/en_US/orders.lang index a244c69aef0..67482d8e763 100644 --- a/htdocs/langs/en_US/orders.lang +++ b/htdocs/langs/en_US/orders.lang @@ -89,7 +89,8 @@ ConfirmUnvalidateOrder=Are you sure you want to restore order %s to draft ConfirmCancelOrder=Are you sure you want to cancel this order ? ConfirmMakeOrder=Are you sure you want to confirm you made this order on %s ? GenerateBill=Generate invoice -ClassifyBilled=Classify "Billed" +ClassifyShipped=Classify delivered +ClassifyBilled=Classify billed ComptaCard=Accountancy card DraftOrders=Draft orders RelatedOrders=Related orders diff --git a/htdocs/langs/en_US/workflow.lang b/htdocs/langs/en_US/workflow.lang index c910cccc184..0913a2910b2 100644 --- a/htdocs/langs/en_US/workflow.lang +++ b/htdocs/langs/en_US/workflow.lang @@ -7,5 +7,5 @@ descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Create a customer order automatically after 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 -descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify billed the original proposal along with a customer order -descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify billed originals customer orders along with a customer invoice +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 to billed when customer invoice is set to paid diff --git a/htdocs/langs/fr_FR/orders.lang b/htdocs/langs/fr_FR/orders.lang index a3c140aa2d6..d53f6a38305 100644 --- a/htdocs/langs/fr_FR/orders.lang +++ b/htdocs/langs/fr_FR/orders.lang @@ -89,7 +89,8 @@ ConfirmUnvalidateOrder=Êtes-vous sûr de vouloir restaurer la commande %s%s ? GenerateBill=Facturer -ClassifyBilled=Classer "Facturée" +ClassifyShipped=Classer délivrée +ClassifyBilled=Classer facturée ComptaCard=Fiche compta DraftOrders=Commandes brouillons RelatedOrders=Commandes rattachées diff --git a/htdocs/langs/fr_FR/workflow.lang b/htdocs/langs/fr_FR/workflow.lang index 0702c0aebc3..274511dbd18 100644 --- a/htdocs/langs/fr_FR/workflow.lang +++ b/htdocs/langs/fr_FR/workflow.lang @@ -7,5 +7,5 @@ descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Créer une commande client automatiquement descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Créer une facture client automatiquement à la signature d'une proposition commerciale descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Créer une facture client automatiquement à la validation d'un contrat descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Créer une facture client automatiquement à la cloture d'une commande client -descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classer facturée la proposition commerciale d'origine en même temps que la commande -descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classer facturée la ou les commandes clients d'origine en même temps que la facture +descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classer facturée la proposition commerciale source quand la commande client dérivée est classée à payée +descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classer facturée la ou les commandes clients source quand la facture client dérivée est classée à payée