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

Change-Id: I4f33b4d7230f327934c3572c2f8a89e0b1b5adeb