am c687312a: (-s ours) am 2d64aeb0: (-s ours) Import translations. DO NOT MERGE

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