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

Change-Id: I28f0b3c2a697fea0460cb33baf9fe568218d848a