diff --git a/source/Ox.UI/js/Form/InsertHTMLDialog.js b/source/Ox.UI/js/Form/InsertHTMLDialog.js
index 2bc2f08a..c637ec8d 100644
--- a/source/Ox.UI/js/Form/InsertHTMLDialog.js
+++ b/source/Ox.UI/js/Form/InsertHTMLDialog.js
@@ -152,7 +152,7 @@ Ox.InsertHTMLDialog = function(options, self) {
 
     self.$select = Ox.Select({
             items: self.items,
-            label: 'Insert',
+            label: Ox._('Insert'),
             labelWidth: 128,
             value: 'img',
             width: 384
diff --git a/source/Ox.UI/js/Map/MapEditor.js b/source/Ox.UI/js/Map/MapEditor.js
index 8f677512..362a46d0 100644
--- a/source/Ox.UI/js/Map/MapEditor.js
+++ b/source/Ox.UI/js/Map/MapEditor.js
@@ -309,7 +309,7 @@ Ox.MapEditor = function(options, self) {
                     }),
                 self.$findInput = Ox.Input({
                         clear: true,
-                        placeholder: 'Find in List',
+                        placeholder: Ox._('Find in List'),
                         width: 234
                     })
                     .bindEvent({
@@ -385,7 +385,7 @@ Ox.MapEditor = function(options, self) {
     self.$map = Ox.Map({
             clickable: true,
             editable: true,
-            findPlaceholder: 'Find on Map',
+            findPlaceholder: Ox._('Find on Map'),
             height: self.options.height,
             places: self.options.places,
             //statusbar: true,
@@ -951,11 +951,7 @@ Ox.MapEditor = function(options, self) {
     }
 
     function initList(data) {
-        self.$status.html(
-            Ox.formatNumber(data.items) + ' Place' + (
-                data.items == 1 ? '' : 's'
-            )
-        );
+        self.$status.html(Ox.formatCount(data.items, 'Place'));
     }
 
     function openItem(data) {
diff --git a/source/Ox.UI/js/Video/AnnotationFolder.js b/source/Ox.UI/js/Video/AnnotationFolder.js
index d55fc83c..468f0136 100644
--- a/source/Ox.UI/js/Video/AnnotationFolder.js
+++ b/source/Ox.UI/js/Video/AnnotationFolder.js
@@ -122,7 +122,7 @@ Ox.AnnotationFolder = function(options, self) {
             id: 'add',
             style: 'symbol',
             title: 'add',
-            tooltip: Ox._('Add {0}', self.options.item),
+            tooltip: Ox._('Add {0}', [self.options.item]),
             type: 'image'
         })
         .bindEvent({
diff --git a/source/Ox.UI/js/Video/ClipPanel.js b/source/Ox.UI/js/Video/ClipPanel.js
index 8af97c25..3500806d 100644
--- a/source/Ox.UI/js/Video/ClipPanel.js
+++ b/source/Ox.UI/js/Video/ClipPanel.js
@@ -64,9 +64,9 @@ Ox.ClipPanel = function(options, self) {
                     {id: 'grid', title: Ox._('View as Grid'), checked: self.options.view == 'grid'},
                 ]},
                 {},
-                {id: 'split', title: 'Split Clip(s) at Cuts', disabled: true},
-                {id: 'join', title: 'Join Clip(s) at Cuts', disabled: true},
-                {id: 'dereference', title: 'Make Clip(s) Static', disabled: true}
+                {id: 'split', title: Ox._('Split Clip(s) at Cuts'), disabled: true},
+                {id: 'join', title: Ox._('Join Clip(s) at Cuts'), disabled: true},
+                {id: 'dereference', title: Ox._('Make Clip(s) Static'), disabled: true}
             ],
             title: 'set',
             tooltip: Ox._('Options'),
diff --git a/source/Ox.UI/js/Video/VideoPlayer.js b/source/Ox.UI/js/Video/VideoPlayer.js
index 03bcf611..7f51c55b 100644
--- a/source/Ox.UI/js/Video/VideoPlayer.js
+++ b/source/Ox.UI/js/Video/VideoPlayer.js
@@ -778,9 +778,9 @@ Ox.VideoPlayer = function(options, self) {
                     self.positionWidth = getPositionWidth();
 
                     self.$position = Ox.Element({
-                            tooltip: self.options.type == 'play' ? 'Position'
+                            tooltip: Ox._(self.options.type == 'play' ? 'Position'
                                 : self.options.type == 'in' ? 'In Point'
-                                : 'Out Point'
+                                : 'Out Point')
                         })
                         .addClass('OxPosition')
                         .css({