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

Change-Id: I92946352d33dde8674731be448b73d8b972abb9f