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

Change-Id: Iaf26109ee01cc4264b7f046bdd8963f0e95a51f4