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

Change-Id: I30cb4d57dde6ff8aafd65c849a1a011a77d86bb4