[automerger skipped] Merge "Import translations. DO NOT MERGE" into...

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

Change-Id: I9c68d57b765fe91b674a35f8e504fd2365894f12