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

Change-Id: I5860e36942041c1d6070c0c7b84dc2b8a3b2ee5a