am 91baff48: (-s ours) am a2edad16: (-s ours) am 796e3c3f: (-s ours) Import translations. DO NOT MERGE

* commit '91baff4826343738eb06229a330d269e8704cc45':