am 038707b4: (-s ours) am ce2e385c: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-master

* commit '038707b4f74428d0468e6966106e5c4372252036':
  Import translations. DO NOT MERGE