Merge lp:~openerp-community/openobject-addons/trunk-membership-trans-fr into lp:openobject-addons

[LudoRA]

Just update the french language

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

ligne 77: je mettrais des guillemets autour des de colonnes (sinon on a l'impression d'une faute d'accord)

ligne 426: s/Vous avez saisit/Vous avez saisi/

ligne 466: s/être définit/être définie/

review: Needs Fixing

[Olivier Dony (Odoo) (odo-openerp)]

Hi,

Thanks a lot for your contributions to the french translation, and thanks Alexandre for the spellchecking.

The process for improving translation is described in our documentation[1] and works via Launchpad's translation system, not with merge proposals/patches. This allows a proper review process by the corresponding translation team, without bypassing the translation flow.

It should be easy enough for you to simply upload the modified .po file through the Launchpad upload system here (see also the "Batch translation" note in our documentation), via this URL:
  https://translations.launchpad.net/openobject-addons/trunk/+pots/membership/fr/+upload
(Launchpad will take it as if you had been entering all those translations one by one on translations.launchpad.net)

In the mean time I will mark this merge proposal as rejected, not because it's not good but because your updated .po file should be uploaded directly on Launchpad's translation system.

I hope my explanations are clear enough...

Thanks! :-)

[1] http://doc.openerp.com/v6.1/contribute/07_improving_translations.html

[LudoRA (tenshi20)]

Hi!

Le 23/11/2012 10:29, Olivier Dony (OpenERP) a écrit :
> It should be easy enough for you to simply upload the modified .po file through the Launchpad upload system here (see also the "Batch translation" note in our documentation), via this URL:
> https://translations.launchpad.net/openobject-addons/trunk/+pots/membership/fr/+upload
> (Launchpad will take it as if you had been entering all those translations one by one on translations.launchpad.net)
>
I looked at this option, but didn't found it.
The link you give to me retrun: Not allowed here

Can you give me a solution to do this in the good way?

Thanks.

Ludo

[Numérigraphe (numerigraphe)]

Hi,
Indeed that's not very practical for translation reviews.
And I suppose uploading the files will not allow for a review on LP translations either, they'll probably be directly validated.

A few extra remarks:
- "#" : please translate as "Nb." or "N°" according to context
- please add accents on capitals where they a re missing (example : "État" not "Etat")
- membre libre = membre gratuit ?

Anyway, it's a very useful contribution so I'll add you in the team, but be aware that this implies you must adhere to the rules of the team - and they're a bit strict. It becomes your sacred duty to review other translators' suggestions and help them when you can.
http://pad.openerp.com/p/french-translation-guidelines has it all written down I think.

Unmerged revisions

8096. By LudoRA on 2012-11-22

[TRANS] membership update for fr_FR language

=== modified file 'membership/i18n/fr.po'
--- membership/i18n/fr.po	2012-10-30 05:37:00 +0000
+++ membership/i18n/fr.po	2012-11-22 07:55:24 +0000
@@ -1,15 +1,16 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* membership
+# 	* membership
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-01-21 20:48+0000\n"
-"Last-Translator: LudoRA <Unknown>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-11-22 06:35+0000\n"
+"PO-Revision-Date: 2012-11-22 08:51+0100\n"
+"Last-Translator: Ludovic CHEVALIER <[e-mail]>\n"
 "Language-Team: \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -35,6 +36,11 @@
 
 #. module: membership
 #: view:report.membership:0
+msgid "This will display waiting, invoiced and total pending columns"
+msgstr "Ceci va afficher les colonnes en attente, facturées, et totales"
+
+#. module: membership
+#: view:report.membership:0
 #: view:res.partner:0
 msgid "Group By..."
 msgstr "Grouper par ..."
@@ -77,6 +83,14 @@
 msgstr "Société"
 
 #. module: membership
+#: selection:membership.membership_line,state:0
+#: selection:report.membership,membership_state:0
+#: field:res.partner,free_member:0
+#: selection:res.partner,membership_state:0
+msgid "Free Member"
+msgstr "Membre Libre"
+
+#. module: membership
 #: view:res.partner:0
 msgid "Ending Date Of Membership"
 msgstr "Date de fin de l'adhésion"
@@ -87,6 +101,18 @@
 msgstr "Date de fin"
 
 #. module: membership
+#: field:res.partner,membership_stop:0
+msgid "Membership End Date"
+msgstr "Date de fin d'adhésion"
+
+#. module: membership
+#: view:report.membership:0
+#: field:report.membership,user_id:0
+#: view:res.partner:0
+msgid "Salesperson"
+msgstr "Vendeur"
+
+#. module: membership
 #: model:process.transition,name:membership.process_transition_waitingtoinvoice0
 msgid "Waiting to invoice"
 msgstr "En attente de facturation"
@@ -94,7 +120,7 @@
 #. module: membership
 #: view:report.membership:0
 msgid "This will display paid, old and total earned columns"
-msgstr ""
+msgstr "Ceci va afficher les colonnes payé, ancien, et totalement gagné"
 
 #. module: membership
 #: view:res.partner:0
@@ -109,9 +135,9 @@
 msgstr "Non membre"
 
 #. module: membership
-#: model:product.template,name:membership.membership_2_product_template
-msgid "Basic Membership"
-msgstr "Adhésion de base"
+#: view:product.product:0
+msgid "Taxes"
+msgstr "Taxes"
 
 #. module: membership
 #: view:res.partner:0
@@ -119,9 +145,11 @@
 msgstr "Tous les membres"
 
 #. module: membership
-#: field:res.partner,membership_stop:0
-msgid "Stop membership date"
-msgstr "Date de fin d'adhésion"
+#: code:addons/membership/membership.py:410
+#: code:addons/membership/membership.py:413
+#, python-format
+msgid "Error!"
+msgstr "Erreur !"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_producttomember0
@@ -134,21 +162,11 @@
 msgstr "Adhérer"
 
 #. module: membership
-#: field:res.partner,associate_member:0
-msgid "Associate member"
-msgstr "Membre associé"
-
-#. module: membership
 #: model:process.node,note:membership.process_node_associatedmember0
 msgid "Member is associated."
 msgstr "Le membre est associé"
 
 #. module: membership
-#: view:report.membership:0
-msgid "   Month   "
-msgstr "   Mois   "
-
-#. module: membership
 #: field:report.membership,tot_pending:0
 msgid "Pending Amount"
 msgstr "Montant en attente"
@@ -164,16 +182,6 @@
 msgstr "Partenaires fournisseurs"
 
 #. module: membership
-#: field:report.membership,num_invoiced:0
-msgid "# Invoiced"
-msgstr "# Facturés"
-
-#. module: membership
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr "Structure de communication BBA invalide !"
-
-#. module: membership
 #: model:ir.actions.act_window,name:membership.action_report_membership_tree
 #: model:ir.ui.menu,name:membership.menu_report_membership
 msgid "Members Analysis"
@@ -212,11 +220,6 @@
 msgstr "Partenaires clients"
 
 #. module: membership
-#: view:res.partner:0
-msgid "Partners"
-msgstr "Partenaires"
-
-#. module: membership
 #: field:membership.membership_line,date_from:0
 msgid "From"
 msgstr "De"
@@ -227,72 +230,24 @@
 msgstr "Erreur, ce produit d'adhésion est expiré"
 
 #. module: membership
-#: help:res.partner,membership_state:0
-msgid ""
-"It indicates the membership state.\n"
-"                    -Non Member: A member who has not applied for any "
-"membership.\n"
-"                    -Cancelled Member: A member who has cancelled his "
-"membership.\n"
-"                    -Old Member: A member whose membership date has "
-"expired.\n"
-"                    -Waiting Member: A member who has applied for the "
-"membership and whose invoice is going to be created.\n"
-"                    -Invoiced Member: A member whose invoice has been "
-"created.\n"
-"                    -Paid Member: A member who has paid the membership "
-"amount."
-msgstr ""
-"Ceci indique l'état de l'adhésion.\n"
-"                   - Non Membre : un membre qui n'a fait aucune demande "
-"d'adhésion.\n"
-"                   - Membre annulé : un membre qui a annulé son adhésion.\n"
-"                   - Vieux membre : un membre dont la date d'adhésion a "
-"expiré.\n"
-"                   - Membre en attente : un membre qui a fait une demande "
-"d'adhésion pour laquelle la facture va être créée.\n"
-"                   - Membre facturé : un membre pour lequel la facture a été "
-"créée.\n"
-"                   - Membre payé : un membre qui a payé le montant de "
-"l'adhésion."
-
-#. module: membership
 #: model:process.transition.action,name:membership.process_transition_action_create0
 msgid "Create"
 msgstr "Créer"
 
 #. module: membership
-#: view:product.product:0
-msgid "Membership products"
-msgstr "Produits d'adhésion"
-
-#. module: membership
 #: model:ir.model,name:membership.model_membership_membership_line
 msgid "Member line"
 msgstr "Ligne de Membres"
 
 #. module: membership
 #: help:report.membership,date_from:0
-#: field:res.partner,membership_start:0
 msgid "Start membership date"
 msgstr "Date de début d'adhésion"
 
 #. module: membership
-#: view:report.membership:0
-msgid "Events created in current month"
-msgstr "Événements créés ce mois"
-
-#. module: membership
-#: view:report.membership:0
-msgid "This will display waiting, invoiced and total pending columns"
-msgstr ""
-
-#. module: membership
-#: code:addons/membership/membership.py:410
-#: code:addons/membership/membership.py:413
-#, python-format
-msgid "Error !"
-msgstr "Erreur !"
+#: field:res.partner,membership_cancel:0
+msgid "Cancel Membership Date"
+msgstr "Date d'annulation de l'adhésion"
 
 #. module: membership
 #: model:process.node,name:membership.process_node_paidmember0
@@ -300,28 +255,14 @@
 msgstr "Membre payé"
 
 #. module: membership
-#: view:report.membership:0
-msgid "    Month-1    "
-msgstr "    Mois -1    "
-
-#. module: membership
-#: view:report.membership:0
-msgid "Events created in last month"
-msgstr "Événements créés le mois dernier"
-
-#. module: membership
 #: field:report.membership,num_waiting:0
 msgid "# Waiting"
 msgstr "Nb. en attente"
 
 #. module: membership
-#: view:report.membership:0
-msgid "Events created in current year"
-msgstr "Événements créés cette année"
-
-#. module: membership
 #: model:ir.actions.act_window,name:membership.action_membership_members
 #: model:ir.ui.menu,name:membership.menu_members
+#: model:ir.ui.menu,name:membership.menu_membership
 #: view:res.partner:0
 msgid "Members"
 msgstr "Membres"
@@ -342,21 +283,17 @@
 msgstr "Juillet"
 
 #. module: membership
-#: model:product.template,name:membership.membership_0_product_template
-msgid "Golden Membership"
-msgstr "Adhésion Or"
+#: field:report.membership,num_invoiced:0
+msgid "# Invoiced"
+msgstr "# Facturés"
 
 #. module: membership
 #: help:res.partner,associate_member:0
-msgid ""
-"A member with whom you want to associate your membership.It will consider "
-"the membership state of the associated member."
-msgstr ""
-"Un membre auquel vous voulez associer votre adhésion. Cela prendra en compte "
-"l'état de l'adhésion du membre associé."
+msgid "A member with whom you want to associate your membership.It will consider the membership state of the associated member."
+msgstr "Un membre auquel vous voulez associer votre adhésion. Cela prendra en compte l'état de l'adhésion du membre associé."
 
 #. module: membership
-#: field:membership.membership_line,membership_id:0
+#: view:product.product:0
 #: view:report.membership:0
 #: field:report.membership,membership_id:0
 msgid "Membership Product"
@@ -384,9 +321,14 @@
 msgstr "Date jusqu'à laquelle l'adhésion reste active."
 
 #. module: membership
-#: field:res.partner,membership_cancel:0
-msgid "Cancel membership date"
-msgstr "Annuler la date d'adhésion"
+#: view:product.product:0
+msgid "Membership products"
+msgstr "Produits d'adhésion"
+
+#. module: membership
+#: field:res.partner,membership_state:0
+msgid "Current Membership Status"
+msgstr "État actuel de l'adhésion"
 
 #. module: membership
 #: field:membership.membership_line,date:0
@@ -394,11 +336,6 @@
 msgstr "Date d'adhésion"
 
 #. module: membership
-#: help:res.partner,free_member:0
-msgid "Select if you want to give membership free of cost."
-msgstr "Sélectionnez ceci si vous voulez donner l'adhésion gratuitement."
-
-#. module: membership
 #: model:process.node,name:membership.process_node_setassociation0
 msgid "Set association"
 msgstr "Définir l'association"
@@ -419,11 +356,6 @@
 msgstr "La facture d'adhésion a été payée."
 
 #. module: membership
-#: model:ir.model,name:membership.model_product_template
-msgid "Product Template"
-msgstr "Modèle de produit"
-
-#. module: membership
 #: selection:report.membership,month:0
 msgid "September"
 msgstr "Septembre"
@@ -439,36 +371,6 @@
 msgstr "Ligne de facuration"
 
 #. module: membership
-#: help:membership.membership_line,state:0
-msgid ""
-"It indicates the membership state.\n"
-"                        -Non Member: A member who has not applied for any "
-"membership.\n"
-"                        -Cancelled Member: A member who has cancelled his "
-"membership.\n"
-"                        -Old Member: A member whose membership date has "
-"expired.\n"
-"                        -Waiting Member: A member who has applied for the "
-"membership and whose invoice is going to be created.\n"
-"                        -Invoiced Member: A member whose invoice has been "
-"created.\n"
-"                        -Paid Member: A member who has paid the membership "
-"amount."
-msgstr ""
-"Ceci indique l'état de l'adhésion.\n"
-"                   - Non Membre : un membre qui n'a fait aucune demande "
-"d'adhésion.\n"
-"                   - Membre annulé : un membre qui a annulé son adhésion.\n"
-"                   - Vieux membre : un membre dont la date d'adhésion a "
-"expiré.\n"
-"                   - Membre en attente : un membre qui a fait une demande "
-"d'adhésion pour laquelle la facture va être créée.\n"
-"                   - Membre facturé : un membre pour lequel la facture a été "
-"créée.\n"
-"                   - Membre payé : un membre qui a payé le montant de "
-"l'adhésion."
-
-#. module: membership
 #: view:report.membership:0
 #: field:report.membership,month:0
 msgid "Month"
@@ -486,13 +388,9 @@
 msgstr "Le partenaire est membre gratuitement."
 
 #. module: membership
-#: model:product.pricelist,name:membership.list1m
-msgid "Member Sale Pricelist"
-msgstr "Liste de Prix de Vente Membre"
-
-#. module: membership
 #: field:report.membership,associate_member_id:0
 #: view:res.partner:0
+#: field:res.partner,associate_member:0
 msgid "Associate Member"
 msgstr "Membre associé"
 
@@ -514,13 +412,6 @@
 msgstr "Facture de l'adhésion"
 
 #. module: membership
-#: view:report.membership:0
-#: field:report.membership,user_id:0
-#: view:res.partner:0
-msgid "Salesman"
-msgstr "Vendeur"
-
-#. module: membership
 #: model:process.node,note:membership.process_node_membershipproduct0
 msgid "Define membership product."
 msgstr "Définir un produit d'adhésion"
@@ -531,24 +422,14 @@
 msgstr "Catégorie"
 
 #. module: membership
-#: selection:membership.membership_line,state:0
-#: selection:report.membership,membership_state:0
-#: selection:res.partner,membership_state:0
-msgid "Free Member"
-msgstr "Membre Libre"
-
-#. module: membership
-#: model:product.pricelist.version,name:membership.ver1m
-msgid "Member Sale Pricelist Version"
-msgstr "Version membre de la liste de prix de vente"
-
-#. module: membership
-#: constraint:product.template:0
-msgid ""
-"Error: The default UOM and the purchase UOM must be in the same category."
-msgstr ""
-"Erreur: l'UdM par défaut et l'UdM d'achat doivent appartenir à la même "
-"catégorie."
+#: constraint:product.product:0
+msgid "You provided an invalid \"EAN13 Barcode\" reference. You may use the \"Internal Reference\" field instead."
+msgstr "Vous avez saisit une référence de \"Code barre EAN13\" invalide. Vous pouvez utiliser le champ \"Référence Interne\" à la place."
+
+#. module: membership
+#: view:res.partner:0
+msgid "Contacts"
+msgstr "Contacts"
 
 #. module: membership
 #: view:report.membership:0
@@ -571,9 +452,9 @@
 msgstr "Membre associé"
 
 #. module: membership
-#: view:product.product:0
-msgid "Accounting Info"
-msgstr "Informations comptables"
+#: field:membership.membership_line,state:0
+msgid "Membership Status"
+msgstr "État de l'adhésion"
 
 #. module: membership
 #: help:report.membership,date_to:0
@@ -586,6 +467,11 @@
 msgstr "Clients"
 
 #. module: membership
+#: view:membership.invoice:0
+msgid "or"
+msgstr "ou"
+
+#. module: membership
 #: selection:report.membership,month:0
 msgid "August"
 msgstr "Août"
@@ -598,20 +484,19 @@
 msgstr "Produits d'adhésion"
 
 #. module: membership
+#: sql_constraint:product.product:0
+msgid "Error ! Ending Date cannot be set before Beginning Date."
+msgstr "Erreur! La date de fin de peut pas être définit avant la date de début."
+
+#. module: membership
 #: selection:report.membership,month:0
 msgid "June"
 msgstr "Juin"
 
 #. module: membership
-#: model:ir.ui.menu,name:membership.menu_membership
-#: field:membership.invoice,product_id:0
-#: view:product.product:0
-#: field:product.product,membership:0
-#: view:report.membership:0
-#: view:res.partner:0
-#: field:res.partner,member_lines:0
-msgid "Membership"
-msgstr "Adhésion"
+#: help:product.product,membership:0
+msgid "Check if the product is eligible for membership."
+msgstr "Cochez si ce produit est un produit d'adhésion."
 
 #. module: membership
 #: selection:membership.membership_line,state:0
@@ -649,24 +534,28 @@
 msgstr "Novembre"
 
 #. module: membership
-#: help:product.product,membership:0
-msgid "Select if a product is a membership product."
-msgstr "Sélectionnez ceci si le produit est un produit d'adhésion."
-
-#. module: membership
-#: field:membership.membership_line,state:0
-msgid "Membership State"
-msgstr "Etat de l'adhésion"
-
-#. module: membership
 #: selection:report.membership,month:0
 msgid "October"
 msgstr "Octobre"
 
 #. module: membership
-#: view:product.product:0
-msgid "Sale Description"
-msgstr "Description de vente"
+#: help:res.partner,membership_state:0
+msgid ""
+"It indicates the membership state.\n"
+"                    -Non Member: A partner who has not applied for any membership.\n"
+"                    -Cancelled Member: A member who has cancelled his membership.\n"
+"                    -Old Member: A member whose membership date has expired.\n"
+"                    -Waiting Member: A member who has applied for the membership and whose invoice is going to be created.\n"
+"                    -Invoiced Member: A member whose invoice has been created.\n"
+"                    -Paying member: A member who has paid the membership fee."
+msgstr ""
+"Ceci indique l'état de l'adhésion.\n"
+"                   - Non Membre : Un partenaire qui n'a fait aucune demande d'adhésion.\n"
+"                   - Membre annulé : Un membre qui a annulé son adhésion.\n"
+"                   - Ancien membre : Un membre dont la date d'adhésion a expirée.\n"
+"                   - Membre en attente : Un membre qui a fait une demande d'adhésion pour laquelle la facture va être créée.\n"
+"                   - Membre facturé : Un membre pour lequel la facture a été créée.\n"
+"                   - Membre payé : Un membre qui a payé le montant de l'adhésion."
 
 #. module: membership
 #: selection:report.membership,month:0
@@ -679,16 +568,12 @@
 msgstr "Adhésion"
 
 #. module: membership
+#: field:membership.membership_line,member_price:0
 #: view:product.product:0
 msgid "Membership Fee"
 msgstr "Frais d'adhésion"
 
 #. module: membership
-#: field:res.partner,membership_amount:0
-msgid "Membership amount"
-msgstr "Montant de l'adhésion"
-
-#. module: membership
 #: help:res.partner,membership_amount:0
 msgid "The price negotiated by the partner"
 msgstr "Prix négocié par le partenaire"
@@ -718,14 +603,27 @@
 #. module: membership
 #: view:report.membership:0
 #: field:report.membership,membership_state:0
-#: field:res.partner,membership_state:0
 msgid "Current Membership State"
 msgstr "État actuel de l'adhésion"
 
 #. module: membership
-#: view:product.product:0
-msgid "General"
-msgstr "Général"
+#: help:membership.membership_line,state:0
+msgid ""
+"It indicates the membership status.\n"
+"                        -Non Member: A member who has not applied for any membership.\n"
+"                        -Cancelled Member: A member who has cancelled his membership.\n"
+"                        -Old Member: A member whose membership date has expired.\n"
+"                        -Waiting Member: A member who has applied for the membership and whose invoice is going to be created.\n"
+"                        -Invoiced Member: A member whose invoice has been created.\n"
+"                        -Paid Member: A member who has paid the membership amount."
+msgstr ""
+"Ceci indique l'état de l'adhésion.\n"
+"                   - Non Membre : Un partenaire qui n'a fait aucune demande d'adhésion.\n"
+"                   - Membre annulé : Un membre qui a annulé son adhésion.\n"
+"                   - Vieux membre : Un membre dont la date d'adhésion a expirée.\n"
+"                   - Membre en attente : Un membre qui a fait une demande d'adhésion pour laquelle la facture va être créée.\n"
+"                   - Membre facturé : Un membre pour lequel la facture a été créée.\n"
+"                   - Membre payé : Un membre qui a payé le montant de l'adhésion."
 
 #. module: membership
 #: model:process.transition,note:membership.process_transition_waitingtoinvoice0
@@ -745,8 +643,8 @@
 
 #. module: membership
 #: view:membership.invoice:0
-msgid "Close"
-msgstr "Fermer"
+msgid "Cancel"
+msgstr "Annuler"
 
 #. module: membership
 #: view:res.partner:0
@@ -764,27 +662,19 @@
 msgstr "Ligne de Facture"
 
 #. module: membership
-#: view:product.product:0
-msgid "Categorization"
-msgstr "Catégorisation"
-
-#. module: membership
 #: model:process.node,note:membership.process_node_waitingmember0
 msgid "Draft invoice for membership."
 msgstr "Facture brouillon pour adhésion."
 
 #. module: membership
 #: field:membership.invoice,member_price:0
-#: field:membership.membership_line,member_price:0
-#: model:product.price.type,name:membership.product_price_type_memberprice
-#: field:product.template,member_price:0
 msgid "Member Price"
 msgstr "Prix Membre"
 
 #. module: membership
 #: view:product.product:0
-msgid "Purchase Description"
-msgstr "Description d'achat"
+msgid "Membership Duration"
+msgstr "Durée de l'adhésion"
 
 #. module: membership
 #: model:ir.model,name:membership.model_product_product
@@ -792,29 +682,40 @@
 msgstr "Produit"
 
 #. module: membership
-#: view:product.product:0
-msgid "Description"
-msgstr "Description"
-
-#. module: membership
-#: field:res.partner,free_member:0
-msgid "Free member"
-msgstr "Membre Libre"
-
-#. module: membership
 #: selection:report.membership,month:0
 msgid "May"
 msgstr "Mai"
 
 #. module: membership
-#: model:product.template,name:membership.membership_1_product_template
-msgid "Silver Membership"
-msgstr "Adhésion Argent"
-
-#. module: membership
-#: view:product.product:0
-msgid "Sale Taxes"
-msgstr "Taxes à la vente"
+#: field:membership.invoice,product_id:0
+#: field:membership.membership_line,membership_id:0
+#: view:product.product:0
+#: field:product.product,membership:0
+#: view:report.membership:0
+#: view:res.partner:0
+#: field:res.partner,member_lines:0
+msgid "Membership"
+msgstr "Adhésion"
+
+#. module: membership
+#: view:product.product:0
+msgid "-"
+msgstr "-"
+
+#. module: membership
+#: field:res.partner,membership_start:0
+msgid "Membership Start Date"
+msgstr "Date de début d'adhésion"
+
+#. module: membership
+#: help:res.partner,free_member:0
+msgid "Select if you want to give free membership."
+msgstr "Sélectionnez ceci si vous voulez offrir l'adhésion."
+
+#. module: membership
+#: field:res.partner,membership_amount:0
+msgid "Membership Amount"
+msgstr "Montant de l'adhésion"
 
 #. module: membership
 #: field:report.membership,date_to:0
@@ -875,8 +776,7 @@
 #. module: membership
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
-"Erreur ! Vous ne pouvez pas créer des membres associés de manière récursive."
+msgstr "Erreur ! Vous ne pouvez pas créer des membres associés de manière récursive."
 
 #. module: membership
 #: selection:membership.membership_line,state:0
@@ -886,7 +786,7 @@
 msgstr "Adhésion annulée"
 
 #. module: membership
-#: constraint:product.product:0
+#: constraint:res.partner:0
 msgid "Error: Invalid ean code"
 msgstr "Erreur: code EAN invalide"
 
@@ -901,6 +801,84 @@
 msgid "Revenue Done"
 msgstr "Revenu final"
 
+#~ msgid "Basic Membership"
+#~ msgstr "Adhésion de base"
+
+#~ msgid "Stop membership date"
+#~ msgstr "Date de fin d'adhésion"
+
+#~ msgid "Associate member"
+#~ msgstr "Membre associé"
+
+#~ msgid "   Month   "
+#~ msgstr "   Mois   "
+
+#~ msgid "Invalid BBA Structured Communication !"
+#~ msgstr "Structure de communication BBA invalide !"
+
+#~ msgid "Partners"
+#~ msgstr "Partenaires"
+
+#~ msgid "Events created in current month"
+#~ msgstr "Événements créés ce mois"
+
+#~ msgid "    Month-1    "
+#~ msgstr "    Mois -1    "
+
+#~ msgid "Events created in last month"
+#~ msgstr "Événements créés le mois dernier"
+
+#~ msgid "Events created in current year"
+#~ msgstr "Événements créés cette année"
+
+#~ msgid "Golden Membership"
+#~ msgstr "Adhésion Or"
+
+#~ msgid "Product Template"
+#~ msgstr "Modèle de produit"
+
+#~ msgid "Member Sale Pricelist"
+#~ msgstr "Liste de Prix de Vente Membre"
+
+#~ msgid "Member Sale Pricelist Version"
+#~ msgstr "Version membre de la liste de prix de vente"
+
+#~ msgid ""
+#~ "Error: The default UOM and the purchase UOM must be in the same category."
+#~ msgstr ""
+#~ "Erreur: l'UdM par défaut et l'UdM d'achat doivent appartenir à la même "
+#~ "catégorie."
+
+#~ msgid "Accounting Info"
+#~ msgstr "Informations comptables"
+
+#~ msgid "Select if a product is a membership product."
+#~ msgstr "Sélectionnez ceci si le produit est un produit d'adhésion."
+
+#~ msgid "Sale Description"
+#~ msgstr "Description de vente"
+
+#~ msgid "General"
+#~ msgstr "Général"
+
+#~ msgid "Close"
+#~ msgstr "Fermer"
+
+#~ msgid "Categorization"
+#~ msgstr "Catégorisation"
+
+#~ msgid "Purchase Description"
+#~ msgstr "Description d'achat"
+
+#~ msgid "Description"
+#~ msgstr "Description"
+
+#~ msgid "Free member"
+#~ msgstr "Membre Libre"
+
+#~ msgid "Silver Membership"
+#~ msgstr "Adhésion Argent"
+
 #~ msgid "Currency"
 #~ msgstr "Devise"
 
@@ -958,9 +936,6 @@
 #~ msgid "Future members"
 #~ msgstr "Membres Futures"
 
-#~ msgid "Cancel"
-#~ msgstr "Annuler"
-
 #~ msgid "Associated members"
 #~ msgstr "Membres Associés"
 
@@ -970,8 +945,8 @@
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
-#~ "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
-#~ "spéciaux !"
+#~ "Le nom de l'objet doit commencer avec x_ et ne pas contenir de "
+#~ "charactères spéciaux !"
 
 #~ msgid "Canceled Member"
 #~ msgstr "Membre Annulé"
@@ -1008,7 +983,8 @@
 
 #~ msgid ""
 #~ "\n"
-#~ "This module allows you to manage all operations for managing memberships.\n"
+#~ "This module allows you to manage all operations for managing "
+#~ "memberships.\n"
 #~ "It supports different kind of members:\n"
 #~ "* Free member\n"
 #~ "* Associated member (ex: a group subscribe for a membership for all\n"
@@ -1032,5 +1008,6 @@
 #~ "\n"
 #~ "Il est intégré avec les ventes et la comptabilité pour vous permettre de "
 #~ "facturer \n"
-#~ "et d'envoyer les propositions de renouvellement d'adhésion automatiquement.\n"
+#~ "et d'envoyer les propositions de renouvellement d'adhésion "
+#~ "automatiquement.\n"
 #~ "    "

=== modified file 'membership/i18n/membership.pot'
--- membership/i18n/membership.pot	2012-02-08 01:08:30 +0000
+++ membership/i18n/membership.pot	2012-11-22 07:55:24 +0000
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.1rc1\n"
+"Project-Id-Version: OpenERP Server 7.0alpha\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-02-08 00:36+0000\n"
+"POT-Creation-Date: 2012-11-22 06:35+0000\n"
+"PO-Revision-Date: 2012-11-22 06:35+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -34,6 +34,11 @@
 
 #. module: membership
 #: view:report.membership:0
+msgid "This will display waiting, invoiced and total pending columns"
+msgstr ""
+
+#. module: membership
+#: view:report.membership:0
 #: view:res.partner:0
 msgid "Group By..."
 msgstr ""
@@ -76,6 +81,14 @@
 msgstr ""
 
 #. module: membership
+#: selection:membership.membership_line,state:0
+#: selection:report.membership,membership_state:0
+#: field:res.partner,free_member:0
+#: selection:res.partner,membership_state:0
+msgid "Free Member"
+msgstr ""
+
+#. module: membership
 #: view:res.partner:0
 msgid "Ending Date Of Membership"
 msgstr ""
@@ -86,6 +99,18 @@
 msgstr ""
 
 #. module: membership
+#: field:res.partner,membership_stop:0
+msgid "Membership End Date"
+msgstr ""
+
+#. module: membership
+#: view:report.membership:0
+#: field:report.membership,user_id:0
+#: view:res.partner:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: membership
 #: model:process.transition,name:membership.process_transition_waitingtoinvoice0
 msgid "Waiting to invoice"
 msgstr ""
@@ -108,8 +133,8 @@
 msgstr ""
 
 #. module: membership
-#: model:product.template,name:membership.membership_2_product_template
-msgid "Basic Membership"
+#: view:product.product:0
+msgid "Taxes"
 msgstr ""
 
 #. module: membership
@@ -118,8 +143,10 @@
 msgstr ""
 
 #. module: membership
-#: field:res.partner,membership_stop:0
-msgid "Stop membership date"
+#: code:addons/membership/membership.py:410
+#: code:addons/membership/membership.py:413
+#, python-format
+msgid "Error!"
 msgstr ""
 
 #. module: membership
@@ -133,21 +160,11 @@
 msgstr ""
 
 #. module: membership
-#: field:res.partner,associate_member:0
-msgid "Associate member"
-msgstr ""
-
-#. module: membership
 #: model:process.node,note:membership.process_node_associatedmember0
 msgid "Member is associated."
 msgstr ""
 
 #. module: membership
-#: view:report.membership:0
-msgid "   Month   "
-msgstr ""
-
-#. module: membership
 #: field:report.membership,tot_pending:0
 msgid "Pending Amount"
 msgstr ""
@@ -163,16 +180,6 @@
 msgstr ""
 
 #. module: membership
-#: field:report.membership,num_invoiced:0
-msgid "# Invoiced"
-msgstr ""
-
-#. module: membership
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: membership
 #: model:ir.actions.act_window,name:membership.action_report_membership_tree
 #: model:ir.ui.menu,name:membership.menu_report_membership
 msgid "Members Analysis"
@@ -211,11 +218,6 @@
 msgstr ""
 
 #. module: membership
-#: view:res.partner:0
-msgid "Partners"
-msgstr ""
-
-#. module: membership
 #: field:membership.membership_line,date_from:0
 msgid "From"
 msgstr ""
@@ -226,52 +228,23 @@
 msgstr ""
 
 #. module: membership
-#: help:res.partner,membership_state:0
-msgid "It indicates the membership state.\n"
-"                    -Non Member: A member who has not applied for any membership.\n"
-"                    -Cancelled Member: A member who has cancelled his membership.\n"
-"                    -Old Member: A member whose membership date has expired.\n"
-"                    -Waiting Member: A member who has applied for the membership and whose invoice is going to be created.\n"
-"                    -Invoiced Member: A member whose invoice has been created.\n"
-"                    -Paid Member: A member who has paid the membership amount."
-msgstr ""
-
-#. module: membership
 #: model:process.transition.action,name:membership.process_transition_action_create0
 msgid "Create"
 msgstr ""
 
 #. module: membership
-#: view:product.product:0
-msgid "Membership products"
-msgstr ""
-
-#. module: membership
 #: model:ir.model,name:membership.model_membership_membership_line
 msgid "Member line"
 msgstr ""
 
 #. module: membership
 #: help:report.membership,date_from:0
-#: field:res.partner,membership_start:0
 msgid "Start membership date"
 msgstr ""
 
 #. module: membership
-#: view:report.membership:0
-msgid "Events created in current month"
-msgstr ""
-
-#. module: membership
-#: view:report.membership:0
-msgid "This will display waiting, invoiced and total pending columns"
-msgstr ""
-
-#. module: membership
-#: code:addons/membership/membership.py:410
-#: code:addons/membership/membership.py:413
-#, python-format
-msgid "Error !"
+#: field:res.partner,membership_cancel:0
+msgid "Cancel Membership Date"
 msgstr ""
 
 #. module: membership
@@ -280,28 +253,14 @@
 msgstr ""
 
 #. module: membership
-#: view:report.membership:0
-msgid "    Month-1    "
-msgstr ""
-
-#. module: membership
-#: view:report.membership:0
-msgid "Events created in last month"
-msgstr ""
-
-#. module: membership
 #: field:report.membership,num_waiting:0
 msgid "# Waiting"
 msgstr ""
 
 #. module: membership
-#: view:report.membership:0
-msgid "Events created in current year"
-msgstr ""
-
-#. module: membership
 #: model:ir.actions.act_window,name:membership.action_membership_members
 #: model:ir.ui.menu,name:membership.menu_members
+#: model:ir.ui.menu,name:membership.menu_membership
 #: view:res.partner:0
 msgid "Members"
 msgstr ""
@@ -322,8 +281,8 @@
 msgstr ""
 
 #. module: membership
-#: model:product.template,name:membership.membership_0_product_template
-msgid "Golden Membership"
+#: field:report.membership,num_invoiced:0
+msgid "# Invoiced"
 msgstr ""
 
 #. module: membership
@@ -332,7 +291,7 @@
 msgstr ""
 
 #. module: membership
-#: field:membership.membership_line,membership_id:0
+#: view:product.product:0
 #: view:report.membership:0
 #: field:report.membership,membership_id:0
 msgid "Membership Product"
@@ -360,8 +319,13 @@
 msgstr ""
 
 #. module: membership
-#: field:res.partner,membership_cancel:0
-msgid "Cancel membership date"
+#: view:product.product:0
+msgid "Membership products"
+msgstr ""
+
+#. module: membership
+#: field:res.partner,membership_state:0
+msgid "Current Membership Status"
 msgstr ""
 
 #. module: membership
@@ -370,11 +334,6 @@
 msgstr ""
 
 #. module: membership
-#: help:res.partner,free_member:0
-msgid "Select if you want to give membership free of cost."
-msgstr ""
-
-#. module: membership
 #: model:process.node,name:membership.process_node_setassociation0
 msgid "Set association"
 msgstr ""
@@ -395,11 +354,6 @@
 msgstr ""
 
 #. module: membership
-#: model:ir.model,name:membership.model_product_template
-msgid "Product Template"
-msgstr ""
-
-#. module: membership
 #: selection:report.membership,month:0
 msgid "September"
 msgstr ""
@@ -415,17 +369,6 @@
 msgstr ""
 
 #. module: membership
-#: help:membership.membership_line,state:0
-msgid "It indicates the membership state.\n"
-"                        -Non Member: A member who has not applied for any membership.\n"
-"                        -Cancelled Member: A member who has cancelled his membership.\n"
-"                        -Old Member: A member whose membership date has expired.\n"
-"                        -Waiting Member: A member who has applied for the membership and whose invoice is going to be created.\n"
-"                        -Invoiced Member: A member whose invoice has been created.\n"
-"                        -Paid Member: A member who has paid the membership amount."
-msgstr ""
-
-#. module: membership
 #: view:report.membership:0
 #: field:report.membership,month:0
 msgid "Month"
@@ -443,13 +386,9 @@
 msgstr ""
 
 #. module: membership
-#: model:product.pricelist,name:membership.list1m
-msgid "Member Sale Pricelist"
-msgstr ""
-
-#. module: membership
 #: field:report.membership,associate_member_id:0
 #: view:res.partner:0
+#: field:res.partner,associate_member:0
 msgid "Associate Member"
 msgstr ""
 
@@ -471,13 +410,6 @@
 msgstr ""
 
 #. module: membership
-#: view:report.membership:0
-#: field:report.membership,user_id:0
-#: view:res.partner:0
-msgid "Salesman"
-msgstr ""
-
-#. module: membership
 #: model:process.node,note:membership.process_node_membershipproduct0
 msgid "Define membership product."
 msgstr ""
@@ -488,20 +420,13 @@
 msgstr ""
 
 #. module: membership
-#: selection:membership.membership_line,state:0
-#: selection:report.membership,membership_state:0
-#: selection:res.partner,membership_state:0
-msgid "Free Member"
-msgstr ""
-
-#. module: membership
-#: model:product.pricelist.version,name:membership.ver1m
-msgid "Member Sale Pricelist Version"
-msgstr ""
-
-#. module: membership
-#: constraint:product.template:0
-msgid "Error: The default UOM and the purchase UOM must be in the same category."
+#: constraint:product.product:0
+msgid "You provided an invalid \"EAN13 Barcode\" reference. You may use the \"Internal Reference\" field instead."
+msgstr ""
+
+#. module: membership
+#: view:res.partner:0
+msgid "Contacts"
 msgstr ""
 
 #. module: membership
@@ -525,8 +450,8 @@
 msgstr ""
 
 #. module: membership
-#: view:product.product:0
-msgid "Accounting Info"
+#: field:membership.membership_line,state:0
+msgid "Membership Status"
 msgstr ""
 
 #. module: membership
@@ -540,6 +465,11 @@
 msgstr ""
 
 #. module: membership
+#: view:membership.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: membership
 #: selection:report.membership,month:0
 msgid "August"
 msgstr ""
@@ -552,19 +482,18 @@
 msgstr ""
 
 #. module: membership
+#: sql_constraint:product.product:0
+msgid "Error ! Ending Date cannot be set before Beginning Date."
+msgstr ""
+
+#. module: membership
 #: selection:report.membership,month:0
 msgid "June"
 msgstr ""
 
 #. module: membership
-#: model:ir.ui.menu,name:membership.menu_membership
-#: field:membership.invoice,product_id:0
-#: view:product.product:0
-#: field:product.product,membership:0
-#: view:report.membership:0
-#: view:res.partner:0
-#: field:res.partner,member_lines:0
-msgid "Membership"
+#: help:product.product,membership:0
+msgid "Check if the product is eligible for membership."
 msgstr ""
 
 #. module: membership
@@ -603,23 +532,19 @@
 msgstr ""
 
 #. module: membership
-#: help:product.product,membership:0
-msgid "Select if a product is a membership product."
-msgstr ""
-
-#. module: membership
-#: field:membership.membership_line,state:0
-msgid "Membership State"
-msgstr ""
-
-#. module: membership
 #: selection:report.membership,month:0
 msgid "October"
 msgstr ""
 
 #. module: membership
-#: view:product.product:0
-msgid "Sale Description"
+#: help:res.partner,membership_state:0
+msgid "It indicates the membership state.\n"
+"                    -Non Member: A partner who has not applied for any membership.\n"
+"                    -Cancelled Member: A member who has cancelled his membership.\n"
+"                    -Old Member: A member whose membership date has expired.\n"
+"                    -Waiting Member: A member who has applied for the membership and whose invoice is going to be created.\n"
+"                    -Invoiced Member: A member whose invoice has been created.\n"
+"                    -Paying member: A member who has paid the membership fee."
 msgstr ""
 
 #. module: membership
@@ -633,16 +558,12 @@
 msgstr ""
 
 #. module: membership
+#: field:membership.membership_line,member_price:0
 #: view:product.product:0
 msgid "Membership Fee"
 msgstr ""
 
 #. module: membership
-#: field:res.partner,membership_amount:0
-msgid "Membership amount"
-msgstr ""
-
-#. module: membership
 #: help:res.partner,membership_amount:0
 msgid "The price negotiated by the partner"
 msgstr ""
@@ -672,13 +593,18 @@
 #. module: membership
 #: view:report.membership:0
 #: field:report.membership,membership_state:0
-#: field:res.partner,membership_state:0
 msgid "Current Membership State"
 msgstr ""
 
 #. module: membership
-#: view:product.product:0
-msgid "General"
+#: help:membership.membership_line,state:0
+msgid "It indicates the membership status.\n"
+"                        -Non Member: A member who has not applied for any membership.\n"
+"                        -Cancelled Member: A member who has cancelled his membership.\n"
+"                        -Old Member: A member whose membership date has expired.\n"
+"                        -Waiting Member: A member who has applied for the membership and whose invoice is going to be created.\n"
+"                        -Invoiced Member: A member whose invoice has been created.\n"
+"                        -Paid Member: A member who has paid the membership amount."
 msgstr ""
 
 #. module: membership
@@ -699,7 +625,7 @@
 
 #. module: membership
 #: view:membership.invoice:0
-msgid "Close"
+msgid "Cancel"
 msgstr ""
 
 #. module: membership
@@ -718,26 +644,18 @@
 msgstr ""
 
 #. module: membership
-#: view:product.product:0
-msgid "Categorization"
-msgstr ""
-
-#. module: membership
 #: model:process.node,note:membership.process_node_waitingmember0
 msgid "Draft invoice for membership."
 msgstr ""
 
 #. module: membership
 #: field:membership.invoice,member_price:0
-#: field:membership.membership_line,member_price:0
-#: model:product.price.type,name:membership.product_price_type_memberprice
-#: field:product.template,member_price:0
 msgid "Member Price"
 msgstr ""
 
 #. module: membership
 #: view:product.product:0
-msgid "Purchase Description"
+msgid "Membership Duration"
 msgstr ""
 
 #. module: membership
@@ -746,28 +664,39 @@
 msgstr ""
 
 #. module: membership
-#: view:product.product:0
-msgid "Description"
-msgstr ""
-
-#. module: membership
-#: field:res.partner,free_member:0
-msgid "Free member"
-msgstr ""
-
-#. module: membership
 #: selection:report.membership,month:0
 msgid "May"
 msgstr ""
 
 #. module: membership
-#: model:product.template,name:membership.membership_1_product_template
-msgid "Silver Membership"
-msgstr ""
-
-#. module: membership
-#: view:product.product:0
-msgid "Sale Taxes"
+#: field:membership.invoice,product_id:0
+#: field:membership.membership_line,membership_id:0
+#: view:product.product:0
+#: field:product.product,membership:0
+#: view:report.membership:0
+#: view:res.partner:0
+#: field:res.partner,member_lines:0
+msgid "Membership"
+msgstr ""
+
+#. module: membership
+#: view:product.product:0
+msgid "-"
+msgstr ""
+
+#. module: membership
+#: field:res.partner,membership_start:0
+msgid "Membership Start Date"
+msgstr ""
+
+#. module: membership
+#: help:res.partner,free_member:0
+msgid "Select if you want to give free membership."
+msgstr ""
+
+#. module: membership
+#: field:res.partner,membership_amount:0
+msgid "Membership Amount"
 msgstr ""
 
 #. module: membership
@@ -839,7 +768,7 @@
 msgstr ""
 
 #. module: membership
-#: constraint:product.product:0
+#: constraint:res.partner:0
 msgid "Error: Invalid ean code"
 msgstr ""