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

Change-Id: I431e6368b9bf0d1ee69ab905a7d4011789d3f2c2