am 835c0b74: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-indigo-rose

* commit '835c0b74f0bb5fc7d66c561cc9f501f669b0d41a':
  Import translations. DO NOT MERGE