[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: c7a7eaa776 -s ours
am: 251258f382 -s ours
am skip reason: subject contains skip directive
Change-Id: I3bcc04339ba1cce8fa29aef95841da58264fb781
This commit is contained in: