am 6aea6b9d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '6aea6b9da7b779ff5f08da631f30bc5f177a3423':
  Import translations. DO NOT MERGE