Merge lp://staging/~henninge/launchpad/bug-565294-devel into lp://staging/launchpad

Proposed by Henning Eggers
Status: Merged
Approved by: Henning Eggers
Approved revision: no longer in the source branch.
Merged at revision: not available
Proposed branch: lp://staging/~henninge/launchpad/bug-565294-devel
Merge into: lp://staging/launchpad
Diff against target: 763 lines (+219/-89)
2 files modified
lib/lp/translations/model/pofile.py (+42/-23)
lib/lp/translations/tests/test_pofile.py (+177/-66)
To merge this branch: bzr merge lp://staging/~henninge/launchpad/bug-565294-devel
Reviewer Review Type Date Requested Status
Michael Nelson (community) code Approve
Review via email: mp+24020@code.staging.launchpad.net

Commit message

When exporting PO files, use the plural information from the imported file in some cases instead of the information from the language database.

Description of the change

Merging already approved branch into devel instead of production-devel.
https://code.edge.launchpad.net/~henninge/launchpad/bug-565294-nplurals

No changes since last approval. ;-)

To post a comment you must log in.
Revision history for this message
Michael Nelson (michael.nelson) wrote :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.