am 805d423d: (-s ours) am e3f4f893: (-s ours) Import translations. DO NOT MERGE

* commit '805d423da669434c779b3703bc9a41fe7367169e':
  Import translations. DO NOT MERGE