am 48ad967b: (-s ours) am 98d24469: (-s ours) Import translations. DO NOT MERGE

* commit '48ad967b74a3935f7e3f16d06265aac2fc82afa8':
  Import translations. DO NOT MERGE