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

Change-Id: I46f8087bac81d03cdbda77b07423d514d5ef109d