am 4d34d6e8: (-s ours) am 5382925f: (-s ours) am 5b120dfd: (-s ours) am 788475e9: (-s ours) am 7881f431: (-s ours) am e0916aec: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-indigo-rose

* commit '4d34d6e8847cf0fb9b1d30b4f06d3c9e86c6a09e':