diff --git a/extensions/venkman/resources/locale/en-US/venkman.properties b/extensions/venkman/resources/locale/en-US/venkman.properties
index 454b075d7e1..7ce3f8a329a 100644
--- a/extensions/venkman/resources/locale/en-US/venkman.properties
+++ b/extensions/venkman/resources/locale/en-US/venkman.properties
@@ -3,7 +3,7 @@ err.notimplemented = Not implemented
 err.required.param = Missing required parameter %1$S
 err.invalid.param  = Invalid value for parameter %1$S (%2$S)
 # 1 url, 2 fileName, 3 lineNumber, 4 reason
-err.subscript.load = Error loading subscript from %1$S, %2$S, line %3$S: %4$S
+err.subscript.load = Error loading subscript from <%1$S>, %2$S, line %3$S: %4$S
 err.no.debugger    = JS Debugger Service is not installed.
 err.failure        = Unclassified failure.
 err.no.stack       = No Stack
@@ -14,11 +14,11 @@ msg.err.nosource        = No source for current script
 msg.err.nocommand       = No such command, ``%1$S''
 msg.err.notimplemented  = Sorry, ``%1$S'' has not been implemented
 msg.err.ambigcommand    = Ambiguous command, ``%1$S'', %2$S commands match [%3$S]
-msg.err.bp.noscript     = No scripts loaded for ``%1$S''
-msg.err.bp.noline       = No scripts loaded for ``%1$S'' contain line %2$S
-msg.err.bp.nodice       = No breakpoint set at %1$S:%2$S
+msg.err.bp.noscript     = <%1$S> URL not loaded
+msg.err.bp.noline       = <%1$S> contains no code at line %2$S
+msg.err.bp.nodice       = No breakpoint set at <%1$S> line %2$S
 msg.err.bp.noindex      = No breakpoint at index %1$S
-msg.err.source.load.failed = Error loading source for URL ``%1$S''
+msg.err.source.load.failed = Error loading source for URL <%1$S>
 msg.err.startup         = An exception occurred while initializing, please file a bug.\n%1$S
 msg.err.cant.close      = Cannot exit, execution in progress.
 
@@ -65,11 +65,11 @@ msg.callstack       = Call Stack
 ## messages ##
 msg.stop             = Stopped for %1$S.
 msg.cont             = Continuing from %1$S.
-msg.subscript.load   = Subscript %1$S loaded.
+msg.subscript.load   = <%1$S> Subscript loaded.
 # 1 exception name, 2 fileName, 3 lineNumber
-msg.eval.error       = %1$S: %2$S, line %3$S
+msg.eval.error       = %1$S: <%2$S>, line %3$S
 msg.eval.threw       = Caught exception: %1$S
-msg.hello            = Welcome to ``Venkman'', the JavaScript debugger. Visit chrome://venkman/content/tests/testpage.html for a sample debugging target.
+msg.hello            = Welcome to ``Venkman'', the JavaScript debugger. Visit <chrome://venkman/content/tests/testpage.html> for a sample debugging target.
 msg.version          = You are running Venkman version %1$S.
 msg.tip.help         = Use ``help <command-name>'' for help on specific commands.
 msg.no.breakpoints.set = No breakpoints set.
@@ -81,20 +81,23 @@ msg.commandmatch.all = Implemented commands are %1$S.
 msg.props.header     = Properties of %1$S in debug target scope:
 msg.propsd.header    = Properties of %1$S in debugger scope:
 msg.bp.header        = %1$S breakpoints set:
-msg.bp.line          = #%1$S %2$S:%3$S (%4$S scripts match.)
-msg.bp.created       = Breakpoint at %1$S:%2$S created (%3$S scripts match.)
-msg.bp.disabled      = Breakpoint at %1$S:%2$S disabled (%3$S scripts match.)
-msg.bp.cleared       = Breakpoint at %1$S:%2$S deleted (%3$S scripts match.)
-msg.bp.exists        = Breakpoint at %1$S:%2$S already set.
+# 1 index, 2 file name, 3 line, 4 match count
+msg.bp.line          = #%1$S <%2$S> line %3$S (%4$S scripts match.)
+msg.bp.created       = Breakpoint at <%1$S> line %2$S created (%3$S scripts match.)
+msg.bp.disabled      = Breakpoint at <%1$S> line %2$S disabled (%3$S scripts match.)
+msg.bp.cleared       = Breakpoint at <%1$S> line %2$S deleted (%3$S scripts match.)
+msg.bp.exists        = Breakpoint at <%1$S> line %2$S already set.
 msg.fbp.header       = %1$S future breakpoints set:
+# 1 index, 2 file name, 3 line
 msg.fbp.line         = #%1$S %2$S:%3$S
-msg.fbp.created      = Future breakpoint at %1$S:%2$S created.
-msg.fbp.disabled     = Future breakpoint at %1$S:%2$S deleted.
-msg.fbp.exists       = Future breakpoint at %1$S:%2$S already set.
+msg.fbp.created      = Future breakpoint at <%1$S> line %2$S created.
+msg.fbp.disabled     = Future breakpoint at <%1$S> line %2$S deleted.
+msg.fbp.exists       = Future breakpoint at <%1$S> line %2$S already set.
 msg.source.line      = %1$S: %2$S
 msg.tmode.ignore     = Exceptions will now be ignored.
 msg.tmode.trace      = Exceptions will now be traced.
 msg.tmode.break      = Exceptions will now stop the debug target.
+# 1 value, 2 frame
 msg.exception.trace  = Exception %1$S thrown from %2$S.
 
 ## property value flags ##
@@ -113,9 +116,9 @@ fmt.argument = %1$S=%2$S
 # 1: property flags, 2: property name, 3: property value
 fmt.property = [%1$S] %2$S = %3$S
 # 1: function name, 2: filename
-fmt.script = function %1$S in %2$S
+fmt.script = function %1$S in <%2$S>
 # 1: function name, 2: arguments, 3: filename, 4: line number
-fmt.frame = function %1$S(%2$S) in %3$S, line %4$S
+fmt.frame = function %1$S(%2$S) in <%3$S> line %4$S
 # 1: type, 2: class name, 3: value
 fmt.value.long = [%1$S] [class: %2$S] %3$S
 # 1: type, 2: value
@@ -125,9 +128,9 @@ fmt.value.short = %1$S:%2$S
 # 1: property count
 fmt.object = %1$S properties
 # 1: JS exception name, 2: error text, 3: file name, 4: line number
-fmt.jsexception = %1$S: %2$S @ %3$S:%4$S
+fmt.jsexception = %1$S: %2$S @ <%3$S> %4$S
 # 1: error number,  2: error text, 3: file name, 4: line number, 5: function name
-fmt.badmojo = BadMojo %1$S: %2$S @ %3$S:%4$S (%5$S)
+fmt.badmojo = BadMojo %1$S: %2$S @ <%3$S> line %4$S (%5$S)
 # 1: var number, 2: value
 fmt.tmp.assign = $[%1$S] = %2$S
 # 1: string length