Merge lp:~qtheuret/openobject-client-web/fr-translation into lp:openobject-client-web/trunk

Proposed by Quentin THEURET @Amaris
Status: Merged
Merged at revision: 4318
Proposed branch: lp:~qtheuret/openobject-client-web/fr-translation
Merge into: lp:openobject-client-web/trunk
Diff against target: 21 lines (+2/-2)
1 file modified
addons/openerp/po/messages/fr.po (+2/-2)
To merge this branch: bzr merge lp:~qtheuret/openobject-client-web/fr-translation
Reviewer Review Type Date Requested Status
OpenERP R&D Web Team Pending
OpenERP French translators Pending
Review via email: mp+46000@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Xavier (Open ERP) (xmo-deactivatedaccount) wrote :

Merged, but I'd rather you go through Rosetta next time around.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'addons/openerp/po/messages/fr.po'
2--- addons/openerp/po/messages/fr.po 2011-01-11 04:56:43 +0000
3+++ addons/openerp/po/messages/fr.po 2011-01-12 15:28:53 +0000
4@@ -619,7 +619,7 @@
5 #: controllers/templates/login.mako:67 controllers/templates/login_ajax.mako:85
6 #: controllers/templates/login_ajax.mako:104
7 msgid "Login"
8-msgstr "Identifiant"
9+msgstr "Identification"
10
11 #: controllers/templates/database.mako:60
12 msgid "Password"
13@@ -1477,7 +1477,7 @@
14
15 #: widgets/form/templates/image.mako:7 widgets/form/templates/image.mako:39
16 msgid "Click here to add new image."
17-msgstr ""
18+msgstr "Cliquez ici pour ajouter une nouvelle image"
19
20 #: widgets/form/templates/many2one.mako:2
21 #: widgets/form/templates/reference.mako:30