diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 6a938d738..7c415cc96 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -10,6 +10,7 @@
  - fixed #11301: Matrix - Comparing too many products error message
  - fixed #11297: YUI Rich Editor fails to load when editing Survey in 7.7.27
  - fixed #11306: Survey i18n: Loading....
+ - fixed #11307: Survey i18n #2
 
 7.8.7
  - fixed #11278: Wrong test for Template::Toolkit in testEnvironment.pl
diff --git a/lib/WebGUI/i18n/English/Asset_Survey.pm b/lib/WebGUI/i18n/English/Asset_Survey.pm
index 493002a11..1a6ba084d 100644
--- a/lib/WebGUI/i18n/English/Asset_Survey.pm
+++ b/lib/WebGUI/i18n/English/Asset_Survey.pm
@@ -1690,21 +1690,21 @@ section/answer.|,
         lastUpdated => 0,
     },
 
-    'Add Question' => {
-        message => q{Add Question},
-        lastUpdated => 0,
-    },
-
-    'Add Answer' => {
-        message => q{Add Answer},
-        lastUpdated => 0,
-    },
-
     'Survey Objects' => {
         message => q{Survey Objects},
         lastUpdated => 0,
     },
 
+    'Make Default Type' => {
+        message => q{Make Default Type},
+        lastUpdated => 0,
+    },
+
+    'Remove Default Type' => {
+        message => q{Remove Default Type},
+        lastUpdated => 0,
+    },
+
 };
 
 1;
diff --git a/www/extras/wobject/Survey/editsurvey.js b/www/extras/wobject/Survey/editsurvey.js
index a5c4b5342..415796931 100644
--- a/www/extras/wobject/Survey/editsurvey.js
+++ b/www/extras/wobject/Survey/editsurvey.js
@@ -146,7 +146,7 @@ Survey.Data = (function(){
 
 			if (!sButton) {
                 sButton = new YAHOO.widget.Button({
-                    label: Survey.i18n.get('Asset_Survey','Add Section'),
+                    label: Survey.i18n.get('Asset_Survey','add section'),
                     id: "addSection",
                     container: "addSection"
                 });
@@ -155,7 +155,7 @@ Survey.Data = (function(){
 
 			if (!qButton) {
                 qButton = new YAHOO.widget.Button({
-                    label: Survey.i18n.get('Asset_Survey', 'Add Question'),
+                    label: Survey.i18n.get('Asset_Survey', 'add question'),
                     id: "addQuestion",
                     container: "addQuestion"
                 });
@@ -168,7 +168,7 @@ Survey.Data = (function(){
                 YAHOO.util.Dom.setStyle('addAnswer', 'display', 'inline');
 				if (!aButton) {
                     aButton = new YAHOO.widget.Button({
-                        label: "Add Answer",
+                        label: Survey.i18n.get('Asset_Survey',"Add Answer"),
                         id: "addAnswer",
                         container: "addAnswer"
                     });
@@ -215,10 +215,21 @@ YAHOO.util.Event.onDOMReady(function(){
     Survey.i18n = new WebGUI.i18n( {
         'namespaces' : {
             'Asset_Survey' : [
-                'Add Question',
-                'Add Answer',
-                'Add Section',
+                'Make Default Type',
+                'Remove Default Type',
+                'cancel',
+                'add question',
+                'add answer',
+                'add section',
                 'Survey Objects'
+            ],
+            'Asset' : [
+                'Copy'
+            ],
+            'WebGUI' : [
+                'submit',
+                'preview',
+                '576'
             ]
         },
         onpreload   : {
diff --git a/www/extras/wobject/Survey/editsurvey/object.js b/www/extras/wobject/Survey/editsurvey/object.js
index cdaa4cd6d..960834316 100644
--- a/www/extras/wobject/Survey/editsurvey/object.js
+++ b/www/extras/wobject/Survey/editsurvey/object.js
@@ -75,7 +75,7 @@ Survey.ObjectTemplate = (function(){
             document.getElementById('edit').innerHTML = html;
             
             var btns = [{
-                text: "Submit",
+                text: Survey.i18n.get('WebGUI',"submit"),
                 handler: function(){
                     editor.saveHTML();
                     YAHOO.util.Dom.get('texteditortarget').value = editor.getEditorHTML();
@@ -84,25 +84,25 @@ Survey.ObjectTemplate = (function(){
                 },
                 isDefault: true
             }, {
-                text: "Copy",
+                text: Survey.i18n.get('Asset',"Copy"),
                 handler: function(){
                     document.getElementById('copy').value = 1;
                     this.submit();
                 }
             }, {
-                text: "Cancel",
+                text: Survey.i18n.get('Asset_Survey',"cancel"),
                 handler: function(){
                     this.cancel();
                     Survey.Comm.loadSurvey('-');
                 }
             }, {
-                text: "Delete",
+                text: Survey.i18n.get('WebGUI',"576"),
                 handler: function(){
                     document.getElementById('delete').value = 1;
                     this.submit();
                 }
             }, {
-                text: "Preview",
+                text: Survey.i18n.get('WebGUI',"preview"),
                 handler: function(){
                     if (type === 'answer') {
                         alert('Sorry, preview is only supported for Sections and Questions, not Answers');
@@ -119,7 +119,7 @@ Survey.ObjectTemplate = (function(){
             }];
             if(type === 'question'){
                 btns[btns.length] = {
-                    text: "Make Default Type",
+                    text: Survey.i18n.get('Asset_Survey',"Make Default Type"),
                         handler: function(){
                             var name = prompt("Please change name to new type, or leave to update current type",document.forms[0].questionType.value);
                             if(name != null){
@@ -129,10 +129,10 @@ Survey.ObjectTemplate = (function(){
                     }
                 };
                 btns[btns.length] = {
-                    text: "Remove Default Type",
-                        handler: function(){
-                                document.getElementById('removetype').value = 1;
-                                this.submit();
+                    text: Survey.i18n.get('Asset_Survey',"Remove Default Type"),
+                    handler: function(){
+                            document.getElementById('removetype').value = 1;
+                            this.submit();
                     }
                 };