OpenERP Community Backports (Server)

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

  1. ocb-add-fr_CA
  2. Merge into 7.0
Status: Rejected
Rejected by: Holger Brunn (Therp)
Proposed branch: lp:~savoirfairelinux-openerp/ocb-server/ocb-add-fr_CA
Merge into: lp:ocb-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/ocb-server/ocb-add-fr_CA
Reviewer Review Type Date Requested Status
Holger Brunn (Therp) Disapprove
Raphaël Valyi - http://www.akretion.com Approve
Review via email: mp+212742@code.launchpad.net

Description of the change

[IMP] Add fr_CA translation

To post a comment you must log in.
Revision history for this message
Raphaël Valyi - http://www.akretion.com (rvalyi) :
review: Approve
Revision history for this message
Holger Brunn (Therp) (hbrunn) wrote :

I miss the bug report and the MP for upstream

review: Needs Fixing
Revision history for this message
Holger Brunn (Therp) (hbrunn) wrote :

Development for 7.0 has moved to github on https://github.com/OCA/ocb - please move your merge proposal there if it is still valid.

(I close and reject this in order to have a cleaner overview for 6.1 MPs which indeed have to be done on launchpad)

review: Disapprove

Unmerged revisions

5295. By Maxime Chambreuil (http://www.savoirfairelinux.com)

[IMP] Add fr_CA translation

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'openerp/tools/misc.py'
--- openerp/tools/misc.py 2014-01-06 11:02:38 +0000
+++ openerp/tools/misc.py 2014-03-25 22:36:33 +0000
@@ -469,6 +469,7 @@
469 'fa_IR': u'Persian / فارس',469 'fa_IR': u'Persian / فارس',
470 'fi_FI': u'Finnish / Suomi',470 'fi_FI': u'Finnish / Suomi',
471 'fr_BE': u'French (BE) / Français (BE)',471 'fr_BE': u'French (BE) / Français (BE)',
472 'fr_CA': u'French (CA) / Français (CA)',
472 'fr_CH': u'French (CH) / Français (CH)',473 'fr_CH': u'French (CH) / Français (CH)',
473 'fr_FR': u'French / Français',474 'fr_FR': u'French / Français',
474 'gl_ES': u'Galician / Galego',475 'gl_ES': u'Galician / Galego',