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

Change-Id: Ib835b3160d2394d5e1f177f16065b653804d62bd