am ae88bd60: (-s ours) am 6fd8ce22: (-s ours) Import translations. DO NOT MERGE

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