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

Change-Id: Icc0afd688ddff4cd22509215ba5ddd3225579811