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

Change-Id: I22d56ba044543ee2389402ca28ae5ecf49b4a9cc