am 496cdc32: (-s ours) am 88f4c6b1: (-s ours) Import translations. DO NOT MERGE

* commit '496cdc32d5a47c2f74d0f78ecd0477dd8dc39f16':
  Import translations. DO NOT MERGE