diff --git a/application/config/version.php b/application/config/version.php
index 6c777821381..99cc1f1d522 100644
--- a/application/config/version.php
+++ b/application/config/version.php
@@ -12,7 +12,7 @@
  *
  */
 
-$config['versionnumber'] = "2.0RC8";
+$config['versionnumber'] = "2.0RC9";
 $config['dbversionnumber'] = 162;
 $config['buildnumber'] = '';
 $config['updatable'] = false;
diff --git a/application/controllers/admin/database.php b/application/controllers/admin/database.php
index 718d6075fac..79689d98814 100644
--- a/application/controllers/admin/database.php
+++ b/application/controllers/admin/database.php
@@ -695,7 +695,7 @@ function index($sa = null)
                                     // Moving question to a 'upper' group
                                     // insert question at the end of the destination group
                                     // this prevent breaking conditions if the target qid is in the dest group
-                                    $insertorder = getMaxQuestionOrder($gid) + 1;
+                                    $insertorder = getMaxQuestionOrder($gid,$surveyid) + 1;
                                     $udata = array_merge($udata,array('question_order' => $insertorder));
                                 }
                                 else
diff --git a/application/controllers/admin/statistics.php b/application/controllers/admin/statistics.php
index d182c0e19f0..8689a1caca8 100644
--- a/application/controllers/admin/statistics.php
+++ b/application/controllers/admin/statistics.php
@@ -453,7 +453,7 @@ public function run($surveyid = 0, $subaction = null)
 		Yii::app()->loadHelper('admin/statistics');
 		$showtextinline=isset($_POST['showtextinline']) ? 1 : 0;
 		$aData['showtextinline'] = $showtextinline;
-		
+
 		//Show Summary results
 		if (isset($summary) && $summary)
 		{
@@ -497,6 +497,7 @@ public function run($surveyid = 0, $subaction = null)
     function listcolumn($surveyid, $column, $sql, $sortby="", $sortmethod="", $sorttype="")
     {
         $search['condition']=$column." != ''";
+        if($sql != "") {$search['condition'].= " AND ($sql)";}
         if($sorttype=='N') {$sortby = "($sortby * 1)";} //Converts text sorting into numerical sorting
         if($sortby != "") $search['order']=$sortby.' '.$sortmethod;
         $results=Survey_dynamic::model($surveyid)->findAll($search);
diff --git a/application/controllers/survey/index.php b/application/controllers/survey/index.php
index 2a95c10cf69..5d282c3c2ac 100644
--- a/application/controllers/survey/index.php
+++ b/application/controllers/survey/index.php
@@ -145,6 +145,7 @@ function action()
         //CHECK FOR REQUIRED INFORMATION (sid)
         if ($surveyid && $surveyExists)
         {
+ 		    LimeExpressionManager::SetSurveyId($surveyid); // must be called early - it clears internal cache if a new survey is being used
             $clang = SetSurveyLanguage( $surveyid, $sTempLanguage);
             UpdateSessionGroupList($surveyid, $sTempLanguage);  // to refresh the language strings in the group list session variable
             UpdateFieldArray();        // to refresh question titles and question text
diff --git a/application/helpers/admin/import_helper.php b/application/helpers/admin/import_helper.php
index 813105f52a8..f5816394264 100644
--- a/application/helpers/admin/import_helper.php
+++ b/application/helpers/admin/import_helper.php
@@ -4322,15 +4322,11 @@ function ExcelImportSurvey($sFullFilepath)
     }
 
     // Create the survey entry
-    $iNewSID=GetNewSurveyID($iOldSID);
     $surveyinfo['startdate']=NULL;
-    $surveyinfo['sid']=$iNewSID;
     $surveyinfo['active']='N';
-    $surveyinfo['owner_id']=$_SESSION['loginID'];
-    $surveyinfo['datecreated']= date('Y-m-d');
-
     switchMSSQLIdentityInsert('surveys',true);
     $iNewSID = Survey::model()->insertNewSurvey($surveyinfo) or safeDie($clang->gT("Error").": Failed to insert survey<br />");
+    $surveyinfo['sid']=$iNewSID;
     $results['surveys']++;
     switchMSSQLIdentityInsert('surveys',false);
     $results['newsid']=$iNewSID;
diff --git a/application/helpers/frontend_helper.php b/application/helpers/frontend_helper.php
index d6459c87699..9b0dda156c1 100644
--- a/application/helpers/frontend_helper.php
+++ b/application/helpers/frontend_helper.php
@@ -1605,6 +1605,17 @@ function buildsurveysession($surveyid,$previewGroup=false)
 	$totalquestions = count($unique);
 	$_SESSION['survey_'.$surveyid]['totalquestions'] = $totalquestions - count($display);
 
+
+    // Fix totalquestions by substracting Test Display questions
+    $iNumberofQuestions=dbExecuteAssoc("SELECT count(*)\n"
+    ." FROM {{questions}}"
+    ." WHERE type in ('X','*')\n"
+    ." AND sid={$surveyid}"
+    ." AND language='".$_SESSION['survey_'.$surveyid]['s_lang']."'"
+    ." AND parent_qid=0")->read();
+
+    $_SESSION['survey_'.$surveyid]['totalquestions'] = $totalquestions - (int) reset($iNumberofQuestions);
+	
     //2. SESSION VARIABLE: totalsteps
     //The number of "pages" that will be presented in this survey
     //The number of pages to be presented will differ depending on the survey format
diff --git a/application/libraries/admin/excel/excel_reader2.php b/application/libraries/admin/excel/excel_reader2.php
index a935f402e4d..522d4c606f6 100644
--- a/application/libraries/admin/excel/excel_reader2.php
+++ b/application/libraries/admin/excel/excel_reader2.php
@@ -858,7 +858,7 @@ function dump($row_numbers=false,$col_letters=false,$sheet=0,$table_class='excel
 	function read16bitstring($data, $start) {
 		$len = 0;
 		while (ord($data[$start + $len]) + ord($data[$start + $len + 1]) > 0) $len++;
-		return substr($data, $start, $len);
+		return substr($data, $start, $len+1);
 	}
 
 	// ADDED by Matt Kruse for better formatting
diff --git a/application/models/Conditions.php b/application/models/Conditions.php
index 04e0d71eff7..d7fc01aba3a 100644
--- a/application/models/Conditions.php
+++ b/application/models/Conditions.php
@@ -96,7 +96,34 @@ public function deleteRecords($condition=FALSE)
         }
 
 
+        /**
+        * Updates the group ID for all conditions
+        * 
+        * @param integer $iSurveyID
+        * @param integer $iQuestionID
+        * @param integer $iOldGroupID
+        * @param integer $iNewGroupID
+        */
+        public function updateCFieldName($iSurveyID, $iQuestionID, $iOldGroupID, $iNewGroupID)
+        {
+            $oResults=$this->findAllByAttributes(array('cqid'=>$iQuestionID));
+            foreach ($oResults as $oRow)
+            {
+
+                $cfnregs='';
+                if (preg_match('/'.$surveyid."X".$iOldGroupID."X".$iQuestionID."(.*)/", $oRow->cfieldname, $cfnregs) > 0)
+                {
+                    $newcfn=$surveyid."X".$iNewGroupID."X".$iQuestionID.$cfnregs[1];
+                    $c2query="UPDATE ".db_table_name('conditions')
+                    ." SET cfieldname='{$newcfn}' WHERE cid={$oRow->cid}";
+
+                    Yii::app()->db->createCommand($c2query)->query();
+                }
+            }
+        }
 
+        
+        
         public function insertRecords($data, $update=FALSE, $condition=FALSE)
         {
             $record = new self;
@@ -126,6 +153,7 @@ public function insertRecords($data, $update=FALSE, $condition=FALSE)
             else
                 return $record->save();
         }
+        
         function getScenarios($qid)
         {
 
@@ -133,6 +161,7 @@ function getScenarios($qid)
 
             return Yii::app()->db->createCommand($scenarioquery)->query();
         }
+        
         function getSomeConditions($fields, $condition, $order, $group){
             $record = Yii::app()->db->createCommand()
             ->select($fields)
diff --git a/application/views/admin/checkintegrity/check_view.php b/application/views/admin/checkintegrity/check_view.php
index 2d24709064b..46c16734e84 100644
--- a/application/views/admin/checkintegrity/check_view.php
+++ b/application/views/admin/checkintegrity/check_view.php
@@ -32,7 +32,7 @@
 
         <?php
             if ($defaultvalues) { ?>
-            <li><?php printf($clang->gT("There are %s orphaned default value entries which can be deleted."),$dv); ?> </li>
+            <li><?php printf($clang->gT("There are %s orphaned default value entries which can be deleted."),$defaultvalues); ?> </li>
             <?php }
             else
             { ?>
diff --git a/application/views/admin/export/statistics_view.php b/application/views/admin/export/statistics_view.php
index 6bb84b20184..33309921897 100644
--- a/application/views/admin/export/statistics_view.php
+++ b/application/views/admin/export/statistics_view.php
@@ -9,7 +9,7 @@
 <script type='text/javascript'>
     var graphUrl="<?php echo Yii::app()->getController()->createUrl("admin/statistics/graph"); ?>";
     var listColumnUrl="<?php echo Yii::app()->getController()->createUrl("admin/statistics/listcolumn/surveyid/".$surveyid."/column/"); ?>";
-    var sql="<?php //echo urlencode($sql) ?>";
+    var sql="<?php echo urlencode($sql); ?>";
     var showTextInline="<?php echo $showtextinline ?>";
 </script>
 <form method='post' name='formbuilder' action='<?php echo Yii::app()->getController()->createUrl("admin/statistics/index/surveyid/$surveyid"); ?>#start'>
@@ -241,7 +241,7 @@
                 <select name='<?php
                     if ($flt[2] == "M" ) { echo "M";};
                     if ($flt[2] == "P" ) { echo "P";};
-                    echo "{$surveyid}X{$flt[1]}X{$flt[0]}[]'";?> multiple='multiple'>
+                    echo "{$surveyid}X{$flt[1]}X{$flt[0]}[]'";?>' multiple='multiple'>
                 <?php
                 }
         }?>
diff --git a/application/views/admin/participants/participantsPanel_view.php b/application/views/admin/participants/participantsPanel_view.php
index 9cfc5dff668..b55381e672f 100644
--- a/application/views/admin/participants/participantsPanel_view.php
+++ b/application/views/admin/participants/participantsPanel_view.php
@@ -11,43 +11,43 @@
     </div>
     <?php
     $home = array('src' => $sImageURL.'home.png',
-        'alt' => 'Home Page',
-        'title' => 'Home Page',
+        'alt' => $clang->gT("Main Admin Screen"), 
+        'title' => $clang->gT("Main Admin Screen"),  
         'style' => 'margin-left:2px');
 
     $information = array('src' => $sImageURL.'summary.png',
-        'alt' => 'Information',
-        'title' => 'Information',
+        'alt' => $clang->gT("Information"),  
+        'title' => $clang->gT("Information"), 
         'style' => 'margin-left:2px');
 
     $import = array('src' => $sImageURL.'importcsv.png',
-        'alt' => 'Import from CSV',
-        'title' => 'Import from CSV',
+        'alt' => $clang->gT("Import from CSV"), 
+        'title' => $clang->gT("Import from CSV"), 
         'style' => 'margin-left:0px',
         'style' => 'margin-right:1px');
 
     $export = array('src' => $sImageURL.'exportcsv.png',
-        'alt' => 'Export all',
-        'title' => 'Export all',
+        'alt' => $clang->gT("Export all"), 
+        'title' => $clang->gT("Export all"),
         'name' => 'export',
         'id' => 'export',
         'style' => 'margin-left:0px',
         'style' => 'margin-right:1px');
 
     $display = array('src' => $sImageURL.'document.png',
-        'alt' => 'Display participants',
-        'title' => 'Display participants',
+        'alt' => $clang->gT("Display participants"),
+        'title' => $clang->gT("Display participants"),
         'style' => 'margin-left:5px');
 
     $blacklist = array('src' => $sImageURL.'trafficred.png',
-        'alt' => 'Blacklist control',
-        'title' => 'Blacklist control',
+        'alt' => $clang->gT("Blacklist control"),
+        'title' => $clang->gT("Blacklist control"),
         'style' => 'margin-left:1px',
         'style' => 'margin-right:1px');
 
     $globalsettings = array('src' => $sImageURL.'global.png',
-        'alt' => 'Global participant settings',
-        'title' => 'Global participant settings',
+        'alt' => $clang->gT("Global participant settings"),
+        'title' => $clang->gT("Global participant settings"),
         'style' => 'margin-left:5px',
         'style' => 'margin-right:1px');
 
@@ -60,8 +60,8 @@
         'style' => 'margin-right:1px');
 
     $sharepanel = array('src' => $sImageURL.'share.png',
-        'alt' => 'Share panel',
-        'title' => 'Share panel',
+        'alt' => $clang->gT("Share panel"), 
+        'title' => $clang->gT("Share panel"),
         'height' => 35,
         'width' => 35,
         'style' => 'margin-left:5px');
diff --git a/application/views/installer/success_view.php b/application/views/installer/success_view.php
index 121eabf838e..9307fc77397 100644
--- a/application/views/installer/success_view.php
+++ b/application/views/installer/success_view.php
@@ -29,7 +29,7 @@
  <tbody>
   <tr>
    <td align="left" style="width: 227px;"></td>
-   <td align="right" style="width: 227px;"><input class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only" type="submit" value="Administration" onclick="javascript: window.open('<?php echo $this->createUrl("/admin"); ?>', '_top')" />
+   <td align="right" style="width: 227px;"><input class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only" type="submit" value="<?php $clang->eT("Administration"); ?>" onclick="javascript: window.open('<?php echo $this->createUrl("/admin"); ?>', '_top')" />
     <div id="next" style="font-size:11px;"></div>
    </td>
   </tr>
diff --git a/locale/_template/limesurvey.pot b/locale/_template/limesurvey.pot
index 7a26e86375c..22b4f222744 100644
--- a/locale/_template/limesurvey.pot
+++ b/locale/_template/limesurvey.pot
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LimeSurvey language file\n"
 "Report-Msgid-Bugs-To: http://translate.limesurvey.org/\n"
-"POT-Creation-Date: 2012-08-16 08:12:04+00:00\n"
+"POT-Creation-Date: 2012-08-17 22:05:44+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -59,11 +59,11 @@ msgstr ""
 #: application/helpers/admin/import_helper.php:4066
 #: application/helpers/admin/import_helper.php:4127
 #: application/helpers/admin/import_helper.php:4182
-#: application/helpers/admin/import_helper.php:4286
-#: application/helpers/admin/import_helper.php:4356
-#: application/helpers/admin/import_helper.php:4401
-#: application/helpers/admin/import_helper.php:4514
-#: application/helpers/admin/import_helper.php:4550
+#: application/helpers/admin/import_helper.php:4281
+#: application/helpers/admin/import_helper.php:4352
+#: application/helpers/admin/import_helper.php:4397
+#: application/helpers/admin/import_helper.php:4510
+#: application/helpers/admin/import_helper.php:4546
 #: application/views/admin/dataentry/active_html_view.php:93
 #: application/views/admin/dataentry/warning_header.php:1
 #: application/views/admin/error_view.php:3
@@ -332,11 +332,11 @@ msgstr ""
 #: application/controllers/PrintanswersController.php:73
 #: application/controllers/admin/templates.php:887
 #: application/controllers/survey/index.php:97
-#: application/controllers/survey/index.php:271
+#: application/controllers/survey/index.php:272
 #: application/controllers/survey/index.php:349
 #: application/controllers/survey/index.php:362
 #: application/controllers/survey/index.php:377
-#: application/helpers/replacements_helper.php:224
+#: application/helpers/replacements_helper.php:223
 msgid "Please contact %s ( %s ) for further assistance."
 msgstr ""
 
@@ -372,8 +372,8 @@ msgstr ""
 
 #: application/controllers/RegisterController.php:102
 #: application/controllers/survey/index.php:413
-#: application/helpers/frontend_helper.php:1416
-#: application/helpers/frontend_helper.php:1645
+#: application/helpers/frontend_helper.php:1411
+#: application/helpers/frontend_helper.php:1640
 #: application/libraries/Save.php:127
 msgid "The answer to the security question is incorrect."
 msgstr ""
@@ -1383,7 +1383,7 @@ msgid "and"
 msgstr ""
 
 #: application/controllers/admin/conditionsaction.php:1330
-#: application/helpers/SurveyRuntimeHelper.php:470
+#: application/helpers/SurveyRuntimeHelper.php:472
 msgid "or"
 msgstr ""
 
@@ -1728,7 +1728,7 @@ msgstr ""
 #: application/views/admin/survey/Question/answerOptions_view.php:184
 #: application/views/admin/survey/Question/editQuestion_view.php:37
 #: application/views/admin/survey/Question/editQuestion_view.php:267
-#: application/views/admin/survey/Question/editdefaultvalues_view.php:186
+#: application/views/admin/survey/Question/editdefaultvalues_view.php:184
 #: application/views/admin/survey/Question/subQuestion_view.php:183
 #: application/views/admin/survey/QuestionGroups/editGroup_view.php:41
 #: application/views/admin/survey/editLocalSettings_main_view.php:8
@@ -1847,7 +1847,7 @@ msgid "Thank you for saving your survey in progress.  The following details can
 msgstr ""
 
 #: application/controllers/admin/dataentry.php:1948
-#: application/helpers/replacements_helper.php:551
+#: application/helpers/replacements_helper.php:550
 #: application/libraries/Save.php:199
 msgid "Name"
 msgstr ""
@@ -1857,8 +1857,8 @@ msgstr ""
 #: application/controllers/admin/useraction.php:133
 #: application/controllers/admin/useraction.php:362
 #: application/controllers/admin/useraction.php:380
-#: application/helpers/replacements_helper.php:557
-#: application/helpers/replacements_helper.php:590
+#: application/helpers/replacements_helper.php:556
+#: application/helpers/replacements_helper.php:589
 #: application/libraries/Save.php:200
 #: application/views/admin/authentication/login.php:8
 #: application/views/admin/user/modifyuser.php:7
@@ -2569,23 +2569,23 @@ msgstr ""
 msgid "Checked"
 msgstr ""
 
-#: application/controllers/admin/question.php:321
+#: application/controllers/admin/question.php:322
 msgid "Some example answer option"
 msgstr ""
 
-#: application/controllers/admin/question.php:487
+#: application/controllers/admin/question.php:488
 msgid "Some example subquestion"
 msgstr ""
 
-#: application/controllers/admin/question.php:872
+#: application/controllers/admin/question.php:873
 msgid "Question could not be deleted. There are conditions for other questions that rely on this question. You cannot delete this question until those conditions are removed"
 msgstr ""
 
-#: application/controllers/admin/question.php:899
+#: application/controllers/admin/question.php:900
 msgid "Question was successfully deleted."
 msgstr ""
 
-#: application/controllers/admin/question.php:905
+#: application/controllers/admin/question.php:906
 msgid "You are not authorized to delete questions."
 msgstr ""
 
@@ -2645,7 +2645,7 @@ msgstr ""
 #: application/controllers/admin/responses.php:130
 #: application/controllers/admin/responses.php:465
 #: application/helpers/common_helper.php:5447
-#: application/helpers/replacements_helper.php:627
+#: application/helpers/replacements_helper.php:626
 #: application/views/admin/export/exportresults_view.php:119
 #: application/views/admin/participants/displayParticipants_view.php:65
 #: application/views/admin/participants/displayParticipants_view.php:158
@@ -2661,7 +2661,7 @@ msgstr ""
 #: application/controllers/admin/responses.php:131
 #: application/controllers/admin/responses.php:466
 #: application/helpers/common_helper.php:5448
-#: application/helpers/replacements_helper.php:634
+#: application/helpers/replacements_helper.php:633
 #: application/views/admin/export/exportresults_view.php:120
 #: application/views/admin/participants/displayParticipants_view.php:66
 #: application/views/admin/participants/displayParticipants_view.php:158
@@ -3054,10 +3054,10 @@ msgstr ""
 #: application/helpers/common_helper.php:6470
 #: application/helpers/common_helper.php:6474
 #: application/helpers/common_helper.php:6478
-#: application/helpers/frontend_helper.php:1448
-#: application/helpers/frontend_helper.php:1525
-#: application/helpers/frontend_helper.php:1697
-#: application/helpers/replacements_helper.php:663
+#: application/helpers/frontend_helper.php:1443
+#: application/helpers/frontend_helper.php:1520
+#: application/helpers/frontend_helper.php:1692
+#: application/helpers/replacements_helper.php:662
 #: application/views/admin/authentication/message.php:3
 #: application/views/admin/participants/attributeMapCSV_view.php:76
 #: application/views/admin/participants/attributeMap_view.php:106
@@ -3132,7 +3132,7 @@ msgid "Export"
 msgstr ""
 
 #: application/controllers/admin/surveypermission.php:439
-#: application/helpers/replacements_helper.php:580
+#: application/helpers/replacements_helper.php:579
 #: application/views/admin/user/setuserrights.php:119
 msgid "Save Now"
 msgstr ""
@@ -3341,12 +3341,12 @@ msgid "This is some help text."
 msgstr ""
 
 #: application/controllers/admin/templates.php:886
-#: application/controllers/survey/index.php:262
+#: application/controllers/survey/index.php:263
 msgid "You have not provided a survey identification number"
 msgstr ""
 
 #: application/controllers/admin/templates.php:888
-#: application/controllers/survey/index.php:272
+#: application/controllers/survey/index.php:273
 msgid "The following surveys are available:"
 msgstr ""
 
@@ -3982,20 +3982,20 @@ msgstr ""
 msgid "Your browser reports that it was used previously to answer this survey. We are resetting the session so that you can start from the beginning."
 msgstr ""
 
-#: application/controllers/survey/index.php:204
+#: application/controllers/survey/index.php:205
 msgid "View statistics"
 msgstr ""
 
-#: application/controllers/survey/index.php:228
+#: application/controllers/survey/index.php:229
 msgid "Following survey(s) are not yet active but you can register for them."
 msgstr ""
 
-#: application/controllers/survey/index.php:257
+#: application/controllers/survey/index.php:258
 msgid "No available surveys"
 msgstr ""
 
-#: application/controllers/survey/index.php:266
 #: application/controllers/survey/index.php:267
+#: application/controllers/survey/index.php:268
 msgid "The survey identification number is invalid"
 msgstr ""
 
@@ -4021,25 +4021,25 @@ msgstr ""
 
 #: application/controllers/survey/index.php:431
 #: application/controllers/survey/index.php:435
-#: application/helpers/replacements_helper.php:440
-#: application/helpers/replacements_helper.php:452
+#: application/helpers/replacements_helper.php:439
+#: application/helpers/replacements_helper.php:451
 msgid "Load unfinished survey"
 msgstr ""
 
 #: application/controllers/survey/index.php:475
-#: application/helpers/frontend_helper.php:1490
-#: application/helpers/frontend_helper.php:1564
-#: application/helpers/frontend_helper.php:1609
-#: application/helpers/frontend_helper.php:1648
+#: application/helpers/frontend_helper.php:1485
+#: application/helpers/frontend_helper.php:1559
+#: application/helpers/frontend_helper.php:1604
+#: application/helpers/frontend_helper.php:1643
 #: application/views/entertoken_view.php:8
 msgid "This is a controlled survey. You need a valid token to participate."
 msgstr ""
 
 #: application/controllers/survey/index.php:476
 #: application/controllers/survey/index.php:507
-#: application/helpers/frontend_helper.php:1566
-#: application/helpers/frontend_helper.php:1611
-#: application/helpers/frontend_helper.php:1802
+#: application/helpers/frontend_helper.php:1561
+#: application/helpers/frontend_helper.php:1606
+#: application/helpers/frontend_helper.php:1808
 msgid "For further information please contact %s"
 msgstr ""
 
@@ -4144,92 +4144,92 @@ msgstr ""
 msgid "You need to add questions"
 msgstr ""
 
-#: application/helpers/SurveyRuntimeHelper.php:141
+#: application/helpers/SurveyRuntimeHelper.php:143
 msgid "Please use the LimeSurvey navigation buttons or index.  It appears you attempted to use the browser back button to re-submit a page."
 msgstr ""
 
-#: application/helpers/SurveyRuntimeHelper.php:255
+#: application/helpers/SurveyRuntimeHelper.php:257
 msgid "Save your responses so far"
 msgstr ""
 
-#: application/helpers/SurveyRuntimeHelper.php:380
+#: application/helpers/SurveyRuntimeHelper.php:382
 #: application/helpers/frontend_helper.php:1331
 msgid "Did Not Save"
 msgstr ""
 
-#: application/helpers/SurveyRuntimeHelper.php:381
+#: application/helpers/SurveyRuntimeHelper.php:383
 msgid "Your survey responses have not been recorded. This survey is not yet active."
 msgstr ""
 
-#: application/helpers/SurveyRuntimeHelper.php:386
+#: application/helpers/SurveyRuntimeHelper.php:388
 msgid "Clear Responses"
 msgstr ""
 
-#: application/helpers/SurveyRuntimeHelper.php:449
-#: application/helpers/replacements_helper.php:843
+#: application/helpers/SurveyRuntimeHelper.php:451
+#: application/helpers/replacements_helper.php:842
 #: application/views/admin/templates/templateeditor_completed_view.php:2
 msgid "Thank you!"
 msgstr ""
 
-#: application/helpers/SurveyRuntimeHelper.php:450
+#: application/helpers/SurveyRuntimeHelper.php:452
 #: application/views/admin/templates/templateeditor_completed_view.php:4
 msgid "Your survey responses have been recorded."
 msgstr ""
 
-#: application/helpers/SurveyRuntimeHelper.php:463
+#: application/helpers/SurveyRuntimeHelper.php:465
 msgid "Print your answers."
 msgstr ""
 
-#: application/helpers/SurveyRuntimeHelper.php:479
+#: application/helpers/SurveyRuntimeHelper.php:481
 msgid "View the statistics for this survey."
 msgstr ""
 
-#: application/helpers/SurveyRuntimeHelper.php:539
+#: application/helpers/SurveyRuntimeHelper.php:541
 msgid "Sorry. There is no matching survey."
 msgstr ""
 
-#: application/helpers/SurveyRuntimeHelper.php:556
+#: application/helpers/SurveyRuntimeHelper.php:558
 msgid "Invalid group number for this survey: "
 msgstr ""
 
-#: application/helpers/SurveyRuntimeHelper.php:562
+#: application/helpers/SurveyRuntimeHelper.php:564
 msgid "This group contains no questions.  You must add questions to this group before you can preview it"
 msgstr ""
 
-#: application/helpers/SurveyRuntimeHelper.php:580
+#: application/helpers/SurveyRuntimeHelper.php:582
 msgid "Submit your answers"
 msgstr ""
 
-#: application/helpers/SurveyRuntimeHelper.php:581
+#: application/helpers/SurveyRuntimeHelper.php:583
 msgid "There are no more questions. Please press the <Submit> button to finish this survey."
 msgstr ""
 
-#: application/helpers/SurveyRuntimeHelper.php:896
+#: application/helpers/SurveyRuntimeHelper.php:898
 #: application/helpers/qanda_helper.php:474
 msgid "One or more mandatory questions have not been answered. You cannot proceed until these have been completed."
 msgstr ""
 
-#: application/helpers/SurveyRuntimeHelper.php:902
+#: application/helpers/SurveyRuntimeHelper.php:904
 #: application/helpers/qanda_helper.php:504
 msgid "One or more questions have not been answered in a valid manner. You cannot proceed until these answers are valid."
 msgstr ""
 
-#: application/helpers/SurveyRuntimeHelper.php:908
+#: application/helpers/SurveyRuntimeHelper.php:910
 msgid "One or more uploaded files are not in proper format/size. You cannot proceed until these files are valid."
 msgstr ""
 
-#: application/helpers/SurveyRuntimeHelper.php:1046
-#: application/helpers/frontend_helper.php:2767
+#: application/helpers/SurveyRuntimeHelper.php:1048
+#: application/helpers/frontend_helper.php:2760
 msgid "This survey is currently not active. You will not be able to save your responses."
 msgstr ""
 
-#: application/helpers/SurveyRuntimeHelper.php:1054
+#: application/helpers/SurveyRuntimeHelper.php:1056
 msgid "Question index"
 msgstr ""
 
-#: application/helpers/SurveyRuntimeHelper.php:1122
-#: application/helpers/frontend_helper.php:2234
-#: application/helpers/replacements_helper.php:383
+#: application/helpers/SurveyRuntimeHelper.php:1124
+#: application/helpers/frontend_helper.php:2226
+#: application/helpers/replacements_helper.php:382
 #: application/views/admin/dataentry/active_html_view.php:67
 #: application/views/admin/dataentry/includes/editdata/editdata.php:57
 #: application/views/admin/dataentry/insert.php:41
@@ -4338,7 +4338,7 @@ msgstr ""
 #: application/helpers/admin/import_helper.php:2619
 #: application/helpers/admin/import_helper.php:2662
 #: application/helpers/admin/import_helper.php:2689
-#: application/helpers/admin/import_helper.php:4314
+#: application/helpers/admin/import_helper.php:4310
 msgid "Import of this survey file failed"
 msgstr ""
 
@@ -4376,16 +4376,16 @@ msgstr ""
 msgid "This is not a valid timings data XML file."
 msgstr ""
 
-#: application/helpers/admin/import_helper.php:4401
+#: application/helpers/admin/import_helper.php:4397
 msgid "Could not insert question"
 msgstr ""
 
-#: application/helpers/admin/import_helper.php:4401
-#: application/helpers/admin/import_helper.php:4550
+#: application/helpers/admin/import_helper.php:4397
+#: application/helpers/admin/import_helper.php:4546
 msgid "Excel row number "
 msgstr ""
 
-#: application/helpers/admin/import_helper.php:4550
+#: application/helpers/admin/import_helper.php:4546
 msgid "Could not insert answer"
 msgstr ""
 
@@ -5011,7 +5011,7 @@ msgid "Start language"
 msgstr ""
 
 #: application/helpers/common_helper.php:2368
-#: application/helpers/frontend_helper.php:1668
+#: application/helpers/frontend_helper.php:1663
 #: application/views/admin/dataentry/caption_view.php:29
 #: application/views/admin/export/exportresults_view.php:122
 #: application/views/admin/participants/attributeMap_view.php:95
@@ -6180,7 +6180,7 @@ msgid "SMTP debug output:"
 msgstr ""
 
 #: application/helpers/common_helper.php:5449
-#: application/helpers/replacements_helper.php:641
+#: application/helpers/replacements_helper.php:640
 #: application/views/admin/export/exportresults_view.php:121
 #: application/views/admin/saved/savedlist_view.php:10
 #: application/views/admin/token/browse.php:77
@@ -7026,48 +7026,48 @@ msgstr ""
 msgid "Try to submit again"
 msgstr ""
 
-#: application/helpers/frontend_helper.php:1419
+#: application/helpers/frontend_helper.php:1414
 msgid "Please confirm access to survey by answering the security question below and click continue."
 msgstr ""
 
-#: application/helpers/frontend_helper.php:1443
+#: application/helpers/frontend_helper.php:1438
 msgid "Security question:"
 msgstr ""
 
-#: application/helpers/frontend_helper.php:1491
-#: application/helpers/frontend_helper.php:1653
+#: application/helpers/frontend_helper.php:1486
+#: application/helpers/frontend_helper.php:1648
 #: application/views/entertoken_view.php:9
 msgid "If you have been issued a token, please enter it in the box below and click continue."
 msgstr ""
 
-#: application/helpers/frontend_helper.php:1496
-#: application/helpers/frontend_helper.php:1686
+#: application/helpers/frontend_helper.php:1491
+#: application/helpers/frontend_helper.php:1681
 msgid "Token:"
 msgstr ""
 
-#: application/helpers/frontend_helper.php:1521
-#: application/helpers/frontend_helper.php:1694
-#: application/helpers/replacements_helper.php:577
-#: application/helpers/replacements_helper.php:598
-#: application/helpers/replacements_helper.php:661
+#: application/helpers/frontend_helper.php:1516
+#: application/helpers/frontend_helper.php:1689
+#: application/helpers/replacements_helper.php:576
+#: application/helpers/replacements_helper.php:597
+#: application/helpers/replacements_helper.php:660
 msgid "Security Question"
 msgstr ""
 
-#: application/helpers/frontend_helper.php:1565
-#: application/helpers/frontend_helper.php:1610
+#: application/helpers/frontend_helper.php:1560
+#: application/helpers/frontend_helper.php:1605
 msgid "The token you have provided is either not valid, or has already been used."
 msgstr ""
 
-#: application/helpers/frontend_helper.php:1672
+#: application/helpers/frontend_helper.php:1667
 msgid "Please confirm the token by answering the security question below and click continue."
 msgstr ""
 
-#: application/helpers/frontend_helper.php:1801
+#: application/helpers/frontend_helper.php:1807
 msgid "This survey does not yet have any questions and cannot be tested or completed."
 msgstr ""
 
-#: application/helpers/frontend_helper.php:2211
-#: application/helpers/frontend_helper.php:2643
+#: application/helpers/frontend_helper.php:2203
+#: application/helpers/frontend_helper.php:2635
 #: application/views/admin/templates/templateeditor_navigator_view.php:5
 #: application/views/installer/dbconfig_view.php:87
 #: application/views/installer/dbsettings_view.php:29
@@ -7077,9 +7077,9 @@ msgstr ""
 msgid "Previous"
 msgstr ""
 
-#: application/helpers/frontend_helper.php:2218
-#: application/helpers/frontend_helper.php:2224
-#: application/helpers/frontend_helper.php:2229
+#: application/helpers/frontend_helper.php:2210
+#: application/helpers/frontend_helper.php:2216
+#: application/helpers/frontend_helper.php:2221
 #: application/views/admin/participants/displayParticipants_view.php:117
 #: application/views/admin/quotas/newanswer_view.php:33
 #: application/views/admin/quotas/newanswertwo_view.php:45
@@ -7318,142 +7318,142 @@ msgstr ""
 msgid "Error: There are no answers defined for this question."
 msgstr ""
 
-#: application/helpers/replacements_helper.php:340
+#: application/helpers/replacements_helper.php:339
 msgid "There are no questions in this survey"
 msgstr ""
 
-#: application/helpers/replacements_helper.php:344
+#: application/helpers/replacements_helper.php:343
 msgid "There is 1 question in this survey"
 msgstr ""
 
-#: application/helpers/replacements_helper.php:348
+#: application/helpers/replacements_helper.php:347
 msgid "There are {NUMBEROFQUESTIONS} questions in this survey."
 msgstr ""
 
-#: application/helpers/replacements_helper.php:411
+#: application/helpers/replacements_helper.php:410
 msgid "Exit and Clear Survey"
 msgstr ""
 
-#: application/helpers/replacements_helper.php:412
+#: application/helpers/replacements_helper.php:411
 msgid "Are you sure you want to clear all your responses?"
 msgstr ""
 
-#: application/helpers/replacements_helper.php:441
-#: application/helpers/replacements_helper.php:445
-#: application/helpers/replacements_helper.php:465
+#: application/helpers/replacements_helper.php:440
+#: application/helpers/replacements_helper.php:444
+#: application/helpers/replacements_helper.php:464
 msgid "Resume later"
 msgstr ""
 
-#: application/helpers/replacements_helper.php:504
+#: application/helpers/replacements_helper.php:503
 msgid "If you want to check any of the answers you have made, and/or change them, you can do that now by clicking on the [<< prev] button and browsing through your responses."
 msgstr ""
 
-#: application/helpers/replacements_helper.php:511
-#: application/helpers/replacements_helper.php:520
+#: application/helpers/replacements_helper.php:510
+#: application/helpers/replacements_helper.php:519
 msgid "Restart this Survey"
 msgstr ""
 
-#: application/helpers/replacements_helper.php:529
+#: application/helpers/replacements_helper.php:528
 msgid "To remain anonymous please use a pseudonym as your username, also an email address is not required."
 msgstr ""
 
-#: application/helpers/replacements_helper.php:543
+#: application/helpers/replacements_helper.php:542
 msgid "Return To Survey"
 msgstr ""
 
-#: application/helpers/replacements_helper.php:563
+#: application/helpers/replacements_helper.php:562
 msgid "Repeat Password"
 msgstr ""
 
-#: application/helpers/replacements_helper.php:569
+#: application/helpers/replacements_helper.php:568
 msgid "Your Email"
 msgstr ""
 
-#: application/helpers/replacements_helper.php:584
+#: application/helpers/replacements_helper.php:583
 msgid "Saved name"
 msgstr ""
 
-#: application/helpers/replacements_helper.php:601
+#: application/helpers/replacements_helper.php:600
 msgid "Load Now"
 msgstr ""
 
-#: application/helpers/replacements_helper.php:780
+#: application/helpers/replacements_helper.php:779
 msgid "Answers Cleared"
 msgstr ""
 
-#: application/helpers/replacements_helper.php:783
+#: application/helpers/replacements_helper.php:782
 msgid "Your Assessment"
 msgstr ""
 
-#: application/helpers/replacements_helper.php:784
+#: application/helpers/replacements_helper.php:783
 msgid "Caution: JavaScript execution is disabled in your browser. You may not be able to answer all questions in this survey. Please, verify your browser parameters."
 msgstr ""
 
-#: application/helpers/replacements_helper.php:786
+#: application/helpers/replacements_helper.php:785
 msgid "Close this window"
 msgstr ""
 
-#: application/helpers/replacements_helper.php:800
+#: application/helpers/replacements_helper.php:799
 msgid "Load A Previously Saved Survey"
 msgstr ""
 
-#: application/helpers/replacements_helper.php:801
+#: application/helpers/replacements_helper.php:800
 msgid "You can load a survey that you have previously saved from this screen."
 msgstr ""
 
-#: application/helpers/replacements_helper.php:801
+#: application/helpers/replacements_helper.php:800
 msgid "Type in the 'name' you used to save the survey, and the password."
 msgstr ""
 
-#: application/helpers/replacements_helper.php:809
+#: application/helpers/replacements_helper.php:808
 msgid "A Note On Privacy"
 msgstr ""
 
-#: application/helpers/replacements_helper.php:809
+#: application/helpers/replacements_helper.php:808
 msgid "This survey is anonymous."
 msgstr ""
 
-#: application/helpers/replacements_helper.php:809
+#: application/helpers/replacements_helper.php:808
 msgid "The record kept of your survey responses does not contain any identifying information about you unless a specific question in the survey has asked for this. If you have responded to a survey that used an identifying token to allow you to access the survey, you can rest assured that the identifying token is not kept with your responses. It is managed in a separate database, and will only be updated to indicate that you have (or haven't) completed this survey. There is no way of matching identification tokens with survey responses in this survey."
 msgstr ""
 
-#: application/helpers/replacements_helper.php:828
+#: application/helpers/replacements_helper.php:827
 msgid "You must be registered to complete this survey"
 msgstr ""
 
-#: application/helpers/replacements_helper.php:829
+#: application/helpers/replacements_helper.php:828
 msgid "You may register for this survey if you wish to take part."
 msgstr ""
 
-#: application/helpers/replacements_helper.php:829
+#: application/helpers/replacements_helper.php:828
 msgid "Enter your details below, and an email containing the link to participate in this survey will be sent immediately."
 msgstr ""
 
-#: application/helpers/replacements_helper.php:837
+#: application/helpers/replacements_helper.php:836
 msgid "Save Your Unfinished Survey"
 msgstr ""
 
-#: application/helpers/replacements_helper.php:838
+#: application/helpers/replacements_helper.php:837
 msgid "Enter a name and password for this survey and click save below."
 msgstr ""
 
-#: application/helpers/replacements_helper.php:838
+#: application/helpers/replacements_helper.php:837
 msgid "Your survey will be saved using that name and password, and can be completed later by logging in with the same name and password."
 msgstr ""
 
-#: application/helpers/replacements_helper.php:838
+#: application/helpers/replacements_helper.php:837
 msgid "If you give an email address, an email containing the details will be sent to you."
 msgstr ""
 
-#: application/helpers/replacements_helper.php:838
+#: application/helpers/replacements_helper.php:837
 msgid "After having clicked the save button you can either close this browser window or continue filling out the survey."
 msgstr ""
 
-#: application/helpers/replacements_helper.php:843
+#: application/helpers/replacements_helper.php:842
 msgid "You have completed answering the questions in this survey."
 msgstr ""
 
-#: application/helpers/replacements_helper.php:843
+#: application/helpers/replacements_helper.php:842
 msgid "Click on 'Submit' now to complete the process and save your answers."
 msgstr ""
 
@@ -11370,11 +11370,11 @@ msgstr ""
 msgid "Default value for option 'Other':"
 msgstr ""
 
-#: application/views/admin/survey/Question/editdefaultvalues_view.php:154
+#: application/views/admin/survey/Question/editdefaultvalues_view.php:152
 msgid "Default value:"
 msgstr ""
 
-#: application/views/admin/survey/Question/editdefaultvalues_view.php:169
+#: application/views/admin/survey/Question/editdefaultvalues_view.php:167
 msgid "Use same default value across languages:"
 msgstr ""
 
diff --git a/locale/de/LC_MESSAGES/de.mo b/locale/de/LC_MESSAGES/de.mo
index f0605c354d2..651d1424eab 100644
Binary files a/locale/de/LC_MESSAGES/de.mo and b/locale/de/LC_MESSAGES/de.mo differ
diff --git a/locale/it/LC_MESSAGES/it.mo b/locale/it/LC_MESSAGES/it.mo
index a2692b02e4c..7bd820ba65d 100644
Binary files a/locale/it/LC_MESSAGES/it.mo and b/locale/it/LC_MESSAGES/it.mo differ
diff --git a/locale/ja/LC_MESSAGES/ja.mo b/locale/ja/LC_MESSAGES/ja.mo
index 6de9907c1d3..1df799516e9 100644
Binary files a/locale/ja/LC_MESSAGES/ja.mo and b/locale/ja/LC_MESSAGES/ja.mo differ
diff --git a/locale/nb/LC_MESSAGES/nb.mo b/locale/nb/LC_MESSAGES/nb.mo
index 7957b9010ca..a1754a55c7f 100644
Binary files a/locale/nb/LC_MESSAGES/nb.mo and b/locale/nb/LC_MESSAGES/nb.mo differ
diff --git a/locale/th/LC_MESSAGES/th.mo b/locale/th/LC_MESSAGES/th.mo
index 0446e1da026..4f62cf05b6b 100644
Binary files a/locale/th/LC_MESSAGES/th.mo and b/locale/th/LC_MESSAGES/th.mo differ
diff --git a/tmp/.gitignore b/tmp/.gitignore
index 9d875d2e4ef..31548c86778 100644
--- a/tmp/.gitignore
+++ b/tmp/.gitignore
@@ -2,3 +2,4 @@
 *.html
 /*.lss
 /*.png
+/*.xls