diff --git a/locale/_template/limesurvey.pot b/locale/_template/limesurvey.pot
index 0abe9eb809e..675387cfd45 100644
--- a/locale/_template/limesurvey.pot
+++ b/locale/_template/limesurvey.pot
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LimeSurvey language file\n"
 "Report-Msgid-Bugs-To: http://translate.limesurvey.org/\n"
-"POT-Creation-Date: 2012-06-22 07:00:03+00:00\n"
+"POT-Creation-Date: 2012-07-04 12:11:16+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -99,7 +99,7 @@ msgid "Back"
 msgstr ""
 
 #: application/controllers/AdminController.php:86
-#: application/controllers/admin/tokens.php:1948
+#: application/controllers/admin/tokens.php:1959
 #: application/helpers/admin/activate_helper.php:429
 #: application/helpers/admin/import_helper.php:2619
 #: application/views/admin/authentication/forgotpassword.php:15
@@ -113,7 +113,7 @@ msgid "Main Admin Screen"
 msgstr ""
 
 #: application/controllers/AdminController.php:94
-#: application/core/Survey_Common_Action.php:301
+#: application/core/Survey_Common_Action.php:308
 #: application/views/admin/conditions/conditionshead_view.php:25
 #: application/views/admin/index.php:4
 #: application/views/admin/super/adminmenu.php:109
@@ -238,7 +238,7 @@ msgid "Please continue with populating the database."
 msgstr ""
 
 #: application/controllers/InstallerController.php:555
-#: application/controllers/InstallerController.php:1152
+#: application/controllers/InstallerController.php:1153
 msgid "Try again! Connection with database failed. Reason: "
 msgstr ""
 
@@ -277,11 +277,11 @@ msgstr ""
 msgid "Passwords don't match."
 msgstr ""
 
-#: application/controllers/InstallerController.php:1022
+#: application/controllers/InstallerController.php:1023
 msgid "Configuration directory is not writable"
 msgstr ""
 
-#: application/controllers/InstallerController.php:1023
+#: application/controllers/InstallerController.php:1024
 msgid "You will be redirected in about 5 secs. If not, click <a href=\"%s\">here</a>."
 msgstr ""
 
@@ -327,7 +327,7 @@ msgstr ""
 #: application/controllers/survey/index.php:358
 #: application/controllers/survey/index.php:371
 #: application/controllers/survey/index.php:386
-#: application/helpers/replacements_helper.php:224
+#: application/helpers/replacements_helper.php:225
 msgid "Please contact %s ( %s ) for further assistance."
 msgstr ""
 
@@ -459,9 +459,9 @@ msgid "Unknown error"
 msgstr ""
 
 #: application/controllers/UploaderController.php:263
-#: application/helpers/qanda_helper.php:2996
+#: application/helpers/qanda_helper.php:2866
 #: application/views/admin/assessments_view.php:13
-#: application/views/admin/labels/labelview_view.php:36
+#: application/views/admin/labels/labelview_view.php:40
 #: application/views/admin/survey/QuestionGroups/editGroup_view.php:16
 #: application/views/admin/survey/QuestionGroups/questiongroupbar_view.php:131
 #: application/views/admin/survey/subview/tabGeneralNewSurvey_view.php:18
@@ -472,7 +472,7 @@ msgstr ""
 #: application/controllers/UploaderController.php:264
 #: application/helpers/common_helper.php:2443
 #: application/helpers/common_helper.php:2656
-#: application/helpers/qanda_helper.php:2997
+#: application/helpers/qanda_helper.php:2867
 #: application/views/admin/dataentry/content_view.php:139
 msgid "Comment"
 msgstr ""
@@ -549,11 +549,11 @@ msgstr ""
 #: application/controllers/admin/assessments.php:90
 #: application/views/admin/globalSettings_view.php:458
 #: application/views/admin/labels/editlabel_view.php:35
-#: application/views/admin/labels/labelview_view.php:156
+#: application/views/admin/labels/labelview_view.php:160
 #: application/views/admin/survey/Question/answerOptions_view.php:164
 #: application/views/admin/survey/Question/answerOptions_view.php:176
-#: application/views/admin/survey/Question/subQuestion_view.php:161
-#: application/views/admin/survey/Question/subQuestion_view.php:174
+#: application/views/admin/survey/Question/subQuestion_view.php:162
+#: application/views/admin/survey/Question/subQuestion_view.php:175
 #: application/views/admin/survey/subview/tabGeneralEditSurvey_view.php:33
 msgid "Add"
 msgstr ""
@@ -658,8 +658,8 @@ msgstr ""
 
 #: application/controllers/admin/browse.php:130
 #: application/controllers/admin/browse.php:457
-#: application/helpers/common_helper.php:5257
-#: application/helpers/replacements_helper.php:620
+#: application/helpers/common_helper.php:5270
+#: application/helpers/replacements_helper.php:629
 #: application/views/admin/export/exportresults_view.php:121
 #: application/views/admin/participants/displayParticipants_view.php:63
 #: application/views/admin/participants/displayParticipants_view.php:149
@@ -673,8 +673,8 @@ msgstr ""
 
 #: application/controllers/admin/browse.php:131
 #: application/controllers/admin/browse.php:458
-#: application/helpers/common_helper.php:5258
-#: application/helpers/replacements_helper.php:627
+#: application/helpers/common_helper.php:5271
+#: application/helpers/replacements_helper.php:636
 #: application/views/admin/export/exportresults_view.php:122
 #: application/views/admin/participants/displayParticipants_view.php:64
 #: application/views/admin/participants/displayParticipants_view.php:149
@@ -915,8 +915,8 @@ msgstr ""
 #: application/controllers/admin/printablesurvey.php:1185
 #: application/controllers/admin/quotas.php:517
 #: application/controllers/admin/surveyadmin.php:563
-#: application/controllers/admin/tokens.php:1885
-#: application/core/Survey_Common_Action.php:821
+#: application/controllers/admin/tokens.php:1890
+#: application/core/Survey_Common_Action.php:828
 #: application/helpers/admin/statistics_helper.php:1797
 #: application/helpers/admin/statistics_helper.php:1931
 #: application/helpers/common_helper.php:1819
@@ -944,26 +944,27 @@ msgstr ""
 #: application/helpers/common_helper.php:3637
 #: application/helpers/common_helper.php:3657
 #: application/helpers/common_helper.php:3677
-#: application/helpers/common_helper.php:3722
-#: application/helpers/common_helper.php:3765
-#: application/helpers/common_helper.php:3791
-#: application/helpers/common_helper.php:3827
-#: application/helpers/common_helper.php:3895
-#: application/helpers/common_helper.php:3905
-#: application/helpers/common_helper.php:4052
-#: application/helpers/common_helper.php:4063
-#: application/helpers/common_helper.php:4123
+#: application/helpers/common_helper.php:3714
+#: application/helpers/common_helper.php:3735
+#: application/helpers/common_helper.php:3778
+#: application/helpers/common_helper.php:3804
+#: application/helpers/common_helper.php:3840
+#: application/helpers/common_helper.php:3908
+#: application/helpers/common_helper.php:3918
+#: application/helpers/common_helper.php:4065
+#: application/helpers/common_helper.php:4076
+#: application/helpers/common_helper.php:4136
 #: application/helpers/export_helper.php:241
 #: application/helpers/export_helper.php:245
 #: application/helpers/export_helper.php:253
 #: application/helpers/export_helper.php:257
 #: application/helpers/export_helper.php:1331
 #: application/helpers/export_helper.php:1350
-#: application/helpers/expressions/em_manager_helper.php:2811
-#: application/helpers/expressions/em_manager_helper.php:2815
-#: application/helpers/qanda_helper.php:4290
-#: application/helpers/qanda_helper.php:4717
-#: application/helpers/qanda_helper.php:4755
+#: application/helpers/expressions/em_manager_helper.php:2816
+#: application/helpers/expressions/em_manager_helper.php:2820
+#: application/helpers/qanda_helper.php:4155
+#: application/helpers/qanda_helper.php:4582
+#: application/helpers/qanda_helper.php:4620
 #: application/views/admin/dataentry/content_view.php:527
 #: application/views/admin/dataentry/content_view.php:580
 #: application/views/admin/dataentry/import.php:23
@@ -1010,17 +1011,17 @@ msgstr ""
 #: application/views/admin/survey/subview/tabTokens_view.php:92
 #: application/views/admin/survey/subview/tabTokens_view.php:109
 #: application/views/admin/token/email.php:89
-#: application/views/admin/token/managetokenattributes.php:64
-#: application/views/admin/token/managetokenattributes.php:65
+#: application/views/admin/token/managetokenattributes.php:69
+#: application/views/admin/token/managetokenattributes.php:70
 #: application/views/admin/token/remind.php:75
 msgid "Yes"
 msgstr ""
 
 #: application/controllers/admin/conditionsaction.php:181
-#: application/controllers/admin/tokens.php:1933
+#: application/controllers/admin/tokens.php:1940
 #: application/views/admin/assessments_view.php:122
 #: application/views/admin/conditions/includes/conditions_scenario.php:13
-#: application/views/admin/labels/labelview_view.php:157
+#: application/views/admin/labels/labelview_view.php:161
 #: application/views/admin/participants/attributeMapCSV_view.php:64
 #: application/views/admin/participants/displayParticipants_view.php:117
 #: application/views/admin/quotas/editquotafooter_view.php:6
@@ -1028,10 +1029,10 @@ msgstr ""
 #: application/views/admin/survey/Question/answerOptions_view.php:165
 #: application/views/admin/survey/Question/answerOptions_view.php:177
 #: application/views/admin/survey/Question/answerOptions_view.php:185
-#: application/views/admin/survey/Question/subQuestion_view.php:22
-#: application/views/admin/survey/Question/subQuestion_view.php:162
-#: application/views/admin/survey/Question/subQuestion_view.php:175
-#: application/views/admin/survey/Question/subQuestion_view.php:183
+#: application/views/admin/survey/Question/subQuestion_view.php:23
+#: application/views/admin/survey/Question/subQuestion_view.php:163
+#: application/views/admin/survey/Question/subQuestion_view.php:176
+#: application/views/admin/survey/Question/subQuestion_view.php:184
 #: application/views/admin/survey/deleteSurvey_view.php:36
 #: application/views/admin/token/browse.php:47
 #: application/views/admin/token/browse.php:59
@@ -1047,12 +1048,12 @@ msgid "We recommend that before you proceed, you export the entire survey from t
 msgstr ""
 
 #: application/controllers/admin/conditionsaction.php:190
-#: application/controllers/admin/tokens.php:1241
+#: application/controllers/admin/tokens.php:1246
 #: application/controllers/admin/useraction.php:157
 #: application/views/admin/dataentry/import.php:31
 #: application/views/admin/survey/Question/questionbar_view.php:193
 #: application/views/admin/survey/Question/questionbar_view.php:202
-#: application/views/admin/survey/Question/subQuestion_view.php:203
+#: application/views/admin/survey/Question/subQuestion_view.php:204
 #: application/views/admin/survey/activateSurvey_view.php:37
 #: application/views/admin/survey/activateSurvey_view.php:55
 #: application/views/admin/survey/deactivateSurvey_view.php:6
@@ -1075,10 +1076,9 @@ msgstr ""
 #: application/controllers/admin/surveypermission.php:329
 #: application/controllers/admin/surveypermission.php:502
 #: application/controllers/admin/surveypermission.php:595
-#: application/controllers/admin/tokens.php:2067
 #: application/controllers/admin/tokens.php:2078
+#: application/controllers/admin/tokens.php:2093
 #: application/controllers/admin/useraction.php:720
-#: application/helpers/common_helper.php:6174
 #: application/helpers/common_helper.php:6179
 #: application/helpers/common_helper.php:6184
 #: application/helpers/common_helper.php:6189
@@ -1087,24 +1087,25 @@ msgstr ""
 #: application/helpers/common_helper.php:6204
 #: application/helpers/common_helper.php:6209
 #: application/helpers/common_helper.php:6214
-#: application/helpers/common_helper.php:6220
-#: application/helpers/common_helper.php:6226
+#: application/helpers/common_helper.php:6219
+#: application/helpers/common_helper.php:6225
 #: application/helpers/common_helper.php:6231
 #: application/helpers/common_helper.php:6236
 #: application/helpers/common_helper.php:6241
 #: application/helpers/common_helper.php:6246
 #: application/helpers/common_helper.php:6251
-#: application/helpers/common_helper.php:6257
+#: application/helpers/common_helper.php:6256
 #: application/helpers/common_helper.php:6262
-#: application/helpers/common_helper.php:6271
+#: application/helpers/common_helper.php:6267
 #: application/helpers/common_helper.php:6276
-#: application/helpers/common_helper.php:6283
-#: application/helpers/common_helper.php:6287
-#: application/helpers/common_helper.php:6291
+#: application/helpers/common_helper.php:6281
+#: application/helpers/common_helper.php:6288
+#: application/helpers/common_helper.php:6292
+#: application/helpers/common_helper.php:6296
 #: application/helpers/frontend_helper.php:1424
 #: application/helpers/frontend_helper.php:1501
 #: application/helpers/frontend_helper.php:1673
-#: application/helpers/replacements_helper.php:656
+#: application/helpers/replacements_helper.php:665
 #: application/views/admin/authentication/message.php:3
 #: application/views/admin/participants/attributeMapCSV_view.php:63
 #: application/views/admin/participants/attributeMap_view.php:95
@@ -1145,9 +1146,9 @@ msgstr ""
 #: application/helpers/common_helper.php:1843
 #: application/helpers/export_helper.php:259
 #: application/helpers/export_helper.php:1350
-#: application/helpers/expressions/em_manager_helper.php:2817
-#: application/helpers/qanda_helper.php:4718
-#: application/helpers/qanda_helper.php:4763
+#: application/helpers/expressions/em_manager_helper.php:2822
+#: application/helpers/qanda_helper.php:4583
+#: application/helpers/qanda_helper.php:4628
 #: application/views/admin/dataentry/content_view.php:581
 #: application/views/admin/export/statistics_view.php:677
 msgid "Uncertain"
@@ -1165,8 +1166,8 @@ msgstr ""
 #: application/controllers/admin/printablesurvey.php:1185
 #: application/controllers/admin/quotas.php:518
 #: application/controllers/admin/surveyadmin.php:567
-#: application/controllers/admin/tokens.php:1887
-#: application/core/Survey_Common_Action.php:817
+#: application/controllers/admin/tokens.php:1892
+#: application/core/Survey_Common_Action.php:824
 #: application/helpers/admin/statistics_helper.php:1798
 #: application/helpers/admin/statistics_helper.php:1932
 #: application/helpers/common_helper.php:1826
@@ -1193,25 +1194,26 @@ msgstr ""
 #: application/helpers/common_helper.php:3636
 #: application/helpers/common_helper.php:3656
 #: application/helpers/common_helper.php:3676
-#: application/helpers/common_helper.php:3721
-#: application/helpers/common_helper.php:3764
-#: application/helpers/common_helper.php:3776
-#: application/helpers/common_helper.php:3790
-#: application/helpers/common_helper.php:3826
-#: application/helpers/common_helper.php:3894
-#: application/helpers/common_helper.php:3904
-#: application/helpers/common_helper.php:4051
-#: application/helpers/common_helper.php:4062
-#: application/helpers/common_helper.php:4122
+#: application/helpers/common_helper.php:3713
+#: application/helpers/common_helper.php:3734
+#: application/helpers/common_helper.php:3777
+#: application/helpers/common_helper.php:3789
+#: application/helpers/common_helper.php:3803
+#: application/helpers/common_helper.php:3839
+#: application/helpers/common_helper.php:3907
+#: application/helpers/common_helper.php:3917
+#: application/helpers/common_helper.php:4064
+#: application/helpers/common_helper.php:4075
+#: application/helpers/common_helper.php:4135
 #: application/helpers/export_helper.php:254
 #: application/helpers/export_helper.php:258
 #: application/helpers/export_helper.php:1331
 #: application/helpers/export_helper.php:1350
-#: application/helpers/expressions/em_manager_helper.php:2812
-#: application/helpers/expressions/em_manager_helper.php:2816
-#: application/helpers/qanda_helper.php:4299
-#: application/helpers/qanda_helper.php:4719
-#: application/helpers/qanda_helper.php:4773
+#: application/helpers/expressions/em_manager_helper.php:2817
+#: application/helpers/expressions/em_manager_helper.php:2821
+#: application/helpers/qanda_helper.php:4164
+#: application/helpers/qanda_helper.php:4584
+#: application/helpers/qanda_helper.php:4638
 #: application/views/admin/dataentry/content_view.php:528
 #: application/views/admin/dataentry/content_view.php:582
 #: application/views/admin/dataentry/import.php:24
@@ -1258,8 +1260,8 @@ msgstr ""
 #: application/views/admin/survey/subview/tabTokens_view.php:98
 #: application/views/admin/survey/subview/tabTokens_view.php:114
 #: application/views/admin/token/email.php:90
-#: application/views/admin/token/managetokenattributes.php:64
-#: application/views/admin/token/managetokenattributes.php:65
+#: application/views/admin/token/managetokenattributes.php:69
+#: application/views/admin/token/managetokenattributes.php:70
 #: application/views/admin/token/remind.php:76
 msgid "No"
 msgstr ""
@@ -1272,9 +1274,9 @@ msgstr ""
 #: application/helpers/common_helper.php:1849
 #: application/helpers/export_helper.php:262
 #: application/helpers/export_helper.php:1355
-#: application/helpers/expressions/em_manager_helper.php:2820
-#: application/helpers/qanda_helper.php:4874
-#: application/helpers/qanda_helper.php:4916
+#: application/helpers/expressions/em_manager_helper.php:2825
+#: application/helpers/qanda_helper.php:4739
+#: application/helpers/qanda_helper.php:4781
 #: application/views/admin/dataentry/content_view.php:598
 #: application/views/admin/export/statistics_view.php:727
 msgid "Increase"
@@ -1288,9 +1290,9 @@ msgstr ""
 #: application/helpers/common_helper.php:1851
 #: application/helpers/export_helper.php:263
 #: application/helpers/export_helper.php:1355
-#: application/helpers/expressions/em_manager_helper.php:2821
-#: application/helpers/qanda_helper.php:4875
-#: application/helpers/qanda_helper.php:4927
+#: application/helpers/expressions/em_manager_helper.php:2826
+#: application/helpers/qanda_helper.php:4740
+#: application/helpers/qanda_helper.php:4792
 #: application/views/admin/dataentry/content_view.php:599
 #: application/views/admin/export/statistics_view.php:732
 msgid "Same"
@@ -1304,9 +1306,9 @@ msgstr ""
 #: application/helpers/common_helper.php:1850
 #: application/helpers/export_helper.php:264
 #: application/helpers/export_helper.php:1355
-#: application/helpers/expressions/em_manager_helper.php:2822
-#: application/helpers/qanda_helper.php:4876
-#: application/helpers/qanda_helper.php:4939
+#: application/helpers/expressions/em_manager_helper.php:2827
+#: application/helpers/qanda_helper.php:4741
+#: application/helpers/qanda_helper.php:4804
 #: application/views/admin/dataentry/content_view.php:600
 #: application/views/admin/export/statistics_view.php:737
 msgid "Decrease"
@@ -1338,30 +1340,30 @@ msgstr ""
 #: application/helpers/common_helper.php:1835
 #: application/helpers/qanda_helper.php:986
 #: application/helpers/qanda_helper.php:1516
-#: application/helpers/qanda_helper.php:1825
-#: application/helpers/qanda_helper.php:1958
-#: application/helpers/qanda_helper.php:2021
-#: application/helpers/qanda_helper.php:4310
-#: application/helpers/qanda_helper.php:4354
-#: application/helpers/qanda_helper.php:4446
-#: application/helpers/qanda_helper.php:4508
-#: application/helpers/qanda_helper.php:4599
-#: application/helpers/qanda_helper.php:4644
-#: application/helpers/qanda_helper.php:4722
-#: application/helpers/qanda_helper.php:4793
-#: application/helpers/qanda_helper.php:4879
-#: application/helpers/qanda_helper.php:4957
-#: application/helpers/qanda_helper.php:5060
-#: application/helpers/qanda_helper.php:5083
-#: application/helpers/qanda_helper.php:5153
-#: application/helpers/qanda_helper.php:5285
-#: application/helpers/qanda_helper.php:6083
-#: application/helpers/qanda_helper.php:6084
-#: application/helpers/qanda_helper.php:6372
-#: application/helpers/qanda_helper.php:6447
-#: application/helpers/qanda_helper.php:6551
-#: application/helpers/qanda_helper.php:6752
-#: application/helpers/qanda_helper.php:6806
+#: application/helpers/qanda_helper.php:1823
+#: application/helpers/qanda_helper.php:1956
+#: application/helpers/qanda_helper.php:2019
+#: application/helpers/qanda_helper.php:4175
+#: application/helpers/qanda_helper.php:4219
+#: application/helpers/qanda_helper.php:4311
+#: application/helpers/qanda_helper.php:4373
+#: application/helpers/qanda_helper.php:4464
+#: application/helpers/qanda_helper.php:4509
+#: application/helpers/qanda_helper.php:4587
+#: application/helpers/qanda_helper.php:4658
+#: application/helpers/qanda_helper.php:4744
+#: application/helpers/qanda_helper.php:4822
+#: application/helpers/qanda_helper.php:4925
+#: application/helpers/qanda_helper.php:4948
+#: application/helpers/qanda_helper.php:5018
+#: application/helpers/qanda_helper.php:5150
+#: application/helpers/qanda_helper.php:5945
+#: application/helpers/qanda_helper.php:5946
+#: application/helpers/qanda_helper.php:6234
+#: application/helpers/qanda_helper.php:6309
+#: application/helpers/qanda_helper.php:6413
+#: application/helpers/qanda_helper.php:6614
+#: application/helpers/qanda_helper.php:6668
 #: application/views/admin/dataentry/content_view.php:29
 msgid "No answer"
 msgstr ""
@@ -1391,8 +1393,8 @@ msgstr ""
 #: application/helpers/common_helper.php:1834
 #: application/helpers/export_helper.php:249
 #: application/helpers/export_helper.php:1335
-#: application/helpers/expressions/em_manager_helper.php:2808
-#: application/helpers/qanda_helper.php:4336
+#: application/helpers/expressions/em_manager_helper.php:2813
+#: application/helpers/qanda_helper.php:4201
 #: application/views/admin/dataentry/content_view.php:54
 #: application/views/admin/export/statistics_view.php:488
 msgid "Female"
@@ -1407,8 +1409,8 @@ msgstr ""
 #: application/helpers/common_helper.php:1833
 #: application/helpers/export_helper.php:250
 #: application/helpers/export_helper.php:1335
-#: application/helpers/expressions/em_manager_helper.php:2807
-#: application/helpers/qanda_helper.php:4344
+#: application/helpers/expressions/em_manager_helper.php:2812
+#: application/helpers/qanda_helper.php:4209
 #: application/views/admin/dataentry/content_view.php:55
 #: application/views/admin/export/statistics_view.php:494
 msgid "Male"
@@ -1429,18 +1431,18 @@ msgstr ""
 #: application/helpers/common_helper.php:3597
 #: application/helpers/common_helper.php:3653
 #: application/helpers/common_helper.php:3673
-#: application/helpers/common_helper.php:3856
-#: application/helpers/common_helper.php:4071
-#: application/helpers/common_helper.php:4080
-#: application/helpers/common_helper.php:4089
-#: application/helpers/common_helper.php:4098
+#: application/helpers/common_helper.php:3869
+#: application/helpers/common_helper.php:4084
+#: application/helpers/common_helper.php:4093
+#: application/helpers/common_helper.php:4102
+#: application/helpers/common_helper.php:4111
 #: application/helpers/export_helper.php:928
 #: application/helpers/export_helper.php:937
 #: application/helpers/export_helper.php:1033
 #: application/helpers/export_helper.php:1048
-#: application/helpers/qanda_helper.php:1791
-#: application/helpers/qanda_helper.php:2479
-#: application/helpers/qanda_helper.php:2810
+#: application/helpers/qanda_helper.php:1789
+#: application/helpers/qanda_helper.php:2351
+#: application/helpers/qanda_helper.php:2679
 #: application/views/admin/dataentry/content_view.php:103
 #: application/views/admin/dataentry/content_view.php:108
 #: application/views/admin/dataentry/content_view.php:123
@@ -1598,12 +1600,12 @@ msgstr ""
 #: application/helpers/admin/statistics_helper.php:2484
 #: application/helpers/admin/statistics_helper.php:2489
 #: application/helpers/qanda_helper.php:1237
-#: application/helpers/qanda_helper.php:3887
-#: application/helpers/qanda_helper.php:3990
-#: application/helpers/qanda_helper.php:4082
-#: application/helpers/qanda_helper.php:4183
-#: application/helpers/qanda_helper.php:4184
-#: application/helpers/qanda_helper.php:4258
+#: application/helpers/qanda_helper.php:3754
+#: application/helpers/qanda_helper.php:3855
+#: application/helpers/qanda_helper.php:3947
+#: application/helpers/qanda_helper.php:4048
+#: application/helpers/qanda_helper.php:4049
+#: application/helpers/qanda_helper.php:4123
 msgid "Answer"
 msgstr ""
 
@@ -1787,7 +1789,7 @@ msgstr ""
 #: application/controllers/admin/dataentry.php:515
 #: application/controllers/admin/dataentry.php:1495
 #: application/controllers/admin/dataentry.php:1623
-#: application/controllers/admin/dataentry.php:2613
+#: application/controllers/admin/dataentry.php:2611
 #: application/views/admin/dataentry/caption_view.php:1
 #: application/views/admin/dataentry/dataentry_header_view.php:1
 #: application/views/admin/dataentry/delete.php:1
@@ -1801,7 +1803,7 @@ msgstr ""
 #: application/controllers/admin/dataentry.php:1067
 #: application/controllers/admin/dataentry.php:1184
 #: application/helpers/qanda_helper.php:1530
-#: application/helpers/qanda_helper.php:5265
+#: application/helpers/qanda_helper.php:5130
 #: application/views/admin/dataentry/content_view.php:53
 #: application/views/admin/dataentry/content_view.php:118
 #: application/views/admin/dataentry/content_view.php:136
@@ -1817,17 +1819,16 @@ msgstr ""
 
 #: application/controllers/admin/dataentry.php:978
 #: application/controllers/admin/dataentry.php:2296
-#: application/helpers/qanda_helper.php:2216
 msgid "Remove this item"
 msgstr ""
 
 #: application/controllers/admin/dataentry.php:1000
-#: application/helpers/qanda_helper.php:2245
+#: application/helpers/qanda_helper.php:2139
 msgid "Your Choices"
 msgstr ""
 
 #: application/controllers/admin/dataentry.php:1005
-#: application/helpers/qanda_helper.php:2256
+#: application/helpers/qanda_helper.php:2140
 msgid "Your Ranking"
 msgstr ""
 
@@ -1839,14 +1840,14 @@ msgstr ""
 #: application/views/admin/labels/editlabel_view.php:50
 #: application/views/admin/survey/Question/answerOptions_view.php:184
 #: application/views/admin/survey/Question/editdefaultvalues_view.php:182
-#: application/views/admin/survey/Question/subQuestion_view.php:182
+#: application/views/admin/survey/Question/subQuestion_view.php:183
 #: application/views/admin/survey/QuestionGroups/editGroup_view.php:41
 #: application/views/admin/survey/editLocalSettings_main_view.php:8
 #: application/views/admin/survey/editSurvey_view.php:28
 #: application/views/admin/survey/listSurveys_view.php:6
 #: application/views/admin/survey/newSurvey_view.php:29
 #: application/views/admin/survey/organizeGroupsAndQuestions_view.php:30
-#: application/views/admin/token/managetokenattributes.php:90
+#: application/views/admin/token/managetokenattributes.php:95
 #: application/views/admin/translate/translatefooter_view.php:1
 #: application/views/admin/user/modifyuser.php:41
 msgid "Save"
@@ -1854,7 +1855,7 @@ msgstr ""
 
 #: application/controllers/admin/dataentry.php:1585
 #: application/controllers/admin/tokens.php:705
-#: application/controllers/admin/tokens.php:843
+#: application/controllers/admin/tokens.php:848
 #: application/controllers/admin/useraction.php:149
 #: application/views/admin/dataentry/insert.php:73
 #: application/views/admin/dataentry/iteratesurvey.php:5
@@ -1947,7 +1948,7 @@ msgid "Thank you for saving your survey in progress.  The following details can
 msgstr ""
 
 #: application/controllers/admin/dataentry.php:1946
-#: application/helpers/replacements_helper.php:544
+#: application/helpers/replacements_helper.php:553
 #: application/libraries/Save.php:198
 msgid "Name"
 msgstr ""
@@ -1957,8 +1958,8 @@ msgstr ""
 #: application/controllers/admin/useraction.php:133
 #: application/controllers/admin/useraction.php:362
 #: application/controllers/admin/useraction.php:380
-#: application/helpers/replacements_helper.php:550
-#: application/helpers/replacements_helper.php:583
+#: application/helpers/replacements_helper.php:559
+#: application/helpers/replacements_helper.php:592
 #: application/libraries/Save.php:199
 #: application/views/admin/authentication/login.php:8
 #: application/views/admin/user/modifyuser.php:7
@@ -1987,234 +1988,234 @@ msgstr ""
 msgid "The answer(s) must meet these array_filter criteria:"
 msgstr ""
 
-#: application/controllers/admin/dataentry.php:2495
-#: application/controllers/admin/tokens.php:1576
+#: application/controllers/admin/dataentry.php:2493
+#: application/controllers/admin/tokens.php:1581
 #: application/views/admin/participants/importCSV_view.php:17
 msgid "ARMSCII-8 Armenian"
 msgstr ""
 
-#: application/controllers/admin/dataentry.php:2496
-#: application/controllers/admin/tokens.php:1577
+#: application/controllers/admin/dataentry.php:2494
+#: application/controllers/admin/tokens.php:1582
 #: application/views/admin/participants/importCSV_view.php:18
 msgid "US ASCII"
 msgstr ""
 
-#: application/controllers/admin/dataentry.php:2497
-#: application/controllers/admin/tokens.php:1578
+#: application/controllers/admin/dataentry.php:2495
+#: application/controllers/admin/tokens.php:1583
 #: application/views/admin/participants/importCSV_view.php:19
 msgid "Automatic"
 msgstr ""
 
-#: application/controllers/admin/dataentry.php:2498
-#: application/controllers/admin/tokens.php:1579
+#: application/controllers/admin/dataentry.php:2496
+#: application/controllers/admin/tokens.php:1584
 #: application/views/admin/participants/importCSV_view.php:20
 msgid "Big5 Traditional Chinese"
 msgstr ""
 
-#: application/controllers/admin/dataentry.php:2499
-#: application/controllers/admin/tokens.php:1580
+#: application/controllers/admin/dataentry.php:2497
+#: application/controllers/admin/tokens.php:1585
 #: application/views/admin/participants/importCSV_view.php:21
 msgid "Binary pseudo charset"
 msgstr ""
 
-#: application/controllers/admin/dataentry.php:2500
-#: application/controllers/admin/tokens.php:1581
+#: application/controllers/admin/dataentry.php:2498
+#: application/controllers/admin/tokens.php:1586
 #: application/views/admin/participants/importCSV_view.php:22
 msgid "Windows Central European"
 msgstr ""
 
-#: application/controllers/admin/dataentry.php:2501
-#: application/controllers/admin/tokens.php:1582
+#: application/controllers/admin/dataentry.php:2499
+#: application/controllers/admin/tokens.php:1587
 #: application/views/admin/participants/importCSV_view.php:23
 msgid "Windows Cyrillic"
 msgstr ""
 
-#: application/controllers/admin/dataentry.php:2502
-#: application/controllers/admin/tokens.php:1583
+#: application/controllers/admin/dataentry.php:2500
+#: application/controllers/admin/tokens.php:1588
 #: application/views/admin/participants/importCSV_view.php:24
 msgid "Windows Arabic"
 msgstr ""
 
-#: application/controllers/admin/dataentry.php:2503
-#: application/controllers/admin/tokens.php:1584
+#: application/controllers/admin/dataentry.php:2501
+#: application/controllers/admin/tokens.php:1589
 #: application/views/admin/participants/importCSV_view.php:25
 msgid "Windows Baltic"
 msgstr ""
 
-#: application/controllers/admin/dataentry.php:2504
-#: application/controllers/admin/tokens.php:1585
+#: application/controllers/admin/dataentry.php:2502
+#: application/controllers/admin/tokens.php:1590
 #: application/views/admin/participants/importCSV_view.php:26
 msgid "DOS West European"
 msgstr ""
 
-#: application/controllers/admin/dataentry.php:2505
-#: application/controllers/admin/tokens.php:1586
+#: application/controllers/admin/dataentry.php:2503
+#: application/controllers/admin/tokens.php:1591
 #: application/views/admin/participants/importCSV_view.php:27
 msgid "DOS Central European"
 msgstr ""
 
-#: application/controllers/admin/dataentry.php:2506
-#: application/controllers/admin/tokens.php:1587
+#: application/controllers/admin/dataentry.php:2504
+#: application/controllers/admin/tokens.php:1592
 #: application/views/admin/participants/importCSV_view.php:28
 msgid "DOS Russian"
 msgstr ""
 
-#: application/controllers/admin/dataentry.php:2507
-#: application/controllers/admin/tokens.php:1588
+#: application/controllers/admin/dataentry.php:2505
+#: application/controllers/admin/tokens.php:1593
 #: application/views/admin/participants/importCSV_view.php:29
 msgid "SJIS for Windows Japanese"
 msgstr ""
 
-#: application/controllers/admin/dataentry.php:2508
-#: application/controllers/admin/tokens.php:1589
+#: application/controllers/admin/dataentry.php:2506
+#: application/controllers/admin/tokens.php:1594
 #: application/views/admin/participants/importCSV_view.php:30
 msgid "DEC West European"
 msgstr ""
 
-#: application/controllers/admin/dataentry.php:2509
-#: application/controllers/admin/tokens.php:1590
+#: application/controllers/admin/dataentry.php:2507
+#: application/controllers/admin/tokens.php:1595
 #: application/views/admin/participants/importCSV_view.php:31
 msgid "UJIS for Windows Japanese"
 msgstr ""
 
-#: application/controllers/admin/dataentry.php:2510
-#: application/controllers/admin/tokens.php:1591
+#: application/controllers/admin/dataentry.php:2508
+#: application/controllers/admin/tokens.php:1596
 #: application/views/admin/participants/importCSV_view.php:32
 msgid "EUC-KR Korean"
 msgstr ""
 
-#: application/controllers/admin/dataentry.php:2511
-#: application/controllers/admin/tokens.php:1592
+#: application/controllers/admin/dataentry.php:2509
+#: application/controllers/admin/tokens.php:1597
 #: application/views/admin/participants/importCSV_view.php:33
 msgid "GB2312 Simplified Chinese"
 msgstr ""
 
-#: application/controllers/admin/dataentry.php:2512
-#: application/controllers/admin/tokens.php:1593
+#: application/controllers/admin/dataentry.php:2510
+#: application/controllers/admin/tokens.php:1598
 #: application/views/admin/participants/importCSV_view.php:34
 msgid "GBK Simplified Chinese"
 msgstr ""
 
-#: application/controllers/admin/dataentry.php:2513
-#: application/controllers/admin/tokens.php:1594
+#: application/controllers/admin/dataentry.php:2511
+#: application/controllers/admin/tokens.php:1599
 #: application/views/admin/participants/importCSV_view.php:35
 msgid "GEOSTD8 Georgian"
 msgstr ""
 
-#: application/controllers/admin/dataentry.php:2514
-#: application/controllers/admin/tokens.php:1595
+#: application/controllers/admin/dataentry.php:2512
+#: application/controllers/admin/tokens.php:1600
 #: application/views/admin/participants/importCSV_view.php:36
 msgid "ISO 8859-7 Greek"
 msgstr ""
 
-#: application/controllers/admin/dataentry.php:2515
-#: application/controllers/admin/tokens.php:1596
+#: application/controllers/admin/dataentry.php:2513
+#: application/controllers/admin/tokens.php:1601
 #: application/views/admin/participants/importCSV_view.php:37
 msgid "ISO 8859-8 Hebrew"
 msgstr ""
 
-#: application/controllers/admin/dataentry.php:2516
-#: application/controllers/admin/tokens.php:1597
+#: application/controllers/admin/dataentry.php:2514
+#: application/controllers/admin/tokens.php:1602
 #: application/views/admin/participants/importCSV_view.php:38
 msgid "HP West European"
 msgstr ""
 
-#: application/controllers/admin/dataentry.php:2517
-#: application/controllers/admin/tokens.php:1598
+#: application/controllers/admin/dataentry.php:2515
+#: application/controllers/admin/tokens.php:1603
 #: application/views/admin/participants/importCSV_view.php:39
 msgid "DOS Kamenicky Czech-Slovak"
 msgstr ""
 
-#: application/controllers/admin/dataentry.php:2518
-#: application/controllers/admin/tokens.php:1599
+#: application/controllers/admin/dataentry.php:2516
+#: application/controllers/admin/tokens.php:1604
 #: application/views/admin/participants/importCSV_view.php:40
 msgid "KOI8-R Relcom Russian"
 msgstr ""
 
-#: application/controllers/admin/dataentry.php:2519
-#: application/controllers/admin/tokens.php:1600
+#: application/controllers/admin/dataentry.php:2517
+#: application/controllers/admin/tokens.php:1605
 #: application/views/admin/participants/importCSV_view.php:41
 msgid "KOI8-U Ukrainian"
 msgstr ""
 
-#: application/controllers/admin/dataentry.php:2520
-#: application/controllers/admin/tokens.php:1601
+#: application/controllers/admin/dataentry.php:2518
+#: application/controllers/admin/tokens.php:1606
 #: application/views/admin/participants/importCSV_view.php:42
 msgid "cp1252 West European"
 msgstr ""
 
-#: application/controllers/admin/dataentry.php:2521
-#: application/controllers/admin/tokens.php:1602
+#: application/controllers/admin/dataentry.php:2519
+#: application/controllers/admin/tokens.php:1607
 #: application/views/admin/participants/importCSV_view.php:43
 msgid "ISO 8859-2 Central European"
 msgstr ""
 
-#: application/controllers/admin/dataentry.php:2522
-#: application/controllers/admin/tokens.php:1603
+#: application/controllers/admin/dataentry.php:2520
+#: application/controllers/admin/tokens.php:1608
 #: application/views/admin/participants/importCSV_view.php:44
 msgid "ISO 8859-9 Turkish"
 msgstr ""
 
-#: application/controllers/admin/dataentry.php:2523
-#: application/controllers/admin/tokens.php:1604
+#: application/controllers/admin/dataentry.php:2521
+#: application/controllers/admin/tokens.php:1609
 #: application/views/admin/participants/importCSV_view.php:45
 msgid "ISO 8859-13 Baltic"
 msgstr ""
 
-#: application/controllers/admin/dataentry.php:2524
-#: application/controllers/admin/tokens.php:1605
+#: application/controllers/admin/dataentry.php:2522
+#: application/controllers/admin/tokens.php:1610
 #: application/views/admin/participants/importCSV_view.php:46
 msgid "Mac Central European"
 msgstr ""
 
-#: application/controllers/admin/dataentry.php:2525
-#: application/controllers/admin/tokens.php:1606
+#: application/controllers/admin/dataentry.php:2523
+#: application/controllers/admin/tokens.php:1611
 #: application/views/admin/participants/importCSV_view.php:47
 msgid "Mac West European"
 msgstr ""
 
-#: application/controllers/admin/dataentry.php:2526
-#: application/controllers/admin/tokens.php:1607
+#: application/controllers/admin/dataentry.php:2524
+#: application/controllers/admin/tokens.php:1612
 #: application/views/admin/participants/importCSV_view.php:48
 msgid "Shift-JIS Japanese"
 msgstr ""
 
-#: application/controllers/admin/dataentry.php:2527
-#: application/controllers/admin/tokens.php:1608
+#: application/controllers/admin/dataentry.php:2525
+#: application/controllers/admin/tokens.php:1613
 #: application/views/admin/participants/importCSV_view.php:49
 msgid "7bit Swedish"
 msgstr ""
 
-#: application/controllers/admin/dataentry.php:2528
-#: application/controllers/admin/tokens.php:1609
+#: application/controllers/admin/dataentry.php:2526
+#: application/controllers/admin/tokens.php:1614
 #: application/views/admin/participants/importCSV_view.php:50
 msgid "TIS620 Thai"
 msgstr ""
 
-#: application/controllers/admin/dataentry.php:2529
-#: application/controllers/admin/tokens.php:1610
+#: application/controllers/admin/dataentry.php:2527
+#: application/controllers/admin/tokens.php:1615
 #: application/views/admin/participants/importCSV_view.php:51
 msgid "UCS-2 Unicode"
 msgstr ""
 
-#: application/controllers/admin/dataentry.php:2530
-#: application/controllers/admin/tokens.php:1611
+#: application/controllers/admin/dataentry.php:2528
+#: application/controllers/admin/tokens.php:1616
 #: application/views/admin/participants/importCSV_view.php:52
 msgid "EUC-JP Japanese"
 msgstr ""
 
-#: application/controllers/admin/dataentry.php:2531
-#: application/controllers/admin/tokens.php:1612
+#: application/controllers/admin/dataentry.php:2529
+#: application/controllers/admin/tokens.php:1617
 #: application/views/admin/participants/importCSV_view.php:53
 msgid "UTF-8 Unicode"
 msgstr ""
 
-#: application/controllers/admin/dataentry.php:2588
+#: application/controllers/admin/dataentry.php:2586
 #: application/controllers/admin/printablesurvey.php:1949
 msgid "Only answer this question for the items you selected in question %s ('%s')"
 msgstr ""
 
-#: application/controllers/admin/dataentry.php:2596
+#: application/controllers/admin/dataentry.php:2594
 #: application/controllers/admin/printablesurvey.php:1957
 msgid "Only answer this question for the items you did not select in question %s ('%s')"
 msgstr ""
@@ -2544,10 +2545,10 @@ msgstr ""
 
 #: application/controllers/admin/printablesurvey.php:824
 #: application/controllers/admin/printablesurvey.php:826
-#: application/helpers/qanda_helper.php:2792
-#: application/helpers/qanda_helper.php:2793
-#: application/helpers/qanda_helper.php:2824
-#: application/helpers/qanda_helper.php:2826
+#: application/helpers/qanda_helper.php:2661
+#: application/helpers/qanda_helper.php:2662
+#: application/helpers/qanda_helper.php:2693
+#: application/helpers/qanda_helper.php:2696
 msgid "Make a comment on your choice here:"
 msgstr ""
 
@@ -2570,12 +2571,12 @@ msgid "Please choose all that apply and provide a comment:"
 msgstr ""
 
 #: application/controllers/admin/printablesurvey.php:931
-#: application/helpers/expressions/em_manager_helper.php:2940
-#: application/helpers/expressions/em_manager_helper.php:5339
+#: application/helpers/expressions/em_manager_helper.php:2945
+#: application/helpers/expressions/em_manager_helper.php:5477
 #: application/helpers/qanda_helper.php:1349
 #: application/helpers/qanda_helper.php:1675
-#: application/helpers/qanda_helper.php:2320
-#: application/helpers/qanda_helper.php:2683
+#: application/helpers/qanda_helper.php:2194
+#: application/helpers/qanda_helper.php:2553
 msgid "Other:"
 msgstr ""
 
@@ -2779,7 +2780,8 @@ msgstr ""
 
 #: application/controllers/admin/surveyadmin.php:702
 #: application/views/admin/survey/Question/answerOptions_view.php:43
-#: application/views/admin/survey/Question/subQuestion_view.php:40
+#: application/views/admin/survey/Question/subQuestion_view.php:41
+#: application/views/admin/token/managetokenattributes.php:12
 msgid "Base Language"
 msgstr ""
 
@@ -2814,8 +2816,8 @@ msgid "The new question group/question order was successfully saved."
 msgstr ""
 
 #: application/controllers/admin/surveyadmin.php:1318
-#: application/views/admin/labels/labelview_view.php:132
-#: application/views/admin/labels/labelview_view.php:144
+#: application/views/admin/labels/labelview_view.php:136
+#: application/views/admin/labels/labelview_view.php:148
 #: application/views/admin/survey/Question/editQuestion_view.php:262
 #: application/views/admin/survey/QuestionGroups/addGroup_view.php:54
 #: application/views/admin/survey/subview/tabImport_view.php:2
@@ -2826,7 +2828,7 @@ msgid "Please select a file to import!"
 msgstr ""
 
 #: application/controllers/admin/surveyadmin.php:1321
-#: application/views/admin/labels/labelview_view.php:144
+#: application/views/admin/labels/labelview_view.php:148
 #: application/views/admin/templates/importform_view.php:16
 msgid "zip library not supported by PHP, Import ZIP Disabled"
 msgstr ""
@@ -2849,9 +2851,9 @@ msgid "Survey permissions"
 msgstr ""
 
 #: application/controllers/admin/surveypermission.php:49
-#: application/views/admin/labels/labelview_view.php:37
+#: application/views/admin/labels/labelview_view.php:41
 #: application/views/admin/quotas/viewquotas_view.php:19
-#: application/views/admin/survey/Question/subQuestion_view.php:79
+#: application/views/admin/survey/Question/subQuestion_view.php:80
 #: application/views/admin/survey/subview/tabPanelIntegration_view.php:8
 #: application/views/admin/token/browse.php:72
 #: application/views/admin/user/editusers.php:5
@@ -2901,7 +2903,6 @@ msgstr ""
 #: application/views/admin/assessments_view.php:32
 #: application/views/admin/browse/browseidheader_view.php:14
 #: application/views/admin/saved/savedlist_view.php:29
-#: application/views/admin/token/browse.php:61
 #: application/views/admin/user/editusers.php:24
 #: application/views/admin/user/editusers.php:93
 #: application/views/admin/usergroup/usergroupbar_view.php:43
@@ -3016,7 +3017,7 @@ msgid "Export"
 msgstr ""
 
 #: application/controllers/admin/surveypermission.php:439
-#: application/helpers/replacements_helper.php:573
+#: application/helpers/replacements_helper.php:582
 #: application/views/admin/user/setuserrights.php:119
 msgid "Save Now"
 msgstr ""
@@ -3059,12 +3060,12 @@ msgid "This file is not a valid ZIP file archive. Import failed."
 msgstr ""
 
 #: application/controllers/admin/templates.php:124
-#: application/core/Survey_Common_Action.php:956
+#: application/core/Survey_Common_Action.php:963
 msgid "Copy failed"
 msgstr ""
 
 #: application/controllers/admin/templates.php:129
-#: application/core/Survey_Common_Action.php:963
+#: application/core/Survey_Common_Action.php:970
 #: application/views/admin/participants/attributeMapCSV_view.php:18
 #: application/views/admin/participants/displayParticipants_view.php:119
 #: application/views/admin/participants/participantsPanel_view.php:5
@@ -3074,7 +3075,7 @@ msgid "OK"
 msgstr ""
 
 #: application/controllers/admin/templates.php:135
-#: application/core/Survey_Common_Action.php:972
+#: application/core/Survey_Common_Action.php:979
 msgid "Forbidden Extension"
 msgstr ""
 
@@ -3301,7 +3302,7 @@ msgstr ""
 #: application/controllers/admin/tokens.php:484
 #: application/controllers/admin/tokens.php:590
 #: application/controllers/admin/tokens.php:695
-#: application/controllers/admin/tokens.php:813
+#: application/controllers/admin/tokens.php:818
 msgid "%s cannot be empty"
 msgstr ""
 
@@ -3310,7 +3311,7 @@ msgid "The token entry was successfully updated."
 msgstr ""
 
 #: application/controllers/admin/tokens.php:707
-#: application/controllers/admin/tokens.php:845
+#: application/controllers/admin/tokens.php:850
 #: application/views/admin/token/addtokenpost.php:7
 #: application/views/admin/token/addtokenpost.php:14
 #: application/views/admin/token/tokenbar.php:12
@@ -3332,142 +3333,142 @@ msgstr ""
 msgid "Show this token entry"
 msgstr ""
 
-#: application/controllers/admin/tokens.php:844
+#: application/controllers/admin/tokens.php:849
 msgid "New dummy tokens were added."
 msgstr ""
 
-#: application/controllers/admin/tokens.php:940
+#: application/controllers/admin/tokens.php:945
 msgid "%s field(s) were successfully added."
 msgstr ""
 
-#: application/controllers/admin/tokens.php:941
-#: application/controllers/admin/tokens.php:992
+#: application/controllers/admin/tokens.php:946
+#: application/controllers/admin/tokens.php:997
 msgid "Back to attribute field management."
 msgstr ""
 
-#: application/controllers/admin/tokens.php:991
+#: application/controllers/admin/tokens.php:996
 msgid "Token attribute descriptions were successfully updated."
 msgstr ""
 
-#: application/controllers/admin/tokens.php:1181
+#: application/controllers/admin/tokens.php:1186
 msgid "Email to {FIRSTNAME} {LASTNAME} ({EMAIL}) delayed: Token is not yet valid."
 msgstr ""
 
-#: application/controllers/admin/tokens.php:1185
+#: application/controllers/admin/tokens.php:1190
 msgid "Email to {FIRSTNAME} {LASTNAME} ({EMAIL}) skipped: Token is not valid anymore."
 msgstr ""
 
-#: application/controllers/admin/tokens.php:1193
+#: application/controllers/admin/tokens.php:1198
 msgid "Invitation sent to:"
 msgstr ""
 
-#: application/controllers/admin/tokens.php:1198
+#: application/controllers/admin/tokens.php:1203
 msgid "Reminder sent to:"
 msgstr ""
 
-#: application/controllers/admin/tokens.php:1212
+#: application/controllers/admin/tokens.php:1217
 msgid "Email to {FIRSTNAME} {LASTNAME} ({EMAIL}) failed. Error Message:"
 msgstr ""
 
-#: application/controllers/admin/tokens.php:1242
+#: application/controllers/admin/tokens.php:1247
 msgid "There were no eligible emails to send. This will be because none satisfied the criteria of:"
 msgstr ""
 
-#: application/controllers/admin/tokens.php:1243
+#: application/controllers/admin/tokens.php:1248
 msgid "having a valid email address"
 msgstr ""
 
-#: application/controllers/admin/tokens.php:1244
+#: application/controllers/admin/tokens.php:1249
 msgid "not having been sent an invitation already"
 msgstr ""
 
-#: application/controllers/admin/tokens.php:1245
+#: application/controllers/admin/tokens.php:1250
 msgid "having already completed the survey"
 msgstr ""
 
-#: application/controllers/admin/tokens.php:1246
+#: application/controllers/admin/tokens.php:1251
 msgid "having a token"
 msgstr ""
 
-#: application/controllers/admin/tokens.php:1328
+#: application/controllers/admin/tokens.php:1333
 msgid "Uploading LDAP Query"
 msgstr ""
 
-#: application/controllers/admin/tokens.php:1541
+#: application/controllers/admin/tokens.php:1546
 msgid "Can't bind to the LDAP directory"
 msgstr ""
 
-#: application/controllers/admin/tokens.php:1548
+#: application/controllers/admin/tokens.php:1553
 msgid "Can't connect to the LDAP directory"
 msgstr ""
 
-#: application/controllers/admin/tokens.php:1882
-#: application/controllers/admin/tokens.php:1896
+#: application/controllers/admin/tokens.php:1887
+#: application/controllers/admin/tokens.php:1901
 msgid "Create tokens"
 msgstr ""
 
-#: application/controllers/admin/tokens.php:1883
+#: application/controllers/admin/tokens.php:1888
 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:1897
+#: application/controllers/admin/tokens.php:1902
 msgid "%s token has been created."
 msgid_plural "%s tokens have been created."
 msgstr[0] ""
 msgstr[1] ""
 
-#: application/controllers/admin/tokens.php:1927
-#: application/controllers/admin/tokens.php:1944
+#: application/controllers/admin/tokens.php:1934
+#: application/controllers/admin/tokens.php:1955
 msgid "Delete Tokens Table"
 msgstr ""
 
-#: application/controllers/admin/tokens.php:1928
+#: application/controllers/admin/tokens.php:1935
 msgid "If you delete this table tokens will no longer be required to access this survey."
 msgstr ""
 
-#: application/controllers/admin/tokens.php:1928
+#: application/controllers/admin/tokens.php:1935
 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:1931
+#: application/controllers/admin/tokens.php:1938
 msgid "Delete Tokens"
 msgstr ""
 
-#: application/controllers/admin/tokens.php:1945
+#: application/controllers/admin/tokens.php:1956
 msgid "The tokens table has now been removed and tokens are no longer required to access this survey."
 msgstr ""
 
-#: application/controllers/admin/tokens.php:1945
+#: application/controllers/admin/tokens.php:1956
 msgid "A backup of this table has been made and can be accessed by your system administrator."
 msgstr ""
 
-#: application/controllers/admin/tokens.php:1990
+#: application/controllers/admin/tokens.php:2001
 #: application/views/admin/globalSettings_view.php:10
 #: application/views/admin/token/bounce.php:1
 #: application/views/admin/token/tokenbar.php:78
 msgid "Bounce settings"
 msgstr ""
 
-#: application/controllers/admin/tokens.php:1991
+#: application/controllers/admin/tokens.php:2002
 msgid "Bounce settings have been saved."
 msgstr ""
 
-#: application/controllers/admin/tokens.php:2064
+#: application/controllers/admin/tokens.php:2075
 #: application/views/admin/export/exportresults_view.php:115
 #: application/views/admin/token/tokenbar.php:3
 #: application/views/admin/token/tokenwarning.php:3
 msgid "Token control"
 msgstr ""
 
-#: application/controllers/admin/tokens.php:2065
+#: application/controllers/admin/tokens.php:2076
 msgid "A token table has been created for this survey."
 msgstr ""
 
-#: application/controllers/admin/tokens.php:2075
+#: application/controllers/admin/tokens.php:2090
 msgid "Import old tokens"
 msgstr ""
 
-#: application/controllers/admin/tokens.php:2076
+#: application/controllers/admin/tokens.php:2091
 msgid "A token table has been created for this survey and the old tokens were imported."
 msgstr ""
 
@@ -3490,12 +3491,12 @@ msgid "Return to survey administration"
 msgstr ""
 
 #: application/controllers/admin/translate.php:304
-#: application/core/Survey_Common_Action.php:535
+#: application/core/Survey_Common_Action.php:542
 msgid "Test this survey"
 msgstr ""
 
 #: application/controllers/admin/translate.php:304
-#: application/core/Survey_Common_Action.php:539
+#: application/core/Survey_Common_Action.php:546
 msgid "Execute this survey"
 msgstr ""
 
@@ -3514,14 +3515,15 @@ msgstr ""
 #: application/helpers/common_helper.php:621
 #: application/helpers/common_helper.php:1274
 #: application/helpers/common_helper.php:1344
-#: application/helpers/common_helper.php:6916
-#: application/helpers/common_helper.php:6953
-#: application/helpers/common_helper.php:7349
-#: application/helpers/common_helper.php:7392
+#: application/helpers/common_helper.php:6921
+#: application/helpers/common_helper.php:6958
+#: application/helpers/common_helper.php:7354
+#: application/helpers/common_helper.php:7397
 #: application/helpers/qanda_helper.php:1312
 #: application/helpers/qanda_helper.php:1492
-#: application/helpers/qanda_helper.php:6732
-#: application/helpers/qanda_helper.php:6786
+#: application/helpers/qanda_helper.php:2103
+#: application/helpers/qanda_helper.php:6594
+#: application/helpers/qanda_helper.php:6648
 #: application/views/admin/dataentry/content_view.php:84
 #: application/views/admin/dataentry/content_view.php:94
 #: application/views/admin/labels/labelsetsbar_view.php:22
@@ -3533,6 +3535,7 @@ msgid "Survey title and description"
 msgstr ""
 
 #: application/controllers/admin/translate.php:462
+#: application/helpers/expressions/em_manager_helper.php:8021
 #: application/views/admin/survey/QuestionGroups/addGroup_view.php:33
 #: application/views/admin/survey/QuestionGroups/addGroup_view.php:35
 #: application/views/admin/survey/QuestionGroups/editGroup_view.php:19
@@ -3553,6 +3556,7 @@ msgid "Welcome and end text"
 msgstr ""
 
 #: application/controllers/admin/translate.php:492
+#: application/helpers/expressions/em_manager_helper.php:8035
 #: application/views/admin/survey/editLocalSettings_view.php:13
 #: application/views/admin/survey/editLocalSettings_view.php:15
 #: application/views/admin/survey/subview/tabGeneralNewSurvey_view.php:29
@@ -3865,8 +3869,8 @@ msgstr ""
 
 #: application/controllers/survey/index.php:440
 #: application/controllers/survey/index.php:444
-#: application/helpers/replacements_helper.php:433
-#: application/helpers/replacements_helper.php:445
+#: application/helpers/replacements_helper.php:442
+#: application/helpers/replacements_helper.php:454
 msgid "Load unfinished survey"
 msgstr ""
 
@@ -3895,113 +3899,113 @@ msgstr ""
 msgid "Your token seems to be valid but can be used only during a certain time period."
 msgstr ""
 
-#: application/controllers/survey/index.php:679
+#: application/controllers/survey/index.php:678
 msgid "Your responses were successfully saved."
 msgstr ""
 
-#: application/core/Survey_Common_Action.php:612
+#: application/core/Survey_Common_Action.php:619
 #: application/helpers/common_helper.php:428
 #: application/helpers/common_helper.php:431
 #: application/helpers/common_helper.php:625
 #: application/helpers/common_helper.php:1275
 #: application/helpers/common_helper.php:1345
-#: application/helpers/common_helper.php:3847
-#: application/helpers/common_helper.php:7350
-#: application/helpers/common_helper.php:7393
+#: application/helpers/common_helper.php:3860
+#: application/helpers/common_helper.php:7355
+#: application/helpers/common_helper.php:7398
 #: application/views/admin/token/bounce.php:14
 #: application/views/admin/token/bounce.php:57
 msgid "None"
 msgstr ""
 
-#: application/core/Survey_Common_Action.php:664
+#: application/core/Survey_Common_Action.php:671
 #: application/views/admin/survey/subview/tabTokens_view.php:24
 msgid "Responses to this survey are anonymized."
 msgstr ""
 
-#: application/core/Survey_Common_Action.php:668
+#: application/core/Survey_Common_Action.php:675
 #: application/views/admin/survey/subview/tabTokens_view.php:22
 msgid "Responses to this survey are NOT anonymized."
 msgstr ""
 
-#: application/core/Survey_Common_Action.php:672
+#: application/core/Survey_Common_Action.php:679
 msgid "It is presented question by question."
 msgstr ""
 
-#: application/core/Survey_Common_Action.php:676
+#: application/core/Survey_Common_Action.php:683
 msgid "It is presented group by group."
 msgstr ""
 
-#: application/core/Survey_Common_Action.php:680
+#: application/core/Survey_Common_Action.php:687
 msgid "It is presented on one single page."
 msgstr ""
 
-#: application/core/Survey_Common_Action.php:686
+#: application/core/Survey_Common_Action.php:693
 msgid "No question index will be shown with this format."
 msgstr ""
 
-#: application/core/Survey_Common_Action.php:690
+#: application/core/Survey_Common_Action.php:697
 msgid "A question index will be shown; participants will be able to jump between viewed questions."
 msgstr ""
 
-#: application/core/Survey_Common_Action.php:695
+#: application/core/Survey_Common_Action.php:702
 #: application/views/admin/survey/subview/tabNotification_view.php:22
 msgid "Responses will be date stamped."
 msgstr ""
 
-#: application/core/Survey_Common_Action.php:699
+#: application/core/Survey_Common_Action.php:706
 msgid "IP Addresses will be logged"
 msgstr ""
 
-#: application/core/Survey_Common_Action.php:703
+#: application/core/Survey_Common_Action.php:710
 msgid "Referrer URL will be saved."
 msgstr ""
 
-#: application/core/Survey_Common_Action.php:707
+#: application/core/Survey_Common_Action.php:714
 msgid "It uses cookies for access control."
 msgstr ""
 
-#: application/core/Survey_Common_Action.php:711
+#: application/core/Survey_Common_Action.php:718
 msgid "If tokens are used, the public may register for this survey"
 msgstr ""
 
-#: application/core/Survey_Common_Action.php:715
+#: application/core/Survey_Common_Action.php:722
 msgid "Participants can save partially finished surveys"
 msgstr ""
 
-#: application/core/Survey_Common_Action.php:719
+#: application/core/Survey_Common_Action.php:726
 msgid "Basic email notification is sent to:"
 msgstr ""
 
-#: application/core/Survey_Common_Action.php:723
+#: application/core/Survey_Common_Action.php:730
 msgid "Detailed email notification with response data is sent to:"
 msgstr ""
 
-#: application/core/Survey_Common_Action.php:728
+#: application/core/Survey_Common_Action.php:735
 msgid "Regenerate question codes:"
 msgstr ""
 
-#: application/core/Survey_Common_Action.php:730
-#: application/core/Survey_Common_Action.php:733
+#: application/core/Survey_Common_Action.php:737
+#: application/core/Survey_Common_Action.php:740
 msgid "Are you sure you want regenerate the question codes?"
 msgstr ""
 
-#: application/core/Survey_Common_Action.php:731
+#: application/core/Survey_Common_Action.php:738
 msgid "Straight"
 msgstr ""
 
-#: application/core/Survey_Common_Action.php:734
+#: application/core/Survey_Common_Action.php:741
 msgid "By Group"
 msgstr ""
 
-#: application/core/Survey_Common_Action.php:832
+#: application/core/Survey_Common_Action.php:839
 msgid "Survey cannot be activated yet."
 msgstr ""
 
-#: application/core/Survey_Common_Action.php:835
+#: application/core/Survey_Common_Action.php:842
 msgid "You need to add question groups"
 msgstr ""
 
-#: application/core/Survey_Common_Action.php:839
+#: application/core/Survey_Common_Action.php:846
 msgid "You need to add questions"
 msgstr ""
 
@@ -4027,7 +4031,7 @@ msgid "Clear Responses"
 msgstr ""
 
 #: application/helpers/SurveyRuntimeHelper.php:443
-#: application/helpers/replacements_helper.php:827
+#: application/helpers/replacements_helper.php:844
 #: application/views/admin/templates/templateeditor_completed_view.php:2
 msgid "Thank you!"
 msgstr ""
@@ -4065,32 +4069,32 @@ msgstr ""
 msgid "There are no more questions. Please press the <Submit> button to finish this survey."
 msgstr ""
 
-#: application/helpers/SurveyRuntimeHelper.php:877
+#: application/helpers/SurveyRuntimeHelper.php:888
 #: application/helpers/qanda_helper.php:494
 msgid "One or more mandatory questions have not been answered. You cannot proceed until these have been completed."
 msgstr ""
 
-#: application/helpers/SurveyRuntimeHelper.php:883
+#: application/helpers/SurveyRuntimeHelper.php:894
 #: application/helpers/qanda_helper.php:524
 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:889
+#: application/helpers/SurveyRuntimeHelper.php:900
 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:1027
+#: application/helpers/SurveyRuntimeHelper.php:1038
 #: application/helpers/frontend_helper.php:2739
 msgid "This survey is currently not active. You will not be able to save your responses."
 msgstr ""
 
-#: application/helpers/SurveyRuntimeHelper.php:1035
+#: application/helpers/SurveyRuntimeHelper.php:1046
 msgid "Question index"
 msgstr ""
 
-#: application/helpers/SurveyRuntimeHelper.php:1103
+#: application/helpers/SurveyRuntimeHelper.php:1114
 #: application/helpers/frontend_helper.php:2210
-#: application/helpers/replacements_helper.php:384
+#: application/helpers/replacements_helper.php:385
 #: application/views/admin/dataentry/active_html_view.php:67
 #: application/views/admin/dataentry/includes/editdata/editdata.php:57
 #: application/views/admin/dataentry/insert.php:41
@@ -4981,13 +4985,14 @@ msgstr ""
 #: application/helpers/common_helper.php:3664
 #: application/helpers/common_helper.php:3684
 #: application/helpers/common_helper.php:3710
-#: application/helpers/common_helper.php:3772
-#: application/helpers/common_helper.php:3806
-#: application/helpers/common_helper.php:3815
-#: application/helpers/common_helper.php:3823
-#: application/helpers/common_helper.php:3835
-#: application/helpers/common_helper.php:3844
-#: application/helpers/common_helper.php:4036
+#: application/helpers/common_helper.php:3723
+#: application/helpers/common_helper.php:3785
+#: application/helpers/common_helper.php:3819
+#: application/helpers/common_helper.php:3828
+#: application/helpers/common_helper.php:3836
+#: application/helpers/common_helper.php:3848
+#: application/helpers/common_helper.php:3857
+#: application/helpers/common_helper.php:4049
 msgid "Display"
 msgstr ""
 
@@ -5022,7 +5027,7 @@ msgstr ""
 #: application/helpers/common_helper.php:3469
 #: application/helpers/common_helper.php:3622
 #: application/helpers/common_helper.php:3633
-#: application/helpers/common_helper.php:4107
+#: application/helpers/common_helper.php:4120
 msgid "Logic"
 msgstr ""
 
@@ -5065,7 +5070,7 @@ msgid "If one of the subquestions is marked then for each marked subquestion thi
 msgstr ""
 
 #: application/helpers/common_helper.php:3109
-#: application/views/admin/labels/labelview_view.php:35
+#: application/views/admin/labels/labelview_view.php:39
 #: application/views/admin/survey/Question/answerOptions_view.php:22
 #: application/views/admin/survey/Question/answerOptions_view.php:68
 msgid "Assessment value"
@@ -5163,9 +5168,9 @@ msgstr ""
 #: application/helpers/common_helper.php:3477
 #: application/helpers/common_helper.php:3485
 #: application/helpers/common_helper.php:3555
-#: application/helpers/common_helper.php:4020
-#: application/helpers/common_helper.php:4028
-#: application/helpers/common_helper.php:4119
+#: application/helpers/common_helper.php:4033
+#: application/helpers/common_helper.php:4041
+#: application/helpers/common_helper.php:4132
 msgid "Input"
 msgstr ""
 
@@ -5587,129 +5592,137 @@ msgstr ""
 msgid "Random answer order"
 msgstr ""
 
-#: application/helpers/common_helper.php:3713
+#: application/helpers/common_helper.php:3716
+msgid "Show javascript alert"
+msgstr ""
+
+#: application/helpers/common_helper.php:3717
+msgid "Show an alert if answers exceeds the number of max answers"
+msgstr ""
+
+#: application/helpers/common_helper.php:3726
 msgid "Get order from previous question"
 msgstr ""
 
-#: application/helpers/common_helper.php:3714
+#: application/helpers/common_helper.php:3727
 msgid "Enter question ID to get subquestion order from a previous question"
 msgstr ""
 
-#: application/helpers/common_helper.php:3718
-#: application/helpers/common_helper.php:3729
-#: application/helpers/common_helper.php:3737
-#: application/helpers/common_helper.php:3745
-#: application/helpers/common_helper.php:3753
-#: application/helpers/common_helper.php:3761
-#: application/helpers/common_helper.php:3787
-#: application/helpers/common_helper.php:3798
+#: application/helpers/common_helper.php:3731
+#: application/helpers/common_helper.php:3742
+#: application/helpers/common_helper.php:3750
+#: application/helpers/common_helper.php:3758
+#: application/helpers/common_helper.php:3766
+#: application/helpers/common_helper.php:3774
+#: application/helpers/common_helper.php:3800
+#: application/helpers/common_helper.php:3811
 msgid "Slider"
 msgstr ""
 
-#: application/helpers/common_helper.php:3724
-#: application/helpers/common_helper.php:3725
-#: application/helpers/common_helper.php:3781
-#: application/helpers/common_helper.php:3782
+#: application/helpers/common_helper.php:3737
+#: application/helpers/common_helper.php:3738
+#: application/helpers/common_helper.php:3794
+#: application/helpers/common_helper.php:3795
 msgid "Use slider layout"
 msgstr ""
 
-#: application/helpers/common_helper.php:3732
-#: application/helpers/common_helper.php:3733
+#: application/helpers/common_helper.php:3745
+#: application/helpers/common_helper.php:3746
 msgid "Slider minimum value"
 msgstr ""
 
-#: application/helpers/common_helper.php:3740
-#: application/helpers/common_helper.php:3741
+#: application/helpers/common_helper.php:3753
+#: application/helpers/common_helper.php:3754
 msgid "Slider maximum value"
 msgstr ""
 
-#: application/helpers/common_helper.php:3748
-#: application/helpers/common_helper.php:3749
+#: application/helpers/common_helper.php:3761
+#: application/helpers/common_helper.php:3762
 msgid "Slider accuracy"
 msgstr ""
 
-#: application/helpers/common_helper.php:3756
-#: application/helpers/common_helper.php:3757
+#: application/helpers/common_helper.php:3769
+#: application/helpers/common_helper.php:3770
 msgid "Slider initial value"
 msgstr ""
 
-#: application/helpers/common_helper.php:3767
+#: application/helpers/common_helper.php:3780
 msgid "The handle is displayed at the middle of the slider (this will not set the initial value)"
 msgstr ""
 
-#: application/helpers/common_helper.php:3768
+#: application/helpers/common_helper.php:3781
 msgid "Slider starts at the middle position"
 msgstr ""
 
-#: application/helpers/common_helper.php:3777
+#: application/helpers/common_helper.php:3790
 msgid "Yes - stars"
 msgstr ""
 
-#: application/helpers/common_helper.php:3778
+#: application/helpers/common_helper.php:3791
 msgid "Yes - slider with emoticon"
 msgstr ""
 
-#: application/helpers/common_helper.php:3793
+#: application/helpers/common_helper.php:3806
 msgid "Display min and max value under the slider"
 msgstr ""
 
-#: application/helpers/common_helper.php:3794
+#: application/helpers/common_helper.php:3807
 msgid "Display slider min and max value"
 msgstr ""
 
-#: application/helpers/common_helper.php:3801
+#: application/helpers/common_helper.php:3814
 msgid "Answer|Left-slider-text|Right-slider-text separator character"
 msgstr ""
 
-#: application/helpers/common_helper.php:3802
+#: application/helpers/common_helper.php:3815
 msgid "Slider left/right text separator"
 msgstr ""
 
-#: application/helpers/common_helper.php:3810
+#: application/helpers/common_helper.php:3823
 msgid "Add a suffix to the answer field"
 msgstr ""
 
-#: application/helpers/common_helper.php:3811
+#: application/helpers/common_helper.php:3824
 msgid "Answer suffix"
 msgstr ""
 
-#: application/helpers/common_helper.php:3818
+#: application/helpers/common_helper.php:3831
 msgid "Width of text input box"
 msgstr ""
 
-#: application/helpers/common_helper.php:3819
+#: application/helpers/common_helper.php:3832
 msgid "Input box width"
 msgstr ""
 
-#: application/helpers/common_helper.php:3829
+#: application/helpers/common_helper.php:3842
 msgid "Present dropdown control(s) instead of list of radio buttons"
 msgstr ""
 
-#: application/helpers/common_helper.php:3830
+#: application/helpers/common_helper.php:3843
 msgid "Use dropdown presentation"
 msgstr ""
 
-#: application/helpers/common_helper.php:3839
+#: application/helpers/common_helper.php:3852
 msgid "For list dropdown boxes, show up to this many rows"
 msgstr ""
 
-#: application/helpers/common_helper.php:3840
+#: application/helpers/common_helper.php:3853
 msgid "Height of dropdown"
 msgstr ""
 
-#: application/helpers/common_helper.php:3848
+#: application/helpers/common_helper.php:3861
 msgid "Order - like 3)"
 msgstr ""
 
-#: application/helpers/common_helper.php:3851
+#: application/helpers/common_helper.php:3864
 msgid "Accelerator keys for list items"
 msgstr ""
 
-#: application/helpers/common_helper.php:3852
+#: application/helpers/common_helper.php:3865
 msgid "Prefix for list items"
 msgstr ""
 
-#: application/helpers/common_helper.php:3859
+#: application/helpers/common_helper.php:3872
 #: application/views/admin/authentication/login.php:12
 #: application/views/admin/user/personalsettings.php:29
 #: application/views/admin/user/personalsettings.php:41
@@ -5717,309 +5730,309 @@ msgstr ""
 msgid "Default"
 msgstr ""
 
-#: application/helpers/common_helper.php:3860
+#: application/helpers/common_helper.php:3873
 msgid "Nominal"
 msgstr ""
 
-#: application/helpers/common_helper.php:3861
+#: application/helpers/common_helper.php:3874
 msgid "Ordinal"
 msgstr ""
 
-#: application/helpers/common_helper.php:3862
+#: application/helpers/common_helper.php:3875
 msgid "Scale"
 msgstr ""
 
-#: application/helpers/common_helper.php:3864
+#: application/helpers/common_helper.php:3877
 msgid "Set a specific SPSS export scale type for this question"
 msgstr ""
 
-#: application/helpers/common_helper.php:3865
+#: application/helpers/common_helper.php:3878
 msgid "SPSS export scale type"
 msgstr ""
 
-#: application/helpers/common_helper.php:3870
-#: application/helpers/common_helper.php:3878
-#: application/helpers/common_helper.php:3890
-#: application/helpers/common_helper.php:3901
-#: application/helpers/common_helper.php:3912
-#: application/helpers/common_helper.php:3921
-#: application/helpers/common_helper.php:3929
-#: application/helpers/common_helper.php:3937
-#: application/helpers/common_helper.php:3946
-#: application/helpers/common_helper.php:3954
-#: application/helpers/common_helper.php:3962
-#: application/helpers/common_helper.php:3970
-#: application/helpers/common_helper.php:3979
-#: application/helpers/common_helper.php:3987
-#: application/helpers/common_helper.php:3995
-#: application/helpers/common_helper.php:4003
-#: application/helpers/common_helper.php:4012
+#: application/helpers/common_helper.php:3883
+#: application/helpers/common_helper.php:3891
+#: application/helpers/common_helper.php:3903
+#: application/helpers/common_helper.php:3914
+#: application/helpers/common_helper.php:3925
+#: application/helpers/common_helper.php:3934
+#: application/helpers/common_helper.php:3942
+#: application/helpers/common_helper.php:3950
+#: application/helpers/common_helper.php:3959
+#: application/helpers/common_helper.php:3967
+#: application/helpers/common_helper.php:3975
+#: application/helpers/common_helper.php:3983
+#: application/helpers/common_helper.php:3992
+#: application/helpers/common_helper.php:4000
+#: application/helpers/common_helper.php:4008
+#: application/helpers/common_helper.php:4016
+#: application/helpers/common_helper.php:4025
 msgid "Timer"
 msgstr ""
 
-#: application/helpers/common_helper.php:3873
+#: application/helpers/common_helper.php:3886
 msgid "Limit time to answer question (in seconds)"
 msgstr ""
 
-#: application/helpers/common_helper.php:3874
+#: application/helpers/common_helper.php:3887
 msgid "Time limit"
 msgstr ""
 
-#: application/helpers/common_helper.php:3881
+#: application/helpers/common_helper.php:3894
 msgid "Warn and move on"
 msgstr ""
 
-#: application/helpers/common_helper.php:3882
+#: application/helpers/common_helper.php:3895
 msgid "Move on without warning"
 msgstr ""
 
-#: application/helpers/common_helper.php:3883
+#: application/helpers/common_helper.php:3896
 msgid "Disable only"
 msgstr ""
 
-#: application/helpers/common_helper.php:3885
+#: application/helpers/common_helper.php:3898
 msgid "Action to perform when time limit is up"
 msgstr ""
 
-#: application/helpers/common_helper.php:3886
+#: application/helpers/common_helper.php:3899
 msgid "Time limit action"
 msgstr ""
 
-#: application/helpers/common_helper.php:3896
+#: application/helpers/common_helper.php:3909
 msgid "Disable the next button until time limit expires"
 msgstr ""
 
-#: application/helpers/common_helper.php:3897
+#: application/helpers/common_helper.php:3910
 msgid "Time limit disable next"
 msgstr ""
 
-#: application/helpers/common_helper.php:3907
+#: application/helpers/common_helper.php:3920
 msgid "Disable the prev button until the time limit expires"
 msgstr ""
 
-#: application/helpers/common_helper.php:3908
+#: application/helpers/common_helper.php:3921
 msgid "Time limit disable prev"
 msgstr ""
 
-#: application/helpers/common_helper.php:3916
+#: application/helpers/common_helper.php:3929
 msgid "The text message that displays in the countdown timer during the countdown"
 msgstr ""
 
-#: application/helpers/common_helper.php:3917
+#: application/helpers/common_helper.php:3930
 msgid "Time limit countdown message"
 msgstr ""
 
-#: application/helpers/common_helper.php:3924
+#: application/helpers/common_helper.php:3937
 msgid "CSS Style for the message that displays in the countdown timer during the countdown"
 msgstr ""
 
-#: application/helpers/common_helper.php:3925
+#: application/helpers/common_helper.php:3938
 msgid "Time limit timer CSS style"
 msgstr ""
 
-#: application/helpers/common_helper.php:3932
+#: application/helpers/common_helper.php:3945
 msgid "Display the 'time limit expiry message' for this many seconds before performing the 'time limit action' (defaults to 1 second if left blank)"
 msgstr ""
 
-#: application/helpers/common_helper.php:3933
+#: application/helpers/common_helper.php:3946
 msgid "Time limit expiry message display time"
 msgstr ""
 
-#: application/helpers/common_helper.php:3941
+#: application/helpers/common_helper.php:3954
 msgid "The message to display when the time limit has expired (a default message will display if this setting is left blank)"
 msgstr ""
 
-#: application/helpers/common_helper.php:3942
+#: application/helpers/common_helper.php:3955
 msgid "Time limit expiry message"
 msgstr ""
 
-#: application/helpers/common_helper.php:3949
+#: application/helpers/common_helper.php:3962
 msgid "CSS style for the 'time limit expiry message'"
 msgstr ""
 
-#: application/helpers/common_helper.php:3950
+#: application/helpers/common_helper.php:3963
 msgid "Time limit message CSS style"
 msgstr ""
 
-#: application/helpers/common_helper.php:3957
+#: application/helpers/common_helper.php:3970
 msgid "Display a 'time limit warning' when there are this many seconds remaining in the countdown (warning will not display if left blank)"
 msgstr ""
 
-#: application/helpers/common_helper.php:3958
+#: application/helpers/common_helper.php:3971
 msgid "1st time limit warning message timer"
 msgstr ""
 
-#: application/helpers/common_helper.php:3965
+#: application/helpers/common_helper.php:3978
 msgid "The 'time limit warning' will stay visible for this many seconds (will not turn off if this setting is left blank)"
 msgstr ""
 
-#: application/helpers/common_helper.php:3966
+#: application/helpers/common_helper.php:3979
 msgid "1st time limit warning message display time"
 msgstr ""
 
-#: application/helpers/common_helper.php:3974
+#: application/helpers/common_helper.php:3987
 msgid "The message to display as a 'time limit warning' (a default warning will display if this is left blank)"
 msgstr ""
 
-#: application/helpers/common_helper.php:3975
+#: application/helpers/common_helper.php:3988
 msgid "1st time limit warning message"
 msgstr ""
 
-#: application/helpers/common_helper.php:3982
+#: application/helpers/common_helper.php:3995
 msgid "CSS style used when the 'time limit warning' message is displayed"
 msgstr ""
 
-#: application/helpers/common_helper.php:3983
+#: application/helpers/common_helper.php:3996
 msgid "1st time limit warning CSS style"
 msgstr ""
 
-#: application/helpers/common_helper.php:3990
+#: application/helpers/common_helper.php:4003
 msgid "Display the 2nd 'time limit warning' when there are this many seconds remaining in the countdown (warning will not display if left blank)"
 msgstr ""
 
-#: application/helpers/common_helper.php:3991
+#: application/helpers/common_helper.php:4004
 msgid "2nd time limit warning message timer"
 msgstr ""
 
-#: application/helpers/common_helper.php:3998
+#: application/helpers/common_helper.php:4011
 msgid "The 2nd 'time limit warning' will stay visible for this many seconds (will not turn off if this setting is left blank)"
 msgstr ""
 
-#: application/helpers/common_helper.php:3999
+#: application/helpers/common_helper.php:4012
 msgid "2nd time limit warning message display time"
 msgstr ""
 
-#: application/helpers/common_helper.php:4007
+#: application/helpers/common_helper.php:4020
 msgid "The 2nd message to display as a 'time limit warning' (a default warning will display if this is left blank)"
 msgstr ""
 
-#: application/helpers/common_helper.php:4008
+#: application/helpers/common_helper.php:4021
 msgid "2nd time limit warning message"
 msgstr ""
 
-#: application/helpers/common_helper.php:4015
+#: application/helpers/common_helper.php:4028
 msgid "CSS style used when the 2nd 'time limit warning' message is displayed"
 msgstr ""
 
-#: application/helpers/common_helper.php:4016
+#: application/helpers/common_helper.php:4029
 msgid "2nd time limit warning CSS style"
 msgstr ""
 
-#: application/helpers/common_helper.php:4023
+#: application/helpers/common_helper.php:4036
 msgid "Specify a custom date/time format (the <i>d/dd m/mm yy/yyyy H/HH M/MM</i> formats and \"-./: \" characters are allowed for day/month/year/hour/minutes without or with leading zero respectively. Defaults to survey's date format"
 msgstr ""
 
-#: application/helpers/common_helper.php:4024
+#: application/helpers/common_helper.php:4037
 msgid "Date/Time format"
 msgstr ""
 
-#: application/helpers/common_helper.php:4031
+#: application/helpers/common_helper.php:4044
 msgid "Minute step interval when using select boxes"
 msgstr ""
 
-#: application/helpers/common_helper.php:4032
+#: application/helpers/common_helper.php:4045
 msgid "Minute step interval"
 msgstr ""
 
-#: application/helpers/common_helper.php:4039
+#: application/helpers/common_helper.php:4052
 msgid "Short names"
 msgstr ""
 
-#: application/helpers/common_helper.php:4040
+#: application/helpers/common_helper.php:4053
 msgid "Full names"
 msgstr ""
 
-#: application/helpers/common_helper.php:4041
+#: application/helpers/common_helper.php:4054
 msgid "Numbers"
 msgstr ""
 
-#: application/helpers/common_helper.php:4043
+#: application/helpers/common_helper.php:4056
 msgid "Change the display style of the month when using select boxes"
 msgstr ""
 
-#: application/helpers/common_helper.php:4044
+#: application/helpers/common_helper.php:4057
 msgid "Month display style"
 msgstr ""
 
-#: application/helpers/common_helper.php:4048
-#: application/helpers/common_helper.php:4059
+#: application/helpers/common_helper.php:4061
+#: application/helpers/common_helper.php:4072
 msgid "File metadata"
 msgstr ""
 
-#: application/helpers/common_helper.php:4054
+#: application/helpers/common_helper.php:4067
 msgid "Is the participant required to give a title to the uploaded file?"
 msgstr ""
 
-#: application/helpers/common_helper.php:4055
+#: application/helpers/common_helper.php:4068
 msgid "Show title"
 msgstr ""
 
-#: application/helpers/common_helper.php:4065
+#: application/helpers/common_helper.php:4078
 msgid "Is the participant required to give a comment to the uploaded file?"
 msgstr ""
 
-#: application/helpers/common_helper.php:4066
+#: application/helpers/common_helper.php:4079
 msgid "Show comment"
 msgstr ""
 
-#: application/helpers/common_helper.php:4075
+#: application/helpers/common_helper.php:4088
 msgid "The participant cannot upload a single file larger than this size"
 msgstr ""
 
-#: application/helpers/common_helper.php:4076
+#: application/helpers/common_helper.php:4089
 msgid "Maximum file size allowed (in KB)"
 msgstr ""
 
-#: application/helpers/common_helper.php:4084
+#: application/helpers/common_helper.php:4097
 msgid "Maximum number of files that the participant can upload for this question"
 msgstr ""
 
-#: application/helpers/common_helper.php:4085
+#: application/helpers/common_helper.php:4098
 msgid "Max number of files"
 msgstr ""
 
-#: application/helpers/common_helper.php:4093
+#: application/helpers/common_helper.php:4106
 msgid "Minimum number of files that the participant must upload for this question"
 msgstr ""
 
-#: application/helpers/common_helper.php:4094
+#: application/helpers/common_helper.php:4107
 msgid "Min number of files"
 msgstr ""
 
-#: application/helpers/common_helper.php:4102
+#: application/helpers/common_helper.php:4115
 msgid "Allowed file types in comma separated format. e.g. pdf,doc,odt"
 msgstr ""
 
-#: application/helpers/common_helper.php:4103
+#: application/helpers/common_helper.php:4116
 msgid "Allowed file types"
 msgstr ""
 
-#: application/helpers/common_helper.php:4110
+#: application/helpers/common_helper.php:4123
 msgid "Place questions into a specified randomization group, all questions included in the specified group will appear in a random order"
 msgstr ""
 
-#: application/helpers/common_helper.php:4111
+#: application/helpers/common_helper.php:4124
 msgid "Randomization group name"
 msgstr ""
 
-#: application/helpers/common_helper.php:4125
+#: application/helpers/common_helper.php:4138
 msgid "Is no answer (missing) allowed when either 'Equals sum value' or 'Minimum sum value' are set?"
 msgstr ""
 
-#: application/helpers/common_helper.php:4126
+#: application/helpers/common_helper.php:4139
 msgid "Value range allows missing"
 msgstr ""
 
-#: application/helpers/common_helper.php:4260
+#: application/helpers/common_helper.php:4273
 msgid "Email was not sent because demo-mode is activated."
 msgstr ""
 
-#: application/helpers/common_helper.php:4381
+#: application/helpers/common_helper.php:4394
 msgid "SMTP debug output:"
 msgstr ""
 
-#: application/helpers/common_helper.php:5259
-#: application/helpers/replacements_helper.php:634
+#: application/helpers/common_helper.php:5272
+#: application/helpers/replacements_helper.php:643
 #: application/views/admin/export/exportresults_view.php:123
 #: application/views/admin/saved/savedlist_view.php:10
 #: application/views/admin/token/browse.php:72
@@ -6027,132 +6040,132 @@ msgstr ""
 msgid "Email address"
 msgstr ""
 
-#: application/helpers/common_helper.php:5260
+#: application/helpers/common_helper.php:5273
 msgid "Token code"
 msgstr ""
 
-#: application/helpers/common_helper.php:5261
+#: application/helpers/common_helper.php:5274
 msgid "Language code"
 msgstr ""
 
-#: application/helpers/common_helper.php:5262
+#: application/helpers/common_helper.php:5275
 msgid "Invitation sent date"
 msgstr ""
 
-#: application/helpers/common_helper.php:5263
+#: application/helpers/common_helper.php:5276
 msgid "Last Reminder sent date"
 msgstr ""
 
-#: application/helpers/common_helper.php:5264
+#: application/helpers/common_helper.php:5277
 msgid "Total numbers of sent reminders"
 msgstr ""
 
-#: application/helpers/common_helper.php:5265
+#: application/helpers/common_helper.php:5278
 #: application/views/admin/token/browse.php:72
 #: application/views/admin/token/browse.php:138
 msgid "Uses left"
 msgstr ""
 
-#: application/helpers/common_helper.php:5284
+#: application/helpers/common_helper.php:5297
 msgid "Attribute %s"
 msgstr ""
 
-#: application/helpers/common_helper.php:6168
+#: application/helpers/common_helper.php:6173
 msgid "Access denied!"
 msgstr ""
 
-#: application/helpers/common_helper.php:6173
+#: application/helpers/common_helper.php:6178
 msgid "You are not allowed dump the database!"
 msgstr ""
 
-#: application/helpers/common_helper.php:6178
+#: application/helpers/common_helper.php:6183
 msgid "You are not allowed export a label set!"
 msgstr ""
 
-#: application/helpers/common_helper.php:6183
+#: application/helpers/common_helper.php:6188
 msgid "You are not allowed to change user data!"
 msgstr ""
 
-#: application/helpers/common_helper.php:6188
+#: application/helpers/common_helper.php:6193
 msgid "You are not allowed to create new surveys!"
 msgstr ""
 
-#: application/helpers/common_helper.php:6193
+#: application/helpers/common_helper.php:6198
 msgid "You are not allowed to delete this survey!"
 msgstr ""
 
-#: application/helpers/common_helper.php:6198
+#: application/helpers/common_helper.php:6203
 msgid "You are not allowed to add new questions for this survey!"
 msgstr ""
 
-#: application/helpers/common_helper.php:6203
+#: application/helpers/common_helper.php:6208
 msgid "You are not allowed to activate this survey!"
 msgstr ""
 
-#: application/helpers/common_helper.php:6208
+#: application/helpers/common_helper.php:6213
 msgid "You are not allowed to stop this survey!"
 msgstr ""
 
-#: application/helpers/common_helper.php:6213
+#: application/helpers/common_helper.php:6218
 msgid "You are not allowed to add a group to this survey!"
 msgstr ""
 
-#: application/helpers/common_helper.php:6219
+#: application/helpers/common_helper.php:6224
 msgid "You are not allowed to order groups in this survey!"
 msgstr ""
 
-#: application/helpers/common_helper.php:6225
+#: application/helpers/common_helper.php:6230
 msgid "You are not allowed to edit this survey!"
 msgstr ""
 
-#: application/helpers/common_helper.php:6230
+#: application/helpers/common_helper.php:6235
 msgid "You are not allowed to edit groups in this survey!"
 msgstr ""
 
-#: application/helpers/common_helper.php:6235
+#: application/helpers/common_helper.php:6240
 msgid "You are not allowed to browse responses!"
 msgstr ""
 
-#: application/helpers/common_helper.php:6240
+#: application/helpers/common_helper.php:6245
 msgid "You are not allowed to set assessment rules!"
 msgstr ""
 
-#: application/helpers/common_helper.php:6245
+#: application/helpers/common_helper.php:6250
 msgid "You are not allowed to delete this group!"
 msgstr ""
 
-#: application/helpers/common_helper.php:6250
+#: application/helpers/common_helper.php:6255
 msgid "You are not allowed to import a survey!"
 msgstr ""
 
-#: application/helpers/common_helper.php:6256
+#: application/helpers/common_helper.php:6261
 msgid "You are not allowed to import a group!"
 msgstr ""
 
-#: application/helpers/common_helper.php:6261
+#: application/helpers/common_helper.php:6266
 msgid "You are not allowed to to import a question!"
 msgstr ""
 
-#: application/helpers/common_helper.php:6270
 #: application/helpers/common_helper.php:6275
+#: application/helpers/common_helper.php:6280
 msgid "Security alert"
 msgstr ""
 
-#: application/helpers/common_helper.php:6270
 #: application/helpers/common_helper.php:6275
+#: application/helpers/common_helper.php:6280
 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:6270
 #: application/helpers/common_helper.php:6275
+#: application/helpers/common_helper.php:6280
 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:6280
+#: application/helpers/common_helper.php:6285
 msgid "You are not allowed to perform this operation!"
 msgstr ""
 
-#: application/helpers/common_helper.php:7027
+#: application/helpers/common_helper.php:7032
 msgid "SQL command failed: %s"
 msgstr ""
 
@@ -6542,195 +6555,210 @@ msgstr ""
 msgid "Missing %s closing right parentheses"
 msgstr ""
 
-#: application/helpers/expressions/em_core_helper.php:1965
+#: application/helpers/expressions/em_core_helper.php:1994
 msgid "Function must have at least %s argument"
 msgid_plural "Function must have at least %s arguments"
 msgstr[0] ""
 msgstr[1] ""
 
-#: application/helpers/expressions/em_core_helper.php:2056
+#: application/helpers/expressions/em_core_helper.php:2085
 msgid "Unsupported number of arguments: %s"
 msgstr ""
 
-#: application/helpers/expressions/em_core_helper.php:2061
+#: application/helpers/expressions/em_core_helper.php:2090
 msgid "Function does not support %s arguments"
 msgstr ""
 
-#: application/helpers/expressions/em_core_helper.php:2062
+#: application/helpers/expressions/em_core_helper.php:2091
 msgid "Function supports this many arguments, where -1=unlimited: %s"
 msgstr ""
 
-#: application/helpers/expressions/em_core_helper.php:2296
+#: application/helpers/expressions/em_core_helper.php:2325
 msgid "Tried to pop value off of empty stack"
 msgstr ""
 
-#: application/helpers/expressions/em_core_helper.php:3358
+#: application/helpers/expressions/em_core_helper.php:3388
 msgid "Invalid PERL Regular Expression: %s"
 msgstr ""
 
-#: application/helpers/expressions/em_manager_helper.php:2433
+#: application/helpers/expressions/em_manager_helper.php:2438
 msgid "Please select at least one answer"
 msgstr ""
 
-#: application/helpers/expressions/em_manager_helper.php:2434
+#: application/helpers/expressions/em_manager_helper.php:2439
 msgid "Please select at least %s answers"
 msgstr ""
 
-#: application/helpers/expressions/em_manager_helper.php:2438
+#: application/helpers/expressions/em_manager_helper.php:2443
 msgid "Please select at most one answer"
 msgstr ""
 
-#: application/helpers/expressions/em_manager_helper.php:2439
+#: application/helpers/expressions/em_manager_helper.php:2444
 msgid "Please select at most %s answers"
 msgstr ""
 
-#: application/helpers/expressions/em_manager_helper.php:2443
+#: application/helpers/expressions/em_manager_helper.php:2448
 msgid "Please select one answer"
 msgstr ""
 
-#: application/helpers/expressions/em_manager_helper.php:2444
+#: application/helpers/expressions/em_manager_helper.php:2449
 msgid "Please select %s answers"
 msgstr ""
 
-#: application/helpers/expressions/em_manager_helper.php:2446
+#: application/helpers/expressions/em_manager_helper.php:2451
 msgid "Please select between %s and %s answers"
 msgstr ""
 
-#: application/helpers/expressions/em_manager_helper.php:2462
-#: application/helpers/expressions/em_manager_helper.php:2483
+#: application/helpers/expressions/em_manager_helper.php:2467
+#: application/helpers/expressions/em_manager_helper.php:2488
 msgid "Each answer must be at least %s"
 msgstr ""
 
-#: application/helpers/expressions/em_manager_helper.php:2464
-#: application/helpers/expressions/em_manager_helper.php:2485
+#: application/helpers/expressions/em_manager_helper.php:2469
+#: application/helpers/expressions/em_manager_helper.php:2490
 msgid "Each answer must be at most %s"
 msgstr ""
 
-#: application/helpers/expressions/em_manager_helper.php:2466
-#: application/helpers/expressions/em_manager_helper.php:2487
+#: application/helpers/expressions/em_manager_helper.php:2471
+#: application/helpers/expressions/em_manager_helper.php:2492
 msgid "Each answer must be %s"
 msgstr ""
 
-#: application/helpers/expressions/em_manager_helper.php:2467
-#: application/helpers/expressions/em_manager_helper.php:2488
+#: application/helpers/expressions/em_manager_helper.php:2472
+#: application/helpers/expressions/em_manager_helper.php:2493
 msgid "Each answer must be between %s and %s"
 msgstr ""
 
-#: application/helpers/expressions/em_manager_helper.php:2504
+#: application/helpers/expressions/em_manager_helper.php:2509
 msgid "The sum must be at least %s"
 msgstr ""
 
-#: application/helpers/expressions/em_manager_helper.php:2506
+#: application/helpers/expressions/em_manager_helper.php:2511
 msgid "The sum must be at most %s"
 msgstr ""
 
-#: application/helpers/expressions/em_manager_helper.php:2508
+#: application/helpers/expressions/em_manager_helper.php:2513
 msgid "The sum must equal %s"
 msgstr ""
 
-#: application/helpers/expressions/em_manager_helper.php:2509
+#: application/helpers/expressions/em_manager_helper.php:2514
 msgid "The sum must be between %s and %s"
 msgstr ""
 
-#: application/helpers/expressions/em_manager_helper.php:2527
+#: application/helpers/expressions/em_manager_helper.php:2532
 msgid "Please upload at least one file"
 msgstr ""
 
-#: application/helpers/expressions/em_manager_helper.php:2528
+#: application/helpers/expressions/em_manager_helper.php:2533
 msgid "Please upload at least %s files"
 msgstr ""
 
-#: application/helpers/expressions/em_manager_helper.php:2532
+#: application/helpers/expressions/em_manager_helper.php:2537
 msgid "Please upload at most one file"
 msgstr ""
 
-#: application/helpers/expressions/em_manager_helper.php:2533
+#: application/helpers/expressions/em_manager_helper.php:2538
 msgid "Please upload at most %s files"
 msgstr ""
 
-#: application/helpers/expressions/em_manager_helper.php:2537
+#: application/helpers/expressions/em_manager_helper.php:2542
 msgid "Please upload one file"
 msgstr ""
 
-#: application/helpers/expressions/em_manager_helper.php:2538
+#: application/helpers/expressions/em_manager_helper.php:2543
 msgid "Please upload %s files"
 msgstr ""
 
-#: application/helpers/expressions/em_manager_helper.php:2540
+#: application/helpers/expressions/em_manager_helper.php:2545
 msgid "Please upload between %s and %s files"
 msgstr ""
 
-#: application/helpers/expressions/em_manager_helper.php:2550
+#: application/helpers/expressions/em_manager_helper.php:2555
 msgid "The sum must equal %s."
 msgstr ""
 
-#: application/helpers/expressions/em_manager_helper.php:2556
+#: application/helpers/expressions/em_manager_helper.php:2561
 msgid "Please also fill in the \"other comment\" field."
 msgstr ""
 
-#: application/helpers/expressions/em_manager_helper.php:2564
+#: application/helpers/expressions/em_manager_helper.php:2569
 msgid "Please check the format of your answer."
 msgstr ""
 
-#: application/helpers/expressions/em_manager_helper.php:4335
+#: application/helpers/expressions/em_manager_helper.php:4472
 msgid "Unable to insert record into survey table"
 msgstr ""
 
-#: application/helpers/expressions/em_manager_helper.php:4350
+#: application/helpers/expressions/em_manager_helper.php:4487
 msgid "Unable to insert record into timings table"
 msgstr ""
 
-#: application/helpers/expressions/em_manager_helper.php:4425
+#: application/helpers/expressions/em_manager_helper.php:4562
 msgid "Error in SQL update"
 msgstr ""
 
-#: application/helpers/expressions/em_manager_helper.php:5316
+#: application/helpers/expressions/em_manager_helper.php:5454
 msgid "This question is mandatory"
 msgstr ""
 
-#: application/helpers/expressions/em_manager_helper.php:5330
+#: application/helpers/expressions/em_manager_helper.php:5468
 msgid "Please check at least one item."
 msgstr ""
 
-#: application/helpers/expressions/em_manager_helper.php:5341
+#: application/helpers/expressions/em_manager_helper.php:5479
 msgid "If you choose '%s' you must provide a description."
 msgstr ""
 
-#: application/helpers/expressions/em_manager_helper.php:5363
-#: application/helpers/expressions/em_manager_helper.php:5400
+#: application/helpers/expressions/em_manager_helper.php:5501
+#: application/helpers/expressions/em_manager_helper.php:5538
 msgid "Please complete all parts"
 msgstr ""
 
-#: application/helpers/expressions/em_manager_helper.php:5392
+#: application/helpers/expressions/em_manager_helper.php:5530
 msgid "Please check at least one box per row"
 msgstr ""
 
-#: application/helpers/expressions/em_manager_helper.php:5408
+#: application/helpers/expressions/em_manager_helper.php:5546
 msgid "Please rank all items"
 msgstr ""
 
-#: application/helpers/expressions/em_manager_helper.php:7837
+#: application/helpers/expressions/em_manager_helper.php:8006
 msgid "Invalid question - probably missing sub-questions or language-specific settings for language %s"
 msgstr ""
 
-#: application/helpers/expressions/em_manager_helper.php:7842
+#: application/helpers/expressions/em_manager_helper.php:8012
+msgid "Logic File for Survey # "
+msgstr ""
+
+#: application/helpers/expressions/em_manager_helper.php:8028
+#: application/views/admin/survey/editLocalSettings_view.php:11
+#: application/views/admin/survey/surveySummary_view.php:40
+msgid "Welcome:"
+msgstr ""
+
+#: application/helpers/expressions/em_manager_helper.php:8042
+#: application/views/admin/survey/surveySummary_view.php:117
+msgid "End URL"
+msgstr ""
+
+#: application/helpers/expressions/em_manager_helper.php:8046
 msgid "Name [ID]"
 msgstr ""
 
-#: application/helpers/expressions/em_manager_helper.php:7842
+#: application/helpers/expressions/em_manager_helper.php:8046
 msgid "Relevance [Validation] (Default)"
 msgstr ""
 
-#: application/helpers/expressions/em_manager_helper.php:7842
+#: application/helpers/expressions/em_manager_helper.php:8046
 msgid "Text [Help] (Tip)"
 msgstr ""
 
-#: application/helpers/expressions/em_manager_helper.php:7894
-#: application/helpers/expressions/em_manager_helper.php:8135
+#: application/helpers/expressions/em_manager_helper.php:8098
+#: application/helpers/expressions/em_manager_helper.php:8343
 msgid "Default:"
 msgstr ""
 
-#: application/helpers/expressions/em_manager_helper.php:7902
+#: application/helpers/expressions/em_manager_helper.php:8106
 #: application/views/admin/survey/Question/editQuestion_view.php:44
 #: application/views/admin/survey/Question/editQuestion_view.php:46
 #: application/views/admin/survey/Question/editQuestion_view.php:68
@@ -6741,47 +6769,47 @@ msgstr ""
 msgid "Help:"
 msgstr ""
 
-#: application/helpers/expressions/em_manager_helper.php:7903
+#: application/helpers/expressions/em_manager_helper.php:8107
 msgid "Tip:"
 msgstr ""
 
-#: application/helpers/expressions/em_manager_helper.php:7920
+#: application/helpers/expressions/em_manager_helper.php:8124
 msgid "Question Attribute"
 msgstr ""
 
-#: application/helpers/expressions/em_manager_helper.php:7920
+#: application/helpers/expressions/em_manager_helper.php:8124
 msgid "Value"
 msgstr ""
 
-#: application/helpers/expressions/em_manager_helper.php:8041
+#: application/helpers/expressions/em_manager_helper.php:8245
 msgid "This variable name has already been used."
 msgstr ""
 
-#: application/helpers/expressions/em_manager_helper.php:8053
+#: application/helpers/expressions/em_manager_helper.php:8257
 msgid "Starting in 1.92, variable names should only contain letters, numbers, and underscores; and may not start with a number. This variable name is deprecated."
 msgstr ""
 
-#: application/helpers/expressions/em_manager_helper.php:8207
+#: application/helpers/expressions/em_manager_helper.php:8415
 msgid "This question has at least %s error."
 msgid_plural "This question has at least %s errors."
 msgstr[0] ""
 msgstr[1] ""
 
-#: application/helpers/expressions/em_manager_helper.php:8246
+#: application/helpers/expressions/em_manager_helper.php:8454
 msgid "%s question contains errors that need to be corrected"
 msgid_plural "%s questions contain errors that need to be corrected"
 msgstr[0] ""
 msgstr[1] ""
 
-#: application/helpers/expressions/em_manager_helper.php:8252
+#: application/helpers/expressions/em_manager_helper.php:8460
 msgid "No syntax errors detected in this survey"
 msgstr ""
 
-#: application/helpers/expressions/em_manager_helper.php:8255
+#: application/helpers/expressions/em_manager_helper.php:8463
 msgid "This group, by itself, does not contain any syntax errors"
 msgstr ""
 
-#: application/helpers/expressions/em_manager_helper.php:8258
+#: application/helpers/expressions/em_manager_helper.php:8466
 msgid "This question, by itself, does not contain any syntax errors"
 msgstr ""
 
@@ -6859,9 +6887,9 @@ msgstr ""
 
 #: application/helpers/frontend_helper.php:1497
 #: application/helpers/frontend_helper.php:1670
-#: application/helpers/replacements_helper.php:570
-#: application/helpers/replacements_helper.php:591
-#: application/helpers/replacements_helper.php:654
+#: application/helpers/replacements_helper.php:579
+#: application/helpers/replacements_helper.php:600
+#: application/helpers/replacements_helper.php:663
 msgid "Security Question"
 msgstr ""
 
@@ -7047,217 +7075,221 @@ msgstr ""
 msgid "Other answer"
 msgstr ""
 
-#: application/helpers/qanda_helper.php:1925
+#: application/helpers/qanda_helper.php:1923
 msgid "Please enter your comment here"
 msgstr ""
 
-#: application/helpers/qanda_helper.php:2267
-msgid "Click on the scissors next to each item on the right to remove the last entry in your ranked list"
+#: application/helpers/qanda_helper.php:2095
+msgid "First choice"
+msgstr ""
+
+#: application/helpers/qanda_helper.php:2097
+msgid "Next choice"
 msgstr ""
 
-#: application/helpers/qanda_helper.php:2611
+#: application/helpers/qanda_helper.php:2483
 msgid "You've marked the \"other\" field for question \"%s\". Please also fill in the accompanying \"other comment\" field."
 msgstr ""
 
-#: application/helpers/qanda_helper.php:2982
+#: application/helpers/qanda_helper.php:2852
 msgid "Upload files"
 msgstr ""
 
-#: application/helpers/qanda_helper.php:2994
+#: application/helpers/qanda_helper.php:2864
 msgid "Upload your files"
 msgstr ""
 
-#: application/helpers/qanda_helper.php:2995
+#: application/helpers/qanda_helper.php:2865
 msgid "Return to survey"
 msgstr ""
 
-#: application/helpers/qanda_helper.php:2998
+#: application/helpers/qanda_helper.php:2868
 msgid "File name"
 msgstr ""
 
-#: application/helpers/qanda_helper.php:3176
-#: application/helpers/qanda_helper.php:3496
-#: application/helpers/qanda_helper.php:4729
-#: application/helpers/qanda_helper.php:6603
+#: application/helpers/qanda_helper.php:3044
+#: application/helpers/qanda_helper.php:3363
+#: application/helpers/qanda_helper.php:4594
+#: application/helpers/qanda_helper.php:6465
 msgid "Error: This question has no answers."
 msgstr ""
 
-#: application/helpers/qanda_helper.php:3639
+#: application/helpers/qanda_helper.php:3506
 msgid "Only numbers may be entered in these fields"
 msgstr ""
 
-#: application/helpers/qanda_helper.php:3678
+#: application/helpers/qanda_helper.php:3545
 msgid "Remaining: "
 msgstr ""
 
-#: application/helpers/qanda_helper.php:3686
+#: application/helpers/qanda_helper.php:3553
 msgid "Total: "
 msgstr ""
 
-#: application/helpers/qanda_helper.php:3888
-#: application/helpers/qanda_helper.php:3889
-#: application/helpers/qanda_helper.php:3893
+#: application/helpers/qanda_helper.php:3755
+#: application/helpers/qanda_helper.php:3756
+#: application/helpers/qanda_helper.php:3760
 #: application/views/admin/dataentry/content_view.php:408
 msgid "Only numbers may be entered in this field"
 msgstr ""
 
-#: application/helpers/qanda_helper.php:4074
-#: application/helpers/qanda_helper.php:4075
+#: application/helpers/qanda_helper.php:3939
+#: application/helpers/qanda_helper.php:3940
 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:5309
-#: application/helpers/qanda_helper.php:5691
-#: application/helpers/qanda_helper.php:6050
-#: application/helpers/qanda_helper.php:6198
-#: application/helpers/qanda_helper.php:6832
+#: application/helpers/qanda_helper.php:5174
+#: application/helpers/qanda_helper.php:5553
+#: application/helpers/qanda_helper.php:5912
+#: application/helpers/qanda_helper.php:6060
+#: application/helpers/qanda_helper.php:6694
 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:5967
+#: application/helpers/qanda_helper.php:5829
 msgid "..."
 msgstr ""
 
-#: application/helpers/qanda_helper.php:6192
+#: application/helpers/qanda_helper.php:6054
 msgid "Error: There are no answers defined for this question."
 msgstr ""
 
-#: application/helpers/replacements_helper.php:340
+#: application/helpers/replacements_helper.php:341
 msgid "There are no questions in this survey"
 msgstr ""
 
-#: application/helpers/replacements_helper.php:344
+#: application/helpers/replacements_helper.php:345
 msgid "There is 1 question in this survey"
 msgstr ""
 
-#: application/helpers/replacements_helper.php:348
+#: application/helpers/replacements_helper.php:349
 msgid "There are {NUMBEROFQUESTIONS} questions in this survey."
 msgstr ""
 
-#: application/helpers/replacements_helper.php:403
+#: application/helpers/replacements_helper.php:413
 msgid "Exit and Clear Survey"
 msgstr ""
 
-#: application/helpers/replacements_helper.php:404
+#: application/helpers/replacements_helper.php:414
 msgid "Are you sure you want to clear all your responses?"
 msgstr ""
 
-#: application/helpers/replacements_helper.php:434
-#: application/helpers/replacements_helper.php:438
-#: application/helpers/replacements_helper.php:458
+#: application/helpers/replacements_helper.php:443
+#: application/helpers/replacements_helper.php:447
+#: application/helpers/replacements_helper.php:467
 msgid "Resume later"
 msgstr ""
 
-#: application/helpers/replacements_helper.php:497
+#: application/helpers/replacements_helper.php:506
 msgid "If you want to check any of the answers you have made, and/or change them, you can do that now by clicking on the [<< prev] button and browsing through your responses."
 msgstr ""
 
-#: application/helpers/replacements_helper.php:504
 #: application/helpers/replacements_helper.php:513
+#: application/helpers/replacements_helper.php:522
 msgid "Restart this Survey"
 msgstr ""
 
-#: application/helpers/replacements_helper.php:522
+#: application/helpers/replacements_helper.php:531
 msgid "To remain anonymous please use a pseudonym as your username, also an email address is not required."
 msgstr ""
 
-#: application/helpers/replacements_helper.php:536
+#: application/helpers/replacements_helper.php:545
 msgid "Return To Survey"
 msgstr ""
 
-#: application/helpers/replacements_helper.php:556
+#: application/helpers/replacements_helper.php:565
 msgid "Repeat Password"
 msgstr ""
 
-#: application/helpers/replacements_helper.php:562
+#: application/helpers/replacements_helper.php:571
 msgid "Your Email"
 msgstr ""
 
-#: application/helpers/replacements_helper.php:577
+#: application/helpers/replacements_helper.php:586
 msgid "Saved name"
 msgstr ""
 
-#: application/helpers/replacements_helper.php:594
+#: application/helpers/replacements_helper.php:603
 msgid "Load Now"
 msgstr ""
 
-#: application/helpers/replacements_helper.php:765
+#: application/helpers/replacements_helper.php:781
 msgid "Answers Cleared"
 msgstr ""
 
-#: application/helpers/replacements_helper.php:768
+#: application/helpers/replacements_helper.php:784
 msgid "Your Assessment"
 msgstr ""
 
-#: application/helpers/replacements_helper.php:769
+#: application/helpers/replacements_helper.php:785
 msgid "Caution: JavaScript execution is disabled in your browser. You may not be able to answer all questions in this survey. Please, verify your browser parameters."
 msgstr ""
 
-#: application/helpers/replacements_helper.php:771
+#: application/helpers/replacements_helper.php:787
 msgid "Close this window"
 msgstr ""
 
-#: application/helpers/replacements_helper.php:784
+#: application/helpers/replacements_helper.php:801
 msgid "Load A Previously Saved Survey"
 msgstr ""
 
-#: application/helpers/replacements_helper.php:785
+#: application/helpers/replacements_helper.php:802
 msgid "You can load a survey that you have previously saved from this screen."
 msgstr ""
 
-#: application/helpers/replacements_helper.php:785
+#: application/helpers/replacements_helper.php:802
 msgid "Type in the 'name' you used to save the survey, and the password."
 msgstr ""
 
-#: application/helpers/replacements_helper.php:793
+#: application/helpers/replacements_helper.php:810
 msgid "A Note On Privacy"
 msgstr ""
 
-#: application/helpers/replacements_helper.php:793
+#: application/helpers/replacements_helper.php:810
 msgid "This survey is anonymous."
 msgstr ""
 
-#: application/helpers/replacements_helper.php:793
+#: application/helpers/replacements_helper.php:810
 msgid "The record kept of your survey responses does not contain any identifying information about you unless a specific question in the survey has asked for this. If you have responded to a survey that used an identifying token to allow you to access the survey, you can rest assured that the identifying token is not kept with your responses. It is managed in a separate database, and will only be updated to indicate that you have (or haven't) completed this survey. There is no way of matching identification tokens with survey responses in this survey."
 msgstr ""
 
-#: application/helpers/replacements_helper.php:812
+#: application/helpers/replacements_helper.php:829
 msgid "You must be registered to complete this survey"
 msgstr ""
 
-#: application/helpers/replacements_helper.php:813
+#: application/helpers/replacements_helper.php:830
 msgid "You may register for this survey if you wish to take part."
 msgstr ""
 
-#: application/helpers/replacements_helper.php:813
+#: application/helpers/replacements_helper.php:830
 msgid "Enter your details below, and an email containing the link to participate in this survey will be sent immediately."
 msgstr ""
 
-#: application/helpers/replacements_helper.php:821
+#: application/helpers/replacements_helper.php:838
 msgid "Save Your Unfinished Survey"
 msgstr ""
 
-#: application/helpers/replacements_helper.php:822
+#: application/helpers/replacements_helper.php:839
 msgid "Enter a name and password for this survey and click save below."
 msgstr ""
 
-#: application/helpers/replacements_helper.php:822
+#: application/helpers/replacements_helper.php:839
 msgid "Your survey will be saved using that name and password, and can be completed later by logging in with the same name and password."
 msgstr ""
 
-#: application/helpers/replacements_helper.php:822
+#: application/helpers/replacements_helper.php:839
 msgid "If you give an email address, an email containing the details will be sent to you."
 msgstr ""
 
-#: application/helpers/replacements_helper.php:822
+#: application/helpers/replacements_helper.php:839
 msgid "After having clicked the save button you can either close this browser window or continue filling out the survey."
 msgstr ""
 
-#: application/helpers/replacements_helper.php:827
+#: application/helpers/replacements_helper.php:844
 msgid "You have completed answering the questions in this survey."
 msgstr ""
 
-#: application/helpers/replacements_helper.php:827
+#: application/helpers/replacements_helper.php:844
 msgid "Click on 'Submit' now to complete the process and save your answers."
 msgstr ""
 
@@ -7442,7 +7474,7 @@ msgid "Italian"
 msgstr ""
 
 #: application/helpers/surveytranslator_helper.php:305
-msgid "Italian (formal)"
+msgid "Italian (informal)"
 msgstr ""
 
 #: application/helpers/surveytranslator_helper.php:312
@@ -7620,7 +7652,7 @@ msgstr ""
 msgid "Moving user templates to new location at %s..."
 msgstr ""
 
-#: application/helpers/update/updatedb_helper.php:1006
+#: application/helpers/update/updatedb_helper.php:1013
 msgid "Database update finished (%s)"
 msgstr ""
 
@@ -9101,10 +9133,6 @@ msgstr ""
 msgid "For easy opening in MS Excel, change the extension to 'tab' or 'txt'"
 msgstr ""
 
-#: application/views/admin/expressions/test/survey_logic_file.php:111
-msgid "Logic file for survey ID %s"
-msgstr ""
-
 #: application/views/admin/globalSettings_view.php:2
 msgid "You must set at last one available language."
 msgstr ""
@@ -9674,7 +9702,7 @@ msgid "Label sets"
 msgstr ""
 
 #: application/views/admin/labels/import_view.php:43
-#: application/views/admin/labels/labelview_view.php:1
+#: application/views/admin/labels/labelview_view.php:5
 msgid "Labels"
 msgstr ""
 
@@ -9771,96 +9799,96 @@ msgstr ""
 msgid "Show help"
 msgstr ""
 
-#: application/views/admin/labels/labelview_view.php:9
-msgid "Uploaded resources management"
+#: application/views/admin/labels/labelview_view.php:2
+msgid "Error: You are trying to use duplicate label codes."
 msgstr ""
 
-#: application/views/admin/labels/labelview_view.php:13
-msgid "Error: You are trying to use duplicate label codes."
+#: application/views/admin/labels/labelview_view.php:3
+#: application/views/admin/survey/Question/subQuestion_view.php:12
+msgid "Error: 'other' is a reserved keyword."
 msgstr ""
 
 #: application/views/admin/labels/labelview_view.php:13
-#: application/views/admin/survey/Question/subQuestion_view.php:28
-msgid "Error: 'other' is a reserved keyword."
+msgid "Uploaded resources management"
 msgstr ""
 
-#: application/views/admin/labels/labelview_view.php:34
+#: application/views/admin/labels/labelview_view.php:38
 #: application/views/admin/survey/Question/answerOptions_view.php:17
 #: application/views/admin/survey/Question/answerOptions_view.php:65
 #: application/views/admin/survey/Question/subQuestion_view.php:4
-#: application/views/admin/survey/Question/subQuestion_view.php:75
+#: application/views/admin/survey/Question/subQuestion_view.php:76
 msgid "Code"
 msgstr ""
 
-#: application/views/admin/labels/labelview_view.php:82
+#: application/views/admin/labels/labelview_view.php:86
 msgid "Label:"
 msgstr ""
 
-#: application/views/admin/labels/labelview_view.php:90
+#: application/views/admin/labels/labelview_view.php:94
 msgid "Insert a new label after this one"
 msgstr ""
 
-#: application/views/admin/labels/labelview_view.php:91
+#: application/views/admin/labels/labelview_view.php:95
 msgid "Delete this label"
 msgstr ""
 
-#: application/views/admin/labels/labelview_view.php:104
+#: application/views/admin/labels/labelview_view.php:108
 #: application/views/admin/survey/Question/answerOptions_view.php:146
-#: application/views/admin/survey/Question/subQuestion_view.php:145
+#: application/views/admin/survey/Question/subQuestion_view.php:146
 msgid "Quick add..."
 msgstr ""
 
-#: application/views/admin/labels/labelview_view.php:105
+#: application/views/admin/labels/labelview_view.php:109
 #: application/views/admin/survey/Question/answerOptions_view.php:200
-#: application/views/admin/survey/Question/subQuestion_view.php:197
+#: application/views/admin/survey/Question/subQuestion_view.php:198
 #: application/views/admin/templates/templatesummary_view.php:51
 msgid "Save changes"
 msgstr ""
 
-#: application/views/admin/labels/labelview_view.php:119
+#: application/views/admin/labels/labelview_view.php:123
 #: application/views/admin/survey/subview/tabResourceManagement_view.php:7
 msgid "Files"
 msgstr ""
 
-#: application/views/admin/labels/labelview_view.php:119
+#: application/views/admin/labels/labelview_view.php:123
 #: application/views/admin/survey/subview/tabResourceManagement_view.php:7
 msgid "Flash"
 msgstr ""
 
-#: application/views/admin/labels/labelview_view.php:119
+#: application/views/admin/labels/labelview_view.php:123
 #: application/views/admin/survey/subview/tabResourceManagement_view.php:7
 msgid "Images"
 msgstr ""
 
-#: application/views/admin/labels/labelview_view.php:120
+#: application/views/admin/labels/labelview_view.php:124
 msgid "Browse uploaded resources"
 msgstr ""
 
-#: application/views/admin/labels/labelview_view.php:126
+#: application/views/admin/labels/labelview_view.php:130
 msgid "Export resources as ZIP archive"
 msgstr ""
 
-#: application/views/admin/labels/labelview_view.php:138
+#: application/views/admin/labels/labelview_view.php:142
 msgid "Select ZIP file:"
 msgstr ""
 
-#: application/views/admin/labels/labelview_view.php:143
+#: application/views/admin/labels/labelview_view.php:147
 msgid "Import resources ZIP archive"
 msgstr ""
 
-#: application/views/admin/labels/labelview_view.php:152
+#: application/views/admin/labels/labelview_view.php:156
 msgid "Enter your labels:"
 msgstr ""
 
-#: application/views/admin/labels/labelview_view.php:154
+#: application/views/admin/labels/labelview_view.php:158
 msgid "Enter one label per line. You can provide a code by separating code and label text with a semikolon or tab. For multilingual surveys you add the translation(s) on the same line separated with a semikolon or tab."
 msgstr ""
 
-#: application/views/admin/labels/labelview_view.php:155
+#: application/views/admin/labels/labelview_view.php:159
 #: application/views/admin/survey/Question/answerOptions_view.php:163
 #: application/views/admin/survey/Question/answerOptions_view.php:175
-#: application/views/admin/survey/Question/subQuestion_view.php:160
-#: application/views/admin/survey/Question/subQuestion_view.php:173
+#: application/views/admin/survey/Question/subQuestion_view.php:161
+#: application/views/admin/survey/Question/subQuestion_view.php:174
 msgid "Replace"
 msgstr ""
 
@@ -10785,7 +10813,6 @@ msgid "Quick-add answers"
 msgstr ""
 
 #: application/views/admin/survey/Question/answerOptions_view.php:23
-#: application/views/admin/survey/Question/subQuestion_view.php:28
 msgid "Error: You are trying to use duplicate answer codes."
 msgstr ""
 
@@ -10796,23 +10823,23 @@ msgstr ""
 
 #: application/views/admin/survey/Question/answerOptions_view.php:27
 #: application/views/admin/survey/Question/answerOptions_view.php:149
-#: application/views/admin/survey/Question/subQuestion_view.php:13
-#: application/views/admin/survey/Question/subQuestion_view.php:147
+#: application/views/admin/survey/Question/subQuestion_view.php:14
+#: application/views/admin/survey/Question/subQuestion_view.php:148
 msgid "Save as label set"
 msgstr ""
 
 #: application/views/admin/survey/Question/answerOptions_view.php:33
-#: application/views/admin/survey/Question/subQuestion_view.php:19
+#: application/views/admin/survey/Question/subQuestion_view.php:20
 msgid "The records have been saved successfully!"
 msgstr ""
 
 #: application/views/admin/survey/Question/answerOptions_view.php:34
-#: application/views/admin/survey/Question/subQuestion_view.php:20
+#: application/views/admin/survey/Question/subQuestion_view.php:21
 msgid "Sorry, the request failed!"
 msgstr ""
 
 #: application/views/admin/survey/Question/answerOptions_view.php:35
-#: application/views/admin/survey/Question/subQuestion_view.php:21
+#: application/views/admin/survey/Question/subQuestion_view.php:22
 msgid "Ok"
 msgstr ""
 
@@ -10837,12 +10864,12 @@ msgid "Delete this answer option"
 msgstr ""
 
 #: application/views/admin/survey/Question/answerOptions_view.php:145
-#: application/views/admin/survey/Question/subQuestion_view.php:144
+#: application/views/admin/survey/Question/subQuestion_view.php:145
 msgid "Predefined label sets..."
 msgstr ""
 
 #: application/views/admin/survey/Question/answerOptions_view.php:160
-#: application/views/admin/survey/Question/subQuestion_view.php:157
+#: application/views/admin/survey/Question/subQuestion_view.php:158
 msgid "Available label sets:"
 msgstr ""
 
@@ -10855,12 +10882,12 @@ msgid "Enter one answer per line. You can provide a code by separating code and
 msgstr ""
 
 #: application/views/admin/survey/Question/answerOptions_view.php:182
-#: application/views/admin/survey/Question/subQuestion_view.php:180
+#: application/views/admin/survey/Question/subQuestion_view.php:181
 msgid "New label set"
 msgstr ""
 
 #: application/views/admin/survey/Question/answerOptions_view.php:183
-#: application/views/admin/survey/Question/subQuestion_view.php:181
+#: application/views/admin/survey/Question/subQuestion_view.php:182
 msgid "Replace existing label set"
 msgstr ""
 
@@ -10869,7 +10896,7 @@ msgid "You are about to replace a given label set with the current answer option
 msgstr ""
 
 #: application/views/admin/survey/Question/answerOptions_view.php:193
-#: application/views/admin/survey/Question/subQuestion_view.php:190
+#: application/views/admin/survey/Question/subQuestion_view.php:191
 msgid "Sorry, the name you entered for the label set is already in the database. Please select a different name."
 msgstr ""
 
@@ -11148,47 +11175,47 @@ msgstr ""
 msgid "Error: You are trying to use duplicate subquestion codes."
 msgstr ""
 
-#: application/views/admin/survey/Question/subQuestion_view.php:26
+#: application/views/admin/survey/Question/subQuestion_view.php:27
 msgid "Edit subquestions"
 msgstr ""
 
-#: application/views/admin/survey/Question/subQuestion_view.php:61
+#: application/views/admin/survey/Question/subQuestion_view.php:62
 msgid "Y-Scale"
 msgstr ""
 
-#: application/views/admin/survey/Question/subQuestion_view.php:66
+#: application/views/admin/survey/Question/subQuestion_view.php:67
 msgid "X-Scale"
 msgstr ""
 
-#: application/views/admin/survey/Question/subQuestion_view.php:76
+#: application/views/admin/survey/Question/subQuestion_view.php:77
 msgid "Subquestion"
 msgstr ""
 
-#: application/views/admin/survey/Question/subQuestion_view.php:123
+#: application/views/admin/survey/Question/subQuestion_view.php:124
 msgid "Subquestion:"
 msgstr ""
 
-#: application/views/admin/survey/Question/subQuestion_view.php:130
+#: application/views/admin/survey/Question/subQuestion_view.php:131
 msgid "Insert a new subquestion after this one"
 msgstr ""
 
-#: application/views/admin/survey/Question/subQuestion_view.php:131
+#: application/views/admin/survey/Question/subQuestion_view.php:132
 msgid "Delete this subquestion"
 msgstr ""
 
-#: application/views/admin/survey/Question/subQuestion_view.php:170
+#: application/views/admin/survey/Question/subQuestion_view.php:171
 msgid "Enter your subquestions:"
 msgstr ""
 
-#: application/views/admin/survey/Question/subQuestion_view.php:171
+#: application/views/admin/survey/Question/subQuestion_view.php:172
 msgid "Enter one subquestion per line. You can provide a code by separating code and subquestion text with a semikolon or tab. For multilingual surveys you add the translation(s) on the same line separated with a semikolon or tab."
 msgstr ""
 
-#: application/views/admin/survey/Question/subQuestion_view.php:186
+#: application/views/admin/survey/Question/subQuestion_view.php:187
 msgid "You are about to replace a given label set with the labels of this subquestions. Continue?"
 msgstr ""
 
-#: application/views/admin/survey/Question/subQuestion_view.php:203
+#: application/views/admin/survey/Question/subQuestion_view.php:204
 msgid "You cannot add/remove subquestions or edit their codes because the survey is active."
 msgstr ""
 
@@ -11603,11 +11630,6 @@ msgstr ""
 msgid "Welcome message:"
 msgstr ""
 
-#: application/views/admin/survey/editLocalSettings_view.php:11
-#: application/views/admin/survey/surveySummary_view.php:40
-msgid "Welcome:"
-msgstr ""
-
 #: application/views/admin/survey/editLocalSettings_view.php:17
 #: application/views/admin/survey/subview/tabGeneralNewSurvey_view.php:34
 msgid "End URL:"
@@ -12215,10 +12237,6 @@ msgstr ""
 msgid "Additional languages:"
 msgstr ""
 
-#: application/views/admin/survey/surveySummary_view.php:117
-msgid "End URL"
-msgstr ""
-
 #: application/views/admin/survey/surveySummary_view.php:125
 msgid "Number of questions/groups"
 msgstr ""
@@ -12601,6 +12619,7 @@ msgstr ""
 #: application/views/admin/token/actions.php:6
 #: application/views/admin/token/actions.php:13
 #: application/views/admin/token/actions.php:28
+#: application/views/admin/token/browse.php:61
 msgid "Are you sure you want to delete the selected entries?"
 msgstr ""
 
@@ -12944,47 +12963,47 @@ msgstr ""
 msgid "Manage token attribute fields"
 msgstr ""
 
-#: application/views/admin/token/managetokenattributes.php:22
+#: application/views/admin/token/managetokenattributes.php:27
 msgid "Attribute field"
 msgstr ""
 
-#: application/views/admin/token/managetokenattributes.php:23
+#: application/views/admin/token/managetokenattributes.php:28
 msgid "Field description"
 msgstr ""
 
-#: application/views/admin/token/managetokenattributes.php:24
+#: application/views/admin/token/managetokenattributes.php:29
 msgid "Mandatory?"
 msgstr ""
 
-#: application/views/admin/token/managetokenattributes.php:25
+#: application/views/admin/token/managetokenattributes.php:30
 msgid "Show during registration?"
 msgstr ""
 
-#: application/views/admin/token/managetokenattributes.php:26
+#: application/views/admin/token/managetokenattributes.php:31
 msgid "Field caption"
 msgstr ""
 
-#: application/views/admin/token/managetokenattributes.php:27
+#: application/views/admin/token/managetokenattributes.php:32
 msgid "Example data"
 msgstr ""
 
-#: application/views/admin/token/managetokenattributes.php:79
+#: application/views/admin/token/managetokenattributes.php:84
 msgid "<no data>"
 msgstr ""
 
-#: application/views/admin/token/managetokenattributes.php:98
+#: application/views/admin/token/managetokenattributes.php:103
 msgid "Add token attributes"
 msgstr ""
 
-#: application/views/admin/token/managetokenattributes.php:100
+#: application/views/admin/token/managetokenattributes.php:105
 msgid "There are %s user attribute fields in this token table"
 msgstr ""
 
-#: application/views/admin/token/managetokenattributes.php:103
+#: application/views/admin/token/managetokenattributes.php:108
 msgid "Number of attribute fields to add:"
 msgstr ""
 
-#: application/views/admin/token/managetokenattributes.php:107
+#: application/views/admin/token/managetokenattributes.php:112
 msgid "Add fields"
 msgstr ""
 
@@ -13526,7 +13545,7 @@ msgid "Set this to the IP/net location of your database server. In most cases \"
 msgstr ""
 
 #: application/views/installer/dbconfig_view.php:44
-msgid "If the database not exists it will be created (necessrary permission provided). If there are existing tables then the LimeSurvey database will be upgraded automatically after installation if necessary."
+msgid "If the database not exists it will be created (necessary permission provided). If there are existing LimeSurvey tables these will be upgraded automatically after installation"
 msgstr ""
 
 #: application/views/installer/dbconfig_view.php:50
diff --git a/locale/cs/LC_MESSAGES/cs.mo b/locale/cs/LC_MESSAGES/cs.mo
index 2e570e80ce0..804e73775ae 100644
Binary files a/locale/cs/LC_MESSAGES/cs.mo and b/locale/cs/LC_MESSAGES/cs.mo differ