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

Change-Id: I33db0fe88e381802ae508c2d3a652600540afbb1