am a1754194: (-s ours) am e62c9069: am 05e16515: (-s ours) am cb5624b8: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit 'a17541940f6e6169956b8be3bf191eec06a8285d': Import translations. DO NOT MERGE
This commit is contained in: