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

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