am 4fdde2b5: (-s ours) am 2b802ceb: (-s ours) am cd6e6034: (-s ours) am d0d54fc1: (-s ours) Import translations. DO NOT MERGE
* commit '4fdde2b56fee192ea787a68d37fc4dc0ee0fab6e': Import translations. DO NOT MERGE
This commit is contained in: