am d84a3249: (-s ours) am bc226ce9: (-s ours) am d060ed99: Import revised translations. DO NOT MERGE
* commit 'd84a3249735891f030440f17cf2ca30ea22f444a': Import revised translations. DO NOT MERGEmain
commit
3b24b2bde7
* commit 'd84a3249735891f030440f17cf2ca30ea22f444a': Import revised translations. DO NOT MERGEmain