am 2aeff372: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '2aeff372095d716ccd066be400679b361fb19f41':
  Import translations. DO NOT MERGE