am 5f87bb02: (-s ours) am c2d1fdac: (-s ours) am d82e8f2b: (-s ours) Import translations. DO NOT MERGE
* commit '5f87bb027ce5799ce88da15f88ca4b4f36f88007': Import translations. DO NOT MERGE
This commit is contained in: