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