am c7206510: (-s ours) am ca8c001f: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit 'c720651001117d67f4aca62350979b2854a88de5': Import translations. DO NOT MERGEmain
commit
c355d63a80
* commit 'c720651001117d67f4aca62350979b2854a88de5': Import translations. DO NOT MERGEmain