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

Change-Id: I6b11220567a0491323c6eb2ff0f7527a0d00ac26