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

Change-Id: I7dc7fb9d346ba377c5b72abceaf24680c89227a2