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

Change-Id: I899e44d9ca7408470029e37de56d0e0509a499ad