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

Change-Id: I2f33c36e4938c6929d6faceab6f03884e5e37878