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

Change-Id: I9afbae67748a98fed5c6a513c415e8bf52ff6d13