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