am b8ecb297: (-s ours) am 5204b662: am 9ef9801f: (-s ours) am 0512f51f: (-s ours) Import revised translations. DO NOT MERGE
Merge commit 'b8ecb2977928e26ac93d083134e6a18aec29fcb1' * commit 'b8ecb2977928e26ac93d083134e6a18aec29fcb1':
This commit is contained in: