am c7948047: (-s ours) am 37f38236: (-s ours) Import translations. DO NOT MERGE

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