am 8b2d8dc9: (-s ours) am ea8d6329: (-s ours) Import translations. DO NOT MERGE
* commit '8b2d8dc940519f34ed773268e55183dd05b32b19': Import translations. DO NOT MERGEmain
commit
e429dcfd98
* commit '8b2d8dc940519f34ed773268e55183dd05b32b19': Import translations. DO NOT MERGEmain