diff --git a/bin/assets/i18n/en.xml b/bin/assets/i18n/en.xml
index d8fd6b169..692bbde97 100644
--- a/bin/assets/i18n/en.xml
+++ b/bin/assets/i18n/en.xml
@@ -56,6 +56,7 @@
 	<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_ellipsis">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
@@ -157,6 +158,7 @@ File path is: </string>
 	<string name="directory">directory</string>
 	<string name="document">Document</string>
 	<string name="document_symbol_find_ellipsis">Search Document Symbol...</string>
+	<string name="documentation">documentation</string>
 	<string name="documents_settings">Documents Settings</string>
 	<string name="double_quotes">Double Quotes ""</string>
 	<string name="download_file_web">Download File Web</string>
@@ -164,6 +166,7 @@ File path is: </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</string>
+	<string name="ecode_source_ellipsis">ecode source code...</string>
 	<string name="ecode_unreleased_version">You are running an unreleased version of ecode!
 Current version: </string>
 	<string name="ecode_updates_available"> is available!
@@ -194,9 +197,8 @@ 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="escape_sequence_tooltip">Replace \, \t, \n, \r and (Unicode characters</string>
+	<string name="escape_sequences">Escape Sequences</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>
@@ -218,9 +220,11 @@ is hover a word that represents a color.</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="for_help_please_visit">For help, please visit:</string>
 	<string name="force_new_line_at_end_of_file">Force New Line at End of File</string>
 	<string name="format_doc">Format Doc</string>
 	<string name="formatter_format_document">Format Document</string>
+	<string name="forum">forum</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>
@@ -249,7 +253,10 @@ is hover a word that represents a color.</string>
 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_diff_head">Diff HEAD</string>
+	<string name="git_diff_staged">Diff Staged</string>
 	<string name="git_discard">Discard</string>
+	<string name="git_discard_all">Discard All</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>
@@ -284,6 +291,7 @@ Name your stash (optional):</string>
 	<string name="git_tags">Tags</string>
 	<string name="git_unmerged">Unmerged</string>
 	<string name="git_unstage">Unstage</string>
+	<string name="git_unstage_all">Unstage All</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>
@@ -310,7 +318,8 @@ Restart ecode to see the changes.</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="issues">issues</string>
+	<string name="issues_capitalized">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>
@@ -352,6 +361,9 @@ Restart ecode to see the changes.</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="lua_pattern_match">Lua Pattern Match</string>
+	<string name="main_menu">Main Menu</string>
+	<string name="match_case">Match Case</string>
 	<string name="match_whole_word">Match Whole Word</string>
 	<string name="menu_toggle">Menu Toggle</string>
 	<string name="message">Message</string>
@@ -428,7 +440,7 @@ Please restart the application.</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_capitalized">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>
@@ -531,6 +543,7 @@ Set 0 to disable it.
 Minimum value is 1, and maximum 6. Requires restart.</string>
 	<string name="shell">Shell</string>
 	<string name="shell_configuration">Shell Configuration</string>
+	<string name="shortcuts">Shortcuts</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>
@@ -602,6 +615,7 @@ file in the directory tree.</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="the_ecode_nbsp">The ecode </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>
@@ -630,7 +644,7 @@ file in the directory tree.</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_cut">Cut</string>
 	<string name="uicodeeditor_delete">Delete</string>
 	<string name="uicodeeditor_open_containing_folder_ellipsis">Open Containing Folder...</string>
 	<string name="uicodeeditor_paste">Paste</string>
diff --git a/src/eepp/system/translator.cpp b/src/eepp/system/translator.cpp
index 52be924f7..1ec6d3a5c 100644
--- a/src/eepp/system/translator.cpp
+++ b/src/eepp/system/translator.cpp
@@ -271,6 +271,10 @@ void Translator::saveToStream( IOStream& stream, std::string lang ) {
 	auto resources = doc.append_child( "resources" );
 	resources.append_attribute( "language" ).set_value( lang.c_str() );
 
+	auto langNameIt = mLangNames.find( lang );
+	if ( langNameIt != mLangNames.end() )
+		resources.append_attribute( "title" ).set_value( langNameIt->second.c_str() );
+
 	auto& unordered_map = mDictionary[lang];
 	std::map<std::string, String> langStrs( unordered_map.begin(), unordered_map.end() );
 
@@ -279,10 +283,6 @@ void Translator::saveToStream( IOStream& stream, std::string lang ) {
 		auto d = r.append_child( pugi::node_pcdata );
 		r.append_attribute( "name" ).set_value( str.first.c_str() );
 
-		auto langNameIt = mLangNames.find( lang );
-		if ( langNameIt != mLangNames.end() )
-			r.append_attribute( "title" ).set_name( langNameIt->second.c_str() );
-
 		d.set_value( str.second.toUtf8().c_str() );
 	}
 
diff --git a/src/eepp/ui/tools/uidocfindreplace.cpp b/src/eepp/ui/tools/uidocfindreplace.cpp
index 6a23ecda7..f4cde74bd 100644
--- a/src/eepp/ui/tools/uidocfindreplace.cpp
+++ b/src/eepp/ui/tools/uidocfindreplace.cpp
@@ -112,19 +112,19 @@ const char DOC_FIND_REPLACE_XML[] = R"xml(
 				<input class="input-find" layout_width="match_parent" layout_height="wrap_content" hint="Find" />
 				<selectbutton id="ce_find_replace_box-escape-sequences"
 							  layout_width="wrap_content" layout_height="wrap_content" class="escape-sequences"
-							  layout_gravity="right|center_vertical" tooltip="Escape Sequences"
+							  layout_gravity="right|center_vertical" tooltip="@string(escape_sequences, Escape Sequences)"
 							  marginRight="2dp" text="\n" />
 				<selectbutton id="ce_find_replace_box-match-case" class="match-case"
 							  layout_width="wrap_content" layout_height="wrap_content"
-							  layout_gravity="right|center_vertical" tooltip="Match Case" marginRight="2dp"
+							  layout_gravity="right|center_vertical" tooltip="@string(match_case, Match Case)" marginRight="2dp"
 							  layout_to_left_of="ce_find_replace_box-escape-sequences" />
 				<selectbutton id="ce_find_replace_box-whole-word" class="whole-word"
 							  layout_width="wrap_content" layout_height="wrap_content"
-							  layout_gravity="right|center_vertical" tooltip="Whole Word"
+							  layout_gravity="right|center_vertical" tooltip="@string(Whole Word)"
 							  layout_to_left_of="ce_find_replace_box-match-case" marginRight="2dp" />
 				<selectbutton id="ce_find_replace_box-regex" class="regex" layout_width="wrap_content"
 							  layout_height="wrap_content" layout_gravity="right|center_vertical"
-							  tooltip="Lua Pattern Match" layout_to_left_of="ce_find_replace_box-whole-word"
+							  tooltip="@string(lua_pattern_match, Lua Pattern Match)" layout_to_left_of="ce_find_replace_box-whole-word"
 							  marginRight="2dp" />
 			</RelativeLayout>
 			<button class="prev-button" layout_width="wrap_content" layout_height="24dp" text="Prev." icon="icon(arrow-up, 16dp)" />
@@ -134,9 +134,9 @@ const char DOC_FIND_REPLACE_XML[] = R"xml(
 		<hbox class="replace_box" layout_width="match_parent" layout_height="wrap_content">
 			<input class="input-replace" layout_width="200dp" layout_height="wrap_content" hint="Replace" marginRight="1dp" />
 
-			<button class="replace-button" layout_width="wrap_content" layout_height="wrap_content" tooltip="Replace" />
+			<button class="replace-button" layout_width="wrap_content" layout_height="wrap_content" tooltip="@string(replace, Replace)" />
 
-			<button class="replace-all-button" layout_width="wrap_content" layout_height="wrap_content" tooltip="Replace All" />
+			<button class="replace-all-button" layout_width="wrap_content" layout_height="wrap_content" tooltip="@string(replace_all, Replace All)" />
 		</hbox>
 	</vbox>
 </hbox>
diff --git a/src/eepp/ui/uitextinput.cpp b/src/eepp/ui/uitextinput.cpp
index 7f0c3ca99..bada546ea 100644
--- a/src/eepp/ui/uitextinput.cpp
+++ b/src/eepp/ui/uitextinput.cpp
@@ -898,7 +898,7 @@ void UITextInput::createDefaultContextMenuOptions( UIPopUpMenu* menu ) {
 		->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_paste", "Paste" ), "paste", "paste" );
 	menuAdd( menu, i18n( "uicodeeditor_delete", "Delete" ), "delete-text", "delete-to-next-char" );
 	menu->addSeparator();
 	menuAdd( menu, i18n( "uicodeeditor_select_all", "Select All" ), "select-all", "select-all" );
diff --git a/src/tools/ecode/applayout.xml.hpp b/src/tools/ecode/applayout.xml.hpp
index 304f14d93..3b9971dfb 100644
--- a/src/tools/ecode/applayout.xml.hpp
+++ b/src/tools/ecode/applayout.xml.hpp
@@ -474,7 +474,7 @@ R"html(
 			</vbox>
 			<vbox lw="wc" lh="wc" margin-right="4dp">
 				<CheckBox id="whole_word" lw="wc" lh="wc" text='@string(match_whole_word, "Match Whole Word")' selected="false" />
-				<CheckBox id="escape_sequence" lw="wc" lh="wc" text='@string(use_escape_sequences, "Use escape sequences")' selected="false" tooltip='@string(escape_sequence_tooltip, "Replace \\, \t, \n, \r and \uXXXX (Unicode characters) with the corresponding control")' />
+				<CheckBox id="escape_sequence" lw="wc" lh="wc" text='@string(use_escape_sequences, "Use escape sequences")' selected="false" tooltip='@string(escape_sequence_tooltip, "Replace \\, \\t, \\n, \\r and \\uXXXX (Unicode characters) with the corresponding control")' />
 			</vbox>
 			<vbox lw="wc" lh="wc">
 				<hbox lw="wc" lh="wc" margin-bottom="2dp">
diff --git a/src/tools/ecode/projectbuild.cpp b/src/tools/ecode/projectbuild.cpp
index 72d9bb10c..e1d2c61a8 100644
--- a/src/tools/ecode/projectbuild.cpp
+++ b/src/tools/ecode/projectbuild.cpp
@@ -132,7 +132,7 @@ ProjectBuildManager::ProjectBuildManager( const std::string& projectRoot,
 	mThreadPool( pool ),
 	mSidePanel( sidePanel ),
 	mApp( app ),
-	mNewBuild( mApp->i18n( "new_name", "new_name" ), mProjectRoot ) {
+	mNewBuild( mApp->i18n( "new_name", "New Name" ), mProjectRoot ) {
 	FileSystem::dirAddSlashAtEnd( mProjectRoot );
 
 	if ( mThreadPool ) {
@@ -172,7 +172,7 @@ bool ProjectBuildManager::cloneBuild( const std::string& build, std::string newB
 }
 
 void ProjectBuildManager::addBuild( UIWidget* buildTab ) {
-	mNewBuild = ProjectBuild( mApp->i18n( "new_name", "new_name" ), mProjectRoot );
+	mNewBuild = ProjectBuild( mApp->i18n( "new_name", "New Name" ), mProjectRoot );
 	std::string hashName = String::toString( String::hash( "new_name" ) );
 	UIWidget* widget = nullptr;
 	if ( ( widget = buildTab->getUISceneNode()->getRoot()->querySelector( "#build_settings_" +
diff --git a/src/tools/ecode/statusbuildoutputcontroller.cpp b/src/tools/ecode/statusbuildoutputcontroller.cpp
index 3399b9ec2..350cdccd1 100644
--- a/src/tools/ecode/statusbuildoutputcontroller.cpp
+++ b/src/tools/ecode/statusbuildoutputcontroller.cpp
@@ -442,8 +442,8 @@ void StatusBuildOutputController::createContainer() {
 <rellayce id="build_output" lw="mp" lh="mp" visible="false" class="status_build_output_cont" lw="mp" lh="mp">
 	<CodeEditor id="build_output_output" lw="mp" lh="mp" />
 	<TableView id="build_output_issues" lw="mp" lh="mp" visible="false" />
-	<SelectButton id="but_build_output_issues" text="@string(issues, Issues)" lg="bottom|right" margin-right="1dp" margin-bottom="18dp" margin-right="18dp" />
-	<SelectButton id="but_build_output_output" text="@string(output, Output)" layout-to-left-of="but_build_output_issues" selected="true" />
+	<SelectButton id="but_build_output_issues" text="@string(issues_capitalized, Issues)" lg="bottom|right" margin-right="1dp" margin-bottom="18dp" margin-right="18dp" />
+	<SelectButton id="but_build_output_output" text="@string(output_capitalized, Output)" layout-to-left-of="but_build_output_issues" selected="true" />
 </rellayce>
 	)xml";