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

Change-Id: I7fb455119ad1e0b4fc1b442a3483106cab7758b8