am 082541a7: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit '082541a730e56092b948580a8e8040be78979e23':
  Import translations. DO NOT MERGE