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

Change-Id: I20abdd0866faa94de019f2fe530fe833114796e6