am 97dd8c21: (-s ours) am 591f23a6: (-s ours) Import translations. DO NOT MERGE

* commit '97dd8c21efa751ebcaeaf4f10f40450bfa245f69':
  Import translations. DO NOT MERGE