am 14bca947: (-s ours) am cdf5ecc8: Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev

* commit '14bca94708363f3a22d741aad9e63132e903397e':
  Import translations. DO NOT MERGE