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

Change-Id: Icb85eb173a3b25046019429b2318836e86ea5b15