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

Change-Id: Ifb177da0da34e78960a0e5929f8738d46d8883af