[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: ea59105148
-s ours
am: 74cc0f8c3e
-s ours
am skip reason: subject contains skip directive
Change-Id: I0250acb21cfc060f4ac19b0206e50e5ef26adde1
main
commit
286429b34c