[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 9d6d37ad3a -s ours
am: e634446beb -s ours
am skip reason: subject contains skip directive
Change-Id: I73158432257a57d1e50ae590c51b0ca52e95c19b
This commit is contained in: