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

Change-Id: If600d8980c99becda73d77b6fb1e652cf538c109