am c29121ba: (-s ours) am 0961a545: (-s ours) Import translations. DO NOT MERGE

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