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

Change-Id: Ibad3b67a5257fb2bec72bb305d6dbb097d3acaa0