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

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