[Merge] lp:~ken-vandine/content-hub/rtm-lp1394211 into lp:content-hub/rtm-14.09

[Ken VanDine]

Ken VanDine has proposed merging lp:~ken-vandine/content-hub/rtm-lp1394211 into lp:content-hub/rtm-14.09.

Commit message:
Fixed conflict with nih-dbus and our own i18n wrapper


Requested reviews:
  Ubuntu Phablet Team (phablet-team)
Related bugs:
  Bug #1394211 in content-hub (Ubuntu): "Download complete dialog is shown untranslated"
  https://bugs.launchpad.net/ubuntu/+source/content-hub/+bug/1394211

For more details, see:
https://code.launchpad.net/~ken-vandine/content-hub/rtm-lp1394211/+merge/242262

Fixed conflict with nih-dbus and our own i18n wrapper

-- 
Your team Ubuntu Phablet Team is requested to review the proposed merge of lp:~ken-vandine/content-hub/rtm-lp1394211 into lp:content-hub/rtm-14.09.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 3853 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20141119/9bfef724/attachment-0001.diff>