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

Change-Id: Id65065656d3a8adc237ecc2410ceab20a14bca2b