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

Change-Id: I1ec4fe08b29d0879ac9f494d09449e47b91ac110