Merge lp://qastaging/~mardy/unity-scope-gdrive/i18n into lp://qastaging/unity-scope-gdrive
Proposed by
Alberto Mardegan
Status: | Merged |
---|---|
Approved by: | David King |
Approved revision: | 17 |
Merged at revision: | 13 |
Proposed branch: | lp://qastaging/~mardy/unity-scope-gdrive/i18n |
Merge into: | lp://qastaging/unity-scope-gdrive |
Diff against target: |
188 lines (+100/-13) 9 files modified
.bzrignore (+1/-0) MANIFEST.in (+3/-1) build_i18n_ext.py (+41/-0) po/POTFILES.in (+1/-0) po/unity-scope-gdocs.pot (+26/-0) setup.cfg (+6/-0) setup.py (+6/-6) unity-scope-gdocs.application.in (+7/-6) unity-scope-gdocs.desktop (+9/-0) |
To merge this branch: | bzr merge lp://qastaging/~mardy/unity-scope-gdrive/i18n |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
David King (community) | Approve | ||
Review via email:
|
Description of the change
Allow translating the .application file
Also, include the change from
https:/
To post a comment you must log in.
This does not work, as the translations are merged back into the XML file, as repeated nodes with xml:lang attributes. The advice in bug 1052375 must be followed, so that "--no-translations" is passed as an argument to intltool, i.e. the strings are only extracted and not merged back.