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