diff --git a/plugins/UiConfig/UiConfigPlugin.py b/plugins/UiConfig/UiConfigPlugin.py
index 558a21fa..6c6a7982 100644
--- a/plugins/UiConfig/UiConfigPlugin.py
+++ b/plugins/UiConfig/UiConfigPlugin.py
@@ -1,5 +1,11 @@
 from Plugin import PluginManager
 from Config import config
+from Translate import Translate
+from cStringIO import StringIO
+
+
+if "_" not in locals():
+    _ = Translate("plugins/UiConfig/languages/")
 
 
 @PluginManager.afterLoad
@@ -30,7 +36,15 @@ class UiRequestPlugin(object):
                 # If debugging merge *.css to all.css and *.js to all.js
                 from Debug import DebugMedia
                 DebugMedia.merge(file_path)
-            return self.actionFile(file_path)
+
+            if file_path.endswith("js"):
+                data = _.translateData(open(file_path).read(), mode="js")
+            elif file_path.endswith("html"):
+                data = _.translateData(open(file_path).read(), mode="html")
+            else:
+                data = open(file_path).read()
+
+            return self.actionFile(file_path, file_obj=StringIO(data), file_size=len(data))
         else:
             return super(UiRequestPlugin, self).actionUiMedia(path)
 
@@ -45,7 +59,7 @@ class UiWebsocketPlugin(object):
             if key not in config.keys_api_change_allowed:
                 continue
             is_pending = key in config.pending_changes
-            if val == None and is_pending:
+            if val is None and is_pending:
                 val = config.parser.get_default(key)
             back[key] = {
                 "value": val,
@@ -53,4 +67,3 @@ class UiWebsocketPlugin(object):
                 "pending": is_pending
             }
         return back
-
diff --git a/plugins/UiConfig/media/config.html b/plugins/UiConfig/media/config.html
index 407d2acd..752dccf0 100644
--- a/plugins/UiConfig/media/config.html
+++ b/plugins/UiConfig/media/config.html
@@ -15,6 +15,6 @@
 <div class="bottom" id="bottom-save"></div>
 <div class="bottom" id="bottom-restart"></div>
 
-<script type="text/javascript" src="js/all.js"></script>
+<script type="text/javascript" src="js/all.js?rev={rev}&lang={lang}"></script>
 </body>
 </html>