           App.Translation.refresh( { id: object[0], source: object[1], target: object[2], locale: @locale } )
     )
 
-  translate_inline: ( string, args... ) =>
-    @translate( string, args... )
+  translateInline: ( string, args... ) =>
+    @escape( @translate( string, args... ) )
 
-  translate_content: ( string, args... ) =>
-    translated = @translate( string, args... )
+  translateContent: ( string, args... ) =>
+    translated = @escape( @translate( string, args... ) )
 #    replace = '<span class="translation" contenteditable="true" data-text="' + @escape(string) + '">' + translated + '<span class="icon-edit"></span>'
     if App.Config.get( 'Translation' )
       replace = '<span class="translation" contenteditable="true" data-text="' + @escape(string) + '">' + translated + ''

    # search %s
    for arg in args
      translated = translated.replace(/%s/, arg)

    # escape
    translated = @escape(translated)

    @log 'i18n', 'debug', 'translate', string, args, translated


  @translateContent: ( string, args... ) ->
    if _instance == undefined
      _instance ?= new _Singleton
    _instance.translateContent( string, args )

  @translatePlain: ( string, args... ) ->
    if _instance == undefined
      _instance ?= new _Singleton
    _instance.translatePlain( string, args )

  @translateInline: ( string, args... ) ->
    if _instance == undefined
      _instance ?= new _Singleton
    _instance.translateInline( string, args )

  @translateTimestamp: ( args ) ->
    if _instance == undefined
