am ade9346e: (-s ours) am 3b09d33c: (-s ours) Import translations. DO NOT MERGE

* commit 'ade9346ee34974f74ca2f61e6e5f7662926b7c22':
  Import translations. DO NOT MERGE