am 634fbcf8: (-s ours) am 2785892d: (-s ours) Import translations. DO NOT MERGE

* commit '634fbcf8a3a367ef0abbc7a905411c7918281394':
  Import translations. DO NOT MERGE