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

Change-Id: I925fe54cbbd0ae21a6b1a4b39456e1f31ff9b759