[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: ab6ef4f0df -s ours am: 3633c30ccd -s ours
am: 358c2af533 -s ours
am skip reason: subject contains skip directive

Change-Id: I662703425358262619b3a117eacda82775abd6a6