am 69ee3c6e: (-s ours) am 85fa405a: Import revised translations. DO NOT MERGE
* commit '69ee3c6e8b09b92b93a7a9d099501c7eaa3f0828': Import revised translations. DO NOT MERGEmain
commit
a46b5e684c
* commit '69ee3c6e8b09b92b93a7a9d099501c7eaa3f0828': Import revised translations. DO NOT MERGEmain