[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: f63cb669ff -s ours am: 1e7de9c312 -s ours
am: 004b9882e7 -s ours
am skip reason: subject contains skip directive
Change-Id: Ib41894386f8fb461c6f017edaa50505a56a5e843
This commit is contained in: