am 9ca833b2: (-s ours) am 99b126e8: (-s ours) Import translations. DO NOT MERGE

* commit '9ca833b2692476d1c12d471c2622c51b99319bfc':
  Import translations. DO NOT MERGE