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

Change-Id: I44b43d91d65bee00e54fb67bd7a27d417e48bf8e