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

Change-Id: I193fde9d1ccf34995e8e41a7cc3754ef69abacf4