[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: f63cb669ff -s ours am: 50dc17d8bc -s ours
am: 25bfe44ee6 -s ours
am skip reason: subject contains skip directive
Change-Id: I010cbf748db824b397032e8e7601997fed63feec
This commit is contained in: