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

Change-Id: I658c3f3345eead84d37f7922fdc66ce55750101e