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

Change-Id: I38ede1e35baec53683c2721013cf52ff8232ff43