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

Change-Id: I5f1e1708b3c0c0845643cd4b3c0756f06e5c0ffd