[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 55a5388280 -s ours
am: 8237048fb0 -s ours
am skip reason: subject contains skip directive

Change-Id: I01bd7e707b7758d8221db45dd341f0b3745947df