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

Change-Id: I82105c48c3cecc5c985a4d7b3049226b77180763