Merge branch 'master' into develop

application/config/version.php

@@ -16,5 +16,5 @@
 $config['buildnumber'] = '';
 $config['updatable'] = true;
 $config['templateapiversion']  = 3;
-$config['assetsversionnumber'] = '30363';
+$config['assetsversionnumber'] = '30364';
 return $config;

docs/release_notes.txt

@@ -34,6 +34,16 @@ Thank you to everyone who helped with this new release!
 
 CHANGE LOG
 ------------------------------------------------------
+Changes from 6.3.5 (build 231113) to 6.3.6 (build 231120) November 20, 2023
+-Fixed issue #CT-480: CPDB attribute issues (#3620) (Tim Willig)
+#Updated translation: Polish by elissa
+#Updated translation: Polish (Informal) by elissa
+#Updated translation: Japanese by d_inoue
+#Updated translation: French (France) by mapage
+#Updated translation: Finnish by Jmantysalo
+#Updated translation: Catalan by qualitatuvic
+
+
 Changes from 6.3.4 (build 231108) to 6.3.5 (build 231113) November 13, 2023
 -Fixed issue: Update can fail if there are label codes longer than 5 characters (Carsten Schmitz)
 -Fixed issue #CR-1352: Saving subquestions and answers caused display errors (#3514) (Tim Willig)

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: 2023-11-13 14:39:36+00:00\n"
+"POT-Creation-Date: 2023-11-20 09:10:36+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -65,7 +65,7 @@ msgstr ""
 #: application/views/admin/labels/import_view.php:4
 #: application/views/admin/labels/importlabelresources_view.php:28
 #: application/views/admin/participants/participantsPanel_view.php:20
-#: application/views/admin/participants/uploadSummary_view.php:92
+#: application/views/admin/participants/uploadSummary_view.php:93
 #: application/views/admin/super/footer.php:181
 #: application/views/admin/survey/copySurvey_view.php:12
 #: application/views/admin/themes/importuploaded_view.php:17
@@ -2221,7 +2221,7 @@ msgstr ""
 #: application/models/Permission.php:901
 #: application/views/admin/labels/partials/topbarBtns_export/rightSideButtons.php:25
 #: application/views/admin/participants/massive_actions/_selector.php:65
-#: application/views/admin/participants/modal_subviews/_exportCSV.php:38
+#: application/views/admin/participants/modal_subviews/_exportCSV.php:44
 #: application/views/admin/participants/participantsPanel_view.php:21
 #: application/views/admin/survey/surveybar_displayexport.php:157
 #: application/views/admin/survey/surveybar_displayexport.php:158
@@ -3115,14 +3115,14 @@ msgstr ""
 #: application/views/admin/emailtemplates/emailtemplates_view.php:82
 #: application/views/admin/htmleditor/modal_editor_partial.php:14
 #: application/views/admin/labels/_labelviewquickadd_view.php:13
-#: application/views/admin/participants/attributeMapCSV_view.php:78
+#: application/views/admin/participants/attributeMapCSV_view.php:84
 #: application/views/admin/participants/attributeMap_view.php:185
 #: application/views/admin/participants/massive_actions/_selector.php:38
 #: application/views/admin/participants/modal_subviews/_addToSurvey.php:55
 #: application/views/admin/participants/modal_subviews/_deleteParticipant.php:29
 #: application/views/admin/participants/modal_subviews/_editAttribute.php:244
 #: application/views/admin/participants/modal_subviews/_editParticipant.php:138
-#: application/views/admin/participants/modal_subviews/_exportCSV.php:36
+#: application/views/admin/participants/modal_subviews/_exportCSV.php:42
 #: application/views/admin/participants/modal_subviews/_shareParticipant.php:68
 #: application/views/admin/participants/participantsPanel_view.php:22
 #: application/views/admin/super/footer.php:163
@@ -5647,7 +5647,7 @@ msgstr ""
 #: application/views/admin/labels/partials/topbarBtns_singlelabelset/rightSideButtons.php:9
 #: application/views/admin/participants/attributeMapToken_view.php:124
 #: application/views/admin/participants/attributeMap_view.php:211
-#: application/views/admin/participants/modal_subviews/_exportCSV.php:68
+#: application/views/admin/participants/modal_subviews/_exportCSV.php:74
 #: application/views/admin/participants/modal_subviews/_showParticipantSurveys.php:33
 #: application/views/admin/pluginmanager/uploadModal.php:39
 #: application/views/admin/super/footer.php:168
@@ -6549,7 +6549,7 @@ msgstr ""
 #: application/extensions/admin/grid/MassiveActionsWidget/views/modals/first-select.php:14
 #: application/views/admin/authentication/error.php:6
 #: application/views/admin/error_view.php:5
-#: application/views/admin/participants/uploadSummary_view.php:111
+#: application/views/admin/participants/uploadSummary_view.php:112
 #: application/views/admin/update/check_updates/update_buttons/_updatesavailable_error.php:91
 msgid "Ok"
 msgstr ""
@@ -6580,7 +6580,7 @@ msgstr ""
 
 #: application/controllers/admin/Tokens.php:1757
 #: application/views/admin/participants/modal_subviews/_exportCSV.php:5
-#: application/views/admin/participants/modal_subviews/_exportCSV.php:61
+#: application/views/admin/participants/modal_subviews/_exportCSV.php:67
 #: application/views/admin/token/exportdialog.php:146
 msgid "Export participants"
 msgstr ""
@@ -6776,7 +6776,7 @@ msgstr ""
 #: application/controllers/admin/Tokens.php:2860
 #: application/views/SurveysGroupsPermission/subviews/deleteUserResult.php:11
 #: application/views/admin/authentication/message.php:45
-#: application/views/admin/participants/attributeMapCSV_view.php:80
+#: application/views/admin/participants/attributeMapCSV_view.php:86
 #: application/views/admin/participants/attributeMapToken_view.php:100
 #: application/views/admin/participants/attributeMap_view.php:187
 #: application/views/admin/themes/templateeditor_register_view.php:15
@@ -9371,58 +9371,58 @@ msgid "Breadcrumb"
 msgstr ""
 
 #: application/extensions/DateTimePickerWidget/DateTimePicker.php:399
-#: application/views/admin/participants/participantsPanel_view.php:43
+#: application/views/admin/participants/participantsPanel_view.php:40
 #: application/views/responses/modal_subviews/filterColumns.php:35
 msgid "Clear selection"
 msgstr ""
 
 #: application/extensions/DateTimePickerWidget/DateTimePicker.php:400
-#: application/views/admin/participants/participantsPanel_view.php:46
+#: application/views/admin/participants/participantsPanel_view.php:43
 msgid "Previous month"
 msgstr ""
 
 #: application/extensions/DateTimePickerWidget/DateTimePicker.php:401
-#: application/views/admin/participants/participantsPanel_view.php:47
+#: application/views/admin/participants/participantsPanel_view.php:44
 msgid "Next month"
 msgstr ""
 
 #: application/extensions/DateTimePickerWidget/DateTimePicker.php:402
-#: application/views/admin/participants/participantsPanel_view.php:48
+#: application/views/admin/participants/participantsPanel_view.php:45
 msgid "Select year"
 msgstr ""
 
 #: application/extensions/DateTimePickerWidget/DateTimePicker.php:403
-#: application/views/admin/participants/participantsPanel_view.php:49
+#: application/views/admin/participants/participantsPanel_view.php:46
 msgid "Previous year"
 msgstr ""
 
 #: application/extensions/DateTimePickerWidget/DateTimePicker.php:404
-#: application/views/admin/participants/participantsPanel_view.php:50
+#: application/views/admin/participants/participantsPanel_view.php:47
 msgid "Next year"
 msgstr ""
 
 #: application/extensions/DateTimePickerWidget/DateTimePicker.php:405
-#: application/views/admin/participants/participantsPanel_view.php:51
+#: application/views/admin/participants/participantsPanel_view.php:48
 msgid "Select decade"
 msgstr ""
 
 #: application/extensions/DateTimePickerWidget/DateTimePicker.php:406
-#: application/views/admin/participants/participantsPanel_view.php:52
+#: application/views/admin/participants/participantsPanel_view.php:49
 msgid "Previous decade"
 msgstr ""
 
 #: application/extensions/DateTimePickerWidget/DateTimePicker.php:407
-#: application/views/admin/participants/participantsPanel_view.php:53
+#: application/views/admin/participants/participantsPanel_view.php:50
 msgid "Next decade"
 msgstr ""
 
 #: application/extensions/DateTimePickerWidget/DateTimePicker.php:408
-#: application/views/admin/participants/participantsPanel_view.php:54
+#: application/views/admin/participants/participantsPanel_view.php:51
 msgid "Previous century"
 msgstr ""
 
 #: application/extensions/DateTimePickerWidget/DateTimePicker.php:409
-#: application/views/admin/participants/participantsPanel_view.php:55
+#: application/views/admin/participants/participantsPanel_view.php:52
 msgid "Next century"
 msgstr ""
 
@@ -9855,7 +9855,7 @@ msgstr ""
 #: application/models/TemplateConfiguration.php:782
 #: application/models/TemplateConfiguration.php:791
 #: application/views/admin/export/exportresult_panels/_single-value.php:28
-#: application/views/admin/participants/attributeMapCSV_view.php:79
+#: application/views/admin/participants/attributeMapCSV_view.php:85
 #: application/views/admin/participants/attributeMapToken_view.php:99
 #: application/views/admin/participants/attributeMap_view.php:186
 #: application/views/admin/super/fullpagebar_view.php:71
@@ -17943,7 +17943,7 @@ msgstr ""
 
 #: application/views/admin/export/statistics_subviews/_statistics_output.php:15
 #: application/views/admin/globalsettings/_email.php:147
-#: application/views/admin/participants/modal_subviews/_exportCSV.php:46
+#: application/views/admin/participants/modal_subviews/_exportCSV.php:52
 #: application/views/admin/super/footer.php:150
 #: application/views/admin/token/browse.php:93
 #: application/views/admin/token/surveyParticipantView.php:169
@@ -18823,7 +18823,7 @@ msgid "Return to label set administration"
 msgstr ""
 
 #: application/views/admin/labels/import_view.php:19
-#: application/views/admin/participants/uploadSummary_view.php:40
+#: application/views/admin/participants/uploadSummary_view.php:39
 #: application/views/admin/survey/copySurvey_view.php:60
 #: application/views/admin/token/csvimportresult.php:48
 #: application/views/questionAdministration/import.php:60
@@ -18936,35 +18936,35 @@ msgstr ""
 msgid "The following additional fields were found in your CSV file."
 msgstr ""
 
-#: application/views/admin/participants/attributeMapCSV_view.php:34
+#: application/views/admin/participants/attributeMapCSV_view.php:37
 msgid "Attributes to be created"
 msgstr ""
 
-#: application/views/admin/participants/attributeMapCSV_view.php:37
+#: application/views/admin/participants/attributeMapCSV_view.php:40
 msgid "Drop a CSV field into this area to create a new participant attribute and import your data into it."
 msgstr ""
 
-#: application/views/admin/participants/attributeMapCSV_view.php:45
+#: application/views/admin/participants/attributeMapCSV_view.php:48
 msgid "Existing attribute"
 msgstr ""
 
-#: application/views/admin/participants/attributeMapCSV_view.php:47
+#: application/views/admin/participants/attributeMapCSV_view.php:50
 msgid "Drop a CSV field into an existing participant attribute listed below to import your data into it."
 msgstr ""
 
-#: application/views/admin/participants/attributeMapCSV_view.php:62
+#: application/views/admin/participants/attributeMapCSV_view.php:68
 msgid "Overwrite existing participant attribute values if a duplicate participant is found?"
 msgstr ""
 
-#: application/views/admin/participants/attributeMapCSV_view.php:66
+#: application/views/admin/participants/attributeMapCSV_view.php:72
 msgid "Duplicates will be detected using the participant_id field in this CSV file."
 msgstr ""
 
-#: application/views/admin/participants/attributeMapCSV_view.php:68
+#: application/views/admin/participants/attributeMapCSV_view.php:74
 msgid "Duplicates will be detected by a combination of firstname, lastname and email addresses."
 msgstr ""
 
-#: application/views/admin/participants/attributeMapCSV_view.php:82
+#: application/views/admin/participants/attributeMapCSV_view.php:88
 #: application/views/admin/participants/attributeMapToken_view.php:110
 #: application/views/admin/participants/attributeMap_view.php:197
 msgid "Processing..."
@@ -19356,15 +19356,21 @@ msgstr ""
 msgid "Custom attributes"
 msgstr ""
 
-#: application/views/admin/participants/modal_subviews/_exportCSV.php:11
+#: application/views/admin/participants/modal_subviews/_exportCSV.php:12
 msgid "Attributes to export:"
 msgstr ""
 
-#: application/views/admin/participants/modal_subviews/_exportCSV.php:28
+#: application/views/admin/participants/modal_subviews/_exportCSV.php:15
+#: application/views/responses/modal_subviews/filterColumns.php:30
+#: application/views/userManagement/partial/edittemplatepermissions.php:19
+msgid "Select all"
+msgstr ""
+
+#: application/views/admin/participants/modal_subviews/_exportCSV.php:34
 msgid "If you want to export blacklisted participants, set \"Hide blacklisted participants\" to \"No\" in CPDB settings."
 msgstr ""
 
-#: application/views/admin/participants/modal_subviews/_exportCSV.php:65
+#: application/views/admin/participants/modal_subviews/_exportCSV.php:71
 msgid "There are no participants to be exported."
 msgstr ""
 
@@ -19412,37 +19418,23 @@ msgstr ""
 msgid "Add new attribute"
 msgstr ""
 
-#: application/views/admin/participants/participantsPanel_view.php:23
-#: application/views/responses/modal_subviews/filterColumns.php:30
-#: application/views/userManagement/partial/edittemplatepermissions.php:19
-msgid "Select all"
-msgstr ""
-
-#: application/views/admin/participants/participantsPanel_view.php:24
-msgid "None selected"
-msgstr ""
-
-#: application/views/admin/participants/participantsPanel_view.php:25
-msgid "selected"
-msgstr ""
-
-#: application/views/admin/participants/participantsPanel_view.php:31
+#: application/views/admin/participants/participantsPanel_view.php:28
 msgid "Remove from blacklist?"
 msgstr ""
 
-#: application/views/admin/participants/participantsPanel_view.php:32
+#: application/views/admin/participants/participantsPanel_view.php:29
 msgid "Add to blacklist?"
 msgstr ""
 
-#: application/views/admin/participants/participantsPanel_view.php:42
+#: application/views/admin/participants/participantsPanel_view.php:39
 msgid "Go to today"
 msgstr ""
 
-#: application/views/admin/participants/participantsPanel_view.php:44
+#: application/views/admin/participants/participantsPanel_view.php:41
 msgid "Close the picker"
 msgstr ""
 
-#: application/views/admin/participants/participantsPanel_view.php:45
+#: application/views/admin/participants/participantsPanel_view.php:42
 msgid "Select month"
 msgstr ""
 
@@ -19510,36 +19502,36 @@ msgstr ""
 msgid "%s records were duplicate but had attributes updated"
 msgstr ""
 
-#: application/views/admin/participants/uploadSummary_view.php:42
+#: application/views/admin/participants/uploadSummary_view.php:41
 msgid "%s were found to be duplicate entries and did not need a new participant to be created."
 msgstr ""
 
-#: application/views/admin/participants/uploadSummary_view.php:44
+#: application/views/admin/participants/uploadSummary_view.php:43
 msgid "They were found to be duplicate using the participant id field"
 msgstr ""
 
-#: application/views/admin/participants/uploadSummary_view.php:46
+#: application/views/admin/participants/uploadSummary_view.php:45
 msgid "They were found to be duplicate using a combination of firstname, lastname and email fields"
 msgstr ""
 
-#: application/views/admin/participants/uploadSummary_view.php:55
+#: application/views/admin/participants/uploadSummary_view.php:54
 #: application/views/admin/token/csvimportresult.php:94
 msgid "%s records with invalid email address removed"
 msgstr ""
 
-#: application/views/admin/participants/uploadSummary_view.php:63
+#: application/views/admin/participants/uploadSummary_view.php:62
 msgid "%s records have incomplete or wrong attribute values"
 msgstr ""
 
-#: application/views/admin/participants/uploadSummary_view.php:71
+#: application/views/admin/participants/uploadSummary_view.php:70
 msgid "%s records where the number of fields does not match"
 msgstr ""
 
-#: application/views/admin/participants/uploadSummary_view.php:74
+#: application/views/admin/participants/uploadSummary_view.php:73
 msgid "Line %s: Fields found: %s Expected: %s"
 msgstr ""
 
-#: application/views/admin/participants/uploadSummary_view.php:104
+#: application/views/admin/participants/uploadSummary_view.php:105
 msgid "CPDB CSV summary"
 msgstr ""