[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 6562981448
-s ours am: 786dd43b9e
-s ours
am: 882969d4f5
-s ours
am skip reason: subject contains skip directive
Change-Id: I9909ae6aea36ee803c04f2fa13309df630691ba3
main
commit
d7911332cc