am 2ef9983d: (-s ours) am 855f0d26: (-s ours) Import translations. DO NOT MERGE automerge: c7df50c -s ours automerge: 967c000 -s ours
* commit '2ef9983d4eff175364fd963db7df8a8392b5bd4e': Import translations. DO NOT MERGE
This commit is contained in: