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

Change-Id: Ife330f63a9eb9895465ff58dcb229110eea28e5c