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

Change-Id: I61f5482e934631476aedef0e3dece656489da873