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