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

Change-Id: Ic727e25a1c2975c797a6425fb662d2f5575ad19c