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

Change-Id: I3b319306b19b021f455d0764ea3a2abf2d923904