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

Change-Id: I87b460d3f477ab36826ff5c0241a9ce05c8a9a10