[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 67afe87617
-s ours
am: 1b86d59384
-s ours
am skip reason: subject contains skip directive
Change-Id: I2aa2952eec13d8c7fcb0ae1eeb437e780ef8c818
This commit is contained in: