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

Change-Id: Ie05e225f4a0ce0bb00b05fbef0768843f7504f49