Merge branch 'MDL-73812-master-enfix' of https://github.com/vmdef/moodle

admin/tool/admin_presets/lang/en/tool_admin_presets.php

@@ -33,8 +33,8 @@
 $string['basedescription'] = 'Presets allow you to easily switch between different site admin configurations. After selecting a preset, you can turn on more features any time as required.';
 $string['created'] = 'Created';
 $string['currentvalue'] = 'Current value';
-$string['deletepreset'] = 'Are you sure you want to delete "{$a}" site admin preset?';
-$string['deletepreviouslyapplied'] = 'This preset has been previously applied. Deleting a preset removes it from your site completely. You will not be able to revert your settings to how they were before applying this preset';
+$string['deletepreset'] = 'Are you sure you want to delete the site admin preset {$a}?';
+$string['deletepreviouslyapplied'] = 'This preset has been previously applied. Deleting a preset removes it from your site completely. You will not be able to revert your settings to how they were before applying this preset.';
 $string['deletepresettitle'] = 'Delete {$a} preset?';
 $string['deleteshow'] = 'Delete site admin preset';
 $string['eventpresetdeleted'] = 'Preset deleted';
@@ -55,7 +55,7 @@
 $string['importexecute'] = 'Import site admin preset';
 $string['importshow'] = 'Import site admin preset';
 $string['includesensiblesettings'] = 'Include settings with passwords';
-$string['includesensiblesettings_help'] = 'Settings with passwords contain sensitive information specific to your site. Only include these settings if you are creating a preset to reuse on your site. You can find the list of settings with passwords in Site admin preset settings in the Site administration';
+$string['includesensiblesettings_help'] = 'Settings with passwords contain sensitive information specific to your site. Only include these settings if you are creating a preset to reuse on your site.';
 $string['loaddescription'] = 'Review the setting changes before applying this preset.';
 $string['loadexecute'] = 'Site admin preset applied';
 $string['loadpreview'] = 'Preview site admin preset';
@@ -77,8 +77,8 @@
 $string['renamepreset'] = 'Name (optional)';
 $string['rollback'] = 'Restore this version';
 $string['rollbackdescription'] = 'Use the \'Restore this version\' link to revert to the settings just before the preset was applied.';
-$string['rollbackexecute'] = 'Restored version from "{$a}" site admin preset';
-$string['rollbackfailures'] = 'The following settings can not be restored, the actual values differs from the values applied by the preset';
+$string['rollbackexecute'] = 'Restored version from the site admin preset {$a}';
+$string['rollbackfailures'] = 'The following settings cannot be reverted, as the value was changed after applying the preset.';
 $string['rollbackresults'] = 'Settings successfully restored';
 $string['rollbackshow'] = '{$a} preset version history';
 $string['selectfile'] = 'Select file';

admin/tool/admin_presets/tests/behat/delete.feature

@@ -23,7 +23,7 @@ Feature: Admin preset deletion
     Given I should see "Custom preset"
     And I open the action menu in "Custom preset" "table_row"
     When I choose "Delete" in the open action menu
-    And I should see "Are you sure you want to delete \"Custom preset\" site admin preset?"
+    And I should see "Are you sure you want to delete the site admin preset Custom preset?"
     And I should not see "This preset has been previously applied"
     And I click on "Cancel" "button"
     And I should see "Presets allow you to easily switch between different site admin configurations."
@@ -42,7 +42,7 @@ Feature: Admin preset deletion
     And I navigate to "Site admin presets" in site administration
     When I open the action menu in "Custom preset" "table_row"
     And I choose "Delete" in the open action menu
-    And I should see "Are you sure you want to delete \"Custom preset\" site admin preset?"
+    And I should see "Are you sure you want to delete the site admin preset Custom preset?"
     Then I should see "This preset has been previously applied"
     And I click on "Delete" "button"
     And I should see "Presets allow you to easily switch between different site admin configurations"

admin/tool/lpimportcsv/lang/en/tool_lpimportcsv.php

@@ -26,7 +26,7 @@
 $string['competencyscaledescription'] = 'Competency scale created by import';
 $string['confirmcolumnmappings'] = 'Confirm the column mappings';
 $string['confirm'] = 'Confirm';
-$string['csvdelimiter'] = 'CSV delimiter';
+$string['csvdelimiter'] = 'CSV separator';
 $string['description'] = 'Description';
 $string['descriptionformat'] = 'Description format';
 $string['encoding'] = 'Encoding';

admin/tool/uploadcourse/lang/en/tool_uploadcourse.php

@@ -70,9 +70,9 @@
 $string['createall'] = 'Create all, increment shortname if needed';
 $string['createnew'] = 'Create new courses only, skip existing ones';
 $string['createorupdate'] = 'Create new courses, or update existing ones';
-$string['csvdelimiter'] = 'CSV delimiter';
-$string['csvdelimiter_help'] = 'CSV delimiter of the CSV file.';
-$string['csvfileerror'] = 'There is something wrong with the format of the CSV file. Please check the number of headings and columns match, and that the delimiter and file encoding are correct: {$a}';
+$string['csvdelimiter'] = 'CSV separator';
+$string['csvdelimiter_help'] = 'The character separating the series of data in each record.';
+$string['csvfileerror'] = 'There is something wrong with the format of the CSV file. Please check the number of headings and columns match, and that the separator and file encoding are correct. {$a}';
 $string['csvline'] = 'Line';
 $string['defaultvalues'] = 'Default course values';
 $string['defaultvaluescustomfieldcategory'] = 'Default values for \'{$a}\'';
@@ -131,7 +131,7 @@
 $string['uploadcourses_help'] = 'Courses may be uploaded via text file. The format of the file should be as follows:
 
 * Each line of the file contains one record
-* Each record is a series of data separated by commas (or other delimiters)
+* Each record is a series of data separated by the selected separator
 * The first record contains a list of fieldnames defining the format of the rest of the file
 * Required fieldnames are shortname, fullname, and category';
 $string['uploadcoursespreview'] = 'Upload courses preview';

admin/tool/uploaduser/lang/en/tool_uploaduser.php

@@ -35,7 +35,7 @@
 $string['climissingargument'] = 'Argument --{$a} is required';
 $string['clititle'] = 'Command line Upload user tool.';
 $string['clivalidationerror'] = 'Validation error:';
-$string['csvdelimiter'] = 'CSV delimiter';
+$string['csvdelimiter'] = 'CSV separator';
 $string['defaultvalues'] = 'Default values';
 $string['deleteerrors'] = 'Delete errors';
 $string['encoding'] = 'Encoding';
@@ -76,7 +76,7 @@
 $string['uploadusers_help'] = 'Users may be uploaded (and optionally enrolled in courses) via text file. The format of the file should be as follows:
 
 * Each line of the file contains one record
-* Each record is a series of data separated by commas (or other delimiters)
+* Each record is a series of data separated by the selected separator
 * The first record contains a list of fieldnames defining the format of the rest of the file
 * Required fieldnames are username, password, firstname, lastname, email';
 $string['uploadusers_link'] = 'admin/tool/uploaduser/index';

admin/tool/usertours/lang/en/tool_usertours.php

@@ -44,12 +44,10 @@
 $string['content_heading'] = 'Content';
 $string['content_help'] = 'Content describing the step may be added as plain text, enclosed in multilang tags (for use with the multi-language content filter) if required.';
 $string['content_type'] = 'Content type';
-$string['content_type_help'] = 'Content types are:
-
-* Read from language pack - Language string ID may be entered in the format identifier,component (with no brackets or space after the comma).
-* Enter manually - Using an editor to input the content';
-$string['content_type_langstring'] = 'Read from language pack';
-$string['content_type_manual'] = 'Enter manually';
+$string['content_type_help'] = '* Manual - content is entered using a text editor
+* Language string ID - in the format string identifier,component (with no space after the comma)';
+$string['content_type_langstring'] = 'Language string ID';
+$string['content_type_manual'] = 'Manual';
 $string['cssselector'] = 'CSS selector';
 $string['defaultvalue'] = 'Default ({$a})';
 $string['delay'] = 'Delay before showing the step';
@@ -60,7 +58,7 @@
 $string['tourisenabled'] = 'Tour is enabled';
 $string['enabled'] = 'Enabled';
 $string['endtourlabel'] = 'End tour button\'s label';
-$string['endtourlabel_help'] = 'You can optionally specify a custom label for the end tour button. The default label is "Got it" for single-step, and "End tour" for multiple-step tours..
+$string['endtourlabel_help'] = 'You can optionally specify a custom label for the end tour button. The default label is \'Got it\' for single-step and \'End tour\' for multiple-step tours.
 
 Alternatively, a language string ID may be entered in the format identifier,component (with no brackets or space after the comma).';
 $string['event_tour_started'] = 'Tour started';
@@ -89,10 +87,10 @@
 $string['filter_role'] = 'Role';
 $string['filter_role_help'] = 'A tour may be restricted to users with selected roles in the context where the tour is shown. For example, restricting a Dashboard tour to users with the role of student won\'t work if users have the role of student in a course (as is generally the case). A Dashboard tour can only be restricted to users with a system role.';
 $string['importtour'] = 'Import tour';
-$string['invalid_lang_id'] = 'Invalid language identifier';
+$string['invalid_lang_id'] = 'Invalid language string ID';
 $string['left'] = 'Left';
 $string['modifyshippedtourwarning'] = 'This is a user tour that has shipped with Moodle. Any modifications you make may be overridden during your next site upgrade.';
-$string['moodle_language_identifier'] = 'Moodle language identifier';
+$string['moodle_language_identifier'] = 'Language string ID';
 $string['movestepdown'] = 'Move step down';
 $string['movestepup'] = 'Move step up';
 $string['movetourdown'] = 'Move tour down';
@@ -282,8 +280,8 @@
 $string['tour_navigation_course_teacher_tour_des'] = 'Edit mode, drag and drop of activities and posting announcements in a course';
 $string['tour_navigation_course_teacher_tour_name'] = 'Course editing';
 $string['tour_navigation_dashboard_content'] = '@@PIXICON::tour/tour_dashboard::tool_usertours@@<br>This side panel can contain more features.';
-$string['tour_navigation_dashboard_title'] = 'Expand to explore!';
-$string['tour_navigation_dashboard_tour_des'] = 'Where blocks can be found on the Dashboard';
+$string['tour_navigation_dashboard_title'] = 'Expand to explore';
+$string['tour_navigation_dashboard_tour_des'] = 'Where blocks can be found';
 $string['tour_navigation_dashboard_tour_name'] = 'Block drawer';
 $string['tour_navigation_mycourses_content'] = '@@PIXICON::tour/tour_mycourses::tool_usertours@@<br>Add, copy, delete and hide courses from this menu.';
 $string['tour_navigation_mycourses_endtourlabel'] = 'I understand';

admin/tool/usertours/tests/behat/create_tour.feature

@@ -17,14 +17,14 @@ Feature: Add a new user tour
       | Tour is enabled     | 1 |
     And I add steps to the "First tour" tour:
       | targettype                | Title   | id_content                                                                                                                     | Content type   |
-      | Display in middle of page | Welcome | Welcome to your personal learning space. We'd like to give you a quick tour to show you some of the areas you may find helpful | Enter manually |
+      | Display in middle of page | Welcome | Welcome to your personal learning space. We'd like to give you a quick tour to show you some of the areas you may find helpful | Manual         |
     And I add steps to the "First tour" tour:
       | targettype | targetvalue_block | Title    | id_content                                                                    | Content type   |
-      | Block      | Timeline          | Timeline | This is the Timeline. All of your upcoming activities can be found here       | Enter manually |
-      | Block      | Calendar          | Calendar | This is the Calendar. All of your assignments and due dates can be found here | Enter manually |
+      | Block      | Timeline          | Timeline | This is the Timeline. All of your upcoming activities can be found here       | Manual         |
+      | Block      | Calendar          | Calendar | This is the Calendar. All of your assignments and due dates can be found here | Manual         |
     And I add steps to the "First tour" tour:
       | targettype | targetvalue_selector | Title     | id_content                                                                                         | Content type   |
-      | Selector   | .usermenu            | User menu | This is your personal user menu. You'll find your personal preferences and your user profile here. | Enter manually |
+      | Selector   | .usermenu            | User menu | This is your personal user menu. You'll find your personal preferences and your user profile here. | Manual         |
     When I am on homepage
     Then I should see "Welcome to your personal learning space. We'd like to give you a quick tour to show you some of the areas you may find helpful"
     And I click on "Next" "button" in the "[data-role='flexitour-step']" "css_element"
@@ -54,7 +54,7 @@ Feature: Add a new user tour
       | Tour is enabled     | 0 |
     And I add steps to the "First tour" tour:
       | targettype                | Title   | id_content                                                                                                                     | Content type   |
-      | Display in middle of page | Welcome | Welcome to your personal learning space. We'd like to give you a quick tour to show you some of the areas you may find helpful | Enter manually |
+      | Display in middle of page | Welcome | Welcome to your personal learning space. We'd like to give you a quick tour to show you some of the areas you may find helpful | Manual         |
     When I am on homepage
     Then I should not see "Welcome to your personal learning space. We'd like to give you a quick tour to show you some of the areas you may find helpful"
 
@@ -71,7 +71,7 @@ Feature: Add a new user tour
       | Tour is enabled     | 0 |
     And I add steps to the "First tour" tour:
       | targettype                | Title   | id_content                                                                                                                     | Content type   |
-      | Display in middle of page | Welcome | Welcome to your personal learning space. We'd like to give you a quick tour to show you some of the areas you may find helpful | Enter manually |
+      | Display in middle of page | Welcome | Welcome to your personal learning space. We'd like to give you a quick tour to show you some of the areas you may find helpful | Manual         |
     And I open the User tour settings page
     When I click on "Enable" "link" in the "My first tour" "table_row"
     And I am on homepage
@@ -92,11 +92,11 @@ Feature: Add a new user tour
       | End tour button's label | Sample end label |
     And I add steps to the "Steps tour" tour:
       | targettype                | Title   | id_content             | Content type   |
-      | Display in middle of page | Welcome | First step of the Tour | Enter manually |
+      | Display in middle of page | Welcome | First step of the Tour | Manual         |
     And I add steps to the "Steps tour" tour:
       | targettype | targetvalue_block | Title    | id_content              | Content type   |
-      | Block      | Timeline          | Timeline | Second step of the Tour | Enter manually |
-      | Block      | Calendar          | Calendar | Third step of the Tour  | Enter manually |
+      | Block      | Timeline          | Timeline | Second step of the Tour | Manual         |
+      | Block      | Calendar          | Calendar | Third step of the Tour  | Manual         |
     When I am on homepage
     Then I should see "First step of the Tour"
     And I should see "Next (1/3)"
@@ -126,11 +126,11 @@ Feature: Add a new user tour
       | Display step numbers | 0             |
     And I add steps to the "Steps tour" tour:
       | targettype                | Title   | id_content             | Content type   |
-      | Display in middle of page | Welcome | First step of the Tour | Enter manually |
+      | Display in middle of page | Welcome | First step of the Tour | Manual         |
     And I add steps to the "Steps tour" tour:
       | targettype | targetvalue_block | Title    | id_content              | Content type   |
-      | Block      | Timeline          | Timeline | Second step of the Tour | Enter manually |
-      | Block      | Calendar          | Calendar | Third step of the Tour  | Enter manually |
+      | Block      | Timeline          | Timeline | Second step of the Tour | Manual         |
+      | Block      | Calendar          | Calendar | Third step of the Tour  | Manual         |
     When I am on homepage
     Then I should see "First step of the Tour"
     And I should see "Next"
@@ -154,7 +154,7 @@ Feature: Add a new user tour
       | Display step numbers | 1             |
     And I add steps to the "Steps tour" tour:
       | targettype                | Title   | id_content                 | Content type   |
-      | Display in middle of page | Welcome | This is a single step tour | Enter manually |
+      | Display in middle of page | Welcome | This is a single step tour | Manual         |
     When I am on homepage
     Then I should see "This is a single step tour"
     And I should not see "Next (1/1)"

admin/tool/usertours/tests/behat/duplicate_tour.feature

@@ -16,7 +16,7 @@ Feature: Duplicate a user tour
       | Tour is enabled     | 0 |
     And I add steps to the "First tour" tour:
       | targettype                | Title   | id_content                                                                                                                     | Content type   |
-      | Display in middle of page | Welcome | Welcome to your personal learning space. We'd like to give you a quick tour to show you some of the areas you may find helpful | Enter manually |
+      | Display in middle of page | Welcome | Welcome to your personal learning space. We'd like to give you a quick tour to show you some of the areas you may find helpful | Manual         |
     And I open the User tour settings page
     And I should see "1" occurrences of "First tour" in the "admintable" "table"
     And I click on "Duplicate" "link" in the "My first tour" "table_row"

admin/tool/usertours/tests/behat/reset_tour.feature

@@ -14,7 +14,7 @@ Feature: Reset a tour
       | Show with backdrop | 1             |
     And I add steps to the "First tour" tour:
       | targettype                | Title   | id_content    | Content type   |
-      | Display in middle of page | Welcome | Welcome tour. | Enter manually |
+      | Display in middle of page | Welcome | Welcome tour. | Manual         |
 
   @javascript
   Scenario: Reset the tour with mobile view

admin/tool/usertours/tests/behat/tour_accessibility.feature

@@ -10,14 +10,14 @@ Feature: Apply accessibility to a tour
       | Show with backdrop  | 1 |
     And I add steps to the "First tour" tour:
       | targettype                | Title   | id_content    | Content type   |
-      | Display in middle of page | Welcome | Welcome tour. | Enter manually |
+      | Display in middle of page | Welcome | Welcome tour. | Manual |
     And I add steps to the tour:
       | targettype | targetvalue_selector | Title     | id_content | Content type   |
-      | Selector   | .usermenu            | User menu | Next page  | Enter manually |
-      | Selector   | .navbar-brand        | Page 2    | Next page  | Enter manually |
+      | Selector   | .usermenu            | User menu | Next page  | Manual |
+      | Selector   | .navbar-brand        | Page 2    | Next page  | Manual |
     And I add steps to the tour:
       | targettype                | Title  | id_content  | Content type   |
-      | Display in middle of page | Page 3 | Final page. | Enter manually |
+      | Display in middle of page | Page 3 | Final page. | Manual |
 
   @javascript
   Scenario: Check tabbing working correctly.