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

Change-Id: I31a5e2af717be18efc6324ed51c797c816bd07ab