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

Change-Id: Iff64d278eb7d1d18e0ef22f8ad65f22f3cf0d323