am 08f1d439: (-s ours) am 05404105: (-s ours) Import translations. DO NOT MERGE

* commit '08f1d439c7a278b0cd9afd60f2ba41e846f40543':
  Import translations. DO NOT MERGE