am 05f79758: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '05f79758cd2688f89444a38baba326a0a1c1a438': Import translations. DO NOT MERGE
This commit is contained in: