[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 8931739c16 -s ours
am: a6e7345636 -s ours
am skip reason: subject contains skip directive

Change-Id: I1d5193e298818d94425d28492caaafcf4d6ea295