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

Change-Id: I25ff80a01eb1816be70b681808078b9ba986d230