[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 67afe87617
-s ours
am: 1b86d59384
-s ours
am skip reason: subject contains skip directive
Change-Id: I420655e2749fafc0543cc7f8aa79af1d43f17edc
This commit is contained in: