[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: e42eefbaca -s ours
am: c67a57d7be -s ours
am skip reason: subject contains skip directive

Change-Id: Ica11afbd02a1f00542b29c57984c5da0ae04cd70