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

Change-Id: I4eff119da425ecfc9f2170489435e453cfe4411c