am bb23697a: (-s ours) am d58d91ef: (-s ours) am 2ae0419f: (-s ours) Import translations. DO NOT MERGE

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