am 68207e25: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop
am: 6317598a19  -s ours

* commit '6317598a196ada3f32950c7f4a8d5cfe005acf42':