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

Change-Id: I8a8e21de0dc7731cfb2c28cc7f6bcb3bdddb4c4f