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

Change-Id: If0c210a99446b120b51b760242d9a98945037f70