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

Change-Id: I0231c0a9b3ce5c80ead63666f7a2c7584b4c3967