diff --git a/bin/assets/i18n/en.xml b/bin/assets/i18n/en.xml
index 80b38017d..96e71d9ca 100644
--- a/bin/assets/i18n/en.xml
+++ b/bin/assets/i18n/en.xml
@@ -1,10 +1,19 @@
 <?xml version="1.0"?>
 <resources language="en">
-	<string name="about_ecode">About ecode...</string>
+	<string name="about_ecode">About Ecode</string>
+	<string name="add_branch">Add Branch</string>
+	<string name="add_build">Add Build</string>
+	<string name="add_build_step">Add Build Step</string>
+	<string name="add_build_type">Add Build Type</string>
+	<string name="add_clean_step">Add Clean Step</string>
+	<string name="add_custom_output_parser">Add Custom Output Parser</string>
+	<string name="add_custom_variable">Add Custom Environment Variable</string>
+	<string name="advanced_options">Advanced Options</string>
 	<string name="any_https_or_http_url">Any https or http URL</string>
-	<string name="any_name">Any name...</string>
+	<string name="any_name_ellipsis">Any name...</string>
+	<string name="arguments">Arguments</string>
 	<string name="ask_close_tab">Close Tab?</string>
-	<string name="author">author</string>
+	<string name="author">Author</string>
 	<string name="auto_close_brackets_and_tags">Auto-Close Brackets &amp; Tags</string>
 	<string name="auto_close_xml_tags">Auto Close XML Tags</string>
 	<string name="auto_detect_indent_type_and_width">Auto Detect Indent Type &amp; Width</string>
@@ -13,42 +22,79 @@
 	<string name="branches">Branches</string>
 	<string name="build">Build</string>
 	<string name="build_cloned_name">New Cloned Build Name:</string>
+	<string name="build_configuration">Build Configuration</string>
 	<string name="build_elapsed_time">Elapsed Time: %s.
 </string>
+	<string name="build_environment">Build Environment</string>
 	<string name="build_failed">Build run with errors
 </string>
+	<string name="build_name">Build Name</string>
 	<string name="build_name_not_found">Build name not found!</string>
 	<string name="build_os_not_supported">Operating System not supported for this build!</string>
+	<string name="build_output_show_build_issues">Build Output Show Build Issues</string>
+	<string name="build_output_show_build_output">Build Output Show Build Output</string>
 	<string name="build_seetings">Build Settings</string>
 	<string name="build_settings">Build Settings</string>
+	<string name="build_settings_save_clarification">* All changes are automatically saved</string>
 	<string name="build_step_num">Step %u: %s</string>
+	<string name="build_steps">Build Steps</string>
 	<string name="build_successful">Build run successfully
 </string>
+	<string name="build_target">Build Target</string>
 	<string name="build_type_name">Build Type Name:</string>
 	<string name="build_type_name_del">Delete Build Type: %s?</string>
 	<string name="build_type_required">Build type must be set!</string>
+	<string name="build_types">Build Types</string>
+	<string name="build_types_desc">Build types can be used as a dynamic build option represented by the special key ${build_type}. The build type can be switch easily from the editor.</string>
+	<string name="camsg_box_cancel">Cancel</string>
 	<string name="cancel_build">Cancel Build</string>
 	<string name="cancel_clean">Cancel Clean</string>
+	<string name="capture_positions">Capture Positions</string>
+	<string name="case_sensitive">Case sensitive</string>
+	<string name="change_case">Change Case</string>
+	<string name="change_escape_sequence">Change Escape Sequence</string>
+	<string name="change_whole_word">Change Whole Word</string>
 	<string name="check_for_new_updates_at_startup">Always check for new updates at startup.</string>
-	<string name="check_for_updates">Check for Updates...</string>
+	<string name="check_for_updates">Check For Updates</string>
 	<string name="check_languages_health">Check Languages Health</string>
 	<string name="clean">Clean</string>
 	<string name="clean_failed">Clean run with errors
 </string>
+	<string name="clean_steps">Clean Steps</string>
 	<string name="clean_successful">Clean run successfully
 </string>
+	<string name="clear_history">Clear History</string>
 	<string name="clear_menu">Clear Menu</string>
+	<string name="clear_system_enviroment">Clear System Environment</string>
+	<string name="clone_setting">Clone Setting</string>
 	<string name="cloned_name_must_be_different">Cloned name must be different from any existing build name.</string>
 	<string name="close">Close</string>
+	<string name="close_all_tabs">Close All Tabs</string>
+	<string name="close_app">Close App</string>
+	<string name="close_clean_tabs">Close Clean Tabs</string>
+	<string name="close_find_replace">Close Find Replace</string>
 	<string name="close_folder">Close Folder</string>
 	<string name="close_folder_question">Close Folder?</string>
+	<string name="close_global_searchbar">Close Global Searchbar</string>
+	<string name="close_locatebar">Close Locatebar</string>
+	<string name="close_other_tabs">Close Other Tabs</string>
+	<string name="close_searchbar">Close Searchbar</string>
+	<string name="close_tab">Close Tab</string>
+	<string name="close_tabs_to_the_left">Close Tabs To The Left</string>
+	<string name="close_tabs_to_the_right">Close Tabs To The Right</string>
 	<string name="close_title">Close %s?</string>
 	<string name="col_abbr">col</string>
 	<string name="collapse_all">Collapse All</string>
 	<string name="color_scheme_set">Color scheme: %s</string>
-	<string name="command_palette">Command Palette...</string>
-	<string name="commit">commit</string>
-	<string name="configure_ignore_files">Configure Ignore Files...</string>
+	<string name="column_position">Column Position</string>
+	<string name="command">Command</string>
+	<string name="command_palette">Command Palette</string>
+	<string name="command_palette_ellipsis">Command Palette...</string>
+	<string name="commit">Commit</string>
+	<string name="commit_bypass_hook">Commit Bypass Hook</string>
+	<string name="complete_edit">Complete Edit</string>
+	<string name="configure_default_shell">Configure default shell</string>
+	<string name="configure_ignore_files_ellipsis">Configure Ignore Files...</string>
 	<string name="configure_terminal_scrollback">Configure Terminal Scrollback</string>
 	<string name="configure_terminal_shell">Configure Terminal Shell</string>
 	<string name="confirm_build_delete">Are you sure you want to delete the build configuration?</string>
@@ -60,10 +106,13 @@ All changes in "%s" will be lost.</string>
 All changes will be lost.</string>
 	<string name="confirm_loading_font">Font loading confirmation</string>
 	<string name="confirm_remove_file">Do you really want to remove "%s"?</string>
+	<string name="console_toggle">Console Toggle</string>
 	<string name="copy">Copy</string>
-	<string name="copy_containing_folder_path">Copy Containing Folder Path...</string>
+	<string name="copy_containing_folder_path">Copy Containing Folder Path</string>
+	<string name="copy_containing_folder_path_ellipsis">Copy Containing Folder Path...</string>
 	<string name="copy_error_message">Copy Error Message</string>
 	<string name="copy_file_path">Copy File Path</string>
+	<string name="copy_file_path_and_position">Copy File Path And Position</string>
 	<string name="coudlnt_write_the_file">Couldn't write the file.</string>
 	<string name="could_not_write_file">Could not write file to disk.
 Please check if the file is read-only or if ecode does not have permissions to write to that file.
@@ -74,34 +123,61 @@ File path is: </string>
 	<string name="couldnt_create_folder_of_file">Couldn't create folder of file.</string>
 	<string name="couldnt_remove">Couldn't remove</string>
 	<string name="couldnt_write_file">Couldn't write file on disk.</string>
+	<string name="create_new">Create New</string>
 	<string name="create_new_file">Create new file</string>
 	<string name="create_new_folder">Create new folder</string>
+	<string name="create_new_terminal">Create New Terminal</string>
+	<string name="create_new_window">Create New Window</string>
 	<string name="curly_brackets">Curly Brackets {}</string>
 	<string name="current_document">Current Document</string>
 	<string name="current_terminal">Current Terminal</string>
 	<string name="cursor_blinking_time">Cursor Blinking Time</string>
+	<string name="custom_environment_variables">Custom Environment Variables</string>
 	<string name="custom_output_parser">Custom Output Parser</string>
+	<string name="custom_variables">Custom Variables</string>
+	<string name="custom_variables_desc">Custom Variables allow to simplify the build commands steps adding custom variables that can be used over the build settings in commands, arguments, and working directories.</string>
+	<string name="custom_variables_desc_2">Custom Variables can be invoked using ${variable_name} in any of the commands.</string>
+	<string name="custom_variables_desc_3">There are predefined custom variables available to use:&amp;#10;${project_root}: The folder / project root directory.&amp;#10;${build_type}: The build type selected to build the project.&amp;#10;${os}: The current operating system name.&amp;#10;${nproc}: The number of logical processing units.</string>
 	<string name="cut">Cut</string>
 	<string name="dark">Dark</string>
-	<string name="date">date</string>
+	<string name="date">Date</string>
+	<string name="debug_draw_boxes">Draw Boxes</string>
+	<string name="debug_draw_boxes_toggle">Debug Draw Boxes Toggle</string>
+	<string name="debug_draw_debug_data">Debug Draw Debug Data</string>
+	<string name="debug_draw_highlight">Highlight Focus &amp; Hover</string>
+	<string name="debug_draw_highlight_toggle">Debug Draw Highlight Toggle</string>
+	<string name="debug_widget_tree_view">Debug Widget Tree View</string>
 	<string name="default_theme">Default Theme</string>
+	<string name="del_custom_output_parser">Delete Selected Custom Output Parser</string>
+	<string name="del_custom_variable">Delete Selected Environment Variable</string>
 	<string name="delete">Delete</string>
+	<string name="delete_selected">Delete Selected</string>
+	<string name="delete_setting">Delete Setting</string>
+	<string name="details_nbsp">Details </string>
 	<string name="directory">directory</string>
 	<string name="document">Document</string>
-	<string name="document_symbol_find">Search Document Symbol...</string>
+	<string name="document_symbol_find_ellipsis">Search Document Symbol...</string>
 	<string name="documents_settings">Documents Settings</string>
 	<string name="double_quotes">Double Quotes ""</string>
+	<string name="download_file_web">Download File Web</string>
 	<string name="duplicate_file">Duplicate file</string>
+	<string name="duplicate_file_ellipsis">Duplicate File...</string>
 	<string name="ecode_no_updates_available">There are currently no updates available.</string>
-	<string name="ecode_source">ecode source code...</string>
+	<string name="ecode_source">Ecode Source</string>
 	<string name="ecode_unreleased_version">You are running an unreleased version of ecode!
 Current version: </string>
 	<string name="ecode_updates_available"> is available!
 Do you want to download it now?</string>
 	<string name="edit">Edit</string>
+	<string name="edit_build">Edit Build</string>
+	<string name="edit_custom_output_parser">Edit Selected Custom Output Parser</string>
 	<string name="editor_font_size">Editor Font Size</string>
+	<string name="editor_go_back">Editor Go Back</string>
+	<string name="editor_go_forward">Editor Go Forward</string>
+	<string name="editor_set_cursor_blinking_time">Editor Set Cursor Blinking Time</string>
+	<string name="editor_set_line_breaking_column">Editor Set Line Breaking Column</string>
+	<string name="editor_set_line_spacing">Editor Set Line Spacing</string>
 	<string name="empty_file_name">You must set a name to the file.</string>
-	<string name="enable-vertical-scrollbar">Enable Vertical ScrollBar</string>
 	<string name="enable_color_picker">Enable Color Picker</string>
 	<string name="enable_color_picker_tooltip">Enables the color picker tool when a double click selection
 is done over a word representing a color.</string>
@@ -109,6 +185,8 @@ is done over a word representing a color.</string>
 	<string name="enable_color_preview_tooltip">Enables a quick preview of a color when the mouse
 is hover a word that represents a color.</string>
 	<string name="enable_horizontal_scrollbar">Enable Horizontal ScrollBar</string>
+	<string name="enable_vertical_scrollbar">Enable Vertical ScrollBar</string>
+	<string name="enabled_question">Enabled?</string>
 	<string name="enter_duplicate_file_name">Enter duplicate file name:</string>
 	<string name="enter_new_file_name">Enter new file name:</string>
 	<string name="enter_new_folder_name">Enter new folder name:</string>
@@ -116,32 +194,47 @@ is hover a word that represents a color.</string>
 	<string name="error_checking_version">Failed checking for updates.</string>
 	<string name="error_copying_file">Error copying file.</string>
 	<string name="error_renaming_file">Error renaming file.</string>
+	<string name="escape_sequence_tooltip">Replace \, 	, 
+, 
 and (Unicode characters</string>
 	<string name="exclusive_mode">Exclusive Mode</string>
 	<string name="execute_dir_in_terminal">Open directory in terminal</string>
 	<string name="execute_in_terminal">Execute in terminal</string>
 	<string name="expand_all">Expand All</string>
-	<string name="fallback_font">Fallback Font...</string>
+	<string name="fallback_font">Fallback Font</string>
+	<string name="fallback_font_ellipsis">Fallback Font...</string>
 	<string name="feature_not_supported_in_emscripten">This feature is only supported in the desktop version of ecode.</string>
 	<string name="feature_not_supported_in_os">This feature is not supported in this Operating System</string>
 	<string name="file">file</string>
 	<string name="file_already_exists">File already exists!</string>
+	<string name="file_name">File Name</string>
 	<string name="file_type">File Type</string>
-	<string name="find_replace">Find/Replace</string>
+	<string name="find_and_replace">Find And Replace</string>
+	<string name="find_prev">Find Prev</string>
+	<string name="find_replace">Find Replace</string>
+	<string name="find_text">Find:</string>
 	<string name="folder_project_settings">Folder/Project Settings</string>
 	<string name="folder_settings">Folder/Project Settings</string>
+	<string name="font_size_grow">Font Size Grow</string>
+	<string name="font_size_reset">Font Size Reset</string>
+	<string name="font_size_shrink">Font Size Shrink</string>
 	<string name="force_new_line_at_end_of_file">Force New Line at End of File</string>
-	<string name="formatter-format-document">Format Document</string>
+	<string name="format_doc">Format Doc</string>
+	<string name="formatter_format_document">Format Document</string>
 	<string name="frame_rate_limit">Frame Rate Limit</string>
 	<string name="frame_rate_limit_applied">Frame Rate Limit Applied</string>
 	<string name="fullscreen_mode">Full Screen Mode</string>
+	<string name="fullscreen_toggle">Fullscreen Toggle</string>
 	<string name="git">Git</string>
 	<string name="git_add_branch">Add Branch</string>
 	<string name="git_ammend">Ammend last commit</string>
+	<string name="git_apply_stash">Apply Stash</string>
 	<string name="git_apply_stash_title">Apply Stash</string>
+	<string name="git_blame">Git Blame</string>
 	<string name="git_bypass_hook">Bypass commit hook</string>
 	<string name="git_changed">Changed</string>
 	<string name="git_checkout">Check Out</string>
-	<string name="git_commit">Commit</string>
+	<string name="git_checkout_ellipsis">Check Out...</string>
+	<string name="git_commit">Git Commit</string>
 	<string name="git_commit_message">Commit Message:</string>
 	<string name="git_confirm">Confirm</string>
 	<string name="git_confirm_apply_stash">Apply a previously saved stash?</string>
@@ -150,21 +243,37 @@ is hover a word that represents a color.</string>
 	<string name="git_confirm_discard_changes">Are you sure you want to discard the changes in file: "%s"?</string>
 	<string name="git_confirm_drop_stash">Do you want to drop the selected stash?</string>
 	<string name="git_confirm_push_changes">Are you sure you want to push the local changes to the remote server?</string>
+	<string name="git_create_branch">Create Branch</string>
 	<string name="git_create_branch_ask">Create new branch at current branch (HEAD).
 Enter the name for the branch:</string>
 	<string name="git_create_local_branch">Create local branch?</string>
+	<string name="git_delete_branch">Delete</string>
+	<string name="git_discard">Discard</string>
+	<string name="git_drop_stash">Drop Stash</string>
 	<string name="git_drop_stash_title">Drop Stash</string>
+	<string name="git_fast_forward_merge">Fast Forward Merge</string>
+	<string name="git_fetch">Git Fetch</string>
 	<string name="git_ignored">Ignored</string>
 	<string name="git_local_branches">Local Branches</string>
+	<string name="git_merge_branch">Merge Branch</string>
+	<string name="git_no_git_repo">Current folder is not a Git repository.</string>
 	<string name="git_not_found">Git binary not found.
 Please check that git is accesible via PATH</string>
 	<string name="git_nothing_to_commit">Nothing to Commit</string>
+	<string name="git_open_diff">Open Diff</string>
+	<string name="git_open_file">Open File</string>
+	<string name="git_pull">Git Pull</string>
+	<string name="git_push">Git Push</string>
 	<string name="git_push_commit">Push commit</string>
 	<string name="git_remote_branches">Remote Branches</string>
+	<string name="git_rename">Rename</string>
 	<string name="git_rename_branch">Rename Branch</string>
 	<string name="git_rename_branch_ask">Enter the new name for the branch: '%s'</string>
 	<string name="git_restore_index">Restore Index</string>
+	<string name="git_stage">Stage</string>
+	<string name="git_stage_all">Stage All</string>
 	<string name="git_staged">Staged</string>
+	<string name="git_stash_all">Stash All</string>
 	<string name="git_stash_keep_index">Keep Index</string>
 	<string name="git_stash_keep_working_tree">Keep Working Tree</string>
 	<string name="git_stash_push">Stash Local Changes
@@ -173,40 +282,94 @@ Name your stash (optional):</string>
 	<string name="git_stashes">Stashes</string>
 	<string name="git_tags">Tags</string>
 	<string name="git_unmerged">Unmerged</string>
+	<string name="git_unstage">Unstage</string>
 	<string name="git_untracked">Untracked</string>
+	<string name="global_search">Global Search</string>
+	<string name="global_search_clear_history">Global Search Clear History</string>
 	<string name="global_settings">Global Settings</string>
 	<string name="glversion_changed">Renderer version changed.
 Restart ecode to see the changes.</string>
-	<string name="go_to_line">Go to line...</string>
+	<string name="go_to_line">Go To Line</string>
+	<string name="go_to_line_ellipsis">Go to line...</string>
 	<string name="go_to_line_in_current_document">Go To Line in Current Document</string>
 	<string name="group">Group</string>
 	<string name="h_as_cpp">Treat .h files as C++ code.</string>
 	<string name="help">Help</string>
+	<string name="hide">Hide</string>
 	<string name="hide_tabbar_on_single_tab">Hide tabbar on single tab</string>
 	<string name="hide_tabbar_on_single_tab_tooltip">Hides the tabbar if there's only one element in the tab widget.</string>
 	<string name="highlight_current_line">Highlight Current Line</string>
 	<string name="highlight_matching_brackets">Highlight Matching Bracket</string>
 	<string name="highlight_selection_match">Highlight Selection Match</string>
+	<string name="history">History:</string>
+	<string name="ignore">Ignore</string>
+	<string name="indent">Indent</string>
 	<string name="indent_width">Indent Width</string>
 	<string name="indentation_type">Indentation Type</string>
 	<string name="inode">Inode</string>
 	<string name="insert_search_query">Insert search query</string>
 	<string name="inspect_widgets">Inspect Widgets</string>
+	<string name="issues">Issues</string>
+	<string name="jump_lines_down">Jump Lines Down</string>
+	<string name="jump_lines_up">Jump Lines Up</string>
 	<string name="key_bindings">Key Bindings</string>
+	<string name="keybindings">Keybindings</string>
+	<string name="lang_selected_default">The language selected will be set as the default language for this file extension.</string>
+	<string name="languages_health">Languages Health</string>
 	<string name="light">Light</string>
 	<string name="line">Line</string>
 	<string name="line_abbr">line</string>
 	<string name="line_breaking_column">Line Breaking Column</string>
 	<string name="line_endings">Line Endings</string>
+	<string name="line_number">Line Number</string>
 	<string name="line_spacing">Line Spacing</string>
+	<string name="linter_copy_error_message">Linter Copy Error Message</string>
+	<string name="linter_go_to_next_error">Linter Go To Next Error</string>
+	<string name="linter_go_to_previous_error">Linter Go To Previous Error</string>
 	<string name="load_cur_dir_as_folder">Load current document directory as folder</string>
-	<string name="locate">Locate...</string>
+	<string name="load_current_dir">Load Current Dir</string>
+	<string name="locate">Locate</string>
+	<string name="locate_ellipsis">Locate...</string>
+	<string name="locate_files_and_symbols">Locate Files &amp; Symbols</string>
+	<string name="lock">Lock</string>
+	<string name="lock_toggle">Lock Toggle</string>
+	<string name="lsp_code_action">Code Action</string>
+	<string name="lsp_find_references_to_symbol_under_cursor">Find References to Symbol Under Cursor</string>
+	<string name="lsp_format_range">Lsp Format Range</string>
+	<string name="lsp_format_selected_range">Format Selected Range</string>
+	<string name="lsp_go_to_declaration">Lsp Go To Declaration</string>
+	<string name="lsp_go_to_definition">Lsp Go To Definition</string>
+	<string name="lsp_go_to_implementation">Lsp Go To Implementation</string>
+	<string name="lsp_go_to_type_definition">Lsp Go To Type Definition</string>
+	<string name="lsp_memory_usage">Lsp Memory Usage</string>
+	<string name="lsp_plugin_restart">Lsp Plugin Restart</string>
+	<string name="lsp_refresh_semantic_highlighting">Lsp Refresh Semantic Highlighting</string>
+	<string name="lsp_rename_symbol_under_cursor">Lsp Rename Symbol Under Cursor</string>
+	<string name="lsp_restart_lsp_client">Restart LSP Client</string>
+	<string name="lsp_switch_header_source">Lsp Switch Header Source</string>
+	<string name="lsp_symbol_code_action">Lsp Symbol Code Action</string>
+	<string name="lsp_symbol_info">Lsp Symbol Info</string>
+	<string name="lsp_symbol_references">Lsp Symbol References</string>
+	<string name="lua_pattern">Lua Pattern</string>
+	<string name="match_whole_word">Match Whole Word</string>
+	<string name="menu_toggle">Menu Toggle</string>
 	<string name="message">Message</string>
+	<string name="message_capture_pattern">Message Capture Pattern</string>
 	<string name="mode">Mode</string>
 	<string name="modified">Modified</string>
-	<string name="monospace_font">Monospace Font...</string>
-	<string name="move_panel_left">Move panel to left...</string>
-	<string name="move_panel_right">Move panel to right...</string>
+	<string name="monospace_font">Monospace Font</string>
+	<string name="monospace_font_ellipsis">Monospace Font...</string>
+	<string name="more_ellipsis">More...</string>
+	<string name="move_down">Move Down</string>
+	<string name="move_panel_left">Move Panel Left</string>
+	<string name="move_panel_left_ellipsis">Move panel to left...</string>
+	<string name="move_panel_right">Move Panel Right</string>
+	<string name="move_panel_right_ellipsis">Move panel to right...</string>
+	<string name="move_scroll_down">Move Scroll Down</string>
+	<string name="move_scroll_up">Move Scroll Up</string>
+	<string name="move_to_next_line">Move To Next Line</string>
+	<string name="move_to_previous_line">Move To Previous Line</string>
+	<string name="move_up">Move Up</string>
 	<string name="msg_box_cancel">Cancel</string>
 	<string name="msg_box_no">No</string>
 	<string name="msg_box_ok">Ok</string>
@@ -215,10 +378,11 @@ Restart ecode to see the changes.</string>
 	<string name="multisamples_changed">Multisample Anti-Aliasing Level applied.
 Restart ecode to see the changes.</string>
 	<string name="name">Name</string>
-	<string name="new_file">New File...</string>
-	<string name="new_file_in_directory">New File in directory...</string>
-	<string name="new_file_in_file_folder">New File in File Folder...</string>
-	<string name="new_folder">New Folder...</string>
+	<string name="new_file">New File</string>
+	<string name="new_file_ellipsis">New File...</string>
+	<string name="new_file_in_directory_ellipsis">New File in directory...</string>
+	<string name="new_file_in_file_folder_ellipsis">New File in File Folder...</string>
+	<string name="new_folder_ellipsis">New Folder...</string>
 	<string name="new_name">New Name</string>
 	<string name="new_terminal">New Terminal</string>
 	<string name="new_terminal_behavior">New Terminal Behavior</string>
@@ -227,6 +391,8 @@ Restart ecode to see the changes.</string>
 Please restart the application.</string>
 	<string name="new_value">New Value</string>
 	<string name="new_window">New Window</string>
+	<string name="next">Next</string>
+	<string name="next_tab">Next Tab</string>
 	<string name="no_build_has_been_run">No build has been run</string>
 	<string name="no_code_action">No Code Action</string>
 	<string name="no_open_document">No open document</string>
@@ -234,24 +400,44 @@ Please restart the application.</string>
 	<string name="no_threads">Threaded ecode required to compile builds.</string>
 	<string name="none">None</string>
 	<string name="not_found_in_path">Not found in $PATH</string>
+	<string name="notice">Notice</string>
 	<string name="open">Open</string>
-	<string name="open_containin_folder">Open Containing Folder...</string>
-	<string name="open_containing_folder">Open Containing Folder...</string>
+	<string name="open_a_file">Open a File</string>
+	<string name="open_a_folder">Open a Folder</string>
+	<string name="open_command_palette">Open Command Palette</string>
+	<string name="open_containing_folder">Open Containing Folder</string>
+	<string name="open_containing_folder_ellipsis">Open Containing Folder...</string>
+	<string name="open_context_menu">Open Context Menu</string>
+	<string name="open_document_symbol_search">Open Document Symbol Search</string>
 	<string name="open_documents">Open Documents</string>
 	<string name="open_file">Open File</string>
-	<string name="open_file_from_web">Open File from Web...</string>
+	<string name="open_file_ellipsis">Open File...</string>
+	<string name="open_file_from_web_ellipsis">Open File from Web...</string>
 	<string name="open_first_a_folder">You must first open a folder.</string>
-	<string name="open_folder">Open Folder...</string>
+	<string name="open_folder">Open Folder</string>
+	<string name="open_folder_ellipsis">Open Folder...</string>
+	<string name="open_global_search">Open Global Search</string>
 	<string name="open_in_horizontal_split">Open In New Horizontal Split</string>
-	<string name="open_in_new_window">Open in New Window...</string>
+	<string name="open_in_new_window">Open In New Window</string>
+	<string name="open_in_new_window_ellipsis">Open in New Window...</string>
 	<string name="open_in_same_tabbar">Open In Current Tab Bar</string>
 	<string name="open_in_vertical_split">Open In New Vertical Split</string>
+	<string name="open_locatebar">Open Locatebar</string>
+	<string name="open_recent_folder_ellipsis">Open Recent Folder...</string>
+	<string name="open_workspace_symbol_search">Open Workspace Symbol Search</string>
+	<string name="output">Output</string>
+	<string name="output_parser">Output Parser</string>
+	<string name="output_parser_desc">Custom output parsers scan command line output for user-provided error patterns to create entries in Build Issues and highlight those errors on the Build Output</string>
+	<string name="output_parser_preset">Presets are provided as generic output parsers, you can select one below, by default a "generic" preset will be selected:</string>
+	<string name="overwrite">Overwrite</string>
 	<string name="owner">Owner</string>
 	<string name="paste">Paste</string>
 	<string name="path">Path</string>
 	<string name="pattern">Pattern</string>
-	<string name="please_enter_file_url">Please enter the file URL...</string>
+	<string name="pick_widget">Pick Widget</string>
+	<string name="please_enter_file_url_ellipsis">Please enter the file URL...</string>
 	<string name="plugin_manager">Plugin Manager</string>
+	<string name="plugin_manager_open">Plugin Manager Open</string>
 	<string name="pluginsmodel_description">Description</string>
 	<string name="pluginsmodel_enabled">Enabled</string>
 	<string name="pluginsmodel_id">Id</string>
@@ -259,36 +445,69 @@ Please restart the application.</string>
 	<string name="pluginsmodel_version">Version</string>
 	<string name="portable_mode_failed">Portable Mode failed.
 Please check that the application directory has write permissions.</string>
+	<string name="preferences">Preferences</string>
+	<string name="press_enter">Press Enter</string>
+	<string name="previous">Previous</string>
+	<string name="previous_tab">Previous Tab</string>
 	<string name="process_exited_normally">The process "%s" exited normally.
 </string>
 	<string name="process_exited_with_errors">The process "%s" exited with errors.
 </string>
-	<string name="project_find">Project Find...</string>
+	<string name="project">Project</string>
+	<string name="project_build_cancel">Project Build Cancel</string>
+	<string name="project_build_start">Project Build Start</string>
+	<string name="project_find_ellipsis">Project Find...</string>
+	<string name="pull_branch">Pull Branch</string>
+	<string name="push_branch">Push Branch</string>
 	<string name="quit">Quit</string>
 	<string name="read_only">Read Only</string>
 	<string name="recent_files">Recent Files</string>
+	<string name="recent_files_ellipsis">Recent Files...</string>
 	<string name="recent_folders">Recent Folders</string>
+	<string name="recent_folders_ellipsis">Recent Folders...</string>
 	<string name="redo">Redo</string>
-	<string name="refresh_view">Refresh View...</string>
-	<string name="remove">Remove...</string>
+	<string name="refresh_view_ellipsis">Refresh View...</string>
+	<string name="reload">Reload</string>
+	<string name="reload_current_file">The current document uses an extension that can be interpreted as more than one languages.&amp;#xA;Which language is this document?</string>
+	<string name="remove item">Remove Item</string>
+	<string name="remove_ellipsis">Remove...</string>
 	<string name="remove_file_question">Remove file?</string>
+	<string name="remove_item">Remove Item</string>
 	<string name="rename">Rename</string>
 	<string name="rename_file">Rename file</string>
 	<string name="rename_session">Rename Session</string>
 	<string name="reopen_closed_document">Reopen Closed Document</string>
+	<string name="reopen_closed_tab">Reopen Closed Tab</string>
+	<string name="repeat_find">Repeat Find</string>
+	<string name="replace">Replace</string>
+	<string name="replace_all">Replace All</string>
+	<string name="replace_and_find">Replace &amp; Find</string>
+	<string name="replace_in_files">Replace In Files</string>
+	<string name="replace_selection">Replace Selection</string>
+	<string name="replace_with_text">Replace with:</string>
 	<string name="restore_last_session_at_startup">Restart last session at startup</string>
-	<string name="running_steps_for_project">Running steps for project %s...
+	<string name="running_steps_for_project_ellipsis">Running steps for project %s...
 </string>
 	<string name="save">Save</string>
 	<string name="save_all">Save All</string>
-	<string name="save_as">Save as...</string>
+	<string name="save_as_doc">Save As Doc</string>
+	<string name="save_as_ellipsis">Save as...</string>
+	<string name="save_doc">Save Doc</string>
 	<string name="save_file_as">Save File As</string>
+	<string name="search">Search</string>
+	<string name="search_and_replace">Search &amp; Replace</string>
+	<string name="search_for">Search for:</string>
 	<string name="search_for_document_symbols">Search for Symbols in Current Document</string>
 	<string name="search_for_workspace_symbols">Search for Workspace Symbols</string>
 	<string name="search_in_command_palette">Search in Command Palette</string>
+	<string name="search_set_string">Search Set String</string>
 	<string name="select_all">Select All</string>
+	<string name="select_all_results">Select All Results</string>
 	<string name="select_font_file">Select Font File</string>
-	<string name="serif_font">Serif Font...</string>
+	<string name="select_to_next_line">Select To Next Line</string>
+	<string name="select_to_previous_line">Select To Previous Line</string>
+	<string name="serif_font">Serif Font</string>
+	<string name="serif_font_ellipsis">Serif Font...</string>
 	<string name="set_cursor_blinking_time">Set Cursor Blinking Time:
 Set 0 to disable it.
 </string>
@@ -308,8 +527,11 @@ Set 0 to disable it.
 	<string name="set_ui_scale_factor">Set the UI scale factor (pixel density):
 Minimum value is 1, and maximum 6. Requires restart.</string>
 	<string name="shell">Shell</string>
+	<string name="shell_configuration">Shell Configuration</string>
+	<string name="show_build_tab">Show Build Tab</string>
 	<string name="show_console">Show Console</string>
 	<string name="show_doc_info">Show Document Info</string>
+	<string name="show_folder_treeview_tab">Show Folder Treeview Tab</string>
 	<string name="show_hidden_files">Show hidden files</string>
 	<string name="show_image_preview">Show Image Preview</string>
 	<string name="show_indentation_guides">Show Indentation Guides</string>
@@ -317,8 +539,10 @@ Minimum value is 1, and maximum 6. Requires restart.</string>
 	<string name="show_line_numbers">Show Line Numbers</string>
 	<string name="show_lines_relative_position">Show Lines Relative Position</string>
 	<string name="show_minimap">Show Minimap</string>
-	<string name="show_open_documents">Show Open Documents...</string>
+	<string name="show_open_documents">Show Open Documents</string>
+	<string name="show_open_documents_ellipsis">Show Open Documents...</string>
 	<string name="show_side_panel">Show Side Panel</string>
+	<string name="show_source_control_tab">Show Source Control Tab</string>
 	<string name="show_status_bar">Show Status Bar</string>
 	<string name="show_white_spaces">Show White Spaces</string>
 	<string name="single_quotes">Single Quotes ''</string>
@@ -328,13 +552,23 @@ Minimum value is 1, and maximum 6. Requires restart.</string>
 	<string name="split_bottom">Split Bottom</string>
 	<string name="split_left">Split Left</string>
 	<string name="split_right">Split Right</string>
+	<string name="split_swap">Split Swap</string>
 	<string name="split_top">Split Top</string>
 	<string name="square_brakcets">Square Brackets []</string>
 	<string name="starting_process">Starting %s %s
 </string>
 	<string name="status">Status</string>
+	<string name="supported_platforms">Supported Platforms</string>
+	<string name="supported_platforms_desc">Selecting none means that the build settings will work and be available on any Operating System</string>
 	<string name="switch_build">Switch Build</string>
 	<string name="switch_build_type">Switch Build Type</string>
+	<string name="switch_side_panel">Switch Side Panel</string>
+	<string name="switch_to_first_tab">Switch To First Tab</string>
+	<string name="switch_to_last_tab">Switch To Last Tab</string>
+	<string name="switch_to_next_colorscheme">Switch To Next Colorscheme</string>
+	<string name="switch_to_next_split">Switch To Next Split</string>
+	<string name="switch_to_previous_colorscheme">Switch To Previous Colorscheme</string>
+	<string name="switch_to_previous_split">Switch To Previous Split</string>
 	<string name="symlink_target">Symlink target</string>
 	<string name="sync_project_tree">Synchronize project tree with editor</string>
 	<string name="sync_project_tree_tooltip">Syncronizes the current focused document as the selected
@@ -345,24 +579,61 @@ file in the directory tree.</string>
 	<string name="terminal">Terminal</string>
 	<string name="terminal_color_scheme">Terminal Color Scheme</string>
 	<string name="terminal_color_scheme_set">Terminal color scheme: %s</string>
-	<string name="terminal_font">Terminal Font...</string>
+	<string name="terminal_copy">Terminal Copy</string>
+	<string name="terminal_font">Terminal Font</string>
+	<string name="terminal_font_ellipsis">Terminal Font...</string>
 	<string name="terminal_font_size">Terminal Font Size</string>
-	<string name="terminal_split_bottom">Split Terminal Bottom</string>
-	<string name="terminal_split_left">Split Terminal Left</string>
-	<string name="terminal_split_right">Split Terminal Right</string>
-	<string name="terminal_split_top">Split Terminal Top</string>
+	<string name="terminal_font_size_grow">Terminal Font Size Grow</string>
+	<string name="terminal_font_size_shrink">Terminal Font Size Shrink</string>
+	<string name="terminal_open_link">Terminal Open Link</string>
+	<string name="terminal_paste">Terminal Paste</string>
+	<string name="terminal_rename">Terminal Rename</string>
+	<string name="terminal_scroll_down_history">Terminal Scroll Down History</string>
+	<string name="terminal_scroll_down_row">Terminal Scroll Down Row</string>
+	<string name="terminal_scroll_down_screen">Terminal Scroll Down Screen</string>
+	<string name="terminal_scroll_up_history">Terminal Scroll Up History</string>
+	<string name="terminal_scroll_up_row">Terminal Scroll Up Row</string>
+	<string name="terminal_scroll_up_screen">Terminal Scroll Up Screen</string>
+	<string name="terminal_split_bottom">Terminal Split Bottom</string>
+	<string name="terminal_split_left">Terminal Split Left</string>
+	<string name="terminal_split_right">Terminal Split Right</string>
+	<string name="terminal_split_top">Terminal Split Top</string>
+	<string name="texture_viewer">Texture Viewer</string>
+	<string name="toggle_lua_pattern">Toggle Lua Pattern</string>
+	<string name="toggle_status_bar">Toggle Status Bar</string>
+	<string name="toggle_status_build_output">Toggle Status Build Output</string>
+	<string name="toggle_status_global_search_bar">Toggle Status Global Search Bar</string>
+	<string name="toggle_status_locate_bar">Toggle Status Locate Bar</string>
+	<string name="toggle_status_terminal">Toggle Status Terminal</string>
 	<string name="tools">Tools</string>
+	<string name="tooltip_ignore_file_changes">Ignores the changes on disk without any action.</string>
+	<string name="tooltip_reload_file">Reload the file from disk. Unsaved changes will be lost.</string>
+	<string name="tooltip_write_local_changes">Writes the local changes on disk, overwriting the disk changes</string>
+	<string name="tree_view_configure_ignore_files">Tree View Configure Ignore Files</string>
 	<string name="treeview_single_click_nav">Single Click Navigation in Tree View</string>
 	<string name="trim_trailing_whitespaces">Trim Trailing Whitespaces</string>
 	<string name="type">Type</string>
-	<string name="ui_font_size">UI Font Size</string>
+	<string name="type_to_locate">Type to Locate</string>
+	<string name="ui_font_size">Ui Font Size</string>
 	<string name="ui_multisamples_level">Multisample Anti-Aliasing Level</string>
-	<string name="ui_panel_font_size">UI Panel Font Size</string>
+	<string name="ui_panel_font_size">Ui Panel Font Size</string>
 	<string name="ui_prefes_color_scheme">UI Prefers Color Scheme</string>
 	<string name="ui_renderer">Renderer</string>
 	<string name="ui_renderer_version">Renderer Version</string>
-	<string name="ui_scale_factor">UI Scale Factor (Pixel Density)</string>
+	<string name="ui_scale_factor">Ui Scale Factor</string>
 	<string name="ui_thene">UI Theme</string>
+	<string name="uicodeeditor_copy">Copy</string>
+	<string name="uicodeeditor_copy_containing_folder_path_ellipsis">Copy Containing Folder Path...</string>
+	<string name="uicodeeditor_copy_file_path">Copy File Path</string>
+	<string name="uicodeeditor_copy_file_path_and_position">Copy File Path and Position</string>
+	<string name="uicodeeditor_cut">Paste</string>
+	<string name="uicodeeditor_delete">Delete</string>
+	<string name="uicodeeditor_open_containing_folder_ellipsis">Open Containing Folder...</string>
+	<string name="uicodeeditor_paste">Paste</string>
+	<string name="uicodeeditor_redo">Redo</string>
+	<string name="uicodeeditor_select_all">Select All</string>
+	<string name="uicodeeditor_undo">Undo</string>
+	<string name="uiconsole_copy">Copy</string>
 	<string name="uifiledialog_cancel">Cancel</string>
 	<string name="uifiledialog_create_new_folder">Create new folder</string>
 	<string name="uifiledialog_enter_new_folder_name">Enter new folder name:</string>
@@ -377,7 +648,13 @@ file in the directory tree.</string>
 	<string name="uifiledialog_select_file">Select a file</string>
 	<string name="uifiledialog_select_folder">Select a folder</string>
 	<string name="uifiledialog_table">Table</string>
+	<string name="uiterminal_copy">Copy</string>
+	<string name="uiterminal_open_link">Open Link</string>
+	<string name="uiterminal_paste">Paste</string>
 	<string name="undo">Undo</string>
+	<string name="unindent">Unindent</string>
+	<string name="unlock">Unlock</string>
+	<string name="use_escape_sequences">Use escape sequences</string>
 	<string name="use_global_settings">Use Global Settings</string>
 	<string name="using_build_type">Using build type: %s.
 </string>
@@ -385,12 +662,15 @@ file in the directory tree.</string>
 	<string name="vsync">VSync</string>
 	<string name="vsync_changed">Vsync configuration changed.
 Restart ecode to see the changes.</string>
+	<string name="warning">Warning</string>
 	<string name="welcome">Welcome</string>
 	<string name="window">Window</string>
+	<string name="working_dir">Working Directory</string>
 	<string name="working_dir_at">Working Dir %s
 </string>
-	<string name="workspace_symbol_find">Search Worskspace Symbol...</string>
+	<string name="workspace_symbol_find_ellipsis">Search Worskspace Symbol...</string>
 	<string name="write_unicode_bom">Write Unicode BOM</string>
+	<string name="you_have_not_yet_opened_a_folder">You have not yet opened a folder.</string>
 	<string name="zoom_in">Zoom In</string>
 	<string name="zoom_out">Zoom Out</string>
 	<string name="zoom_reset">Zoom Reset</string>
diff --git a/include/eepp/ui/uicodeeditor.hpp b/include/eepp/ui/uicodeeditor.hpp
index 1bb90e7ca..884da13f9 100644
--- a/include/eepp/ui/uicodeeditor.hpp
+++ b/include/eepp/ui/uicodeeditor.hpp
@@ -631,9 +631,9 @@ class EE_API UICodeEditor : public UIWidget, public TextDocument::Client {
 	void setFileLockIconName( const std::string& fileLockIconName );
 
 	bool getDisplayLockedIcon() const;
-	void setDisplayLockedIcon(bool displayLockedIcon);
+	void setDisplayLockedIcon( bool displayLockedIcon );
 
-	protected:
+  protected:
 	struct LastXOffset {
 		TextPosition position{ 0, 0 };
 		Float offset{ 0.f };
@@ -892,8 +892,7 @@ class EE_API UICodeEditor : public UIWidget, public TextDocument::Client {
 
 	void createDefaultContextMenuOptions( UIPopUpMenu* menu );
 
-	UIMenuItem* menuAdd( UIPopUpMenu* menu, const std::string& translateKey,
-						 const String& translateString, const std::string& icon,
+	UIMenuItem* menuAdd( UIPopUpMenu* menu, const String& translateString, const std::string& icon,
 						 const std::string& cmd );
 
 	void drawMinimap( const Vector2f& start, const std::pair<Uint64, Uint64>& lineRange );
diff --git a/include/eepp/ui/uiconsole.hpp b/include/eepp/ui/uiconsole.hpp
index 02d169e10..4d1488163 100644
--- a/include/eepp/ui/uiconsole.hpp
+++ b/include/eepp/ui/uiconsole.hpp
@@ -327,8 +327,7 @@ class EE_API UIConsole : public UIWidget,
 
 	TextPosition getPositionOnScreen( Vector2f position );
 
-	UIMenuItem* menuAdd( UIPopUpMenu* menu, const std::string& translateKey,
-						 const String& translateString, const std::string& icon,
+	UIMenuItem* menuAdd( UIPopUpMenu* menu, const String& translateString, const std::string& icon,
 						 const std::string& cmd );
 
 	Drawable* findIcon( const std::string& name );
diff --git a/include/eepp/ui/uitextinput.hpp b/include/eepp/ui/uitextinput.hpp
index e9269d84c..4a34b8dfd 100644
--- a/include/eepp/ui/uitextinput.hpp
+++ b/include/eepp/ui/uitextinput.hpp
@@ -227,8 +227,7 @@ class EE_API UITextInput : public UITextView, public TextDocument::Client {
 
 	virtual bool onCreateContextMenu( const Vector2i& position, const Uint32& flags );
 
-	UIMenuItem* menuAdd( UIPopUpMenu* menu, const std::string& translateKey,
-						 const String& translateString, const std::string& icon,
+	UIMenuItem* menuAdd( UIPopUpMenu* menu, const String& translateString, const std::string& icon,
 						 const std::string& cmd );
 
 	Drawable* findIcon( const std::string& name );
diff --git a/projects/linux/ee.creator.user b/projects/linux/ee.creator.user
index 415e63431..157eb53c5 100644
--- a/projects/linux/ee.creator.user
+++ b/projects/linux/ee.creator.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 12.0.1, 2024-02-08T17:31:05. -->
+<!-- Written by QtCreator 12.0.1, 2024-02-09T20:03:27. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -1173,7 +1173,7 @@
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.CustomExecutableRunConfiguration</value>
     <value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey"></value>
     <value type="bool" key="ProjectExplorer.RunConfiguration.Customized">true</value>
-    <value type="QString" key="RunConfiguration.Arguments">--css=/root/.config/ecode/style.css</value>
+    <value type="QString" key="RunConfiguration.Arguments">--css=/root/.config/ecode/style.css --language=de</value>
     <value type="int" key="RunConfiguration.UseCppDebugger">0</value>
     <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">false</value>
     <value type="int" key="RunConfiguration.UseQmlDebugger">1</value>
diff --git a/projects/linux/ee.files b/projects/linux/ee.files
index ffd1fb24b..e3c1c8363 100644
--- a/projects/linux/ee.files
+++ b/projects/linux/ee.files
@@ -972,6 +972,7 @@
 ../../src/eepp/ui/tools/uitextureviewer.hpp
 ../../src/eepp/ui/tools/uiwidgetinspector.cpp
 ../../src/eepp/ui/uiabstractview.cpp
+../../src/eepp/ui/uiapplication.cpp
 ../../src/eepp/ui/uibackgrounddrawable.cpp
 ../../src/eepp/ui/uiborderdrawable.cpp
 ../../src/eepp/ui/uicheckbox.cpp
diff --git a/src/eepp/system/translator.cpp b/src/eepp/system/translator.cpp
index 5e878643c..8babd0b55 100644
--- a/src/eepp/system/translator.cpp
+++ b/src/eepp/system/translator.cpp
@@ -64,6 +64,18 @@ bool Translator::loadNodes( pugi::xml_node node, std::string lang ) {
 	return true;
 }
 
+static size_t countLines( const std::string_view& text ) {
+	const char* startPtr = text.data();
+	const char* endPtr = text.data() + text.size();
+	size_t count = 0;
+	if ( startPtr != endPtr ) {
+		count = 1 + *startPtr == '\n' ? 1 : 0;
+		while ( ++startPtr && startPtr != endPtr )
+			count += ( '\n' == *startPtr ) ? 1 : 0;
+	}
+	return count;
+}
+
 bool Translator::loadFromFile( const std::string& path, std::string lang ) {
 	if ( FileSystem::fileExists( path ) ) {
 		lang = lang.size() == 2
@@ -79,6 +91,10 @@ bool Translator::loadFromFile( const std::string& path, std::string lang ) {
 			Log::error( "Couldn't load i18n file: %s", path.c_str() );
 			Log::error( "Error description: %s", result.description() );
 			Log::error( "Error offset: %d", result.offset );
+			std::string file;
+			FileSystem::fileGet( path, file );
+			Log::error( "Error line: %d",
+						countLines( std::string_view{ file }.substr( 0, result.offset ) ) + 1 );
 		}
 	} else if ( PackManager::instance()->isFallbackToPacksActive() ) {
 		std::string packPath( path );
@@ -100,6 +116,8 @@ bool Translator::loadFromString( const std::string& string, std::string lang ) {
 		Log::error( "Couldn't load i18n file from string: %s", string.c_str() );
 		Log::error( "Error description: %s", result.description() );
 		Log::error( "Error offset: %d", result.offset );
+		Log::error( "Error line: %d",
+					countLines( std::string_view{ string }.substr( 0, result.offset ) ) + 1 );
 	}
 	return false;
 }
@@ -114,6 +132,10 @@ bool Translator::loadFromMemory( const void* buffer, Int32 bufferSize, std::stri
 		Log::error( "Couldn't load i18n file from buffer" );
 		Log::error( "Error description: %s", result.description() );
 		Log::error( "Error offset: %d", result.offset );
+		Log::error( "Error line: %d",
+					countLines( std::string_view{ (const char*)buffer, (size_t)bufferSize }.substr(
+						0, result.offset ) ) +
+						1 );
 	}
 	return false;
 }
@@ -250,7 +272,7 @@ void Translator::saveToStream( IOStream& stream, std::string lang ) {
 	resources.append_attribute( "language" ).set_value( lang.c_str() );
 
 	auto& unordered_map = mDictionary[lang];
-	std::map<std::string, String> langStrs(unordered_map.begin(), unordered_map.end());
+	std::map<std::string, String> langStrs( unordered_map.begin(), unordered_map.end() );
 
 	for ( const auto& str : langStrs ) {
 		auto r = resources.append_child( "string" );
diff --git a/src/eepp/ui/uicodeeditor.cpp b/src/eepp/ui/uicodeeditor.cpp
index 16a4bd6e7..3c9fe7669 100644
--- a/src/eepp/ui/uicodeeditor.cpp
+++ b/src/eepp/ui/uicodeeditor.cpp
@@ -1051,12 +1051,10 @@ Sizef UICodeEditor::getMaxScroll() const {
 							getLineHeight() );
 }
 
-UIMenuItem* UICodeEditor::menuAdd( UIPopUpMenu* menu, const std::string& translateKey,
-								   const String& translateString, const std::string& icon,
-								   const std::string& cmd ) {
+UIMenuItem* UICodeEditor::menuAdd( UIPopUpMenu* menu, const String& translateString,
+								   const std::string& icon, const std::string& cmd ) {
 	UIMenuItem* menuItem =
-		menu->add( i18n( "uicodeeditor_" + translateKey, translateString ), findIcon( icon ),
-				   mKeyBindings.getCommandKeybindString( cmd ) );
+		menu->add( translateString, findIcon( icon ), mKeyBindings.getCommandKeybindString( cmd ) );
 	menuItem->setId( cmd );
 	return menuItem;
 }
@@ -1065,30 +1063,40 @@ void UICodeEditor::createDefaultContextMenuOptions( UIPopUpMenu* menu ) {
 	if ( !mCreateDefaultContextMenuOptions )
 		return;
 
-	menuAdd( menu, "undo", "Undo", "undo", "undo" )->setEnabled( mDoc->hasUndo() );
-	menuAdd( menu, "redo", "Redo", "redo", "redo" )->setEnabled( mDoc->hasRedo() );
+	menuAdd( menu, i18n( "uicodeeditor_undo", "Undo" ), "undo", "undo" )
+		->setEnabled( mDoc->hasUndo() );
+	menuAdd( menu, i18n( "uicodeeditor_redo", "Redo" ), "redo", "redo" )
+		->setEnabled( mDoc->hasRedo() );
 	menu->addSeparator();
 
-	menuAdd( menu, "cut", "Cut", "cut", "cut" )->setEnabled( mDoc->hasSelection() );
-	menuAdd( menu, "copy", "Copy", "copy", "copy" )->setEnabled( mDoc->hasSelection() );
-	menuAdd( menu, "paste", "Paste", "paste", "paste" );
-	menuAdd( menu, "delete", "Delete", "delete-text", "delete-to-next-char" );
+	menuAdd( menu, i18n( "uicodeeditor_cut", "Cut" ), "cut", "cut" )
+		->setEnabled( mDoc->hasSelection() );
+	menuAdd( menu, i18n( "uicodeeditor_copy", "Copy" ), "copy", "copy" )
+		->setEnabled( mDoc->hasSelection() );
+	menuAdd( menu, i18n( "uicodeeditor_paste", "Paste" ), "paste", "paste" );
+	menuAdd( menu, i18n( "uicodeeditor_delete", "Delete" ), "delete-text", "delete-to-next-char" );
 	menu->addSeparator();
-	menuAdd( menu, "select_all", "Select All", "select-all", "select-all" );
+	menuAdd( menu, i18n( "uicodeeditor_select_all", "Select All" ), "select-all", "select-all" );
 
 	if ( mDoc->hasFilepath() ) {
 		menu->addSeparator();
 
-		menuAdd( menu, "open_containing_folder", "Open Containing Folder...", "folder-open",
-				 "open-containing-folder" );
+		menuAdd(
+			menu,
+			i18n( "uicodeeditor_open_containing_folder_ellipsis", "Open Containing Folder..." ),
+			"folder-open", "open-containing-folder" );
 
-		menuAdd( menu, "copy_containing_folder_path", "Copy Containing Folder Path...", "copy",
-				 "copy-containing-folder-path" );
+		menuAdd( menu,
+				 i18n( "uicodeeditor_copy_containing_folder_path_ellipsis",
+					   "Copy Containing Folder Path..." ),
+				 "copy", "copy-containing-folder-path" );
 
-		menuAdd( menu, "copy_file_path", "Copy File Path", "copy", "copy-file-path" );
+		menuAdd( menu, i18n( "uicodeeditor_copy_file_path", "Copy File Path" ), "copy",
+				 "copy-file-path" );
 
-		menuAdd( menu, "copy_file_path_and_position", "Copy File Path and Position", "copy",
-				 "copy-file-path-and-position" );
+		menuAdd( menu,
+				 i18n( "uicodeeditor_copy_file_path_and_position", "Copy File Path and Position" ),
+				 "copy", "copy-file-path-and-position" );
 	}
 }
 
diff --git a/src/eepp/ui/uiconsole.cpp b/src/eepp/ui/uiconsole.cpp
index 5c1550768..79151bb05 100644
--- a/src/eepp/ui/uiconsole.cpp
+++ b/src/eepp/ui/uiconsole.cpp
@@ -1192,12 +1192,10 @@ void UIConsole::copySelection() {
 	getUISceneNode()->getWindow()->getClipboard()->setText( str );
 }
 
-UIMenuItem* UIConsole::menuAdd( UIPopUpMenu* menu, const std::string& translateKey,
-								const String& translateString, const std::string& icon,
-								const std::string& cmd ) {
+UIMenuItem* UIConsole::menuAdd( UIPopUpMenu* menu, const String& translateString,
+								const std::string& icon, const std::string& cmd ) {
 	UIMenuItem* menuItem =
-		menu->add( i18n( "uiconsole_" + translateKey, translateString ), findIcon( icon ),
-				   mKeyBindings.getCommandKeybindString( cmd ) );
+		menu->add( translateString, findIcon( icon ), mKeyBindings.getCommandKeybindString( cmd ) );
 	menuItem->setId( cmd );
 	return menuItem;
 }
@@ -1208,7 +1206,8 @@ bool UIConsole::onCreateContextMenu( const Vector2i& position, const Uint32& fla
 
 	UIPopUpMenu* menu = UIPopUpMenu::New();
 
-	menuAdd( menu, "copy", "Copy", "copy", "copy" )->setEnabled( mSelection.hasSelection() );
+	menuAdd( menu, i18n( "uiconsole_copy", "Copy" ), "copy", "copy" )
+		->setEnabled( mSelection.hasSelection() );
 
 	ContextMenuEvent event( this, menu, Event::OnCreateContextMenu, position, flags );
 	sendEvent( &event );
diff --git a/src/eepp/ui/uitextinput.cpp b/src/eepp/ui/uitextinput.cpp
index eadd4a513..7f0c3ca99 100644
--- a/src/eepp/ui/uitextinput.cpp
+++ b/src/eepp/ui/uitextinput.cpp
@@ -876,12 +876,10 @@ Drawable* UITextInput::findIcon( const std::string& name ) {
 	return nullptr;
 }
 
-UIMenuItem* UITextInput::menuAdd( UIPopUpMenu* menu, const std::string& translateKey,
-								  const String& translateString, const std::string& icon,
-								  const std::string& cmd ) {
+UIMenuItem* UITextInput::menuAdd( UIPopUpMenu* menu, const String& translateString,
+								  const std::string& icon, const std::string& cmd ) {
 	UIMenuItem* menuItem =
-		menu->add( i18n( "uicodeeditor_" + translateKey, translateString ),
-				   findIcon( icon ), mKeyBindings.getCommandKeybindString( cmd ) );
+		menu->add( translateString, findIcon( icon ), mKeyBindings.getCommandKeybindString( cmd ) );
 	menuItem->setId( cmd );
 	return menuItem;
 }
@@ -890,16 +888,20 @@ void UITextInput::createDefaultContextMenuOptions( UIPopUpMenu* menu ) {
 	if ( !mCreateDefaultContextMenuOptions )
 		return;
 
-	menuAdd( menu, "undo", "Undo", "undo", "undo" )->setEnabled( mDoc.hasUndo() );
-	menuAdd( menu, "redo", "Redo", "redo", "redo" )->setEnabled( mDoc.hasRedo() );
+	menuAdd( menu, i18n( "uicodeeditor_undo", "Undo" ), "undo", "undo" )
+		->setEnabled( mDoc.hasUndo() );
+	menuAdd( menu, i18n( "uicodeeditor_redo", "Redo" ), "redo", "redo" )
+		->setEnabled( mDoc.hasRedo() );
 	menu->addSeparator();
 
-	menuAdd( menu, "cut", "Cut", "cut", "cut" )->setEnabled( mDoc.hasSelection() );
-	menuAdd( menu, "copy", "Copy", "copy", "copy" )->setEnabled( mDoc.hasSelection() );
-	menuAdd( menu, "cut", "Paste", "paste", "paste" );
-	menuAdd( menu, "delete", "Delete", "delete-text", "delete-to-next-char" );
+	menuAdd( menu, i18n( "uicodeeditor_cut", "Cut" ), "cut", "cut" )
+		->setEnabled( mDoc.hasSelection() );
+	menuAdd( menu, i18n( "uicodeeditor_copy", "Copy" ), "copy", "copy" )
+		->setEnabled( mDoc.hasSelection() );
+	menuAdd( menu, i18n( "uicodeeditor_cut", "Paste" ), "paste", "paste" );
+	menuAdd( menu, i18n( "uicodeeditor_delete", "Delete" ), "delete-text", "delete-to-next-char" );
 	menu->addSeparator();
-	menuAdd( menu, "select_all", "Select All", "select-all", "select-all" );
+	menuAdd( menu, i18n( "uicodeeditor_select_all", "Select All" ), "select-all", "select-all" );
 }
 
 bool UITextInput::onCreateContextMenu( const Vector2i& position, const Uint32& flags ) {
diff --git a/src/examples/7guis/circle_drawer/circle_drawer.cpp b/src/examples/7guis/circle_drawer/circle_drawer.cpp
index df98c9479..a22ddd354 100644
--- a/src/examples/7guis/circle_drawer/circle_drawer.cpp
+++ b/src/examples/7guis/circle_drawer/circle_drawer.cpp
@@ -37,7 +37,7 @@ class AddCircleCommand : public UndoCommand {
 	}
 
 	virtual ~AddCircleCommand() {
-		if ( !SceneManager::instance()->isShuttingDown() )
+		if ( SceneManager::existsSingleton() && !SceneManager::instance()->isShuttingDown() )
 			circle->close();
 	}
 
diff --git a/src/modules/eterm/include/eterm/ui/uiterminal.hpp b/src/modules/eterm/include/eterm/ui/uiterminal.hpp
index 2de1fe38f..068c78b1c 100644
--- a/src/modules/eterm/include/eterm/ui/uiterminal.hpp
+++ b/src/modules/eterm/include/eterm/ui/uiterminal.hpp
@@ -165,8 +165,7 @@ class UITerminal : public UIWidget {
 
 	virtual int getContentSize() const;
 
-	UIMenuItem* menuAdd( UIPopUpMenu* menu, const std::string& translateKey,
-						 const String& translateString, const std::string& icon,
+	UIMenuItem* menuAdd( UIPopUpMenu* menu, const String& translateString, const std::string& icon,
 						 const std::string& cmd );
 
 	virtual bool onCreateContextMenu( const Vector2i& position, const Uint32& flags );
diff --git a/src/modules/eterm/src/eterm/ui/uiterminal.cpp b/src/modules/eterm/src/eterm/ui/uiterminal.cpp
index ab3903f3d..38e779a7b 100644
--- a/src/modules/eterm/src/eterm/ui/uiterminal.cpp
+++ b/src/modules/eterm/src/eterm/ui/uiterminal.cpp
@@ -536,13 +536,14 @@ void UITerminal::createDefaultContextMenuOptions( UIPopUpMenu* menu ) {
 		auto sel( mTerm->getTerminal()->getSelection() );
 
 		if ( LuaPattern::matches( sel, LuaPattern::getURIPattern() ) ) {
-			menuAdd( menu, "open_link", "Open Link", "earth", "terminal-open-link" );
+			menuAdd( menu, i18n( "uiterminal_open_link", "Open Link" ), "earth",
+					 "terminal-open-link" );
 		}
 	}
 
-	menuAdd( menu, "copy", "Copy", "copy", "terminal-copy" )
+	menuAdd( menu, i18n( "uiterminal_copy", "Copy" ), "copy", "terminal-copy" )
 		->setEnabled( mTerm->getTerminal() && mTerm->getTerminal()->hasSelection() );
-	menuAdd( menu, "paste", "Paste", "paste", "terminal-paste" )
+	menuAdd( menu, i18n( "uiterminal_paste", "Paste" ), "paste", "terminal-paste" )
 		->setEnabled( !getUISceneNode()->getWindow()->getClipboard()->getText().empty() );
 }
 
@@ -553,12 +554,10 @@ Drawable* UITerminal::findIcon( const std::string& name ) {
 	return nullptr;
 }
 
-UIMenuItem* UITerminal::menuAdd( UIPopUpMenu* menu, const std::string& translateKey,
-								 const String& translateString, const std::string& icon,
-								 const std::string& cmd ) {
+UIMenuItem* UITerminal::menuAdd( UIPopUpMenu* menu, const String& translateString,
+								 const std::string& icon, const std::string& cmd ) {
 	UIMenuItem* menuItem =
-		menu->add( i18n( "uiterminal_" + translateKey, translateString ), findIcon( icon ),
-				   mKeyBindings.getCommandKeybindString( cmd ) );
+		menu->add( translateString, findIcon( icon ), mKeyBindings.getCommandKeybindString( cmd ) );
 	menuItem->setId( cmd );
 	return menuItem;
 }
diff --git a/src/tools/ecode/applayout.xml.hpp b/src/tools/ecode/applayout.xml.hpp
index f45d0306e..84d25b6c5 100644
--- a/src/tools/ecode/applayout.xml.hpp
+++ b/src/tools/ecode/applayout.xml.hpp
@@ -436,9 +436,9 @@ R"html(
 		<RelativeLayout id="project_view_cont" lw="mp" lh="mp">
 			<TreeView id="project_view" lw="mp" lh="mp" />
 			<vbox id="project_view_empty" lg="top|center_horizontal" lw="mp" lh="wc">
-				<TextView text-align="center" lw="mp" lg="center" text='@string(you-have-not-yet-opened-a-folder, "You have not yet opened a folder.")' word-wrap="true"  />
+				<TextView text-align="center" lw="mp" lg="center" text='@string(you_have_not_yet_opened_a_folder, "You have not yet opened a folder.")' word-wrap="true"  />
 				<PushButton lw="mp" lg="center" id="open_folder" text='@string(open_folder, "Open Folder")' margin-top="4dp" />
-				<PushButton lw="mp" lg="center" id="open_recent_folder" text='@string(open-recent-folder, "Open Recent Folder...")' margin-top="4dp" />
+				<PushButton lw="mp" lg="center" id="open_recent_folder" text='@string(open_recent_folder_ellipsis, "Open Recent Folder...")' margin-top="4dp" />
 			</vbox>
 		</RelativeLayout>
 		<Tab id="treeview_tab" text='@string("project", "Project")' owns="project_view_cont" text-as-fallback="true" icon="icon(folder-open, 12dp)" />
diff --git a/src/tools/ecode/ecode.cpp b/src/tools/ecode/ecode.cpp
index 22123f99d..c0a868489 100644
--- a/src/tools/ecode/ecode.cpp
+++ b/src/tools/ecode/ecode.cpp
@@ -331,8 +331,9 @@ void App::openFontDialog( std::string& fontPath, bool loadingMonoFont ) {
 }
 
 void App::downloadFileWebDialog() {
-	UIMessageBox* msgBox = UIMessageBox::New(
-		UIMessageBox::INPUT, i18n( "please_enter_file_url", "Please enter the file URL..." ) );
+	UIMessageBox* msgBox =
+		UIMessageBox::New( UIMessageBox::INPUT, i18n( "please_enter_file_url_ellipsis",
+													  "Please enter the file URL..." ) );
 
 	msgBox->setTitle( mWindowTitle );
 	msgBox->getTextInput()->setHint( i18n( "any_https_or_http_url", "Any https or http URL" ) );
@@ -1703,14 +1704,14 @@ void App::onTabCreated( UITab* tab, UIWidget* ) {
 
 			menu->addSeparator();
 
-			menuAdd( "open_containing_folder", "Open Containing Folder...", "folder-open",
+			menuAdd( "open_containing_folder_ellipsis", "Open Containing Folder...", "folder-open",
 					 "open-containing-folder" );
 
-			menuAdd( "open_in_new_window", "Open in New Window...", "window",
+			menuAdd( "open_in_new_window_ellipsis", "Open in New Window...", "window",
 					 "open-in-new-window" );
 
-			menuAdd( "copy_containing_folder_path", "Copy Containing Folder Path...", "copy",
-					 "copy-containing-folder-path" );
+			menuAdd( "copy_containing_folder_path_ellipsis", "Copy Containing Folder Path...",
+					 "copy", "copy-containing-folder-path" );
 
 			menuAdd( "copy_file_path", "Copy File Path", "copy", "copy-file-path" );
 
@@ -3560,8 +3561,7 @@ void App::init( const LogLevel& logLevel, std::string file, const Float& pidelDe
 			language = mConfig.ui.language;
 		if ( !language.empty() )
 			mUISceneNode->getTranslator().setCurrentLanguage( language );
-		std::string currentLanguage(
-			language.empty() ? mUISceneNode->getTranslator().getCurrentLanguage() : language );
+		std::string currentLanguage( mUISceneNode->getTranslator().getCurrentLanguage() );
 		std::string langPath( mResPath + "i18n" + FileSystem::getOSSlash() + currentLanguage +
 							  ".xml" );
 		if ( currentLanguage != "en" && FileSystem::fileExists( langPath ) )
@@ -3603,7 +3603,8 @@ void App::init( const LogLevel& logLevel, std::string file, const Float& pidelDe
 								  "fonts/DejaVuSansMonoNerdFontComplete.ttf" );
 		if ( ( nullptr != mTerminalFont && mTerminalFont->getInfo().family == "DejaVuSansMono NF" &&
 			   mFontMono->getInfo().family == "DejaVu Sans Mono" ) ||
-			 ( nullptr != mTerminalFont && mTerminalFont->getInfo().family == mFontMono->getInfo().family ) ) {
+			 ( nullptr != mTerminalFont &&
+			   mTerminalFont->getInfo().family == mFontMono->getInfo().family ) ) {
 			mTerminalFont->setBoldFont( mFontMono->getBoldFont() );
 			mTerminalFont->setItalicFont( mFontMono->getItalicFont() );
 			mTerminalFont->setBoldItalicFont( mFontMono->getBoldItalicFont() );
diff --git a/src/tools/ecode/plugins/formatter/formatterplugin.cpp b/src/tools/ecode/plugins/formatter/formatterplugin.cpp
index 8fa147303..0144879ed 100644
--- a/src/tools/ecode/plugins/formatter/formatterplugin.cpp
+++ b/src/tools/ecode/plugins/formatter/formatterplugin.cpp
@@ -310,7 +310,7 @@ bool FormatterPlugin::onCreateContextMenu( UICodeEditor* editor, UIPopUpMenu* me
 		return false;
 
 	menu->addSeparator();
-	menu->add( editor->getUISceneNode()->i18n( "formatter-format-document", "Format Document" ),
+	menu->add( editor->getUISceneNode()->i18n( "formatter_format_document", "Format Document" ),
 			   nullptr, KeyBindings::keybindFormat( mKeyBindings["format-doc"] ) )
 		->setId( "format-doc" );
 
diff --git a/src/tools/ecode/plugins/git/gitplugin.cpp b/src/tools/ecode/plugins/git/gitplugin.cpp
index 5ff493627..824903c2a 100644
--- a/src/tools/ecode/plugins/git/gitplugin.cpp
+++ b/src/tools/ecode/plugins/git/gitplugin.cpp
@@ -401,12 +401,12 @@ void GitPlugin::displayTooltip( UICodeEditor* editor, const Git::Blame& blame,
 
 	String str( blame.error.empty()
 					? String::format( "%s: %s (%s)\n%s: %s (%s)\n%s: %s\n\n%s",
-									  i18n( "commit", "commit" ).capitalize().toUtf8().c_str(),
+									  i18n( "commit", "Commit" ).toUtf8().c_str(),
 									  blame.commitHash.c_str(), blame.commitShortHash.c_str(),
-									  i18n( "author", "author" ).capitalize().toUtf8().c_str(),
+									  i18n( "author", "Author" ).toUtf8().c_str(),
 									  blame.author.c_str(), blame.authorEmail.c_str(),
-									  i18n( "date", "date" ).capitalize().toUtf8().c_str(),
-									  blame.date.c_str(), blame.commitMessage.c_str() )
+									  i18n( "date", "Date" ).toUtf8().c_str(), blame.date.c_str(),
+									  blame.commitMessage.c_str() )
 					: blame.error );
 
 	Text::wrapText( str, PixelDensity::dpToPx( 400 ), tooltip->getFontStyleConfig(),
@@ -761,7 +761,7 @@ void GitPlugin::commit( const std::string& repoPath ) {
 
 		msgBox->closeWindow();
 		runAsync(
-			[this, msg, ammend, bypassHook, msgBox, pushCommit, repoPath]() {
+			[this, msg, ammend, bypassHook, pushCommit, repoPath]() {
 				std::optional<Git::Branch> branch = getBranchFromRepoPath( repoPath );
 				bool pushNewBranch = branch && !branch->name.empty() && branch->remote.empty();
 				auto res = mGit->commit( msg, ammend, bypassHook, repoPath );
@@ -773,7 +773,7 @@ void GitPlugin::commit( const std::string& repoPath ) {
 						return mGit->push( repoPath );
 					}
 				} else
-					mLastCommitMsg = msgBox->getTextEdit()->getText();
+					mLastCommitMsg = msg;
 				return res;
 			},
 			true, true, true, true, true );
@@ -1261,9 +1261,9 @@ void GitPlugin::buildSidePanelTab() {
 					<vbox id="git_branches" lw="mp" lh="wc">
 						<hbox lw="mp" lh="wc" padding="4dp">
 							<DropDownList id="git_repo" lw="0" lh="wc" lw8="1" />
-							<PushButton id="branch_pull" text="@string(pull_branch, Pull)" tooltip="@string(pull_branch, Pull Branch)" text-as-fallback="true" icon="icon(repo-pull, 12dp)" margin-left="2dp" />
-							<PushButton id="branch_push" text="@string(push_branch, Push)" tooltip="@string(push_branch, Push Branch)" text-as-fallback="true" icon="icon(repo-push, 12dp)" margin-left="2dp" />
-							<PushButton id="branch_add" text="@string(add_branch, Add Branch)" tooltip="@string(add_branch, Add Branch)" text-as-fallback="true" icon="icon(add, 12dp)" margin-left="2dp" />
+							<PushButton id="branch_pull" text="@string(git_pull, Pull)" tooltip="@string(pull_branch, Pull Branch)" text-as-fallback="true" icon="icon(repo-pull, 12dp)" margin-left="2dp" />
+							<PushButton id="branch_push" text="@string(git_push, Push)" tooltip="@string(push_branch, Push Branch)" text-as-fallback="true" icon="icon(repo-push, 12dp)" margin-left="2dp" />
+							<PushButton id="branch_add" text="@string(git_add_branch, Add Branch)" tooltip="@string(add_branch, Add Branch)" text-as-fallback="true" icon="icon(add, 12dp)" margin-left="2dp" />
 						</hbox>
 						<TreeView id="git_branches_tree" lw="mp" lh="0" lw8="1" />
 					</vbox>
@@ -1413,17 +1413,17 @@ void GitPlugin::buildSidePanelTab() {
 						menu->setId( "git_status_type_menu" );
 
 						if ( status->type == Git::GitStatusType::Staged ) {
-							addMenuItem( menu, "git-commit", "Commit", "git-commit" );
-							addMenuItem( menu, "git-unstage-all", "Unstage All" );
+							menuAdd( menu, "git-commit", "Commit", "git-commit" );
+							menuAdd( menu, "git-unstage-all", "Unstage All" );
 						}
 
 						if ( status->type == Git::GitStatusType::Untracked ||
 							 status->type == Git::GitStatusType::Changed )
-							addMenuItem( menu, "git-stage-all", "Stage All" );
+							menuAdd( menu, "git-stage-all", "Stage All" );
 
 						if ( status->type == Git::GitStatusType::Changed ) {
 							menu->addSeparator();
-							addMenuItem( menu, "git-discard-all", "Discard All" );
+							menuAdd( menu, "git-discard-all", "Discard All" );
 						}
 
 						menu->on( Event::OnItemClicked, [this, model,
@@ -1475,17 +1475,17 @@ void GitPlugin::buildSidePanelTab() {
 					menu->setId( "git_repo_type_menu" );
 
 					if ( repo->hasStatusType( Git::GitStatusType::Staged ) ) {
-						addMenuItem( menu, "git-commit", "Commit", "git-commit" );
+						menuAdd( menu, "git-commit", i18n( "git_commit", "Commit" ), "git-commit" );
 					}
 
 					if ( repo->hasStatusType( Git::GitStatusType::Untracked ) ) {
-						addMenuItem( menu, "git-stage-all", "Stage All" );
+						menuAdd( menu, "git-stage-all", i18n( "git_stage_all", "Stage All" ) );
 					}
 
-					addMenuItem( menu, "git-fetch", "Fetch", "repo-fetch" );
-					addMenuItem( menu, "git-pull", "Pull", "repo-pull" );
-					addMenuItem( menu, "git-push", "Push", "repo-push" );
-					addMenuItem( menu, "git-stash", "Stash All", "git-stash" );
+					menuAdd( menu, "git-fetch", i18n( "git_fetch", "Fetch" ), "repo-fetch" );
+					menuAdd( menu, "git-pull", i18n( "git_pull", "Pull" ), "repo-pull" );
+					menuAdd( menu, "git-push", i18n( "git_push", "Push" ), "repo-push" );
+					menuAdd( menu, "git-stash", i18n( "git_stash_all", "Stash All" ), "git-stash" );
 
 					menu->on( Event::OnItemClicked,
 							  [this, model, repoName, repoPath]( const Event* event ) {
@@ -1541,28 +1541,33 @@ void GitPlugin::openBranchMenu( const Git::Branch& branch ) {
 	menu->setId( "git_branch_menu" );
 
 	if ( branch.type != Git::RefType::Stash ) {
-		addMenuItem( menu, "git-fetch", "Fetch", "repo-fetch" );
+		menuAdd( menu, "git-fetch", i18n( "git_fetch", "Fetch" ), "repo-fetch" );
 
 		if ( gitBranch() != branch.name ) {
-			addMenuItem( menu, "git-checkout", "Check Out...", "git-fetch" );
+			menuAdd( menu, "git-checkout", i18n( "git_checkout_ellipsis", "Check Out..." ),
+					 "git-fetch" );
 		}
 
 		if ( branch.type == Git::RefType::Head ) {
-			addMenuItem( menu, "git-branch-rename", "Rename", "", { KEY_F2 } );
-			addMenuItem( menu, "git-pull", "Pull", "repo-pull" );
+			menuAdd( menu, "git-branch-rename", i18n( "git_rename", "Rename" ), "", { KEY_F2 } );
+			menuAdd( menu, "git-pull", i18n( "git_pull", "Pull" ), "repo-pull" );
 			if ( branch.ahead )
-				addMenuItem( menu, "git-push", "Push", "repo-push" );
+				menuAdd( menu, "git-push", i18n( "git_push", "Push" ), "repo-push" );
 			if ( branch.behind )
-				addMenuItem( menu, "git-fast-forward-merge", "Fast Forward Merge" );
+				menuAdd( menu, "git-fast-forward-merge",
+						 i18n( "git_fast_forward_merge", "Fast Forward Merge" ) );
 			menu->addSeparator();
-			addMenuItem( menu, "git-branch-delete", "Delete", "remove" );
+			menuAdd( menu, "git-branch-delete", i18n( "git_delete_branch", "Delete" ), "remove" );
 		}
 
-		addMenuItem( menu, "git-merge-branch", "Merge Branch", "git-merge" );
-		addMenuItem( menu, "git-create-branch", "Create Branch", "repo-forked", { KEY_F7 } );
+		menuAdd( menu, "git-merge-branch", i18n( "git_merge_branch", "Merge Branch" ),
+				 "git-merge" );
+		menuAdd( menu, "git-create-branch", i18n( "git_create_branch", "Create Branch" ),
+				 "repo-forked", { KEY_F7 } );
 	} else {
-		addMenuItem( menu, "git-stash-apply", "Apply Stash", "git-stash-apply" );
-		addMenuItem( menu, "git-stash-drop", "Drop Stash", "git-stash-pop" );
+		menuAdd( menu, "git-stash-apply", i18n( "git_apply_stash", "Apply Stash" ),
+				 "git-stash-apply" );
+		menuAdd( menu, "git-stash-drop", i18n( "git_drop_stash", "Drop Stash" ), "git-stash-pop" );
 	}
 
 	menu->on( Event::OnItemClicked, [this, branch]( const Event* event ) {
@@ -1602,19 +1607,19 @@ void GitPlugin::openFileStatusMenu( const Git::DiffFile& file ) {
 	UIPopUpMenu* menu = UIPopUpMenu::New();
 	menu->setId( "git_file_status_menu" );
 
-	addMenuItem( menu, "git-open-file", "Open File", "file" );
-	addMenuItem( menu, "git-diff", "Open Diff", "diff-single" );
+	menuAdd( menu, "git-open-file", i18n( "git_open_file", "Open File" ), "file" );
+	menuAdd( menu, "git-diff", i18n( "git_open_diff", "Open Diff" ), "diff-single" );
 
 	if ( file.report.type != Git::GitStatusType::Staged ) {
-		addMenuItem( menu, "git-stage", "Stage" );
+		menuAdd( menu, "git-stage", i18n( "git_stage", "Stage" ) );
 	} else {
-		addMenuItem( menu, "git-unstage", "Unstage" );
+		menuAdd( menu, "git-unstage", i18n( "git_unstage", "Unstage" ) );
 	}
 
 	menu->addSeparator();
 
 	if ( file.report.type != Git::GitStatusType::Staged )
-		addMenuItem( menu, "git-discard", "Discard" );
+		menuAdd( menu, "git-discard", i18n( "git_discard", "Discard" ) );
 
 	menu->on( Event::OnItemClicked, [this, file]( const Event* event ) {
 		if ( !mGit )
@@ -1663,15 +1668,14 @@ void GitPlugin::runAsync( std::function<Git::Result()> fn, bool _updateStatus, b
 	} );
 }
 
-void GitPlugin::addMenuItem( UIMenu* menu, const std::string& txtKey, const std::string& txtVal,
-							 const std::string& icon,
-							 const KeyBindings::Shortcut& forcedKeybinding ) {
+void GitPlugin::menuAdd( UIMenu* menu, const std::string& cmd, const std::string& text,
+						 const std::string& icon, const KeyBindings::Shortcut& forcedKeybinding ) {
 
-	menu->add( i18n( txtKey, txtVal ), iconDrawable( icon, 12 ),
-			   forcedKeybinding.empty() ? KeyBindings::keybindFormat( mKeyBindings[txtKey] )
+	menu->add( text, iconDrawable( icon, 12 ),
+			   forcedKeybinding.empty() ? KeyBindings::keybindFormat( mKeyBindings[cmd] )
 										: getUISceneNode()->getKeyBindings().getShortcutString(
 											  forcedKeybinding, true ) )
-		->setId( txtKey );
+		->setId( cmd );
 }
 
 std::string GitPlugin::repoSelected() {
diff --git a/src/tools/ecode/plugins/git/gitplugin.hpp b/src/tools/ecode/plugins/git/gitplugin.hpp
index 45bcfc40f..0ec154052 100644
--- a/src/tools/ecode/plugins/git/gitplugin.hpp
+++ b/src/tools/ecode/plugins/git/gitplugin.hpp
@@ -207,9 +207,9 @@ class GitPlugin : public PluginBase {
 				   bool displaySuccessMsg = false, bool updateBranchesOnError = false,
 				   bool updateStatusOnError = false );
 
-	void addMenuItem( UIMenu* menu, const std::string& txtKey, const std::string& txtVal,
-					  const std::string& icon = "",
-					  const KeyBindings::Shortcut& forcedKeybinding = KeyBindings::Shortcut() );
+	void menuAdd( UIMenu* menu, const std::string& cmd, const std::string& text,
+				  const std::string& icon = "",
+				  const KeyBindings::Shortcut& forcedKeybinding = KeyBindings::Shortcut() );
 
 	std::string repoSelected();
 
diff --git a/src/tools/ecode/plugins/linter/linterplugin.cpp b/src/tools/ecode/plugins/linter/linterplugin.cpp
index 1623376ab..dab2430ad 100644
--- a/src/tools/ecode/plugins/linter/linterplugin.cpp
+++ b/src/tools/ecode/plugins/linter/linterplugin.cpp
@@ -1306,7 +1306,7 @@ bool LinterPlugin::onCreateContextMenu( UICodeEditor* editor, UIPopUpMenu* menu,
 	for ( auto& match : matches ) {
 		if ( match.box[editor].contains( localPos ) ) {
 			menu->addSeparator();
-			menu->add( editor->i18n( "copy_error_message", "Copy Error Message" ),
+			menu->add( editor->i18n( "linter_copy_error_message", "Copy Error Message" ),
 					   mManager->getUISceneNode()->findIcon( "copy" )->getSize(
 						   PixelDensity::dpToPxI( 12 ) ) )
 				->setId( "linter-copy-error-message" );
diff --git a/src/tools/ecode/plugins/lsp/lspclientplugin.cpp b/src/tools/ecode/plugins/lsp/lspclientplugin.cpp
index 74c75bec6..9ae8d57cf 100644
--- a/src/tools/ecode/plugins/lsp/lspclientplugin.cpp
+++ b/src/tools/ecode/plugins/lsp/lspclientplugin.cpp
@@ -1348,52 +1348,60 @@ bool LSPClientPlugin::onCreateContextMenu( UICodeEditor* editor, UIPopUpMenu* me
 
 	menu->addSeparator();
 
-	auto addFn = [this, menu]( const std::string& txtKey, const std::string& txtVal,
-									   const std::string& icon = "" ) {
-		menu->add( i18n( txtKey, txtVal ), iconDrawable( icon, 12 ),
-				   KeyBindings::keybindFormat( mKeyBindings[txtKey] ) )
-			->setId( txtKey );
+	auto addFn = [this, menu]( const std::string& cmd, const std::string& text,
+							   const std::string& icon = "" ) {
+		menu->add( text, iconDrawable( icon, 12 ), KeyBindings::keybindFormat( mKeyBindings[cmd] ) )
+			->setId( cmd );
 	};
 	auto& cap = server->getCapabilities();
 
-	addFn( "lsp-symbol-info", "Symbol Info" );
+	addFn( "lsp-symbol-info", i18n( "lsp_symbol_info", "Symbol Info" ) );
 
 	if ( cap.definitionProvider )
-		addFn( "lsp-go-to-definition", "Go To Definition" );
+		addFn( "lsp-go-to-definition", i18n( "lsp_go_to_definition", "Go To Definition" ) );
 
 	if ( cap.declarationProvider )
-		addFn( "lsp-go-to-declaration", "Go To Declaration" );
+		addFn( "lsp-go-to-declaration", i18n( "lsp_go_to_declaration", "Go To Declaration" ) );
 
 	if ( cap.typeDefinitionProvider )
-		addFn( "lsp-go-to-type-definition", "Go To Type Definition" );
+		addFn( "lsp-go-to-type-definition",
+			   i18n( "lsp_go_to_type_definition", "Go To Type Definition" ) );
 
 	if ( cap.implementationProvider )
-		addFn( "lsp-go-to-implementation", "Go To Implementation" );
+		addFn( "lsp-go-to-implementation",
+			   i18n( "lsp_go_to_implementation", "Go To Implementation" ) );
 
 	if ( cap.renameProvider )
-		addFn( "lsp-rename-symbol-under-cursor", "Rename Symbol Under Cursor" );
+		addFn( "lsp-rename-symbol-under-cursor",
+			   i18n( "lsp_rename_symbol_under_cursor", "Rename Symbol Under Cursor" ) );
 
 	if ( cap.referencesProvider )
-		addFn( "lsp-symbol-references", "Find References to Symbol Under Cursor" );
+		addFn( "lsp-symbol-references", i18n( "lsp_find_references_to_symbol_under_cursor",
+											  "Find References to Symbol Under Cursor" ) );
 
 	if ( cap.codeActionProvider )
-		addFn( "lsp-symbol-code-action", "Code Action", "lightbulb-autofix" );
+		addFn( "lsp-symbol-code-action", i18n( "lsp_code_action", "Code Action" ),
+			   "lightbulb-autofix" );
 
 	if ( cap.documentRangeFormattingProvider &&
 		 editor->getDocument().getSelection().hasSelection() )
-		addFn( "lsp-format-range", "Format Selected Range" );
+		addFn( "lsp-format-range", i18n( "lsp_format_selected_range", "Format Selected Range" ) );
 
 	if ( cap.semanticTokenProvider.full || cap.semanticTokenProvider.fullDelta )
-		addFn( "lsp-refresh-semantic-highlighting", "Refresh Semantic Highlighting", "refresh" );
+		addFn( "lsp-refresh-semantic-highlighting",
+			   i18n( "lsp_refresh_semantic_highlighting", "Refresh Semantic Highlighting" ),
+			   "refresh" );
 
 	if ( server->getDefinition().language == "cpp" || server->getDefinition().language == "c" )
-		addFn( "lsp-switch-header-source", "Switch Header/Source", "filetype-hpp" );
+		addFn( "lsp-switch-header-source",
+			   i18n( "lsp_switch_header_source", "Switch Header/Source" ), "filetype-hpp" );
 
-	addFn( "lsp-plugin-restart", "Restart LSP Client", "refresh" );
+	addFn( "lsp-plugin-restart", i18n( "lsp_restart_lsp_client", "Restart LSP Client" ),
+		   "refresh" );
 
 #ifdef EE_DEBUG
 	if ( server->getDefinition().name == "clangd" )
-		addFn( "lsp-memory-usage", "LSP Memory Usage" );
+		addFn( "lsp-memory-usage", i18n( "lsp_memory_usage", "LSP Memory Usage" ) );
 #endif
 
 	return false;
diff --git a/src/tools/ecode/projectbuild.cpp b/src/tools/ecode/projectbuild.cpp
index 60a4aa100..72d9bb10c 100644
--- a/src/tools/ecode/projectbuild.cpp
+++ b/src/tools/ecode/projectbuild.cpp
@@ -711,11 +711,11 @@ void ProjectBuildManager::runBuild( const std::string& buildName, const std::str
 	if ( progressFn ) {
 		progressFn( 0,
 					Sys::getDateTimeStr() + ": " +
-						String::format(
-							i18n( "running_steps_for_project", "Running steps for project %s...\n" )
-								.toUtf8()
-								.c_str(),
-							buildName.c_str() ),
+						String::format( i18n( "running_steps_for_project_ellipsis",
+											  "Running steps for project %s...\n" )
+											.toUtf8()
+											.c_str(),
+										buildName.c_str() ),
 					nullptr );
 
 		if ( !buildType.empty() )
diff --git a/src/tools/ecode/projectdirectorytree.cpp b/src/tools/ecode/projectdirectorytree.cpp
index 9a04edcfc..ca97b043c 100644
--- a/src/tools/ecode/projectdirectorytree.cpp
+++ b/src/tools/ecode/projectdirectorytree.cpp
@@ -223,10 +223,12 @@ ProjectDirectoryTree::emptyModel( const std::vector<CommandInfo>& prependCommand
 }
 
 size_t ProjectDirectoryTree::getFilesCount() const {
+	Lock l( mFilesMutex );
 	return mFiles.size();
 }
 
 const std::vector<std::string>& ProjectDirectoryTree::getFiles() const {
+	Lock l( mFilesMutex );
 	return mFiles;
 }
 
diff --git a/src/tools/ecode/settingsmenu.cpp b/src/tools/ecode/settingsmenu.cpp
index 3e7e3b8be..5f8e65ce8 100644
--- a/src/tools/ecode/settingsmenu.cpp
+++ b/src/tools/ecode/settingsmenu.cpp
@@ -41,16 +41,16 @@ void SettingsMenu::createSettingsMenu( App* app ) {
 			   getKeybind( "create-new-window" ) )
 		->setId( "create-new-window" );
 	mSettingsMenu
-		->add( i18n( "open_file", "Open File..." ), findIcon( "document-open" ),
+		->add( i18n( "open_file_ellipsis", "Open File..." ), findIcon( "document-open" ),
 			   getKeybind( "open-file" ) )
 		->setId( "open-file" );
 	mSettingsMenu
-		->add( i18n( "open_folder", "Open Folder..." ), findIcon( "document-open" ),
+		->add( i18n( "open_folder_ellipsis", "Open Folder..." ), findIcon( "document-open" ),
 			   getKeybind( "open-folder" ) )
 		->setId( "open-folder" );
 	mSettingsMenu
-		->add( i18n( "open_file_from_web", "Open File from Web..." ), findIcon( "download-cloud" ),
-			   getKeybind( "download-file-web" ) )
+		->add( i18n( "open_file_from_web_ellipsis", "Open File from Web..." ),
+			   findIcon( "download-cloud" ), getKeybind( "download-file-web" ) )
 		->setId( "download-file-web" );
 	mSettingsMenu
 		->addSubMenu( i18n( "recent_files", "Recent Files" ), findIcon( "document-recent" ),
@@ -65,7 +65,7 @@ void SettingsMenu::createSettingsMenu( App* app ) {
 		->add( i18n( "save", "Save" ), findIcon( "document-save" ), getKeybind( "save-doc" ) )
 		->setId( "save-doc" );
 	mSettingsMenu
-		->add( i18n( "save_as", "Save as..." ), findIcon( "document-save-as" ),
+		->add( i18n( "save_as_ellipsis", "Save as..." ), findIcon( "document-save-as" ),
 			   getKeybind( "save-as-doc" ) )
 		->setId( "save-as-doc" );
 	mSettingsMenu
@@ -181,7 +181,7 @@ UIMenu* SettingsMenu::createFileTypeMenu() {
 
 		if ( menu->getCount() == maxItems && names.size() - total > 1 ) {
 			UIPopUpMenu* newMenu = UIPopUpMenu::New();
-			menu->addSubMenu( i18n( "more...", "More..." ), nullptr, newMenu );
+			menu->addSubMenu( i18n( "more_ellipsis", "More..." ), nullptr, newMenu );
 			newMenu->addEventListener( Event::OnItemClicked, cb );
 			mFileTypeMenues.push_back( newMenu );
 			menu = newMenu;
@@ -221,7 +221,7 @@ UIMenu* SettingsMenu::createColorSchemeMenu() {
 
 		if ( menu->getCount() == maxItems && colorSchemes.size() - total > 1 ) {
 			UIPopUpMenu* newMenu = UIPopUpMenu::New();
-			menu->addSubMenu( i18n( "more...", "More..." ), nullptr, newMenu );
+			menu->addSubMenu( i18n( "more_ellipsis", "More..." ), nullptr, newMenu );
 			newMenu->addEventListener( Event::OnItemClicked, cb );
 			mColorSchemeMenues.push_back( newMenu );
 			menu = newMenu;
@@ -823,13 +823,13 @@ UIMenu* SettingsMenu::createEditMenu() {
 			   getKeybind( "find-replace" ) )
 		->setId( "find-replace" );
 	menu->addSeparator();
-	menu->add( i18n( "open_containing_folder", "Open Containing Folder..." ),
+	menu->add( i18n( "open_containing_folder_ellipsis", "Open Containing Folder..." ),
 			   findIcon( "folder-open" ), getKeybind( "open-containing-folder" ) )
 		->setId( "open-containing-folder" );
-	menu->add( i18n( "open_in_new_window", "Open in New Window..." ), findIcon( "window" ),
+	menu->add( i18n( "open_in_new_window_ellipsis", "Open in New Window..." ), findIcon( "window" ),
 			   getKeybind( "open-in-new-window" ) )
 		->setId( "open-in-new-window" );
-	menu->add( i18n( "copy_containing_folder_path", "Copy Containing Folder Path..." ),
+	menu->add( i18n( "copy_containing_folder_path_ellipsis", "Copy Containing Folder Path..." ),
 			   findIcon( "copy" ), getKeybind( "copy-containing-folder-path" ) )
 		->setId( "copy-containing-folder-path" );
 	menu->add( i18n( "copy_file_path", "Copy File Path" ), findIcon( "copy" ),
@@ -907,13 +907,16 @@ UIMenu* SettingsMenu::createWindowMenu() {
 		->setId( "editor-font-size" );
 	mWindowMenu->add( i18n( "terminal_font_size", "Terminal Font Size" ), findIcon( "font-size" ) )
 		->setId( "terminal-font-size" );
-	mWindowMenu->add( i18n( "serif_font", "Serif Font..." ), findIcon( "font-size" ) )
+	mWindowMenu->add( i18n( "serif_font_ellipsis", "Serif Font..." ), findIcon( "font-size" ) )
 		->setId( "serif-font" );
-	mWindowMenu->add( i18n( "monospace_font", "Monospace Font..." ), findIcon( "font-size" ) )
+	mWindowMenu
+		->add( i18n( "monospace_font_ellipsis", "Monospace Font..." ), findIcon( "font-size" ) )
 		->setId( "monospace-font" );
-	mWindowMenu->add( i18n( "terminal_font", "Terminal Font..." ), findIcon( "font-size" ) )
+	mWindowMenu
+		->add( i18n( "terminal_font_ellipsis", "Terminal Font..." ), findIcon( "font-size" ) )
 		->setId( "terminal-font" );
-	mWindowMenu->add( i18n( "fallback_font", "Fallback Font..." ), findIcon( "font-size" ) )
+	mWindowMenu
+		->add( i18n( "fallback_font_ellipsis", "Fallback Font..." ), findIcon( "font-size" ) )
 		->setId( "fallback-font" );
 	mWindowMenu->addSeparator();
 	mWindowMenu
@@ -934,12 +937,12 @@ UIMenu* SettingsMenu::createWindowMenu() {
 					   mApp->getConfig().ui.showStatusBar, getKeybind( "toggle-status-bar" ) )
 		->setId( "toggle-status-bar" );
 	mWindowMenu
-		->add( i18n( "move_panel_left", "Move panel to left..." ), findIcon( "layout-left" ),
-			   getKeybind( "layout-left" ) )
+		->add( i18n( "move_panel_left_ellipsis", "Move panel to left..." ),
+			   findIcon( "layout-left" ), getKeybind( "layout-left" ) )
 		->setId( "move-panel-left" );
 	mWindowMenu
-		->add( i18n( "move_panel_right", "Move panel to right..." ), findIcon( "layout-right" ),
-			   getKeybind( "layout-rigth" ) )
+		->add( i18n( "move_panel_right_ellipsis", "Move panel to right..." ),
+			   findIcon( "layout-right" ), getKeybind( "layout-rigth" ) )
 		->setId( "move-panel-right" );
 	mWindowMenu->addSeparator();
 	mWindowMenu
@@ -1138,7 +1141,7 @@ UIMenu* SettingsMenu::createViewMenu() {
 	mViewMenu->addCheckBox( i18n( "highlight_selection_match", "Highlight Selection Match" ) )
 		->setActive( mApp->getConfig().editor.highlightSelectionMatch )
 		->setId( "highlight-selection-match" );
-	mViewMenu->addCheckBox( i18n( "enable-vertical-scrollbar", "Enable Vertical ScrollBar" ) )
+	mViewMenu->addCheckBox( i18n( "enable_vertical_scrollbar", "Enable Vertical ScrollBar" ) )
 		->setActive( mApp->getConfig().editor.verticalScrollbar )
 		->setId( "enable-vertical-scrollbar" );
 	mViewMenu->addCheckBox( i18n( "enable_horizontal_scrollbar", "Enable Horizontal ScrollBar" ) )
@@ -1289,30 +1292,31 @@ UIMenu* SettingsMenu::createViewMenu() {
 UIPopUpMenu* SettingsMenu::createToolsMenu() {
 	mToolsMenu = UIPopUpMenu::New();
 	mToolsMenu
-		->add( i18n( "locate", "Locate..." ), findIcon( "search" ), getKeybind( "open-locatebar" ) )
+		->add( i18n( "locate_ellipsis", "Locate..." ), findIcon( "search" ),
+			   getKeybind( "open-locatebar" ) )
 		->setId( "open-locatebar" );
 	mToolsMenu
-		->add( i18n( "command_palette", "Command Palette..." ), findIcon( "search" ),
+		->add( i18n( "command_palette_ellipsis", "Command Palette..." ), findIcon( "search" ),
 			   getKeybind( "open-command-palette" ) )
 		->setId( "open-command-palette" );
 	mToolsMenu
-		->add( i18n( "project_find", "Project Find..." ), findIcon( "search" ),
+		->add( i18n( "project_find_ellipsis", "Project Find..." ), findIcon( "search" ),
 			   getKeybind( "open-global-search" ) )
 		->setId( "open-global-search" );
 	mToolsMenu
-		->add( i18n( "show_open_documents", "Show Open Documents..." ), findIcon( "search" ),
-			   getKeybind( "show-open-documents" ) )
+		->add( i18n( "show_open_documents_ellipsis", "Show Open Documents..." ),
+			   findIcon( "search" ), getKeybind( "show-open-documents" ) )
 		->setId( "show-open-documents" );
 	mToolsMenu
-		->add( i18n( "workspace_symbol_find", "Search Worskspace Symbol..." ), findIcon( "search" ),
-			   getKeybind( "open-workspace-symbol-search" ) )
+		->add( i18n( "workspace_symbol_find_ellipsis", "Search Worskspace Symbol..." ),
+			   findIcon( "search" ), getKeybind( "open-workspace-symbol-search" ) )
 		->setId( "open-workspace-symbol-search" );
 	mToolsMenu
-		->add( i18n( "document_symbol_find", "Search Document Symbol..." ), findIcon( "search" ),
-			   getKeybind( "open-document-symbol-search" ) )
+		->add( i18n( "document_symbol_find_ellipsis", "Search Document Symbol..." ),
+			   findIcon( "search" ), getKeybind( "open-document-symbol-search" ) )
 		->setId( "open-workspace-symbol-search" );
 	mToolsMenu
-		->add( i18n( "go_to_line", "Go to line..." ), findIcon( "go-to-line" ),
+		->add( i18n( "go_to_line_ellipsis", "Go to line..." ), findIcon( "go-to-line" ),
 			   getKeybind( "go-to-line" ) )
 		->setId( "go-to-line" );
 
@@ -1559,11 +1563,13 @@ void SettingsMenu::createProjectTreeMenu() {
 	mProjectTreeMenu = UIPopUpMenu::New();
 
 	if ( !mApp->getCurrentProject().empty() ) {
-		mProjectTreeMenu->add( i18n( "new_file", "New File..." ), findIcon( "file-add" ) )
+		mProjectTreeMenu->add( i18n( "new_file_ellipsis", "New File..." ), findIcon( "file-add" ) )
 			->setId( "new_file" );
-		mProjectTreeMenu->add( i18n( "new_folder", "New Folder..." ), findIcon( "folder-add" ) )
+		mProjectTreeMenu
+			->add( i18n( "new_folder_ellipsis", "New Folder..." ), findIcon( "folder-add" ) )
 			->setId( "new_folder" );
-		mProjectTreeMenu->add( i18n( "open_folder", "Open Folder..." ), findIcon( "folder-open" ) )
+		mProjectTreeMenu
+			->add( i18n( "open_folder_ellipsis", "Open Folder..." ), findIcon( "folder-open" ) )
 			->setId( "open_folder" );
 		mProjectTreeMenu
 			->add( i18n( "execute_dir_in_terminal", "Open directory in terminal" ),
@@ -1580,13 +1586,16 @@ void SettingsMenu::createProjectTreeMenu() {
 						   !mApp->getFileSystemModel()->getDisplayConfig().ignoreHidden )
 			->setId( "show-hidden-files" );
 		mProjectTreeMenu->addSeparator();
-		mProjectTreeMenu->add( i18n( "refresh_view", "Refresh View..." ), findIcon( "refresh" ) )
+		mProjectTreeMenu
+			->add( i18n( "refresh_view_ellipsis", "Refresh View..." ), findIcon( "refresh" ) )
 			->setId( "refresh-view" );
 		mProjectTreeMenu->addSeparator();
-		mProjectTreeMenu->add( i18n( "configure_ignore_files", "Configure Ignore Files..." ) )
+		mProjectTreeMenu
+			->add( i18n( "configure_ignore_files_ellipsis", "Configure Ignore Files..." ) )
 			->setId( "configure-ignore-files" );
 	} else if ( !mApp->getFileSystemModel() ) {
-		mProjectTreeMenu->add( i18n( "open_folder", "Open Folder..." ), findIcon( "folder-open" ) )
+		mProjectTreeMenu
+			->add( i18n( "open_folder_ellipsis", "Open Folder..." ), findIcon( "folder-open" ) )
 			->setId( "open-folder" );
 	}
 
@@ -1635,11 +1644,13 @@ void SettingsMenu::createProjectTreeMenu( const FileInfo& file ) {
 	mProjectTreeMenu = UIPopUpMenu::New();
 
 	if ( file.isDirectory() ) {
-		mProjectTreeMenu->add( i18n( "new_file", "New File..." ), findIcon( "file-add" ) )
+		mProjectTreeMenu->add( i18n( "new_file_ellipsis", "New File..." ), findIcon( "file-add" ) )
 			->setId( "new_file" );
-		mProjectTreeMenu->add( i18n( "new_folder", "New Folder..." ), findIcon( "folder-add" ) )
+		mProjectTreeMenu
+			->add( i18n( "new_folder_ellipsis", "New Folder..." ), findIcon( "folder-add" ) )
 			->setId( "new_folder" );
-		mProjectTreeMenu->add( i18n( "open_folder", "Open Folder..." ), findIcon( "folder-open" ) )
+		mProjectTreeMenu
+			->add( i18n( "open_folder_ellipsis", "Open Folder..." ), findIcon( "folder-open" ) )
 			->setId( "open_folder" );
 	} else {
 		if ( file.isRegularFile() ) {
@@ -1647,7 +1658,7 @@ void SettingsMenu::createProjectTreeMenu( const FileInfo& file ) {
 			FileSystem::dirAddSlashAtEnd( curDir );
 			if ( curDir == file.getDirectoryPath() ) {
 				mProjectTreeMenu
-					->add( i18n( "new_file_in_file_folder", "New File in File Folder..." ),
+					->add( i18n( "new_file_in_file_folder_ellipsis", "New File in File Folder..." ),
 						   findIcon( "file-add" ) )
 					->setId( "new_file" );
 			}
@@ -1656,20 +1667,21 @@ void SettingsMenu::createProjectTreeMenu( const FileInfo& file ) {
 		mProjectTreeMenu->add( i18n( "open_file", "Open File" ), findIcon( "document-open" ) )
 			->setId( "open_file" );
 		mProjectTreeMenu
-			->add( i18n( "open_containin_folder", "Open Containing Folder..." ),
+			->add( i18n( "open_containing_folder_ellipsis", "Open Containing Folder..." ),
 				   findIcon( "folder-open" ) )
 			->setId( "open_containing_folder" );
 		mProjectTreeMenu
-			->add( i18n( "new_file_in_directory", "New File in directory..." ),
+			->add( i18n( "new_file_in_directory_ellipsis", "New File in directory..." ),
 				   findIcon( "file-add" ) )
 			->setId( "new_file_in_place" );
 		mProjectTreeMenu
-			->add( i18n( "duplicate_file", "Duplicate File..." ), findIcon( "file-copy" ) )
+			->add( i18n( "duplicate_file_ellipsis", "Duplicate File..." ), findIcon( "file-copy" ) )
 			->setId( "duplicate_file" );
 	}
 	mProjectTreeMenu->add( i18n( "rename", "Rename" ), findIcon( "edit" ), "F2" )
 		->setId( "rename" );
-	mProjectTreeMenu->add( i18n( "remove", "Remove..." ), findIcon( "delete-bin" ), "Delete" )
+	mProjectTreeMenu
+		->add( i18n( "remove_ellipsis", "Remove..." ), findIcon( "delete-bin" ), "Delete" )
 		->setId( "remove" );
 
 	if ( file.isDirectory() || file.isExecutable() ) {
@@ -1700,12 +1712,14 @@ void SettingsMenu::createProjectTreeMenu( const FileInfo& file ) {
 	mProjectTreeMenu->add( i18n( "expand_all", "Expand All" ), findIcon( "expand-all" ) )
 		->setId( "expand-all" );
 	mProjectTreeMenu->addSeparator();
-	mProjectTreeMenu->add( i18n( "refresh_view", "Refresh View..." ), findIcon( "refresh" ) )
+	mProjectTreeMenu
+		->add( i18n( "refresh_view_ellipsis", "Refresh View..." ), findIcon( "refresh" ) )
 		->setId( "refresh-view" );
 
 	if ( !mApp->getCurrentProject().empty() ) {
 		mProjectTreeMenu->addSeparator();
-		mProjectTreeMenu->add( i18n( "configure_ignore_files", "Configure Ignore Files..." ) )
+		mProjectTreeMenu
+			->add( i18n( "configure_ignore_files_ellipsis", "Configure Ignore Files..." ) )
 			->setId( "configure-ignore-files" );
 	}
 
diff --git a/src/tools/ecode/terminalmanager.cpp b/src/tools/ecode/terminalmanager.cpp
index 511273257..1fbf29a72 100644
--- a/src/tools/ecode/terminalmanager.cpp
+++ b/src/tools/ecode/terminalmanager.cpp
@@ -213,7 +213,7 @@ UIMenu* TerminalManager::createColorSchemeMenu() {
 
 		if ( menu->getCount() == maxItems && colorSchemes.size() - total > 1 ) {
 			UIPopUpMenu* newMenu = UIPopUpMenu::New();
-			menu->addSubMenu( mApp->i18n( "more...", "More..." ), nullptr, newMenu );
+			menu->addSubMenu( mApp->i18n( "more_ellipsis", "More..." ), nullptr, newMenu );
 			newMenu->addEventListener( Event::OnItemClicked, cb );
 			mColorSchemeMenues.push_back( newMenu );
 			menu = newMenu;
@@ -311,7 +311,7 @@ UITerminal* TerminalManager::createNewTerminal( const std::string& title, UITabW
 		UIMessageBox* msgBox = UIMessageBox::New(
 			UIMessageBox::INPUT, mApp->i18n( "new_terminal_name", "New terminal name:" ) );
 		msgBox->setTitle( mApp->getWindowTitle() );
-		msgBox->getTextInput()->setHint( mApp->i18n( "any_name", "Any name..." ) );
+		msgBox->getTextInput()->setHint( mApp->i18n( "any_name_ellipsis", "Any name..." ) );
 		msgBox->setCloseShortcut( { KEY_ESCAPE, KEYMOD_NONE } );
 		msgBox->showWhenReady();
 		msgBox->addEventListener( Event::OnConfirm, [&, msgBox, term]( const Event* ) {
diff --git a/src/tools/ecode/uiwelcomescreen.cpp b/src/tools/ecode/uiwelcomescreen.cpp
index 20adff8c0..96bacb279 100644
--- a/src/tools/ecode/uiwelcomescreen.cpp
+++ b/src/tools/ecode/uiwelcomescreen.cpp
@@ -111,8 +111,8 @@ static const auto LAYOUT = R"xml(
 			<button id="open-folder" text="@string(open_a_folder, Open a Folder)" />
 			<button id="open-file" text="@string(open_a_file, Open a File)" />
 			<button id="create-new-terminal" text="@string(new_terminal, New Terminal)" />
-			<button id="recent-folders" text="@string(recent_folders, Recent Folders...)" />
-			<button id="recent-files" text="@string(recent_files, Recent Files...)" />
+			<button id="recent-folders" text="@string(recent_folders_ellipsis, Recent Folders...)" />
+			<button id="recent-files" text="@string(recent_files_ellipsis, Recent Files...)" />
 			<button id="plugin-manager-open" text="@string(plugin_manager, Plugin Manager)" />
 			<button id="keybindings" text="@string(keybindings, Keybindings)" />
 			<widget class="separator" lw="mp" lh="32dp" />
diff --git a/src/tools/uieditor/uieditor.cpp b/src/tools/uieditor/uieditor.cpp
index 7fd8b4a76..ab3670684 100644
--- a/src/tools/uieditor/uieditor.cpp
+++ b/src/tools/uieditor/uieditor.cpp
@@ -1127,7 +1127,7 @@ void App::createAppMenu() {
 		->setId( "recent-projects" );
 	uiPopMenu->addSeparator();
 	uiPopMenu->add( i18n( "save", "Save" ), findIcon( "document-save" ) )->setId( "save-doc" );
-	uiPopMenu->add( i18n( "save_as", "Save as..." ), findIcon( "document-save-as" ) )
+	uiPopMenu->add( i18n( "save_as_ellipsis", "Save as..." ), findIcon( "document-save-as" ) )
 		->setId( "save-as-doc" );
 	uiPopMenu->add( i18n( "save_all", "Save All" ), findIcon( "document-save-as" ) )
 		->setId( "save-all" );