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

Change-Id: I0c8629b4901da29af669faa0f441e1e2e8643780