am 165c7521: (-s ours) am 879da353: (-s ours) am e57e462a: (-s ours) Import translations. DO NOT MERGE

* commit '165c7521ae918a6dcf306043f3d4a5d897af02f5':
  Import translations. DO NOT MERGE