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

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