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

Change-Id: Iffa7977a0eb2ed564513d518ee35761e02a2498e