[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: ba8291e6b6 -s ours
am: 544896bd1b -s ours
am skip reason: subject contains skip directive
Change-Id: Ia1dc0a36e303005ba2969844b109299a10fb3abe
This commit is contained in: