[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 1feb0dfde8 -s ours
am: 0df7443054 -s ours
am skip reason: subject contains skip directive
Change-Id: I145c27b3f368aafdb735333bbcde9ffab79c6c2b
This commit is contained in: