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

Change-Id: I3543668871316bb18f700c0f5fa7c94ea46212ee