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

Change-Id: I73adc6470ae79ab5f948be804a36ab4e5ed982de