am 00950bf4: (-s ours) am 1c820785: (-s ours) Import translations. DO NOT MERGE

* commit '00950bf4016cafe475b71ef5720c079758687997':
  Import translations. DO NOT MERGE