diff --git a/datafiles/data/Locale/en/words.json b/datafiles/data/Locale/en/words.json index 6ecd624a0..8c86f1fb0 100644 --- a/datafiles/data/Locale/en/words.json +++ b/datafiles/data/Locale/en/words.json @@ -388,6 +388,8 @@ "append" : "Append", "auto_align" : "Auto Align", "blend_canvas" : "Blend Canvas", + "both" : "Both", + "center_view" : "Center view", "clear_all_notifications" : "Clear all notifications", "clear_log_messages" : "Clear log messages", "clear_warning_messages" : "Clear warning messages", @@ -423,14 +425,17 @@ "grid_settings" : "Grid Settings", "hide_disconnected" : "Hide Disconnected", "import_.zip" : "Import .zip", + "keep_view" : "Keep view", "lock_keyframe_y" : "Lock Keyframe Y", "new_preview_window" : "New Preview Window", + "off" : "Off", "onion_skin_settings" : "Onion Skin Settings", "open_at" : "Open at", "open_autosave_folder" : "Open Autosave Folder", "open_group_in_new_tab" : "Open Group In New Tab", "open_log_file" : "Open log file", "open_safe" : "Open Safe", + "panel_preview_on_preview" : "On preview", "paste_value" : "Paste Value", "remove_group" : "Remove Group", "rename_group" : "Rename Group", @@ -452,13 +457,25 @@ "separate_axis" : "Separate Axis", "set_range_end" : "Set Range End", "set_range_start" : "Set Range Start", + "set_reset_view_off" : "Set Reset View Off", + "set_reset_view_on" : "Set Reset View On", "set_tile_both" : "Set Tile Both", "set_tile_horizontal" : "Set Tile Horizontal", "set_tile_off" : "Set Tile Off", "set_tile_vertical" : "Set Tile Vertical", "snap_nodes" : "Snap Nodes", + "split_view_horizontal" : "Split View Horizontal", + "split_view_off" : "Split View Off", + "split_view_settings" : "Split View Settings", + "split_view_vertical" : "Split View Vertical", + "split_view" : "Split view", "stagger" : "Stagger", + "tile_both" : "Tile Both", + "tile_horizontal" : "Tile Horizontal", + "tile_off" : "Tile Off", + "tile_vertical" : "Tile Vertical", "tiling_settings" : "Tiling Settings", + "tiling" : "Tiling", "toggle_avoid_label" : "Toggle Avoid Label", "toggle_bypass" : "Toggle Bypass", "toggle_compute" : "Toggle Compute", diff --git a/datafiles/data/locale/en/words.json b/datafiles/data/locale/en/words.json index 6ecd624a0..8c86f1fb0 100644 --- a/datafiles/data/locale/en/words.json +++ b/datafiles/data/locale/en/words.json @@ -388,6 +388,8 @@ "append" : "Append", "auto_align" : "Auto Align", "blend_canvas" : "Blend Canvas", + "both" : "Both", + "center_view" : "Center view", "clear_all_notifications" : "Clear all notifications", "clear_log_messages" : "Clear log messages", "clear_warning_messages" : "Clear warning messages", @@ -423,14 +425,17 @@ "grid_settings" : "Grid Settings", "hide_disconnected" : "Hide Disconnected", "import_.zip" : "Import .zip", + "keep_view" : "Keep view", "lock_keyframe_y" : "Lock Keyframe Y", "new_preview_window" : "New Preview Window", + "off" : "Off", "onion_skin_settings" : "Onion Skin Settings", "open_at" : "Open at", "open_autosave_folder" : "Open Autosave Folder", "open_group_in_new_tab" : "Open Group In New Tab", "open_log_file" : "Open log file", "open_safe" : "Open Safe", + "panel_preview_on_preview" : "On preview", "paste_value" : "Paste Value", "remove_group" : "Remove Group", "rename_group" : "Rename Group", @@ -452,13 +457,25 @@ "separate_axis" : "Separate Axis", "set_range_end" : "Set Range End", "set_range_start" : "Set Range Start", + "set_reset_view_off" : "Set Reset View Off", + "set_reset_view_on" : "Set Reset View On", "set_tile_both" : "Set Tile Both", "set_tile_horizontal" : "Set Tile Horizontal", "set_tile_off" : "Set Tile Off", "set_tile_vertical" : "Set Tile Vertical", "snap_nodes" : "Snap Nodes", + "split_view_horizontal" : "Split View Horizontal", + "split_view_off" : "Split View Off", + "split_view_settings" : "Split View Settings", + "split_view_vertical" : "Split View Vertical", + "split_view" : "Split view", "stagger" : "Stagger", + "tile_both" : "Tile Both", + "tile_horizontal" : "Tile Horizontal", + "tile_off" : "Tile Off", + "tile_vertical" : "Tile Vertical", "tiling_settings" : "Tiling Settings", + "tiling" : "Tiling", "toggle_avoid_label" : "Toggle Avoid Label", "toggle_bypass" : "Toggle Bypass", "toggle_compute" : "Toggle Compute", diff --git a/scripts/locale_data/locale_data.gml b/scripts/locale_data/locale_data.gml index ec8c6ed2e..5ba2ef1d7 100644 --- a/scripts/locale_data/locale_data.gml +++ b/scripts/locale_data/locale_data.gml @@ -1,13 +1,13 @@ globalvar LOCALE, TEST_LOCALE, LOCALE_DEF; + +TEST_LOCALE = false; +LOCALE_DEF = true; LOCALE = { fontDir: "", config: { per_character_line_break: false }, }; global.missing_locale = {} -TEST_LOCALE = false; -LOCALE_DEF = true; - function __initLocale() { var lfile = $"data/Locale/en.zip"; var root = $"{DIRECTORY}Locale"; diff --git a/scripts/node_registry/node_registry.gml b/scripts/node_registry/node_registry.gml index fc9e2f12f..45c2d41ab 100644 --- a/scripts/node_registry/node_registry.gml +++ b/scripts/node_registry/node_registry.gml @@ -48,11 +48,11 @@ function NodeObject(_name, _spr, _node, _create, tooltip = "", tags = []) constr return self; } - static setIcon = function(icon) { + static setIcon = function(_icon) { INLINE if(IS_CMD) return self; - self.icon = icon; + icon = _icon; return self; }