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

Change-Id: If4ad59dbba3e9a70dae108abecad17471eb87403