Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
Geoff Mendal [Tue, 2 Feb 2016 16:50:12 +0000 (16:50 +0000)]
am: dcd74a8a54  -s ours

* commit 'dcd74a8a549ee25bc4dc9730ba660096e7d88d40':
  Import translations. DO NOT MERGE


Trivial merge