am f256f49f: (-s ours) am 258bd63f: (-s ours) am 6e15a49e: (-s ours) Import translations. DO NOT MERGE

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