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

Change-Id: I44ae5fd2adbf9fec717a65c193cb934b0800d3b9