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

* commit '19e93807dc1784f535a1c0b29bcbecd6093fd34d':