am 0dac1504: (-s ours) am e76ce140: (-s ours) Import translations. DO NOT MERGE

* commit '0dac150402dd11f80f71a230b20e5a82accc1927':