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

Change-Id: I03bbddaced7e70dc51f32aad95b8b52318d454a3