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

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