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