[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: e801eb78f0
-s ours
am skip reason: subject contains skip directive
Change-Id: I4a4242e21d022e82b969b4d7eb7b2156f4cc82e3
main
commit
ffe1c80f35