am d46f31f6: (-s ours) am eb7ed429: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit
* commit 'd46f31f60cc502c1403fa8210861294b10fe2994': Import translations. DO NOT MERGE
This commit is contained in: