[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: abff0ad0e3
-s ours
am skip reason: subject contains skip directive
Change-Id: I82d7a41da78f4ee69f786cfa7a7681ea21438af1
main
commit
7c609c0cc4