Merge proposals dependent on lp://qastaging/~mikemc/ubuntuone-control-panel/use-translations-1074116

lp://qastaging/~mikemc/ubuntuone-control-panel/use-translations-1074116 has no merge proposals.