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

Change-Id: I3b745e0a1d32d3261f71786df21112b9bc528f75