Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 921a346  -s ours
am: efd58d9  -s ours

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