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

Change-Id: I3cb8649a4a3e6177bbf17fc20faac7b9c018a216