diff --git a/application/config/version.php b/application/config/version.php index 207c2f0366e..d851f2ef30a 100644 --- a/application/config/version.php +++ b/application/config/version.php @@ -12,11 +12,11 @@ *150413 */ -$config['versionnumber'] = '2.54.3 (answers_html)'; +$config['versionnumber'] = '2.55 (answers_html)'; $config['dbversionnumber'] = 261; $config['buildnumber'] = ''; $config['updatable'] = true; -$config['assetsversionnumber'] = '36'; +$config['assetsversionnumber'] = '37'; return $config; ?> diff --git a/application/controllers/admin/authentication.php b/application/controllers/admin/authentication.php index ec0289ffc77..c8a5d71b9b3 100644 --- a/application/controllers/admin/authentication.php +++ b/application/controllers/admin/authentication.php @@ -85,6 +85,23 @@ public static function prepareLogin() { $aData = array(); + // Plugins, include core plugins, can't be activated by default. + // So after a fresh installation, core plugins are not activated + // They need to be manually loaded. + if (!class_exists('Authdb', false)) { + $plugin = Plugin::model()->findByAttributes(array('name'=>'Authdb')); + if (!$plugin) { + $plugin = new Plugin(); + $plugin->name = 'Authdb'; + $plugin->active = 1; + $plugin->save(); + App()->getPluginManager()->loadPlugin('Authdb', $plugin->id); + } else { + $plugin->active = 1; + $plugin->save(); + } + } + // In Authdb, the plugin event "beforeLogin" checks if the url param "onepass" is set // if yes, it will call AuthPluginBase::setAuthPlugin to set to true the plugin private parameter "_stop", so the form will not be displayed // @see: application/core/plugins/Authdb/Authdb.php: function beforeLogin() @@ -125,9 +142,7 @@ public static function prepareLogin() App()->getPluginManager()->dispatchEvent($newLoginForm); // inject the HTML of the form inside the private varibale "_content" of the plugin $aData['summary'] = self::getSummary('logout'); $aData['pluginContent'] = $newLoginForm->getAllContent(); // Retreives the private varibale "_content" , and parse it to $aData['pluginContent'], which will be rendered in application/views/admin/authentication/login.php - } - else - { + }else{ // The form has been submited, or the plugin has been stoped (so normally, the value of login/password are available) // Handle getting the post and populating the identity there @@ -143,10 +158,17 @@ public static function prepareLogin() $identity = $event->get('identity'); // Now authenticate - if ($identity->authenticate()) - { + // This call LSUserIdentity::authenticate() (application/core/LSUserIdentity.php)) + // which will call the plugin function newUserSession() (eg: Authdb::newUserSession() ) + // TODO: for sake of clarity, the plugin function should be renamed to authenticate(). + if ($identity->authenticate()){ FailedLoginAttempt::model()->deleteAttempts(); App()->user->setState('plugin', $authMethod); + + // This call to AdminController::_GetSessionUserRights() ; + // NB 1:calling another controller method from a controller method is a bad pratice + // NB 2: this function only check if logged in user is super admin to set in session USER_RIGHT_INITIALSUPERADMIN + // TODO: move this function to the user object Yii::app()->getController()->_GetSessionUserRights(Yii::app()->session['loginID']); Yii::app()->session['just_logged_in'] = true; Yii::app()->session['loginsummary'] = self::getSummary(); @@ -155,9 +177,7 @@ public static function prepareLogin() App()->getPluginManager()->dispatchEvent($event); return array('success'); - } - else - { + }else{ // Failed $event = new PluginEvent('afterFailedLoginAttempt'); $event->set('identity', $identity); diff --git a/application/controllers/admin/conditionsaction.php b/application/controllers/admin/conditionsaction.php index 0d7ea7a8809..2e38da3fa47 100644 --- a/application/controllers/admin/conditionsaction.php +++ b/application/controllers/admin/conditionsaction.php @@ -296,10 +296,31 @@ public function index($subaction, $iSurveyID=null, $gid=null, $qid=null) $aData['conditionsoutput_action_error'] = $conditionsoutput_action_error; $aData['javascriptpre'] = $javascriptpre; + $scenarios = $this->getAllScenarios($qid); + + // Some extra args to getEditConditionForm + $args['subaction'] = $subaction; + $args['iSurveyID'] = $this->iSurveyID; + $args['gid'] = $gid; + $args['qcount'] = $this->getQCount($cquestions); + $args['method'] = $method; + $args['cquestions'] = $cquestions; + $args['scenariocount'] = count($scenarios); + + $aData['quickAddConditionForm'] = $this->getQuickAddConditionForm($args); + + $aData['quickAddConditionURL'] = $this->getController()->createUrl( + '/admin/conditions/sa/quickAddCondition', + array( + 'surveyId' => $this->iSurveyID, + 'gid' => $gid, + 'qid' => $qid + ) + ); + $aViewUrls['conditionshead_view'][] = $aData; $conditionsList = array(); - $scenariocount = 0; //BEGIN DISPLAY CONDITIONS FOR THIS QUESTION if ( @@ -317,7 +338,6 @@ public function index($subaction, $iSurveyID=null, $gid=null, $qid=null) $conditionscount = 0; $s=0; - $scenarios = $this->getAllScenarios($qid); $scenariocount = count($scenarios); $aData['conditionsoutput'] = ''; @@ -363,6 +383,18 @@ public function index($subaction, $iSurveyID=null, $gid=null, $qid=null) $aData['scenarionr'] = $scenarionr; + // Used when click on button to add condition to scenario + $aData['addConditionToScenarioURL'] = $this->getController()->createUrl( + '/admin/conditions/sa/index/', + array( + 'subaction' => 'editconditionsform', + 'surveyid' => $this->iSurveyID, + 'gid' => $gid, + 'qid' => $qid, + 'scenarioNr' => $scenarionr['scenario'] + ) + ); + if (!isset($aViewUrls['output'])) { $aViewUrls['output'] = ''; } @@ -586,27 +618,6 @@ public function index($subaction, $iSurveyID=null, $gid=null, $qid=null) $aViewUrls['output'] .= $this->getCopyForm($qid, $gid, $conditionsList, $pquestions); } - if (isset($cquestions)) { - if ( count($cquestions) > 0 && count($cquestions) <=10) { - $qcount = count($cquestions); - } - else { - $qcount = 9; - } - } - else { - $qcount = 0; - } - - // Some extra args to getEditConditionForm - $args['subaction'] = $subaction; - $args['iSurveyID'] = $this->iSurveyID; - $args['gid'] = $gid; - $args['qcount'] = $qcount; - $args['method'] = $method; - $args['cquestions'] = $cquestions; - $args['scenariocount'] = $scenariocount; - if ( $subaction == "editconditionsform" || $subaction == "insertcondition" || $subaction == "updatecondition" @@ -818,6 +829,173 @@ protected function insertCondition(array $args) $this->redirectToConditionStart($qid, $gid); } + /** + * As insertCondition() but using Ajax, called from quickAddCondition + * @todo Code duplication + * @return array [message, result], where result = 'success' or 'error' + */ + protected function insertConditionAjax($args) + { + // Extract scenario, cquestions, ... + extract($args); + + if (isset($cquestions) && $cquestions != '' && $editSourceTab == '#SRCPREVQUEST') { + $conditionCfieldname = $cquestions; + } + elseif(isset($csrctoken) && $csrctoken != '') { + $conditionCfieldname = $csrctoken; + } + else { + return array(gT("Your condition could not be added! It did not include the question and/or answer upon which the condition was based. Please ensure you have selected a question and an answer."), 'error'); + } + + $condition_data = array( + 'qid' => $qid, + 'scenario' => $scenario, + 'cqid' => $cqid, + 'cfieldname' => $conditionCfieldname, + 'method' => $method + ); + + if (!empty($canswers) && $editSourceTab == '#SRCPREVQUEST') { + + $results = array(); + + foreach ($canswers as $ca) { + //First lets make sure there isn't already an exact replica of this condition + $condition_data['value'] = $ca; + + $result = Condition::model()->findAllByAttributes($condition_data); + + $count_caseinsensitivedupes = count($result); + + if ($count_caseinsensitivedupes == 0) { + $results[] = Condition::model()->insertRecords($condition_data);; + } + } + + // Check if any result returned false + if (in_array(false, $results, true)) { + return array(gT('Could not insert all conditions.'), 'error'); + } + else if (!empty($results)) { + return array (gT('Condition added.'), 'success'); + } + else { + return array( + gT( + "Your condition could not be added! It did not include the question and/or answer upon which the condition was based. Please ensure you have selected a question and an answer.", + "js" + ), + 'error' + ); + } + + } + else { + + $posted_condition_value = null; + + // Other conditions like constant, other question or token field + if ($editTargetTab=="#CONST") { + $posted_condition_value = $ConditionConst; + } + elseif ($editTargetTab=="#PREVQUESTIONS") { + $posted_condition_value = $prevQuestionSGQA; + } + elseif ($editTargetTab=="#TOKENATTRS") { + $posted_condition_value = $tokenAttr; + } + elseif ($editTargetTab=="#REGEXP") { + $posted_condition_value = $ConditionRegexp; + } + + if ($posted_condition_value) { + $condition_data['value'] = $posted_condition_value; + $result = Condition::model()->insertRecords($condition_data); + } + else { + $result = null; + } + + if ($result === false) { + return array(gT('Could not insert all conditions.'), 'error'); + } + else if ($result === true) { + return array (gT('Condition added.'), 'success'); + } + else { + return array( + gT( + "Your condition could not be added! It did not include the question and/or answer upon which the condition was based. Please ensure you have selected a question and an answer.", + "js" + ), + 'error' + ); + } + } + + } + + /** + * Used by quick-add form to add conditions async + * @return void + */ + public function quickAddCondition() + { + Yii::import('application.helpers.admin.ajax_helper', true); + $request = Yii::app()->request; + $data = $this->getQuickAddData($request); + + list($message, $status) = $this->insertConditionAjax($data); + + if ($status == 'success') { + LimeExpressionManager::UpgradeConditionsToRelevance(NULL, $data['qid']); + ls\ajax\AjaxHelper::outputSuccess($message); + } + else if ($status == 'error') { + ls\ajax\AjaxHelper::outputError($message); + } + else { + ls\ajax\AjaxHelper::outputError('Internal error: Could not add condition, status unknown: ' . $status); + } + } + + /** + * Get posted data from quick-add modal form + * @param LSHttpRequest $request + * @return array + */ + protected function getQuickAddData(LSHttpRequest $request) + { + $result = array(); + $keys = array( + 'scenario', + 'cquestions', + 'method', + 'canswers', + 'ConditionConst', + 'ConditionRegexp', + 'sid', + 'qid', + 'gid', + 'cqid', + 'canswersToSelect', + 'editSourceTab', + 'editTargetTab', + 'csrctoken', + 'prevQuestionSGQA', + 'tokenAttr' + ); + foreach ($keys as $key) { + $value = $request->getPost('quick-add-' . $key); + $value = str_replace('QUICKADD-', '', $value); // Remove QUICKADD- from editSourceTab/editTargetTab + $result[$key] = $value; + } + + return $result; + } + /** * Update a condition * @param array $args @@ -1038,6 +1216,7 @@ protected function applySubaction($p_subaction, array $args) LimeExpressionManager::RevertUpgradeConditionsToRelevance(NULL,$qid); // in case deleted the last condition $result = Condition::model()->deleteRecords(array('cid'=>$p_cid)); LimeExpressionManager::UpgradeConditionsToRelevance(NULL,$qid); + $this->redirectToConditionStart($qid, $gid); break; // Delete all conditions in this scenario @@ -1045,6 +1224,7 @@ protected function applySubaction($p_subaction, array $args) LimeExpressionManager::RevertUpgradeConditionsToRelevance(NULL,$qid); // in case deleted the last condition $result = Condition::model()->deleteRecords(array('qid'=>$qid, 'scenario'=>$p_scenario)); LimeExpressionManager::UpgradeConditionsToRelevance(NULL,$qid); + $this->redirectToConditionStart($qid, $gid); break; // Update scenario @@ -1059,11 +1239,14 @@ protected function applySubaction($p_subaction, array $args) case "deleteallconditions": LimeExpressionManager::RevertUpgradeConditionsToRelevance(NULL,$qid); // in case deleted the last condition $result = Condition::model()->deleteRecords(array('qid'=>$qid)); + Yii::app()->setFlashMessage(gT("All conditions for this question have been deleted."), 'success'); + $this->redirectToConditionStart($qid, $gid); break; // Renumber scenarios case "renumberscenarios": $this->renumberScenarios($args); + $this->redirectToConditionStart($qid, $gid); break; // Copy conditions if this is copy @@ -1685,7 +1868,8 @@ protected function getEditConditionForm(array $args) 'submitSubaction' => $submitSubaction, 'submitcid' => $submitcid, 'editSourceTab' => $this->getEditSourceTab(), - 'editTargetTab' => $this->getEditTargetTab() + 'editTargetTab' => $this->getEditTargetTab(), + 'addConditionToScenarioNr' => Yii::app()->request->getQuery('scenarioNr') ); $result .= $this->getController()->renderPartial('/admin/conditions/includes/form_editconditions_header', $data, true); @@ -1707,6 +1891,29 @@ protected function getEditConditionForm(array $args) return $result; } + /** + * Form used in quick-add modal + * @param array $args + */ + protected function getQuickAddConditionForm(array $args) + { + extract($args); + $data = array( + 'subaction' => $subaction, + 'iSurveyID' => $iSurveyID, + 'gid' => $gid, + 'qid' => $qid, + 'cquestions' => $cquestions, + 'p_csrctoken' => $p_csrctoken, + 'p_prevquestionsgqa' => $p_prevquestionsgqa, + 'tokenFieldsAndNames' => $this->tokenFieldsAndNames, + 'method' => $method, + 'subaction' => $subaction, + ); + $html = $this->getController()->renderPartial('/admin/conditions/includes/quickAddConditionForm', $data, true); + return $html; + } + /** * @param array $cquestions * @param string $p_cquestions Question SGID @@ -2140,6 +2347,24 @@ protected function redirectToConditionStart($qid, $gid) */ protected function shouldShowScenario($subaction, $scenariocount) { - return (($subaction != "editthiscondition" && ($scenariocount == 1 || $scenariocount==0)) || ($subaction == "editthiscondition")); + return $subaction != "editthiscondition" && ($scenariocount == 1 || $scenariocount==0); + } + + /** + * Used to calculate size of select box + * @todo Not used + * @param array $cquestions + * @return int + */ + protected function getQCount(array $cquestions) + { + if ( count($cquestions) > 0 && count($cquestions) <=10) { + $qcount = count($cquestions); + } + else { + $qcount = 9; + } + + return $qcount; } } diff --git a/application/controllers/admin/limereplacementfields.php b/application/controllers/admin/limereplacementfields.php index bef3226a9a9..465dfba1fbe 100644 --- a/application/controllers/admin/limereplacementfields.php +++ b/application/controllers/admin/limereplacementfields.php @@ -108,7 +108,7 @@ private function _shouldAddQuestion($action, $gid, $qid, array $question, $previ case 'addquestion': if (empty($gid)) { - safeDie("No GID provided."); + safeDie("No GID provided. Please save the question and try again."); } if (!is_null($previousQuestion) && $previousQuestion['gid'] == $gid && $question['gid'] != $gid ) { diff --git a/application/controllers/admin/tokens.php b/application/controllers/admin/tokens.php index 1c6b087b967..ea92a595c41 100644 --- a/application/controllers/admin/tokens.php +++ b/application/controllers/admin/tokens.php @@ -2485,7 +2485,11 @@ public function bouncesettings($iSurveyId) /** * Handle token form for addnew/edit actions + * @param int $iSurveyId * @param string $subaction + * @param int $iTokenId + * @param boolean $ajax + * @return void */ public function _handletokenform($iSurveyId, $subaction, $iTokenId="", $ajax=false) { diff --git a/application/core/LSUserIdentity.php b/application/core/LSUserIdentity.php index 34dd8354130..baf036685e1 100644 --- a/application/core/LSUserIdentity.php +++ b/application/core/LSUserIdentity.php @@ -65,7 +65,7 @@ public function authenticate() { $result->setError(self::ERROR_UNKNOWN_HANDLER); } else { // Delegate actual authentication to plugin - $authEvent = new PluginEvent('newUserSession', $this); + $authEvent = new PluginEvent('newUserSession', $this); // TODO: rename the plugin function authenticate() $authEvent->set('identity', $this); App()->getPluginManager()->dispatchEvent($authEvent); $pluginResult = $authEvent->get('result'); @@ -172,4 +172,4 @@ public function setPlugin($name) { public function setConfig($config) { $this->config = $config; } -} \ No newline at end of file +} diff --git a/application/core/Survey_Common_Action.php b/application/core/Survey_Common_Action.php index e4b3feee4c3..c4eb55c5cca 100644 --- a/application/core/Survey_Common_Action.php +++ b/application/core/Survey_Common_Action.php @@ -254,11 +254,6 @@ protected function _renderWrappedTemplate($sAction = '', $aViewUrls = array(), $ //// This check will be useless when it will be handle directly by each specific controller. if (!empty($aData['surveyid'])) { - //// TODO : check what is doing exactly this function. (application/helpers/expressions/em_manager_helper.php) - //// If it's about initialiazing global variables, should be removed and parsed in right controllers. - //// But it seems that it's just useless. - LimeExpressionManager::StartProcessingPage(false, Yii::app()->baseUrl); // so can click on syntax highlighting to edit questions - $aData['oSurvey'] = Survey::model()->findByPk($aData['surveyid']); $this->_titlebar($aData); @@ -271,12 +266,6 @@ protected function _renderWrappedTemplate($sAction = '', $aViewUrls = array(), $ $this->_tokenbar($aData); $this->_organizequestionbar($aData); - //// TODO : check what it's doing exactly, and why it is here (not after or before) - //// It seems that it is not used at all. It's about timing - LimeExpressionManager::FinishProcessingPage(); - - - //// TODO : Move this div inside each correct view ASAP ! echo '
'; diff --git a/application/helpers/admin/export/SurveyDao.php b/application/helpers/admin/export/SurveyDao.php index 1bcb7a22652..9051ae6d84f 100644 --- a/application/helpers/admin/export/SurveyDao.php +++ b/application/helpers/admin/export/SurveyDao.php @@ -152,7 +152,7 @@ public function loadSurveyResults(SurveyObj $survey, $iMinimum, $iMaximum, $sFil // Do nothing, all responses break; } - + $oRecordSet->order='{{survey_' . $survey->id . '}}.id ASC'; $survey->responses=$oRecordSet->select($aSelectFields)->query(); } } diff --git a/application/helpers/export_helper.php b/application/helpers/export_helper.php index 7de2a1dc87a..d646fd3251a 100644 --- a/application/helpers/export_helper.php +++ b/application/helpers/export_helper.php @@ -547,6 +547,7 @@ function SPSSGetQuery($iSurveyID, $limit = null, $offset = null) { { $query->limit((int) $limit, (int) $offset); } + $query->order('id ASC'); return $query; } diff --git a/application/models/SurveyDynamic.php b/application/models/SurveyDynamic.php index bd5e3fa38ec..7f3bd1f60f6 100644 --- a/application/models/SurveyDynamic.php +++ b/application/models/SurveyDynamic.php @@ -574,6 +574,7 @@ public function search() $pageSize = Yii::app()->user->getState('pageSize',Yii::app()->params['defaultPageSize']); $criteria = new CDbCriteria; $sort = new CSort; + $sort->defaultOrder = 'id ASC'; // Make all the model's columns sortable (default behaviour) $sort->attributes = array( diff --git a/application/views/admin/conditions/conditionshead_view.php b/application/views/admin/conditions/conditionshead_view.php index d252360374c..9cd0bfb6450 100644 --- a/application/views/admin/conditions/conditionshead_view.php +++ b/application/views/admin/conditions/conditionshead_view.php @@ -10,7 +10,7 @@ data-target='#confirmation-modal' data-message='' data-onclick='(function() { document.getElementById("deleteallconditions").submit(); })' - class='btn btn-warning pull-right' + class='btn btn-warning pull-right condition-header-button' onclick='return false'; > @@ -22,7 +22,7 @@ class='btn btn-warning pull-right' 1): ?> + +
@@ -41,3 +54,26 @@ class="btn btn-default pull-right" + + + diff --git a/application/views/admin/conditions/includes/conditions_scenario.php b/application/views/admin/conditions/includes/conditions_scenario.php index bcb2254968d..e5f2764d3f1 100644 --- a/application/views/admin/conditions/includes/conditions_scenario.php +++ b/application/views/admin/conditions/includes/conditions_scenario.php @@ -67,6 +67,17 @@ class='btn btn-default btn-xs' > + + + + ' /> @@ -74,6 +85,7 @@ class='btn btn-default btn-xs' +
diff --git a/application/views/admin/conditions/includes/form_editconditions_header.php b/application/views/admin/conditions/includes/form_editconditions_header.php index c9c02789104..c087884c225 100644 --- a/application/views/admin/conditions/includes/form_editconditions_header.php +++ b/application/views/admin/conditions/includes/form_editconditions_header.php @@ -8,7 +8,6 @@ * @var $qid * @var $title * @var $showScenario ( $subaction != "editthiscondition" && isset($scenariocount) && ($scenariocount == 1 || $scenariocount==0)) ||( $subaction == "editthiscondition" && isset($scenario) && $scenario == 1) - * @var $qcountI $qcount+1 */ ?> @@ -21,7 +20,7 @@
-

+

@@ -29,13 +28,11 @@
- style='display: none;' /> + ' style='display: none;' /> - -  
-
-
-
- -
- -
+
+
+ +
+
-
-
-
- - -
- -
+
+
+ + +
+
-
-
- -
- -
- -
+
+
+ +
+
-
-
-
-
- -
- -
-
+
+
+ +
+
-
-



-
-
+ -
+ +
 
+ -
diff --git a/application/views/admin/token/tokenform.php b/application/views/admin/token/tokenform.php index 1e8fc559996..3ba6ad0f0a4 100644 --- a/application/views/admin/token/tokenform.php +++ b/application/views/admin/token/tokenform.php @@ -111,7 +111,7 @@ { $completedDBFormat = $completed; $bCompletedValue = "1"; - $completed = convertToGlobalSettingFormat($completed); + $completed = convertToGlobalSettingFormat($completed, true); } ?> @@ -238,7 +238,7 @@ class="YesNoDatePicker form-control" { $bSwitchValue = "1"; $sentDBValue = $sent; - $sent = convertToGlobalSettingFormat($sent); + $sent = convertToGlobalSettingFormat($sent, true); } $bRemindSwitchValue = "0"; @@ -246,7 +246,7 @@ class="YesNoDatePicker form-control" { $bRemindSwitchValue = "1"; $remindersentDBValue = $remindersent; - $remindersent = convertToGlobalSettingFormat($remindersent); + $remindersent = convertToGlobalSettingFormat($remindersent, true); } ?> diff --git a/application/views/survey/questions/date/selector/answer.php b/application/views/survey/questions/date/selector/answer.php index c43260d065f..33fd41bdef6 100644 --- a/application/views/survey/questions/date/selector/answer.php +++ b/application/views/survey/questions/date/selector/answer.php @@ -114,3 +114,11 @@ class='form-control' + + diff --git a/docs/release_notes.txt b/docs/release_notes.txt index 0bc7835a4f8..d49e7641336 100644 --- a/docs/release_notes.txt +++ b/docs/release_notes.txt @@ -1,4 +1,4 @@ -Welcome to LimeSurvey v2.50+! +Welcome to LimeSurvey v2.x! Warranty: This program is provided "as is" without warranties of any kind, either expressed or implied, including, but not limited to, the implied warranties of merchantability and fitness for a particular @@ -35,6 +35,46 @@ Thank you to everyone who helped with this new release! CHANGE LOG ------------------------------------------------------ +Changes from 2.54.5 (build 161019) to 2.55 (build 161021) Oct 21 2016 +-New feature: Quick-add conditions in the condition designer (Olle Haerstedt) +-Fixed issue #11727: 'Undefined index: LEMsid' with a plugin sidebody URL (Olle Haerstedt) +-Fixed issue #11758: Better error message for replacement fields (Olle Haerstedt) +-Fixed issue #11794: Show scenario number when edit condition (Olle Haerstedt) +-Fixed issue #11818: Non-sanitized output in massive actions for question list (Carsten Schmitz) +#Updated translation: Catalan by qualitatuvic +#Updated translation: Dutch by Han +#Updated translation: Dutch (Informal) by Han +#Updated translation: Polish by elisa +#Updated translation: Polish (Informal) by elisa + +Changes from 2.54.4 (build 161018) to 2.54.5 (build 161019) Oct 19 2016 +-Fixed issue #11805: Timestamp hours does not display correctly in 'invitations sent' window (Olle Haerstedt) +-Fixed issue #11809: Restrictions for mass actions not correct working in response browsing (Olle Haerstedt) +-Fixed issue #11815: Can't login, no input field for login (LouisGac) +#Updated translation: Chinese (Simplified) by yooyooh, yanglaw, leadingsoci + +Changes from 2.54.3 (build 161014) to 2.54.4 (build 161018) Oct 18, 2016 +-Fixed issue #11702: Dropdown question : 2 'no answer' if value selected is 0 (Denis Chenu) +-Fixed issue #11731: Regexp validation for short-text question (Olle Haerstedt) +-Fixed issue #11740: Decimal throwerreor with negative value (Denis Chenu) +-Fixed issue #11753: Date validation issues (Olle Haerstedt) +-Fixed issue #11768: Window for old token tables too small (Olle Haerstedt) +-Fixed issue #11802: Remove unused files (Olle Haerstedt) +-Fixed issue #11806: Blank page in conditions (Olle Haerstedt) +#Updated translation: Catalan by qualitatuvic +#Updated translation: Dutch by kpadm, Han +#Updated translation: Dutch (Informal) by c_schmitz, Han +#Updated translation: Finnish by jeskiv +#Updated translation: German by Joffm, c_schmitz +#Updated translation: Italian by lfanfoni +#Updated translation: Italian (Informal) by lfanfoni +#Updated translation: Japanese by nomoto +#Updated translation: Norwegian (Bokmål) by pmonstad +#Updated translation: Norwegian (Nynorsk) by pmonstad +#Updated translation: Polish by elisa +#Updated translation: Polish (Informal) by elisa +#Updated translation: Russian by ddrmoscow, kmaksat, vipgroup +#Updated translation: Spanish (Spain) by aesteban Changes from 2.54.2 (build 161012) to 2.54.3 (build 161014) Oct 14, 2016 -Fixed issue #11746: Notice when previewing a hidden question and debug mode activated (Carsten Schmitz) diff --git a/locale/_template/limesurvey.pot b/locale/_template/limesurvey.pot index 6c3c3334513..55c71075776 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: 2016-10-14 08:10:40+00:00\n" +"POT-Creation-Date: 2016-10-21 06:48:38+00:00\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -37,27 +37,27 @@ msgstr "" #: application/extensions/PannelBoxWidget/PannelBoxWidget.php:63 #: application/extensions/admin/grid/MassiveActionsWidget/views/modals/first-select.php:7 #: application/extensions/admin/survey/ListSurveysWidget/views/massive_actions/_delete_results.php:29 -#: application/helpers/admin/import_helper.php:933 -#: application/helpers/admin/import_helper.php:977 -#: application/helpers/admin/import_helper.php:1010 -#: application/helpers/admin/import_helper.php:1101 -#: application/helpers/admin/import_helper.php:1209 -#: application/helpers/admin/import_helper.php:1310 -#: application/helpers/admin/import_helper.php:1315 -#: application/helpers/admin/import_helper.php:1339 -#: application/helpers/admin/import_helper.php:1416 -#: application/helpers/admin/import_helper.php:1442 -#: application/helpers/admin/import_helper.php:1463 -#: application/helpers/admin/import_helper.php:1485 -#: application/helpers/admin/import_helper.php:1503 -#: application/helpers/admin/import_helper.php:1529 -#: application/helpers/admin/import_helper.php:1697 -#: application/helpers/admin/import_helper.php:2037 -#: application/helpers/admin/import_helper.php:2226 -#: application/helpers/admin/import_helper.php:2283 -#: application/helpers/admin/import_helper.php:2331 -#: application/helpers/admin/import_helper.php:2465 -#: application/helpers/admin/import_helper.php:2505 +#: application/helpers/admin/import_helper.php:940 +#: application/helpers/admin/import_helper.php:984 +#: application/helpers/admin/import_helper.php:1017 +#: application/helpers/admin/import_helper.php:1108 +#: application/helpers/admin/import_helper.php:1216 +#: application/helpers/admin/import_helper.php:1317 +#: application/helpers/admin/import_helper.php:1322 +#: application/helpers/admin/import_helper.php:1346 +#: application/helpers/admin/import_helper.php:1423 +#: application/helpers/admin/import_helper.php:1449 +#: application/helpers/admin/import_helper.php:1470 +#: application/helpers/admin/import_helper.php:1492 +#: application/helpers/admin/import_helper.php:1510 +#: application/helpers/admin/import_helper.php:1536 +#: application/helpers/admin/import_helper.php:1710 +#: application/helpers/admin/import_helper.php:2053 +#: application/helpers/admin/import_helper.php:2242 +#: application/helpers/admin/import_helper.php:2299 +#: application/helpers/admin/import_helper.php:2347 +#: application/helpers/admin/import_helper.php:2481 +#: application/helpers/admin/import_helper.php:2521 #: application/views/admin/dataentry/active_html_view.php:89 #: application/views/admin/dataentry/vvimport_result.php:16 #: application/views/admin/error_view.php:3 @@ -94,7 +94,7 @@ msgstr "" #: application/controllers/AdminController.php:82 #: application/controllers/admin/surveyadmin.php:697 -#: application/controllers/admin/tokens.php:2416 +#: application/controllers/admin/tokens.php:2426 #: application/views/admin/authentication/forgotpassword.php:53 #: application/views/admin/dataentry/active_html_view.php:91 #: application/views/admin/survey/copySurvey_view.php:15 @@ -104,7 +104,7 @@ msgid "Main Admin Screen" msgstr "" #: application/controllers/AdminController.php:90 -#: application/core/Survey_Common_Action.php:376 +#: application/core/Survey_Common_Action.php:365 #: application/views/admin/index.php:4 plugins/Demo/Example/Example.php:53 msgid "LimeSurvey online manual" msgstr "" @@ -244,9 +244,9 @@ msgstr "" #: application/controllers/InstallerController.php:697 #: application/controllers/admin/surveypermission.php:628 -#: application/controllers/admin/useraction.php:326 -#: application/controllers/admin/useraction.php:416 -#: application/controllers/admin/useraction.php:428 +#: application/controllers/admin/useraction.php:328 +#: application/controllers/admin/useraction.php:418 +#: application/controllers/admin/useraction.php:430 #: application/controllers/admin/usergroups.php:141 msgid "Success!" msgstr "" @@ -259,19 +259,19 @@ msgstr "" msgid "The password you have chosen at the optional settings step." msgstr "" -#: application/controllers/InstallerController.php:1150 +#: application/controllers/InstallerController.php:1154 msgid "Configuration directory is not writable" msgstr "" -#: application/controllers/InstallerController.php:1151 +#: application/controllers/InstallerController.php:1155 msgid "You will be redirected in about 5 secs. If not, click
here." msgstr "" -#: application/controllers/InstallerController.php:1341 +#: application/controllers/InstallerController.php:1346 msgid "Try again! Connection with database failed." msgstr "" -#: application/controllers/InstallerController.php:1342 +#: application/controllers/InstallerController.php:1347 #: application/views/admin/checkintegrity/check_view.php:18 #: application/views/admin/checkintegrity/check_view.php:80 #: application/views/admin/checkintegrity/check_view.php:98 @@ -282,7 +282,7 @@ msgstr "" msgid "Reason:" msgstr "" -#: application/controllers/InstallerController.php:1359 +#: application/controllers/InstallerController.php:1364 msgid "The database does not meet the minimum MySQL/MariaDB server version requirement for LimeSurvey (%s)." msgstr "" @@ -332,14 +332,14 @@ msgstr "" #: application/controllers/admin/homepagesettings.php:167 #: application/controllers/admin/labels.php:50 #: application/controllers/admin/labels.php:125 -#: application/controllers/admin/labels.php:247 -#: application/controllers/admin/labels.php:367 +#: application/controllers/admin/labels.php:246 +#: application/controllers/admin/labels.php:366 #: application/controllers/admin/printablesurvey.php:35 -#: application/controllers/admin/quotas.php:64 -#: application/controllers/admin/quotas.php:77 +#: application/controllers/admin/quotas.php:67 +#: application/controllers/admin/quotas.php:80 #: application/controllers/admin/responses.php:328 #: application/controllers/admin/usergroups.php:268 -#: application/helpers/common_helper.php:4683 +#: application/helpers/common_helper.php:4699 msgid "Access denied!" msgstr "" @@ -407,7 +407,7 @@ msgstr "" #: application/controllers/admin/assessments.php:82 #: application/controllers/admin/conditionsaction.php:108 #: application/controllers/admin/emailtemplates.php:74 -#: application/controllers/admin/export.php:1223 +#: application/controllers/admin/export.php:1226 #: application/controllers/admin/expressions.php:49 #: application/controllers/admin/index.php:35 #: application/controllers/admin/questiongroups.php:109 @@ -423,10 +423,10 @@ msgstr "" #: application/controllers/admin/questions.php:667 #: application/controllers/admin/questions.php:1043 #: application/controllers/admin/questions.php:1182 -#: application/controllers/admin/quotas.php:98 -#: application/controllers/admin/quotas.php:415 -#: application/controllers/admin/quotas.php:482 -#: application/controllers/admin/quotas.php:501 +#: application/controllers/admin/quotas.php:101 +#: application/controllers/admin/quotas.php:418 +#: application/controllers/admin/quotas.php:485 +#: application/controllers/admin/quotas.php:504 #: application/controllers/admin/responses.php:660 #: application/controllers/admin/surveyadmin.php:222 #: application/controllers/admin/surveyadmin.php:377 @@ -446,25 +446,25 @@ msgstr "" #: application/controllers/admin/surveypermission.php:762 #: application/controllers/admin/tokens.php:49 #: application/controllers/admin/tokens.php:392 -#: application/controllers/admin/tokens.php:561 -#: application/controllers/admin/tokens.php:820 -#: application/controllers/admin/tokens.php:976 -#: application/controllers/admin/tokens.php:1188 -#: application/controllers/admin/tokens.php:1575 -#: application/controllers/admin/tokens.php:1699 -#: application/controllers/admin/tokens.php:1976 -#: application/controllers/admin/tokens.php:2320 -#: application/controllers/admin/tokens.php:2471 -#: application/controllers/admin/tokens.php:2537 -#: application/controllers/admin/tokens.php:2659 +#: application/controllers/admin/tokens.php:565 +#: application/controllers/admin/tokens.php:828 +#: application/controllers/admin/tokens.php:986 +#: application/controllers/admin/tokens.php:1198 +#: application/controllers/admin/tokens.php:1585 +#: application/controllers/admin/tokens.php:1709 +#: application/controllers/admin/tokens.php:1986 +#: application/controllers/admin/tokens.php:2330 +#: application/controllers/admin/tokens.php:2481 +#: application/controllers/admin/tokens.php:2551 +#: application/controllers/admin/tokens.php:2673 #: application/controllers/admin/translate.php:86 -#: application/helpers/admin/statistics_helper.php:2604 -#: application/helpers/admin/statistics_helper.php:2617 -#: application/helpers/admin/statistics_helper.php:2663 -#: application/helpers/userstatistics_helper.php:1816 -#: application/helpers/userstatistics_helper.php:1829 -#: application/helpers/userstatistics_helper.php:1877 -#: application/models/TokenDynamic.php:566 +#: application/helpers/admin/statistics_helper.php:2610 +#: application/helpers/admin/statistics_helper.php:2623 +#: application/helpers/admin/statistics_helper.php:2669 +#: application/helpers/userstatistics_helper.php:1818 +#: application/helpers/userstatistics_helper.php:1831 +#: application/helpers/userstatistics_helper.php:1879 +#: application/models/TokenDynamic.php:569 #: application/views/admin/assessments_view.php:23 #: application/views/admin/saved/savedlist_view.php:17 #: application/views/admin/survey/surveySummary_view.php:300 @@ -474,7 +474,7 @@ msgstr "" #: application/controllers/RegisterController.php:147 #: application/helpers/frontend_helper.php:1013 -#: application/helpers/frontend_helper.php:1302 +#: application/helpers/frontend_helper.php:1304 msgid "Your answer to the security question was not correct - please try again." msgstr "" @@ -488,10 +488,10 @@ msgstr "" #: application/controllers/RegisterController.php:165 #: application/controllers/admin/tokens.php:482 -#: application/controllers/admin/tokens.php:516 -#: application/controllers/admin/tokens.php:615 -#: application/controllers/admin/tokens.php:727 -#: application/controllers/admin/tokens.php:869 +#: application/controllers/admin/tokens.php:518 +#: application/controllers/admin/tokens.php:619 +#: application/controllers/admin/tokens.php:733 +#: application/controllers/admin/tokens.php:877 msgid "%s cannot be left empty" msgstr "" @@ -564,10 +564,10 @@ msgstr "" #: application/controllers/Statistics_userController.php:331 #: application/controllers/admin/dataentry.php:532 -#: application/controllers/admin/quotas.php:204 +#: application/controllers/admin/quotas.php:207 #: application/controllers/admin/responses.php:159 #: application/controllers/admin/responses.php:160 -#: application/controllers/admin/tokens.php:1614 +#: application/controllers/admin/tokens.php:1624 #: application/models/Token.php:47 #: application/views/admin/quotas/viewquotas_view.php:22 #: application/views/admin/token/exportdialog.php:18 @@ -609,7 +609,7 @@ msgid "Sorry, there was an error uploading your file" msgstr "" #: application/controllers/UploaderController.php:262 -#: application/controllers/admin/export.php:966 +#: application/controllers/admin/export.php:969 msgid "Unknown error" msgstr "" @@ -617,7 +617,7 @@ msgstr "" #: application/controllers/admin/responses.php:188 #: application/extensions/admin/survey/ListSurveysWidget/views/listSurveys.php:60 #: application/extensions/admin/survey/ListSurveysWidget/views/listSurveys.php:65 -#: application/helpers/qanda_helper.php:2541 +#: application/helpers/qanda_helper.php:2551 #: application/views/admin/assessments_view.php:37 #: application/views/admin/homepagesettings/index.php:95 #: application/views/admin/labels/_labelviewtabcontent_view.php:20 @@ -628,9 +628,9 @@ msgstr "" #: application/controllers/UploaderController.php:288 #: application/controllers/admin/responses.php:191 -#: application/helpers/common_helper.php:2045 -#: application/helpers/common_helper.php:2264 -#: application/helpers/qanda_helper.php:2542 +#: application/helpers/common_helper.php:2052 +#: application/helpers/common_helper.php:2271 +#: application/helpers/qanda_helper.php:2552 #: application/views/admin/dataentry/content_view.php:216 msgid "Comment" msgstr "" @@ -675,8 +675,8 @@ msgstr "" #: application/controllers/admin/surveypermission.php:141 #: application/controllers/admin/surveypermission.php:514 #: application/extensions/admin/survey/ListSurveysWidget/views/massive_actions/_selector.php:24 -#: application/helpers/qanda_helper.php:2544 -#: application/models/Question.php:733 application/models/QuestionGroup.php:282 +#: application/helpers/qanda_helper.php:2554 +#: application/models/Question.php:732 application/models/QuestionGroup.php:282 #: application/models/QuestionGroup.php:290 #: application/views/admin/participants/massive_actions/_selector.php:18 #: application/views/admin/participants/massive_actions/_selector.php:37 @@ -684,7 +684,7 @@ msgstr "" #: application/views/admin/participants/massive_actions/_selector_share.php:18 #: application/views/admin/participants/modal_subviews/_deleteParticipant.php:26 #: application/views/admin/quotas/viewquotasrow_view.php:32 -#: application/views/admin/responses/massive_actions/_selector.php:26 +#: application/views/admin/responses/massive_actions/_selector.php:20 #: application/views/admin/survey/Question/massive_actions/_selector.php:44 #: application/views/admin/survey/Question/questionbar_view.php:132 #: application/views/admin/survey/Question/questionbar_view.php:137 @@ -698,7 +698,7 @@ msgstr "" #: application/controllers/UploaderController.php:299 #: application/controllers/admin/assessments.php:149 -#: application/helpers/qanda_helper.php:2545 +#: application/helpers/qanda_helper.php:2555 #: application/views/admin/quotas/viewquotasrow_view.php:27 #: application/views/admin/survey/Question/questionbar_view.php:109 msgid "Edit" @@ -729,7 +729,7 @@ msgid "Validate quota" msgstr "" #: application/controllers/admin/ExpressionValidate.php:110 -#: application/controllers/admin/translate.php:590 +#: application/controllers/admin/translate.php:588 msgid "Invitation email subject" msgstr "" @@ -738,7 +738,7 @@ msgid "Invitation email body" msgstr "" #: application/controllers/admin/ExpressionValidate.php:120 -#: application/controllers/admin/translate.php:620 +#: application/controllers/admin/translate.php:618 msgid "Reminder email subject" msgstr "" @@ -747,8 +747,8 @@ msgid "Reminder email body" msgstr "" #: application/controllers/admin/ExpressionValidate.php:130 -#: application/controllers/admin/translate.php:650 -#: application/controllers/admin/translate.php:710 +#: application/controllers/admin/translate.php:648 +#: application/controllers/admin/translate.php:708 msgid "Confirmation email subject" msgstr "" @@ -757,7 +757,7 @@ msgid "Confirmation email body" msgstr "" #: application/controllers/admin/ExpressionValidate.php:140 -#: application/controllers/admin/translate.php:680 +#: application/controllers/admin/translate.php:678 msgid "Registration email subject" msgstr "" @@ -782,60 +782,60 @@ msgid "Detailed admin notification body" msgstr "" #: application/controllers/admin/ExpressionValidate.php:175 -#: application/controllers/admin/limereplacementfields.php:219 -#: application/controllers/admin/limereplacementfields.php:239 -#: application/controllers/admin/limereplacementfields.php:261 -#: application/controllers/admin/limereplacementfields.php:278 +#: application/controllers/admin/limereplacementfields.php:233 +#: application/controllers/admin/limereplacementfields.php:253 +#: application/controllers/admin/limereplacementfields.php:275 +#: application/controllers/admin/limereplacementfields.php:292 msgid "Name of the survey" msgstr "" #: application/controllers/admin/ExpressionValidate.php:176 -#: application/controllers/admin/limereplacementfields.php:220 -#: application/controllers/admin/limereplacementfields.php:240 -#: application/controllers/admin/limereplacementfields.php:262 -#: application/controllers/admin/limereplacementfields.php:279 +#: application/controllers/admin/limereplacementfields.php:234 +#: application/controllers/admin/limereplacementfields.php:254 +#: application/controllers/admin/limereplacementfields.php:276 +#: application/controllers/admin/limereplacementfields.php:293 msgid "Description of the survey" msgstr "" #: application/controllers/admin/ExpressionValidate.php:179 #: application/controllers/admin/ExpressionValidate.php:183 -#: application/controllers/admin/limereplacementfields.php:216 -#: application/controllers/admin/limereplacementfields.php:236 -#: application/controllers/admin/limereplacementfields.php:255 -#: application/controllers/admin/limereplacementfields.php:275 +#: application/controllers/admin/limereplacementfields.php:230 +#: application/controllers/admin/limereplacementfields.php:250 +#: application/controllers/admin/limereplacementfields.php:269 +#: application/controllers/admin/limereplacementfields.php:289 msgid "Token code for this participant" msgstr "" #: application/controllers/admin/ExpressionValidate.php:180 #: application/controllers/admin/ExpressionValidate.php:196 #: application/controllers/admin/ExpressionValidate.php:209 -#: application/controllers/admin/limereplacementfields.php:199 -#: application/controllers/admin/limereplacementfields.php:254 -#: application/controllers/admin/limereplacementfields.php:308 +#: application/controllers/admin/limereplacementfields.php:213 +#: application/controllers/admin/limereplacementfields.php:268 +#: application/controllers/admin/limereplacementfields.php:322 msgid "Email from the token" msgstr "" #: application/controllers/admin/ExpressionValidate.php:181 #: application/controllers/admin/ExpressionValidate.php:197 #: application/controllers/admin/ExpressionValidate.php:210 -#: application/controllers/admin/limereplacementfields.php:197 -#: application/controllers/admin/limereplacementfields.php:217 -#: application/controllers/admin/limereplacementfields.php:237 -#: application/controllers/admin/limereplacementfields.php:259 -#: application/controllers/admin/limereplacementfields.php:276 -#: application/controllers/admin/limereplacementfields.php:306 +#: application/controllers/admin/limereplacementfields.php:211 +#: application/controllers/admin/limereplacementfields.php:231 +#: application/controllers/admin/limereplacementfields.php:251 +#: application/controllers/admin/limereplacementfields.php:273 +#: application/controllers/admin/limereplacementfields.php:290 +#: application/controllers/admin/limereplacementfields.php:320 msgid "First name from token" msgstr "" #: application/controllers/admin/ExpressionValidate.php:182 #: application/controllers/admin/ExpressionValidate.php:198 #: application/controllers/admin/ExpressionValidate.php:211 -#: application/controllers/admin/limereplacementfields.php:198 -#: application/controllers/admin/limereplacementfields.php:218 -#: application/controllers/admin/limereplacementfields.php:238 -#: application/controllers/admin/limereplacementfields.php:260 -#: application/controllers/admin/limereplacementfields.php:277 -#: application/controllers/admin/limereplacementfields.php:307 +#: application/controllers/admin/limereplacementfields.php:212 +#: application/controllers/admin/limereplacementfields.php:232 +#: application/controllers/admin/limereplacementfields.php:252 +#: application/controllers/admin/limereplacementfields.php:274 +#: application/controllers/admin/limereplacementfields.php:291 +#: application/controllers/admin/limereplacementfields.php:321 msgid "Last name from token" msgstr "" @@ -847,58 +847,58 @@ msgstr "" #: application/controllers/admin/ExpressionValidate.php:187 #: application/controllers/admin/ExpressionValidate.php:205 #: application/controllers/admin/ExpressionValidate.php:215 -#: application/controllers/admin/limereplacementfields.php:203 -#: application/controllers/admin/limereplacementfields.php:224 -#: application/controllers/admin/limereplacementfields.php:244 -#: application/controllers/admin/limereplacementfields.php:266 -#: application/controllers/admin/limereplacementfields.php:283 -#: application/controllers/admin/limereplacementfields.php:316 +#: application/controllers/admin/limereplacementfields.php:217 +#: application/controllers/admin/limereplacementfields.php:238 +#: application/controllers/admin/limereplacementfields.php:258 +#: application/controllers/admin/limereplacementfields.php:280 +#: application/controllers/admin/limereplacementfields.php:297 +#: application/controllers/admin/limereplacementfields.php:330 msgid "Token attribute: %s" msgstr "" #: application/controllers/admin/ExpressionValidate.php:200 -#: application/controllers/admin/limereplacementfields.php:256 +#: application/controllers/admin/limereplacementfields.php:270 msgid "URL for a respondent to opt-out of this survey" msgstr "" #: application/controllers/admin/ExpressionValidate.php:201 -#: application/controllers/admin/limereplacementfields.php:257 +#: application/controllers/admin/limereplacementfields.php:271 msgid "URL for a respondent to opt-in to this survey" msgstr "" #: application/controllers/admin/ExpressionValidate.php:202 #: application/controllers/admin/ExpressionValidate.php:212 -#: application/controllers/admin/limereplacementfields.php:270 -#: application/controllers/admin/limereplacementfields.php:287 +#: application/controllers/admin/limereplacementfields.php:284 +#: application/controllers/admin/limereplacementfields.php:301 msgid "URL of the survey" msgstr "" #: application/controllers/admin/ExpressionValidate.php:221 -#: application/controllers/admin/limereplacementfields.php:212 -#: application/controllers/admin/limereplacementfields.php:231 +#: application/controllers/admin/limereplacementfields.php:226 +#: application/controllers/admin/limereplacementfields.php:245 msgid "Reload URL" msgstr "" #: application/controllers/admin/ExpressionValidate.php:222 -#: application/controllers/admin/limereplacementfields.php:213 -#: application/controllers/admin/limereplacementfields.php:232 +#: application/controllers/admin/limereplacementfields.php:227 +#: application/controllers/admin/limereplacementfields.php:246 msgid "View response URL" msgstr "" #: application/controllers/admin/ExpressionValidate.php:223 -#: application/controllers/admin/limereplacementfields.php:214 -#: application/controllers/admin/limereplacementfields.php:233 +#: application/controllers/admin/limereplacementfields.php:228 +#: application/controllers/admin/limereplacementfields.php:247 msgid "Edit response URL" msgstr "" #: application/controllers/admin/ExpressionValidate.php:224 -#: application/controllers/admin/limereplacementfields.php:215 -#: application/controllers/admin/limereplacementfields.php:234 +#: application/controllers/admin/limereplacementfields.php:229 +#: application/controllers/admin/limereplacementfields.php:248 msgid "Statistics URL" msgstr "" #: application/controllers/admin/ExpressionValidate.php:225 -#: application/controllers/admin/limereplacementfields.php:235 +#: application/controllers/admin/limereplacementfields.php:249 msgid "Answers from this response" msgstr "" @@ -922,31 +922,31 @@ msgstr "" #: application/controllers/admin/surveyadmin.php:878 #: application/controllers/admin/tokens.php:40 #: application/controllers/admin/tokens.php:300 -#: application/controllers/admin/tokens.php:546 -#: application/controllers/admin/tokens.php:659 -#: application/controllers/admin/tokens.php:663 -#: application/controllers/admin/tokens.php:770 -#: application/controllers/admin/tokens.php:805 -#: application/controllers/admin/tokens.php:961 -#: application/controllers/admin/tokens.php:1019 -#: application/controllers/admin/tokens.php:1066 -#: application/controllers/admin/tokens.php:1124 -#: application/controllers/admin/tokens.php:1174 -#: application/controllers/admin/tokens.php:1585 -#: application/controllers/admin/tokens.php:1685 -#: application/controllers/admin/tokens.php:1962 -#: application/controllers/admin/tokens.php:2305 -#: application/controllers/admin/tokens.php:2371 -#: application/controllers/admin/tokens.php:2428 -#: application/controllers/admin/useraction.php:52 -#: application/controllers/admin/useraction.php:86 -#: application/controllers/admin/useraction.php:186 -#: application/controllers/admin/useraction.php:260 -#: application/controllers/admin/useraction.php:276 -#: application/controllers/admin/useraction.php:349 -#: application/controllers/admin/useraction.php:365 -#: application/controllers/admin/useraction.php:572 -#: application/controllers/admin/useraction.php:654 +#: application/controllers/admin/tokens.php:550 +#: application/controllers/admin/tokens.php:665 +#: application/controllers/admin/tokens.php:669 +#: application/controllers/admin/tokens.php:778 +#: application/controllers/admin/tokens.php:813 +#: application/controllers/admin/tokens.php:971 +#: application/controllers/admin/tokens.php:1029 +#: application/controllers/admin/tokens.php:1076 +#: application/controllers/admin/tokens.php:1134 +#: application/controllers/admin/tokens.php:1184 +#: application/controllers/admin/tokens.php:1595 +#: application/controllers/admin/tokens.php:1695 +#: application/controllers/admin/tokens.php:1972 +#: application/controllers/admin/tokens.php:2315 +#: application/controllers/admin/tokens.php:2381 +#: application/controllers/admin/tokens.php:2438 +#: application/controllers/admin/useraction.php:54 +#: application/controllers/admin/useraction.php:88 +#: application/controllers/admin/useraction.php:188 +#: application/controllers/admin/useraction.php:262 +#: application/controllers/admin/useraction.php:278 +#: application/controllers/admin/useraction.php:351 +#: application/controllers/admin/useraction.php:367 +#: application/controllers/admin/useraction.php:574 +#: application/controllers/admin/useraction.php:656 msgid "You do not have permission to access this page." msgstr "" @@ -961,14 +961,14 @@ msgid "Question group" msgstr "" #: application/controllers/admin/assessments.php:95 -#: application/helpers/admin/statistics_helper.php:1069 -#: application/helpers/userstatistics_helper.php:1059 +#: application/helpers/admin/statistics_helper.php:1070 +#: application/helpers/userstatistics_helper.php:1060 msgid "Minimum" msgstr "" #: application/controllers/admin/assessments.php:95 -#: application/helpers/admin/statistics_helper.php:1094 -#: application/helpers/userstatistics_helper.php:1084 +#: application/helpers/admin/statistics_helper.php:1095 +#: application/helpers/userstatistics_helper.php:1085 msgid "Maximum" msgstr "" @@ -998,53 +998,53 @@ msgstr "" msgid "Assessment mode for this survey is not activated. You can activate it in the %s survey settings %s (tab 'Notification & data management')." msgstr "" -#: application/controllers/admin/authentication.php:51 +#: application/controllers/admin/authentication.php:52 msgid "Successful login" msgstr "" -#: application/controllers/admin/authentication.php:55 -#: application/controllers/admin/authentication.php:162 +#: application/controllers/admin/authentication.php:56 +#: application/controllers/admin/authentication.php:189 msgid "Incorrect username and/or password!" msgstr "" -#: application/controllers/admin/authentication.php:185 +#: application/controllers/admin/authentication.php:212 msgid "Logout successful." msgstr "" -#: application/controllers/admin/authentication.php:219 -#: application/controllers/admin/authentication.php:257 +#: application/controllers/admin/authentication.php:246 +#: application/controllers/admin/authentication.php:284 msgid "If username and email are valid and you are allowed to use internal database authentication a new password has been sent to you" msgstr "" -#: application/controllers/admin/authentication.php:239 +#: application/controllers/admin/authentication.php:266 msgid "User data" msgstr "" -#: application/controllers/admin/authentication.php:244 +#: application/controllers/admin/authentication.php:271 msgid "Username: %s" msgstr "" -#: application/controllers/admin/authentication.php:245 +#: application/controllers/admin/authentication.php:272 msgid "New password: %s" msgstr "" -#: application/controllers/admin/authentication.php:248 +#: application/controllers/admin/authentication.php:275 msgid "Your user data for accessing %s" msgstr "" -#: application/controllers/admin/authentication.php:261 +#: application/controllers/admin/authentication.php:288 msgid "Email failed" msgstr "" -#: application/controllers/admin/authentication.php:282 +#: application/controllers/admin/authentication.php:309 msgid "Please log in first." msgstr "" -#: application/controllers/admin/authentication.php:287 +#: application/controllers/admin/authentication.php:314 msgid "Welcome %s!" msgstr "" -#: application/controllers/admin/authentication.php:292 +#: application/controllers/admin/authentication.php:319 msgid "Reloading screen. Please wait." msgstr "" @@ -1208,7 +1208,8 @@ msgstr "" #: application/controllers/admin/conditionsaction.php:69 #: application/controllers/admin/conditionsaction.php:83 -#: application/views/admin/conditions/includes/form_editconditions_header.php:198 +#: application/views/admin/conditions/includes/form_editconditions_header.php:195 +#: application/views/admin/conditions/includes/quickAddConditionForm.php:171 msgid "Regular expression" msgstr "" @@ -1233,79 +1234,79 @@ msgstr "" msgid "equals" msgstr "" -#: application/controllers/admin/conditionsaction.php:185 +#: application/controllers/admin/conditionsaction.php:186 msgid "You have not selected a survey" msgstr "" -#: application/controllers/admin/conditionsaction.php:196 +#: application/controllers/admin/conditionsaction.php:197 msgid "You have not selected a question" msgstr "" -#: application/controllers/admin/conditionsaction.php:410 +#: application/controllers/admin/conditionsaction.php:443 #: application/controllers/admin/printablesurvey.php:243 #: application/views/admin/survey/copySurvey_view.php:55 msgid "and" msgstr "" -#: application/controllers/admin/conditionsaction.php:415 +#: application/controllers/admin/conditionsaction.php:448 #: application/controllers/admin/printablesurvey.php:227 #: application/controllers/admin/printablesurvey.php:518 -#: application/helpers/SurveyRuntimeHelper.php:834 +#: application/helpers/SurveyRuntimeHelper.php:862 msgid "or" msgstr "" -#: application/controllers/admin/conditionsaction.php:487 +#: application/controllers/admin/conditionsaction.php:520 #: application/views/installer/precheck_view.php:14 msgid "Not found" msgstr "" -#: application/controllers/admin/conditionsaction.php:496 -#: application/controllers/admin/conditionsaction.php:2022 +#: application/controllers/admin/conditionsaction.php:529 +#: application/controllers/admin/conditionsaction.php:2231 msgid "From token table" msgstr "" -#: application/controllers/admin/conditionsaction.php:499 -#: application/controllers/admin/conditionsaction.php:2025 +#: application/controllers/admin/conditionsaction.php:532 +#: application/controllers/admin/conditionsaction.php:2234 msgid "Inexistant token table" msgstr "" -#: application/controllers/admin/conditionsaction.php:516 -#: application/controllers/admin/conditionsaction.php:1326 -#: application/controllers/admin/conditionsaction.php:1381 -#: application/controllers/admin/conditionsaction.php:1429 -#: application/controllers/admin/conditionsaction.php:1430 -#: application/controllers/admin/conditionsaction.php:1450 -#: application/controllers/admin/conditionsaction.php:1479 -#: application/controllers/admin/conditionsaction.php:1523 -#: application/controllers/admin/conditionsaction.php:1532 -#: application/controllers/admin/conditionsaction.php:1543 -#: application/controllers/admin/conditionsaction.php:1552 -#: application/controllers/admin/conditionsaction.php:1574 -#: application/controllers/admin/conditionsaction.php:1594 +#: application/controllers/admin/conditionsaction.php:549 +#: application/controllers/admin/conditionsaction.php:1511 +#: application/controllers/admin/conditionsaction.php:1566 +#: application/controllers/admin/conditionsaction.php:1614 +#: application/controllers/admin/conditionsaction.php:1615 +#: application/controllers/admin/conditionsaction.php:1635 +#: application/controllers/admin/conditionsaction.php:1664 +#: application/controllers/admin/conditionsaction.php:1708 +#: application/controllers/admin/conditionsaction.php:1717 +#: application/controllers/admin/conditionsaction.php:1728 +#: application/controllers/admin/conditionsaction.php:1737 +#: application/controllers/admin/conditionsaction.php:1759 +#: application/controllers/admin/conditionsaction.php:1779 #: application/controllers/admin/dataentry.php:1247 #: application/extensions/questionTypes/listRadio/listRadio.php:217 -#: application/helpers/admin/statistics_helper.php:718 -#: application/helpers/admin/statistics_helper.php:757 -#: application/helpers/admin/statistics_helper.php:1596 -#: application/helpers/admin/statistics_helper.php:1741 -#: application/helpers/admin/statistics_helper.php:2586 -#: application/helpers/common_helper.php:1496 -#: application/helpers/common_helper.php:1504 -#: application/helpers/qanda_helper.php:857 -#: application/helpers/qanda_helper.php:1401 -#: application/helpers/qanda_helper.php:1776 -#: application/helpers/qanda_helper.php:1838 -#: application/helpers/qanda_helper.php:4018 -#: application/helpers/qanda_helper.php:4201 -#: application/helpers/qanda_helper.php:4613 -#: application/helpers/qanda_helper.php:4696 -#: application/helpers/qanda_helper.php:4844 -#: application/helpers/qanda_helper.php:5692 -#: application/helpers/qanda_helper.php:5693 -#: application/helpers/userstatistics_helper.php:707 -#: application/helpers/userstatistics_helper.php:746 -#: application/helpers/userstatistics_helper.php:1578 -#: application/helpers/userstatistics_helper.php:1798 +#: application/helpers/admin/statistics_helper.php:719 +#: application/helpers/admin/statistics_helper.php:758 +#: application/helpers/admin/statistics_helper.php:1597 +#: application/helpers/admin/statistics_helper.php:1747 +#: application/helpers/admin/statistics_helper.php:2592 +#: application/helpers/common_helper.php:1503 +#: application/helpers/common_helper.php:1511 +#: application/helpers/qanda_helper.php:867 +#: application/helpers/qanda_helper.php:1411 +#: application/helpers/qanda_helper.php:1786 +#: application/helpers/qanda_helper.php:1848 +#: application/helpers/qanda_helper.php:4028 +#: application/helpers/qanda_helper.php:4211 +#: application/helpers/qanda_helper.php:4623 +#: application/helpers/qanda_helper.php:4706 +#: application/helpers/qanda_helper.php:4854 +#: application/helpers/qanda_helper.php:5702 +#: application/helpers/qanda_helper.php:5703 +#: application/helpers/userstatistics_helper.php:708 +#: application/helpers/userstatistics_helper.php:747 +#: application/helpers/userstatistics_helper.php:1579 +#: application/helpers/userstatistics_helper.php:1800 #: application/views/admin/dataentry/content_view.php:41 #: application/views/admin/templates/templateeditor_question_answer_view.php:165 #: application/views/survey/questions/arrays/dualscale/answer.php:212 @@ -1326,23 +1327,24 @@ msgstr "" msgid "No answer" msgstr "" -#: application/controllers/admin/conditionsaction.php:655 -#: application/controllers/admin/conditionsaction.php:658 +#: application/controllers/admin/conditionsaction.php:667 +#: application/controllers/admin/conditionsaction.php:670 #: application/controllers/admin/responses.php:699 -#: application/helpers/admin/statistics_helper.php:4728 -#: application/views/admin/conditions/includes/form_editconditions_header.php:48 +#: application/helpers/admin/statistics_helper.php:4733 +#: application/views/admin/conditions/includes/form_editconditions_header.php:45 +#: application/views/admin/conditions/includes/quickAddConditionForm.php:21 #: application/views/admin/survey/Question/listquestions.php:88 #: application/views/admin/templates/templateeditor_printoutput_view.php:3 msgid "Question" msgstr "" -#: application/controllers/admin/conditionsaction.php:697 -#: application/controllers/admin/tokens.php:1553 -#: application/controllers/admin/useraction.php:167 -#: application/helpers/admin/import_helper.php:2381 -#: application/helpers/admin/import_helper.php:2399 -#: application/helpers/admin/import_helper.php:2426 -#: application/helpers/admin/import_helper.php:2487 +#: application/controllers/admin/conditionsaction.php:710 +#: application/controllers/admin/tokens.php:1563 +#: application/controllers/admin/useraction.php:169 +#: application/helpers/admin/import_helper.php:2397 +#: application/helpers/admin/import_helper.php:2415 +#: application/helpers/admin/import_helper.php:2442 +#: application/helpers/admin/import_helper.php:2503 #: application/views/admin/dataentry/import.php:27 #: application/views/admin/dataentry/vvimport_result.php:22 #: application/views/admin/survey/Question/question_view.php:103 @@ -1357,54 +1359,65 @@ msgstr "" msgid "Warning" msgstr "" -#: application/controllers/admin/conditionsaction.php:705 +#: application/controllers/admin/conditionsaction.php:718 msgid "All conditions in this survey have been deleted." msgstr "" -#: application/controllers/admin/conditionsaction.php:755 -#: application/controllers/admin/conditionsaction.php:798 +#: application/controllers/admin/conditionsaction.php:768 +#: application/controllers/admin/conditionsaction.php:811 +#: application/controllers/admin/conditionsaction.php:879 +#: application/controllers/admin/conditionsaction.php:922 msgid "Could not insert all conditions." msgstr "" -#: application/controllers/admin/conditionsaction.php:758 -#: application/controllers/admin/conditionsaction.php:801 +#: application/controllers/admin/conditionsaction.php:771 +#: application/controllers/admin/conditionsaction.php:814 +#: application/controllers/admin/conditionsaction.php:882 +#: application/controllers/admin/conditionsaction.php:925 msgid "Condition added." msgstr "" -#: application/controllers/admin/conditionsaction.php:762 -#: application/controllers/admin/conditionsaction.php:805 +#: application/controllers/admin/conditionsaction.php:775 +#: application/controllers/admin/conditionsaction.php:818 +#: application/controllers/admin/conditionsaction.php:849 +#: application/controllers/admin/conditionsaction.php:886 +#: application/controllers/admin/conditionsaction.php:929 msgid "Your condition could not be added! It did not include the question and/or answer upon which the condition was based. Please ensure you have selected a question and an answer." msgstr "" -#: application/controllers/admin/conditionsaction.php:853 -#: application/controllers/admin/conditionsaction.php:859 -#: application/controllers/admin/conditionsaction.php:898 +#: application/controllers/admin/conditionsaction.php:1033 +#: application/controllers/admin/conditionsaction.php:1039 +#: application/controllers/admin/conditionsaction.php:1078 msgid "Could not update condition." msgstr "" -#: application/controllers/admin/conditionsaction.php:856 -#: application/controllers/admin/conditionsaction.php:895 +#: application/controllers/admin/conditionsaction.php:1036 +#: application/controllers/admin/conditionsaction.php:1075 msgid "Condition updated." msgstr "" -#: application/controllers/admin/conditionsaction.php:928 +#: application/controllers/admin/conditionsaction.php:1108 msgid "All conditions scenarios were renumbered." msgstr "" -#: application/controllers/admin/conditionsaction.php:1001 +#: application/controllers/admin/conditionsaction.php:1181 msgid "Condition successfully copied (some were skipped because they were duplicates)" msgstr "" -#: application/controllers/admin/conditionsaction.php:1004 +#: application/controllers/admin/conditionsaction.php:1184 msgid "Condition successfully copied" msgstr "" -#: application/controllers/admin/conditionsaction.php:1008 +#: application/controllers/admin/conditionsaction.php:1188 msgid "No conditions could be copied (due to duplicates)" msgstr "" -#: application/controllers/admin/conditionsaction.php:1299 -#: application/controllers/admin/conditionsaction.php:1518 +#: application/controllers/admin/conditionsaction.php:1242 +msgid "All conditions for this question have been deleted." +msgstr "" + +#: application/controllers/admin/conditionsaction.php:1484 +#: application/controllers/admin/conditionsaction.php:1703 #: application/controllers/admin/dataentry.php:671 #: application/controllers/admin/dataentry.php:1119 #: application/controllers/admin/dataentry.php:1181 @@ -1413,25 +1426,25 @@ msgstr "" #: application/controllers/admin/printablesurvey.php:936 #: application/controllers/admin/printablesurvey.php:1041 #: application/controllers/admin/printablesurvey.php:1057 -#: application/controllers/admin/quotas.php:586 -#: application/controllers/admin/tokens.php:2331 -#: application/core/Survey_Common_Action.php:1201 +#: application/controllers/admin/quotas.php:589 +#: application/controllers/admin/tokens.php:2341 +#: application/core/Survey_Common_Action.php:1190 #: application/core/plugins/ExportSTATAxml/STATAxmlWriter.php:228 #: application/core/plugins/ExportSTATAxml/STATAxmlWriter.php:239 #: application/core/plugins/ExportSTATAxml/STATAxmlWriter.php:261 #: application/core/plugins/ExportSTATAxml/STATAxmlWriter.php:272 #: application/extensions/admin/grid/MassiveActionsWidget/views/modals/yes-no.php:46 -#: application/helpers/admin/statistics_helper.php:1339 -#: application/helpers/admin/statistics_helper.php:1472 -#: application/helpers/common_helper.php:1488 -#: application/helpers/common_helper.php:1494 -#: application/helpers/common_helper.php:1510 -#: application/helpers/export_helper.php:281 -#: application/helpers/export_helper.php:285 -#: application/helpers/export_helper.php:293 -#: application/helpers/export_helper.php:297 -#: application/helpers/export_helper.php:1377 -#: application/helpers/export_helper.php:1396 +#: application/helpers/admin/statistics_helper.php:1340 +#: application/helpers/admin/statistics_helper.php:1473 +#: application/helpers/common_helper.php:1495 +#: application/helpers/common_helper.php:1501 +#: application/helpers/common_helper.php:1517 +#: application/helpers/export_helper.php:282 +#: application/helpers/export_helper.php:286 +#: application/helpers/export_helper.php:294 +#: application/helpers/export_helper.php:298 +#: application/helpers/export_helper.php:1378 +#: application/helpers/export_helper.php:1397 #: application/helpers/expressions/em_manager_helper.php:3616 #: application/helpers/expressions/em_manager_helper.php:3620 #: application/helpers/questionHelper.php:58 @@ -1470,16 +1483,16 @@ msgstr "" #: application/helpers/questionHelper.php:1268 #: application/helpers/questionHelper.php:1279 #: application/helpers/questionHelper.php:1339 -#: application/helpers/userstatistics_helper.php:1322 -#: application/helpers/userstatistics_helper.php:1455 +#: application/helpers/userstatistics_helper.php:1323 +#: application/helpers/userstatistics_helper.php:1456 #: application/models/Participant.php:311 #: application/models/Participant.php:318 #: application/models/Participant.php:372 #: application/models/ParticipantAttributeName.php:177 #: application/models/ParticipantAttributeName.php:214 -#: application/models/ParticipantShare.php:140 -#: application/models/ParticipantShare.php:147 -#: application/models/ParticipantShare.php:255 +#: application/models/ParticipantShare.php:141 +#: application/models/ParticipantShare.php:148 +#: application/models/ParticipantShare.php:256 #: application/models/Survey.php:431 application/models/Survey.php:684 #: application/models/Survey.php:690 #: application/views/admin/conditions/deleteAllConditions.php:15 @@ -1534,18 +1547,18 @@ msgstr "" msgid "Yes" msgstr "" -#: application/controllers/admin/conditionsaction.php:1300 +#: application/controllers/admin/conditionsaction.php:1485 #: application/controllers/admin/dataentry.php:1184 #: application/controllers/admin/printablesurvey.php:358 #: application/controllers/admin/printablesurvey.php:1042 #: application/controllers/admin/printablesurvey.php:1058 #: application/core/plugins/ExportSTATAxml/STATAxmlWriter.php:280 -#: application/helpers/admin/statistics_helper.php:1341 -#: application/helpers/common_helper.php:1512 -#: application/helpers/export_helper.php:299 -#: application/helpers/export_helper.php:1396 +#: application/helpers/admin/statistics_helper.php:1342 +#: application/helpers/common_helper.php:1519 +#: application/helpers/export_helper.php:300 +#: application/helpers/export_helper.php:1397 #: application/helpers/expressions/em_manager_helper.php:3622 -#: application/helpers/userstatistics_helper.php:1324 +#: application/helpers/userstatistics_helper.php:1325 #: application/views/admin/dataentry/content_view.php:697 #: application/views/admin/export/statistics_subviews/_question.php:449 #: application/views/survey/questions/arrays/yesnouncertain/rows/answer_row.php:73 @@ -1553,8 +1566,8 @@ msgstr "" msgid "Uncertain" msgstr "" -#: application/controllers/admin/conditionsaction.php:1301 -#: application/controllers/admin/conditionsaction.php:1519 +#: application/controllers/admin/conditionsaction.php:1486 +#: application/controllers/admin/conditionsaction.php:1704 #: application/controllers/admin/dataentry.php:670 #: application/controllers/admin/dataentry.php:1122 #: application/controllers/admin/dataentry.php:1187 @@ -1563,20 +1576,20 @@ msgstr "" #: application/controllers/admin/printablesurvey.php:937 #: application/controllers/admin/printablesurvey.php:1043 #: application/controllers/admin/printablesurvey.php:1059 -#: application/controllers/admin/quotas.php:587 -#: application/controllers/admin/tokens.php:2333 -#: application/core/Survey_Common_Action.php:1197 +#: application/controllers/admin/quotas.php:590 +#: application/controllers/admin/tokens.php:2343 +#: application/core/Survey_Common_Action.php:1186 #: application/core/plugins/ExportSTATAxml/STATAxmlWriter.php:265 #: application/core/plugins/ExportSTATAxml/STATAxmlWriter.php:276 #: application/extensions/admin/grid/MassiveActionsWidget/views/modals/yes-no.php:54 -#: application/helpers/admin/statistics_helper.php:1340 -#: application/helpers/admin/statistics_helper.php:1473 -#: application/helpers/common_helper.php:1495 -#: application/helpers/common_helper.php:1511 -#: application/helpers/export_helper.php:294 -#: application/helpers/export_helper.php:298 -#: application/helpers/export_helper.php:1377 -#: application/helpers/export_helper.php:1396 +#: application/helpers/admin/statistics_helper.php:1341 +#: application/helpers/admin/statistics_helper.php:1474 +#: application/helpers/common_helper.php:1502 +#: application/helpers/common_helper.php:1518 +#: application/helpers/export_helper.php:295 +#: application/helpers/export_helper.php:299 +#: application/helpers/export_helper.php:1378 +#: application/helpers/export_helper.php:1397 #: application/helpers/expressions/em_manager_helper.php:3617 #: application/helpers/expressions/em_manager_helper.php:3621 #: application/helpers/questionHelper.php:57 @@ -1615,16 +1628,16 @@ msgstr "" #: application/helpers/questionHelper.php:1267 #: application/helpers/questionHelper.php:1278 #: application/helpers/questionHelper.php:1338 -#: application/helpers/userstatistics_helper.php:1323 -#: application/helpers/userstatistics_helper.php:1456 +#: application/helpers/userstatistics_helper.php:1324 +#: application/helpers/userstatistics_helper.php:1457 #: application/models/Participant.php:311 #: application/models/Participant.php:321 #: application/models/Participant.php:372 #: application/models/ParticipantAttributeName.php:177 #: application/models/ParticipantAttributeName.php:214 -#: application/models/ParticipantShare.php:140 -#: application/models/ParticipantShare.php:147 -#: application/models/ParticipantShare.php:255 +#: application/models/ParticipantShare.php:141 +#: application/models/ParticipantShare.php:148 +#: application/models/ParticipantShare.php:256 #: application/models/Survey.php:435 application/models/Survey.php:684 #: application/models/Survey.php:690 #: application/views/admin/dataentry/content_view.php:629 @@ -1678,17 +1691,17 @@ msgstr "" msgid "No" msgstr "" -#: application/controllers/admin/conditionsaction.php:1304 +#: application/controllers/admin/conditionsaction.php:1489 #: application/controllers/admin/printablesurvey.php:365 #: application/controllers/admin/printablesurvey.php:1077 #: application/controllers/admin/printablesurvey.php:1092 #: application/core/plugins/ExportSTATAxml/STATAxmlWriter.php:287 -#: application/helpers/admin/statistics_helper.php:1359 -#: application/helpers/common_helper.php:1518 -#: application/helpers/export_helper.php:302 -#: application/helpers/export_helper.php:1401 +#: application/helpers/admin/statistics_helper.php:1360 +#: application/helpers/common_helper.php:1525 +#: application/helpers/export_helper.php:303 +#: application/helpers/export_helper.php:1402 #: application/helpers/expressions/em_manager_helper.php:3625 -#: application/helpers/userstatistics_helper.php:1342 +#: application/helpers/userstatistics_helper.php:1343 #: application/views/admin/dataentry/content_view.php:721 #: application/views/admin/export/statistics_subviews/_question.php:487 #: application/views/survey/questions/arrays/increasesamedecrease/rows/answer_row.php:62 @@ -1696,17 +1709,17 @@ msgstr "" msgid "Increase" msgstr "" -#: application/controllers/admin/conditionsaction.php:1305 +#: application/controllers/admin/conditionsaction.php:1490 #: application/controllers/admin/printablesurvey.php:367 #: application/controllers/admin/printablesurvey.php:1078 #: application/controllers/admin/printablesurvey.php:1093 #: application/core/plugins/ExportSTATAxml/STATAxmlWriter.php:291 -#: application/helpers/admin/statistics_helper.php:1360 -#: application/helpers/common_helper.php:1520 -#: application/helpers/export_helper.php:303 -#: application/helpers/export_helper.php:1401 +#: application/helpers/admin/statistics_helper.php:1361 +#: application/helpers/common_helper.php:1527 +#: application/helpers/export_helper.php:304 +#: application/helpers/export_helper.php:1402 #: application/helpers/expressions/em_manager_helper.php:3626 -#: application/helpers/userstatistics_helper.php:1343 +#: application/helpers/userstatistics_helper.php:1344 #: application/views/admin/dataentry/content_view.php:722 #: application/views/admin/export/statistics_subviews/_question.php:492 #: application/views/survey/questions/arrays/increasesamedecrease/rows/answer_row.php:84 @@ -1714,17 +1727,17 @@ msgstr "" msgid "Same" msgstr "" -#: application/controllers/admin/conditionsaction.php:1306 +#: application/controllers/admin/conditionsaction.php:1491 #: application/controllers/admin/printablesurvey.php:366 #: application/controllers/admin/printablesurvey.php:1079 #: application/controllers/admin/printablesurvey.php:1094 #: application/core/plugins/ExportSTATAxml/STATAxmlWriter.php:295 -#: application/helpers/admin/statistics_helper.php:1361 -#: application/helpers/common_helper.php:1519 -#: application/helpers/export_helper.php:304 -#: application/helpers/export_helper.php:1401 +#: application/helpers/admin/statistics_helper.php:1362 +#: application/helpers/common_helper.php:1526 +#: application/helpers/export_helper.php:305 +#: application/helpers/export_helper.php:1402 #: application/helpers/expressions/em_manager_helper.php:3627 -#: application/helpers/userstatistics_helper.php:1344 +#: application/helpers/userstatistics_helper.php:1345 #: application/views/admin/dataentry/content_view.php:723 #: application/views/admin/export/statistics_subviews/_question.php:497 #: application/views/survey/questions/arrays/increasesamedecrease/rows/answer_row.php:106 @@ -1732,44 +1745,44 @@ msgstr "" msgid "Decrease" msgstr "" -#: application/controllers/admin/conditionsaction.php:1397 -#: application/helpers/common_helper.php:2124 +#: application/controllers/admin/conditionsaction.php:1582 +#: application/helpers/common_helper.php:2131 msgid "Scale 1" msgstr "" -#: application/controllers/admin/conditionsaction.php:1398 -#: application/helpers/common_helper.php:2142 +#: application/controllers/admin/conditionsaction.php:1583 +#: application/helpers/common_helper.php:2149 msgid "Scale 2" msgstr "" -#: application/controllers/admin/conditionsaction.php:1486 +#: application/controllers/admin/conditionsaction.php:1671 msgid "Group of checkboxes" msgstr "" -#: application/controllers/admin/conditionsaction.php:1501 +#: application/controllers/admin/conditionsaction.php:1686 msgid "Single checkbox" msgstr "" -#: application/controllers/admin/conditionsaction.php:1504 +#: application/controllers/admin/conditionsaction.php:1689 msgid "checked" msgstr "" -#: application/controllers/admin/conditionsaction.php:1505 +#: application/controllers/admin/conditionsaction.php:1690 msgid "not checked" msgstr "" -#: application/controllers/admin/conditionsaction.php:1527 +#: application/controllers/admin/conditionsaction.php:1712 #: application/controllers/admin/dataentry.php:763 #: application/controllers/admin/printablesurvey.php:344 #: application/controllers/admin/printablesurvey.php:659 -#: application/controllers/admin/quotas.php:542 +#: application/controllers/admin/quotas.php:545 #: application/core/plugins/ExportSTATAxml/STATAxmlWriter.php:250 -#: application/helpers/admin/statistics_helper.php:1465 -#: application/helpers/common_helper.php:1503 -#: application/helpers/export_helper.php:289 -#: application/helpers/export_helper.php:1381 +#: application/helpers/admin/statistics_helper.php:1466 +#: application/helpers/common_helper.php:1510 +#: application/helpers/export_helper.php:290 +#: application/helpers/export_helper.php:1382 #: application/helpers/expressions/em_manager_helper.php:3613 -#: application/helpers/userstatistics_helper.php:1448 +#: application/helpers/userstatistics_helper.php:1449 #: application/views/admin/dataentry/content_view.php:94 #: application/views/admin/export/statistics_subviews/_question.php:286 #: application/views/survey/questions/gender/buttons/answer.php:27 @@ -1778,18 +1791,18 @@ msgstr "" msgid "Female" msgstr "" -#: application/controllers/admin/conditionsaction.php:1528 +#: application/controllers/admin/conditionsaction.php:1713 #: application/controllers/admin/dataentry.php:764 #: application/controllers/admin/printablesurvey.php:343 #: application/controllers/admin/printablesurvey.php:660 -#: application/controllers/admin/quotas.php:541 +#: application/controllers/admin/quotas.php:544 #: application/core/plugins/ExportSTATAxml/STATAxmlWriter.php:254 -#: application/helpers/admin/statistics_helper.php:1466 -#: application/helpers/common_helper.php:1502 -#: application/helpers/export_helper.php:290 -#: application/helpers/export_helper.php:1381 +#: application/helpers/admin/statistics_helper.php:1467 +#: application/helpers/common_helper.php:1509 +#: application/helpers/export_helper.php:291 +#: application/helpers/export_helper.php:1382 #: application/helpers/expressions/em_manager_helper.php:3612 -#: application/helpers/userstatistics_helper.php:1449 +#: application/helpers/userstatistics_helper.php:1450 #: application/views/admin/dataentry/content_view.php:95 #: application/views/admin/export/statistics_subviews/_question.php:292 #: application/views/survey/questions/gender/buttons/answer.php:34 @@ -1798,26 +1811,26 @@ msgstr "" msgid "Male" msgstr "" -#: application/controllers/admin/conditionsaction.php:1588 +#: application/controllers/admin/conditionsaction.php:1773 #: application/controllers/admin/dataentry.php:850 #: application/controllers/admin/printablesurvey.php:407 #: application/controllers/admin/printablesurvey.php:737 #: application/extensions/questionTypes/listRadio/listRadio.php:183 -#: application/helpers/admin/statistics_helper.php:691 -#: application/helpers/admin/statistics_helper.php:1583 -#: application/helpers/admin/statistics_helper.php:1621 -#: application/helpers/admin/statistics_helper.php:1745 -#: application/helpers/admin/statistics_helper.php:2455 -#: application/helpers/admin/statistics_helper.php:2590 -#: application/helpers/common_helper.php:1480 -#: application/helpers/common_helper.php:1542 -#: application/helpers/common_helper.php:2017 -#: application/helpers/common_helper.php:2283 -#: application/helpers/export_helper.php:944 -#: application/helpers/export_helper.php:953 -#: application/helpers/export_helper.php:1052 -#: application/helpers/export_helper.php:1067 -#: application/helpers/qanda_helper.php:2459 +#: application/helpers/admin/statistics_helper.php:692 +#: application/helpers/admin/statistics_helper.php:1584 +#: application/helpers/admin/statistics_helper.php:1627 +#: application/helpers/admin/statistics_helper.php:1751 +#: application/helpers/admin/statistics_helper.php:2461 +#: application/helpers/admin/statistics_helper.php:2596 +#: application/helpers/common_helper.php:1487 +#: application/helpers/common_helper.php:1549 +#: application/helpers/common_helper.php:2024 +#: application/helpers/common_helper.php:2290 +#: application/helpers/export_helper.php:945 +#: application/helpers/export_helper.php:954 +#: application/helpers/export_helper.php:1053 +#: application/helpers/export_helper.php:1068 +#: application/helpers/qanda_helper.php:2469 #: application/helpers/questionHelper.php:628 #: application/helpers/questionHelper.php:642 #: application/helpers/questionHelper.php:658 @@ -1829,10 +1842,10 @@ msgstr "" #: application/helpers/questionHelper.php:1296 #: application/helpers/questionHelper.php:1305 #: application/helpers/questionHelper.php:1314 -#: application/helpers/userstatistics_helper.php:680 -#: application/helpers/userstatistics_helper.php:1566 -#: application/helpers/userstatistics_helper.php:1672 -#: application/helpers/userstatistics_helper.php:1802 +#: application/helpers/userstatistics_helper.php:681 +#: application/helpers/userstatistics_helper.php:1567 +#: application/helpers/userstatistics_helper.php:1674 +#: application/helpers/userstatistics_helper.php:1804 #: application/views/admin/dataentry/content_view.php:168 #: application/views/admin/dataentry/content_view.php:172 #: application/views/admin/dataentry/content_view.php:192 @@ -1846,16 +1859,16 @@ msgstr "" msgid "Other" msgstr "" -#: application/controllers/admin/conditionsaction.php:1654 +#: application/controllers/admin/conditionsaction.php:1839 #: application/views/admin/conditions/includes/conditions_edit.php:20 msgid "Edit condition" msgstr "" -#: application/controllers/admin/conditionsaction.php:1655 +#: application/controllers/admin/conditionsaction.php:1840 msgid "Update condition" msgstr "" -#: application/controllers/admin/conditionsaction.php:1660 +#: application/controllers/admin/conditionsaction.php:1845 msgid "Add condition" msgstr "" @@ -1997,7 +2010,7 @@ msgstr "" #: application/controllers/admin/dataentry.php:217 #: application/controllers/admin/labels.php:103 #: application/controllers/admin/labels.php:147 -#: application/controllers/admin/participantsaction.php:725 +#: application/controllers/admin/participantsaction.php:728 #: application/controllers/admin/questiongroups.php:63 #: application/controllers/admin/questions.php:198 #: application/controllers/admin/surveyadmin.php:303 @@ -2020,14 +2033,14 @@ msgid "Import VV file" msgstr "" #: application/controllers/admin/dataentry.php:275 -#: application/controllers/admin/participantsaction.php:2599 +#: application/controllers/admin/participantsaction.php:2602 #: application/controllers/admin/pluginmanager.php:73 #: application/controllers/admin/pluginmanager.php:89 #: application/controllers/admin/pluginmanager.php:136 #: application/controllers/admin/pluginmanager.php:178 #: application/controllers/admin/pluginmanager.php:196 #: application/core/Survey_Common_Action.php:75 -#: application/helpers/admin/ajax_helper.php:163 +#: application/helpers/admin/ajax_helper.php:165 msgid "No permission" msgstr "" @@ -2049,8 +2062,8 @@ msgstr "" #: application/controllers/admin/dataentry.php:321 #: application/controllers/admin/statistics.php:117 -#: application/helpers/admin/statistics_helper.php:4307 -#: application/helpers/userstatistics_helper.php:2935 +#: application/helpers/admin/statistics_helper.php:4312 +#: application/helpers/userstatistics_helper.php:2936 msgid "Quick statistics" msgstr "" @@ -2105,7 +2118,7 @@ msgid "Please choose" msgstr "" #: application/controllers/admin/dataentry.php:902 -#: application/helpers/qanda_helper.php:1954 +#: application/helpers/qanda_helper.php:1964 #: application/views/admin/dataentry/content_view.php:233 #: application/views/admin/templates/templateeditor_printablesurvey_quesanswer_view.php:3 msgid "First choice" @@ -2117,14 +2130,14 @@ msgid "Next choice" msgstr "" #: application/controllers/admin/dataentry.php:910 -#: application/core/Survey_Common_Action.php:507 -#: application/core/Survey_Common_Action.php:870 +#: application/core/Survey_Common_Action.php:496 +#: application/core/Survey_Common_Action.php:859 #: application/helpers/common_helper.php:302 #: application/helpers/common_helper.php:361 -#: application/helpers/common_helper.php:937 -#: application/helpers/common_helper.php:1007 -#: application/helpers/common_helper.php:5864 -#: application/helpers/common_helper.php:5904 +#: application/helpers/common_helper.php:941 +#: application/helpers/common_helper.php:1011 +#: application/helpers/common_helper.php:5883 +#: application/helpers/common_helper.php:5923 #: application/helpers/questionHelper.php:1042 #: application/views/admin/dataentry/content_view.php:239 #: application/views/admin/survey/subview/accordion/_notification_panel.php:170 @@ -2133,22 +2146,23 @@ msgid "None" msgstr "" #: application/controllers/admin/dataentry.php:939 -#: application/helpers/qanda_helper.php:2014 +#: application/helpers/qanda_helper.php:2024 #: application/views/admin/dataentry/content_view.php:265 msgid "Your Choices" msgstr "" #: application/controllers/admin/dataentry.php:940 -#: application/helpers/qanda_helper.php:2022 +#: application/helpers/qanda_helper.php:2032 #: application/views/admin/dataentry/content_view.php:266 msgid "Your Ranking" msgstr "" #: application/controllers/admin/dataentry.php:1359 -#: application/controllers/admin/labels.php:230 +#: application/controllers/admin/labels.php:229 #: application/controllers/admin/usergroups.php:204 #: application/helpers/admin/label_helper.php:120 #: application/views/admin/assessments_view.php:238 +#: application/views/admin/conditions/conditionshead_view.php:72 #: application/views/admin/dataentry/includes/editdata/edit.php:1 #: application/views/admin/emailtemplates/emailtemplates_view.php:74 #: application/views/admin/labels/editlabel_view.php:68 @@ -2167,7 +2181,6 @@ msgstr "" #: application/views/admin/survey/Question/questionbar_view.php:229 #: application/views/admin/survey/Question/questionbar_view.php:271 #: application/views/admin/survey/QuestionGroups/questiongroupbar_view.php:248 -#: application/views/admin/survey/editSurvey_view.php:50 #: application/views/admin/survey/organizeGroupsAndQuestions_view.php:61 #: application/views/admin/survey/subview/addPanelIntegrationParameter_view.php:41 #: application/views/admin/survey/subview/tabCreate_view.php:107 @@ -2254,10 +2267,10 @@ msgid "Name" msgstr "" #: application/controllers/admin/dataentry.php:1890 -#: application/controllers/admin/useraction.php:139 -#: application/controllers/admin/useraction.php:143 -#: application/controllers/admin/useraction.php:416 -#: application/controllers/admin/useraction.php:428 +#: application/controllers/admin/useraction.php:141 +#: application/controllers/admin/useraction.php:145 +#: application/controllers/admin/useraction.php:418 +#: application/controllers/admin/useraction.php:430 #: application/core/plugins/AuthLDAP/AuthLDAP.php:329 #: application/core/plugins/Authdb/Authdb.php:112 #: application/libraries/Save.php:215 @@ -2332,16 +2345,16 @@ msgstr "" msgid "Export VV file" msgstr "" -#: application/controllers/admin/export.php:971 +#: application/controllers/admin/export.php:974 msgid "Not active." msgstr "" -#: application/controllers/admin/export.php:990 +#: application/controllers/admin/export.php:993 #: application/controllers/admin/questions.php:165 #: application/controllers/admin/surveyadmin.php:982 #: application/controllers/admin/tokens.php:87 #: application/controllers/admin/tokens.php:428 -#: application/controllers/admin/tokens.php:530 +#: application/controllers/admin/tokens.php:534 #: application/controllers/survey/index.php:174 #: application/controllers/survey/index.php:193 #: application/views/admin/participants/blacklist_view.php:107 @@ -2352,7 +2365,7 @@ msgstr "" msgid "We are sorry but you don't have permissions to do this." msgstr "" -#: application/controllers/admin/export.php:1295 +#: application/controllers/admin/export.php:1298 msgid "This archive contains a PDF file of the survey, the queXML file of the survey and a queXF banding XML file which can be used with queXF: http://quexf.sourceforge.net/ for processing scanned surveys." msgstr "" @@ -2415,12 +2428,12 @@ msgid "This ZIP archive contains no valid Resources files. Import failed." msgstr "" #: application/controllers/admin/labels.php:141 -#: application/controllers/admin/participantsaction.php:705 +#: application/controllers/admin/participantsaction.php:708 #: application/controllers/admin/questiongroups.php:58 #: application/controllers/admin/questions.php:194 #: application/controllers/admin/surveyadmin.php:929 #: application/controllers/admin/templates.php:121 -#: application/controllers/admin/tokens.php:2006 +#: application/controllers/admin/tokens.php:2016 msgid "Sorry, this file is too large. Only files up to %01.2f MB are allowed." msgstr "" @@ -2428,20 +2441,20 @@ msgstr "" msgid "Uploaded label set file needs to have an .lsl extension." msgstr "" -#: application/controllers/admin/labels.php:206 +#: application/controllers/admin/labels.php:205 #: application/views/admin/survey/Question/question_subviews/_modals.php:79 msgid "New label set" msgstr "" -#: application/controllers/admin/labels.php:209 +#: application/controllers/admin/labels.php:208 #: application/models/LabelSet.php:110 #: application/views/admin/labels/editlabel_view.php:9 #: application/views/admin/labels/labelsetsbar_view.php:53 msgid "Edit label set" msgstr "" -#: application/controllers/admin/labels.php:339 -#: application/helpers/qanda_helper.php:2644 +#: application/controllers/admin/labels.php:338 +#: application/helpers/qanda_helper.php:2654 #: application/views/admin/labels/_labelviewtabcontent_view.php:81 #: application/views/admin/survey/Question/answerOptions_view.php:235 #: application/views/admin/templates/templatesummary_view.php:57 @@ -2449,94 +2462,94 @@ msgstr "" msgid "Save changes" msgstr "" -#: application/controllers/admin/labels.php:377 +#: application/controllers/admin/labels.php:376 msgid "Label set properties sucessfully updated." msgstr "" -#: application/controllers/admin/labels.php:387 -#: application/controllers/admin/labels.php:413 +#: application/controllers/admin/labels.php:386 +#: application/controllers/admin/labels.php:412 msgid "Label set sucessfully deleted." msgstr "" -#: application/controllers/admin/labels.php:418 +#: application/controllers/admin/labels.php:417 msgid "You are not authorized to delete label sets." msgstr "" -#: application/controllers/admin/labels.php:435 +#: application/controllers/admin/labels.php:434 #: application/views/admin/labels/exportmulti_view.php:8 #: application/views/admin/labels/labelsetsbar_view.php:28 #: application/views/admin/labels/labelsetsbar_view.php:36 msgid "Export multiple label sets" msgstr "" -#: application/controllers/admin/limereplacementfields.php:205 -#: application/controllers/admin/limereplacementfields.php:271 -#: application/controllers/admin/limereplacementfields.php:288 -#: application/controllers/admin/limereplacementfields.php:318 +#: application/controllers/admin/limereplacementfields.php:219 +#: application/controllers/admin/limereplacementfields.php:285 +#: application/controllers/admin/limereplacementfields.php:302 +#: application/controllers/admin/limereplacementfields.php:332 msgid "Survey expiration date" msgstr "" -#: application/controllers/admin/limereplacementfields.php:206 -#: application/controllers/admin/limereplacementfields.php:226 -#: application/controllers/admin/limereplacementfields.php:246 -#: application/controllers/admin/limereplacementfields.php:268 -#: application/controllers/admin/limereplacementfields.php:285 +#: application/controllers/admin/limereplacementfields.php:220 +#: application/controllers/admin/limereplacementfields.php:240 +#: application/controllers/admin/limereplacementfields.php:260 +#: application/controllers/admin/limereplacementfields.php:282 +#: application/controllers/admin/limereplacementfields.php:299 msgid "Name of the survey administrator" msgstr "" -#: application/controllers/admin/limereplacementfields.php:207 -#: application/controllers/admin/limereplacementfields.php:227 -#: application/controllers/admin/limereplacementfields.php:247 -#: application/controllers/admin/limereplacementfields.php:269 -#: application/controllers/admin/limereplacementfields.php:286 +#: application/controllers/admin/limereplacementfields.php:221 +#: application/controllers/admin/limereplacementfields.php:241 +#: application/controllers/admin/limereplacementfields.php:261 +#: application/controllers/admin/limereplacementfields.php:283 +#: application/controllers/admin/limereplacementfields.php:300 msgid "Email address of the survey administrator" msgstr "" -#: application/controllers/admin/limereplacementfields.php:309 +#: application/controllers/admin/limereplacementfields.php:323 msgid "This question's survey ID number" msgstr "" -#: application/controllers/admin/limereplacementfields.php:310 +#: application/controllers/admin/limereplacementfields.php:324 msgid "This question's group ID number" msgstr "" -#: application/controllers/admin/limereplacementfields.php:311 +#: application/controllers/admin/limereplacementfields.php:325 msgid "This question's question ID number" msgstr "" -#: application/controllers/admin/limereplacementfields.php:312 +#: application/controllers/admin/limereplacementfields.php:326 msgid "This question's SGQA code" msgstr "" -#: application/controllers/admin/limereplacementfields.php:323 +#: application/controllers/admin/limereplacementfields.php:337 msgid "Overall assessment score" msgstr "" -#: application/controllers/admin/limereplacementfields.php:324 +#: application/controllers/admin/limereplacementfields.php:338 msgid "Assessment group score" msgstr "" -#: application/controllers/admin/participantsaction.php:248 +#: application/controllers/admin/participantsaction.php:251 msgid "Export {n} participant to CSV|Export {n} participants to CSV" msgstr "" -#: application/controllers/admin/participantsaction.php:418 +#: application/controllers/admin/participantsaction.php:421 msgid "No participants deleted" msgstr "" -#: application/controllers/admin/participantsaction.php:421 +#: application/controllers/admin/participantsaction.php:424 msgid "Participant deleted" msgstr "" -#: application/controllers/admin/participantsaction.php:624 +#: application/controllers/admin/participantsaction.php:627 msgid "Participant successfully updated" msgstr "" -#: application/controllers/admin/participantsaction.php:655 +#: application/controllers/admin/participantsaction.php:658 msgid "Participant successfully added" msgstr "" -#: application/controllers/admin/participantsaction.php:694 +#: application/controllers/admin/participantsaction.php:697 #: application/controllers/admin/surveyadmin.php:1417 #: application/views/admin/labels/_labelviewrightcontent_view.php:52 #: application/views/admin/labels/_labelviewrightcontent_view.php:67 @@ -2552,13 +2565,13 @@ msgstr "" msgid "Please select a file to import!" msgstr "" -#: application/controllers/admin/participantsaction.php:718 +#: application/controllers/admin/participantsaction.php:721 msgid "This is not a .csv file." msgstr "" -#: application/controllers/admin/participantsaction.php:777 +#: application/controllers/admin/participantsaction.php:780 #: application/controllers/admin/templates.php:172 -#: application/core/Survey_Common_Action.php:1385 +#: application/core/Survey_Common_Action.php:1377 #: application/views/admin/homepagesettings/index.php:9 #: application/views/admin/participants/participantsPanel_view.php:6 #: application/views/admin/survey/Question/question_subviews/_modals.php:113 @@ -2567,125 +2580,125 @@ msgstr "" msgid "OK" msgstr "" -#: application/controllers/admin/participantsaction.php:778 +#: application/controllers/admin/participantsaction.php:781 #: application/views/admin/responses/browsemenubar_view.php:9 #: application/views/admin/token/browse.php:93 msgid "Summary" msgstr "" -#: application/controllers/admin/participantsaction.php:779 +#: application/controllers/admin/participantsaction.php:782 msgid "Upload summary" msgstr "" -#: application/controllers/admin/participantsaction.php:780 +#: application/controllers/admin/participantsaction.php:783 msgid "You have to pair this field with an existing attribute." msgstr "" -#: application/controllers/admin/participantsaction.php:781 +#: application/controllers/admin/participantsaction.php:784 msgid "Only one CSV attribute is mapped with central attribute." msgstr "" -#: application/controllers/admin/participantsaction.php:782 +#: application/controllers/admin/participantsaction.php:785 #: application/views/admin/participants/attributeMapToken_view.php:9 #: application/views/admin/participants/attributeMap_view.php:18 msgid "This list cannot accept token attributes." msgstr "" -#: application/controllers/admin/participantsaction.php:1236 +#: application/controllers/admin/participantsaction.php:1239 msgid "Blacklist settings were saved." msgstr "" -#: application/controllers/admin/participantsaction.php:1359 +#: application/controllers/admin/participantsaction.php:1362 msgid "Select language to add" msgstr "" -#: application/controllers/admin/participantsaction.php:1451 +#: application/controllers/admin/participantsaction.php:1454 msgid "Attribute successfully updated" msgstr "" -#: application/controllers/admin/participantsaction.php:1468 +#: application/controllers/admin/participantsaction.php:1471 msgid "Language successfully deleted" msgstr "" -#: application/controllers/admin/participantsaction.php:1472 +#: application/controllers/admin/participantsaction.php:1475 msgid "There has to be at least one language." msgstr "" -#: application/controllers/admin/participantsaction.php:1485 +#: application/controllers/admin/participantsaction.php:1488 msgid "Attribute successfully deleted" msgstr "" -#: application/controllers/admin/participantsaction.php:1512 +#: application/controllers/admin/participantsaction.php:1515 msgid "%s attribute deleted|%s attributes deleted" msgstr "" -#: application/controllers/admin/participantsaction.php:1518 +#: application/controllers/admin/participantsaction.php:1521 msgid "Error. Deleted %s attribute(s). Error message: %s" msgstr "" -#: application/controllers/admin/participantsaction.php:1564 +#: application/controllers/admin/participantsaction.php:1567 msgid "Attribute display setting updated" msgstr "" -#: application/controllers/admin/participantsaction.php:1709 +#: application/controllers/admin/participantsaction.php:1712 msgid "Attribute was saved." msgstr "" -#: application/controllers/admin/participantsaction.php:2171 +#: application/controllers/admin/participantsaction.php:2174 msgid "%s participants have been shared" msgstr "" -#: application/controllers/admin/participantsaction.php:2193 +#: application/controllers/admin/participantsaction.php:2196 msgid "Participant shared." msgstr "" -#: application/controllers/admin/participantsaction.php:2208 +#: application/controllers/admin/participantsaction.php:2211 msgid "Participant removed from sharing" msgstr "" -#: application/controllers/admin/participantsaction.php:2226 +#: application/controllers/admin/participantsaction.php:2229 msgid "Found no participant share" msgstr "" -#: application/controllers/admin/participantsaction.php:2235 +#: application/controllers/admin/participantsaction.php:2238 msgid "Participant share deleted" msgstr "" -#: application/controllers/admin/participantsaction.php:2276 +#: application/controllers/admin/participantsaction.php:2279 msgid "No participant shares were deleted" msgstr "" -#: application/controllers/admin/participantsaction.php:2280 +#: application/controllers/admin/participantsaction.php:2283 msgid "%s participant share was deleted|%s participant shares were deleted" msgstr "" -#: application/controllers/admin/participantsaction.php:2322 +#: application/controllers/admin/participantsaction.php:2325 msgid "%s participants have been copied to the central participants table" msgstr "" -#: application/controllers/admin/participantsaction.php:2326 -#: application/controllers/admin/participantsaction.php:2404 +#: application/controllers/admin/participantsaction.php:2329 +#: application/controllers/admin/participantsaction.php:2407 msgid "%s entries were not copied because they already existed" msgstr "" -#: application/controllers/admin/participantsaction.php:2331 +#: application/controllers/admin/participantsaction.php:2334 msgid "Attribute values for existing participants have been updated from the token records" msgstr "" -#: application/controllers/admin/participantsaction.php:2400 +#: application/controllers/admin/participantsaction.php:2403 msgid "%s participants have been copied to the survey token table" msgstr "" -#: application/controllers/admin/participantsaction.php:2409 +#: application/controllers/admin/participantsaction.php:2412 msgid "%s entries were skipped because they are blacklisted" msgstr "" -#: application/controllers/admin/participantsaction.php:2414 +#: application/controllers/admin/participantsaction.php:2417 msgid "Attribute values for existing participants have been updated from the participants records" msgstr "" -#: application/controllers/admin/participantsaction.php:2485 -#: application/controllers/admin/participantsaction.php:2544 +#: application/controllers/admin/participantsaction.php:2488 +#: application/controllers/admin/participantsaction.php:2547 #: application/views/admin/participants/attributeMapToken_view.php:8 msgid "There are no unmapped attributes" msgstr "" @@ -2793,10 +2806,10 @@ msgid "is matched (regexp)" msgstr "" #: application/controllers/admin/printablesurvey.php:486 -#: application/helpers/admin/statistics_helper.php:1524 -#: application/helpers/admin/statistics_helper.php:1546 -#: application/helpers/userstatistics_helper.php:1507 -#: application/helpers/userstatistics_helper.php:1529 +#: application/helpers/admin/statistics_helper.php:1525 +#: application/helpers/admin/statistics_helper.php:1547 +#: application/helpers/userstatistics_helper.php:1508 +#: application/helpers/userstatistics_helper.php:1530 #: application/views/admin/dataentry/content_view.php:128 msgid "Label %s" msgstr "" @@ -2842,8 +2855,8 @@ msgstr "" #: application/controllers/admin/printablesurvey.php:757 #: application/controllers/admin/printablesurvey.php:758 -#: application/helpers/qanda_helper.php:2421 -#: application/helpers/qanda_helper.php:2469 +#: application/helpers/qanda_helper.php:2431 +#: application/helpers/qanda_helper.php:2479 msgid "Make a comment on your choice here:" msgstr "" @@ -2864,11 +2877,11 @@ msgstr "" #: application/helpers/expressions/em_manager_helper.php:3345 #: application/helpers/expressions/em_manager_helper.php:3357 #: application/helpers/expressions/em_manager_helper.php:3747 -#: application/helpers/expressions/em_manager_helper.php:6411 -#: application/helpers/qanda_helper.php:1209 -#: application/helpers/qanda_helper.php:1466 -#: application/helpers/qanda_helper.php:2077 -#: application/helpers/qanda_helper.php:2329 +#: application/helpers/expressions/em_manager_helper.php:6410 +#: application/helpers/qanda_helper.php:1219 +#: application/helpers/qanda_helper.php:1476 +#: application/helpers/qanda_helper.php:2087 +#: application/helpers/qanda_helper.php:2339 #: application/views/admin/templates/templateeditor_question_answer_view.php:129 msgid "Other:" msgstr "" @@ -2974,7 +2987,7 @@ msgid "Group could not be deleted" msgstr "" #: application/controllers/admin/questiongroups.php:414 -#: application/controllers/admin/quotas.php:401 +#: application/controllers/admin/quotas.php:404 #: application/controllers/admin/surveyadmin.php:822 #: application/views/admin/assessments_view.php:197 #: application/views/admin/emailtemplates/emailtemplates_view.php:44 @@ -2997,8 +3010,8 @@ msgstr "" #: application/controllers/admin/responses.php:69 #: application/controllers/admin/surveyadmin.php:977 #: application/core/Survey_Common_Action.php:70 -#: application/core/Survey_Common_Action.php:656 -#: application/core/Survey_Common_Action.php:961 +#: application/core/Survey_Common_Action.php:645 +#: application/core/Survey_Common_Action.php:950 #: application/models/Survey.php:665 msgid "Invalid survey ID" msgstr "" @@ -3030,55 +3043,55 @@ msgstr "" msgid "Edit subquestions" msgstr "" -#: application/controllers/admin/questions.php:1474 +#: application/controllers/admin/questions.php:1473 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/questions.php:1513 +#: application/controllers/admin/questions.php:1512 msgid "Question was successfully deleted." msgstr "" -#: application/controllers/admin/questions.php:1533 +#: application/controllers/admin/questions.php:1532 msgid "You are not authorized to delete questions." msgstr "" -#: application/controllers/admin/questions.php:1848 +#: application/controllers/admin/questions.php:1847 msgid "The existing label set has assessment values assigned." msgstr "" -#: application/controllers/admin/questions.php:1848 +#: application/controllers/admin/questions.php:1847 msgid "If you replace the label set the existing asssessment values will be lost." msgstr "" -#: application/controllers/admin/questions.php:1852 +#: application/controllers/admin/questions.php:1851 msgid "The existing label set has different/more languages." msgstr "" -#: application/controllers/admin/questions.php:1852 +#: application/controllers/admin/questions.php:1851 msgid "If you replace the label set these translations will be lost." msgstr "" -#: application/controllers/admin/questions.php:1859 +#: application/controllers/admin/questions.php:1858 msgid "Do you really want to continue?" msgstr "" -#: application/controllers/admin/questions.php:1863 +#: application/controllers/admin/questions.php:1862 msgid "You are about to replace an existing label set with the current answer options." msgstr "" -#: application/controllers/admin/questions.php:1865 +#: application/controllers/admin/questions.php:1864 #: application/extensions/admin/survey/ListSurveysWidget/views/massive_actions/_selector.php:64 #: application/extensions/admin/survey/ListSurveysWidget/views/massive_actions/_selector.php:82 #: application/views/admin/conditions/deleteAllConditions.php:8 msgid "Continue?" msgstr "" -#: application/controllers/admin/questions.php:2171 +#: application/controllers/admin/questions.php:2170 #: application/views/admin/super/_question_explorer.php:74 msgid "You can't add questions while the survey is active." msgstr "" -#: application/controllers/admin/quotas.php:103 +#: application/controllers/admin/quotas.php:106 #: application/core/plugins/QuickMenu/QuickMenu.php:276 #: application/models/Permission.php:69 #: application/views/admin/survey/copySurvey_view.php:55 @@ -3087,25 +3100,25 @@ msgstr "" msgid "Quotas" msgstr "" -#: application/controllers/admin/quotas.php:204 +#: application/controllers/admin/quotas.php:207 #: application/views/admin/quotas/viewquotas_view.php:19 msgid "Quota name" msgstr "" -#: application/controllers/admin/quotas.php:204 +#: application/controllers/admin/quotas.php:207 #: application/views/admin/quotas/viewquotas_view.php:23 msgid "Limit" msgstr "" -#: application/controllers/admin/quotas.php:204 +#: application/controllers/admin/quotas.php:207 msgid "Remaining" msgstr "" -#: application/controllers/admin/quotas.php:264 +#: application/controllers/admin/quotas.php:267 msgid "New quota saved" msgstr "" -#: application/controllers/admin/quotas.php:378 +#: application/controllers/admin/quotas.php:381 msgid "Quota with ID %s was deleted" msgstr "" @@ -3123,10 +3136,10 @@ msgid "Token ID" msgstr "" #: application/controllers/admin/responses.php:155 -#: application/helpers/common_helper.php:3723 +#: application/helpers/common_helper.php:3738 #: application/models/Participant.php:221 -#: application/models/ParticipantShare.php:228 application/models/Token.php:37 -#: application/models/TokenDynamic.php:575 +#: application/models/ParticipantShare.php:229 application/models/Token.php:37 +#: application/models/TokenDynamic.php:578 #: application/views/admin/export/exportresults_view.php:338 #: application/views/admin/responses/listResponses_view.php:111 #: application/views/admin/templates/templateeditor_register_view.php:3 @@ -3136,10 +3149,10 @@ msgid "First name" msgstr "" #: application/controllers/admin/responses.php:156 -#: application/helpers/common_helper.php:3728 +#: application/helpers/common_helper.php:3743 #: application/models/Participant.php:222 -#: application/models/ParticipantShare.php:223 application/models/Token.php:38 -#: application/models/TokenDynamic.php:583 +#: application/models/ParticipantShare.php:224 application/models/Token.php:38 +#: application/models/TokenDynamic.php:586 #: application/views/admin/export/exportresults_view.php:339 #: application/views/admin/responses/listResponses_view.php:122 #: application/views/admin/templates/templateeditor_register_view.php:7 @@ -3149,8 +3162,8 @@ msgid "Last name" msgstr "" #: application/controllers/admin/responses.php:157 -#: application/controllers/admin/useraction.php:156 -#: application/models/User.php:446 +#: application/controllers/admin/useraction.php:158 +#: application/models/User.php:450 #: application/views/admin/authentication/forgotpassword.php:39 #: application/views/admin/responses/listResponses_view.php:133 #: application/views/admin/token/massive_actions/_selector.php:52 @@ -3170,7 +3183,7 @@ msgid "File %s" msgstr "" #: application/controllers/admin/responses.php:193 -#: application/helpers/qanda_helper.php:2543 +#: application/helpers/qanda_helper.php:2553 #: application/views/admin/emailtemplates/email_language_template_tab.php:50 msgid "File name" msgstr "" @@ -3201,7 +3214,7 @@ msgstr "" #: application/controllers/admin/responses.php:667 #: application/controllers/admin/responses.php:685 -#: application/helpers/common_helper.php:2404 +#: application/helpers/common_helper.php:2412 msgid "Total time" msgstr "" @@ -3388,8 +3401,8 @@ msgstr "" #: application/controllers/admin/surveypermission.php:65 #: application/models/Participant.php:340 #: application/models/ParticipantAttributeName.php:197 -#: application/models/ParticipantShare.php:218 -#: application/models/TokenDynamic.php:556 application/models/User.php:434 +#: application/models/ParticipantShare.php:219 +#: application/models/TokenDynamic.php:559 application/models/User.php:438 #: application/views/admin/emailtemplates/email_language_template_tab.php:49 #: application/views/admin/labels/_labelviewtabcontent_view.php:21 #: application/views/admin/pluginmanager/index.php:77 @@ -3403,11 +3416,11 @@ msgstr "" #: application/controllers/admin/surveypermission.php:66 #: application/controllers/admin/surveypermission.php:627 -#: application/controllers/admin/useraction.php:134 -#: application/controllers/admin/useraction.php:156 +#: application/controllers/admin/useraction.php:136 +#: application/controllers/admin/useraction.php:158 #: application/core/plugins/AuthLDAP/AuthLDAP.php:328 #: application/core/plugins/Authdb/Authdb.php:111 -#: application/models/User.php:442 +#: application/models/User.php:446 #: application/views/admin/user/modifyuser.php:8 #: application/views/admin/usergroup/viewUserGroup_view.php:42 msgid "Username" @@ -3421,7 +3434,7 @@ msgid "User group" msgstr "" #: application/controllers/admin/surveypermission.php:68 -#: application/models/User.php:450 +#: application/models/User.php:454 #: application/views/admin/user/modifyuser.php:23 msgid "Full name" msgstr "" @@ -3447,7 +3460,7 @@ msgstr "" #: application/controllers/admin/surveypermission.php:400 #: application/controllers/admin/surveypermission.php:413 #: application/controllers/admin/surveypermission.php:422 -#: application/controllers/admin/useraction.php:170 +#: application/controllers/admin/useraction.php:172 #: application/views/admin/user/editusers.php:5 #: application/views/admin/usergroup/viewUserGroup_view.php:99 msgid "Add user" @@ -3491,32 +3504,32 @@ msgstr "" #: application/controllers/admin/surveypermission.php:425 #: application/controllers/admin/surveypermission.php:634 #: application/controllers/admin/surveypermission.php:752 -#: application/controllers/admin/tokens.php:2587 -#: application/controllers/admin/tokens.php:2630 -#: application/controllers/admin/useraction.php:835 -#: application/helpers/common_helper.php:4689 -#: application/helpers/common_helper.php:4694 -#: application/helpers/common_helper.php:4699 -#: application/helpers/common_helper.php:4704 -#: application/helpers/common_helper.php:4709 -#: application/helpers/common_helper.php:4714 -#: application/helpers/common_helper.php:4719 -#: application/helpers/common_helper.php:4724 -#: application/helpers/common_helper.php:4729 +#: application/controllers/admin/tokens.php:2601 +#: application/controllers/admin/tokens.php:2644 +#: application/controllers/admin/useraction.php:846 +#: application/helpers/common_helper.php:4705 +#: application/helpers/common_helper.php:4710 +#: application/helpers/common_helper.php:4715 +#: application/helpers/common_helper.php:4720 +#: application/helpers/common_helper.php:4725 +#: application/helpers/common_helper.php:4730 #: application/helpers/common_helper.php:4735 -#: application/helpers/common_helper.php:4741 -#: application/helpers/common_helper.php:4746 +#: application/helpers/common_helper.php:4740 +#: application/helpers/common_helper.php:4745 #: application/helpers/common_helper.php:4751 -#: application/helpers/common_helper.php:4756 -#: application/helpers/common_helper.php:4761 -#: application/helpers/common_helper.php:4766 +#: application/helpers/common_helper.php:4757 +#: application/helpers/common_helper.php:4762 +#: application/helpers/common_helper.php:4767 #: application/helpers/common_helper.php:4772 #: application/helpers/common_helper.php:4777 -#: application/helpers/common_helper.php:4786 -#: application/helpers/common_helper.php:4791 -#: application/helpers/common_helper.php:4798 +#: application/helpers/common_helper.php:4782 +#: application/helpers/common_helper.php:4788 +#: application/helpers/common_helper.php:4793 #: application/helpers/common_helper.php:4802 -#: application/helpers/common_helper.php:4806 +#: application/helpers/common_helper.php:4807 +#: application/helpers/common_helper.php:4814 +#: application/helpers/common_helper.php:4818 +#: application/helpers/common_helper.php:4822 #: application/views/admin/authentication/message.php:35 #: application/views/admin/participants/attributeMapCSV_view.php:76 #: application/views/admin/participants/attributeMapToken_view.php:100 @@ -3595,7 +3608,7 @@ msgid "Update" msgstr "" #: application/controllers/admin/surveypermission.php:516 -#: application/helpers/userstatistics_helper.php:3073 +#: application/helpers/userstatistics_helper.php:3074 #: application/views/admin/participants/massive_actions/_selector.php:53 #: application/views/admin/participants/participantsPanel_view.php:8 #: application/views/admin/participants/participantsPanel_view.php:84 @@ -3622,7 +3635,7 @@ msgid "Deleting User" msgstr "" #: application/controllers/admin/surveypermission.php:632 -#: application/controllers/admin/useraction.php:210 +#: application/controllers/admin/useraction.php:212 msgid "Could not delete user. User was not supplied." msgstr "" @@ -3883,8 +3896,8 @@ msgid "Hint when response is not valid" msgstr "" #: application/controllers/admin/templates.php:1203 -#: application/helpers/frontend_helper.php:1786 -#: application/helpers/frontend_helper.php:2179 +#: application/helpers/frontend_helper.php:1788 +#: application/helpers/frontend_helper.php:2182 #: application/views/admin/templates/templateeditor_navigator_view.php:5 #: application/views/installer/dbconfig_view.php:62 #: application/views/installer/dbsettings_view.php:12 @@ -3896,7 +3909,7 @@ msgstr "" #: application/controllers/admin/templates.php:1204 #: application/controllers/admin/templates.php:1212 -#: application/helpers/frontend_helper.php:1801 +#: application/helpers/frontend_helper.php:1803 #: application/views/admin/participants/modal_subviews/_addToSurvey.php:47 #: application/views/admin/quotas/newanswer_view.php:29 #: application/views/admin/quotas/newanswertwo_view.php:35 @@ -3925,7 +3938,7 @@ msgid "This is the survey end message." msgstr "" #: application/controllers/admin/tokens.php:80 -#: application/controllers/admin/tokens.php:1061 +#: application/controllers/admin/tokens.php:1071 msgid "No token table." msgstr "" @@ -3951,8 +3964,8 @@ msgstr "" msgid "Bounce processing is deactivated either application-wide or for this survey in particular." msgstr "" -#: application/controllers/admin/tokens.php:738 -#: application/controllers/admin/useraction.php:159 +#: application/controllers/admin/tokens.php:746 +#: application/controllers/admin/useraction.php:161 #: application/helpers/update/update_helper.php:36 #: application/views/admin/dataentry/insert.php:37 #: application/views/admin/dataentry/iteratesurvey.php:6 @@ -3971,71 +3984,71 @@ msgstr "" msgid "Success" msgstr "" -#: application/controllers/admin/tokens.php:739 +#: application/controllers/admin/tokens.php:747 msgid "The survey participant was successfully updated." msgstr "" -#: application/controllers/admin/tokens.php:740 -#: application/controllers/admin/tokens.php:932 +#: application/controllers/admin/tokens.php:748 +#: application/controllers/admin/tokens.php:942 #: application/views/admin/token/csvimportresult.php:150 msgid "Browse participants" msgstr "" -#: application/controllers/admin/tokens.php:747 -#: application/controllers/admin/tokens.php:928 +#: application/controllers/admin/tokens.php:755 +#: application/controllers/admin/tokens.php:938 #: application/views/admin/token/addtokenpost.php:31 msgid "Failed" msgstr "" -#: application/controllers/admin/tokens.php:748 +#: application/controllers/admin/tokens.php:756 #: application/views/admin/token/addtokenpost.php:32 msgid "There is already an entry with that exact token in the table. The same token cannot be used in multiple entries." msgstr "" -#: application/controllers/admin/tokens.php:749 +#: application/controllers/admin/tokens.php:757 msgid "Show this token entry" msgstr "" -#: application/controllers/admin/tokens.php:920 +#: application/controllers/admin/tokens.php:930 msgid "New dummy participants were added." msgstr "" -#: application/controllers/admin/tokens.php:929 +#: application/controllers/admin/tokens.php:939 msgid "Only %s new dummy participants were added after %s trials." msgstr "" -#: application/controllers/admin/tokens.php:930 +#: application/controllers/admin/tokens.php:940 msgid "Try with a bigger token length." msgstr "" -#: application/controllers/admin/tokens.php:991 +#: application/controllers/admin/tokens.php:1001 msgid "Attribute %s (%s)" msgstr "" -#: application/controllers/admin/tokens.php:1003 +#: application/controllers/admin/tokens.php:1013 msgid "(none)" msgstr "" -#: application/controllers/admin/tokens.php:1046 +#: application/controllers/admin/tokens.php:1056 msgid "%s field(s) were successfully added." msgstr "" -#: application/controllers/admin/tokens.php:1085 +#: application/controllers/admin/tokens.php:1095 msgid "Delete token attribute %s" msgstr "" -#: application/controllers/admin/tokens.php:1086 +#: application/controllers/admin/tokens.php:1096 msgid "If you remove this attribute, you will lose all information." msgstr "" -#: application/controllers/admin/tokens.php:1090 +#: application/controllers/admin/tokens.php:1100 #: application/views/admin/token/managetokenattributes.php:156 msgid "Delete attribute" msgstr "" -#: application/controllers/admin/tokens.php:1091 -#: application/controllers/admin/tokens.php:1559 -#: application/controllers/admin/tokens.php:2399 +#: application/controllers/admin/tokens.php:1101 +#: application/controllers/admin/tokens.php:1569 +#: application/controllers/admin/tokens.php:2409 #: application/views/admin/conditions/deleteAllConditions.php:21 #: application/views/admin/conditions/includes/conditions_scenario.php:42 #: application/views/admin/dataentry/import.php:19 @@ -4076,57 +4089,57 @@ msgstr "" msgid "Cancel" msgstr "" -#: application/controllers/admin/tokens.php:1106 +#: application/controllers/admin/tokens.php:1116 msgid "Attribute %s was deleted." msgstr "" -#: application/controllers/admin/tokens.php:1111 +#: application/controllers/admin/tokens.php:1121 msgid "The selected attribute was invalid." msgstr "" -#: application/controllers/admin/tokens.php:1159 +#: application/controllers/admin/tokens.php:1169 msgid "Token attribute descriptions were successfully updated." msgstr "" -#: application/controllers/admin/tokens.php:1385 +#: application/controllers/admin/tokens.php:1395 msgid "Email to {FIRSTNAME} {LASTNAME} ({EMAIL}) delayed: Token is not yet valid." msgstr "" -#: application/controllers/admin/tokens.php:1390 +#: application/controllers/admin/tokens.php:1400 msgid "Email to {FIRSTNAME} {LASTNAME} ({EMAIL}) skipped: Token is not valid anymore." msgstr "" -#: application/controllers/admin/tokens.php:1471 +#: application/controllers/admin/tokens.php:1481 msgid "Invitation sent to:" msgstr "" -#: application/controllers/admin/tokens.php:1476 +#: application/controllers/admin/tokens.php:1486 msgid "Reminder sent to:" msgstr "" -#: application/controllers/admin/tokens.php:1498 +#: application/controllers/admin/tokens.php:1508 msgid "Email to {FIRSTNAME} {LASTNAME} ({EMAIL}) failed. Error message:" msgstr "" -#: application/controllers/admin/tokens.php:1528 +#: application/controllers/admin/tokens.php:1538 msgid "All emails were sent." msgstr "" -#: application/controllers/admin/tokens.php:1532 +#: application/controllers/admin/tokens.php:1542 msgid "Not all emails were sent:" msgstr "" -#: application/controllers/admin/tokens.php:1535 +#: application/controllers/admin/tokens.php:1545 msgid "Some entries had a validity date set which was not yet valid or not valid anymore." msgstr "" -#: application/controllers/admin/tokens.php:1539 +#: application/controllers/admin/tokens.php:1549 msgid "Some emails were not sent because the server did not accept the email(s) or some other error occured." msgstr "" -#: application/controllers/admin/tokens.php:1542 -#: application/controllers/admin/tokens.php:2348 -#: application/controllers/admin/tokens.php:2354 +#: application/controllers/admin/tokens.php:1552 +#: application/controllers/admin/tokens.php:2358 +#: application/controllers/admin/tokens.php:2364 #: application/extensions/admin/grid/MassiveActionsWidget/views/modals/first-select.php:14 #: application/views/admin/authentication/error.php:6 #: application/views/admin/error_view.php:5 @@ -4135,54 +4148,54 @@ msgstr "" msgid "Ok" msgstr "" -#: application/controllers/admin/tokens.php:1554 +#: application/controllers/admin/tokens.php:1564 msgid "There were no eligible emails to send. This will be because none satisfied the criteria of:" msgstr "" -#: application/controllers/admin/tokens.php:1555 +#: application/controllers/admin/tokens.php:1565 msgid "having a valid email address" msgstr "" -#: application/controllers/admin/tokens.php:1556 +#: application/controllers/admin/tokens.php:1566 msgid "not having been sent an invitation already" msgstr "" -#: application/controllers/admin/tokens.php:1557 +#: application/controllers/admin/tokens.php:1567 msgid "not having already completed the survey" msgstr "" -#: application/controllers/admin/tokens.php:1558 +#: application/controllers/admin/tokens.php:1568 msgid "having a token" msgstr "" -#: application/controllers/admin/tokens.php:1607 +#: application/controllers/admin/tokens.php:1617 #: application/views/admin/token/exportdialog.php:109 msgid "Export tokens" msgstr "" -#: application/controllers/admin/tokens.php:1614 +#: application/controllers/admin/tokens.php:1624 #: application/views/admin/token/exportdialog.php:17 msgid "All tokens" msgstr "" -#: application/controllers/admin/tokens.php:1614 +#: application/controllers/admin/tokens.php:1624 #: application/views/admin/token/exportdialog.php:19 msgid "Not completed" msgstr "" -#: application/controllers/admin/tokens.php:1617 +#: application/controllers/admin/tokens.php:1627 #: application/views/admin/token/exportdialog.php:20 msgid "Not started" msgstr "" -#: application/controllers/admin/tokens.php:1618 +#: application/controllers/admin/tokens.php:1628 #: application/views/admin/token/exportdialog.php:21 msgid "Started but not yet completed" msgstr "" -#: application/controllers/admin/tokens.php:1622 -#: application/controllers/admin/tokens.php:1638 -#: application/controllers/admin/tokens.php:1647 +#: application/controllers/admin/tokens.php:1632 +#: application/controllers/admin/tokens.php:1648 +#: application/controllers/admin/tokens.php:1657 #: application/views/admin/responses/listResponses_view.php:96 #: application/views/admin/token/exportdialog.php:36 #: application/views/admin/token/exportdialog.php:54 @@ -4190,161 +4203,161 @@ msgstr "" msgid "All" msgstr "" -#: application/controllers/admin/tokens.php:1631 +#: application/controllers/admin/tokens.php:1641 #: application/views/admin/token/exportdialog.php:13 msgid "Survey status:" msgstr "" -#: application/controllers/admin/tokens.php:1636 +#: application/controllers/admin/tokens.php:1646 #: application/views/admin/token/exportdialog.php:29 msgid "Invitation status:" msgstr "" -#: application/controllers/admin/tokens.php:1639 +#: application/controllers/admin/tokens.php:1649 #: application/views/admin/token/exportdialog.php:37 msgid "Invited" msgstr "" -#: application/controllers/admin/tokens.php:1640 +#: application/controllers/admin/tokens.php:1650 #: application/views/admin/token/exportdialog.php:38 msgid "Not invited" msgstr "" -#: application/controllers/admin/tokens.php:1645 +#: application/controllers/admin/tokens.php:1655 #: application/views/admin/token/exportdialog.php:47 msgid "Reminder status:" msgstr "" -#: application/controllers/admin/tokens.php:1648 +#: application/controllers/admin/tokens.php:1658 #: application/views/admin/token/exportdialog.php:55 msgid "Reminder(s) sent" msgstr "" -#: application/controllers/admin/tokens.php:1649 +#: application/controllers/admin/tokens.php:1659 #: application/views/admin/token/exportdialog.php:56 msgid "No reminder(s) sent" msgstr "" -#: application/controllers/admin/tokens.php:1654 +#: application/controllers/admin/tokens.php:1664 #: application/views/admin/token/exportdialog.php:65 msgid "Filter by language:" msgstr "" -#: application/controllers/admin/tokens.php:1659 +#: application/controllers/admin/tokens.php:1669 #: application/views/admin/token/exportdialog.php:79 msgid "Filter by email address:" msgstr "" -#: application/controllers/admin/tokens.php:1660 +#: application/controllers/admin/tokens.php:1670 msgid "Only export entries which contain this string in the email address." msgstr "" -#: application/controllers/admin/tokens.php:1664 +#: application/controllers/admin/tokens.php:1674 msgid "Delete exported tokens:" msgstr "" -#: application/controllers/admin/tokens.php:1727 +#: application/controllers/admin/tokens.php:1737 msgid "Uploading LDAP Query" msgstr "" -#: application/controllers/admin/tokens.php:1940 +#: application/controllers/admin/tokens.php:1950 msgid "Can't bind to the LDAP directory" msgstr "" -#: application/controllers/admin/tokens.php:1947 +#: application/controllers/admin/tokens.php:1957 msgid "Can't connect to the LDAP directory" msgstr "" -#: application/controllers/admin/tokens.php:2010 +#: application/controllers/admin/tokens.php:2020 msgid "Only CSV files are allowed." msgstr "" -#: application/controllers/admin/tokens.php:2014 +#: application/controllers/admin/tokens.php:2024 msgid "Upload file not found. Check your permissions and path (%s) for the upload directory" msgstr "" -#: application/controllers/admin/tokens.php:2121 +#: application/controllers/admin/tokens.php:2131 msgid "Line %s" msgstr "" -#: application/controllers/admin/tokens.php:2159 -#: application/controllers/admin/tokens.php:2185 +#: application/controllers/admin/tokens.php:2169 +#: application/controllers/admin/tokens.php:2195 msgid "Line %s : %s %s (%s)" msgstr "" -#: application/controllers/admin/tokens.php:2167 +#: application/controllers/admin/tokens.php:2177 msgid "Line %s : %s %s" msgstr "" -#: application/controllers/admin/tokens.php:2195 -#: application/controllers/admin/tokens.php:2202 +#: application/controllers/admin/tokens.php:2205 +#: application/controllers/admin/tokens.php:2212 msgid "Line %s : %s %s (%s) - token : %s" msgstr "" -#: application/controllers/admin/tokens.php:2230 +#: application/controllers/admin/tokens.php:2240 msgid "Line %s : %s" msgstr "" -#: application/controllers/admin/tokens.php:2328 -#: application/controllers/admin/tokens.php:2357 +#: application/controllers/admin/tokens.php:2338 +#: application/controllers/admin/tokens.php:2367 msgid "Create tokens" msgstr "" -#: application/controllers/admin/tokens.php:2329 +#: application/controllers/admin/tokens.php:2339 msgid "Clicking 'Yes' will generate tokens for all those in this token list that have not been issued one. Continue?" msgstr "" -#: application/controllers/admin/tokens.php:2346 +#: application/controllers/admin/tokens.php:2356 msgid "Only {n} token has been created.|Only {n} tokens have been created." msgstr "" -#: application/controllers/admin/tokens.php:2347 +#: application/controllers/admin/tokens.php:2357 msgid "Need {n} token.|Need {n} tokens." msgstr "" -#: application/controllers/admin/tokens.php:2353 +#: application/controllers/admin/tokens.php:2363 msgid "{n} token has been created.|{n} tokens have been created." msgstr "" -#: application/controllers/admin/tokens.php:2393 -#: application/controllers/admin/tokens.php:2412 +#: application/controllers/admin/tokens.php:2403 +#: application/controllers/admin/tokens.php:2422 msgid "Delete survey participants table" msgstr "" -#: application/controllers/admin/tokens.php:2394 +#: application/controllers/admin/tokens.php:2404 msgid "If you delete this table tokens will no longer be required to access this survey." msgstr "" -#: application/controllers/admin/tokens.php:2394 +#: application/controllers/admin/tokens.php:2404 msgid "A backup of this table will be made if you proceed. Your system administrator will be able to access this table." msgstr "" -#: application/controllers/admin/tokens.php:2397 +#: application/controllers/admin/tokens.php:2407 msgid "Delete table" msgstr "" -#: application/controllers/admin/tokens.php:2413 +#: application/controllers/admin/tokens.php:2423 msgid "The tokens table has now been removed and tokens are no longer required to access this survey." msgstr "" -#: application/controllers/admin/tokens.php:2413 +#: application/controllers/admin/tokens.php:2423 msgid "A backup of this table has been made and can be accessed by your system administrator." msgstr "" -#: application/controllers/admin/tokens.php:2460 +#: application/controllers/admin/tokens.php:2470 msgid "Bounce settings have been saved." msgstr "" -#: application/controllers/admin/tokens.php:2562 +#: application/controllers/admin/tokens.php:2576 #: application/views/admin/token/tokenwarning.php:7 msgid "Survey participants have not been initialised for this survey." msgstr "" -#: application/controllers/admin/tokens.php:2570 +#: application/controllers/admin/tokens.php:2584 msgid "Tokens already exist for this survey." msgstr "" -#: application/controllers/admin/tokens.php:2584 +#: application/controllers/admin/tokens.php:2598 #: application/core/plugins/QuickMenu/QuickMenu.php:304 #: application/views/admin/super/sidemenu.php:173 #: application/views/admin/survey/breadcrumb.php:67 @@ -4354,15 +4367,15 @@ msgstr "" msgid "Survey participants" msgstr "" -#: application/controllers/admin/tokens.php:2585 +#: application/controllers/admin/tokens.php:2599 msgid "A participant table has been created for this survey." msgstr "" -#: application/controllers/admin/tokens.php:2627 +#: application/controllers/admin/tokens.php:2641 msgid "Import old tokens" msgstr "" -#: application/controllers/admin/tokens.php:2628 +#: application/controllers/admin/tokens.php:2642 msgid "A token table has been created for this survey and the old tokens were imported." msgstr "" @@ -4370,8 +4383,8 @@ msgstr "" msgid "Saved" msgstr "" -#: application/controllers/admin/translate.php:288 -#: application/core/Survey_Common_Action.php:761 +#: application/controllers/admin/translate.php:292 +#: application/core/Survey_Common_Action.php:750 #: application/views/admin/survey/Question/questionbar_view.php:19 #: application/views/admin/survey/Question/questionbar_view.php:79 #: application/views/admin/survey/QuestionGroups/questiongroupbar_view.php:22 @@ -4381,8 +4394,8 @@ msgstr "" msgid "Preview survey" msgstr "" -#: application/controllers/admin/translate.php:288 -#: application/core/Survey_Common_Action.php:765 +#: application/controllers/admin/translate.php:292 +#: application/core/Survey_Common_Action.php:754 #: application/core/plugins/QuickMenu/QuickMenu.php:242 #: application/views/admin/survey/Question/questionbar_view.php:21 #: application/views/admin/survey/Question/questionbar_view.php:81 @@ -4393,26 +4406,26 @@ msgstr "" msgid "Execute survey" msgstr "" -#: application/controllers/admin/translate.php:322 +#: application/controllers/admin/translate.php:326 msgid "Please select a language:" msgstr "" -#: application/controllers/admin/translate.php:359 +#: application/controllers/admin/translate.php:363 msgid "Translate to" msgstr "" -#: application/controllers/admin/translate.php:386 +#: application/controllers/admin/translate.php:390 #: application/helpers/common_helper.php:299 #: application/helpers/common_helper.php:356 -#: application/helpers/common_helper.php:936 -#: application/helpers/common_helper.php:1006 -#: application/helpers/common_helper.php:5439 -#: application/helpers/common_helper.php:5476 -#: application/helpers/common_helper.php:5863 -#: application/helpers/common_helper.php:5903 -#: application/helpers/qanda_helper.php:1275 -#: application/helpers/qanda_helper.php:1964 -#: application/helpers/qanda_helper.php:4825 +#: application/helpers/common_helper.php:940 +#: application/helpers/common_helper.php:1010 +#: application/helpers/common_helper.php:5455 +#: application/helpers/common_helper.php:5492 +#: application/helpers/common_helper.php:5882 +#: application/helpers/common_helper.php:5922 +#: application/helpers/qanda_helper.php:1285 +#: application/helpers/qanda_helper.php:1974 +#: application/helpers/qanda_helper.php:4835 #: application/views/admin/dataentry/content_view.php:143 #: application/views/admin/dataentry/content_view.php:155 #: application/views/survey/questions/arrays/dualscale/answer_dropdown.php:131 @@ -4421,12 +4434,12 @@ msgstr "" msgid "Please choose..." msgstr "" -#: application/controllers/admin/translate.php:439 +#: application/controllers/admin/translate.php:437 msgid "Survey title and description" msgstr "" -#: application/controllers/admin/translate.php:454 -#: application/helpers/expressions/em_manager_helper.php:9205 +#: application/controllers/admin/translate.php:452 +#: application/helpers/expressions/em_manager_helper.php:9220 #: application/models/Boxes.php:63 #: application/views/admin/survey/QuestionGroups/addGroup_view.php:52 #: application/views/admin/survey/QuestionGroups/addGroup_view.php:55 @@ -4443,12 +4456,12 @@ msgstr "" msgid "Description:" msgstr "" -#: application/controllers/admin/translate.php:469 +#: application/controllers/admin/translate.php:467 msgid "Welcome and end text" msgstr "" -#: application/controllers/admin/translate.php:484 -#: application/helpers/expressions/em_manager_helper.php:9219 +#: application/controllers/admin/translate.php:482 +#: application/helpers/expressions/em_manager_helper.php:9234 #: application/views/admin/survey/editLocalSettings_view.php:44 #: application/views/admin/survey/editLocalSettings_view.php:48 #: application/views/admin/survey/subview/tabCreate_view.php:87 @@ -4457,19 +4470,20 @@ msgstr "" msgid "End message:" msgstr "" -#: application/controllers/admin/translate.php:499 +#: application/controllers/admin/translate.php:497 #: application/views/admin/survey/QuestionGroups/import_view.php:24 #: application/views/admin/survey/copySurvey_view.php:30 #: application/views/admin/survey/importSurvey_view.php:67 msgid "Question groups" msgstr "" -#: application/controllers/admin/translate.php:514 +#: application/controllers/admin/translate.php:512 msgid "Group description" msgstr "" -#: application/controllers/admin/translate.php:529 -#: application/views/admin/conditions/includes/form_editconditions_header.php:116 +#: application/controllers/admin/translate.php:527 +#: application/views/admin/conditions/includes/form_editconditions_header.php:113 +#: application/views/admin/conditions/includes/quickAddConditionForm.php:89 #: application/views/admin/quotas/viewquotasrow_view.php:56 #: application/views/admin/survey/Question/import_view.php:16 #: application/views/admin/survey/QuestionGroups/import_view.php:25 @@ -4478,11 +4492,11 @@ msgstr "" msgid "Questions" msgstr "" -#: application/controllers/admin/translate.php:544 +#: application/controllers/admin/translate.php:542 msgid "Question help" msgstr "" -#: application/controllers/admin/translate.php:559 +#: application/controllers/admin/translate.php:557 #: application/views/admin/survey/Question/import_view.php:17 #: application/views/admin/survey/QuestionGroups/import_view.php:26 #: application/views/admin/survey/copySurvey_view.php:35 @@ -4490,37 +4504,37 @@ msgstr "" msgid "Subquestions" msgstr "" -#: application/controllers/admin/translate.php:575 +#: application/controllers/admin/translate.php:573 msgid "Answer options" msgstr "" -#: application/controllers/admin/translate.php:605 +#: application/controllers/admin/translate.php:603 msgid "Invitation email" msgstr "" -#: application/controllers/admin/translate.php:635 +#: application/controllers/admin/translate.php:633 msgid "Reminder email" msgstr "" -#: application/controllers/admin/translate.php:665 -#: application/controllers/admin/translate.php:725 +#: application/controllers/admin/translate.php:663 +#: application/controllers/admin/translate.php:723 msgid "Confirmation email" msgstr "" -#: application/controllers/admin/translate.php:695 +#: application/controllers/admin/translate.php:693 msgid "Registration email" msgstr "" -#: application/controllers/admin/translate.php:839 +#: application/controllers/admin/translate.php:842 msgid "Question code / ID" msgstr "" -#: application/controllers/admin/useraction.php:66 +#: application/controllers/admin/useraction.php:68 msgid "User administration" msgstr "" -#: application/controllers/admin/useraction.php:93 -#: application/controllers/admin/useraction.php:104 +#: application/controllers/admin/useraction.php:95 +#: application/controllers/admin/useraction.php:106 #: application/core/plugins/AuthLDAP/AuthLDAP.php:183 #: application/core/plugins/AuthLDAP/AuthLDAP.php:237 #: application/core/plugins/AuthLDAP/AuthLDAP.php:256 @@ -4529,123 +4543,123 @@ msgstr "" msgid "Failed to add user" msgstr "" -#: application/controllers/admin/useraction.php:93 +#: application/controllers/admin/useraction.php:95 msgid "A username was not supplied or the username is invalid." msgstr "" -#: application/controllers/admin/useraction.php:97 +#: application/controllers/admin/useraction.php:99 msgid "The username already exists." msgstr "" -#: application/controllers/admin/useraction.php:105 +#: application/controllers/admin/useraction.php:107 msgid "Plugin is not active" msgstr "" -#: application/controllers/admin/useraction.php:131 +#: application/controllers/admin/useraction.php:133 msgid "Hello %s," msgstr "" -#: application/controllers/admin/useraction.php:132 +#: application/controllers/admin/useraction.php:134 msgid "this is an automated email to notify that a user has been created for you on the site '%s'." msgstr "" -#: application/controllers/admin/useraction.php:133 +#: application/controllers/admin/useraction.php:135 msgid "You can use now the following credentials to log into the site:" msgstr "" -#: application/controllers/admin/useraction.php:143 +#: application/controllers/admin/useraction.php:145 msgid "Please contact your LimeSurvey administrator for your password." msgstr "" -#: application/controllers/admin/useraction.php:147 +#: application/controllers/admin/useraction.php:149 msgid "Click here to log in." msgstr "" -#: application/controllers/admin/useraction.php:148 +#: application/controllers/admin/useraction.php:150 msgid "If you have any questions regarding this mail please do not hesitate to contact the site administrator at %s. Thank you!" msgstr "" -#: application/controllers/admin/useraction.php:150 +#: application/controllers/admin/useraction.php:152 msgid "User registration at '%s'" msgstr "" -#: application/controllers/admin/useraction.php:157 +#: application/controllers/admin/useraction.php:159 msgid "An email with a generated password was sent to the user." msgstr "" -#: application/controllers/admin/useraction.php:164 +#: application/controllers/admin/useraction.php:166 msgid "Email to {NAME} ({EMAIL}) failed." msgstr "" -#: application/controllers/admin/useraction.php:171 +#: application/controllers/admin/useraction.php:173 msgid "Set user permissions" msgstr "" -#: application/controllers/admin/useraction.php:202 -#: application/controllers/admin/useraction.php:289 +#: application/controllers/admin/useraction.php:204 +#: application/controllers/admin/useraction.php:291 msgid "Initial Superadmin cannot be deleted!" msgstr "" -#: application/controllers/admin/useraction.php:317 +#: application/controllers/admin/useraction.php:319 msgid "User '%s' was successfully deleted." msgstr "" -#: application/controllers/admin/useraction.php:322 +#: application/controllers/admin/useraction.php:324 msgid "All of the user's surveys were transferred to %s." msgstr "" -#: application/controllers/admin/useraction.php:400 -#: application/controllers/admin/useraction.php:435 -#: application/controllers/admin/useraction.php:442 +#: application/controllers/admin/useraction.php:402 +#: application/controllers/admin/useraction.php:437 +#: application/controllers/admin/useraction.php:444 msgid "Could not modify user data." msgstr "" -#: application/controllers/admin/useraction.php:400 +#: application/controllers/admin/useraction.php:402 msgid "Email address is not valid." msgstr "" -#: application/controllers/admin/useraction.php:416 +#: application/controllers/admin/useraction.php:418 msgid "Unchanged" msgstr "" -#: application/controllers/admin/useraction.php:458 +#: application/controllers/admin/useraction.php:460 msgid "You are not allowed to edit your own user permissions." msgstr "" -#: application/controllers/admin/useraction.php:465 -#: application/controllers/admin/useraction.php:512 +#: application/controllers/admin/useraction.php:467 +#: application/controllers/admin/useraction.php:514 msgid "Initial Superadmin permissions cannot be updated!" msgstr "" -#: application/controllers/admin/useraction.php:492 +#: application/controllers/admin/useraction.php:494 msgid "Permissions were successfully updated." msgstr "" -#: application/controllers/admin/useraction.php:497 +#: application/controllers/admin/useraction.php:499 msgid "There was a problem updating the user permissions." msgstr "" -#: application/controllers/admin/useraction.php:530 +#: application/controllers/admin/useraction.php:532 msgid "Note: You can only give limited permissions to other users because your own permissions are limited, too." msgstr "" -#: application/controllers/admin/useraction.php:644 +#: application/controllers/admin/useraction.php:646 msgid "Template permissions were updated successfully." msgstr "" -#: application/controllers/admin/useraction.php:648 +#: application/controllers/admin/useraction.php:650 msgid "Error while updating template permissions." msgstr "" -#: application/controllers/admin/useraction.php:683 +#: application/controllers/admin/useraction.php:685 msgid "Your new password was not saved because the passwords did not match." msgstr "" -#: application/controllers/admin/useraction.php:704 +#: application/controllers/admin/useraction.php:706 msgid "Your personal settings were successfully saved." msgstr "" -#: application/controllers/admin/useraction.php:715 +#: application/controllers/admin/useraction.php:717 #: application/views/admin/participants/importCSV_view.php:45 msgid "(Autodetect)" msgstr "" @@ -4803,8 +4817,8 @@ msgid "We are sorry but you are not allowed to enter this survey." msgstr "" #: application/controllers/survey/index.php:434 -#: application/helpers/frontend_helper.php:1555 -#: application/helpers/frontend_helper.php:1720 +#: application/helpers/frontend_helper.php:1557 +#: application/helpers/frontend_helper.php:1722 msgid "For further information please contact %s" msgstr "" @@ -4817,7 +4831,7 @@ msgid "You have exceeded the number of maximum login attempts. Please wait %d mi msgstr "" #: application/core/LSUserIdentity.php:130 -#: application/core/Survey_Common_Action.php:461 +#: application/core/Survey_Common_Action.php:450 msgid "Warning: You are still using the default password ('password'). Please change your password and re-login again." msgstr "" @@ -4845,94 +4859,94 @@ msgstr "" msgid "Invalid email address." msgstr "" -#: application/core/Survey_Common_Action.php:503 +#: application/core/Survey_Common_Action.php:492 msgid "Activated" msgstr "" -#: application/core/Survey_Common_Action.php:1074 +#: application/core/Survey_Common_Action.php:1063 #: application/views/admin/survey/subview/accordion/_tokens_panel.php:32 msgid "Responses to this survey are anonymized." msgstr "" -#: application/core/Survey_Common_Action.php:1078 +#: application/core/Survey_Common_Action.php:1067 #: application/views/admin/survey/subview/accordion/_tokens_panel.php:30 msgid "Responses to this survey are NOT anonymized." msgstr "" -#: application/core/Survey_Common_Action.php:1082 +#: application/core/Survey_Common_Action.php:1071 msgid "It is presented question by question." msgstr "" -#: application/core/Survey_Common_Action.php:1086 +#: application/core/Survey_Common_Action.php:1075 msgid "It is presented group by group." msgstr "" -#: application/core/Survey_Common_Action.php:1090 +#: application/core/Survey_Common_Action.php:1079 msgid "It is presented on one single page." msgstr "" -#: application/core/Survey_Common_Action.php:1096 +#: application/core/Survey_Common_Action.php:1085 msgid "No question index will be shown with this format." msgstr "" -#: application/core/Survey_Common_Action.php:1100 +#: application/core/Survey_Common_Action.php:1089 msgid "A question index will be shown; participants will be able to jump between viewed questions." msgstr "" -#: application/core/Survey_Common_Action.php:1104 +#: application/core/Survey_Common_Action.php:1093 msgid "A full question index will be shown; participants will be able to jump between relevant questions." msgstr "" -#: application/core/Survey_Common_Action.php:1109 +#: application/core/Survey_Common_Action.php:1098 #: application/views/admin/survey/subview/accordion/_notification_panel.php:33 msgid "Responses will be date stamped." msgstr "" -#: application/core/Survey_Common_Action.php:1113 +#: application/core/Survey_Common_Action.php:1102 msgid "IP Addresses will be logged" msgstr "" -#: application/core/Survey_Common_Action.php:1117 +#: application/core/Survey_Common_Action.php:1106 msgid "Referrer URL will be saved." msgstr "" -#: application/core/Survey_Common_Action.php:1121 +#: application/core/Survey_Common_Action.php:1110 msgid "It uses cookies for access control." msgstr "" -#: application/core/Survey_Common_Action.php:1125 +#: application/core/Survey_Common_Action.php:1114 msgid "If tokens are used, the public may register for this survey" msgstr "" -#: application/core/Survey_Common_Action.php:1129 +#: application/core/Survey_Common_Action.php:1118 msgid "Participants can save partially finished surveys" msgstr "" -#: application/core/Survey_Common_Action.php:1133 +#: application/core/Survey_Common_Action.php:1122 msgid "Basic email notification is sent to:" msgstr "" -#: application/core/Survey_Common_Action.php:1137 +#: application/core/Survey_Common_Action.php:1126 msgid "Detailed email notification with response data is sent to:" msgstr "" -#: application/core/Survey_Common_Action.php:1213 +#: application/core/Survey_Common_Action.php:1202 msgid "Survey cannot be activated yet." msgstr "" -#: application/core/Survey_Common_Action.php:1216 +#: application/core/Survey_Common_Action.php:1205 msgid "You need to add question groups" msgstr "" -#: application/core/Survey_Common_Action.php:1220 +#: application/core/Survey_Common_Action.php:1209 msgid "You need to add questions" msgstr "" -#: application/core/Survey_Common_Action.php:1378 +#: application/core/Survey_Common_Action.php:1370 msgid "Copy failed" msgstr "" -#: application/core/Survey_Common_Action.php:1394 +#: application/core/Survey_Common_Action.php:1386 msgid "Forbidden Extension" msgstr "" @@ -5042,8 +5056,8 @@ msgstr "" #: application/core/plugins/ExportSTATAxml/STATAxmlWriter.php:232 #: application/core/plugins/ExportSTATAxml/STATAxmlWriter.php:243 -#: application/helpers/export_helper.php:282 -#: application/helpers/export_helper.php:286 +#: application/helpers/export_helper.php:283 +#: application/helpers/export_helper.php:287 msgid "Not Selected" msgstr "" @@ -5113,12 +5127,12 @@ msgid "Responses" msgstr "" #: application/core/plugins/QuickMenu/QuickMenu.php:327 -#: application/helpers/admin/statistics_helper.php:4295 +#: application/helpers/admin/statistics_helper.php:4300 #: application/helpers/questionHelper.php:365 #: application/helpers/questionHelper.php:376 #: application/helpers/questionHelper.php:387 #: application/helpers/questionHelper.php:744 -#: application/helpers/userstatistics_helper.php:2924 +#: application/helpers/userstatistics_helper.php:2925 #: application/models/Permission.php:84 application/models/Survey.php:927 #: application/views/admin/export/statistics_subviews/_statistics_header.php:3 #: application/views/admin/export/statistics_user_view.php:17 @@ -5575,6 +5589,7 @@ msgstr "" #: application/extensions/admin/grid/MassiveActionsWidget/views/modals/unkown_modal_type.php:14 #: application/extensions/admin/grid/MassiveActionsWidget/views/modals/yes-no.php:62 #: application/helpers/replacements_helper.php:722 +#: application/views/admin/conditions/conditionshead_view.php:74 #: application/views/admin/emailtemplates/emailtemplates_view.php:99 #: application/views/admin/homepagesettings/index.php:19 #: application/views/admin/labels/labelsetsbar_view.php:111 @@ -5714,10 +5729,10 @@ msgid "Full" msgstr "" #: application/extensions/admin/survey/ListSurveysWidget/views/listSurveys.php:114 -#: application/helpers/qanda_helper.php:4963 -#: application/helpers/qanda_helper.php:4978 -#: application/helpers/qanda_helper.php:4993 -#: application/helpers/qanda_helper.php:4994 +#: application/helpers/qanda_helper.php:4973 +#: application/helpers/qanda_helper.php:4988 +#: application/helpers/qanda_helper.php:5003 +#: application/helpers/qanda_helper.php:5004 #: application/views/admin/assessments_view.php:87 #: application/views/admin/assessments_view.php:132 #: application/views/survey/questions/arrays/texts/columns/col_total.php:15 @@ -5872,138 +5887,138 @@ msgstr "" msgid "Unknown view!" msgstr "" -#: application/helpers/SurveyRuntimeHelper.php:37 -#: application/helpers/SurveyRuntimeHelper.php:78 -#: application/helpers/SurveyRuntimeHelper.php:94 -#: application/helpers/SurveyRuntimeHelper.php:208 -#: application/helpers/SurveyRuntimeHelper.php:257 -#: application/helpers/SurveyRuntimeHelper.php:269 +#: application/helpers/SurveyRuntimeHelper.php:44 +#: application/helpers/SurveyRuntimeHelper.php:88 +#: application/helpers/SurveyRuntimeHelper.php:108 +#: application/helpers/SurveyRuntimeHelper.php:229 +#: application/helpers/SurveyRuntimeHelper.php:281 +#: application/helpers/SurveyRuntimeHelper.php:297 msgid "Question index" msgstr "" -#: application/helpers/SurveyRuntimeHelper.php:47 -#: application/helpers/SurveyRuntimeHelper.php:238 -#: application/helpers/SurveyRuntimeHelper.php:315 +#: application/helpers/SurveyRuntimeHelper.php:54 +#: application/helpers/SurveyRuntimeHelper.php:259 +#: application/helpers/SurveyRuntimeHelper.php:343 msgid "Go to this group" msgstr "" -#: application/helpers/SurveyRuntimeHelper.php:81 +#: application/helpers/SurveyRuntimeHelper.php:91 msgid "Question by question mode not yet supported." msgstr "" -#: application/helpers/SurveyRuntimeHelper.php:178 -#: application/helpers/SurveyRuntimeHelper.php:179 -#: application/helpers/SurveyRuntimeHelper.php:342 -#: application/helpers/frontend_helper.php:1798 +#: application/helpers/SurveyRuntimeHelper.php:192 +#: application/helpers/SurveyRuntimeHelper.php:193 +#: application/helpers/SurveyRuntimeHelper.php:370 +#: application/helpers/frontend_helper.php:1800 #: application/helpers/replacements_helper.php:327 #: application/views/admin/dataentry/active_html_view.php:72 #: application/views/admin/dataentry/includes/editdata/editdata.php:57 msgid "Submit" msgstr "" -#: application/helpers/SurveyRuntimeHelper.php:320 +#: application/helpers/SurveyRuntimeHelper.php:348 msgid "Go to this question" msgstr "" -#: application/helpers/SurveyRuntimeHelper.php:493 +#: application/helpers/SurveyRuntimeHelper.php:521 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:752 +#: application/helpers/SurveyRuntimeHelper.php:780 #: application/helpers/frontend_helper.php:837 msgid "Did Not Save" msgstr "" -#: application/helpers/SurveyRuntimeHelper.php:753 +#: application/helpers/SurveyRuntimeHelper.php:781 msgid "Your survey responses have not been recorded. This survey is not yet active." msgstr "" -#: application/helpers/SurveyRuntimeHelper.php:758 +#: application/helpers/SurveyRuntimeHelper.php:786 msgid "Clear Responses" msgstr "" -#: application/helpers/SurveyRuntimeHelper.php:813 +#: application/helpers/SurveyRuntimeHelper.php:841 #: application/helpers/replacements_helper.php:705 #: application/views/admin/templates/templateeditor_completed_view.php:2 msgid "Thank you!" msgstr "" -#: application/helpers/SurveyRuntimeHelper.php:814 +#: application/helpers/SurveyRuntimeHelper.php:842 #: application/views/admin/templates/templateeditor_completed_view.php:4 msgid "Your survey responses have been recorded." msgstr "" -#: application/helpers/SurveyRuntimeHelper.php:827 +#: application/helpers/SurveyRuntimeHelper.php:855 msgid "Print your answers." msgstr "" -#: application/helpers/SurveyRuntimeHelper.php:843 +#: application/helpers/SurveyRuntimeHelper.php:871 msgid "View the statistics for this survey." msgstr "" -#: application/helpers/SurveyRuntimeHelper.php:913 +#: application/helpers/SurveyRuntimeHelper.php:941 msgid "Sorry. There is no matching survey." msgstr "" -#: application/helpers/SurveyRuntimeHelper.php:930 +#: application/helpers/SurveyRuntimeHelper.php:958 msgid "Invalid group number for this survey: " msgstr "" -#: application/helpers/SurveyRuntimeHelper.php:936 +#: application/helpers/SurveyRuntimeHelper.php:964 msgid "This group contains no questions. You must add questions to this group before you can preview it" msgstr "" -#: application/helpers/SurveyRuntimeHelper.php:954 +#: application/helpers/SurveyRuntimeHelper.php:982 msgid "Submit your answers" msgstr "" -#: application/helpers/SurveyRuntimeHelper.php:955 +#: application/helpers/SurveyRuntimeHelper.php:983 msgid "There are no more questions. Please press the button to finish this survey." msgstr "" -#: application/helpers/SurveyRuntimeHelper.php:1225 +#: application/helpers/SurveyRuntimeHelper.php:1253 #: application/helpers/qanda_helper.php:485 msgid "One or more mandatory questions have not been answered. You cannot proceed until these have been completed." msgstr "" -#: application/helpers/SurveyRuntimeHelper.php:1231 +#: application/helpers/SurveyRuntimeHelper.php:1259 #: application/helpers/qanda_helper.php:509 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:1237 +#: application/helpers/SurveyRuntimeHelper.php:1265 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:1375 +#: application/helpers/SurveyRuntimeHelper.php:1403 msgid "This survey is currently not active. You will not be able to save your responses." msgstr "" -#: application/helpers/admin/activate_helper.php:95 +#: application/helpers/admin/activate_helper.php:97 msgid "This group does not contain any question(s)." msgstr "" -#: application/helpers/admin/activate_helper.php:141 +#: application/helpers/admin/activate_helper.php:143 msgid "This question has missing subquestions." msgstr "" -#: application/helpers/admin/activate_helper.php:154 +#: application/helpers/admin/activate_helper.php:156 msgid "This question has missing answer options." msgstr "" -#: application/helpers/admin/activate_helper.php:165 +#: application/helpers/admin/activate_helper.php:167 msgid "This question does not have a question 'type' set." msgstr "" -#: application/helpers/admin/activate_helper.php:175 +#: application/helpers/admin/activate_helper.php:177 msgid "This question requires answers, but none are set." msgstr "" -#: application/helpers/admin/activate_helper.php:182 +#: application/helpers/admin/activate_helper.php:184 msgid "This question requires a second answer set but none is set." msgstr "" -#: application/helpers/admin/activate_helper.php:227 +#: application/helpers/admin/activate_helper.php:229 msgid "This question has a condition set, however the condition is based on a question that appears after it." msgstr "" @@ -6045,120 +6060,120 @@ msgstr "" msgid "Existing LID: %s" msgstr "" -#: application/helpers/admin/import_helper.php:785 +#: application/helpers/admin/import_helper.php:791 msgid "Unable to create token table" msgstr "" -#: application/helpers/admin/import_helper.php:834 +#: application/helpers/admin/import_helper.php:841 msgid "This is not a valid LimeSurvey survey structure XML file." msgstr "" -#: application/helpers/admin/import_helper.php:930 +#: application/helpers/admin/import_helper.php:937 msgid "This survey setting has not been imported: %s => %s" msgstr "" -#: application/helpers/admin/import_helper.php:1117 +#: application/helpers/admin/import_helper.php:1124 msgid "Question code %s was updated to %s." msgstr "" -#: application/helpers/admin/import_helper.php:1225 +#: application/helpers/admin/import_helper.php:1232 msgid "Title of subquestion %s was updated to %s." msgstr "" -#: application/helpers/admin/import_helper.php:1542 +#: application/helpers/admin/import_helper.php:1549 msgid "Attention: Several question codes were updated. Please check these carefully as the update may not be perfect with customized expressions." msgstr "" -#: application/helpers/admin/import_helper.php:1587 +#: application/helpers/admin/import_helper.php:1597 msgid "This is not a valid token data XML file." msgstr "" -#: application/helpers/admin/import_helper.php:1637 +#: application/helpers/admin/import_helper.php:1647 msgid "Skipped tokens entry:" msgstr "" -#: application/helpers/admin/import_helper.php:1666 +#: application/helpers/admin/import_helper.php:1679 msgid "This is not a valid response data XML file." msgstr "" -#: application/helpers/admin/import_helper.php:1757 +#: application/helpers/admin/import_helper.php:1770 msgid "File seems empty or has only one line" msgstr "" -#: application/helpers/admin/import_helper.php:1805 +#: application/helpers/admin/import_helper.php:1818 msgid "Import failed: Forced import was requested but the input file doesn't contain enough columns to fill the survey." msgstr "" -#: application/helpers/admin/import_helper.php:1817 +#: application/helpers/admin/import_helper.php:1830 msgid "Import failed: No answers could be mapped." msgstr "" -#: application/helpers/admin/import_helper.php:1974 +#: application/helpers/admin/import_helper.php:1987 msgid "%s response lines in your file." msgstr "" -#: application/helpers/admin/import_helper.php:1976 +#: application/helpers/admin/import_helper.php:1989 msgid "No response lines in your file." msgstr "" -#: application/helpers/admin/import_helper.php:1979 +#: application/helpers/admin/import_helper.php:1992 msgid "%s responses were inserted." msgstr "" -#: application/helpers/admin/import_helper.php:1983 +#: application/helpers/admin/import_helper.php:1996 msgid "%s responses were updated." msgstr "" -#: application/helpers/admin/import_helper.php:1986 +#: application/helpers/admin/import_helper.php:1999 msgid "%s responses cannot be inserted or updated." msgstr "" -#: application/helpers/admin/import_helper.php:1990 +#: application/helpers/admin/import_helper.php:2003 msgid "%s responses already exist." msgstr "" -#: application/helpers/admin/import_helper.php:2005 +#: application/helpers/admin/import_helper.php:2021 msgid "This is not a valid timings data XML file." msgstr "" -#: application/helpers/admin/import_helper.php:2226 +#: application/helpers/admin/import_helper.php:2242 msgid "Failed to insert survey language" msgstr "" -#: application/helpers/admin/import_helper.php:2283 +#: application/helpers/admin/import_helper.php:2299 msgid "Failed to insert group" msgstr "" -#: application/helpers/admin/import_helper.php:2283 -#: application/helpers/admin/import_helper.php:2331 -#: application/helpers/admin/import_helper.php:2381 -#: application/helpers/admin/import_helper.php:2399 -#: application/helpers/admin/import_helper.php:2426 -#: application/helpers/admin/import_helper.php:2465 -#: application/helpers/admin/import_helper.php:2487 -#: application/helpers/admin/import_helper.php:2505 +#: application/helpers/admin/import_helper.php:2299 +#: application/helpers/admin/import_helper.php:2347 +#: application/helpers/admin/import_helper.php:2397 +#: application/helpers/admin/import_helper.php:2415 +#: application/helpers/admin/import_helper.php:2442 +#: application/helpers/admin/import_helper.php:2481 +#: application/helpers/admin/import_helper.php:2503 +#: application/helpers/admin/import_helper.php:2521 msgid "Text file row number " msgstr "" -#: application/helpers/admin/import_helper.php:2331 +#: application/helpers/admin/import_helper.php:2347 msgid "Could not insert question" msgstr "" -#: application/helpers/admin/import_helper.php:2381 +#: application/helpers/admin/import_helper.php:2397 msgid "Failed to insert question attribute" msgstr "" -#: application/helpers/admin/import_helper.php:2399 -#: application/helpers/admin/import_helper.php:2426 -#: application/helpers/admin/import_helper.php:2487 +#: application/helpers/admin/import_helper.php:2415 +#: application/helpers/admin/import_helper.php:2442 +#: application/helpers/admin/import_helper.php:2503 msgid "Failed to insert default value" msgstr "" -#: application/helpers/admin/import_helper.php:2465 +#: application/helpers/admin/import_helper.php:2481 msgid "Could not insert subquestion" msgstr "" -#: application/helpers/admin/import_helper.php:2505 +#: application/helpers/admin/import_helper.php:2521 msgid "Could not insert answer" msgstr "" @@ -6194,316 +6209,317 @@ msgid "Sorry, but this question has no responses yet so a graph cannot be shown. msgstr "" #: application/helpers/admin/statistics_helper.php:239 -#: application/helpers/admin/statistics_helper.php:1588 -#: application/helpers/admin/statistics_helper.php:1745 -#: application/helpers/admin/statistics_helper.php:2590 +#: application/helpers/admin/statistics_helper.php:1589 +#: application/helpers/admin/statistics_helper.php:1751 +#: application/helpers/admin/statistics_helper.php:2596 #: application/helpers/userstatistics_helper.php:239 -#: application/helpers/userstatistics_helper.php:1571 -#: application/helpers/userstatistics_helper.php:1802 +#: application/helpers/userstatistics_helper.php:1572 +#: application/helpers/userstatistics_helper.php:1804 msgid "Comments" msgstr "" -#: application/helpers/admin/statistics_helper.php:717 -#: application/helpers/admin/statistics_helper.php:756 -#: application/helpers/admin/statistics_helper.php:1772 -#: application/helpers/admin/statistics_helper.php:2642 -#: application/helpers/admin/statistics_helper.php:2686 -#: application/helpers/admin/statistics_helper.php:2695 -#: application/helpers/admin/statistics_helper.php:2719 -#: application/helpers/admin/statistics_helper.php:2727 -#: application/helpers/admin/statistics_helper.php:2761 -#: application/helpers/admin/statistics_helper.php:2769 -#: application/helpers/userstatistics_helper.php:706 -#: application/helpers/userstatistics_helper.php:745 -#: application/helpers/userstatistics_helper.php:1854 -#: application/helpers/userstatistics_helper.php:1900 -#: application/helpers/userstatistics_helper.php:1909 -#: application/helpers/userstatistics_helper.php:1914 -#: application/helpers/userstatistics_helper.php:1937 -#: application/helpers/userstatistics_helper.php:1945 -#: application/helpers/userstatistics_helper.php:1950 -#: application/helpers/userstatistics_helper.php:1981 -#: application/helpers/userstatistics_helper.php:1989 -#: application/helpers/userstatistics_helper.php:1994 -#: application/views/admin/conditions/includes/form_editconditions_header.php:106 +#: application/helpers/admin/statistics_helper.php:718 +#: application/helpers/admin/statistics_helper.php:757 +#: application/helpers/admin/statistics_helper.php:1778 +#: application/helpers/admin/statistics_helper.php:2648 +#: application/helpers/admin/statistics_helper.php:2692 +#: application/helpers/admin/statistics_helper.php:2701 +#: application/helpers/admin/statistics_helper.php:2725 +#: application/helpers/admin/statistics_helper.php:2733 +#: application/helpers/admin/statistics_helper.php:2767 +#: application/helpers/admin/statistics_helper.php:2775 +#: application/helpers/userstatistics_helper.php:707 +#: application/helpers/userstatistics_helper.php:746 +#: application/helpers/userstatistics_helper.php:1856 +#: application/helpers/userstatistics_helper.php:1902 +#: application/helpers/userstatistics_helper.php:1911 +#: application/helpers/userstatistics_helper.php:1916 +#: application/helpers/userstatistics_helper.php:1939 +#: application/helpers/userstatistics_helper.php:1947 +#: application/helpers/userstatistics_helper.php:1952 +#: application/helpers/userstatistics_helper.php:1983 +#: application/helpers/userstatistics_helper.php:1991 +#: application/helpers/userstatistics_helper.php:1996 +#: application/views/admin/conditions/includes/form_editconditions_header.php:103 +#: application/views/admin/conditions/includes/quickAddConditionForm.php:79 #: application/views/admin/export/generatestats/_statisticsoutput_header.php:34 #: application/views/admin/templates/templateeditor_question_answer_view.php:14 msgid "Answer" msgstr "" -#: application/helpers/admin/statistics_helper.php:777 -#: application/helpers/userstatistics_helper.php:766 -#: application/models/Question.php:565 +#: application/helpers/admin/statistics_helper.php:778 +#: application/helpers/userstatistics_helper.php:767 +#: application/models/Question.php:564 msgid "Ranking" msgstr "" -#: application/helpers/admin/statistics_helper.php:828 -#: application/helpers/userstatistics_helper.php:817 -msgid "Total number of files" -msgstr "" - #: application/helpers/admin/statistics_helper.php:829 #: application/helpers/userstatistics_helper.php:818 -msgid "Average no. of files per respondent" +msgid "Total number of files" msgstr "" -#: application/helpers/admin/statistics_helper.php:852 -#: application/helpers/userstatistics_helper.php:841 -msgid "Total size of files" +#: application/helpers/admin/statistics_helper.php:830 +#: application/helpers/userstatistics_helper.php:819 +msgid "Average no. of files per respondent" msgstr "" #: application/helpers/admin/statistics_helper.php:853 #: application/helpers/userstatistics_helper.php:842 -msgid "Average file size" +msgid "Total size of files" msgstr "" #: application/helpers/admin/statistics_helper.php:854 #: application/helpers/userstatistics_helper.php:843 +msgid "Average file size" +msgstr "" + +#: application/helpers/admin/statistics_helper.php:855 +#: application/helpers/userstatistics_helper.php:844 msgid "Average size per respondent" msgstr "" -#: application/helpers/admin/statistics_helper.php:873 -#: application/helpers/admin/statistics_helper.php:891 -#: application/helpers/admin/statistics_helper.php:900 -#: application/helpers/admin/statistics_helper.php:953 -#: application/helpers/admin/statistics_helper.php:973 -#: application/helpers/admin/statistics_helper.php:982 -#: application/helpers/admin/statistics_helper.php:2413 -#: application/helpers/admin/statistics_helper.php:2429 -#: application/helpers/userstatistics_helper.php:862 -#: application/helpers/userstatistics_helper.php:880 -#: application/helpers/userstatistics_helper.php:889 -#: application/helpers/userstatistics_helper.php:942 -#: application/helpers/userstatistics_helper.php:962 -#: application/helpers/userstatistics_helper.php:972 -#: application/helpers/userstatistics_helper.php:1618 -#: application/helpers/userstatistics_helper.php:1634 -#: application/helpers/userstatistics_helper.php:1650 +#: application/helpers/admin/statistics_helper.php:874 +#: application/helpers/admin/statistics_helper.php:892 +#: application/helpers/admin/statistics_helper.php:901 +#: application/helpers/admin/statistics_helper.php:954 +#: application/helpers/admin/statistics_helper.php:974 +#: application/helpers/admin/statistics_helper.php:983 +#: application/helpers/admin/statistics_helper.php:2419 +#: application/helpers/admin/statistics_helper.php:2435 +#: application/helpers/userstatistics_helper.php:863 +#: application/helpers/userstatistics_helper.php:881 +#: application/helpers/userstatistics_helper.php:890 +#: application/helpers/userstatistics_helper.php:943 +#: application/helpers/userstatistics_helper.php:963 +#: application/helpers/userstatistics_helper.php:973 +#: application/helpers/userstatistics_helper.php:1620 +#: application/helpers/userstatistics_helper.php:1636 +#: application/helpers/userstatistics_helper.php:1652 #: application/views/admin/export/generatestats/_statisticsoutput_header.php:18 msgid "Field summary for %s" msgstr "" -#: application/helpers/admin/statistics_helper.php:882 -#: application/helpers/admin/statistics_helper.php:894 -#: application/helpers/admin/statistics_helper.php:904 -#: application/helpers/admin/statistics_helper.php:963 -#: application/helpers/admin/statistics_helper.php:976 -#: application/helpers/admin/statistics_helper.php:986 -#: application/helpers/userstatistics_helper.php:871 -#: application/helpers/userstatistics_helper.php:883 -#: application/helpers/userstatistics_helper.php:893 -#: application/helpers/userstatistics_helper.php:952 -#: application/helpers/userstatistics_helper.php:965 -#: application/helpers/userstatistics_helper.php:976 -msgid "Calculation" -msgstr "" - #: application/helpers/admin/statistics_helper.php:883 -#: application/helpers/admin/statistics_helper.php:894 -#: application/helpers/admin/statistics_helper.php:906 +#: application/helpers/admin/statistics_helper.php:895 +#: application/helpers/admin/statistics_helper.php:905 #: application/helpers/admin/statistics_helper.php:964 -#: application/helpers/admin/statistics_helper.php:976 -#: application/helpers/admin/statistics_helper.php:988 +#: application/helpers/admin/statistics_helper.php:977 +#: application/helpers/admin/statistics_helper.php:987 #: application/helpers/userstatistics_helper.php:872 -#: application/helpers/userstatistics_helper.php:883 -#: application/helpers/userstatistics_helper.php:895 +#: application/helpers/userstatistics_helper.php:884 +#: application/helpers/userstatistics_helper.php:894 #: application/helpers/userstatistics_helper.php:953 -#: application/helpers/userstatistics_helper.php:965 -#: application/helpers/userstatistics_helper.php:978 +#: application/helpers/userstatistics_helper.php:966 +#: application/helpers/userstatistics_helper.php:977 +msgid "Calculation" +msgstr "" + +#: application/helpers/admin/statistics_helper.php:884 +#: application/helpers/admin/statistics_helper.php:895 +#: application/helpers/admin/statistics_helper.php:907 +#: application/helpers/admin/statistics_helper.php:965 +#: application/helpers/admin/statistics_helper.php:977 +#: application/helpers/admin/statistics_helper.php:989 +#: application/helpers/userstatistics_helper.php:873 +#: application/helpers/userstatistics_helper.php:884 +#: application/helpers/userstatistics_helper.php:896 +#: application/helpers/userstatistics_helper.php:954 +#: application/helpers/userstatistics_helper.php:966 +#: application/helpers/userstatistics_helper.php:979 msgid "Result" msgstr "" -#: application/helpers/admin/statistics_helper.php:1066 -#: application/helpers/admin/statistics_helper.php:2689 +#: application/helpers/admin/statistics_helper.php:1067 #: application/helpers/admin/statistics_helper.php:2695 -#: application/helpers/admin/statistics_helper.php:3279 -#: application/helpers/admin/statistics_helper.php:3283 -#: application/helpers/admin/statistics_helper.php:3295 -#: application/helpers/userstatistics_helper.php:1056 -#: application/helpers/userstatistics_helper.php:1903 -#: application/helpers/userstatistics_helper.php:1909 -#: application/helpers/userstatistics_helper.php:1920 -#: application/helpers/userstatistics_helper.php:2416 -#: application/helpers/userstatistics_helper.php:2420 -#: application/helpers/userstatistics_helper.php:2432 -#: application/helpers/userstatistics_helper.php:2438 +#: application/helpers/admin/statistics_helper.php:2701 +#: application/helpers/admin/statistics_helper.php:3285 +#: application/helpers/admin/statistics_helper.php:3289 +#: application/helpers/admin/statistics_helper.php:3301 +#: application/helpers/userstatistics_helper.php:1057 +#: application/helpers/userstatistics_helper.php:1905 +#: application/helpers/userstatistics_helper.php:1911 +#: application/helpers/userstatistics_helper.php:1922 +#: application/helpers/userstatistics_helper.php:2418 +#: application/helpers/userstatistics_helper.php:2422 +#: application/helpers/userstatistics_helper.php:2434 +#: application/helpers/userstatistics_helper.php:2440 #: application/views/admin/export/generatestats/_statisticsoutput_answer.php:53 #: application/views/admin/export/generatestats/_statisticsoutput_header.php:53 msgid "Sum" msgstr "" -#: application/helpers/admin/statistics_helper.php:1067 -#: application/helpers/admin/statistics_helper.php:3512 -#: application/helpers/admin/statistics_helper.php:3519 -#: application/helpers/userstatistics_helper.php:1057 -#: application/helpers/userstatistics_helper.php:2598 -#: application/helpers/userstatistics_helper.php:2605 -#: application/helpers/userstatistics_helper.php:2612 +#: application/helpers/admin/statistics_helper.php:1068 +#: application/helpers/admin/statistics_helper.php:3518 +#: application/helpers/admin/statistics_helper.php:3525 +#: application/helpers/userstatistics_helper.php:1058 +#: application/helpers/userstatistics_helper.php:2600 +#: application/helpers/userstatistics_helper.php:2607 +#: application/helpers/userstatistics_helper.php:2614 #: application/views/admin/export/generatestats/_statisticsoutput_arithmetic.php:26 #: application/views/admin/export/generatestats/simplestats/_statisticsoutput_arithmetic.php:26 msgid "Standard deviation" msgstr "" -#: application/helpers/admin/statistics_helper.php:1068 -#: application/helpers/userstatistics_helper.php:1058 +#: application/helpers/admin/statistics_helper.php:1069 +#: application/helpers/userstatistics_helper.php:1059 msgid "Average" msgstr "" -#: application/helpers/admin/statistics_helper.php:1085 -#: application/helpers/admin/statistics_helper.php:1772 -#: application/helpers/admin/statistics_helper.php:2642 -#: application/helpers/admin/statistics_helper.php:2687 -#: application/helpers/admin/statistics_helper.php:2695 -#: application/helpers/admin/statistics_helper.php:2720 -#: application/helpers/admin/statistics_helper.php:2727 -#: application/helpers/admin/statistics_helper.php:2762 -#: application/helpers/admin/statistics_helper.php:2769 -#: application/helpers/userstatistics_helper.php:1075 -#: application/helpers/userstatistics_helper.php:1854 -#: application/helpers/userstatistics_helper.php:1870 -#: application/helpers/userstatistics_helper.php:1901 -#: application/helpers/userstatistics_helper.php:1909 -#: application/helpers/userstatistics_helper.php:1916 -#: application/helpers/userstatistics_helper.php:1938 -#: application/helpers/userstatistics_helper.php:1945 -#: application/helpers/userstatistics_helper.php:1952 -#: application/helpers/userstatistics_helper.php:1982 -#: application/helpers/userstatistics_helper.php:1989 -#: application/helpers/userstatistics_helper.php:1996 +#: application/helpers/admin/statistics_helper.php:1086 +#: application/helpers/admin/statistics_helper.php:1778 +#: application/helpers/admin/statistics_helper.php:2648 +#: application/helpers/admin/statistics_helper.php:2693 +#: application/helpers/admin/statistics_helper.php:2701 +#: application/helpers/admin/statistics_helper.php:2726 +#: application/helpers/admin/statistics_helper.php:2733 +#: application/helpers/admin/statistics_helper.php:2768 +#: application/helpers/admin/statistics_helper.php:2775 +#: application/helpers/userstatistics_helper.php:1076 +#: application/helpers/userstatistics_helper.php:1856 +#: application/helpers/userstatistics_helper.php:1872 +#: application/helpers/userstatistics_helper.php:1903 +#: application/helpers/userstatistics_helper.php:1911 +#: application/helpers/userstatistics_helper.php:1918 +#: application/helpers/userstatistics_helper.php:1940 +#: application/helpers/userstatistics_helper.php:1947 +#: application/helpers/userstatistics_helper.php:1954 +#: application/helpers/userstatistics_helper.php:1984 +#: application/helpers/userstatistics_helper.php:1991 +#: application/helpers/userstatistics_helper.php:1998 #: application/views/admin/export/generatestats/_statisticsoutput_header.php:40 msgid "Count" msgstr "" -#: application/helpers/admin/statistics_helper.php:1091 -#: application/helpers/userstatistics_helper.php:1081 -msgid "1st quartile (Q1)" -msgstr "" - #: application/helpers/admin/statistics_helper.php:1092 #: application/helpers/userstatistics_helper.php:1082 -msgid "2nd quartile (Median)" +msgid "1st quartile (Q1)" msgstr "" #: application/helpers/admin/statistics_helper.php:1093 #: application/helpers/userstatistics_helper.php:1083 -msgid "3rd quartile (Q3)" +msgid "2nd quartile (Median)" msgstr "" -#: application/helpers/admin/statistics_helper.php:1132 -#: application/helpers/admin/statistics_helper.php:1136 -#: application/helpers/admin/statistics_helper.php:1142 -#: application/helpers/admin/statistics_helper.php:1158 -#: application/helpers/userstatistics_helper.php:1122 -#: application/helpers/userstatistics_helper.php:1126 -#: application/helpers/userstatistics_helper.php:1132 -#: application/helpers/userstatistics_helper.php:1148 -msgid "Null values are ignored in calculations" +#: application/helpers/admin/statistics_helper.php:1094 +#: application/helpers/userstatistics_helper.php:1084 +msgid "3rd quartile (Q3)" msgstr "" -#: application/helpers/admin/statistics_helper.php:1134 +#: application/helpers/admin/statistics_helper.php:1133 #: application/helpers/admin/statistics_helper.php:1137 #: application/helpers/admin/statistics_helper.php:1143 #: application/helpers/admin/statistics_helper.php:1159 -#: application/helpers/userstatistics_helper.php:1124 +#: application/helpers/userstatistics_helper.php:1123 #: application/helpers/userstatistics_helper.php:1127 #: application/helpers/userstatistics_helper.php:1133 #: application/helpers/userstatistics_helper.php:1149 +msgid "Null values are ignored in calculations" +msgstr "" + +#: application/helpers/admin/statistics_helper.php:1135 +#: application/helpers/admin/statistics_helper.php:1138 +#: application/helpers/admin/statistics_helper.php:1144 +#: application/helpers/admin/statistics_helper.php:1160 +#: application/helpers/userstatistics_helper.php:1125 +#: application/helpers/userstatistics_helper.php:1128 +#: application/helpers/userstatistics_helper.php:1134 +#: application/helpers/userstatistics_helper.php:1150 msgid "Q1 and Q3 calculated using %s" msgstr "" -#: application/helpers/admin/statistics_helper.php:1134 -#: application/helpers/admin/statistics_helper.php:1137 -#: application/helpers/admin/statistics_helper.php:1143 -#: application/helpers/admin/statistics_helper.php:1159 -#: application/helpers/userstatistics_helper.php:1124 -#: application/helpers/userstatistics_helper.php:1127 -#: application/helpers/userstatistics_helper.php:1133 -#: application/helpers/userstatistics_helper.php:1149 +#: application/helpers/admin/statistics_helper.php:1135 +#: application/helpers/admin/statistics_helper.php:1138 +#: application/helpers/admin/statistics_helper.php:1144 +#: application/helpers/admin/statistics_helper.php:1160 +#: application/helpers/userstatistics_helper.php:1125 +#: application/helpers/userstatistics_helper.php:1128 +#: application/helpers/userstatistics_helper.php:1134 +#: application/helpers/userstatistics_helper.php:1150 msgid "minitab method" msgstr "" -#: application/helpers/admin/statistics_helper.php:1168 -#: application/helpers/admin/statistics_helper.php:1756 -#: application/helpers/admin/statistics_helper.php:1779 -#: application/helpers/admin/statistics_helper.php:2600 -#: application/helpers/admin/statistics_helper.php:2649 -#: application/helpers/admin/statistics_helper.php:4464 -#: application/helpers/userstatistics_helper.php:1158 -#: application/helpers/userstatistics_helper.php:1812 -#: application/helpers/userstatistics_helper.php:1861 -#: application/helpers/userstatistics_helper.php:3072 +#: application/helpers/admin/statistics_helper.php:1169 +#: application/helpers/admin/statistics_helper.php:1762 +#: application/helpers/admin/statistics_helper.php:1785 +#: application/helpers/admin/statistics_helper.php:2606 +#: application/helpers/admin/statistics_helper.php:2655 +#: application/helpers/admin/statistics_helper.php:4469 +#: application/helpers/userstatistics_helper.php:1159 +#: application/helpers/userstatistics_helper.php:1814 +#: application/helpers/userstatistics_helper.php:1863 +#: application/helpers/userstatistics_helper.php:3073 #: application/views/admin/export/generatestats/_header.php:28 msgid "Browse" msgstr "" -#: application/helpers/admin/statistics_helper.php:1192 -#: application/helpers/admin/statistics_helper.php:1197 -#: application/helpers/admin/statistics_helper.php:1208 -#: application/helpers/userstatistics_helper.php:1182 -#: application/helpers/userstatistics_helper.php:1187 -#: application/helpers/userstatistics_helper.php:1198 +#: application/helpers/admin/statistics_helper.php:1193 +#: application/helpers/admin/statistics_helper.php:1198 +#: application/helpers/admin/statistics_helper.php:1209 +#: application/helpers/userstatistics_helper.php:1183 +#: application/helpers/userstatistics_helper.php:1188 +#: application/helpers/userstatistics_helper.php:1199 msgid "Not enough values for calculation" msgstr "" -#: application/helpers/admin/statistics_helper.php:1772 -#: application/helpers/admin/statistics_helper.php:2642 -#: application/helpers/admin/statistics_helper.php:2688 -#: application/helpers/admin/statistics_helper.php:2695 -#: application/helpers/admin/statistics_helper.php:2721 +#: application/helpers/admin/statistics_helper.php:1778 +#: application/helpers/admin/statistics_helper.php:2648 +#: application/helpers/admin/statistics_helper.php:2694 +#: application/helpers/admin/statistics_helper.php:2701 #: application/helpers/admin/statistics_helper.php:2727 -#: application/helpers/admin/statistics_helper.php:2763 +#: application/helpers/admin/statistics_helper.php:2733 #: application/helpers/admin/statistics_helper.php:2769 -#: application/helpers/userstatistics_helper.php:1854 -#: application/helpers/userstatistics_helper.php:1872 -#: application/helpers/userstatistics_helper.php:1902 -#: application/helpers/userstatistics_helper.php:1909 -#: application/helpers/userstatistics_helper.php:1918 -#: application/helpers/userstatistics_helper.php:1939 -#: application/helpers/userstatistics_helper.php:1945 -#: application/helpers/userstatistics_helper.php:1954 -#: application/helpers/userstatistics_helper.php:1983 -#: application/helpers/userstatistics_helper.php:1989 -#: application/helpers/userstatistics_helper.php:1998 +#: application/helpers/admin/statistics_helper.php:2775 +#: application/helpers/userstatistics_helper.php:1856 +#: application/helpers/userstatistics_helper.php:1874 +#: application/helpers/userstatistics_helper.php:1904 +#: application/helpers/userstatistics_helper.php:1911 +#: application/helpers/userstatistics_helper.php:1920 +#: application/helpers/userstatistics_helper.php:1941 +#: application/helpers/userstatistics_helper.php:1947 +#: application/helpers/userstatistics_helper.php:1956 +#: application/helpers/userstatistics_helper.php:1985 +#: application/helpers/userstatistics_helper.php:1991 +#: application/helpers/userstatistics_helper.php:2000 #: application/views/admin/export/generatestats/_statisticsoutput_header.php:46 msgid "Percentage" msgstr "" -#: application/helpers/admin/statistics_helper.php:1944 -#: application/helpers/admin/statistics_helper.php:2922 -#: application/helpers/admin/statistics_helper.php:2954 -#: application/helpers/admin/statistics_helper.php:3019 -#: application/helpers/userstatistics_helper.php:2097 -#: application/helpers/userstatistics_helper.php:2129 -#: application/helpers/userstatistics_helper.php:2177 +#: application/helpers/admin/statistics_helper.php:1950 +#: application/helpers/admin/statistics_helper.php:2928 +#: application/helpers/admin/statistics_helper.php:2960 +#: application/helpers/admin/statistics_helper.php:3025 +#: application/helpers/userstatistics_helper.php:2099 +#: application/helpers/userstatistics_helper.php:2131 +#: application/helpers/userstatistics_helper.php:2179 msgid "Not completed or Not displayed" msgstr "" -#: application/helpers/admin/statistics_helper.php:1948 -#: application/helpers/admin/statistics_helper.php:2926 -#: application/helpers/admin/statistics_helper.php:2967 -#: application/helpers/admin/statistics_helper.php:3023 -#: application/helpers/userstatistics_helper.php:2101 -#: application/helpers/userstatistics_helper.php:2133 -#: application/helpers/userstatistics_helper.php:2181 +#: application/helpers/admin/statistics_helper.php:1954 +#: application/helpers/admin/statistics_helper.php:2932 +#: application/helpers/admin/statistics_helper.php:2973 +#: application/helpers/admin/statistics_helper.php:3029 +#: application/helpers/userstatistics_helper.php:2103 +#: application/helpers/userstatistics_helper.php:2135 +#: application/helpers/userstatistics_helper.php:2183 msgid "Not displayed" msgstr "" -#: application/helpers/admin/statistics_helper.php:2604 -#: application/helpers/admin/statistics_helper.php:2617 -#: application/helpers/admin/statistics_helper.php:2663 -#: application/helpers/userstatistics_helper.php:1816 -#: application/helpers/userstatistics_helper.php:1829 -#: application/helpers/userstatistics_helper.php:1877 +#: application/helpers/admin/statistics_helper.php:2610 +#: application/helpers/admin/statistics_helper.php:2623 +#: application/helpers/admin/statistics_helper.php:2669 +#: application/helpers/userstatistics_helper.php:1818 +#: application/helpers/userstatistics_helper.php:1831 +#: application/helpers/userstatistics_helper.php:1879 msgid "Response" msgstr "" -#: application/helpers/admin/statistics_helper.php:3279 -#: application/helpers/admin/statistics_helper.php:3283 -#: application/helpers/admin/statistics_helper.php:3295 -#: application/helpers/userstatistics_helper.php:2416 -#: application/helpers/userstatistics_helper.php:2420 -#: application/helpers/userstatistics_helper.php:2432 -#: application/helpers/userstatistics_helper.php:2438 +#: application/helpers/admin/statistics_helper.php:3285 +#: application/helpers/admin/statistics_helper.php:3289 +#: application/helpers/admin/statistics_helper.php:3301 +#: application/helpers/userstatistics_helper.php:2418 +#: application/helpers/userstatistics_helper.php:2422 +#: application/helpers/userstatistics_helper.php:2434 +#: application/helpers/userstatistics_helper.php:2440 #: application/views/admin/export/generatestats/_statisticsoutput_answer.php:53 #: application/views/admin/quotas/viewquotasrow_view.php:57 #: application/views/admin/survey/Question/import_view.php:18 @@ -6513,84 +6529,84 @@ msgstr "" msgid "Answers" msgstr "" -#: application/helpers/admin/statistics_helper.php:3280 -#: application/helpers/admin/statistics_helper.php:3288 -#: application/helpers/admin/statistics_helper.php:3296 -#: application/helpers/userstatistics_helper.php:2417 -#: application/helpers/userstatistics_helper.php:2425 -#: application/helpers/userstatistics_helper.php:2433 -#: application/helpers/userstatistics_helper.php:2444 +#: application/helpers/admin/statistics_helper.php:3286 +#: application/helpers/admin/statistics_helper.php:3294 +#: application/helpers/admin/statistics_helper.php:3302 +#: application/helpers/userstatistics_helper.php:2419 +#: application/helpers/userstatistics_helper.php:2427 +#: application/helpers/userstatistics_helper.php:2435 +#: application/helpers/userstatistics_helper.php:2446 msgid "Number of cases" msgstr "" -#: application/helpers/admin/statistics_helper.php:3509 -#: application/helpers/admin/statistics_helper.php:3518 -#: application/helpers/userstatistics_helper.php:2595 -#: application/helpers/userstatistics_helper.php:2604 -#: application/helpers/userstatistics_helper.php:2610 +#: application/helpers/admin/statistics_helper.php:3515 +#: application/helpers/admin/statistics_helper.php:3524 +#: application/helpers/userstatistics_helper.php:2597 +#: application/helpers/userstatistics_helper.php:2606 +#: application/helpers/userstatistics_helper.php:2612 #: application/views/admin/export/generatestats/_statisticsoutput_arithmetic.php:12 #: application/views/admin/export/generatestats/simplestats/_statisticsoutput_arithmetic.php:12 msgid "Arithmetic mean" msgstr "" -#: application/helpers/admin/statistics_helper.php:4293 -#: application/helpers/userstatistics_helper.php:2922 +#: application/helpers/admin/statistics_helper.php:4298 +#: application/helpers/userstatistics_helper.php:2923 msgid "Statistics survey %s" msgstr "" -#: application/helpers/admin/statistics_helper.php:4295 -#: application/helpers/userstatistics_helper.php:2924 +#: application/helpers/admin/statistics_helper.php:4300 +#: application/helpers/userstatistics_helper.php:2925 msgid "Survey %s" msgstr "" -#: application/helpers/admin/statistics_helper.php:4307 -#: application/helpers/admin/statistics_helper.php:4420 -#: application/helpers/admin/statistics_helper.php:4539 -#: application/helpers/userstatistics_helper.php:2935 -#: application/helpers/userstatistics_helper.php:3048 -#: application/helpers/userstatistics_helper.php:3163 +#: application/helpers/admin/statistics_helper.php:4312 +#: application/helpers/admin/statistics_helper.php:4425 +#: application/helpers/admin/statistics_helper.php:4544 +#: application/helpers/userstatistics_helper.php:2936 +#: application/helpers/userstatistics_helper.php:3049 +#: application/helpers/userstatistics_helper.php:3164 #: application/views/admin/participants/modal_subviews/_addToSurvey.php:22 #: application/views/admin/super/quickmenu.php:6 #: application/views/admin/super/sidemenu.php:69 msgid "Survey" msgstr "" -#: application/helpers/admin/statistics_helper.php:4393 -#: application/helpers/admin/statistics_helper.php:4411 -#: application/helpers/admin/statistics_helper.php:4428 -#: application/helpers/userstatistics_helper.php:3021 -#: application/helpers/userstatistics_helper.php:3039 -#: application/helpers/userstatistics_helper.php:3056 +#: application/helpers/admin/statistics_helper.php:4398 +#: application/helpers/admin/statistics_helper.php:4416 +#: application/helpers/admin/statistics_helper.php:4433 +#: application/helpers/userstatistics_helper.php:3022 +#: application/helpers/userstatistics_helper.php:3040 +#: application/helpers/userstatistics_helper.php:3057 #: application/views/admin/export/generatestats/_header.php:18 msgid "Number of records in this query:" msgstr "" -#: application/helpers/admin/statistics_helper.php:4396 -#: application/helpers/admin/statistics_helper.php:4412 -#: application/helpers/admin/statistics_helper.php:4429 -#: application/helpers/userstatistics_helper.php:3024 -#: application/helpers/userstatistics_helper.php:3040 -#: application/helpers/userstatistics_helper.php:3058 +#: application/helpers/admin/statistics_helper.php:4401 +#: application/helpers/admin/statistics_helper.php:4417 +#: application/helpers/admin/statistics_helper.php:4434 +#: application/helpers/userstatistics_helper.php:3025 +#: application/helpers/userstatistics_helper.php:3041 +#: application/helpers/userstatistics_helper.php:3059 #: application/views/admin/export/generatestats/_header.php:19 msgid "Total records in survey:" msgstr "" -#: application/helpers/admin/statistics_helper.php:4402 -#: application/helpers/admin/statistics_helper.php:4416 -#: application/helpers/admin/statistics_helper.php:4434 -#: application/helpers/userstatistics_helper.php:3030 -#: application/helpers/userstatistics_helper.php:3044 -#: application/helpers/userstatistics_helper.php:3065 +#: application/helpers/admin/statistics_helper.php:4407 +#: application/helpers/admin/statistics_helper.php:4421 +#: application/helpers/admin/statistics_helper.php:4439 +#: application/helpers/userstatistics_helper.php:3031 +#: application/helpers/userstatistics_helper.php:3045 +#: application/helpers/userstatistics_helper.php:3066 #: application/views/admin/export/generatestats/_header.php:22 msgid "Percentage of total:" msgstr "" -#: application/helpers/admin/statistics_helper.php:4419 -#: application/helpers/admin/statistics_helper.php:4420 -#: application/helpers/admin/statistics_helper.php:4427 -#: application/helpers/userstatistics_helper.php:3047 +#: application/helpers/admin/statistics_helper.php:4424 +#: application/helpers/admin/statistics_helper.php:4425 +#: application/helpers/admin/statistics_helper.php:4432 #: application/helpers/userstatistics_helper.php:3048 -#: application/helpers/userstatistics_helper.php:3055 +#: application/helpers/userstatistics_helper.php:3049 +#: application/helpers/userstatistics_helper.php:3056 #: application/views/admin/export/generatestats/_header.php:17 msgid "Results" msgstr "" @@ -6603,23 +6619,23 @@ msgstr "" msgid "Expired" msgstr "" -#: application/helpers/common_helper.php:894 +#: application/helpers/common_helper.php:898 msgid "No email notification" msgstr "" -#: application/helpers/common_helper.php:895 +#: application/helpers/common_helper.php:899 msgid "Basic email notification" msgstr "" -#: application/helpers/common_helper.php:896 +#: application/helpers/common_helper.php:900 msgid "Detailed email notification with result codes" msgstr "" -#: application/helpers/common_helper.php:1185 +#: application/helpers/common_helper.php:1189 msgid "Response submission for survey {SURVEYNAME} with results" msgstr "" -#: application/helpers/common_helper.php:1186 +#: application/helpers/common_helper.php:1190 msgid "" "Hello,\n" "\n" @@ -6642,11 +6658,11 @@ msgid "" "{ANSWERTABLE}" msgstr "" -#: application/helpers/common_helper.php:1223 +#: application/helpers/common_helper.php:1227 msgid "Response submission for survey {SURVEYNAME}" msgstr "" -#: application/helpers/common_helper.php:1224 +#: application/helpers/common_helper.php:1228 msgid "" "Hello,\n" "\n" @@ -6665,11 +6681,11 @@ msgid "" "{STATISTICSURL}" msgstr "" -#: application/helpers/common_helper.php:1225 +#: application/helpers/common_helper.php:1229 msgid "Confirmation of your participation in our survey" msgstr "" -#: application/helpers/common_helper.php:1226 +#: application/helpers/common_helper.php:1230 msgid "" "Dear {FIRSTNAME},\n" "\n" @@ -6682,11 +6698,11 @@ msgid "" "{ADMINNAME}" msgstr "" -#: application/helpers/common_helper.php:1227 +#: application/helpers/common_helper.php:1231 msgid "Invitation to participate in a survey" msgstr "" -#: application/helpers/common_helper.php:1228 +#: application/helpers/common_helper.php:1232 msgid "" "Dear {FIRSTNAME},\n" "\n" @@ -6708,24 +6724,24 @@ msgid "" "{SURVEYURL}" msgstr "" -#: application/helpers/common_helper.php:1228 -#: application/helpers/common_helper.php:1230 +#: application/helpers/common_helper.php:1232 +#: application/helpers/common_helper.php:1234 msgid "" "If you do not want to participate in this survey and don't want to receive any more invitations please click the following link:\n" "{OPTOUTURL}" msgstr "" -#: application/helpers/common_helper.php:1228 +#: application/helpers/common_helper.php:1232 msgid "" "If you are blacklisted but want to participate in this survey and want to receive invitations please click the following link:\n" "{OPTINURL}" msgstr "" -#: application/helpers/common_helper.php:1229 +#: application/helpers/common_helper.php:1233 msgid "Reminder to participate in a survey" msgstr "" -#: application/helpers/common_helper.php:1230 +#: application/helpers/common_helper.php:1234 msgid "" "Dear {FIRSTNAME},\n" "\n" @@ -6749,11 +6765,11 @@ msgid "" "{SURVEYURL}" msgstr "" -#: application/helpers/common_helper.php:1231 +#: application/helpers/common_helper.php:1235 msgid "Survey registration confirmation" msgstr "" -#: application/helpers/common_helper.php:1232 +#: application/helpers/common_helper.php:1236 msgid "" "Dear {FIRSTNAME},\n" "\n" @@ -6766,78 +6782,78 @@ msgid "" "If you have any questions about this survey, or if you did not register to participate and believe this email is in error, please contact {ADMINNAME} at {ADMINEMAIL}." msgstr "" -#: application/helpers/common_helper.php:1785 +#: application/helpers/common_helper.php:1792 #: application/views/admin/export/statistics_subviews/_responseid.php:3 msgid "Response ID" msgstr "" -#: application/helpers/common_helper.php:1793 +#: application/helpers/common_helper.php:1800 msgid "Date submitted" msgstr "" -#: application/helpers/common_helper.php:1801 +#: application/helpers/common_helper.php:1808 msgid "Last page" msgstr "" -#: application/helpers/common_helper.php:1809 +#: application/helpers/common_helper.php:1816 msgid "Start language" msgstr "" -#: application/helpers/common_helper.php:1831 -#: application/helpers/common_helper.php:3743 application/models/Token.php:41 -#: application/models/TokenDynamic.php:609 +#: application/helpers/common_helper.php:1838 +#: application/helpers/common_helper.php:3758 application/models/Token.php:41 +#: application/models/TokenDynamic.php:612 #: application/views/admin/dataentry/caption_view.php:36 #: application/views/admin/participants/attributeMap_view.php:158 #: application/views/admin/token/browse.php:113 msgid "Token" msgstr "" -#: application/helpers/common_helper.php:1846 +#: application/helpers/common_helper.php:1853 msgid "Date started" msgstr "" -#: application/helpers/common_helper.php:1859 +#: application/helpers/common_helper.php:1866 msgid "Date last action" msgstr "" -#: application/helpers/common_helper.php:1875 +#: application/helpers/common_helper.php:1882 #: application/views/admin/dataentry/caption_view.php:85 #: application/views/admin/saved/savedlist_view.php:20 msgid "IP address" msgstr "" -#: application/helpers/common_helper.php:1886 +#: application/helpers/common_helper.php:1893 msgid "Referrer URL" msgstr "" -#: application/helpers/common_helper.php:2168 +#: application/helpers/common_helper.php:2175 msgid "Rank %s" msgstr "" -#: application/helpers/common_helper.php:2301 +#: application/helpers/common_helper.php:2308 msgid "Other comment" msgstr "" -#: application/helpers/common_helper.php:2411 +#: application/helpers/common_helper.php:2419 msgid "Group time" msgstr "" -#: application/helpers/common_helper.php:2418 +#: application/helpers/common_helper.php:2426 msgid "Question time" msgstr "" -#: application/helpers/common_helper.php:2691 +#: application/helpers/common_helper.php:2699 msgid "Email was not sent because demo-mode is activated." msgstr "" -#: application/helpers/common_helper.php:2833 +#: application/helpers/common_helper.php:2841 msgid "SMTP debug output:" msgstr "" -#: application/helpers/common_helper.php:3733 +#: application/helpers/common_helper.php:3748 #: application/models/Participant.php:223 -#: application/models/ParticipantShare.php:233 application/models/Token.php:39 -#: application/models/TokenDynamic.php:591 +#: application/models/ParticipantShare.php:234 application/models/Token.php:39 +#: application/models/TokenDynamic.php:594 #: application/views/admin/export/exportresults_view.php:340 #: application/views/admin/saved/savedlist_view.php:22 #: application/views/admin/templates/templateeditor_register_view.php:11 @@ -6845,278 +6861,278 @@ msgstr "" msgid "Email address" msgstr "" -#: application/helpers/common_helper.php:3738 application/models/Token.php:40 -#: application/models/TokenDynamic.php:600 +#: application/helpers/common_helper.php:3753 application/models/Token.php:40 +#: application/models/TokenDynamic.php:603 #: application/views/admin/token/browse.php:113 msgid "Email status" msgstr "" -#: application/helpers/common_helper.php:3748 application/models/Token.php:42 +#: application/helpers/common_helper.php:3763 application/models/Token.php:42 msgid "Language code" msgstr "" -#: application/helpers/common_helper.php:3753 application/models/Token.php:44 +#: application/helpers/common_helper.php:3768 application/models/Token.php:44 msgid "Invitation sent date" msgstr "" -#: application/helpers/common_helper.php:3758 application/models/Token.php:45 +#: application/helpers/common_helper.php:3773 application/models/Token.php:45 msgid "Last reminder sent date" msgstr "" -#: application/helpers/common_helper.php:3763 application/models/Token.php:46 +#: application/helpers/common_helper.php:3778 application/models/Token.php:46 msgid "Total numbers of sent reminders" msgstr "" -#: application/helpers/common_helper.php:3768 application/models/Token.php:48 -#: application/models/TokenDynamic.php:660 +#: application/helpers/common_helper.php:3783 application/models/Token.php:48 +#: application/models/TokenDynamic.php:663 #: application/views/admin/token/browse.php:113 msgid "Uses left" msgstr "" -#: application/helpers/common_helper.php:4688 +#: application/helpers/common_helper.php:4704 msgid "You are not allowed dump the database!" msgstr "" -#: application/helpers/common_helper.php:4693 +#: application/helpers/common_helper.php:4709 msgid "You are not allowed export a label set!" msgstr "" -#: application/helpers/common_helper.php:4698 +#: application/helpers/common_helper.php:4714 msgid "You are not allowed to change user data!" msgstr "" -#: application/helpers/common_helper.php:4703 +#: application/helpers/common_helper.php:4719 msgid "You are not allowed to create surveys!" msgstr "" -#: application/helpers/common_helper.php:4708 +#: application/helpers/common_helper.php:4724 msgid "You are not allowed to delete this survey!" msgstr "" -#: application/helpers/common_helper.php:4713 +#: application/helpers/common_helper.php:4729 msgid "You are not allowed to add new questions for this survey!" msgstr "" -#: application/helpers/common_helper.php:4718 +#: application/helpers/common_helper.php:4734 msgid "You are not allowed to activate this survey!" msgstr "" -#: application/helpers/common_helper.php:4723 +#: application/helpers/common_helper.php:4739 msgid "You are not allowed to stop this survey!" msgstr "" -#: application/helpers/common_helper.php:4728 +#: application/helpers/common_helper.php:4744 msgid "You are not allowed to add a group to this survey!" msgstr "" -#: application/helpers/common_helper.php:4734 +#: application/helpers/common_helper.php:4750 msgid "You are not allowed to order groups in this survey!" msgstr "" -#: application/helpers/common_helper.php:4740 +#: application/helpers/common_helper.php:4756 msgid "You are not allowed to edit this survey!" msgstr "" -#: application/helpers/common_helper.php:4745 +#: application/helpers/common_helper.php:4761 msgid "You are not allowed to edit groups in this survey!" msgstr "" -#: application/helpers/common_helper.php:4750 +#: application/helpers/common_helper.php:4766 msgid "You are not allowed to browse responses!" msgstr "" -#: application/helpers/common_helper.php:4755 +#: application/helpers/common_helper.php:4771 msgid "You are not allowed to set assessment rules!" msgstr "" -#: application/helpers/common_helper.php:4760 +#: application/helpers/common_helper.php:4776 msgid "You are not allowed to delete this group!" msgstr "" -#: application/helpers/common_helper.php:4765 +#: application/helpers/common_helper.php:4781 msgid "You are not allowed to import a survey!" msgstr "" -#: application/helpers/common_helper.php:4771 +#: application/helpers/common_helper.php:4787 msgid "You are not allowed to import a group!" msgstr "" -#: application/helpers/common_helper.php:4776 +#: application/helpers/common_helper.php:4792 msgid "You are not allowed to to import a question!" msgstr "" -#: application/helpers/common_helper.php:4785 -#: application/helpers/common_helper.php:4790 +#: application/helpers/common_helper.php:4801 +#: application/helpers/common_helper.php:4806 msgid "Security alert" msgstr "" -#: application/helpers/common_helper.php:4785 -#: application/helpers/common_helper.php:4790 +#: application/helpers/common_helper.php:4801 +#: application/helpers/common_helper.php:4806 msgid "Someone may be trying to use your LimeSurvey session (CSRF attack suspected). If you just clicked on a malicious link, please report this to your system administrator." msgstr "" -#: application/helpers/common_helper.php:4785 -#: application/helpers/common_helper.php:4790 +#: application/helpers/common_helper.php:4801 +#: application/helpers/common_helper.php:4806 msgid "Also this problem can occur when you are working/editing in LimeSurvey in several browser windows/tabs at the same time." msgstr "" -#: application/helpers/common_helper.php:4795 +#: application/helpers/common_helper.php:4811 msgid "You are not allowed to perform this operation!" msgstr "" -#: application/helpers/common_helper.php:5549 +#: application/helpers/common_helper.php:5565 msgid "SQL command failed: %s" msgstr "" -#: application/helpers/common_helper.php:5993 +#: application/helpers/common_helper.php:6012 msgid "ARMSCII-8 Armenian" msgstr "" -#: application/helpers/common_helper.php:5994 +#: application/helpers/common_helper.php:6013 msgid "US ASCII" msgstr "" -#: application/helpers/common_helper.php:5995 +#: application/helpers/common_helper.php:6014 msgid "Big5 Traditional Chinese" msgstr "" -#: application/helpers/common_helper.php:5996 +#: application/helpers/common_helper.php:6015 msgid "Binary pseudo charset" msgstr "" -#: application/helpers/common_helper.php:5997 +#: application/helpers/common_helper.php:6016 msgid "Windows Central European (Windows-1250)" msgstr "" -#: application/helpers/common_helper.php:5998 +#: application/helpers/common_helper.php:6017 msgid "Windows Cyrillic (Windows-1251)" msgstr "" -#: application/helpers/common_helper.php:5999 +#: application/helpers/common_helper.php:6018 msgid "Windows Arabic (Windows-1256)" msgstr "" -#: application/helpers/common_helper.php:6000 +#: application/helpers/common_helper.php:6019 msgid "Windows Baltic (Windows-1257)" msgstr "" -#: application/helpers/common_helper.php:6001 +#: application/helpers/common_helper.php:6020 msgid "DOS West European (cp850)" msgstr "" -#: application/helpers/common_helper.php:6002 +#: application/helpers/common_helper.php:6021 msgid "DOS Central European (cp852)" msgstr "" -#: application/helpers/common_helper.php:6003 +#: application/helpers/common_helper.php:6022 msgid "DOS Cyrillic (cp866)" msgstr "" -#: application/helpers/common_helper.php:6004 +#: application/helpers/common_helper.php:6023 msgid "Windows-31J - SJIS for Windows Japanese (cp932)" msgstr "" -#: application/helpers/common_helper.php:6005 +#: application/helpers/common_helper.php:6024 msgid "DEC West European" msgstr "" -#: application/helpers/common_helper.php:6006 +#: application/helpers/common_helper.php:6025 msgid "UJIS for Windows Japanese" msgstr "" -#: application/helpers/common_helper.php:6007 +#: application/helpers/common_helper.php:6026 msgid "EUC-KR Korean" msgstr "" -#: application/helpers/common_helper.php:6008 +#: application/helpers/common_helper.php:6027 msgid "GB2312 Simplified Chinese" msgstr "" -#: application/helpers/common_helper.php:6009 +#: application/helpers/common_helper.php:6028 msgid "GBK Simplified Chinese" msgstr "" -#: application/helpers/common_helper.php:6010 +#: application/helpers/common_helper.php:6029 msgid "GEOSTD8 Georgian" msgstr "" -#: application/helpers/common_helper.php:6011 +#: application/helpers/common_helper.php:6030 msgid "ISO 8859-7 Greek" msgstr "" -#: application/helpers/common_helper.php:6012 +#: application/helpers/common_helper.php:6031 msgid "ISO 8859-8 Hebrew" msgstr "" -#: application/helpers/common_helper.php:6013 +#: application/helpers/common_helper.php:6032 msgid "HP West European" msgstr "" -#: application/helpers/common_helper.php:6014 +#: application/helpers/common_helper.php:6033 msgid "DOS Kamenicky Czech-Slovak (cp895)" msgstr "" -#: application/helpers/common_helper.php:6015 +#: application/helpers/common_helper.php:6034 msgid "KOI8-R Relcom Russian" msgstr "" -#: application/helpers/common_helper.php:6016 +#: application/helpers/common_helper.php:6035 msgid "KOI8-U Ukrainian" msgstr "" -#: application/helpers/common_helper.php:6017 +#: application/helpers/common_helper.php:6036 msgid "ISO 8859-1 West European (latin1)" msgstr "" -#: application/helpers/common_helper.php:6018 +#: application/helpers/common_helper.php:6037 msgid "ISO 8859-2 Central European (latin2)" msgstr "" -#: application/helpers/common_helper.php:6019 +#: application/helpers/common_helper.php:6038 msgid "ISO 8859-9 Turkish (latin5)" msgstr "" -#: application/helpers/common_helper.php:6020 +#: application/helpers/common_helper.php:6039 msgid "ISO 8859-13 Baltic (latin7)" msgstr "" -#: application/helpers/common_helper.php:6021 +#: application/helpers/common_helper.php:6040 msgid "Mac Central European" msgstr "" -#: application/helpers/common_helper.php:6022 +#: application/helpers/common_helper.php:6041 msgid "Mac West European" msgstr "" -#: application/helpers/common_helper.php:6023 +#: application/helpers/common_helper.php:6042 msgid "Shift-JIS Japanese" msgstr "" -#: application/helpers/common_helper.php:6024 +#: application/helpers/common_helper.php:6043 msgid "7bit Swedish" msgstr "" -#: application/helpers/common_helper.php:6025 +#: application/helpers/common_helper.php:6044 msgid "TIS620 Thai" msgstr "" -#: application/helpers/common_helper.php:6026 +#: application/helpers/common_helper.php:6045 msgid "UCS-2 Unicode" msgstr "" -#: application/helpers/common_helper.php:6027 +#: application/helpers/common_helper.php:6046 msgid "EUC-JP Japanese" msgstr "" -#: application/helpers/common_helper.php:6028 +#: application/helpers/common_helper.php:6047 msgid "UTF-8 Unicode" msgstr "" -#: application/helpers/common_helper.php:6032 +#: application/helpers/common_helper.php:6051 msgid "(Automatic)" msgstr "" -#: application/helpers/export_helper.php:1284 +#: application/helpers/export_helper.php:1285 msgid "Only answer the following question if:" msgstr "" @@ -7468,7 +7484,7 @@ msgid "Poorly terminated expression - expected a constant or variable" msgstr "" #: application/helpers/expressions/em_core_helper.php:600 -#: application/helpers/expressions/em_core_helper.php:1717 +#: application/helpers/expressions/em_core_helper.php:1721 msgid "Undefined variable" msgstr "" @@ -7493,7 +7509,7 @@ msgid "Extra token found after expressions" msgstr "" #: application/helpers/expressions/em_core_helper.php:779 -#: application/helpers/expressions/em_core_helper.php:1710 +#: application/helpers/expressions/em_core_helper.php:1714 msgid "Undefined function" msgstr "" @@ -7509,35 +7525,35 @@ msgstr "" msgid "Expected right parentheses" msgstr "" -#: application/helpers/expressions/em_core_helper.php:1701 +#: application/helpers/expressions/em_core_helper.php:1705 msgid "Extra right parentheses detected" msgstr "" -#: application/helpers/expressions/em_core_helper.php:1722 +#: application/helpers/expressions/em_core_helper.php:1726 msgid "Unsupported syntax" msgstr "" -#: application/helpers/expressions/em_core_helper.php:1730 +#: application/helpers/expressions/em_core_helper.php:1734 msgid "Missing %s closing right parentheses" msgstr "" -#: application/helpers/expressions/em_core_helper.php:2110 +#: application/helpers/expressions/em_core_helper.php:2113 msgid "Unsupported number of arguments: %s" msgstr "" -#: application/helpers/expressions/em_core_helper.php:2115 +#: application/helpers/expressions/em_core_helper.php:2118 msgid "Function does not support %s arguments" msgstr "" -#: application/helpers/expressions/em_core_helper.php:2116 +#: application/helpers/expressions/em_core_helper.php:2119 msgid "Function supports this many arguments, where -1=unlimited: %s" msgstr "" -#: application/helpers/expressions/em_core_helper.php:2361 +#: application/helpers/expressions/em_core_helper.php:2364 msgid "Tried to pop value off of empty stack" msgstr "" -#: application/helpers/expressions/em_core_helper.php:2952 +#: application/helpers/expressions/em_core_helper.php:2955 msgid "Invalid PERL Regular Expression: %s" msgstr "" @@ -7737,7 +7753,7 @@ msgid "Only integer values may be entered in these fields." msgstr "" #: application/helpers/expressions/em_manager_helper.php:3347 -#: application/helpers/expressions/em_manager_helper.php:6414 +#: application/helpers/expressions/em_manager_helper.php:6413 msgid "If you choose '%s' please also specify your choice in the accompanying text field." msgstr "" @@ -7749,74 +7765,74 @@ msgstr "" msgid "Please check the format of your answer." msgstr "" -#: application/helpers/expressions/em_manager_helper.php:5349 +#: application/helpers/expressions/em_manager_helper.php:5348 msgid "Unable to insert record into survey table" msgstr "" -#: application/helpers/expressions/em_manager_helper.php:5451 +#: application/helpers/expressions/em_manager_helper.php:5450 msgid "Error in SQL update" msgstr "" -#: application/helpers/expressions/em_manager_helper.php:6384 +#: application/helpers/expressions/em_manager_helper.php:6383 msgid "This question is mandatory" msgstr "" -#: application/helpers/expressions/em_manager_helper.php:6399 +#: application/helpers/expressions/em_manager_helper.php:6398 msgid "Please check at least one item." msgstr "" -#: application/helpers/expressions/em_manager_helper.php:6440 -#: application/helpers/expressions/em_manager_helper.php:6484 +#: application/helpers/expressions/em_manager_helper.php:6439 +#: application/helpers/expressions/em_manager_helper.php:6483 msgid "Please complete all parts" msgstr "" -#: application/helpers/expressions/em_manager_helper.php:6472 +#: application/helpers/expressions/em_manager_helper.php:6471 msgid "Please check at least one box per row" msgstr "" -#: application/helpers/expressions/em_manager_helper.php:6495 +#: application/helpers/expressions/em_manager_helper.php:6494 msgid "Please rank all items" msgstr "" -#: application/helpers/expressions/em_manager_helper.php:9189 +#: application/helpers/expressions/em_manager_helper.php:9204 msgid "Invalid question - probably missing sub-questions or language-specific settings for language %s" msgstr "" -#: application/helpers/expressions/em_manager_helper.php:9195 +#: application/helpers/expressions/em_manager_helper.php:9210 msgid "Logic File for Survey # " msgstr "" -#: application/helpers/expressions/em_manager_helper.php:9212 +#: application/helpers/expressions/em_manager_helper.php:9227 #: application/views/admin/survey/editLocalSettings_view.php:37 #: application/views/admin/survey/surveySummary_view.php:391 msgid "Welcome:" msgstr "" -#: application/helpers/expressions/em_manager_helper.php:9226 +#: application/helpers/expressions/em_manager_helper.php:9241 #: application/views/admin/survey/editLocalSettings_view.php:55 #: application/views/admin/survey/subview/accordion/_generaloptions_panel.php:142 #: application/views/admin/survey/surveySummary_view.php:359 msgid "End URL:" msgstr "" -#: application/helpers/expressions/em_manager_helper.php:9230 +#: application/helpers/expressions/em_manager_helper.php:9245 msgid "Name [ID]" msgstr "" -#: application/helpers/expressions/em_manager_helper.php:9230 +#: application/helpers/expressions/em_manager_helper.php:9245 msgid "Relevance [Validation] (Default value)" msgstr "" -#: application/helpers/expressions/em_manager_helper.php:9230 +#: application/helpers/expressions/em_manager_helper.php:9245 msgid "Text [Help] (Tip)" msgstr "" -#: application/helpers/expressions/em_manager_helper.php:9288 -#: application/helpers/expressions/em_manager_helper.php:9572 +#: application/helpers/expressions/em_manager_helper.php:9303 +#: application/helpers/expressions/em_manager_helper.php:9587 msgid "Default:" msgstr "" -#: application/helpers/expressions/em_manager_helper.php:9312 +#: application/helpers/expressions/em_manager_helper.php:9327 #: application/views/admin/survey/Question/question_subviews/_tabs.php:54 #: application/views/admin/survey/Question/question_subviews/_tabs.php:58 #: application/views/admin/survey/Question/question_subviews/_tabs.php:80 @@ -7827,43 +7843,43 @@ msgstr "" msgid "Help:" msgstr "" -#: application/helpers/expressions/em_manager_helper.php:9314 +#: application/helpers/expressions/em_manager_helper.php:9329 msgid "Tip:" msgstr "" -#: application/helpers/expressions/em_manager_helper.php:9332 +#: application/helpers/expressions/em_manager_helper.php:9347 msgid "Question attribute" msgstr "" -#: application/helpers/expressions/em_manager_helper.php:9332 +#: application/helpers/expressions/em_manager_helper.php:9347 msgid "Value" msgstr "" -#: application/helpers/expressions/em_manager_helper.php:9467 +#: application/helpers/expressions/em_manager_helper.php:9482 msgid "This variable name has already been used." msgstr "" -#: application/helpers/expressions/em_manager_helper.php:9479 +#: application/helpers/expressions/em_manager_helper.php:9494 msgid "Starting in 2.05, variable names should only contain letters and numbers; and may not start with a number. This variable name is deprecated." msgstr "" -#: application/helpers/expressions/em_manager_helper.php:9641 +#: application/helpers/expressions/em_manager_helper.php:9656 msgid "This question has at least {n} error.|This question has at least {n} errors." msgstr "" -#: application/helpers/expressions/em_manager_helper.php:9679 +#: application/helpers/expressions/em_manager_helper.php:9694 msgid "{n} question contains errors that need to be corrected.|{n} questions contain errors that need to be corrected." msgstr "" -#: application/helpers/expressions/em_manager_helper.php:9685 +#: application/helpers/expressions/em_manager_helper.php:9700 msgid "No syntax errors detected in this survey." msgstr "" -#: application/helpers/expressions/em_manager_helper.php:9688 +#: application/helpers/expressions/em_manager_helper.php:9703 msgid "This group, by itself, does not contain any syntax errors." msgstr "" -#: application/helpers/expressions/em_manager_helper.php:9691 +#: application/helpers/expressions/em_manager_helper.php:9706 msgid "This question, by itself, does not contain any syntax errors." msgstr "" @@ -7924,19 +7940,19 @@ msgstr "" msgid "Try to submit again" msgstr "" -#: application/helpers/frontend_helper.php:1554 +#: application/helpers/frontend_helper.php:1556 msgid "The token you have provided is either not valid, or has already been used." msgstr "" -#: application/helpers/frontend_helper.php:1711 +#: application/helpers/frontend_helper.php:1713 msgid "This survey cannot be tested or completed for the following reason(s):" msgstr "" -#: application/helpers/frontend_helper.php:1714 +#: application/helpers/frontend_helper.php:1716 msgid "There are no questions in this survey." msgstr "" -#: application/helpers/frontend_helper.php:1717 +#: application/helpers/frontend_helper.php:1719 msgid "There are empty question groups in this survey - please create at least one question within a question group." msgstr "" @@ -7968,144 +7984,144 @@ msgstr "" msgid "One or more file have either exceeded the filesize/are not in the right format or the minimum number of required files have not been uploaded. You cannot proceed until these have been completed" msgstr "" -#: application/helpers/qanda_helper.php:572 +#: application/helpers/qanda_helper.php:575 msgid "Your time to answer this question has expired" msgstr "" -#: application/helpers/qanda_helper.php:575 +#: application/helpers/qanda_helper.php:578 msgid "Time remaining" msgstr "" -#: application/helpers/qanda_helper.php:576 -#: application/helpers/qanda_helper.php:582 +#: application/helpers/qanda_helper.php:579 +#: application/helpers/qanda_helper.php:585 msgid "Your time to answer this question has nearly expired. You have {TIME} remaining." msgstr "" -#: application/helpers/qanda_helper.php:907 +#: application/helpers/qanda_helper.php:917 msgid "Date entered is invalid!" msgstr "" -#: application/helpers/qanda_helper.php:1012 +#: application/helpers/qanda_helper.php:1022 msgid "Jan" msgstr "" -#: application/helpers/qanda_helper.php:1013 +#: application/helpers/qanda_helper.php:1023 msgid "Feb" msgstr "" -#: application/helpers/qanda_helper.php:1014 +#: application/helpers/qanda_helper.php:1024 msgid "Mar" msgstr "" -#: application/helpers/qanda_helper.php:1015 +#: application/helpers/qanda_helper.php:1025 msgid "Apr" msgstr "" -#: application/helpers/qanda_helper.php:1016 -#: application/helpers/qanda_helper.php:1031 +#: application/helpers/qanda_helper.php:1026 +#: application/helpers/qanda_helper.php:1041 msgid "May" msgstr "" -#: application/helpers/qanda_helper.php:1017 +#: application/helpers/qanda_helper.php:1027 msgid "Jun" msgstr "" -#: application/helpers/qanda_helper.php:1018 +#: application/helpers/qanda_helper.php:1028 msgid "Jul" msgstr "" -#: application/helpers/qanda_helper.php:1019 +#: application/helpers/qanda_helper.php:1029 msgid "Aug" msgstr "" -#: application/helpers/qanda_helper.php:1020 +#: application/helpers/qanda_helper.php:1030 msgid "Sep" msgstr "" -#: application/helpers/qanda_helper.php:1021 +#: application/helpers/qanda_helper.php:1031 msgid "Oct" msgstr "" -#: application/helpers/qanda_helper.php:1022 +#: application/helpers/qanda_helper.php:1032 msgid "Nov" msgstr "" -#: application/helpers/qanda_helper.php:1023 +#: application/helpers/qanda_helper.php:1033 msgid "Dec" msgstr "" -#: application/helpers/qanda_helper.php:1027 +#: application/helpers/qanda_helper.php:1037 msgid "January" msgstr "" -#: application/helpers/qanda_helper.php:1028 +#: application/helpers/qanda_helper.php:1038 msgid "February" msgstr "" -#: application/helpers/qanda_helper.php:1029 +#: application/helpers/qanda_helper.php:1039 msgid "March" msgstr "" -#: application/helpers/qanda_helper.php:1030 +#: application/helpers/qanda_helper.php:1040 msgid "April" msgstr "" -#: application/helpers/qanda_helper.php:1032 +#: application/helpers/qanda_helper.php:1042 msgid "June" msgstr "" -#: application/helpers/qanda_helper.php:1033 +#: application/helpers/qanda_helper.php:1043 msgid "July" msgstr "" -#: application/helpers/qanda_helper.php:1034 +#: application/helpers/qanda_helper.php:1044 msgid "August" msgstr "" -#: application/helpers/qanda_helper.php:1035 +#: application/helpers/qanda_helper.php:1045 msgid "September" msgstr "" -#: application/helpers/qanda_helper.php:1036 +#: application/helpers/qanda_helper.php:1046 msgid "October" msgstr "" -#: application/helpers/qanda_helper.php:1037 +#: application/helpers/qanda_helper.php:1047 msgid "November" msgstr "" -#: application/helpers/qanda_helper.php:1038 +#: application/helpers/qanda_helper.php:1048 msgid "December" msgstr "" -#: application/helpers/qanda_helper.php:1730 +#: application/helpers/qanda_helper.php:1740 msgid "Please enter your comment here" msgstr "" -#: application/helpers/qanda_helper.php:1954 +#: application/helpers/qanda_helper.php:1964 msgid "Choice of rank %s" msgstr "" -#: application/helpers/qanda_helper.php:2025 +#: application/helpers/qanda_helper.php:2035 msgid "Double-click or drag-and-drop items in the left list to move them to the right - your highest ranking item should be on the top right, moving through to your lowest ranking item." msgstr "" -#: application/helpers/qanda_helper.php:2539 +#: application/helpers/qanda_helper.php:2549 msgid "Upload your files" msgstr "" -#: application/helpers/qanda_helper.php:2540 +#: application/helpers/qanda_helper.php:2550 #: application/helpers/replacements_helper.php:432 #: application/views/admin/survey/activateSurvey_view.php:36 msgid "Return to survey" msgstr "" -#: application/helpers/qanda_helper.php:2638 +#: application/helpers/qanda_helper.php:2648 msgid "Upload file|Upload files" msgstr "" -#: application/helpers/qanda_helper.php:3450 -#: application/helpers/qanda_helper.php:3530 +#: application/helpers/qanda_helper.php:3460 +#: application/helpers/qanda_helper.php:3540 #: application/views/admin/templates/templateeditor_printoutput_view.php:3 #: application/views/survey/questions/longfreetext/answer.php:19 #: application/views/survey/questions/numerical/answer.php:22 @@ -8113,117 +8129,117 @@ msgstr "" msgid "Your answer" msgstr "" -#: application/helpers/qanda_helper.php:3524 +#: application/helpers/qanda_helper.php:3534 msgid "Drag and drop the pin to the desired location. You may also right click on the map to move the pin." msgstr "" -#: application/helpers/qanda_helper.php:3594 +#: application/helpers/qanda_helper.php:3604 msgid "Click to set the location or drag and drop the pin. You may may also enter coordinates" msgstr "" -#: application/helpers/qanda_helper.php:3932 +#: application/helpers/qanda_helper.php:3942 msgid "A table with a subquestion on each row. The answer options are values from 1 to 5 and are contained in the table header." msgstr "" -#: application/helpers/qanda_helper.php:4136 +#: application/helpers/qanda_helper.php:4146 msgid "A table with a subquestion on each row. The answers are values from 1 to 10 and are contained in the table header." msgstr "" -#: application/helpers/qanda_helper.php:4155 -#: application/helpers/qanda_helper.php:4297 -#: application/helpers/qanda_helper.php:4408 -#: application/helpers/qanda_helper.php:4583 -#: application/helpers/qanda_helper.php:5922 +#: application/helpers/qanda_helper.php:4165 +#: application/helpers/qanda_helper.php:4307 +#: application/helpers/qanda_helper.php:4418 +#: application/helpers/qanda_helper.php:4593 +#: application/helpers/qanda_helper.php:5932 msgid "The last cell is for 'No answer'." msgstr "" -#: application/helpers/qanda_helper.php:4284 +#: application/helpers/qanda_helper.php:4294 msgid "A table with a subquestion on each row. The answers are 'Yes', 'No', and 'Uncertain' and are in the table header." msgstr "" -#: application/helpers/qanda_helper.php:4397 +#: application/helpers/qanda_helper.php:4407 msgid "A table with a subquestion on each row. The answers are 'Increase', 'Same', 'Decrease' and are contained in the table header." msgstr "" -#: application/helpers/qanda_helper.php:4518 +#: application/helpers/qanda_helper.php:4528 msgid "A table with a subquestion on each row. You have to select your answer." msgstr "" -#: application/helpers/qanda_helper.php:4523 +#: application/helpers/qanda_helper.php:4533 msgid "A table with a subquestion on each row. The answer options are contained in the table header." msgstr "" -#: application/helpers/qanda_helper.php:4578 +#: application/helpers/qanda_helper.php:4588 msgid "After the answer options a cell does give some information." msgstr "" -#: application/helpers/qanda_helper.php:4894 +#: application/helpers/qanda_helper.php:4904 msgid "A table of subquestions on each cell. The subquestion texts are in the column header and relate the particular row header." msgstr "" -#: application/helpers/qanda_helper.php:4955 +#: application/helpers/qanda_helper.php:4965 msgid "Each answer may only be a number." msgstr "" -#: application/helpers/qanda_helper.php:4967 -#: application/helpers/qanda_helper.php:4983 +#: application/helpers/qanda_helper.php:4977 +#: application/helpers/qanda_helper.php:4993 msgid "Grand total" msgstr "" -#: application/helpers/qanda_helper.php:4972 +#: application/helpers/qanda_helper.php:4982 msgid "The last row shows the total for the column." msgstr "" -#: application/helpers/qanda_helper.php:4986 +#: application/helpers/qanda_helper.php:4996 msgid "The last column shows the total for the row." msgstr "" -#: application/helpers/qanda_helper.php:5005 +#: application/helpers/qanda_helper.php:5015 msgid "The last row shows the total for the column and the last column shows the total for the row." msgstr "" -#: application/helpers/qanda_helper.php:5068 -#: application/helpers/qanda_helper.php:5424 +#: application/helpers/qanda_helper.php:5078 +#: application/helpers/qanda_helper.php:5434 msgid "The last cell gives some information." msgstr "" -#: application/helpers/qanda_helper.php:5272 +#: application/helpers/qanda_helper.php:5282 msgid "A table of subquestions on each cell. The subquestion texts are in the colum header and concern the row header." msgstr "" -#: application/helpers/qanda_helper.php:5339 +#: application/helpers/qanda_helper.php:5349 msgid "Please check the matching combinations." msgstr "" -#: application/helpers/qanda_helper.php:5347 +#: application/helpers/qanda_helper.php:5357 msgid "Please enter only numbers." msgstr "" -#: application/helpers/qanda_helper.php:5353 +#: application/helpers/qanda_helper.php:5363 msgid "Please select an answer for each combination." msgstr "" -#: application/helpers/qanda_helper.php:5666 +#: application/helpers/qanda_helper.php:5676 msgid "A table with subquestions on each column. The subquestions texts are on the column header, the answer options are in row headers." msgstr "" -#: application/helpers/qanda_helper.php:5793 +#: application/helpers/qanda_helper.php:5803 msgid "Error: There are no answers defined for this question." msgstr "" -#: application/helpers/qanda_helper.php:5799 -#: application/helpers/qanda_helper.php:6227 +#: application/helpers/qanda_helper.php:5809 +#: application/helpers/qanda_helper.php:6237 #: application/views/survey/questions/arrays/array/dropdown/empty.php:3 #: application/views/survey/questions/arrays/multiflexi/empty_error.php:2 #: application/views/survey/questions/arrays/texts/empty_error.php:2 msgid "Error: There are no answer options for this question and/or they don't exist in this language." msgstr "" -#: application/helpers/qanda_helper.php:5851 +#: application/helpers/qanda_helper.php:5861 msgid "A table with a subquestion on each row, with two answers to provide on each line. Please select the answers." msgstr "" -#: application/helpers/qanda_helper.php:5859 +#: application/helpers/qanda_helper.php:5869 msgid "A table with one subquestion on each row and two answers to provide on each row. The related answer options are in the top table header row." msgstr "" @@ -8480,7 +8496,7 @@ msgid "Final equation to set in database, defaults to question text." msgstr "" #: application/helpers/questionHelper.php:249 -#: application/models/Question.php:635 +#: application/models/Question.php:634 msgid "Equation" msgstr "" @@ -10106,39 +10122,39 @@ msgstr "" msgid "The database has been updated from version %s to version %s." msgstr "" -#: application/helpers/update/updatedb_helper.php:2785 +#: application/helpers/update/updatedb_helper.php:2798 msgid "Some user templates can not be updated, please add the placeholder {TEMPLATEJS} in your startpage.pstpl manually." msgstr "" -#: application/helpers/update/updatedb_helper.php:2787 +#: application/helpers/update/updatedb_helper.php:2800 msgid "Template(s) to be verified :" msgstr "" -#: application/helpers/update/updatedb_helper.php:2793 +#: application/helpers/update/updatedb_helper.php:2806 msgid "All %s user templates updated." msgstr "" -#: application/helpers/userstatistics_helper.php:2769 +#: application/helpers/userstatistics_helper.php:2771 msgid "Disable chart" msgstr "" -#: application/helpers/userstatistics_helper.php:2770 +#: application/helpers/userstatistics_helper.php:2772 msgid "Enable chart" msgstr "" -#: application/helpers/userstatistics_helper.php:2771 +#: application/helpers/userstatistics_helper.php:2773 msgid "Display as bar chart" msgstr "" -#: application/helpers/userstatistics_helper.php:2772 +#: application/helpers/userstatistics_helper.php:2774 msgid "Display as pie chart" msgstr "" -#: application/helpers/userstatistics_helper.php:2773 +#: application/helpers/userstatistics_helper.php:2775 msgid "Disable map display" msgstr "" -#: application/helpers/userstatistics_helper.php:2774 +#: application/helpers/userstatistics_helper.php:2776 msgid "Enable map display" msgstr "" @@ -10199,7 +10215,7 @@ msgstr "" msgid "Section" msgstr "" -#: application/models/AdminTheme.php:441 +#: application/models/AdminTheme.php:447 msgid "This is the LimeSurvey admin interface. Start to build your survey from here." msgstr "" @@ -10229,8 +10245,8 @@ msgstr "" msgid "Only Superadmin" msgstr "" -#: application/models/Boxes.php:117 application/models/ParticipantShare.php:107 -#: application/models/ParticipantShare.php:126 +#: application/models/Boxes.php:117 application/models/ParticipantShare.php:108 +#: application/models/ParticipantShare.php:127 #: application/views/admin/homepagesettings/_form.php:138 msgid "Everybody" msgstr "" @@ -10304,7 +10320,7 @@ msgstr "" #: application/models/Participant.php:224 #: application/models/QuestionGroup.php:76 -#: application/models/TokenDynamic.php:617 +#: application/models/TokenDynamic.php:620 #: application/views/admin/authentication/ajaxLogin.php:80 #: application/views/admin/authentication/login.php:91 #: application/views/admin/globalSettings_view.php:18 @@ -10365,16 +10381,16 @@ msgstr "" msgid "Text box" msgstr "" -#: application/models/ParticipantShare.php:239 +#: application/models/ParticipantShare.php:240 msgid "Shared by" msgstr "" -#: application/models/ParticipantShare.php:249 +#: application/models/ParticipantShare.php:250 #: application/models/SurveyLink.php:241 msgid "Date added" msgstr "" -#: application/models/ParticipantShare.php:254 +#: application/models/ParticipantShare.php:255 msgid "Can edit?" msgstr "" @@ -10573,165 +10589,165 @@ msgstr "" msgid "Subquestion codes may only contain alphanumeric characters." msgstr "" -#: application/models/Question.php:439 +#: application/models/Question.php:438 msgid "Array dual scale" msgstr "" -#: application/models/Question.php:440 application/models/Question.php:454 -#: application/models/Question.php:461 application/models/Question.php:468 -#: application/models/Question.php:482 application/models/Question.php:489 -#: application/models/Question.php:503 application/models/Question.php:615 -#: application/models/Question.php:622 +#: application/models/Question.php:439 application/models/Question.php:453 +#: application/models/Question.php:460 application/models/Question.php:467 +#: application/models/Question.php:481 application/models/Question.php:488 +#: application/models/Question.php:502 application/models/Question.php:614 +#: application/models/Question.php:621 msgid "Arrays" msgstr "" -#: application/models/Question.php:446 +#: application/models/Question.php:445 msgid "5 Point Choice" msgstr "" -#: application/models/Question.php:447 application/models/Question.php:524 -#: application/models/Question.php:545 application/models/Question.php:608 +#: application/models/Question.php:446 application/models/Question.php:523 +#: application/models/Question.php:544 application/models/Question.php:607 msgid "Single choice questions" msgstr "" -#: application/models/Question.php:453 +#: application/models/Question.php:452 msgid "Array (5 Point Choice)" msgstr "" -#: application/models/Question.php:460 +#: application/models/Question.php:459 msgid "Array (10 Point Choice)" msgstr "" -#: application/models/Question.php:467 +#: application/models/Question.php:466 msgid "Array (Yes/No/Uncertain)" msgstr "" -#: application/models/Question.php:474 +#: application/models/Question.php:473 msgid "Date/Time" msgstr "" -#: application/models/Question.php:475 application/models/Question.php:496 -#: application/models/Question.php:510 application/models/Question.php:517 -#: application/models/Question.php:538 application/models/Question.php:566 -#: application/models/Question.php:594 application/models/Question.php:601 -#: application/models/Question.php:629 application/models/Question.php:636 +#: application/models/Question.php:474 application/models/Question.php:495 +#: application/models/Question.php:509 application/models/Question.php:516 +#: application/models/Question.php:537 application/models/Question.php:565 +#: application/models/Question.php:593 application/models/Question.php:600 +#: application/models/Question.php:628 application/models/Question.php:635 msgid "Mask questions" msgstr "" -#: application/models/Question.php:481 +#: application/models/Question.php:480 msgid "Array (Increase/Same/Decrease)" msgstr "" -#: application/models/Question.php:488 +#: application/models/Question.php:487 msgid "Array" msgstr "" -#: application/models/Question.php:495 +#: application/models/Question.php:494 msgid "Gender" msgstr "" -#: application/models/Question.php:502 +#: application/models/Question.php:501 msgid "Array by column" msgstr "" -#: application/models/Question.php:509 +#: application/models/Question.php:508 msgid "Language Switch" msgstr "" -#: application/models/Question.php:516 +#: application/models/Question.php:515 msgid "Multiple Numerical Input" msgstr "" -#: application/models/Question.php:523 +#: application/models/Question.php:522 msgid "List (Radio)" msgstr "" -#: application/models/Question.php:530 +#: application/models/Question.php:529 msgid "Multiple choice" msgstr "" -#: application/models/Question.php:531 application/models/Question.php:552 +#: application/models/Question.php:530 application/models/Question.php:551 msgid "Multiple choice questions" msgstr "" -#: application/models/Question.php:537 +#: application/models/Question.php:536 msgid "Numerical Input" msgstr "" -#: application/models/Question.php:544 +#: application/models/Question.php:543 msgid "List with comment" msgstr "" -#: application/models/Question.php:551 +#: application/models/Question.php:550 msgid "Multiple choice with comments" msgstr "" -#: application/models/Question.php:558 +#: application/models/Question.php:557 msgid "Multiple Short Text" msgstr "" -#: application/models/Question.php:559 application/models/Question.php:573 -#: application/models/Question.php:580 application/models/Question.php:587 +#: application/models/Question.php:558 application/models/Question.php:572 +#: application/models/Question.php:579 application/models/Question.php:586 msgid "Text questions" msgstr "" -#: application/models/Question.php:572 +#: application/models/Question.php:571 msgid "Short Free Text" msgstr "" -#: application/models/Question.php:579 +#: application/models/Question.php:578 msgid "Long Free Text" msgstr "" -#: application/models/Question.php:586 +#: application/models/Question.php:585 msgid "Huge Free Text" msgstr "" -#: application/models/Question.php:593 +#: application/models/Question.php:592 msgid "Text display" msgstr "" -#: application/models/Question.php:600 +#: application/models/Question.php:599 msgid "Yes/No" msgstr "" -#: application/models/Question.php:607 +#: application/models/Question.php:606 msgid "List (Dropdown)" msgstr "" -#: application/models/Question.php:614 +#: application/models/Question.php:613 msgid "Array (Numbers)" msgstr "" -#: application/models/Question.php:621 +#: application/models/Question.php:620 msgid "Array (Texts)" msgstr "" -#: application/models/Question.php:628 +#: application/models/Question.php:627 msgid "File upload" msgstr "" -#: application/models/Question.php:717 +#: application/models/Question.php:716 #: application/views/admin/survey/Question/listquestions.php:176 msgid "Question preview" msgstr "" -#: application/models/Question.php:721 +#: application/models/Question.php:720 #: application/views/admin/survey/Question/editQuestion_view.php:17 #: application/views/admin/survey/Question/editQuestion_view.php:33 msgid "Edit question" msgstr "" -#: application/models/Question.php:726 +#: application/models/Question.php:725 #: application/views/admin/survey/Question/question_view.php:3 msgid "Question summary" msgstr "" -#: application/models/Question.php:734 +#: application/models/Question.php:733 msgid "Deleting will also delete any answer options and subquestions it includes. Are you sure you want to continue?" msgstr "" -#: application/models/Question.php:814 application/models/Question.php:828 +#: application/models/Question.php:813 application/models/Question.php:827 msgid "Not relevant for this question type" msgstr "" @@ -10802,14 +10818,14 @@ msgid "Add new group" msgstr "" #: application/models/SurveyDynamic.php:284 -#: application/models/SurveyTimingDynamic.php:195 -#: application/models/TokenDynamic.php:727 +#: application/models/SurveyTimingDynamic.php:194 +#: application/models/TokenDynamic.php:730 #: application/views/admin/responses/browseallrow_view.php:5 msgid "View response details" msgstr "" #: application/models/SurveyDynamic.php:289 -#: application/models/SurveyTimingDynamic.php:201 +#: application/models/SurveyTimingDynamic.php:200 #: application/views/admin/responses/browseallrow_view.php:10 msgid "Edit this response" msgstr "" @@ -10823,8 +10839,8 @@ msgstr "" msgid "Delete response %s" msgstr "" -#: application/models/SurveyDynamic.php:531 -#: application/models/TokenDynamic.php:782 +#: application/models/SurveyDynamic.php:534 +#: application/models/TokenDynamic.php:785 msgid "Edit this survey participant" msgstr "" @@ -10840,7 +10856,7 @@ msgstr "" msgid "Submitted" msgstr "" -#: application/models/SurveyTimingDynamic.php:208 +#: application/models/SurveyTimingDynamic.php:207 #: application/views/admin/responses/browseallrow_view.php:22 msgid "Delete this response" msgstr "" @@ -10849,55 +10865,55 @@ msgstr "" msgid "Participant ID" msgstr "" -#: application/models/Token.php:49 application/models/TokenDynamic.php:667 +#: application/models/Token.php:49 application/models/TokenDynamic.php:670 #: application/views/admin/token/browse.php:113 #: application/views/admin/token/dummytokenform.php:81 #: application/views/admin/token/tokenform.php:388 msgid "Valid from" msgstr "" -#: application/models/Token.php:50 application/models/TokenDynamic.php:675 +#: application/models/Token.php:50 application/models/TokenDynamic.php:678 #: application/views/admin/token/browse.php:113 msgid "Valid until" msgstr "" -#: application/models/TokenDynamic.php:625 +#: application/models/TokenDynamic.php:628 #: application/views/admin/token/browse.php:113 #: application/views/admin/token/tokenform.php:226 msgid "Invitation sent?" msgstr "" -#: application/models/TokenDynamic.php:634 +#: application/models/TokenDynamic.php:637 #: application/views/admin/token/browse.php:113 #: application/views/admin/token/tokenform.php:303 msgid "Reminder sent?" msgstr "" -#: application/models/TokenDynamic.php:643 +#: application/models/TokenDynamic.php:646 #: application/views/admin/token/browse.php:113 msgid "Reminder count" msgstr "" -#: application/models/TokenDynamic.php:651 +#: application/models/TokenDynamic.php:654 #: application/views/admin/token/browse.php:113 #: application/views/admin/token/tokenform.php:103 msgid "Completed?" msgstr "" -#: application/models/TokenDynamic.php:734 +#: application/models/TokenDynamic.php:737 msgid "View last response details" msgstr "" -#: application/models/TokenDynamic.php:746 +#: application/models/TokenDynamic.php:749 msgid "Launch the survey with this token" msgstr "" -#: application/models/TokenDynamic.php:760 +#: application/models/TokenDynamic.php:763 #: application/views/admin/token/token_bar.php:99 msgid "Send email invitation" msgstr "" -#: application/models/TokenDynamic.php:764 +#: application/models/TokenDynamic.php:767 #: application/views/admin/token/massive_actions/_selector.php:79 #: application/views/admin/token/remind.php:8 #: application/views/admin/token/remind.php:9 @@ -10905,47 +10921,47 @@ msgstr "" msgid "Send email reminder" msgstr "" -#: application/models/TokenDynamic.php:784 +#: application/models/TokenDynamic.php:787 msgid "Delete survey participant" msgstr "" -#: application/models/TokenDynamic.php:796 +#: application/models/TokenDynamic.php:799 msgid "View this person in the central participants database" msgstr "" -#: application/models/User.php:338 application/models/User.php:373 +#: application/models/User.php:342 application/models/User.php:377 msgid "Edit this user" msgstr "" -#: application/models/User.php:362 +#: application/models/User.php:366 msgid "Delete this user" msgstr "" -#: application/models/User.php:382 +#: application/models/User.php:386 msgid "Set global permissions for this user" msgstr "" -#: application/models/User.php:389 +#: application/models/User.php:393 msgid "Set template permissions for this user" msgstr "" -#: application/models/User.php:410 +#: application/models/User.php:414 msgid "Do you want to delete this user?" msgstr "" -#: application/models/User.php:417 +#: application/models/User.php:421 msgid "Take ownership" msgstr "" -#: application/models/User.php:438 +#: application/models/User.php:442 msgid "User ID" msgstr "" -#: application/models/User.php:456 +#: application/models/User.php:460 msgid "No of surveys" msgstr "" -#: application/models/User.php:462 +#: application/models/User.php:466 msgid "Created by" msgstr "" @@ -11294,6 +11310,29 @@ msgstr "" msgid "Renumber scenario automatically" msgstr "" +#: application/views/admin/conditions/conditionshead_view.php:44 +msgid "Add multiple conditions without a page reload" +msgstr "" + +#: application/views/admin/conditions/conditionshead_view.php:48 +#: application/views/admin/conditions/conditionshead_view.php:65 +msgid "Quick-add conditions" +msgstr "" + +#: application/views/admin/conditions/conditionshead_view.php:73 +#: application/views/admin/emailtemplates/emailtemplates_view.php:75 +#: application/views/admin/pluginmanager/configure.php:21 +#: application/views/admin/responses/browsemenubar_view.php:157 +#: application/views/admin/super/fullpagebar_view.php:36 +#: application/views/admin/survey/Question/editQuestion_view.php:353 +#: application/views/admin/survey/Question/question_subviews/_tabs.php:123 +#: application/views/admin/survey/Question/questionbar_view.php:235 +#: application/views/admin/survey/Question/questionbar_view.php:275 +#: application/views/admin/survey/QuestionGroups/questiongroupbar_view.php:256 +#: application/views/admin/survey/surveybar_view.php:594 +msgid "Save and close" +msgstr "" + #: application/views/admin/conditions/conditionslist_view.php:4 msgid "Only show question" msgstr "" @@ -11324,7 +11363,7 @@ msgid "OR" msgstr "" #: application/views/admin/conditions/includes/conditions_scenario.php:24 -#: application/views/admin/conditions/includes/form_editconditions_header.php:35 +#: application/views/admin/conditions/includes/form_editconditions_header.php:34 msgid "Default scenario" msgstr "" @@ -11348,6 +11387,10 @@ msgstr "" msgid "Change scenario number" msgstr "" +#: application/views/admin/conditions/includes/conditions_scenario.php:74 +msgid "Add condition to this scenario" +msgstr "" + #: application/views/admin/conditions/includes/copyform.php:2 #: application/views/admin/conditions/includes/copyform.php:25 #: application/views/admin/survey/Question/questionbar_view.php:219 @@ -11362,43 +11405,51 @@ msgstr "" msgid "There are no existing conditions in this survey." msgstr "" -#: application/views/admin/conditions/includes/form_editconditions_header.php:30 +#: application/views/admin/conditions/includes/form_editconditions_header.php:29 +#: application/views/admin/conditions/includes/quickAddConditionForm.php:14 msgid "Scenario" msgstr "" -#: application/views/admin/conditions/includes/form_editconditions_header.php:41 +#: application/views/admin/conditions/includes/form_editconditions_header.php:38 msgid "Add scenario" msgstr "" -#: application/views/admin/conditions/includes/form_editconditions_header.php:52 +#: application/views/admin/conditions/includes/form_editconditions_header.php:49 +#: application/views/admin/conditions/includes/quickAddConditionForm.php:25 msgid "Previous questions" msgstr "" -#: application/views/admin/conditions/includes/form_editconditions_header.php:55 +#: application/views/admin/conditions/includes/form_editconditions_header.php:52 +#: application/views/admin/conditions/includes/quickAddConditionForm.php:28 msgid "Survey participant attributes" msgstr "" -#: application/views/admin/conditions/includes/form_editconditions_header.php:93 +#: application/views/admin/conditions/includes/form_editconditions_header.php:90 +#: application/views/admin/conditions/includes/quickAddConditionForm.php:66 msgid "Comparison operator" msgstr "" -#: application/views/admin/conditions/includes/form_editconditions_header.php:110 +#: application/views/admin/conditions/includes/form_editconditions_header.php:107 +#: application/views/admin/conditions/includes/quickAddConditionForm.php:83 msgid "Predefined" msgstr "" -#: application/views/admin/conditions/includes/form_editconditions_header.php:113 +#: application/views/admin/conditions/includes/form_editconditions_header.php:110 +#: application/views/admin/conditions/includes/quickAddConditionForm.php:86 msgid "Constant" msgstr "" -#: application/views/admin/conditions/includes/form_editconditions_header.php:119 +#: application/views/admin/conditions/includes/form_editconditions_header.php:116 +#: application/views/admin/conditions/includes/quickAddConditionForm.php:92 msgid "Token fields" msgstr "" -#: application/views/admin/conditions/includes/form_editconditions_header.php:122 +#: application/views/admin/conditions/includes/form_editconditions_header.php:119 +#: application/views/admin/conditions/includes/quickAddConditionForm.php:95 msgid "RegExp" msgstr "" -#: application/views/admin/conditions/includes/form_editconditions_header.php:209 +#: application/views/admin/conditions/includes/form_editconditions_header.php:206 #: application/views/admin/export/statistics_view.php:50 #: application/views/admin/export/statistics_view.php:94 #: application/views/admin/responses/browsemenubar_view.php:193 @@ -11857,19 +11908,6 @@ msgstr "" msgid "Edit email templates" msgstr "" -#: application/views/admin/emailtemplates/emailtemplates_view.php:75 -#: application/views/admin/pluginmanager/configure.php:21 -#: application/views/admin/responses/browsemenubar_view.php:157 -#: application/views/admin/super/fullpagebar_view.php:36 -#: application/views/admin/survey/Question/editQuestion_view.php:353 -#: application/views/admin/survey/Question/question_subviews/_tabs.php:123 -#: application/views/admin/survey/Question/questionbar_view.php:235 -#: application/views/admin/survey/Question/questionbar_view.php:275 -#: application/views/admin/survey/QuestionGroups/questiongroupbar_view.php:256 -#: application/views/admin/survey/surveybar_view.php:594 -msgid "Save and close" -msgstr "" - #: application/views/admin/emailtemplates/emailtemplates_view.php:91 #: application/views/admin/survey/Question/answerOptions_view.php:117 msgid "Relevance equation" @@ -12338,7 +12376,6 @@ msgstr "" #: application/views/admin/expressions/test/survey_logic_file.php:8 #: application/views/admin/survey/editLocalSettings_main_view.php:31 -#: application/views/admin/survey/editSurvey_view.php:8 msgid "Edit survey settings" msgstr "" @@ -13891,7 +13928,6 @@ msgstr "" #: application/views/admin/pluginmanager/configure.php:6 #: application/views/admin/survey/subview/accordion/_plugins_panel.php:14 -#: application/views/admin/survey/subview/tabPluginSettings_view.php:10 msgid "Settings for plugin %s" msgstr "" @@ -14279,22 +14315,22 @@ msgstr "" msgid "Edit survey participant" msgstr "" -#: application/views/admin/responses/massive_actions/_selector.php:15 -msgid "Selected response(s)..." -msgstr "" - -#: application/views/admin/responses/massive_actions/_selector.php:33 +#: application/views/admin/responses/massive_actions/_selector.php:27 msgid "Delete responses" msgstr "" -#: application/views/admin/responses/massive_actions/_selector.php:34 +#: application/views/admin/responses/massive_actions/_selector.php:28 msgid "Are you sure you want to delete the selected responses?" msgstr "" -#: application/views/admin/responses/massive_actions/_selector.php:46 +#: application/views/admin/responses/massive_actions/_selector.php:42 msgid "Download files" msgstr "" +#: application/views/admin/responses/massive_actions/_selector.php:54 +msgid "Selected response(s)..." +msgstr "" + #: application/views/admin/saved/savedlist_view.php:3 msgid "Saved responses" msgstr "" @@ -15535,10 +15571,6 @@ msgstr "" msgid "Decimal mark:" msgstr "" -#: application/views/admin/survey/editSurvey_view.php:52 -msgid "Save & edit survey text elements" -msgstr "" - #: application/views/admin/survey/importSurveyResources_view.php:6 #: application/views/admin/survey/importSurveyResources_view.php:41 #: application/views/admin/survey/importSurveyResources_view.php:89 diff --git a/locale/ca/ca.mo b/locale/ca/ca.mo index e80e59068ca..b33b227128a 100644 Binary files a/locale/ca/ca.mo and b/locale/ca/ca.mo differ diff --git a/locale/de/de.mo b/locale/de/de.mo index 4b1fceeeb78..7689cd1b560 100644 Binary files a/locale/de/de.mo and b/locale/de/de.mo differ diff --git a/locale/es/es.mo b/locale/es/es.mo index a6549999bed..ac95d103157 100644 Binary files a/locale/es/es.mo and b/locale/es/es.mo differ diff --git a/locale/fi/fi.mo b/locale/fi/fi.mo index 81dc20a3524..c288106196a 100644 Binary files a/locale/fi/fi.mo and b/locale/fi/fi.mo differ diff --git a/locale/it-informal/it-informal.mo b/locale/it-informal/it-informal.mo index b291aafd42c..48c158ae837 100644 Binary files a/locale/it-informal/it-informal.mo and b/locale/it-informal/it-informal.mo differ diff --git a/locale/it/it.mo b/locale/it/it.mo index 55d1c16fb10..3b59ab92056 100644 Binary files a/locale/it/it.mo and b/locale/it/it.mo differ diff --git a/locale/ja/ja.mo b/locale/ja/ja.mo index 3e929a91dfd..b45c8172558 100644 Binary files a/locale/ja/ja.mo and b/locale/ja/ja.mo differ diff --git a/locale/nb/nb.mo b/locale/nb/nb.mo index 3dce9c727c8..e0570af18d3 100644 Binary files a/locale/nb/nb.mo and b/locale/nb/nb.mo differ diff --git a/locale/nl-informal/nl-informal.mo b/locale/nl-informal/nl-informal.mo index 2be877d9421..0ff10f6ac28 100644 Binary files a/locale/nl-informal/nl-informal.mo and b/locale/nl-informal/nl-informal.mo differ diff --git a/locale/nl/nl.mo b/locale/nl/nl.mo index c601d0c65bf..76d362c416c 100644 Binary files a/locale/nl/nl.mo and b/locale/nl/nl.mo differ diff --git a/locale/nn/nn.mo b/locale/nn/nn.mo index dfd2a0c7f3b..36534c1a037 100644 Binary files a/locale/nn/nn.mo and b/locale/nn/nn.mo differ diff --git a/locale/pl/pl.mo b/locale/pl/pl.mo index a2e5ae6d840..10ac5ce0c3e 100644 Binary files a/locale/pl/pl.mo and b/locale/pl/pl.mo differ diff --git a/locale/ru/ru.mo b/locale/ru/ru.mo index afa7aa807f0..a31fd6e71dd 100644 Binary files a/locale/ru/ru.mo and b/locale/ru/ru.mo differ diff --git a/locale/zh-Hans/zh-Hans.mo b/locale/zh-Hans/zh-Hans.mo index b8ddec88575..a50083621a7 100644 Binary files a/locale/zh-Hans/zh-Hans.mo and b/locale/zh-Hans/zh-Hans.mo differ diff --git a/scripts/admin/admin_core.js b/scripts/admin/admin_core.js index af48b248484..900c0d78248 100644 --- a/scripts/admin/admin_core.js +++ b/scripts/admin/admin_core.js @@ -927,7 +927,9 @@ var LsGlobalNotifier = new NotifyFader(); function notifyFader(text, classes, styles, customOptions) { // Hide all modals - $('.modal').modal('hide'); + // TODO: Where is this needed? + // TODO: Commented, because doesn't work quick condition quick-add where modal should stay open + //$('.modal').modal('hide'); LsGlobalNotifier.create(text, classes, styles, customOptions); } @@ -935,7 +937,7 @@ function notifyFader(text, classes, styles, customOptions) { /** * Part of ajax helper * @param {object} JSON object from server - * @return {boolean} true if the original success method should be run after this + * @return {boolean} true if the original success method should be run after this (always, except on failed login) * @todo Localization * @todo Branch on message type? */ @@ -978,6 +980,7 @@ LS.ajaxHelperOnSuccess = function(response) { * Like $.ajax, but with checks for errors, * permission etc. Should be used together * with the PHP AjaxHelper. + * @todo Handle error from server (500)? * @param {object} options - Exactly the same as $.ajax options * @return {object} ajax promise */ @@ -987,6 +990,9 @@ LS.ajax = function(options) { var oldError = options.error; options.success = function(response) { + $('#ls-loading').hide(); + + // User-supplied success is always run EXCEPT when login fails var runOldSuccess = LS.ajaxHelperOnSuccess(response); if (oldSuccess && runOldSuccess) { @@ -994,5 +1000,14 @@ LS.ajax = function(options) { } } + options.error = function(response) { + $('#ls-loading').hide(); + if (oldError) { + oldError(); + } + } + + $('#ls-loading').show(); + return $.ajax(options); } diff --git a/scripts/admin/conditions.js b/scripts/admin/conditions.js index 1dbe7313a19..64060be8fc3 100644 --- a/scripts/admin/conditions.js +++ b/scripts/admin/conditions.js @@ -78,7 +78,6 @@ $(document).ready(function(){ } }); - //$('#languagetabs').bootTabs(); $('#radiototal,#radiogroup').change(function() { if ($('#radiototal').attr('checked')==true) { $('#newgroupselect').attr('disabled','disabled'); @@ -102,64 +101,86 @@ $(document).ready(function(){ }); -function populateCanswersSelect(evt) { - var fname = $('#cquestions').val(); - // empty the canswers Select - $('#canswers option').remove(); - var Keys = new Array(); - // store the indices in the Fieldnames array (to find codes and answers) where fname is found - for (var i=0;i