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

Change-Id: Icba16c513d008c3cf8e617094b3e808bf8f5b18b