Merge lp:~savoirfairelinux-openerp/openobject-server/trunk-add-fr_CA into lp:openobject-server

Status: Merged
Merged at revision: 5211
Proposed branch: lp:~savoirfairelinux-openerp/openobject-server/trunk-add-fr_CA
Merge into: lp:openobject-server
Diff against target: 11 lines (+1/-0)
1 file modified
openerp/tools/misc.py (+1/-0)
To merge this branch: bzr merge lp:~savoirfairelinux-openerp/openobject-server/trunk-add-fr_CA
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+212309@code.launchpad.net

Commit message

[IMP] Add fr_CA translation

Description of the change

Allow installation of fr_CA translation

To post a comment you must log in.
Revision history for this message
Sylvain LE GAL (GRAP) (sylvain-legal) wrote :

LGTM.

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

Thanks, I guess there is no reason that fr_CA was not one of the default installation languages, given that the other FR variants are there. Merged at rev 5211 rev-id: <email address hidden>.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openerp/tools/misc.py'
2--- openerp/tools/misc.py 2014-03-21 15:56:05 +0000
3+++ openerp/tools/misc.py 2014-03-23 00:12:41 +0000
4@@ -459,6 +459,7 @@
5 'fa_IR': u'Persian / فارس',
6 'fi_FI': u'Finnish / Suomi',
7 'fr_BE': u'French (BE) / Français (BE)',
8+ 'fr_CA': u'French (CA) / Français (CA)',
9 'fr_CH': u'French (CH) / Français (CH)',
10 'fr_FR': u'French / Français',
11 'gl_ES': u'Galician / Galego',