[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: Iccd8a20d4268b2de81f006ed55daaa2c4d64237f