am 269f141b: (-s ours) am cfdc91b9: am 58df3cfa: Import translations. DO NOT MERGE
* commit '269f141beda5034ad8dfdb612104711b0d0315ad': Import translations. DO NOT MERGEmain
commit
0afbd6fd1c
* commit '269f141beda5034ad8dfdb612104711b0d0315ad': Import translations. DO NOT MERGEmain