Google Documents Lens

Merge lp://qastaging/~mardy/unity-scope-gdrive/i18n into lp://qastaging/unity-scope-gdrive

i18n
Merge into trunk

Proposed by Alberto Mardegan on 2012-09-19

Status:

Merged

Approved by:

David King on 2012-09-19

Approved revision:

Merged at revision:

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:

Bug #1025583: Dash, Online Accounts - Dash duplicated in "Show accounts that integrate with"	High	Fix Released
Bug #1052375: The online account g-c-c interface doesn't support i18n	High	Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
David King (community)		2012-09-19	Approve on 2012-09-19
Review via email: mp+125113@code.qastaging.launchpad.net

Description of the change

Allow translating the .application file

Also, include the change from
https://code.launchpad.net/~amigadave/unity-lens-gdocs/application-description/+merge/123725

Revision history for this message

David King (amigadave) wrote on 2012-09-19:

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.

review: Needs Fixing

Revision history for this message

Alberto Mardegan (mardy) wrote on 2012-09-19:

Filed https://bugs.launchpad.net/python-distutils-extra/+bug/1052786 about that. I'll try to find a way to support that option locally.

lp://qastaging/~mardy/unity-scope-gdrive/i18n updated on 2012-09-19

15. By Alberto Mardegan on 2012-09-19: Do not merge translations into libaccounts XMl files

Revision history for this message

David King (amigadave) wrote on 2012-09-19:

Looks better now, I just have one request: please fix the desktop file associated with the application. "unity-2d-shell.desktop" does not exist on my system, and it is a lie anyway. :)

review: Approve

lp://qastaging/~mardy/unity-scope-gdrive/i18n updated on 2012-09-19

16. By Alberto Mardegan on 2012-09-19: Add desktop file and icon

Revision history for this message

David King (amigadave) wrote on 2012-09-19:

178 +Categories=Dash Search Plugins

This is not a valid category. You can validate the desktop file using "desktop-file-validate" from desktop-file-utils. Something valid and suitable might be:

Categories=Office;Viewer;

Alternatively, check the list of registered categories in the XDG Desktop Menu specification:

http://standards.freedesktop.org/menu-spec/latest/apa.html

review: Needs Fixing

Revision history for this message

David King (amigadave) wrote on 2012-09-19:

The Encoding key is also deprecated.

lp://qastaging/~mardy/unity-scope-gdrive/i18n updated on 2012-09-19