Merge proposals dependent on lp://staging/~matthew.revell/launchpad/translations-help-10.1-pt2

1. translations-help-10.1-pt2
2. Dependent merge proposals