Merge "Update the string of both magnification settings and gesture navigation...
Merge "Update the string of both magnification settings and gesture navigation tutorial dialog" into qt-dev am: 68aa4e49 am: 267321cd
am: d20fa646
Change-Id: I2ba78f260e539bee65f3e2a9aae42229f8573dc4