[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 01d889815d
-s ours
am: f6fd739942
-s ours
am skip reason: subject contains skip directive
Change-Id: Ie174a01aafefb1e84e422ea360ed61f05f5eac62
This commit is contained in: