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

* commit '35424cc2a6643609f82349c6903e1ee7c2d073dc':
  Import translations. DO NOT MERGE