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

Change-Id: I309bb668f7f4ca91102b866bc07415796ac3fbec