am fe772b67: (-s ours) am b78250d0: (-s ours) Import translations. DO NOT MERGE

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