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

Change-Id: I7af3424dd9b919f6131e1290ad37e433e397a93b