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

Change-Id: If9f84d92600b2538a44a4c1b19c4153fca25f3f9