Added new Docbook wrapping method and fixed a bug that was causing some strings to be pulled for translation that shouldn't have been.