[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 279050c8d6 -s ours am: a5830871e2 -s ours
am: eb1a0a85b9 -s ours
am skip reason: subject contains skip directive
Change-Id: Ife42f37f66f10581c4cf78cd8fb83b68f1c924bf
This commit is contained in: