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

Change-Id: Ib31b020552c1df5a2790759cfd1ef46b0a1512bc