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

Change-Id: Ibdbcf6f0094782d13c57be50582b6671cd41dfa4