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

Change-Id: I8c3d8eb6b098fd39c67eaf48d309372cb0a6a3f2