am e0cb8284: (-s ours) am e13a3013: Import revised translations. DO NOT MERGE
Merge commit 'e0cb828472ca680eba7371dfb042fe783baae8c7' * commit 'e0cb828472ca680eba7371dfb042fe783baae8c7': Import revised translations. DO NOT MERGEmain
commit
e3b34081d6