am fa79517b: (-s ours) am a2b359cd: (-s ours) Import translations. DO NOT MERGE

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