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

Change-Id: Ibef4696cf7a55802d4a3edf66d0fb222b9089c1a