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

Change-Id: Ic3e648121dcf4f59ce92ab8dc874733ebe56261a