Bug 851473 - Include the correct prompt string when switching from/to permanent private browsing mode in the preferences dialog; r=jdm a=bajaj

--HG--
extra : transplant_source : %D5%DC%D6/2%DD%80%9A%F7Q%90Nm%D8%0C%D5B%C5%F4%0C
bug 851495 - add Khmer to table of scripts requiring shaping support. r=jdaggett a=bajaj