From 16db1eb4dd01fbbf588f9e76e7c8aa17d8d2808b Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Fri, 27 Jan 2012 19:22:57 +0000
Subject: [PATCH] Add more menu accelerators and fix a conflict between View
 and Video. Patch by catntabile. Closes #1434.

Originally committed to SVN as r6376.
---
 aegisub/src/command/edit.cpp           | 2 +-
 aegisub/src/command/video.cpp          | 2 +-
 aegisub/src/libresrc/default_menu.json | 6 +++---
 aegisub/src/menu.cpp                   | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/aegisub/src/command/edit.cpp b/aegisub/src/command/edit.cpp
index 9fd999545..47c692860 100644
--- a/aegisub/src/command/edit.cpp
+++ b/aegisub/src/command/edit.cpp
@@ -299,7 +299,7 @@ struct edit_line_paste_over : public Command {
 /// Recombine subtitles when they have been split and merged.
 struct edit_line_recombine : public validate_sel_multiple {
 	CMD_NAME("edit/line/recombine")
-	STR_MENU("Recombine Lines")
+	STR_MENU("Recom&bine Lines")
 	STR_DISP("Recombine Lines")
 	STR_HELP("Recombine subtitles when they have been split and merged.")
 
diff --git a/aegisub/src/command/video.cpp b/aegisub/src/command/video.cpp
index 9dc8cbf22..91a94320c 100644
--- a/aegisub/src/command/video.cpp
+++ b/aegisub/src/command/video.cpp
@@ -106,7 +106,7 @@ struct video_aspect_cinematic : public validator_video_loaded {
 /// Forces video to a custom aspect ratio.
 struct video_aspect_custom : public validator_video_loaded {
 	CMD_NAME("video/aspect/custom")
-	STR_MENU("Custom...")
+	STR_MENU("C&ustom...")
 	STR_DISP("Custom")
 	STR_HELP("Forces video to a custom aspect ratio.")
 	CMD_TYPE(COMMAND_VALIDATE | COMMAND_RADIO)
diff --git a/aegisub/src/libresrc/default_menu.json b/aegisub/src/libresrc/default_menu.json
index d3cec4b93..c872fc0db 100644
--- a/aegisub/src/libresrc/default_menu.json
+++ b/aegisub/src/libresrc/default_menu.json
@@ -33,7 +33,7 @@
         { "submenu" : "main/video",    "text" : "&Video" },
         { "submenu" : "main/audio",    "text" : "&Audio" },
         { "special" : "automation",    "text" : "A&utomation" },
-        { "submenu" : "main/view",     "text" : "&View" },
+        { "submenu" : "main/view",     "text" : "Vie&w" },
         { "submenu" : "main/help",     "text" : "&Help", "special" : "help" }
     ],
     "main/file" : [
@@ -138,8 +138,8 @@
         { "recent" : "Keyframes" },
         {},
         { "command" : "video/detach" },
-        { "submenu" : "main/video/set zoom", "text" : "Set Zoom" },
-        { "submenu" : "main/video/override ar", "text" : "Override AR" },
+        { "submenu" : "main/video/set zoom", "text" : "Set &Zoom" },
+        { "submenu" : "main/video/override ar", "text" : "Override &AR" },
         { "command" : "video/show_overscan" },
         {},
         { "command" : "video/jump" },
diff --git a/aegisub/src/menu.cpp b/aegisub/src/menu.cpp
index 9421c48a3..8e5e031e6 100644
--- a/aegisub/src/menu.cpp
+++ b/aegisub/src/menu.cpp
@@ -219,7 +219,7 @@ public:
 	/// @param parent Menu to append the new MRU menu to
 	void AddRecent(std::string const& name, wxMenu *parent) {
 		mru.push_back(new MruMenu(name, &items));
-		parent->AppendSubMenu(mru.back(), _("Recent"));
+		parent->AppendSubMenu(mru.back(), _("&Recent"));
 	}
 
 	void OnMenuOpen(wxMenuEvent &) {