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

Change-Id: I2d08d4d24d9324c4555069f70114b5946036ec72