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

* commit '8a901a6133308d8cc15dfbad1e96f1aa09028b9b':
  Import translations. DO NOT MERGE