Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
Geoff Mendal [Tue, 2 Feb 2016 16:46:40 +0000 (16:46 +0000)]

Trivial merge