Removed label mnemonics from localization keys.

2 files changed, 123 insertions, 117 deletions

diff --git a/modules/textadept/find.lua b/modules/textadept/find.lua
index a3723683..4d80ae39 100644
--- a/modules/textadept/find.lua
+++ b/modules/textadept/find.lua
@@ -5,16 +5,16 @@ local events = events
 local find = gui.find
 local c = _SCINTILLA.constants
 
-find.find_label_text = L('_Find:')
-find.replace_label_text = L('R_eplace:')
-find.find_next_button_text = L('Find _Next')
-find.find_prev_button_text = L('Find _Prev')
-find.replace_button_text = L('_Replace')
-find.replace_all_button_text = L('Replace _All')
-find.match_case_label_text = L('_Match case')
-find.whole_word_label_text = L('_Whole word')
-find.lua_pattern_label_text = L('_Lua pattern')
-find.in_files_label_text = L('_In files')
+find.find_label_text = L('Find:')
+find.replace_label_text = L('Replace:')
+find.find_next_button_text = L('Find Next')
+find.find_prev_button_text = L('Find Prev')
+find.replace_button_text = L('Replace')
+find.replace_all_button_text = L('Replace All')
+find.match_case_label_text = L('Match case')
+find.whole_word_label_text = L('Whole word')
+find.lua_pattern_label_text = L('Lua pattern')
+find.in_files_label_text = L('In files')
 
 local MARK_FIND = _SCINTILLA.next_marker_number()
 local MARK_FIND_COLOR = 0x4D9999
diff --git a/modules/textadept/menu.lua b/modules/textadept/menu.lua
index 3cab568d..92385fa0 100644
--- a/modules/textadept/menu.lua
+++ b/modules/textadept/menu.lua
@@ -58,17 +58,18 @@ end
 -- @class table
 -- @name menubar
 menubar = {
-  { title = L('_File'),
+  { title = L('File'),
     { L('gtk-new'), new_buffer },
     { L('gtk-open'), io.open_file },
-    { L('_Reload'), { _buffer.reload, _buffer } },
+    { L('Open Recent...'), io.open_recent_file },
+    { L('Reload'), { _buffer.reload, _buffer } },
     { L('gtk-save'), { _buffer.save, _buffer } },
     { L('gtk-save-as'), { _buffer.save_as, _buffer } },
     SEPARATOR,
     { L('gtk-close'), { _buffer.close, _buffer } },
-    { L('Close A_ll'), io.close_all },
+    { L('Close All'), io.close_all },
     SEPARATOR,
-    { L('Loa_d Session...'), function()
+    { L('Load Session...'), function()
       local session_file = _SESSIONFILE or ''
       local utf8_filename = gui.dialog('fileselect',
                                        '--title', L('Load Session'),
@@ -81,7 +82,7 @@ menubar = {
         _m.textadept.session.load(utf8_filename:iconv(_CHARSET, 'UTF-8'))
       end
     end },
-    { L('Sa_ve Session...'), function()
+    { L('Save Session...'), function()
       local session_file = _SESSIONFILE or ''
       local utf8_filename = gui.dialog('filesave',
                                        '--title', L('Save Session'),
@@ -97,35 +98,37 @@ menubar = {
     SEPARATOR,
     { L('gtk-quit'), quit },
   },
-  { title = L('_Edit'),
+  { title = L('Edit'),
     { L('gtk-undo'), { _buffer.undo, _buffer } },
     { L('gtk-redo'), { _buffer.redo, _buffer } },
     SEPARATOR,
     { L('gtk-cut'), { _buffer.cut, _buffer } },
     { L('gtk-copy'), { _buffer.copy, _buffer } },
     { L('gtk-paste'), { _buffer.paste, _buffer } },
+    { L('Duplicate'), { _buffer.line_duplicate, _buffer } },
     { L('gtk-delete'), { _buffer.clear, _buffer } },
     { L('gtk-select-all'), { _buffer.select_all, _buffer } },
     SEPARATOR,
-    { L('Match _Brace'), m_editing.match_brace },
-    { L('Select t_o Brace'), { m_editing.match_brace, 'select' } },
-    { L('Complete _Word'), { m_editing.autocomplete_word, '%w_' } },
-    { L('De_lete Word'), { m_editing.current_word, 'delete' } },
-    { L('Hi_ghlight Word'), m_editing.highlight_word },
-    { L('Complete S_ymbol'), function()
+    { L('Match Brace'), m_editing.match_brace },
+    { L('Select to Brace'), { m_editing.match_brace, 'select' } },
+    { L('Complete Word'), { m_editing.autocomplete_word, '%w_' } },
+    { L('Delete Word'), { m_editing.current_word, 'delete' } },
+    { L('Highlight Word'), m_editing.highlight_word },
+    { L('Complete Symbol'), function()
       local m = _m[buffer:get_lexer()]
       if m and m.adeptsense then m.adeptsense.sense:complete() end
     end },
-    { L('S_how Documentation'), function()
+    { L('Show Documentation'), function()
       local m = _m[buffer:get_lexer()]
       if m and m.adeptsense then m.adeptsense.sense:show_apidoc() end
     end },
-    { L('Tran_spose Characters'), m_editing.transpose_chars },
-    { L('_Join Lines'), m_editing.join_lines },
-    { L('Convert _Indentation'), m_editing.convert_indentation },
-    { title = L('S_election'),
-      { title = L('_Enclose in...'),
-        { L('_HTML Tags'), function()
+    { L('Toggle Block Comment'), m_editing.block_comment },
+    { L('Transpose Characters'), m_editing.transpose_chars },
+    { L('Join Lines'), m_editing.join_lines },
+    { L('Convert Indentation'), m_editing.convert_indentation },
+    { title = L('Selection'),
+      { title = L('Enclose in...'),
+        { L('HTML Tags'), function()
           m_editing.enclose('<', '>')
           local buffer = buffer
           local pos = buffer.current_pos
@@ -133,103 +136,102 @@ menubar = {
           buffer:insert_text(-1,
                              '</'..buffer:text_range(pos, buffer.current_pos))
         end },
-        { L('HTML Single _Tag'), { m_editing.enclose, '<', ' />' } },
-        { L('_Double Quotes'), { m_editing.enclose, '"', '"' } },
-        { L('_Single Quotes'), { m_editing.enclose, "'", "'" } },
-        { L('_Parentheses'), { m_editing.enclose, '(', ')' } },
-        { L('_Brackets'), { m_editing.enclose, '[', ']' } },
-        { L('B_races'), { m_editing.enclose, '{', '}' } },
+        { L('HTML Single Tag'), { m_editing.enclose, '<', ' />' } },
+        { L('Double Quotes'), { m_editing.enclose, '"', '"' } },
+        { L('Single Quotes'), { m_editing.enclose, "'", "'" } },
+        { L('Parentheses'), { m_editing.enclose, '(', ')' } },
+        { L('Brackets'), { m_editing.enclose, '[', ']' } },
+        { L('Braces'), { m_editing.enclose, '{', '}' } },
       },
-      { L('_Grow'), { m_editing.grow_selection, 1 } },
+      { L('Grow'), { m_editing.grow_selection, 1 } },
     },
-    { title = L('Select i_n...'),
-      { L('_HTML Tag'), { m_editing.select_enclosed, '>', '<' } },
-      { L('_Double Quote'), { m_editing.select_enclosed, '"', '"' } },
-      { L('_Single Quote'), { m_editing.select_enclosed, "'", "'" } },
-      { L('_Parenthesis'), { m_editing.select_enclosed, '(', ')' } },
-      { L('_Bracket'), { m_editing.select_enclosed, '[', ']' } },
-      { L('B_race'), { m_editing.select_enclosed, '{', '}' } },
-      { L('_Word'), { m_editing.current_word, 'select' } },
-      { L('_Line'), m_editing.select_line },
-      { L('Para_graph'), m_editing.select_paragraph },
-      { L('_Indented Block'), m_editing.select_indented_block },
-      { L('S_cope'), m_editing.select_scope },
+    { title = L('Select in...'),
+      { L('HTML Tag'), { m_editing.select_enclosed, '>', '<' } },
+      { L('Double Quote'), { m_editing.select_enclosed, '"', '"' } },
+      { L('Single Quote'), { m_editing.select_enclosed, "'", "'" } },
+      { L('Parenthesis'), { m_editing.select_enclosed, '(', ')' } },
+      { L('Bracket'), { m_editing.select_enclosed, '[', ']' } },
+      { L('Brace'), { m_editing.select_enclosed, '{', '}' } },
+      { L('Word'), { m_editing.current_word, 'select' } },
+      { L('Line'), m_editing.select_line },
+      { L('Paragraph'), m_editing.select_paragraph },
+      { L('Indented Block'), m_editing.select_indented_block },
+      { L('Scope'), m_editing.select_scope },
     },
   },
-  { title = L('_Tools'),
-    { title = L('_Find'),
-      { L('gtk-find'), gui.find.focus },
-      { L('Find _Next'), gui.find.call_find_next },
-      { L('Find _Previous'), gui.find.call_find_prev },
-      { L('gtk-find-and-replace'), gui.find.focus },
-      { L('Replace'), gui.find.call_replace },
-      { L('Replace _All'), gui.find.call_replace_all },
-      { L('Find _Incremental'), gui.find.find_incremental },
-      SEPARATOR,
-      { L('Find in Fi_les'), function()
-        gui.find.in_files = true
-        gui.find.focus()
-      end },
-      { L('Goto Next File Found'), { gui.find.goto_file_in_list, true } },
-      { L('Goto Previous File Found'), { gui.find.goto_file_in_list, false } },
-      SEPARATOR,
-      { L('gtk-jump-to'), m_editing.goto_line },
-    },
-    { L('Command _Entry'), gui.command_entry.focus },
+  { title = L('Search'),
+    { L('gtk-find'), gui.find.focus },
+    { L('Find Next'), gui.find.call_find_next },
+    { L('Find Previous'), gui.find.call_find_prev },
+    { L('Replace'), gui.find.call_replace },
+    { L('Replace All'), gui.find.call_replace_all },
+    { L('Find Incremental'), gui.find.find_incremental },
     SEPARATOR,
-    { L('_Run'), m_textadept.run.run },
-    { L('_Compile'), m_textadept.run.compile },
-    { L('Fi_lter Through'), _m.textadept.filter_through.filter_through },
+    { L('Find in Files'), function()
+      gui.find.in_files = true
+      gui.find.focus()
+    end },
+    { L('Goto Next File Found'), { gui.find.goto_file_in_list, true } },
+    { L('Goto Previous File Found'), { gui.find.goto_file_in_list, false } },
     SEPARATOR,
-    { title = L('_Snippets'),
-      { L('_Expand'), m_textadept.snippets._insert },
-      { L('_Insert...'), m_textadept.snippets._select },
-      { L('_Previous Placeholder'), m_textadept.snippets._previous },
-      { L('_Cancel'), m_textadept.snippets._cancel_current },
+    { L('gtk-jump-to'), m_editing.goto_line },
+  },
+  { title = L('Tools'),
+    { L('Command Entry'), gui.command_entry.focus },
+    SEPARATOR,
+    { L('Run'), m_textadept.run.run },
+    { L('Compile'), m_textadept.run.compile },
+    { L('Filter Through'), _m.textadept.filter_through.filter_through },
+    SEPARATOR,
+    { title = L('Snippets'),
+      { L('Expand'), m_textadept.snippets._insert },
+      { L('Insert...'), m_textadept.snippets._select },
+      { L('Previous Placeholder'), m_textadept.snippets._previous },
+      { L('Cancel'), m_textadept.snippets._cancel_current },
     },
-    { title = L('_Bookmark'),
-      { L('_Toggle on Current Line'), m_textadept.bookmarks.toggle },
-      { L('_Clear All'), m_textadept.bookmarks.clear },
-      { L('_Next'), m_textadept.bookmarks.goto_next },
-      { L('_Previous'), m_textadept.bookmarks.goto_prev },
-      { L('_Goto Bookmark...'), m_textadept.bookmarks.goto },
+    { title = L('Bookmark'),
+      { L('Toggle on Current Line'), m_textadept.bookmarks.toggle },
+      { L('Clear All'), m_textadept.bookmarks.clear },
+      { L('Next'), m_textadept.bookmarks.goto_next },
+      { L('Previous'), m_textadept.bookmarks.goto_prev },
+      { L('Goto Bookmark...'), m_textadept.bookmarks.goto },
     },
-    { title = L('Snap_open'),
-      { L('_User Home'), { m_textadept.snapopen.open, _USERHOME } },
-      { L('_Textadept Home'), { m_textadept.snapopen.open, _HOME } },
-      { L('_Current Directory'), function()
+    { title = L('Snapopen'),
+      { L('User Home'), { m_textadept.snapopen.open, _USERHOME } },
+      { L('Textadept Home'), { m_textadept.snapopen.open, _HOME } },
+      { L('Current Directory'), function()
         if buffer.filename then
           m_textadept.snapopen.open(buffer.filename:match('^(.+)[/\\]'))
         end
       end },
     },
   },
-  { title = L('_Buffer'),
-    { L('_Next Buffer'), { _view.goto_buffer, _view, 1, false } },
-    { L('_Previous Buffer'), { _view.goto_buffer, _view, -1, false } },
-    { L('Switch _Buffer'), gui.switch_buffer },
+  { title = L('Buffer'),
+    { L('Next Buffer'), { _view.goto_buffer, _view, 1, false } },
+    { L('Previous Buffer'), { _view.goto_buffer, _view, -1, false } },
+    { L('Switch Buffer'), gui.switch_buffer },
     SEPARATOR,
-    { L('Toggle View _EOL'), { toggle_setting, 'view_eol' } },
-    { L('Toggle _Wrap Mode'), { toggle_setting, 'wrap_mode' } },
-    { L('Toggle Show Indentation _Guides'),
+    { L('Toggle View EOL'), { toggle_setting, 'view_eol' } },
+    { L('Toggle Wrap Mode'), { toggle_setting, 'wrap_mode' } },
+    { L('Toggle Show Indentation Guides'),
       { toggle_setting, 'indentation_guides' } },
-    { L('Toggle Use _Tabs'), { toggle_setting, 'use_tabs' } },
-    { L('Toggle View White_space'), { toggle_setting, 'view_ws' } },
-    { L('Toggle _Virtual Space'),
+    { L('Toggle Use Tabs'), { toggle_setting, 'use_tabs' } },
+    { L('Toggle View Whitespace'), { toggle_setting, 'view_ws' } },
+    { L('Toggle Virtual Space'),
       { toggle_setting, 'virtual_space_options', 2} },
     SEPARATOR,
-    { title = L('_Indentation'),
-      { '_2', { set_indentation, 2 } },
-      { '_3', { set_indentation, 3 } },
-      { '_4', { set_indentation, 4 } },
-      { '_8', { set_indentation, 8 } },
+    { title = L('Indentation'),
+      { '2', { set_indentation, 2 } },
+      { '3', { set_indentation, 3 } },
+      { '4', { set_indentation, 4 } },
+      { '8', { set_indentation, 8 } },
     },
-    { title = L('EOL _Mode'),
+    { title = L('EOL Mode'),
       { L('CRLF'), { set_eol_mode, 0 } },
       { L('CR'), { set_eol_mode, 1 } },
       { L('LF'), { set_eol_mode, 2 } },
     },
-    { title = L('En_coding'),
+    { title = L('Encoding'),
       { L('UTF-8'), { set_encoding, 'UTF-8' } },
       { L('ASCII'), { set_encoding, 'ASCII' } },
       { L('ISO-8859-1'), { set_encoding, 'ISO-8859-1' } },
@@ -237,30 +239,34 @@ menubar = {
       { L('UTF-16'), { set_encoding, 'UTF-16LE' } },
     },
     SEPARATOR,
-    { L('_Refresh Syntax Highlighting'),
+    { L('Refresh Syntax Highlighting'),
       { _buffer.colourise, _buffer, 0, -1 } },
   },
-  { title = L('_View'),
-    { L('_Next View'), { gui.goto_view, 1, false } },
-    { L('_Previous View'), { gui.goto_view, -1, false } },
+  { title = L('View'),
+    { L('Next View'), { gui.goto_view, 1, false } },
+    { L('Previous View'), { gui.goto_view, -1, false } },
     SEPARATOR,
-    { L('Split _Vertical'), { _view.split, _view } },
-    { L('Split _Horizontal'), { _view.split, _view, false } },
-    { L('_Unsplit'), function() view:unsplit() end },
-    { L('Unsplit _All'), function() while view:unsplit() do end end },
+    { L('Split Vertical'), { _view.split, _view } },
+    { L('Split Horizontal'), { _view.split, _view, false } },
+    { L('Unsplit'), function() view:unsplit() end },
+    { L('Unsplit All'), function() while view:unsplit() do end end },
     SEPARATOR,
-    { L('_Grow'),
+    { L('Grow'),
       function() if view.size then view.size = view.size + 10 end end
     },
-    { L('_Shrink'),
+    { L('Shrink'),
       function() if view.size then view.size = view.size - 10 end end
     },
+    SEPARATOR,
+    { L('Zoom In'), function() buffer.zoom = buffer.zoom + 1 end },
+    { L('Zoom Out'), function() buffer.zoom = buffer.zoom - 1 end },
+    { L('Reset Zoom'), function() buffer.zoom = 0 end },
   },
   -- Lexer menu inserted here
-  { title = L('_Help'),
-    { L('_Manual'),
+  { title = L('Help'),
+    { L('Manual'),
       { open_webpage, _HOME..'/doc/manual/1_Introduction.html' } },
-    { L('_LuaDoc'), { open_webpage, _HOME..'/doc/index.html' } },
+    { L('LuaDoc'), { open_webpage, _HOME..'/doc/index.html' } },
     SEPARATOR,
     { L('gtk-about'),
       { gui.dialog, 'ok-msgbox', '--title', 'Textadept', '--informative-text',
@@ -268,7 +274,7 @@ menubar = {
     },
   },
 }
-local lexer_menu = { title = L('Le_xers') }
+local lexer_menu = { title = L('Lexers') }
 for _, lexer in ipairs(_m.textadept.mime_types.lexers) do
   lexer_menu[#lexer_menu + 1] = { lexer:gsub('_', '__'), { set_lexer, lexer} }
 end