[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 9223659928
-s ours am: 545560b547
-s ours
am: bea0b23926
-s ours
am skip reason: subject contains skip directive
Change-Id: I477764102ed76b9d802ba410a68245e823acc188
main
commit
46deb644e0