[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: c26bc89520 -s ours
am: 3c3317af36 -s ours
am skip reason: subject contains skip directive

Change-Id: I3485b5e2ad34c77211c8a54f5cbcac90500f3e0e