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

Change-Id: I62a8c4284e072a277051baaeecb89f60c6fee6e4