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

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