am 8a866d6f: (-s ours) am f68ef910: (-s ours) am cdc4c1dc: (-s ours) Import translations. DO NOT MERGE * commit '8a866d6f': Import translations. DO NOT MERGE