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

Change-Id: Ifae9fe48ef591c9e2c82af7e1ab0fa598fca6cbb