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

Change-Id: I3ff200f8e546795d97aef1fc492a14866d1f26d4