am 28739294: (-s ours) am 90b69615: (-s ours) Import translations. DO NOT MERGE

* commit '28739294c1020bde477a44bd42575d8c640ddc18':
  Import translations. DO NOT MERGE