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

Change-Id: Ibd59faea3e27fa85623a6b0e0170bda6b599e81d