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

Change-Id: I02488c7e87859d70106e7f0b97ccacf8a93abe3f