[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 6aa3f38983 -s ours
am: 1daf3587cb -s ours
am skip reason: subject contains skip directive

Change-Id: Iacbe765bde8186815348d60fcdc2cbac47c2f24a