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

Change-Id: I635028b134c142b4e91172b83b9528b58e8cd3b7