[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 4061ed5736 -s ours
am: 751578eb61 -s ours
am skip reason: subject contains skip directive

Change-Id: If05fe8e1477e2f0a875daf090155a55ee12e795c