am 869df29e: (-s ours) am c1ac011a: (-s ours) Import translations. DO NOT MERGE am: 35424cc2a6  -s ours am: 8a901a6133  -s ours
am: 6cf8795a68  -s ours

* commit '6cf8795a688fb2cf45a990114453d2dfa667bf75':
  Import translations. DO NOT MERGE