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

* commit '79c489389a53c1bc358bac994bc52b1ee99b85e4':
  Import translations. DO NOT MERGE