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

Change-Id: Id4e3cf77ac0c63458cb1c773f97199f702815dda