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

Change-Id: I450da3f61f0baaa0fcf5789244793859ce0cf2f0