am 20aa0113: (-s ours) Import translations. DO NOT MERGE

* commit '20aa01132b0d4bf3af891f9131fbe9a96c8fa708':
  Import translations. DO NOT MERGE