diff --git a/locale/_template/limesurvey.pot b/locale/_template/limesurvey.pot
index b96bafec386..4f5cca2dafe 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: 2018-01-10 15:37:52+00:00\n"
+"POT-Creation-Date: 2018-01-12 14:41:03+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -91,7 +91,6 @@ msgid "Back"
 msgstr ""
 
 #: application/controllers/AdminController.php:74
-#: application/controllers/admin/surveyadmin.php:813
 #: application/controllers/admin/tokens.php:2298
 #: application/views/admin/authentication/forgotpassword.php:52
 #: application/views/admin/dataentry/active_html_view.php:118
@@ -413,9 +412,9 @@ msgstr ""
 #: application/controllers/admin/questions.php:245
 #: application/controllers/admin/questions.php:385
 #: application/controllers/admin/questions.php:431
-#: application/controllers/admin/questions.php:645
-#: application/controllers/admin/questions.php:1015
-#: application/controllers/admin/questions.php:1145
+#: application/controllers/admin/questions.php:646
+#: application/controllers/admin/questions.php:1016
+#: application/controllers/admin/questions.php:1146
 #: application/controllers/admin/quotas.php:146
 #: application/controllers/admin/quotas.php:364
 #: application/controllers/admin/quotas.php:418
@@ -427,11 +426,11 @@ msgstr ""
 #: application/controllers/admin/surveyadmin.php:607
 #: application/controllers/admin/surveyadmin.php:634
 #: application/controllers/admin/surveyadmin.php:756
-#: application/controllers/admin/surveyadmin.php:850
-#: application/controllers/admin/surveyadmin.php:976
-#: application/controllers/admin/surveyadmin.php:1057
-#: application/controllers/admin/surveyadmin.php:1150
-#: application/controllers/admin/surveyadmin.php:1374
+#: application/controllers/admin/surveyadmin.php:839
+#: application/controllers/admin/surveyadmin.php:965
+#: application/controllers/admin/surveyadmin.php:1046
+#: application/controllers/admin/surveyadmin.php:1139
+#: application/controllers/admin/surveyadmin.php:1363
 #: application/controllers/admin/surveypermission.php:48
 #: application/controllers/admin/surveypermission.php:225
 #: application/controllers/admin/surveypermission.php:328
@@ -469,7 +468,7 @@ msgid "ID"
 msgstr ""
 
 #: application/controllers/RegisterController.php:165
-#: application/helpers/SurveyRuntimeHelper.php:1606
+#: application/helpers/SurveyRuntimeHelper.php:1615
 msgid "Your answer to the security question was not correct - please try again."
 msgstr ""
 
@@ -882,7 +881,7 @@ msgstr ""
 #: application/controllers/admin/PluginManagerController.php:180
 #: application/controllers/admin/PluginManagerController.php:195
 #: application/controllers/admin/dataentry.php:235
-#: application/controllers/admin/participantsaction.php:2431
+#: application/controllers/admin/participantsaction.php:2436
 #: application/helpers/admin/ajax_helper.php:175
 msgid "No permission"
 msgstr ""
@@ -929,7 +928,7 @@ msgstr ""
 #: application/controllers/admin/SurveymenuEntryController.php:169
 #: application/controllers/admin/export.php:898
 #: application/controllers/admin/questions.php:145
-#: application/controllers/admin/surveyadmin.php:1254
+#: application/controllers/admin/surveyadmin.php:1243
 #: application/controllers/admin/themeoptions.php:42
 #: application/controllers/admin/themeoptions.php:68
 #: application/controllers/admin/themeoptions.php:94
@@ -980,6 +979,7 @@ msgstr ""
 #: application/extensions/admin/grid/MassiveActionsWidget/views/modals/unkown_modal_type.php:14
 #: application/extensions/admin/grid/MassiveActionsWidget/views/modals/yes-no.php:49
 #: application/helpers/replacements_helper.php:344
+#: application/helpers/replacements_helper.php:477
 #: application/views/admin/assessments/assessments_delete.php:24
 #: application/views/admin/conditions/conditionshead_view.php:73
 #: application/views/admin/emailtemplates/emailtemplates_view.php:104
@@ -1046,10 +1046,10 @@ msgstr ""
 #: application/controllers/admin/responses.php:336
 #: application/controllers/admin/responses.php:466
 #: application/controllers/admin/surveyadmin.php:95
-#: application/controllers/admin/surveyadmin.php:951
-#: application/controllers/admin/surveyadmin.php:1002
-#: application/controllers/admin/surveyadmin.php:1164
-#: application/controllers/admin/surveyadmin.php:1760
+#: application/controllers/admin/surveyadmin.php:940
+#: application/controllers/admin/surveyadmin.php:991
+#: application/controllers/admin/surveyadmin.php:1153
+#: application/controllers/admin/surveyadmin.php:1749
 #: application/controllers/admin/tokens.php:46
 #: application/controllers/admin/tokens.php:277
 #: application/controllers/admin/tokens.php:602
@@ -1559,7 +1559,7 @@ msgstr ""
 #: application/core/plugins/ExportSTATAxml/STATAxmlWriter.php:229
 #: application/core/plugins/ExportSTATAxml/STATAxmlWriter.php:238
 #: application/extensions/admin/grid/MassiveActionsWidget/views/modals/yes-no.php:33
-#: application/helpers/SurveyRuntimeHelper.php:439
+#: application/helpers/SurveyRuntimeHelper.php:448
 #: application/helpers/admin/statistics_helper.php:1224
 #: application/helpers/admin/statistics_helper.php:1346
 #: application/helpers/common_helper.php:1185
@@ -1720,7 +1720,7 @@ msgstr ""
 #: application/core/plugins/ExportSTATAxml/STATAxmlWriter.php:233
 #: application/core/plugins/ExportSTATAxml/STATAxmlWriter.php:242
 #: application/extensions/admin/grid/MassiveActionsWidget/views/modals/yes-no.php:41
-#: application/helpers/SurveyRuntimeHelper.php:439
+#: application/helpers/SurveyRuntimeHelper.php:448
 #: application/helpers/admin/statistics_helper.php:1225
 #: application/helpers/admin/statistics_helper.php:1347
 #: application/helpers/common_helper.php:1191
@@ -2157,11 +2157,11 @@ msgstr ""
 #: application/controllers/admin/dataentry.php:181
 #: application/controllers/admin/labels.php:105
 #: application/controllers/admin/labels.php:146
-#: application/controllers/admin/participantsaction.php:682
+#: application/controllers/admin/participantsaction.php:687
 #: application/controllers/admin/questiongroups.php:59
 #: application/controllers/admin/questions.php:188
 #: application/controllers/admin/surveyadmin.php:304
-#: application/controllers/admin/surveyadmin.php:1214
+#: application/controllers/admin/surveyadmin.php:1203
 #: application/controllers/admin/themes.php:156
 #: application/controllers/admin/themes.php:237
 #: application/controllers/admin/themes.php:305
@@ -2608,10 +2608,10 @@ msgid "This ZIP archive contains no valid Resources files. Import failed."
 msgstr ""
 
 #: application/controllers/admin/labels.php:141
-#: application/controllers/admin/participantsaction.php:669
+#: application/controllers/admin/participantsaction.php:674
 #: application/controllers/admin/questiongroups.php:57
 #: application/controllers/admin/questions.php:186
-#: application/controllers/admin/surveyadmin.php:1208
+#: application/controllers/admin/surveyadmin.php:1197
 #: application/controllers/admin/themes.php:129
 #: application/controllers/admin/themes.php:178
 #: application/controllers/admin/tokens.php:1932
@@ -2744,32 +2744,32 @@ msgstr ""
 msgid "Assessment group score"
 msgstr ""
 
-#: application/controllers/admin/participantsaction.php:228
+#: application/controllers/admin/participantsaction.php:233
 msgid "Export %s participants to CSV"
 msgstr ""
 
-#: application/controllers/admin/participantsaction.php:230
+#: application/controllers/admin/participantsaction.php:235
 msgid "Export participant to CSV"
 msgstr ""
 
-#: application/controllers/admin/participantsaction.php:393
+#: application/controllers/admin/participantsaction.php:398
 msgid "No participants deleted"
 msgstr ""
 
-#: application/controllers/admin/participantsaction.php:395
+#: application/controllers/admin/participantsaction.php:400
 msgid "Participant deleted"
 msgstr ""
 
-#: application/controllers/admin/participantsaction.php:594
+#: application/controllers/admin/participantsaction.php:599
 msgid "Participant successfully updated"
 msgstr ""
 
-#: application/controllers/admin/participantsaction.php:625
+#: application/controllers/admin/participantsaction.php:630
 msgid "Participant successfully added"
 msgstr ""
 
-#: application/controllers/admin/participantsaction.php:660
-#: application/controllers/admin/surveyadmin.php:1738
+#: application/controllers/admin/participantsaction.php:665
+#: application/controllers/admin/surveyadmin.php:1727
 #: application/views/admin/labels/_labelviewrightcontent_view.php:57
 #: application/views/admin/labels/_labelviewrightcontent_view.php:77
 #: application/views/admin/survey/Question/importQuestion_view.php:12
@@ -2784,12 +2784,12 @@ msgstr ""
 msgid "Please select a file to import!"
 msgstr ""
 
-#: application/controllers/admin/participantsaction.php:676
+#: application/controllers/admin/participantsaction.php:681
 msgid "This is not a .csv file."
 msgstr ""
 
-#: application/controllers/admin/participantsaction.php:732
-#: application/controllers/admin/surveyadmin.php:1808
+#: application/controllers/admin/participantsaction.php:737
+#: application/controllers/admin/surveyadmin.php:1797
 #: application/controllers/admin/themes.php:219
 #: application/core/Survey_Common_Action.php:1217
 #: application/helpers/frontend_helper.php:2104
@@ -2799,124 +2799,124 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: application/controllers/admin/participantsaction.php:733
+#: application/controllers/admin/participantsaction.php:738
 #: application/views/admin/responses/browsemenubar_view.php:9
 msgid "Summary"
 msgstr ""
 
-#: application/controllers/admin/participantsaction.php:734
+#: application/controllers/admin/participantsaction.php:739
 msgid "Upload summary"
 msgstr ""
 
-#: application/controllers/admin/participantsaction.php:735
+#: application/controllers/admin/participantsaction.php:740
 msgid "You have to pair this field with an existing attribute."
 msgstr ""
 
-#: application/controllers/admin/participantsaction.php:736
+#: application/controllers/admin/participantsaction.php:741
 msgid "Only one CSV attribute is mapped with central attribute."
 msgstr ""
 
-#: application/controllers/admin/participantsaction.php:737
+#: application/controllers/admin/participantsaction.php:742
 #: application/views/admin/participants/attributeMapToken_view.php:9
 #: application/views/admin/participants/attributeMap_view.php:18
 msgid "This list cannot accept token attributes."
 msgstr ""
 
-#: application/controllers/admin/participantsaction.php:1171
+#: application/controllers/admin/participantsaction.php:1176
 msgid "Blacklist settings were saved."
 msgstr ""
 
-#: application/controllers/admin/participantsaction.php:1287
+#: application/controllers/admin/participantsaction.php:1292
 msgid "Select language to add"
 msgstr ""
 
-#: application/controllers/admin/participantsaction.php:1375
+#: application/controllers/admin/participantsaction.php:1380
 msgid "Attribute successfully updated"
 msgstr ""
 
-#: application/controllers/admin/participantsaction.php:1391
+#: application/controllers/admin/participantsaction.php:1396
 msgid "Language successfully deleted"
 msgstr ""
 
-#: application/controllers/admin/participantsaction.php:1393
+#: application/controllers/admin/participantsaction.php:1398
 msgid "There has to be at least one language."
 msgstr ""
 
-#: application/controllers/admin/participantsaction.php:1406
+#: application/controllers/admin/participantsaction.php:1411
 msgid "Attribute successfully deleted"
 msgstr ""
 
-#: application/controllers/admin/participantsaction.php:1433
+#: application/controllers/admin/participantsaction.php:1438
 msgid "%s attribute deleted|%s attributes deleted"
 msgstr ""
 
-#: application/controllers/admin/participantsaction.php:1438
+#: application/controllers/admin/participantsaction.php:1443
 msgid "Error. Deleted %s attribute(s). Error message: %s"
 msgstr ""
 
-#: application/controllers/admin/participantsaction.php:1478
+#: application/controllers/admin/participantsaction.php:1483
 msgid "Attribute display setting updated"
 msgstr ""
 
-#: application/controllers/admin/participantsaction.php:1606
+#: application/controllers/admin/participantsaction.php:1611
 msgid "Attribute was saved."
 msgstr ""
 
-#: application/controllers/admin/participantsaction.php:2033
+#: application/controllers/admin/participantsaction.php:2038
 msgid "%s participants have been shared"
 msgstr ""
 
-#: application/controllers/admin/participantsaction.php:2055
+#: application/controllers/admin/participantsaction.php:2060
 msgid "Participant shared."
 msgstr ""
 
-#: application/controllers/admin/participantsaction.php:2069
+#: application/controllers/admin/participantsaction.php:2074
 msgid "Participant removed from sharing"
 msgstr ""
 
-#: application/controllers/admin/participantsaction.php:2087
+#: application/controllers/admin/participantsaction.php:2092
 msgid "Found no participant share"
 msgstr ""
 
-#: application/controllers/admin/participantsaction.php:2095
+#: application/controllers/admin/participantsaction.php:2100
 msgid "Participant share deleted"
 msgstr ""
 
-#: application/controllers/admin/participantsaction.php:2135
+#: application/controllers/admin/participantsaction.php:2140
 msgid "No participant shares were deleted"
 msgstr ""
 
-#: application/controllers/admin/participantsaction.php:2138
+#: application/controllers/admin/participantsaction.php:2143
 msgid "%s participant share was deleted|%s participant shares were deleted"
 msgstr ""
 
-#: application/controllers/admin/participantsaction.php:2179
+#: application/controllers/admin/participantsaction.php:2184
 msgid "%s participants have been copied to the central participants table"
 msgstr ""
 
-#: application/controllers/admin/participantsaction.php:2183
-#: application/controllers/admin/participantsaction.php:2255
+#: application/controllers/admin/participantsaction.php:2188
+#: application/controllers/admin/participantsaction.php:2260
 msgid "%s entries were not copied because they already existed"
 msgstr ""
 
-#: application/controllers/admin/participantsaction.php:2188
+#: application/controllers/admin/participantsaction.php:2193
 msgid "Attribute values for existing participants have been updated from the token records"
 msgstr ""
 
-#: application/controllers/admin/participantsaction.php:2251
+#: application/controllers/admin/participantsaction.php:2256
 msgid "%s participants have been copied to the survey survey participants table"
 msgstr ""
 
-#: application/controllers/admin/participantsaction.php:2260
+#: application/controllers/admin/participantsaction.php:2265
 msgid "%s entries were skipped because they are blacklisted"
 msgstr ""
 
-#: application/controllers/admin/participantsaction.php:2265
+#: application/controllers/admin/participantsaction.php:2270
 msgid "Attribute values for existing participants have been updated from the participants records"
 msgstr ""
 
-#: application/controllers/admin/participantsaction.php:2328
-#: application/controllers/admin/participantsaction.php:2381
+#: application/controllers/admin/participantsaction.php:2333
+#: application/controllers/admin/participantsaction.php:2386
 #: application/views/admin/participants/attributeMapToken_view.php:8
 msgid "There are no unmapped attributes"
 msgstr ""
@@ -3128,15 +3128,15 @@ msgstr ""
 #: application/controllers/admin/questiongroups.php:402
 #: application/controllers/admin/questiongroups.php:519
 #: application/controllers/admin/questions.php:416
-#: application/controllers/admin/questions.php:629
-#: application/controllers/admin/questions.php:674
-#: application/controllers/admin/questions.php:1005
-#: application/controllers/admin/questions.php:1172
+#: application/controllers/admin/questions.php:630
+#: application/controllers/admin/questions.php:675
+#: application/controllers/admin/questions.php:1006
+#: application/controllers/admin/questions.php:1173
 #: application/controllers/admin/surveyadmin.php:135
 #: application/controllers/admin/surveyadmin.php:194
-#: application/controllers/admin/surveyadmin.php:865
-#: application/controllers/admin/surveyadmin.php:900
-#: application/controllers/admin/surveyadmin.php:1327
+#: application/controllers/admin/surveyadmin.php:854
+#: application/controllers/admin/surveyadmin.php:889
+#: application/controllers/admin/surveyadmin.php:1316
 msgid "Access denied"
 msgstr ""
 
@@ -3189,10 +3189,10 @@ msgid "Group could not be deleted"
 msgstr ""
 
 #: application/controllers/admin/questiongroups.php:373
-#: application/controllers/admin/surveyadmin.php:1030
-#: application/controllers/admin/surveyadmin.php:1115
-#: application/controllers/admin/surveyadmin.php:1587
-#: application/controllers/admin/surveyadmin.php:1600
+#: application/controllers/admin/surveyadmin.php:1019
+#: application/controllers/admin/surveyadmin.php:1104
+#: application/controllers/admin/surveyadmin.php:1576
+#: application/controllers/admin/surveyadmin.php:1589
 #: application/views/admin/assessments/assessments_edit.php:89
 #: application/views/admin/emailtemplates/emailtemplates_view.php:38
 #: application/views/admin/quotas/_form_langsettings.php:15
@@ -3211,7 +3211,7 @@ msgstr ""
 
 #: application/controllers/admin/questions.php:60
 #: application/controllers/admin/responses.php:67
-#: application/controllers/admin/surveyadmin.php:1251
+#: application/controllers/admin/surveyadmin.php:1240
 #: application/core/Survey_Common_Action.php:586
 #: application/core/Survey_Common_Action.php:862
 msgid "Invalid survey ID"
@@ -3236,70 +3236,70 @@ msgstr ""
 msgid "Checked"
 msgstr ""
 
-#: application/controllers/admin/questions.php:603
+#: application/controllers/admin/questions.php:604
 #: application/core/LsDefaultDataSets.php:714
 msgid "Edit answer options"
 msgstr ""
 
-#: application/controllers/admin/questions.php:839
+#: application/controllers/admin/questions.php:840
 #: application/core/LsDefaultDataSets.php:645
 msgid "Edit subquestions"
 msgstr ""
 
-#: application/controllers/admin/questions.php:1016
-#: application/controllers/admin/questions.php:1161
+#: application/controllers/admin/questions.php:1017
+#: application/controllers/admin/questions.php:1162
 #: application/views/admin/survey/Question/editQuestion_view.php:19
 msgid "Add a new question"
 msgstr ""
 
-#: application/controllers/admin/questions.php:1161
+#: application/controllers/admin/questions.php:1162
 #: application/views/admin/survey/Question/editQuestion_view.php:21
 #: application/views/admin/survey/Question/editQuestion_view.php:279
 msgid "Copy question"
 msgstr ""
 
-#: application/controllers/admin/questions.php:1375
+#: application/controllers/admin/questions.php:1376
 #: application/controllers/admin/surveyadmin.php:72
 msgid "Deleted"
 msgstr ""
 
-#: application/controllers/admin/questions.php:1406
+#: application/controllers/admin/questions.php:1407
 msgid "Question could not be deleted. There are conditions for other questions that rely on this question. You cannot delete this question until those conditions are removed."
 msgstr ""
 
-#: application/controllers/admin/questions.php:1436
+#: application/controllers/admin/questions.php:1437
 msgid "Question was successfully deleted."
 msgstr ""
 
-#: application/controllers/admin/questions.php:1451
+#: application/controllers/admin/questions.php:1452
 msgid "You are not authorized to delete questions."
 msgstr ""
 
-#: application/controllers/admin/questions.php:1760
+#: application/controllers/admin/questions.php:1761
 msgid "The existing label set has assessment values assigned."
 msgstr ""
 
-#: application/controllers/admin/questions.php:1760
+#: application/controllers/admin/questions.php:1761
 msgid "If you replace the label set the existing asssessment values will be lost."
 msgstr ""
 
-#: application/controllers/admin/questions.php:1763
+#: application/controllers/admin/questions.php:1764
 msgid "The existing label set has different/more languages."
 msgstr ""
 
-#: application/controllers/admin/questions.php:1763
+#: application/controllers/admin/questions.php:1764
 msgid "If you replace the label set these translations will be lost."
 msgstr ""
 
-#: application/controllers/admin/questions.php:1769
+#: application/controllers/admin/questions.php:1770
 msgid "Do you really want to continue?"
 msgstr ""
 
-#: application/controllers/admin/questions.php:1771
+#: application/controllers/admin/questions.php:1772
 msgid "You are about to replace an existing label set with the current answer options."
 msgstr ""
 
-#: application/controllers/admin/questions.php:1773
+#: application/controllers/admin/questions.php:1774
 #: application/extensions/admin/survey/ListSurveysWidget/views/massive_actions/_selector.php:65
 #: application/extensions/admin/survey/ListSurveysWidget/views/massive_actions/_selector.php:83
 #: application/extensions/admin/survey/ListSurveysWidget/views/massive_actions/_selector.php:99
@@ -3307,7 +3307,7 @@ msgstr ""
 msgid "Continue?"
 msgstr ""
 
-#: application/controllers/admin/questions.php:1992
+#: application/controllers/admin/questions.php:1993
 #: application/views/admin/super/_question_explorer.php:74
 msgid "You can't add questions while the survey is active."
 msgstr ""
@@ -3589,112 +3589,96 @@ msgstr ""
 msgid "This survey is already active."
 msgstr ""
 
-#: application/controllers/admin/surveyadmin.php:803
-msgid "The survey response table could not be created."
-msgstr ""
-
-#: application/controllers/admin/surveyadmin.php:803
-msgid "Usually this is caused by having too many (sub-)questions in your survey. Please try removing questions from your survey."
-msgstr ""
-
-#: application/controllers/admin/surveyadmin.php:805
-msgid "Timings table could not be created."
-msgstr ""
-
-#: application/controllers/admin/surveyadmin.php:809
-msgid "Database error!!"
-msgstr ""
-
-#: application/controllers/admin/surveyadmin.php:859
+#: application/controllers/admin/surveyadmin.php:848
 msgid "Survey deleted."
 msgstr ""
 
-#: application/controllers/admin/surveyadmin.php:888
+#: application/controllers/admin/surveyadmin.php:877
 msgid "Survey files deleted."
 msgstr ""
 
-#: application/controllers/admin/surveyadmin.php:890
+#: application/controllers/admin/surveyadmin.php:879
 msgid "Error: Could not delete survey files."
 msgstr ""
 
-#: application/controllers/admin/surveyadmin.php:896
+#: application/controllers/admin/surveyadmin.php:885
 msgid "Error: Cannot purge files for a survey that is not deleted. Please delete the survey normally in the survey view."
 msgstr ""
 
-#: application/controllers/admin/surveyadmin.php:1188
+#: application/controllers/admin/surveyadmin.php:1177
 msgid "Import survey data"
 msgstr ""
 
-#: application/controllers/admin/surveyadmin.php:1189
+#: application/controllers/admin/surveyadmin.php:1178
 msgid "Survey structure import summary"
 msgstr ""
 
-#: application/controllers/admin/surveyadmin.php:1197
+#: application/controllers/admin/surveyadmin.php:1186
 #: application/views/admin/survey/copySurvey_view.php:11
 #: application/views/admin/survey/subview/tabCopy_view.php:153
 msgid "Copy survey"
 msgstr ""
 
-#: application/controllers/admin/surveyadmin.php:1198
+#: application/controllers/admin/surveyadmin.php:1187
 msgid "Survey copy summary"
 msgstr ""
 
-#: application/controllers/admin/surveyadmin.php:1211
+#: application/controllers/admin/surveyadmin.php:1200
 msgid "Import failed. You specified an invalid file type '%s'."
 msgstr ""
 
-#: application/controllers/admin/surveyadmin.php:1248
+#: application/controllers/admin/surveyadmin.php:1237
 msgid "No survey ID has been provided. Cannot copy survey"
 msgstr ""
 
-#: application/controllers/admin/surveyadmin.php:1269
+#: application/controllers/admin/surveyadmin.php:1258
 msgid "Unknown error while reading the file, no survey created."
 msgstr ""
 
-#: application/controllers/admin/surveyadmin.php:1451
+#: application/controllers/admin/surveyadmin.php:1440
 msgid "The new question group/question order was successfully saved."
 msgstr ""
 
-#: application/controllers/admin/surveyadmin.php:1740
+#: application/controllers/admin/surveyadmin.php:1729
 #: application/views/admin/labels/_labelviewrightcontent_view.php:76
 #: application/views/admin/themes/importform_view.php:14
 #: application/views/admin/themes/templateeditorbar_view.php:251
 msgid "The ZIP library is not activated in your PHP configuration thus importing ZIP files is currently disabled."
 msgstr ""
 
-#: application/controllers/admin/surveyadmin.php:1763
+#: application/controllers/admin/surveyadmin.php:1752
 msgid "The survey was successfully expired by setting an expiration date in the survey settings."
 msgstr ""
 
-#: application/controllers/admin/surveyadmin.php:1869
+#: application/controllers/admin/surveyadmin.php:1858
 msgid "Survey could not be created because it did not have a title"
 msgstr ""
 
-#: application/controllers/admin/surveyadmin.php:1964
+#: application/controllers/admin/surveyadmin.php:1953
 msgid "Warning! Notification email was not updated because it was not valid."
 msgstr ""
 
-#: application/controllers/admin/surveyadmin.php:1971
+#: application/controllers/admin/surveyadmin.php:1960
 msgid "Warning! Bounce email was not updated because it was not valid."
 msgstr ""
 
-#: application/controllers/admin/surveyadmin.php:2027
+#: application/controllers/admin/surveyadmin.php:2016
 msgid "Your new survey was created. We also created a first question group and an example question for you."
 msgstr ""
 
-#: application/controllers/admin/surveyadmin.php:2037
+#: application/controllers/admin/surveyadmin.php:2026
 msgid "Your new survey was created."
 msgstr ""
 
-#: application/controllers/admin/surveyadmin.php:2067
+#: application/controllers/admin/surveyadmin.php:2056
 msgid "My first question group"
 msgstr ""
 
-#: application/controllers/admin/surveyadmin.php:2090
+#: application/controllers/admin/surveyadmin.php:2079
 msgid "A first example question. Please answer this question:"
 msgstr ""
 
-#: application/controllers/admin/surveyadmin.php:2091
+#: application/controllers/admin/surveyadmin.php:2080
 msgid "This is a question help text."
 msgstr ""
 
@@ -5064,6 +5048,8 @@ msgstr ""
 #: application/controllers/survey/index.php:482
 #: application/helpers/replacements_helper.php:149
 #: application/helpers/replacements_helper.php:151
+#: application/helpers/replacements_helper.php:403
+#: application/helpers/replacements_helper.php:405
 msgid "Please contact %s ( %s ) for further assistance."
 msgstr ""
 
@@ -5178,8 +5164,8 @@ msgstr ""
 #: application/helpers/update/updatedb_helper.php:768
 #: application/helpers/update/updatedb_helper.php:802
 #: application/helpers/update/updatedb_helper.php:877
-#: application/helpers/update/updatedb_helper.php:999
-#: application/helpers/update/updatedb_helper.php:1647
+#: application/helpers/update/updatedb_helper.php:1009
+#: application/helpers/update/updatedb_helper.php:1657
 msgid "End tour"
 msgstr ""
 
@@ -5187,8 +5173,8 @@ msgstr ""
 #: application/helpers/update/updatedb_helper.php:768
 #: application/helpers/update/updatedb_helper.php:802
 #: application/helpers/update/updatedb_helper.php:871
-#: application/helpers/update/updatedb_helper.php:999
-#: application/helpers/update/updatedb_helper.php:1647
+#: application/helpers/update/updatedb_helper.php:1009
+#: application/helpers/update/updatedb_helper.php:1657
 #: application/views/installer/dbconfig_view.php:63
 #: application/views/installer/dbsettings_view.php:12
 #: application/views/installer/license_view.php:16
@@ -5202,8 +5188,8 @@ msgstr ""
 #: application/helpers/update/updatedb_helper.php:768
 #: application/helpers/update/updatedb_helper.php:802
 #: application/helpers/update/updatedb_helper.php:872
-#: application/helpers/update/updatedb_helper.php:999
-#: application/helpers/update/updatedb_helper.php:1647
+#: application/helpers/update/updatedb_helper.php:1009
+#: application/helpers/update/updatedb_helper.php:1657
 #: application/views/admin/participants/modal_subviews/_addToSurvey.php:48
 #: application/views/admin/quotas/newanswer_view.php:34
 #: application/views/admin/quotas/newanswertwo_view.php:43
@@ -6618,41 +6604,41 @@ msgstr ""
 msgid "Unknown view!"
 msgstr ""
 
-#: application/helpers/SurveyRuntimeHelper.php:741
+#: application/helpers/SurveyRuntimeHelper.php:750
 msgid "Please use the LimeSurvey navigation buttons or index.  It appears you attempted to use the browser back button to re-submit a page."
 msgstr ""
 
-#: application/helpers/SurveyRuntimeHelper.php:1419
+#: application/helpers/SurveyRuntimeHelper.php:1428
 #: application/helpers/qanda_helper.php:421
 msgid "One or more mandatory questions have not been answered. You cannot proceed until these have been completed."
 msgstr ""
 
-#: application/helpers/SurveyRuntimeHelper.php:1424
+#: application/helpers/SurveyRuntimeHelper.php:1433
 #: application/helpers/qanda_helper.php:443
 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:1429
+#: application/helpers/SurveyRuntimeHelper.php:1438
 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:1609
+#: application/helpers/SurveyRuntimeHelper.php:1618
 msgid "Your have to answer the security question - please try again."
 msgstr ""
 
-#: application/helpers/SurveyRuntimeHelper.php:1705
+#: application/helpers/SurveyRuntimeHelper.php:1714
 msgid "Invalid group number for this survey: "
 msgstr ""
 
-#: application/helpers/SurveyRuntimeHelper.php:1711
+#: application/helpers/SurveyRuntimeHelper.php:1720
 msgid "This group contains no questions.  You must add questions to this group before you can preview it"
 msgstr ""
 
-#: application/helpers/SurveyRuntimeHelper.php:1735
+#: application/helpers/SurveyRuntimeHelper.php:1744
 msgid "Submit your answers"
 msgstr ""
 
-#: application/helpers/SurveyRuntimeHelper.php:1736
+#: application/helpers/SurveyRuntimeHelper.php:1745
 msgid "There are no more questions. Please press the <Submit> button to finish this survey."
 msgstr ""
 
@@ -10627,11 +10613,11 @@ msgstr ""
 msgid "Please fix this error in your database and try again"
 msgstr ""
 
-#: application/helpers/update/updatedb_helper.php:943
+#: application/helpers/update/updatedb_helper.php:953
 msgid "An non-recoverable error happened during the update. Error details:"
 msgstr ""
 
-#: application/helpers/update/updatedb_helper.php:947
+#: application/helpers/update/updatedb_helper.php:957
 #: application/views/admin/labels/importlabelresources_view.php:47
 #: application/views/admin/labels/importlabelresources_view.php:61
 #: application/views/admin/survey/importSurveyResources_view.php:24
@@ -10641,15 +10627,15 @@ msgstr ""
 msgid "File"
 msgstr ""
 
-#: application/helpers/update/updatedb_helper.php:947
+#: application/helpers/update/updatedb_helper.php:957
 msgid "line"
 msgstr ""
 
-#: application/helpers/update/updatedb_helper.php:972
+#: application/helpers/update/updatedb_helper.php:982
 msgid "Database update"
 msgstr ""
 
-#: application/helpers/update/updatedb_helper.php:973
+#: application/helpers/update/updatedb_helper.php:983
 msgid "The database has been updated from version %s to version %s."
 msgstr ""
 
@@ -11686,7 +11672,7 @@ msgstr ""
 msgid "Delete survey group"
 msgstr ""
 
-#: application/models/Template.php:175
+#: application/models/Template.php:176
 msgid "Default survey theme %s is not installed. Now %s is the new default survey theme"
 msgstr ""
 
@@ -11732,7 +11718,7 @@ msgstr ""
 msgid "Error: Malformed JSON: Field %s must be either a JSON array or the string \"inherit\". Found \"%s\"."
 msgstr ""
 
-#: application/models/TemplateConfiguration.php:769
+#: application/models/TemplateConfiguration.php:770
 msgid "Theme '%s' has been uninstalled because it's not compatible with this LimeSurvey version."
 msgstr ""
 
@@ -15436,10 +15422,6 @@ msgstr ""
 msgid "Tutorials"
 msgstr ""
 
-#: application/views/admin/super/_tutorial_menu.php:15
-msgid "Take"
-msgstr ""
-
 #: application/views/admin/super/admin_notifications.php:78
 msgid "Delete all notifications"
 msgstr ""
@@ -16211,6 +16193,26 @@ msgstr ""
 msgid "Preview"
 msgstr ""
 
+#: application/views/admin/survey/_activation_error.php:10
+msgid "Activate survey error"
+msgstr ""
+
+#: application/views/admin/survey/_activation_error.php:13
+msgid "The survey response table could not be created."
+msgstr ""
+
+#: application/views/admin/survey/_activation_error.php:14
+msgid "Usually this is caused by having too many (sub-)questions in your survey. Please try removing questions from your survey."
+msgstr ""
+
+#: application/views/admin/survey/_activation_error.php:18
+msgid "Timings table could not be created."
+msgstr ""
+
+#: application/views/admin/survey/_activation_error.php:23
+msgid "Database error"
+msgstr ""
+
 #: application/views/admin/survey/_activation_feedback.php:19
 #: application/views/admin/survey/activateSurvey_view.php:6
 msgid "Activate Survey"
diff --git a/locale/ca/ca.mo b/locale/ca/ca.mo
index c810b61c234..e721059d583 100644
Binary files a/locale/ca/ca.mo and b/locale/ca/ca.mo differ
diff --git a/locale/hu/hu.mo b/locale/hu/hu.mo
index 6551d37cfda..dfb735c9e57 100644
Binary files a/locale/hu/hu.mo and b/locale/hu/hu.mo differ
diff --git a/locale/it-informal/it-informal.mo b/locale/it-informal/it-informal.mo
index 45e580a096b..4d48b92ac58 100644
Binary files a/locale/it-informal/it-informal.mo and b/locale/it-informal/it-informal.mo differ
diff --git a/locale/it/it.mo b/locale/it/it.mo
index 0f44f53304e..321823e9f02 100644
Binary files a/locale/it/it.mo and b/locale/it/it.mo differ
diff --git a/locale/ja/ja.mo b/locale/ja/ja.mo
index 9554ce3a0a5..672100c5b6b 100644
Binary files a/locale/ja/ja.mo and b/locale/ja/ja.mo differ
diff --git a/locale/nb/nb.mo b/locale/nb/nb.mo
index c298cf138d3..e29ddb63ad9 100644
Binary files a/locale/nb/nb.mo and b/locale/nb/nb.mo differ
diff --git a/locale/th/th.mo b/locale/th/th.mo
index 00f22076f7c..0dfccc319c4 100644
Binary files a/locale/th/th.mo and b/locale/th/th.mo differ