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

Change-Id: Id01bda17502dcc4644e76ea1771aa0b1eb64d38d