am 06b38f8b: (-s ours) am ecf78498: (-s ours) Import translations. DO NOT MERGE
* commit '06b38f8bd03884cbc763642013d8993abafe14c0': Import translations. DO NOT MERGEmain
commit
da19a4ce9b
* commit '06b38f8bd03884cbc763642013d8993abafe14c0': Import translations. DO NOT MERGEmain