am 68599af0: (-s ours) am b148e621: (-s ours) Import translations. DO NOT MERGE

* commit '68599af02c7d7b6a022916a6b50c973aaae87a02':
  Import translations. DO NOT MERGE