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

Change-Id: I9e814d15fdf82faae92e02a216f5d4bf6ba19ac0