[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: c96234e71c
-s ours
am: 67f5074f2b
-s ours
am skip reason: subject contains skip directive
Change-Id: I170fbecbd52c7a5329869990e392d74ee2f032af
main
commit
174840a530