am 084e062a: (-s ours) am 9dd00e7a: am aaa6299b: (-s ours) am 24c8645a: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '084e062a90806080beb892588bb6aca68e5c0cc1' * commit '084e062a90806080beb892588bb6aca68e5c0cc1':
This commit is contained in: