am 6019758b: (-s ours) am 1b02ce54: (-s ours) Import translations. DO NOT MERGE

* commit '6019758bf024a0ad13ea8c8008519ff23f2bf43e':