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

Proposed by LudoRA
Status: Rejected
Rejected by: Olivier Dony (Odoo)
Proposed branch: lp:~openerp-community/openobject-addons/trunk-mail-trans-fr
Merge into: lp:openobject-addons
Diff against target: 416 lines (+93/-70)
1 file modified
mail/i18n/fr.po (+93/-70)
To merge this branch: bzr merge lp:~openerp-community/openobject-addons/trunk-mail-trans-fr
Reviewer Review Type Date Requested Status
Olivier Dony (Odoo) process Disapprove
Alexandre Fayolle - camptocamp (community) Needs Fixing
Review via email: mp+135455@code.launchpad.net

Description of the change

Just adding tanslation for untranslate term for french language.

To post a comment you must log in.
Revision history for this message
Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c) wrote :

s/en -tête/en-tête/

Il reste une espace avant la virgule ligne 381.

review: Needs Fixing
Revision history for this message
Olivier Dony (Odoo) (odo-openerp) wrote :

Hi LudoRA,

Sorry for answering so late. Thanks for contributing translations!
Unfortunately we cannot accept merge proposals for translations because it bypasses the translation process.
As you're now a member of the French translation team you can apply the procedure described in the documentation to proceed with direct PO file upload via Launchpad's interface:
   http://doc.openerp.com/v6.1/contribute/07_improving_translations.html

(see the question at the top: "Can I do batch translations locally and then upload the .po files in batch in Launchpad?")

Thanks again,

review: Disapprove (process)

Unmerged revisions

8074. By LudoRA

[TRANS] french translation update

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'mail/i18n/fr.po'
--- mail/i18n/fr.po 2012-10-30 05:37:00 +0000
+++ mail/i18n/fr.po 2012-11-21 15:58:26 +0000
@@ -8,8 +8,8 @@
8"Project-Id-Version: openobject-addons\n"8"Project-Id-Version: openobject-addons\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2012-02-09 00:36+0000\n"10"POT-Creation-Date: 2012-02-09 00:36+0000\n"
11"PO-Revision-Date: 2012-06-22 01:42+0000\n"11"PO-Revision-Date: 2012-11-21 16:27+0100\n"
12"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"12"Last-Translator: Ludovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>\n"
13"Language-Team: French <fr@li.org>\n"13"Language-Team: French <fr@li.org>\n"
14"MIME-Version: 1.0\n"14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"15"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,10 +18,11 @@
18"X-Generator: Launchpad (build 16206)\n"18"X-Generator: Launchpad (build 16206)\n"
1919
20#. module: mail20#. module: mail
21#: field:mail.compose.message,subtype:0 field:mail.message,subtype:021#: field:mail.compose.message,subtype:0
22#: field:mail.message,subtype:0
22#: field:mail.message.common,subtype:023#: field:mail.message.common,subtype:0
23msgid "Message Type"24msgid "Message Type"
24msgstr ""25msgstr "Type de message"
2526
26#. module: mail27#. module: mail
27#: help:mail.compose.message,auto_delete:028#: help:mail.compose.message,auto_delete:0
@@ -60,7 +61,8 @@
60msgstr "Rédiger un courriel"61msgstr "Rédiger un courriel"
6162
62#. module: mail63#. module: mail
63#: help:mail.compose.message,body_text:0 help:mail.message,body_text:064#: help:mail.compose.message,body_text:0
65#: help:mail.message,body_text:0
64#: help:mail.message.common,body_text:066#: help:mail.message.common,body_text:0
65msgid "Plain-text version of the message"67msgid "Plain-text version of the message"
66msgstr "Version plein texte du message"68msgstr "Version plein texte du message"
@@ -71,19 +73,22 @@
71msgstr "Corps de texte"73msgstr "Corps de texte"
7274
73#. module: mail75#. module: mail
74#: help:mail.compose.message,email_to:0 help:mail.message,email_to:076#: help:mail.compose.message,email_to:0
77#: help:mail.message,email_to:0
75#: help:mail.message.common,email_to:078#: help:mail.message.common,email_to:0
76msgid "Message recipients"79msgid "Message recipients"
77msgstr "Destinataires du message"80msgstr "Destinataires du message"
7881
79#. module: mail82#. module: mail
80#: field:mail.compose.message,body_text:0 field:mail.message,body_text:083#: field:mail.compose.message,body_text:0
84#: field:mail.message,body_text:0
81#: field:mail.message.common,body_text:085#: field:mail.message.common,body_text:0
82msgid "Text Contents"86msgid "Text Contents"
83msgstr ""87msgstr "Corps de texte"
8488
85#. module: mail89#. module: mail
86#: view:mail.message:0 selection:mail.message,state:090#: view:mail.message:0
91#: selection:mail.message,state:0
87msgid "Received"92msgid "Received"
88msgstr "Reçu"93msgstr "Reçu"
8994
@@ -103,35 +108,41 @@
103msgstr "Annulé"108msgstr "Annulé"
104109
105#. module: mail110#. module: mail
106#: field:mail.compose.message,reply_to:0 field:mail.message,reply_to:0111#: field:mail.compose.message,reply_to:0
112#: field:mail.message,reply_to:0
107#: field:mail.message.common,reply_to:0113#: field:mail.message.common,reply_to:0
108msgid "Reply-To"114msgid "Reply-To"
109msgstr "Répondre à"115msgstr "Répondre à"
110116
111#. module: mail117#. module: mail
112#: help:mail.compose.message,body_html:0 help:mail.message,body_html:0118#: help:mail.compose.message,body_html:0
119#: help:mail.message,body_html:0
113#: help:mail.message.common,body_html:0120#: help:mail.message.common,body_html:0
114msgid "Rich-text/HTML version of the message"121msgid "Rich-text/HTML version of the message"
115msgstr "Version texte enrichi/HTML du message"122msgstr "Version texte enrichi/HTML du message"
116123
117#. module: mail124#. module: mail
118#: field:mail.compose.message,auto_delete:0 field:mail.message,auto_delete:0125#: field:mail.compose.message,auto_delete:0
126#: field:mail.message,auto_delete:0
119msgid "Auto Delete"127msgid "Auto Delete"
120msgstr "Suppression automatique"128msgstr "Suppression automatique"
121129
122#. module: mail130#. module: mail
123#: help:mail.compose.message,email_bcc:0 help:mail.message,email_bcc:0131#: help:mail.compose.message,email_bcc:0
132#: help:mail.message,email_bcc:0
124#: help:mail.message.common,email_bcc:0133#: help:mail.message.common,email_bcc:0
125msgid "Blind carbon copy message recipients"134msgid "Blind carbon copy message recipients"
126msgstr "Destinataires en Copie Conforme Invisible (CCI)"135msgstr "Destinataires en Copie Conforme Invisible (CCI)"
127136
128#. module: mail137#. module: mail
129#: model:ir.model,name:mail.model_res_partner view:mail.message:0138#: model:ir.model,name:mail.model_res_partner
139#: view:mail.message:0
130msgid "Partner"140msgid "Partner"
131msgstr "Partenaire"141msgstr "Partenaire"
132142
133#. module: mail143#. module: mail
134#: field:mail.compose.message,subject:0 field:mail.message,subject:0144#: field:mail.compose.message,subject:0
145#: field:mail.message,subject:0
135#: field:mail.message.common,subject:0146#: field:mail.message.common,subject:0
136msgid "Subject"147msgid "Subject"
137msgstr "Sujet"148msgstr "Sujet"
@@ -143,7 +154,8 @@
143msgstr "Le %(date)s, "154msgstr "Le %(date)s, "
144155
145#. module: mail156#. module: mail
146#: field:mail.compose.message,email_from:0 field:mail.message,email_from:0157#: field:mail.compose.message,email_from:0
158#: field:mail.message,email_from:0
147#: field:mail.message.common,email_from:0159#: field:mail.message.common,email_from:0
148msgid "From"160msgid "From"
149msgstr "De"161msgstr "De"
@@ -164,7 +176,8 @@
164msgstr "Échec"176msgstr "Échec"
165177
166#. module: mail178#. module: mail
167#: view:mail.message:0 field:mail.message,state:0179#: view:mail.message:0
180#: field:mail.message,state:0
168msgid "State"181msgid "State"
169msgstr "État"182msgstr "État"
170183
@@ -174,20 +187,17 @@
174msgstr "Répondre"187msgstr "Répondre"
175188
176#. module: mail189#. module: mail
177#: view:mail.message:0 selection:mail.message,state:0190#: view:mail.message:0
191#: selection:mail.message,state:0
178msgid "Sent"192msgid "Sent"
179msgstr "Envoyé"193msgstr "Envoyé"
180194
181#. module: mail195#. module: mail
182#: help:mail.compose.message,subtype:0 help:mail.message,subtype:0196#: help:mail.compose.message,subtype:0
197#: help:mail.message,subtype:0
183#: help:mail.message.common,subtype:0198#: help:mail.message.common,subtype:0
184msgid ""199msgid "Type of message, usually 'html' or 'plain', used to select plaintext or rich text contents accordingly"
185"Type of message, usually 'html' or 'plain', used to select plaintext or rich "200msgstr "Le type de message, généralement «Texte enrichi - html» ou «texte», utilisé pour respectivement sélectionner un contenu qui puisse être mis en forme ou un texte brut"
186"text contents accordingly"
187msgstr ""
188"Le type de message, généralement «Texte enrichi - html» ou «texte», utilisé "
189"pour respectivement sélectionner un contenu qui puisse être mis en forme ou "
190"un texte brut"
191201
192#. module: mail202#. module: mail
193#: view:mail.message:0203#: view:mail.message:0
@@ -197,10 +207,11 @@
197#. module: mail207#. module: mail
198#: model:ir.model,name:mail.model_mail_compose_message208#: model:ir.model,name:mail.model_mail_compose_message
199msgid "Email composition wizard"209msgid "Email composition wizard"
200msgstr ""210msgstr "Wizard de rédaction de courriel"
201211
202#. module: mail212#. module: mail
203#: field:mail.compose.message,res_id:0 field:mail.message,res_id:0213#: field:mail.compose.message,res_id:0
214#: field:mail.message,res_id:0
204#: field:mail.message.common,res_id:0215#: field:mail.message.common,res_id:0
205msgid "Related Document ID"216msgid "Related Document ID"
206msgstr "ID du document associé"217msgstr "ID du document associé"
@@ -217,10 +228,11 @@
217msgstr "Re:"228msgstr "Re:"
218229
219#. module: mail230#. module: mail
220#: field:mail.compose.message,model:0 field:mail.message,model:0231#: field:mail.compose.message,model:0
232#: field:mail.message,model:0
221#: field:mail.message.common,model:0233#: field:mail.message.common,model:0
222msgid "Related Document Model"234msgid "Related Document Model"
223msgstr ""235msgstr "Modèle du document lié"
224236
225#. module: mail237#. module: mail
226#: view:mail.message:0238#: view:mail.message:0
@@ -248,7 +260,8 @@
248msgstr "Recommencer"260msgstr "Recommencer"
249261
250#. module: mail262#. module: mail
251#: view:mail.message:0 selection:mail.message,state:0263#: view:mail.message:0
264#: selection:mail.message,state:0
252msgid "Outgoing"265msgid "Outgoing"
253msgstr "Sortant"266msgstr "Sortant"
254267
@@ -268,7 +281,8 @@
268msgstr "Utilisateur"281msgstr "Utilisateur"
269282
270#. module: mail283#. module: mail
271#: field:mail.compose.message,date:0 field:mail.message,date:0284#: field:mail.compose.message,date:0
285#: field:mail.message,date:0
272#: field:mail.message.common,date:0286#: field:mail.message.common,date:0
273msgid "Date"287msgid "Date"
274msgstr "Date"288msgstr "Date"
@@ -285,10 +299,11 @@
285msgstr "%(sender_name)s a écrit:"299msgstr "%(sender_name)s a écrit:"
286300
287#. module: mail301#. module: mail
288#: field:mail.compose.message,body_html:0 field:mail.message,body_html:0302#: field:mail.compose.message,body_html:0
303#: field:mail.message,body_html:0
289#: field:mail.message.common,body_html:0304#: field:mail.message.common,body_html:0
290msgid "Rich-text Contents"305msgid "Rich-text Contents"
291msgstr ""306msgstr "Contenu mis en forme"
292307
293#. module: mail308#. module: mail
294#: field:mail.message,original:0309#: field:mail.message,original:0
@@ -296,25 +311,30 @@
296msgstr "Original"311msgstr "Original"
297312
298#. module: mail313#. module: mail
299#: code:addons/mail/mail_thread.py:247 view:res.partner:0314#: code:addons/mail/mail_thread.py:247
315#: view:res.partner:0
300#, python-format316#, python-format
301msgid "History"317msgid "History"
302msgstr "Historique"318msgstr "Historique"
303319
304#. module: mail320#. module: mail
305#: field:mail.compose.message,message_id:0 field:mail.message,message_id:0321#: field:mail.compose.message,message_id:0
322#: field:mail.message,message_id:0
306#: field:mail.message.common,message_id:0323#: field:mail.message.common,message_id:0
307msgid "Message-Id"324msgid "Message-Id"
308msgstr "ID du message"325msgstr "ID du message"
309326
310#. module: mail327#. module: mail
311#: view:mail.compose.message:0 field:mail.compose.message,attachment_ids:0328#: view:mail.compose.message:0
312#: view:mail.message:0 field:mail.message,attachment_ids:0329#: field:mail.compose.message,attachment_ids:0
330#: view:mail.message:0
331#: field:mail.message,attachment_ids:0
313msgid "Attachments"332msgid "Attachments"
314msgstr "Pièces jointes"333msgstr "Pièces jointes"
315334
316#. module: mail335#. module: mail
317#: field:mail.compose.message,email_cc:0 field:mail.message,email_cc:0336#: field:mail.compose.message,email_cc:0
337#: field:mail.message,email_cc:0
318#: field:mail.message.common,email_cc:0338#: field:mail.message.common,email_cc:0
319msgid "Cc"339msgid "Cc"
320msgstr "Copie à (CC)"340msgstr "Copie à (CC)"
@@ -331,7 +351,8 @@
331msgstr "Suppression de ce courriel après envoi pour économiser de l'espace"351msgstr "Suppression de ce courriel après envoi pour économiser de l'espace"
332352
333#. module: mail353#. module: mail
334#: field:mail.compose.message,references:0 field:mail.message,references:0354#: field:mail.compose.message,references:0
355#: field:mail.message,references:0
335#: field:mail.message.common,references:0356#: field:mail.message.common,references:0
336msgid "References"357msgid "References"
337msgstr "Références"358msgstr "Références"
@@ -342,7 +363,8 @@
342msgstr "Texte affiché"363msgstr "Texte affiché"
343364
344#. module: mail365#. module: mail
345#: view:mail.compose.message:0 view:mail.message:0366#: view:mail.compose.message:0
367#: view:mail.message:0
346msgid "Cancel"368msgid "Cancel"
347msgstr "Annuler"369msgstr "Annuler"
348370
@@ -360,17 +382,14 @@
360#. module: mail382#. module: mail
361#: field:mail.message,user_id:0383#: field:mail.message,user_id:0
362msgid "Related User"384msgid "Related User"
363msgstr ""385msgstr "Utilisateur lié"
364386
365#. module: mail387#. module: mail
366#: help:mail.compose.message,headers:0 help:mail.message,headers:0388#: help:mail.compose.message,headers:0
389#: help:mail.message,headers:0
367#: help:mail.message.common,headers:0390#: help:mail.message.common,headers:0
368msgid ""391msgid "Full message headers, e.g. SMTP session headers (usually available on inbound messages only)"
369"Full message headers, e.g. SMTP session headers (usually available on "392msgstr "En-têtes complet de message, par exemple avec en -tête de session SMTP (généralement disponible sur les messages entrants uniquement)"
370"inbound messages only)"
371msgstr ""
372"En-têtes complet de message, par exemple avec en -tête de session SMTP "
373"(généralement disponible sur les messages entrants uniquement)"
374393
375#. module: mail394#. module: mail
376#: view:mail.message:0395#: view:mail.message:0
@@ -378,7 +397,8 @@
378msgstr "Mois de création"397msgstr "Mois de création"
379398
380#. module: mail399#. module: mail
381#: field:mail.compose.message,email_to:0 field:mail.message,email_to:0400#: field:mail.compose.message,email_to:0
401#: field:mail.message,email_to:0
382#: field:mail.message.common,email_to:0402#: field:mail.message.common,email_to:0
383msgid "To"403msgid "To"
384msgstr "À"404msgstr "À"
@@ -395,14 +415,11 @@
395msgstr "Discussions par courriel"415msgstr "Discussions par courriel"
396416
397#. module: mail417#. module: mail
398#: help:mail.compose.message,email_from:0 help:mail.message,email_from:0418#: help:mail.compose.message,email_from:0
419#: help:mail.message,email_from:0
399#: help:mail.message.common,email_from:0420#: help:mail.message.common,email_from:0
400msgid ""421msgid "Message sender, taken from user preferences. If empty, this is not a mail but a message."
401"Message sender, taken from user preferences. If empty, this is not a mail "422msgstr "Expéditeur du message, pris à partir des préférences utilisateur. Si le champ est vide, ce n'est pas un courriel mais un message."
402"but a message."
403msgstr ""
404"Expéditeur du message, pris à partir des préférences utilisateur. Si le "
405"champ est vide, ce n'est pas un courriel mais un message."
406423
407#. module: mail424#. module: mail
408#: view:mail.message:0425#: view:mail.message:0
@@ -416,7 +433,8 @@
416msgstr "Vous"433msgstr "Vous"
417434
418#. module: mail435#. module: mail
419#: help:mail.compose.message,message_id:0 help:mail.message,message_id:0436#: help:mail.compose.message,message_id:0
437#: help:mail.message,message_id:0
420#: help:mail.message.common,message_id:0438#: help:mail.message.common,message_id:0
421msgid "Message unique identifier"439msgid "Message unique identifier"
422msgstr "Identifiant unique de message"440msgstr "Identifiant unique de message"
@@ -440,7 +458,8 @@
440458
441#. module: mail459#. module: mail
442#: model:ir.actions.act_window,name:mail.act_res_partner_emails460#: model:ir.actions.act_window,name:mail.act_res_partner_emails
443#: view:mail.message:0 field:res.partner,emails:0461#: view:mail.message:0
462#: field:res.partner,emails:0
444msgid "Emails"463msgid "Emails"
445msgstr "Courriels"464msgstr "Courriels"
446465
@@ -452,13 +471,15 @@
452msgstr "Messages"471msgstr "Messages"
453472
454#. module: mail473#. module: mail
455#: field:mail.compose.message,headers:0 field:mail.message,headers:0474#: field:mail.compose.message,headers:0
475#: field:mail.message,headers:0
456#: field:mail.message.common,headers:0476#: field:mail.message.common,headers:0
457msgid "Message Headers"477msgid "Message Headers"
458msgstr ""478msgstr "En-tête du courriel"
459479
460#. module: mail480#. module: mail
461#: field:mail.compose.message,email_bcc:0 field:mail.message,email_bcc:0481#: field:mail.compose.message,email_bcc:0
482#: field:mail.message,email_bcc:0
462#: field:mail.message.common,email_bcc:0483#: field:mail.message.common,email_bcc:0
463msgid "Bcc"484msgid "Bcc"
464msgstr "Copie cachée à (BCC)"485msgstr "Copie cachée à (BCC)"
@@ -469,20 +490,20 @@
469msgstr "mail.message.common"490msgstr "mail.message.common"
470491
471#. module: mail492#. module: mail
472#: help:mail.compose.message,references:0 help:mail.message,references:0493#: help:mail.compose.message,references:0
494#: help:mail.message,references:0
473#: help:mail.message.common,references:0495#: help:mail.message.common,references:0
474msgid "Message references, such as identifiers of previous messages"496msgid "Message references, such as identifiers of previous messages"
475msgstr ""497msgstr "Références du message , tel que les identifiants des messages précédents"
476"Références du message , tel que les identifiants des messages précédents"
477498
478#. module: mail499#. module: mail
479#: constraint:res.partner:0500#: constraint:res.partner:0
480msgid "Error ! You cannot create recursive associated members."501msgid "Error ! You cannot create recursive associated members."
481msgstr ""502msgstr "Erreur ! Vous ne pouvez pas créer des membres associés de manière récursive."
482"Erreur ! Vous ne pouvez pas créer des membres associés de manière récursive."
483503
484#. module: mail504#. module: mail
485#: help:mail.compose.message,email_cc:0 help:mail.message,email_cc:0505#: help:mail.compose.message,email_cc:0
506#: help:mail.message,email_cc:0
486#: help:mail.message.common,email_cc:0507#: help:mail.message.common,email_cc:0
487msgid "Carbon copy message recipients"508msgid "Carbon copy message recipients"
488msgstr "Destinataires en copie carbone (Cc)"509msgstr "Destinataires en copie carbone (Cc)"
@@ -498,7 +519,8 @@
498msgstr "Contenu du courriel"519msgstr "Contenu du courriel"
499520
500#. module: mail521#. module: mail
501#: model:ir.model,name:mail.model_mail_thread view:mail.thread:0522#: model:ir.model,name:mail.model_mail_thread
523#: view:mail.thread:0
502msgid "Email Thread"524msgid "Email Thread"
503msgstr "Discussion par courriel"525msgstr "Discussion par courriel"
504526
@@ -514,7 +536,8 @@
514msgstr "Pièce jointe"536msgstr "Pièce jointe"
515537
516#. module: mail538#. module: mail
517#: help:mail.compose.message,reply_to:0 help:mail.message,reply_to:0539#: help:mail.compose.message,reply_to:0
540#: help:mail.message,reply_to:0
518#: help:mail.message.common,reply_to:0541#: help:mail.message.common,reply_to:0
519msgid "Preferred response address for the message"542msgid "Preferred response address for the message"
520msgstr "Adresse de réponse préférée pour le message"543msgstr "Adresse de réponse préférée pour le message"

Subscribers

People subscribed via source and target branches

to all changes: