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

Change-Id: I5a1c6f0754b8468f53f7c2a3d1333dcf27fc5d8a