[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 8292b6bb44 -s ours
am: 7acde27742 -s ours
am skip reason: subject contains skip directive

Change-Id: I1204da01e85ec613be326660baf730dec21c3d8e