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

Change-Id: I6582042ffcb84d3f9fb1f419c40483217d6d1075