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

Change-Id: I7dc1e7113f4719f1a7e47fe0af69de10f7237de3