am 31d085ff: (-s ours) Import translations. DO NOT MERGE
* commit '31d085ffca82a7927f8d25f41916b09c1a6e9fbc': Import translations. DO NOT MERGEmain
commit
7b5472bfab
* commit '31d085ffca82a7927f8d25f41916b09c1a6e9fbc': Import translations. DO NOT MERGEmain