[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 512b97f994
-s ours
am: ebe3b061ee
-s ours
am skip reason: subject contains skip directive
Change-Id: I52650b820e4fdd59714e89fd1e84cdac1eb1a34c
This commit is contained in: