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

Change-Id: I63d5149da0b1657a976be5004f2199b0ec798068