diff --git a/lib/editor/tiny/lang/en/editor_tiny.php b/lib/editor/tiny/lang/en/editor_tiny.php index c56f604d74e..f19adca50a4 100644 --- a/lib/editor/tiny/lang/en/editor_tiny.php +++ b/lib/editor/tiny/lang/en/editor_tiny.php @@ -43,7 +43,7 @@ $string['tiny:activity'] = 'Activity'; $string['tiny:address'] = 'Address'; $string['tiny:advanced'] = 'Advanced'; $string['tiny:align'] = 'Align'; -$string['tiny:align_center'] = 'Align center'; +$string['tiny:align_center'] = 'Align centre'; $string['tiny:align_left'] = 'Align left'; $string['tiny:align_right'] = 'Align right'; $string['tiny:alignment'] = 'Alignment'; @@ -55,22 +55,22 @@ $string['tiny:alternative_source_url'] = 'Alternative source URL'; $string['tiny:anchor'] = 'Anchor'; $string['tiny:anchor...'] = 'Anchor...'; $string['tiny:anchors'] = 'Anchors'; -$string['tiny:animals_and_nature'] = 'Animals and Nature'; +$string['tiny:animals_and_nature'] = 'Animals and nature'; $string['tiny:arrows'] = 'Arrows'; $string['tiny:b'] = 'B'; -$string['tiny:background_color'] = 'Background color'; -$string['tiny:background_color_0'] = 'Background color {0}'; +$string['tiny:background_color'] = 'Background colour'; +$string['tiny:background_color_0'] = 'Background colour {0}'; $string['tiny:black'] = 'Black'; $string['tiny:block'] = 'Block'; $string['tiny:block_0'] = 'Block {0}'; $string['tiny:blockquote'] = 'Blockquote'; -$string['tiny:blocks'] = 'Blocks'; +$string['tiny:blocks'] = 'Paragraph styles'; $string['tiny:blue'] = 'Blue'; $string['tiny:blue_component'] = 'Blue component'; $string['tiny:body'] = 'Body'; $string['tiny:bold'] = 'Bold'; $string['tiny:border'] = 'Border'; -$string['tiny:border_color'] = 'Border color'; +$string['tiny:border_color'] = 'Border colour'; $string['tiny:border_style'] = 'Border style'; $string['tiny:border_width'] = 'Border width'; $string['tiny:bottom'] = 'Bottom'; @@ -86,7 +86,7 @@ $string['tiny:cell_properties'] = 'Cell properties'; $string['tiny:cell_spacing'] = 'Cell spacing'; $string['tiny:cell_styles'] = 'Cell styles'; $string['tiny:cell_type'] = 'Cell type'; -$string['tiny:center'] = 'Center'; +$string['tiny:center'] = 'Centre'; $string['tiny:characters'] = 'Characters'; $string['tiny:characters_no_spaces'] = 'Characters (no spaces)'; $string['tiny:circle'] = 'Circle'; @@ -96,8 +96,8 @@ $string['tiny:close'] = 'Close'; $string['tiny:code'] = 'Code'; $string['tiny:code_sample...'] = 'Code sample...'; $string['tiny:code_view'] = 'Code view'; -$string['tiny:color_picker'] = 'Color Picker'; -$string['tiny:color_swatch'] = 'Color swatch'; +$string['tiny:color_picker'] = 'Colour picker'; +$string['tiny:color_swatch'] = 'Colour swatch'; $string['tiny:cols'] = 'Cols'; $string['tiny:column'] = 'Column'; $string['tiny:column_clipboard_actions'] = 'Column clipboard actions'; @@ -112,19 +112,19 @@ $string['tiny:could_not_load_emojis'] = 'Could not load emojis'; $string['tiny:count'] = 'Count'; $string['tiny:currency'] = 'Currency'; $string['tiny:current_window'] = 'Current window'; -$string['tiny:custom_color'] = 'Custom color'; +$string['tiny:custom_color'] = 'Custom colour'; $string['tiny:custom...'] = 'Custom...'; $string['tiny:cut'] = 'Cut'; $string['tiny:cut_column'] = 'Cut column'; $string['tiny:cut_row'] = 'Cut row'; -$string['tiny:dark_blue'] = 'Dark Blue'; -$string['tiny:dark_gray'] = 'Dark Gray'; -$string['tiny:dark_green'] = 'Dark Green'; -$string['tiny:dark_orange'] = 'Dark Orange'; -$string['tiny:dark_purple'] = 'Dark Purple'; -$string['tiny:dark_red'] = 'Dark Red'; -$string['tiny:dark_turquoise'] = 'Dark Turquoise'; -$string['tiny:dark_yellow'] = 'Dark Yellow'; +$string['tiny:dark_blue'] = 'Dark blue'; +$string['tiny:dark_gray'] = 'Dark grey'; +$string['tiny:dark_green'] = 'Dark green'; +$string['tiny:dark_orange'] = 'Dark orange'; +$string['tiny:dark_purple'] = 'Dark purple'; +$string['tiny:dark_red'] = 'Dark red'; +$string['tiny:dark_turquoise'] = 'Dark turquoise'; +$string['tiny:dark_yellow'] = 'Dark yellow'; $string['tiny:dashed'] = 'Dashed'; $string['tiny:datetime'] = 'Date/time'; $string['tiny:decrease_indent'] = 'Decrease indent'; @@ -155,8 +155,8 @@ $string['tiny:failed_to_load_plugin_0_from_url_1'] = 'Failed to load plugin: {0} $string['tiny:failed_to_upload_image_0'] = 'Failed to upload image: {0}'; $string['tiny:file'] = 'File'; $string['tiny:find'] = 'Find'; -$string['tiny:find_and_replace'] = 'Find and Replace'; -$string['tiny:find_if_searchreplace_plugin_activated'] = 'Find (if searchreplace plugin activated)'; +$string['tiny:find_and_replace'] = 'Find and replace'; +$string['tiny:find_if_searchreplace_plugin_activated'] = 'Find (if search and replace plugin activated)'; $string['tiny:find_and_replace...'] = 'Find and replace...'; $string['tiny:find_in_selection'] = 'Find in selection'; $string['tiny:find_whole_words_only'] = 'Find whole words only'; @@ -170,7 +170,7 @@ $string['tiny:font_size_0'] = 'Font size {0}'; $string['tiny:font_sizes'] = 'Font sizes'; $string['tiny:font_0'] = 'Font {0}'; $string['tiny:fonts'] = 'Fonts'; -$string['tiny:food_and_drink'] = 'Food and Drink'; +$string['tiny:food_and_drink'] = 'Food and drink'; $string['tiny:footer'] = 'Footer'; $string['tiny:format'] = 'Format'; $string['tiny:format_0'] = 'Format {0}'; @@ -178,11 +178,11 @@ $string['tiny:formats'] = 'Formats'; $string['tiny:fullscreen'] = 'Fullscreen'; $string['tiny:g'] = 'G'; $string['tiny:general'] = 'General'; -$string['tiny:gray'] = 'Gray'; +$string['tiny:gray'] = 'Grey'; $string['tiny:green'] = 'Green'; $string['tiny:green_component'] = 'Green component'; $string['tiny:groove'] = 'Groove'; -$string['tiny:handy_shortcuts'] = 'Handy Shortcuts'; +$string['tiny:handy_shortcuts'] = 'Handy shortcuts'; $string['tiny:header'] = 'Header'; $string['tiny:header_cell'] = 'Header cell'; $string['tiny:heading_1'] = 'Heading 1'; @@ -194,7 +194,7 @@ $string['tiny:heading_6'] = 'Heading 6'; $string['tiny:headings'] = 'Headings'; $string['tiny:height'] = 'Height'; $string['tiny:help'] = 'Help'; -$string['tiny:hex_color_code'] = 'Hex color code'; +$string['tiny:hex_color_code'] = 'Hex colour code'; $string['tiny:hidden'] = 'Hidden'; $string['tiny:horizontal_align'] = 'Horizontal align'; $string['tiny:horizontal_line'] = 'Horizontal line'; @@ -212,7 +212,7 @@ $string['tiny:imageproxy_http_error_unknown_imageproxy_error'] = 'ImageProxy HTT $string['tiny:increase_indent'] = 'Increase indent'; $string['tiny:inline'] = 'Inline'; $string['tiny:insert'] = 'Insert'; -$string['tiny:insert_template'] = 'Insert Template'; +$string['tiny:insert_template'] = 'Insert template'; $string['tiny:insert_accordion'] = 'Insert accordion'; $string['tiny:insert_column_after'] = 'Insert column after'; $string['tiny:insert_column_before'] = 'Insert column before'; @@ -224,31 +224,31 @@ $string['tiny:insert_row_before'] = 'Insert row before'; $string['tiny:insert_table'] = 'Insert table'; $string['tiny:insert_template...'] = 'Insert template...'; $string['tiny:insert_video'] = 'Insert video'; -$string['tiny:insertedit_code_sample'] = 'Insert/Edit code sample'; +$string['tiny:insertedit_code_sample'] = 'Insert/edit code sample'; $string['tiny:insertedit_image'] = 'Insert/edit image'; $string['tiny:insertedit_link'] = 'Insert/edit link'; $string['tiny:insertedit_media'] = 'Insert/edit media'; $string['tiny:insertedit_video'] = 'Insert/edit video'; $string['tiny:inset'] = 'Inset'; -$string['tiny:invalid_hex_color_code_0'] = 'Invalid hex color code: {0}'; +$string['tiny:invalid_hex_color_code_0'] = 'Invalid hex colour code: {0}'; $string['tiny:invalid_input'] = 'Invalid input'; $string['tiny:italic'] = 'Italic'; $string['tiny:justify'] = 'Justify'; -$string['tiny:keyboard_navigation'] = 'Keyboard Navigation'; +$string['tiny:keyboard_navigation'] = 'Keyboard navigation'; $string['tiny:language'] = 'Language'; $string['tiny:learn_more...'] = 'Learn more...'; $string['tiny:left'] = 'Left'; $string['tiny:left_to_right'] = 'Left to right'; -$string['tiny:light_blue'] = 'Light Blue'; -$string['tiny:light_gray'] = 'Light Gray'; -$string['tiny:light_green'] = 'Light Green'; -$string['tiny:light_purple'] = 'Light Purple'; -$string['tiny:light_red'] = 'Light Red'; -$string['tiny:light_yellow'] = 'Light Yellow'; +$string['tiny:light_blue'] = 'Light blue'; +$string['tiny:light_gray'] = 'Light grey'; +$string['tiny:light_green'] = 'Light green'; +$string['tiny:light_purple'] = 'Light purple'; +$string['tiny:light_red'] = 'Light red'; +$string['tiny:light_yellow'] = 'Light yellow'; $string['tiny:line_height'] = 'Line height'; $string['tiny:link_list'] = 'Link list'; $string['tiny:link...'] = 'Link...'; -$string['tiny:list_properties'] = 'List Properties'; +$string['tiny:list_properties'] = 'List properties'; $string['tiny:list_properties...'] = 'List properties...'; $string['tiny:loading_emojis...'] = 'Loading emojis...'; $string['tiny:loading...'] = 'Loading...'; @@ -259,21 +259,21 @@ $string['tiny:match_case'] = 'Match case'; $string['tiny:mathematical'] = 'Mathematical'; $string['tiny:media_poster_image_url'] = 'Media poster (Image URL)'; $string['tiny:media...'] = 'Media...'; -$string['tiny:medium_blue'] = 'Medium Blue'; -$string['tiny:medium_gray'] = 'Medium Gray'; -$string['tiny:medium_purple'] = 'Medium Purple'; +$string['tiny:medium_blue'] = 'Medium blue'; +$string['tiny:medium_gray'] = 'Medium grey'; +$string['tiny:medium_purple'] = 'Medium purple'; $string['tiny:merge_cells'] = 'Merge cells'; $string['tiny:middle'] = 'Middle'; -$string['tiny:midnight_blue'] = 'Midnight Blue'; +$string['tiny:midnight_blue'] = 'Midnight blue'; $string['tiny:more...'] = 'More...'; $string['tiny:name'] = 'Name'; -$string['tiny:navy_blue'] = 'Navy Blue'; +$string['tiny:navy_blue'] = 'Navy blue'; $string['tiny:new_document'] = 'New document'; $string['tiny:new_window'] = 'New window'; $string['tiny:next'] = 'Next'; $string['tiny:no'] = 'No'; $string['tiny:no_alignment'] = 'No alignment'; -$string['tiny:no_color'] = 'No color'; +$string['tiny:no_color'] = 'No colour'; $string['tiny:nonbreaking_space'] = 'Nonbreaking space'; $string['tiny:none'] = 'None'; $string['tiny:numbered_list'] = 'Numbered list'; @@ -320,7 +320,7 @@ $string['tiny:red'] = 'Red'; $string['tiny:red_component'] = 'Red component'; $string['tiny:redo'] = 'Redo'; $string['tiny:remove'] = 'Remove'; -$string['tiny:remove_color'] = 'Remove color'; +$string['tiny:remove_color'] = 'Remove colour'; $string['tiny:remove_link'] = 'Remove link'; $string['tiny:replace'] = 'Replace'; $string['tiny:replace_all'] = 'Replace all'; @@ -328,9 +328,9 @@ $string['tiny:replace_with'] = 'Replace with'; $string['tiny:resize'] = 'Resize'; $string['tiny:restore_last_draft'] = 'Restore last draft'; $string['tiny:reveal_or_hide_additional_toolbar_items'] = 'Reveal or hide additional toolbar items'; -$string['tiny:rich_text_area'] = 'Rich Text Area'; -$string['tiny:rich_text_area._press_alt-0_for_help.'] = 'Rich Text Area. Press ALT-0 for help.'; -$string['tiny:rich_text_area._press_alt-f9_for_menu._press_alt-f10_for_toolbar._press_alt-0_for_hel'] = 'Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help'; +$string['tiny:rich_text_area'] = 'Rich text area'; +$string['tiny:rich_text_area._press_alt-0_for_help.'] = 'Rich text area. Press ALT-0 for help.'; +$string['tiny:rich_text_area._press_alt-f9_for_menu._press_alt-f10_for_toolbar._press_alt-0_for_hel'] = 'Rich text area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help.'; $string['tiny:ridge'] = 'Ridge'; $string['tiny:right'] = 'Right'; $string['tiny:right_to_left'] = 'Right to left'; @@ -349,14 +349,14 @@ $string['tiny:select_all'] = 'Select all'; $string['tiny:select...'] = 'Select...'; $string['tiny:selection'] = 'Selection'; $string['tiny:shortcut'] = 'Shortcut'; -$string['tiny:show_blocks'] = 'Show blocks'; +$string['tiny:show_blocks'] = 'Show paragraph styles'; $string['tiny:show_caption'] = 'Show caption'; $string['tiny:show_invisible_characters'] = 'Show invisible characters'; $string['tiny:size'] = 'Size'; $string['tiny:solid'] = 'Solid'; $string['tiny:source'] = 'Source'; $string['tiny:source_code'] = 'Source code'; -$string['tiny:special_character'] = 'Special Character'; +$string['tiny:special_character'] = 'Special character'; $string['tiny:special_character...'] = 'Special character...'; $string['tiny:split_cell'] = 'Split cell'; $string['tiny:square'] = 'Square'; @@ -367,7 +367,7 @@ $string['tiny:subscript'] = 'Subscript'; $string['tiny:superscript'] = 'Superscript'; $string['tiny:switch_to_or_from_fullscreen_mode'] = 'Switch to or from fullscreen mode'; $string['tiny:symbols'] = 'Symbols'; -$string['tiny:system_font'] = 'System Font'; +$string['tiny:system_font'] = 'System font'; $string['tiny:table'] = 'Table'; $string['tiny:table_caption'] = 'Table caption'; $string['tiny:table_properties'] = 'Table properties'; @@ -375,7 +375,7 @@ $string['tiny:table_styles'] = 'Table styles'; $string['tiny:template'] = 'Template'; $string['tiny:templates'] = 'Templates'; $string['tiny:text'] = 'Text'; -$string['tiny:text_color'] = 'Text color'; +$string['tiny:text_color'] = 'Text colour'; $string['tiny:text_color_0'] = 'Text color {0}'; $string['tiny:text_to_display'] = 'Text to display'; $string['tiny:the_url_you_entered_seems_to_be_an_email_address._do_you_want_to_add_the_required_mai'] = 'The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?'; @@ -386,7 +386,7 @@ $string['tiny:to_open_the_popup_press_shiftenter'] = 'To open the popup, press S $string['tiny:toggle_accordion'] = 'Toggle accordion'; $string['tiny:tools'] = 'Tools'; $string['tiny:top'] = 'Top'; -$string['tiny:travel_and_places'] = 'Travel and Places'; +$string['tiny:travel_and_places'] = 'Travel and places'; $string['tiny:turquoise'] = 'Turquoise'; $string['tiny:underline'] = 'Underline'; $string['tiny:undo'] = 'Undo'; @@ -395,7 +395,7 @@ $string['tiny:uploading_image'] = 'Uploading image'; $string['tiny:upper_alpha'] = 'Upper Alpha'; $string['tiny:upper_roman'] = 'Upper Roman'; $string['tiny:url'] = 'Url'; -$string['tiny:user_defined'] = 'User Defined'; +$string['tiny:user_defined'] = 'User defined'; $string['tiny:valid'] = 'Valid'; $string['tiny:version'] = 'Version'; $string['tiny:vertical_align'] = 'Vertical align'; @@ -411,7 +411,7 @@ $string['tiny:words_0'] = 'Words: {0}'; $string['tiny:yellow'] = 'Yellow'; $string['tiny:yes'] = 'Yes'; $string['tiny:you_are_using_0'] = 'You are using {0}'; -$string['tiny:you_have_unsaved_changes_are_you_sure_you_want_to_navigate_away'] = 'You have unsaved changes are you sure you want to navigate away?'; +$string['tiny:you_have_unsaved_changes_are_you_sure_you_want_to_navigate_away'] = 'You have unsaved changes. Are you sure you want to navigate away?'; $string['tiny:your_browser_doesnt_support_direct_access_to_the_clipboard._please_use_the_ctrlxcv_ke'] = 'Your browser doesn\'t support direct access to the clipboard. Please use the Ctrl+X/C/V keyboard shortcuts instead.'; $string['tiny:alignment1'] = 'alignment'; $string['tiny:austral_sign'] = 'austral sign'; diff --git a/lib/editor/tiny/readme_moodle.md b/lib/editor/tiny/readme_moodle.md index 5037b2ba5ed..01c0d89e134 100644 --- a/lib/editor/tiny/readme_moodle.md +++ b/lib/editor/tiny/readme_moodle.md @@ -102,15 +102,19 @@ sed -i "/string\['tiny:/d" "${MOODLEDIR}/lang/en/editor_tiny.php" cat strings.php >> "${MOODLEDIR}/lang/en/editor_tiny.php" ``` -7. Commit changes. Note: You may need to review individual language changes which do not meet Moodle's guidelines. -8. If required, the remaining language strings can be fed into AMOS. +7. Review the changes to the language strings file carefully. You may need to: + + * Edit new strings so they meet [Moodle's guidelines for language strings](https://moodledev.io/general/development/policies/codingstyle#language-strings). + * Revert changes to any Moodle-updated language strings that were fixed for spelling, grammar, and consistency in past releases to meet Moodle's guidelines. For example, from the [`en_fix` issues](https://tracker.moodle.org/issues/?jql=summary%20~%20%22en_fix%22%20order%20by%20createdDate%20desc). Review the `git` history of the language strings file to verify. + +8. Commit the changes. + +9. If required, the remaining language strings can be fed into AMOS. --- **Note:** A set of language files are also generated for all supported translations and may be submitted to AMOS if desired. -**Note:** You will need to manually check for any Moodle-updated language strings as part of this change (for example any from the en_fixes). - --- ## Security fix procedure for TinyMCE Editor