Odoo Addons (MOVED TO GITHUB)

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

  1. trunk-mail-trans-fr
  2. Merge into trunk
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
1=== modified file 'mail/i18n/fr.po'
2--- mail/i18n/fr.po 2012-10-30 05:37:00 +0000
3+++ mail/i18n/fr.po 2012-11-21 15:58:26 +0000
4@@ -8,8 +8,8 @@
5 "Project-Id-Version: openobject-addons\n"
6 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
7 "POT-Creation-Date: 2012-02-09 00:36+0000\n"
8-"PO-Revision-Date: 2012-06-22 01:42+0000\n"
9-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
10+"PO-Revision-Date: 2012-11-21 16:27+0100\n"
11+"Last-Translator: Ludovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>\n"
12 "Language-Team: French <fr@li.org>\n"
13 "MIME-Version: 1.0\n"
14 "Content-Type: text/plain; charset=UTF-8\n"
15@@ -18,10 +18,11 @@
16 "X-Generator: Launchpad (build 16206)\n"
17
18 #. module: mail
19-#: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
20+#: field:mail.compose.message,subtype:0
21+#: field:mail.message,subtype:0
22 #: field:mail.message.common,subtype:0
23 msgid "Message Type"
24-msgstr ""
25+msgstr "Type de message"
26
27 #. module: mail
28 #: help:mail.compose.message,auto_delete:0
29@@ -60,7 +61,8 @@
30 msgstr "Rédiger un courriel"
31
32 #. module: mail
33-#: help:mail.compose.message,body_text:0 help:mail.message,body_text:0
34+#: help:mail.compose.message,body_text:0
35+#: help:mail.message,body_text:0
36 #: help:mail.message.common,body_text:0
37 msgid "Plain-text version of the message"
38 msgstr "Version plein texte du message"
39@@ -71,19 +73,22 @@
40 msgstr "Corps de texte"
41
42 #. module: mail
43-#: help:mail.compose.message,email_to:0 help:mail.message,email_to:0
44+#: help:mail.compose.message,email_to:0
45+#: help:mail.message,email_to:0
46 #: help:mail.message.common,email_to:0
47 msgid "Message recipients"
48 msgstr "Destinataires du message"
49
50 #. module: mail
51-#: field:mail.compose.message,body_text:0 field:mail.message,body_text:0
52+#: field:mail.compose.message,body_text:0
53+#: field:mail.message,body_text:0
54 #: field:mail.message.common,body_text:0
55 msgid "Text Contents"
56-msgstr ""
57+msgstr "Corps de texte"
58
59 #. module: mail
60-#: view:mail.message:0 selection:mail.message,state:0
61+#: view:mail.message:0
62+#: selection:mail.message,state:0
63 msgid "Received"
64 msgstr "Reçu"
65
66@@ -103,35 +108,41 @@
67 msgstr "Annulé"
68
69 #. module: mail
70-#: field:mail.compose.message,reply_to:0 field:mail.message,reply_to:0
71+#: field:mail.compose.message,reply_to:0
72+#: field:mail.message,reply_to:0
73 #: field:mail.message.common,reply_to:0
74 msgid "Reply-To"
75 msgstr "Répondre à"
76
77 #. module: mail
78-#: help:mail.compose.message,body_html:0 help:mail.message,body_html:0
79+#: help:mail.compose.message,body_html:0
80+#: help:mail.message,body_html:0
81 #: help:mail.message.common,body_html:0
82 msgid "Rich-text/HTML version of the message"
83 msgstr "Version texte enrichi/HTML du message"
84
85 #. module: mail
86-#: field:mail.compose.message,auto_delete:0 field:mail.message,auto_delete:0
87+#: field:mail.compose.message,auto_delete:0
88+#: field:mail.message,auto_delete:0
89 msgid "Auto Delete"
90 msgstr "Suppression automatique"
91
92 #. module: mail
93-#: help:mail.compose.message,email_bcc:0 help:mail.message,email_bcc:0
94+#: help:mail.compose.message,email_bcc:0
95+#: help:mail.message,email_bcc:0
96 #: help:mail.message.common,email_bcc:0
97 msgid "Blind carbon copy message recipients"
98 msgstr "Destinataires en Copie Conforme Invisible (CCI)"
99
100 #. module: mail
101-#: model:ir.model,name:mail.model_res_partner view:mail.message:0
102+#: model:ir.model,name:mail.model_res_partner
103+#: view:mail.message:0
104 msgid "Partner"
105 msgstr "Partenaire"
106
107 #. module: mail
108-#: field:mail.compose.message,subject:0 field:mail.message,subject:0
109+#: field:mail.compose.message,subject:0
110+#: field:mail.message,subject:0
111 #: field:mail.message.common,subject:0
112 msgid "Subject"
113 msgstr "Sujet"
114@@ -143,7 +154,8 @@
115 msgstr "Le %(date)s, "
116
117 #. module: mail
118-#: field:mail.compose.message,email_from:0 field:mail.message,email_from:0
119+#: field:mail.compose.message,email_from:0
120+#: field:mail.message,email_from:0
121 #: field:mail.message.common,email_from:0
122 msgid "From"
123 msgstr "De"
124@@ -164,7 +176,8 @@
125 msgstr "Échec"
126
127 #. module: mail
128-#: view:mail.message:0 field:mail.message,state:0
129+#: view:mail.message:0
130+#: field:mail.message,state:0
131 msgid "State"
132 msgstr "État"
133
134@@ -174,20 +187,17 @@
135 msgstr "Répondre"
136
137 #. module: mail
138-#: view:mail.message:0 selection:mail.message,state:0
139+#: view:mail.message:0
140+#: selection:mail.message,state:0
141 msgid "Sent"
142 msgstr "Envoyé"
143
144 #. module: mail
145-#: help:mail.compose.message,subtype:0 help:mail.message,subtype:0
146+#: help:mail.compose.message,subtype:0
147+#: help:mail.message,subtype:0
148 #: help:mail.message.common,subtype:0
149-msgid ""
150-"Type of message, usually 'html' or 'plain', used to select plaintext or rich "
151-"text contents accordingly"
152-msgstr ""
153-"Le type de message, généralement «Texte enrichi - html» ou «texte», utilisé "
154-"pour respectivement sélectionner un contenu qui puisse être mis en forme ou "
155-"un texte brut"
156+msgid "Type of message, usually 'html' or 'plain', used to select plaintext or rich text contents accordingly"
157+msgstr "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"
158
159 #. module: mail
160 #: view:mail.message:0
161@@ -197,10 +207,11 @@
162 #. module: mail
163 #: model:ir.model,name:mail.model_mail_compose_message
164 msgid "Email composition wizard"
165-msgstr ""
166+msgstr "Wizard de rédaction de courriel"
167
168 #. module: mail
169-#: field:mail.compose.message,res_id:0 field:mail.message,res_id:0
170+#: field:mail.compose.message,res_id:0
171+#: field:mail.message,res_id:0
172 #: field:mail.message.common,res_id:0
173 msgid "Related Document ID"
174 msgstr "ID du document associé"
175@@ -217,10 +228,11 @@
176 msgstr "Re:"
177
178 #. module: mail
179-#: field:mail.compose.message,model:0 field:mail.message,model:0
180+#: field:mail.compose.message,model:0
181+#: field:mail.message,model:0
182 #: field:mail.message.common,model:0
183 msgid "Related Document Model"
184-msgstr ""
185+msgstr "Modèle du document lié"
186
187 #. module: mail
188 #: view:mail.message:0
189@@ -248,7 +260,8 @@
190 msgstr "Recommencer"
191
192 #. module: mail
193-#: view:mail.message:0 selection:mail.message,state:0
194+#: view:mail.message:0
195+#: selection:mail.message,state:0
196 msgid "Outgoing"
197 msgstr "Sortant"
198
199@@ -268,7 +281,8 @@
200 msgstr "Utilisateur"
201
202 #. module: mail
203-#: field:mail.compose.message,date:0 field:mail.message,date:0
204+#: field:mail.compose.message,date:0
205+#: field:mail.message,date:0
206 #: field:mail.message.common,date:0
207 msgid "Date"
208 msgstr "Date"
209@@ -285,10 +299,11 @@
210 msgstr "%(sender_name)s a écrit:"
211
212 #. module: mail
213-#: field:mail.compose.message,body_html:0 field:mail.message,body_html:0
214+#: field:mail.compose.message,body_html:0
215+#: field:mail.message,body_html:0
216 #: field:mail.message.common,body_html:0
217 msgid "Rich-text Contents"
218-msgstr ""
219+msgstr "Contenu mis en forme"
220
221 #. module: mail
222 #: field:mail.message,original:0
223@@ -296,25 +311,30 @@
224 msgstr "Original"
225
226 #. module: mail
227-#: code:addons/mail/mail_thread.py:247 view:res.partner:0
228+#: code:addons/mail/mail_thread.py:247
229+#: view:res.partner:0
230 #, python-format
231 msgid "History"
232 msgstr "Historique"
233
234 #. module: mail
235-#: field:mail.compose.message,message_id:0 field:mail.message,message_id:0
236+#: field:mail.compose.message,message_id:0
237+#: field:mail.message,message_id:0
238 #: field:mail.message.common,message_id:0
239 msgid "Message-Id"
240 msgstr "ID du message"
241
242 #. module: mail
243-#: view:mail.compose.message:0 field:mail.compose.message,attachment_ids:0
244-#: view:mail.message:0 field:mail.message,attachment_ids:0
245+#: view:mail.compose.message:0
246+#: field:mail.compose.message,attachment_ids:0
247+#: view:mail.message:0
248+#: field:mail.message,attachment_ids:0
249 msgid "Attachments"
250 msgstr "Pièces jointes"
251
252 #. module: mail
253-#: field:mail.compose.message,email_cc:0 field:mail.message,email_cc:0
254+#: field:mail.compose.message,email_cc:0
255+#: field:mail.message,email_cc:0
256 #: field:mail.message.common,email_cc:0
257 msgid "Cc"
258 msgstr "Copie à (CC)"
259@@ -331,7 +351,8 @@
260 msgstr "Suppression de ce courriel après envoi pour économiser de l'espace"
261
262 #. module: mail
263-#: field:mail.compose.message,references:0 field:mail.message,references:0
264+#: field:mail.compose.message,references:0
265+#: field:mail.message,references:0
266 #: field:mail.message.common,references:0
267 msgid "References"
268 msgstr "Références"
269@@ -342,7 +363,8 @@
270 msgstr "Texte affiché"
271
272 #. module: mail
273-#: view:mail.compose.message:0 view:mail.message:0
274+#: view:mail.compose.message:0
275+#: view:mail.message:0
276 msgid "Cancel"
277 msgstr "Annuler"
278
279@@ -360,17 +382,14 @@
280 #. module: mail
281 #: field:mail.message,user_id:0
282 msgid "Related User"
283-msgstr ""
284+msgstr "Utilisateur lié"
285
286 #. module: mail
287-#: help:mail.compose.message,headers:0 help:mail.message,headers:0
288+#: help:mail.compose.message,headers:0
289+#: help:mail.message,headers:0
290 #: help:mail.message.common,headers:0
291-msgid ""
292-"Full message headers, e.g. SMTP session headers (usually available on "
293-"inbound messages only)"
294-msgstr ""
295-"En-têtes complet de message, par exemple avec en -tête de session SMTP "
296-"(généralement disponible sur les messages entrants uniquement)"
297+msgid "Full message headers, e.g. SMTP session headers (usually available on inbound messages only)"
298+msgstr "En-têtes complet de message, par exemple avec en -tête de session SMTP (généralement disponible sur les messages entrants uniquement)"
299
300 #. module: mail
301 #: view:mail.message:0
302@@ -378,7 +397,8 @@
303 msgstr "Mois de création"
304
305 #. module: mail
306-#: field:mail.compose.message,email_to:0 field:mail.message,email_to:0
307+#: field:mail.compose.message,email_to:0
308+#: field:mail.message,email_to:0
309 #: field:mail.message.common,email_to:0
310 msgid "To"
311 msgstr "À"
312@@ -395,14 +415,11 @@
313 msgstr "Discussions par courriel"
314
315 #. module: mail
316-#: help:mail.compose.message,email_from:0 help:mail.message,email_from:0
317+#: help:mail.compose.message,email_from:0
318+#: help:mail.message,email_from:0
319 #: help:mail.message.common,email_from:0
320-msgid ""
321-"Message sender, taken from user preferences. If empty, this is not a mail "
322-"but a message."
323-msgstr ""
324-"Expéditeur du message, pris à partir des préférences utilisateur. Si le "
325-"champ est vide, ce n'est pas un courriel mais un message."
326+msgid "Message sender, taken from user preferences. If empty, this is not a mail but a message."
327+msgstr "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."
328
329 #. module: mail
330 #: view:mail.message:0
331@@ -416,7 +433,8 @@
332 msgstr "Vous"
333
334 #. module: mail
335-#: help:mail.compose.message,message_id:0 help:mail.message,message_id:0
336+#: help:mail.compose.message,message_id:0
337+#: help:mail.message,message_id:0
338 #: help:mail.message.common,message_id:0
339 msgid "Message unique identifier"
340 msgstr "Identifiant unique de message"
341@@ -440,7 +458,8 @@
342
343 #. module: mail
344 #: model:ir.actions.act_window,name:mail.act_res_partner_emails
345-#: view:mail.message:0 field:res.partner,emails:0
346+#: view:mail.message:0
347+#: field:res.partner,emails:0
348 msgid "Emails"
349 msgstr "Courriels"
350
351@@ -452,13 +471,15 @@
352 msgstr "Messages"
353
354 #. module: mail
355-#: field:mail.compose.message,headers:0 field:mail.message,headers:0
356+#: field:mail.compose.message,headers:0
357+#: field:mail.message,headers:0
358 #: field:mail.message.common,headers:0
359 msgid "Message Headers"
360-msgstr ""
361+msgstr "En-tête du courriel"
362
363 #. module: mail
364-#: field:mail.compose.message,email_bcc:0 field:mail.message,email_bcc:0
365+#: field:mail.compose.message,email_bcc:0
366+#: field:mail.message,email_bcc:0
367 #: field:mail.message.common,email_bcc:0
368 msgid "Bcc"
369 msgstr "Copie cachée à (BCC)"
370@@ -469,20 +490,20 @@
371 msgstr "mail.message.common"
372
373 #. module: mail
374-#: help:mail.compose.message,references:0 help:mail.message,references:0
375+#: help:mail.compose.message,references:0
376+#: help:mail.message,references:0
377 #: help:mail.message.common,references:0
378 msgid "Message references, such as identifiers of previous messages"
379-msgstr ""
380-"Références du message , tel que les identifiants des messages précédents"
381+msgstr "Références du message , tel que les identifiants des messages précédents"
382
383 #. module: mail
384 #: constraint:res.partner:0
385 msgid "Error ! You cannot create recursive associated members."
386-msgstr ""
387-"Erreur ! Vous ne pouvez pas créer des membres associés de manière récursive."
388+msgstr "Erreur ! Vous ne pouvez pas créer des membres associés de manière récursive."
389
390 #. module: mail
391-#: help:mail.compose.message,email_cc:0 help:mail.message,email_cc:0
392+#: help:mail.compose.message,email_cc:0
393+#: help:mail.message,email_cc:0
394 #: help:mail.message.common,email_cc:0
395 msgid "Carbon copy message recipients"
396 msgstr "Destinataires en copie carbone (Cc)"
397@@ -498,7 +519,8 @@
398 msgstr "Contenu du courriel"
399
400 #. module: mail
401-#: model:ir.model,name:mail.model_mail_thread view:mail.thread:0
402+#: model:ir.model,name:mail.model_mail_thread
403+#: view:mail.thread:0
404 msgid "Email Thread"
405 msgstr "Discussion par courriel"
406
407@@ -514,7 +536,8 @@
408 msgstr "Pièce jointe"
409
410 #. module: mail
411-#: help:mail.compose.message,reply_to:0 help:mail.message,reply_to:0
412+#: help:mail.compose.message,reply_to:0
413+#: help:mail.message,reply_to:0
414 #: help:mail.message.common,reply_to:0
415 msgid "Preferred response address for the message"
416 msgstr "Adresse de réponse préférée pour le message"

Subscribers

People subscribed via source and target branches

to all changes: