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

Change-Id: I3444044e42260385e0e207cba35cd6d610b36cfb