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

Change-Id: Id627e7ef0fbcf5e9f6657eb1bace529ca36880b3