am 04250824: (-s ours) Import translations. DO NOT MERGE
automerge: 3f2ece6 -s ours
* commit '3f2ece6ceae3923dca0d54b2e65fa16e79e3752c':
Import translations. DO NOT MERGE
This commit is contained in: