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

Change-Id: I2a131da1ad0218a02bf49a9929a04405d1023315