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

Change-Id: I8fe26cb9c7b071c25d8961c9c0139f4e20d314dc