am c7f4582c: (-s ours) am 2bc2a994: (-s ours) Import translations. DO NOT MERGE

* commit 'c7f4582c410760105e9eac10597fd5a23257685b':
  Import translations. DO NOT MERGE