am 9004fe9a: (-s ours) Import translations. DO NOT MERGE
automerge: 712608d -s ours
* commit '712608d356b5a7b1f4e0cb9a955009a70e7f7a2a':
Import translations. DO NOT MERGE
This commit is contained in: