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

Change-Id: I6fa303defc6e688fe37956dd79ba653ee6ee6716