am c4b29ac9: (-s ours) am 0e81e747: (-s ours) Import translations. DO NOT MERGE

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