am 817e6042: (-s ours) am bc8c7914: (-s ours) am 1992d5a1: (-s ours) Import translations. DO NOT MERGE
* commit '817e60422ae3c1fe9f2ba4cea0252d2975711ba5':
This commit is contained in: