Merge branch '2.06' of github.com:LimeSurvey/LimeSurvey into ls2.06-n…

…ocomposer
LimeSurvey · Apr 23, 2014 · c9076a1 · c9076a1
2 parents 56eb2b5 + dbcb574
commit c9076a1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -1,10 +1,10 @@
 filter:
-  excluded_paths: [framework/*, locale/*, docs/*, fonts/*, third_party/*, application/third_party/*, images/*, styles/*, styles-public/*, templates/*, themes/*, tmp/*, upload/*]
+    paths: ["application"]
 tools:
     php_code_sniffer:
         config:
             standard: "PSR1"
     php_pdepend:
         command: pdepend
     php_cs_fixer:
-        config: { level: psr1 }
+        config: { level: psr1 }
diff --git a/application/views/admin/survey/subview/tabCopy_view.php b/application/views/admin/survey/subview/tabCopy_view.php
@@ -13,7 +13,7 @@
                 <input id='copysurveyexcludequotas' name="copysurveyexcludequotas" type="checkbox" /></li>
             <li><label for='copysurveyexcludepermissions'><?php echo $clang->gT("Exclude survey permissions?"); ?> </label>
                 <input id='copysurveyexcludepermissions' name="copysurveyexcludepermissions" type="checkbox"/></li>
-            <li><label for='copysurveyexcludeanswers'><?php echo $clang->gT("Exclude answers?"); ?> </label>
+            <li><label for='copysurveyexcludeanswers'><?php echo $clang->gT("Exclude answer options?"); ?> </label>
                 <input id='copysurveyexcludeanswers' name="copysurveyexcludeanswers" type="checkbox" /></li>
             <li><label for='copysurveyresetconditions'><?php echo $clang->gT("Reset conditions/relevance?"); ?></label>
                 <input id='copysurveyresetconditions' name="copysurveyresetconditions" type="checkbox" /></li>