am 297c781b: (-s ours) am 8ec1ba6d: am c08efb27: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '297c781b921e9f48bdbba5bc0a4abd3e12edb98e' * commit '297c781b921e9f48bdbba5bc0a4abd3e12edb98e': Import revised translations. DO NOT MERGE
This commit is contained in: