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

Change-Id: I931de961774f8f4a3209802a612cd963108dbea0