[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: c38c7db007
-s ours
am: c993143422
-s ours
am skip reason: subject contains skip directive
Change-Id: Ia860d2b8937f1805c3a51d0dff750ee7ecff4a84
main
commit
76919956c4