Translate all messages instead of relying on GTK to translate stock items.

11 files changed, 702 insertions, 613 deletions

diff --git a/core/file_io.lua b/core/file_io.lua
index 41566664..18b7b919 100644
--- a/core/file_io.lua
+++ b/core/file_io.lua
@@ -109,6 +109,8 @@ function io.open_file(utf8_filenames)
   utf8_filenames = utf8_filenames or
                    gui.dialog('fileselect',
                               '--title', _L['Open'],
+                              '--button1', _L['_Open'],
+                              '--button2', _L['_Cancel'],
                               '--select-multiple',
                               '--with-directory',
                               (buffer.filename or ''):match('.+[/\\]') or '')
@@ -238,6 +240,8 @@ local function save_as(buffer, utf8_filename)
   if not utf8_filename then
     utf8_filename = gui.dialog('filesave',
                                '--title', _L['Save'],
+                               '--button1', _L['_Save'],
+                               '--button2', _L['_Cancel'],
                                '--with-directory',
                                (buffer.filename or ''):match('.+[/\\]') or '',
                                '--with-file',
@@ -274,7 +278,7 @@ local function close(buffer)
                                  '--title', _L['Close without saving?'],
                                  '--text', _L['There are unsaved changes in'],
                                  '--informative-text', filename,
-                                 '--button1', 'gtk-cancel',
+                                 '--button1', _L['_Cancel'],
                                  '--button2', _L['Close _without saving'],
                                  '--no-newline') ~= '2' then
     return false
@@ -315,6 +319,8 @@ local function update_modified_file()
                   '--informative-text',
                   ('"%s"\n%s'):format(utf8_filename,
                                       _L['has been modified. Reload it?']),
+                  '--button1', _L['_Yes'],
+                  '--button2', _L['_No'],
                   '--no-cancel',
                   '--no-newline') == '1' then
       buffer:reload()
diff --git a/core/gui.lua b/core/gui.lua
index 5be51813..6681388a 100644
--- a/core/gui.lua
+++ b/core/gui.lua
@@ -82,8 +82,8 @@ function gui.print(...) gui._print(_L['[Message Buffer]'], ...) end
 function gui.filteredlist(title, columns, items, int_return, ...)
   local out = gui.dialog('filteredlist',
                          '--title', title,
-                         '--button1', 'gtk-ok',
-                         '--button2', 'gtk-cancel',
+                         '--button1', _L['_OK'],
+                         '--button2', _L['_Cancel'],
                          '--no-newline',
                          int_return and '' or '--string-output',
                          '--columns', columns,
@@ -91,7 +91,7 @@ function gui.filteredlist(title, columns, items, int_return, ...)
                          ...)
   local patt = int_return and '^(%-?%d+)\n(%d+)$' or '^([^\n]+)\n(.+)$'
   local response, value = out:match(patt)
-  if response == (int_return and '1' or 'gtk-ok') then
+  if response == (int_return and '1' or _L['_OK']) then
     return not int_return and value or tonumber(value)
   end
 end
@@ -409,7 +409,7 @@ events_connect(events.QUIT, function()
                                  '--text',
                                  _L['The following buffers are unsaved:'],
                                  '--informative-text', table.concat(list, '\n'),
-                                 '--button1', 'gtk-cancel',
+                                 '--button1', _L['_Cancel'],
                                  '--button2', _L['Quit _without saving'],
                                  '--no-newline') == '2'
 end)
diff --git a/core/locale.conf b/core/locale.conf
index 18ef2927..b8cfc082 100644
--- a/core/locale.conf
+++ b/core/locale.conf
@@ -19,25 +19,34 @@
 Undefined event name = Undefined event name
 
 % core/file_io.lua
-Encoding conversion failed. = Encoding conversion failed.
 Open = Open
+_Open = _Open
+_Cancel = _Cancel
+Encoding conversion failed. = Encoding conversion failed.
 Cannot change binary file encoding = Cannot change binary file encoding
 Save = Save
+_Save = _Save
+Untitled = Untitled
 Close without saving? = Close without saving?
 There are unsaved changes in = There are unsaved changes in
 Close _without saving = Close _without saving
 Reload? = Reload?
 Reload modified file? = Reload modified file?
 has been modified. Reload it? = has been modified. Reload it?
+_Yes = _Yes
+_No = _No
 File = File
 
 % core/gui.lua
 [Message Buffer] = [Message Buffer]
+_OK = _Ok
+%_Cancel = _Cancel
 Name = Name
 %File = File
-Untitled = Untitled
+%Untitled = Untitled
 Switch Buffers = Switch Buffers
 theme not found. = theme not found.
+Select Theme = Select Theme
 CRLF = CRLF
 CR = CR
 LF = LF
@@ -56,182 +65,188 @@ Invalid sequence = Invalid sequence
 
 % modules/textadept/bookmarks.lua
 Select Bookmark = Select Bookmark
+Bookmark = Bookmark
 
 % modules/textadept/editing.lua
 Go To = Go To
 Line Number: = Line Number:
+%_OK = _OK
+%_Cancel = _Cancel
 
 % modules/textadept/find.lua
-Find: = _Find:
-Replace: = R_eplace:
-Find Next = Find _Next
-Find Prev = Find _Prev
-Replace = _Replace
-Replace All = Replace _All
-Match case = _Match case
-Whole word = _Whole word
-Lua pattern = _Lua pattern
-In files = _In files
+_Find: = _Find:
+R_eplace: = R_eplace:
+Find _Next = Find _Next
+Find _Prev = Find _Prev
+_Replace = _Replace
+Replace _All = Replace _All
+_Match case = _Match case
+_Whole word = _Whole word
+_Lua pattern = _Lua pattern
+_In files = _In files
 Find in Files = Find in Files
+%_Open = _Open
+%_Cancel = _Cancel
 No results found = No results found
 [Files Found Buffer] = [Files Found Buffer]
 Search wrapped = Search wrapped
 Error = Error
 An error occured: = An error occured:
+%_OK = _OK
+%_Cancel = _Cancel
 replacement(s) made = replacement(s) made
 
 % modules/textadept/keys.lua
 Lexer = Lexer
 Style = Style
+Error loading webpage: = Error loading webpage:
 
 % modules/textadept/menu.lua
-Error loading webpage: = Error loading webpage:
-File = _File
-gtk-new = gtk-new
-gtk-open = gtk-open
-Open Recent... = Open _Recent...
-Reload = Re_load
-gtk-save = gtk-save
-gtk-save-as = gtk-save-as
-gtk-close = gtk-close
+_File = _File
+_New = _New
+%_Open = _Open
+Open _Recent... = Open _Recent...
+Re_load = Re_load
+%_Save = _Save
+Save _As = Save _As
+_Close = _Close
 Close All = Close All
-Load Session... = Loa_d Session...
-Load Session = Load Session
-Save Session... = Sav_e Session...
-Save Session = Save Session
-gtk-quit = gtk-quit
-Edit = _Edit
-gtk-undo = gtk-undo
-gtk-redo = gtk-redo
-gtk-cut = gtk-cut
-gtk-copy = gtk-copy
-gtk-paste = gtk-paste
-Duplicate Line = Duplicate _Line
-gtk-delete = gtk-delete
-gtk-select-all = gtk-select-all
-Match Brace = _Match Brace
-Complete Word = Complete _Word
-Delete Word = D_elete Word
-Highlight Word = _Highlight Word
-Toggle Block Comment = Toggle _Block Comment
-Transpose Characters = T_ranspose Characters
-Join Lines = _Join Lines
-Select = _Select
-Select to Matching Brace = Select to _Matching Brace
-Select between XML Tags = Select between _XML Tags
-Select in XML Tag = Select in XML _Tag
-Select in Double Quotes = Select in _Double Quotes
-Select in Single Quotes = Select in _Single Quotes
-Select in Parentheses = Select in _Parentheses
-Select in Brackets = Select in _Brackets
-Select in Braces = Select in B_races
-Select Word = Select _Word
-Select Line = Select _Line
-Select Paragraph = Select Para_graph
-Select Indented Block = Select _Indented Block
-Selection = Selectio_n
-Upper Case Selection = _Upper Case Selection
-Lower Case Selection = _Lower Case Selection
-Enclose as XML Tags = Enclose as _XML Tags
-Enclose as Single XML Tag = Enclose as Single XML _Tag
-Enclose in Single Quotes = Enclose in Single _Quotes
-Enclose in Double Quotes = Enclose in _Double Quotes
-Enclose in Parentheses = Enclose in _Parentheses
-Enclose in Brackets = Enclose in _Brackets
-Enclose in Braces = Enclose in B_races
-Grow Selection = _Grow Selection
-Shrink Selection = _Shrink Selection
-Move Selected Lines Up = _Move Selected Lines Up
-Move Selected Lines Down = Move Selected Lines Do_wn
-Search = _Search
-gtk-find = gtk-find
-%Find Next = Find _Next
-Find Previous = Find _Previous
-Replace = _Replace
-%Replace All = Replace _All
-Find Incremental = Find _Incremental
-Find in Files = Find in Fi_les
-Goto Next File Found = Goto Nex_t File Found
-Goto Previous File Found = Goto Previou_s File Found
-gtk-jump-to = gtk-jump-to
-Tools = _Tools
-Command Entry = Command _Entry
-Select Command = Select Co_mmand
-Run = _Run
-Compile = _Compile
-Filter Through = _Filter Through
-Adeptsense = _Adeptsense
-Complete Symbol = _Complete Symbol
-Show Documentation = Show _Documentation
-Bookmark = _Bookmark
-Toggle Bookmark = _Toggle Bookmark
-Clear Bookmarks = _Clear Bookmarks
-Next Bookmark = _Next Bookmark
-Previous Bookmark = _Previous Bookmark
-Goto Bookmark... = _Goto Bookmark...
-Snapopen = Snap_open
-Snapopen User Home = Snapopen _User Home
-Snapopen Textadept Home = Snapopen _Textadept Home
-Snapopen Current Directory = Snapopen _Current Directory
-Snippets = _Snippets
-Insert Snippet... = _Insert Snippet...
-Expand Snippet/Next Placeholder = _Expand Snippet/Next Placeholder
-Previous Snippet Placeholder = _Previous Snippet Placeholder
-Cancel Snippet = _Cancel Snippet
-Show Style = Show St_yle
-Buffer = _Buffer
-Next Buffer = _Next Buffer
-Previous Buffer = _Previous Buffer
-Switch to Buffer... = _Switch to Buffer...
-Indentation = _Indentation
-Tab width: 2 = Tab width: _2
-Tab width: 3 = Tab width: _3
-Tab width: 4 = Tab width: _4
-Tab width: 8 = Tab width: _8
-Toggle Use Tabs = _Toggle Use Tabs
-Convert Indentation = _Convert Indentation
-EOL Mode = _EOL Mode
+Loa_d Session... = Loa_d Session...
+Sav_e Session... = Sav_e Session...
+_Quit = _Quit
+_Edit = _Edit
+_Undo = _Undo
+_Redo = _Redo
+Cu_t = Cu_t
+_Copy = _Copy
+_Paste = _Paste
+Duplicate _Line = Duplicate _Line
+_Delete = _Delete
+D_elete Word = D_elete Word
+Select _All = Select _All
+_Match Brace = _Match Brace
+Complete _Word = Complete _Word
+_Highlight Word = _Highlight Word
+Toggle _Block Comment = Toggle _Block Comment
+T_ranspose Characters = T_ranspose Characters
+_Join Lines = _Join Lines
+_Select = _Select
+Select to _Matching Brace = Select to _Matching Brace
+Select between _XML Tags = Select between _XML Tags
+Select in XML _Tag = Select in XML _Tag
+Select in _Single Quotes = Select in _Single Quotes
+Select in _Double Quotes = Select in _Double Quotes
+Select in _Parentheses = Select in _Parentheses
+Select in _Brackets = Select in _Brackets
+Select in B_races = Select in B_races
+Select _Word = Select _Word
+Select _Line = Select _Line
+Select Para_graph = Select Para_graph
+Select _Indented Block = Select _Indented Block
+Selectio_n = Selectio_n
+_Upper Case Selection = _Upper Case Selection
+_Lower Case Selection = _Lower Case Selection
+Enclose as _XML Tags = Enclose as _XML Tags
+Enclose as Single XML _Tag = Enclose as Single XML _Tag
+Enclose in Single _Quotes = Enclose in Single _Quotes
+Enclose in _Double Quotes = Enclose in _Double Quotes
+Enclose in _Parentheses = Enclose in _Parentheses
+Enclose in _Brackets = Enclose in _Brackets
+Enclose in B_races = Enclose in B_races
+_Grow Selection = _Grow Selection
+_Shrink Selection = _Shrink Selection
+_Move Selected Lines Up = _Move Selected Lines Up
+Move Selected Lines Do_wn = Move Selected Lines Do_wn
+_Search = _Search
+_Find = _Find
+%Find _Next = Find _Next
+Find _Previous = Find _Previous
+%_Replace = _Replace
+%Replace _All = Replace _All
+Find _Incremental = Find _Incremental
+Find in Fi_les = Find in Fi_les
+Goto Nex_t File Found = Goto Nex_t File Found
+Goto Previou_s File Found = Goto Previou_s File Found
+_Jump to = _Jump to
+_Tools = _Tools
+Command _Entry = Command _Entry
+Select Co_mmand = Select Co_mmand
+_Run = _Run
+_Compile = _Compile
+_Filter Through = _Filter Through
+_Adeptsense = _Adeptsense
+_Complete Symbol = _Complete Symbol
+Show _Documentation = Show _Documentation
+_Bookmark = _Bookmark
+_Toggle Bookmark = _Toggle Bookmark
+_Clear Bookmarks = _Clear Bookmarks
+_Next Bookmark = _Next Bookmark
+_Previous Bookmark = _Previous Bookmark
+_Goto Bookmark... = _Goto Bookmark...
+Snap_open = Snap_open
+Snapopen _User Home = Snapopen _User Home
+Snapopen _Textadept Home = Snapopen _Textadept Home
+Snapopen _Current Directory = Snapopen _Current Directory
+_Snippets = _Snippets
+_Insert Snippet... = _Insert Snippet...
+_Expand Snippet/Next Placeholder = _Expand Snippet/Next Placeholder
+_Previous Snippet Placeholder = _Previous Snippet Placeholder
+_Cancel Snippet = _Cancel Snippet
+Show St_yle = Show St_yle
+_Buffer = _Buffer
+_Next Buffer = _Next Buffer
+_Previous Buffer = _Previous Buffer
+_Switch to Buffer... = _Switch to Buffer...
+_Indentation = _Indentation
+Tab width: _2 = Tab width: _2
+Tab width: _3 = Tab width: _3
+Tab width: _4 = Tab width: _4
+Tab width: _8 = Tab width: _8
+_Toggle Use Tabs = _Toggle Use Tabs
+_Convert Indentation = _Convert Indentation
+_EOL Mode = _EOL Mode
 %CRLF = CRLF
 %CR = CR
 %LF = LF
-Encoding = E_ncoding
-UTF-8 Encoding = _UTF-8 Encoding
-ASCII Encoding = _ASCII Encoding
-ISO-8859-1 Encoding = _ISO-8859-1 Encoding
-MacRoman Encoding = _MacRoman Encoding
-UTF-16 Encoding = UTF-1_6 Encoding
-Refresh Syntax Highlighting = _Refresh Syntax Highlighting
-Select Lexer... = Select _Lexer...
-View = _View
-Next View = _Next View
-Previous View = _Previous View
-Split View Horizontal = Split View _Horizontal
-Split View Vertical = Split View _Vertical
-Unsplit View = _Unsplit View
-Unsplit All Views = Unsplit _All Views
-Grow View = _Grow View
-Shrink View = Shrin_k View
-Toggle Current Fold = Toggle Current _Fold
-Toggle View EOL = Toggle View _EOL
-Toggle Wrap Mode = Toggle _Wrap Mode
-Toggle Show Indent Guides = Toggle Show In_dent Guides
-Toggle View Whitespace = Toggle View White_space
-Toggle Virtual Space = Toggle _Virtual Space
-Zoom In = Zoom _In
-Zoom Out = Zoom _Out
-Reset Zoom = _Reset Zoom
-Select Theme... = Select _Theme...
-Help = _Help
-Show Manual = Show _Manual
-Show LuaDoc = Show _LuaDoc
-gtk-about = gtk-about
-Unknown command: = Unknown command:
-Run Command = Run Command
+E_ncoding = E_ncoding
+_UTF-8 Encoding = _UTF-8 Encoding
+_ASCII Encoding = _ASCII Encoding
+_ISO-8859-1 Encoding = _ISO-8859-1 Encoding
+_MacRoman Encoding = _MacRoman Encoding
+UTF-1_6 Encoding = UTF-1_6 Encoding
+Select _Lexer... = Select _Lexer...
+_Refresh Syntax Highlighting = _Refresh Syntax Highlighting
+_View = _View
+_Next View = _Next View
+_Previous View = _Previous View
+Split View _Horizontal = Split View _Horizontal
+Split View _Vertical = Split View _Vertical
+_Unsplit View = _Unsplit View
+Unsplit _All Views = Unsplit _All Views
+_Grow View = _Grow View
+Shrin_k View = Shrin_k View
+Toggle Current _Fold = Toggle Current _Fold
+Toggle View _EOL = Toggle View _EOL
+Toggle _Wrap Mode = Toggle _Wrap Mode
+Toggle Show In_dent Guides = Toggle Show In_dent Guides
+Toggle View White_space = Toggle View White_space
+Toggle _Virtual Space = Toggle _Virtual Space
+Zoom _In = Zoom _In
+Zoom _Out = Zoom _Out
+_Reset Zoom = _Reset Zoom
+Select _Theme... = Select _Theme...
+_Help = _Help
+Show _Manual = Show _Manual
+Show _LuaDoc = Show _LuaDoc
+_About = _About
 Command = Command
 Key Command = Key Command
+Run Command = Run Command
+Unknown command: = Unknown command:
 
 % modules/textadept/mime_types.lua
 Select Lexer = Select Lexer
+%Name = Name
 
 % modules/textadept/run.lua
 does not exist = does not exist
@@ -239,10 +254,18 @@ does not exist = does not exist
 % modules/textadept/session.lua
 Session Files Not Found = Session Files Not Found
 The following session files were not found = The following session files were not found
+%_OK = _OK
+Load Session = Load Session
+%_Open = _Open
+%_Cancel = _Cancel
+Save Session = Save Session
+%_Save = _Save
+%_Cancel = _Cancel
 
 % modules/textadept/snapopen.lua
 File Limit Exceeded = File Limit Exceeded
 files or more were found. Showing the first = files or more were found. Showing the first
+%_OK = _OK
 %Open = Open
 %File = File
 
diff --git a/core/locales/locale.es.conf b/core/locales/locale.es.conf
index 795327c7..c1401171 100644
--- a/core/locales/locale.es.conf
+++ b/core/locales/locale.es.conf
@@ -20,25 +20,34 @@
 Undefined event name = Nombre de evento sin definir
 
 % core/file_io.lua
-Encoding conversion failed. = Error al convertir codificación.
 Open = Abrir
+_Open = _Abrir
+_Cancel = _Cancelar
+Encoding conversion failed. = Error al convertir codificación.
 Cannot change binary file encoding = No se ha podido cambiar la codificación del fichero binario
 Save = Guardar
+_Save = _Guardar
+Untitled = Sin Nombre
 Close without saving? = ¿Cerrar sin guardar?
 There are unsaved changes in = Hay cambios sin guardar en
 Close _without saving = Cerrar _sin guardar
 Reload? = Volver a cargar?
 Reload modified file? = ¿Volver a cargar fichero modificado?
 has been modified. Reload it? = ha sido modificado. ¿Desea volver a cargarlo?
+_Yes = _Sí
+_No = _No
 File = Archivo
 
 % core/gui.lua
 [Message Buffer] = [Buffer de mensajes]
+_OK = _Aceptar
+%_Cancel = _Cancelar
 Name = Nombre
 %File = File
-Untitled = Sin Nombre
+%Untitled = Sin Nombre
 Switch Buffers = Cambiar Buffer
 theme not found. = tema no encontrado.
+Select Theme = Seleccionar tema
 CRLF = CRLF
 CR = CR
 LF = LF
@@ -57,182 +66,188 @@ Invalid sequence = Combinación de teclas no válida
 
 % modules/textadept/bookmarks.lua
 Select Bookmark = Seleccionar marcador
+Bookmark = Marcador
 
 % modules/textadept/editing.lua
 Go To = Ir a
 Line Number: = Número de línea:
+%_OK = _Aceptar
+%_Cancel = _Cancelar
 
 % modules/textadept/find.lua
-Find: = _Buscar:
-Replace: = Reempla_zar:
-Find Next = Buscar _siguiente
-Find Prev = Buscar a_nterior
-Replace = _Reemplazar
-Replace All = Reemplazar _todo
-Match case = Concid. _mayús/minús
-Whole word = Palabra _completa
-Lua pattern = Patrón de _Lua
-In files = En ficher_os
+_Find: = _Buscar:
+R_eplace: = Reempla_zar:
+Find _Next = Buscar _siguiente
+Find _Prev = Buscar a_nterior
+_Replace = _Reemplazar
+Replace _All = Reemplazar _todo
+_Match case = Concid. _mayús/minús
+_Whole word = Palabra _completa
+_Lua pattern = Patrón de _Lua
+_In files = En ficher_os
 Find in Files = Buscar en ficheros
+%_Open = _Abrir
+%_Cancel = _Cancelar
 No results found = No se han encontrado coincidencias
 [Files Found Buffer] = [Buffer de búsqueda en ficheros]
 Search wrapped = La búsqueda ha sobrepasado el final/inicio del documento
 Error = Error
 An error occured: = Ha ocurrido un error:
+%_OK = _Aceptar
+%_Cancel = _Cancelar
 replacement(s) made = cambios(s) hecho(s)
 
 % modules/textadept/keys.lua
 Lexer = Analizador léxico
 Style = Estilo
+Error loading webpage: = Error al cargar la página web:
 
 % modules/textadept/menu.lua
-Error loading webpage: = Error al cargar la página web:
-File = _Archivo
-gtk-new = gtk-new
-gtk-open = gtk-open
-Open Recent... = Abrir _reciente...
-Reload = _Volver a cargar
-gtk-save = gtk-save
-gtk-save-as = gtk-save-as
-gtk-close = gtk-close
+_File = _Archivo
+_New = _Nuevo
+%_Open = _Abrir
+Open _Recent... = Abrir _reciente...
+Re_load = _Volver a cargar
+%_Save = _Guardar
+Save _As = Guardar co_mo
+_Close = _Cerrar
 Close All = Cerrar _todo
-Load Session... = Cargar s_esión...
-Load Session = Cargar sesión
-Save Session... = G_uardar sesión...
-Save Session = Guardar sesión
-gtk-quit = gtk-quit
-Edit = _Editar
-gtk-undo = gtk-undo
-gtk-redo = gtk-redo
-gtk-cut = gtk-cut
-gtk-copy = gtk-copy
-gtk-paste = gtk-paste
-Duplicate Line = D_uplicar línea
-gtk-delete = gtk-delete
-gtk-select-all = gtk-select-all
-Match Brace = _Saltar a paréntesis coincidente
-Complete Word = C_ompletar palabra
-Delete Word = _Borrar palabra
-Highlight Word = Res_altar palabra
-Toggle Block Comment = Activar/Desactivar co_mentario de bloque
-Transpose Characters = _Intercambiar caracteres
-Join Lines = U_nir líneas
-Select = Se_leccionar
-Select to Matching Brace = Seleccionar _hasta paréntesis correspondiente
-Select between XML Tags = Seleccionar _entre etiquetas XML
-Select in XML Tag = Seleccionar e_tiqueta XML
-Select in Double Quotes = Seleccionar e_ntre comillas dobles
-Select in Single Quotes = Seleccionar ent_re comillas simples
-Select in Parentheses = Seleccionar entre _paréntesis
-Select in Brackets = Seleccionar entre _corchetes
-Select in Braces = Seleccionar entre _llaves
-Select Word = Seleccionar pala_bra
-Select Line = Seleccionar l_ínea
-Select Paragraph = Seleccionar párra_fo
-Select Indented Block = Seleccionar blo_que indentado
-Selection = Sele_cción
-Upper Case Selection = _Selección a mayúsculas
-Lower Case Selection = S_eleccion a minúsculas
-Enclose as XML Tags = _Delimitar por etiq. XML
-Enclose as Single XML Tag = _Convertir en etiqueta XML
-Enclose in Single Quotes = De_limitar por comillas simples
-Enclose in Double Quotes = Del_imitar por comillas dobles
-Enclose in Parentheses = Deli_mitar por paréntesis
-Enclose in Brackets = Delimi_tar por corchetes
-Enclose in Braces = Delimit_ar por llaves
-Grow Selection = E_xtender selección
-Shrink Selection = Enc_oger selección
-Move Selected Lines Up = Mover lí_neas seleccionadas arriba
-Move Selected Lines Down = Mo_ver líneas seleccionadas abajo
-Search = _Buscar
-gtk-find = gtk-find
-%Find Next = Buscar _Siguiente
-Find Previous = Buscar _anterior
-Replace = _Reemplazar
-%Replace All = Reemplazar _todo
-Find Incremental = Búsqueda i_ncremental
-Find in Files = Búsqueda en _ficheros
-Goto Next File Found = Ir a sig_uiente fichero encontrado
-Goto Previous File Found = Ir _a anterior fichero encontrado
-gtk-jump-to = gtk-jump-to
-Tools = _Herramientas
-Command Entry = _Línea de comandos
-Select Command = _Seleccionar comandos
-Run = _Ejecutar
-Compile = _Compilar
-Filter Through = _Filtrar mediante
-Adeptsense = _Adeptsense
-Complete Symbol = _Completar símbolo
-Show Documentation = _Mostrar documentación
-Bookmark = _Marcadores
-Toggle Bookmark = Activar/Desactivar _marcador
-Clear Bookmarks = _Borrar marcadores
-Next Bookmark = Marcador _siguiente
-Previous Bookmark = Marcador _anterior
-Goto Bookmark... = _Ir a marcador...
-Snapopen = Snap_open
-Snapopen User Home = Snapopen en carpeta de _usuario
-Snapopen Textadept Home = Snapopen en carpeta de _Textadept
-Snapopen Current Directory = Snapopen en carpeta _actual
-Snippets = _Fragmentos de código
-Insert Snippet... = _Insertar fragmento...
-Expand Snippet/Next Placeholder = _Expandir fragmento/siguiente marcador
-Previous Snippet Placeholder = _Anterior marcador en fragmento
-Cancel Snippet = _Cancelar fragmento
-Show Style = Mos_trar estilo
-Buffer = Bu_ffer
-Next Buffer = Buffer _siguiente
-Previous Buffer = Buffer _anterior
-Switch to Buffer... = _Cambiar de Buffer...
-Indentation = _Indentación
-Tab width: 2 = Ancho de tabulación: _2
-Tab width: 3 = Ancho de tabulación: _3
-Tab width: 4 = Ancho de tabulación: _4
-Tab width: 8 = Ancho de tabulación: _8
-Toggle Use Tabs = _Activar/Desactivar tabulaciones
-Convert Indentation = _Convertir indentación
-EOL Mode = Ca_rácter fin de línea
+Loa_d Session... = Cargar s_esión...
+Sav_e Session... = G_uardar sesión...
+_Quit = _Salir
+_Edit = _Editar
+_Undo = _Deshacer
+_Redo = _Rehacer
+Cu_t = Cor_tar
+_Copy = _Copiar
+_Paste = _Pegar
+Duplicate _Line = D_uplicar línea
+_Delete = _Eliminar
+D_elete Word = _Borrar palabra
+Select _All = Seleccionar _todo
+_Match Brace = _Saltar a paréntesis coincidente
+Complete _Word = C_ompletar palabra
+_Highlight Word = Res_altar palabra
+Toggle _Block Comment = Activar/Desactivar co_mentario de bloque
+T_ranspose Characters = _Intercambiar caracteres
+_Join Lines = U_nir líneas
+_Select = Se_leccionar
+Select to _Matching Brace = Seleccionar _hasta paréntesis correspondiente
+Select between _XML Tags = Seleccionar _entre etiquetas XML
+Select in XML _Tag = Seleccionar e_tiqueta XML
+Select in _Single Quotes = Seleccionar ent_re comillas simples
+Select in _Double Quotes = Seleccionar e_ntre comillas dobles
+Select in _Parentheses = Seleccionar entre _paréntesis
+Select in _Brackets = Seleccionar entre _corchetes
+Select in B_races = Seleccionar entre _llaves
+Select _Word = Seleccionar pala_bra
+Select _Line = Seleccionar l_ínea
+Select Para_graph = Seleccionar párra_fo
+Select _Indented Block = Seleccionar blo_que indentado
+Selectio_n = Sele_cción
+_Upper Case Selection = _Selección a mayúsculas
+_Lower Case Selection = S_eleccion a minúsculas
+Enclose as _XML Tags = _Delimitar por etiq. XML
+Enclose as Single XML _Tag = _Convertir en etiqueta XML
+Enclose in Single _Quotes = De_limitar por comillas simples
+Enclose in _Double Quotes = Del_imitar por comillas dobles
+Enclose in _Parentheses = Deli_mitar por paréntesis
+Enclose in _Brackets = Delimi_tar por corchetes
+Enclose in B_races = Delimit_ar por llaves
+_Grow Selection = E_xtender selección
+_Shrink Selection = Enc_oger selección
+_Move Selected Lines Up = Mover lí_neas seleccionadas arriba
+Move Selected Lines Do_wn = Mo_ver líneas seleccionadas abajo
+_Search = _Buscar
+_Find = _Buscar
+%Find _Next = Buscar _Siguiente
+Find _Previous = Buscar _anterior
+%_Replace = _Reemplazar
+%Replace _All = Reemplazar _todo
+Find _Incremental = Búsqueda i_ncremental
+Find in Fi_les = Búsqueda en _ficheros
+Goto Nex_t File Found = Ir a sig_uiente fichero encontrado
+Goto Previou_s File Found = Ir _a anterior fichero encontrado
+_Jump to = _Ir a
+_Tools = _Herramientas
+Command _Entry = _Línea de comandos
+Select Co_mmand = _Seleccionar comandos
+_Run = _Ejecutar
+_Compile = _Compilar
+_Filter Through = _Filtrar mediante
+_Adeptsense = _Adeptsense
+_Complete Symbol = _Completar símbolo
+Show _Documentation = _Mostrar documentación
+_Bookmark = _Marcadores
+_Toggle Bookmark = Activar/Desactivar _marcador
+_Clear Bookmarks = _Borrar marcadores
+_Next Bookmark = Marcador _siguiente
+_Previous Bookmark = Marcador _anterior
+_Goto Bookmark... = _Ir a marcador...
+Snap_open = Snap_open
+Snapopen _User Home = Snapopen en carpeta de _usuario
+Snapopen _Textadept Home = Snapopen en carpeta de _Textadept
+Snapopen _Current Directory = Snapopen en carpeta _actual
+_Snippets = _Fragmentos de código
+_Insert Snippet... = _Insertar fragmento...
+_Expand Snippet/Next Placeholder = _Expandir fragmento/siguiente marcador
+_Previous Snippet Placeholder = _Anterior marcador en fragmento
+_Cancel Snippet = _Cancelar fragmento
+Show St_yle = Mos_trar estilo
+_Buffer = Bu_ffer
+_Next Buffer = Buffer _siguiente
+_Previous Buffer = Buffer _anterior
+_Switch to Buffer... = _Cambiar de Buffer...
+_Indentation = _Indentación
+Tab width: _2 = Ancho de tabulación: _2
+Tab width: _3 = Ancho de tabulación: _3
+Tab width: _4 = Ancho de tabulación: _4
+Tab width: _8 = Ancho de tabulación: _8
+_Toggle Use Tabs = _Activar/Desactivar tabulaciones
+_Convert Indentation = _Convertir indentación
+_EOL Mode = Ca_rácter fin de línea
 %CRLF = _CRLF
 %CR = C_R
 %LF = _LF
-Encoding = C_odificación
-UTF-8 Encoding = Codificación UTF-_8
-ASCII Encoding = Codificación _ASCII
-ISO-8859-1 Encoding = Codificación _ISO-8859-1
-MacRoman Encoding = Codificación _MacRoman
-UTF-16 Encoding = Codificación UTF-_16
-Refresh Syntax Highlighting = Ac_tualizar resaltado de sintaxis
-Select Lexer... = S_eleccionar analizador léxico
-View = _Ver
-Next View = Vista _siguiente
-Previous View = Vista _anterior
-Split View Horizontal = Dividir vista _horizontalmente
-Split View Vertical = Dividir vista _verticalmente
-Unsplit View = _Cerrar vista
-Unsplit All Views = Cerrar _todas las vistas
-Grow View = E_xpandir vista
-Shrink View = Enco_ger vista
-Toggle Current Fold = _Plegar/Desplegar en posición actual
-Toggle View EOL = _Mostrar/Ocultar fin de línea
-Toggle Wrap Mode = _Activar/Desactivar ajuste de línea
-Toggle Show Indent Guides = Act_ivar/Desactivar guias de indentación
-Toggle View Whitespace = M_ostrar/Ocultar espacios en blanco
-Toggle Virtual Space = Activa_r/Desactivar modo espacio virtual
-Zoom In = _Zoom: Acercar
-Zoom Out = Zoom: Ale_jar
-Reset Zoom = Zoom: R_estaurar
-Select Theme... = Se_leccionar tema...
-Help = A_yuda
-Show Manual = Mostrar _manual
-Show LuaDoc = Mostrar _LuaDoc
-gtk-about = gtk-about
-Unknown command: = Comando desconocido:
-Run Command = Ejecutar comando
+E_ncoding = C_odificación
+_UTF-8 Encoding = Codificación UTF-_8
+_ASCII Encoding = Codificación _ASCII
+_ISO-8859-1 Encoding = Codificación _ISO-8859-1
+_MacRoman Encoding = Codificación _MacRoman
+UTF-1_6 Encoding = Codificación UTF-_16
+Select _Lexer... = S_eleccionar analizador léxico
+_Refresh Syntax Highlighting = Ac_tualizar resaltado de sintaxis
+_View = _Ver
+_Next View = Vista _siguiente
+_Previous View = Vista _anterior
+Split View _Horizontal = Dividir vista _horizontalmente
+Split View _Vertical = Dividir vista _verticalmente
+_Unsplit View = _Cerrar vista
+Unsplit _All Views = Cerrar _todas las vistas
+_Grow View = E_xpandir vista
+Shrin_k View = Enco_ger vista
+Toggle Current _Fold = _Plegar/Desplegar en posición actual
+Toggle View _EOL = _Mostrar/Ocultar fin de línea
+Toggle _Wrap Mode = _Activar/Desactivar ajuste de línea
+Toggle Show In_dent Guides = Act_ivar/Desactivar guias de indentación
+Toggle View White_space = M_ostrar/Ocultar espacios en blanco
+Toggle _Virtual Space = Activa_r/Desactivar modo espacio virtual
+Zoom _In = _Zoom: Acercar
+Zoom _Out = Zoom: Ale_jar
+_Reset Zoom = Zoom: R_estaurar
+Select _Theme... = Se_leccionar tema...
+_Help = A_yuda
+Show _Manual = Mostrar _manual
+Show _LuaDoc = Mostrar _LuaDoc
+_About = Acerca _de
 Command = Comando
 Key Command = Teclas de comando
+Run Command = Ejecutar comando
+Unknown command: = Comando desconocido:
 
 % modules/textadept/mime_types.lua
 Select Lexer = Seleccionar analizador léxico
+%Name = Nombre
 
 % modules/textadept/run.lua
 does not exist = no existe
@@ -240,13 +255,20 @@ does not exist = no existe
 % modules/textadept/session.lua
 Session Files Not Found = Archivos de sesión no encontrados
 The following session files were not found = No se han encontrado los archivos de sesión siguientes
-
+%_OK = _Aceptar
+Load Session = Cargar sesión
+%_Open = _Abrir
+%_Cancel = _Cancelar
+Save Session = Guardar sesión
+%_Save = _Guardar
+%_Cancel = _Cancelar
 
 % modules/textadept/snapopen.lua
 File Limit Exceeded = Límite de ficheros excedido
 files or more were found. Showing the first = ficheros o más han sido encontrados. Se muestran los primeros
-%Open = Open
-%File = File
+%_OK = _Aceptar
+%Open = Abrir
+%File = Archivo
 
 % modules/textadept/snippets.lua
 Select Snippet = Seleccionar fragmento
diff --git a/core/locales/locale.ru.conf b/core/locales/locale.ru.conf
index e6c6f9cd..b92f7233 100644
--- a/core/locales/locale.ru.conf
+++ b/core/locales/locale.ru.conf
@@ -20,24 +20,34 @@
 Undefined event name = Неизвестное название события
 
 % core/file_io.lua
-Encoding conversion failed. = Ошибка при преобразовании кодировки.
 Open = Открыть
+_Open = _Открыть
+_Cancel = О_тменить
+Encoding conversion failed. = Ошибка при преобразовании кодировки.
 Cannot change binary file encoding = Невозможно изменить кодировку двоичного файла
 Save = Сохранить
+_Save = Со_хранить
+Untitled = Безымянный
 Close without saving? = Закрыть без сохранения?
 There are unsaved changes in = Есть несохранённые изменения в
 Close _without saving = Закрыть _без сохранения
 Reload? = Перезагрузить?
 Reload modified file? = Перезагрузить файл с изменениями?
 has been modified. Reload it? = был изменён. Открыть заново?
+_Yes = _Да
+_No = _Нет
+File = Файл
 
 % core/gui.lua
 [Message Buffer] = [Буфер сообщений]
+_OK = _OK
+%_Cancel = О_тменить
 Name = Название
 %File = Файл
-Untitled = Безымянный
+%Untitled = Безымянный
 Switch Buffers = Переключение между буферами
 theme not found. = тема не найдена.
+Select Theme = Выбрать тему
 CRLF = CRLF
 CR = CR
 LF = LF
@@ -56,182 +66,188 @@ Invalid sequence = Неизвестная комбинация
 
 % modules/textadept/bookmarks.lua
 Select Bookmark = Выбрать закладку
+Bookmark = Закладки
 
 % modules/textadept/editing.lua
 Go To = Перейти к
 Line Number: = Номер строки:
+%_OK = _OK
+%_Cancel = О_тменить
 
 % modules/textadept/find.lua
-Find: = Н_айти:
-Replace: = _Заменить:
-Find Next = Найти _следующий
-Find Prev = Найти _предыдущий
-Replace = _Заменить
-Replace All = Заменить _всё
-Match case = _Учитывать регистр
-Whole word = _Слово целиком
-Lua pattern = _Шаблон lua
-In files = _В файлах
+_Find: = Н_айти:
+R_eplace: = _Заменить:
+Find _Next = Найти _следующий
+Find _Prev = Найти _предыдущий
+_Replace = _Заменить
+Replace _All = Заменить _всё
+_Match case = _Учитывать регистр
+_Whole word = _Слово целиком
+_Lua pattern = _Шаблон lua
+_In files = _В файлах
 Find in Files = Найти в файлах
+%_Open = _Открыть
+%_Cancel = О_тменить
 No results found = Ничего не найдено
 [Files Found Buffer] = [Буфер поиска в файлах]
 Search wrapped = Искать по кругу
 Error = Ошибка
 An error occured: = Произошла ошибка:
+%_OK = _OK
+%_Cancel = О_тменить
 replacement(s) made = замен(а/ы) сделано
 
 % modules/textadept/keys.lua
 Lexer = Подсветка
 Style = Стиль
+Error loading webpage: = Ошибка при загрузке web-страницы:
 
 % modules/textadept/menu.lua
-Error loading webpage: = Ошибка при загрузке web-страницы:
-File = _Файл
-gtk-new = gtk-new
-gtk-open = gtk-open
-Open Recent... = Открыть _недавние...
-Reload = _Перезагрузить
-gtk-save = gtk-save
-gtk-save-as = gtk-save-as
-gtk-close = gtk-close
+_File = _Файл
+_New = _Создать
+%_Open = _Открыть
+Open _Recent... = Открыть _недавние...
+Re_load = _Перезагрузить
+%_Save = Со_хранить
+Save _As = Сохранить _как
+_Close = _Закрыть
 Close All = Закрыть в_се
-Load Session... = За_грузить сессию...
-Load Session = Загрузить сессию
-Save Session... = Со_хранить сессию...
-Save Session = Сохранить сессию
-gtk-quit = gtk-quit
-Edit = _Правка
-gtk-undo = gtk-undo
-gtk-redo = gtk-redo
-gtk-cut = gtk-cut
-gtk-copy = gtk-copy
-gtk-paste = gtk-paste
-Duplicate Line = Скопировать _строку
-gtk-delete = gtk-delete
-gtk-select-all = gtk-select-all
-Match Brace = _Парные скобки
-Complete Word = Автозавершение сл_ова
-Delete Word = Уда_лить слово
-Highlight Word = Под_светить слово
-Toggle Block Comment = Изменить комментирование _блока
-Transpose Characters = Пе_реставить символы
-Join Lines = _Объединить строки
-Select = В_ыделить
-Select to Matching Brace = Выделить до _парной фигурной скобки
-Select between XML Tags = Выделить меджу _XML тегами
-Select in XML Tag = Выделить в XML _теге
-Select in Double Quotes = Выделить в _двойных кавычках
-Select in Single Quotes = Выделить в _одинарных кавычках
-Select in Parentheses = Выделить в _круглых скобках
-Select in Brackets = Выделить в к_вадратных скобках
-Select in Braces = Веделить в _фигурных скобках
-Select Word = Выделить с_лово
-Select Line = Выделить ст_року
-Select Paragraph = Выделить _параграф
-Select Indented Block = Выделить блок с _отступом
-Selection = Выдел_ение
-Upper Case Selection = Преобразовать выделение в _верхний регист
-Lower Case Selection = Преобразовать выделение в _нижний регистр
-Enclose as XML Tags = Поместить между _XML тегами
-Enclose as Single XML Tag = Поместить в одном XML _теге
-Enclose in Single Quotes = Заключить в _одинарные кавычки
-Enclose in Double Quotes = Заключить в _двойные кавычки
-Enclose in Parentheses = Заключить в к_руглые скобки
-Enclose in Brackets = Заключить в к_вадратные скобки
-Enclose in Braces = Заключить в _фигурные скобки
-Grow Selection = _Увеличить выделение
-Shrink Selection = У_меньшить выделение
-Move Selected Lines Up = Переместить выделенные строки _вверх
-Move Selected Lines Down = Переместить выделнные строки в_низ
-Search = _Поиск
-gtk-find = gtk-find
-%Find Next = Найти _следующий
-Find Previous = Найти _предыдущий
-Replace = Заменить
-%Replace All = Заменить _всё
-Find Incremental = Найти по мере _набора
-Find in Files = Найти в _файлах
-Goto Next File Found = Перейти к следующему найденному файлу
-Goto Previous File Found = Перейти к предыдущему найденному файлу
-gtk-jump-to = gtk-jump-to
-Tools = _Инструменты
-Command Entry = Командная _строка
-Select Command = Выбрать _команду
-Run = _Запустить
-Compile = _Скомпилировать
-Filter Through = Пропустить через _фильтр
-Adeptsense = _Adeptsense
-Complete Symbol = _Завершить символ
-Show Documentation = Показать _документацию
-Bookmark = _Закладки
-Toggle Bookmark = _Показать/скрыть закладки
-Clear Bookmarks = _Очистить закладки
-Next Bookmark = _Следующая закладка
-Previous Bookmark = П_редыдущая закладка
-Goto Bookmark... = П_ерейти к закладке...
-Snapopen = _Быстрое открытие файлов
-Snapopen User Home = Быстрое открытие _домашнего каталога
-Snapopen Textadept Home = Быстрое открытие домашней страницы _Textadept
-Snapopen Current Directory = Быстрое открытие _текущего каталога
-Snippets = _Заготовки
-Insert Snippet... = _Вставить загтовку...
-Expand Snippet/Next Placeholder = _Развернуть заготовку/Следующая метка
-Previous Snippet Placeholder = _Предыдущая метка заготовки
-Cancel Snippet = _Убрать заготовку
-Show Style = Показать _стиль
-Buffer = _Буфер
-Next Buffer = _Следующий буфер
-Previous Buffer = _Предыдущий буфер
-Switch to Buffer... = Переключиться на _буфер
-Indentation = _Отступ
-Tab width: 2 = Ширина табуляции: _2
-Tab width: 3 = Ширина табуляции: _3
-Tab width: 4 = Ширина табуляции: _4
-Tab width: 8 = Ширина табуляции: _8
-Toggle Use Tabs = Переключить использование _табуляции
-Convert Indentation = _Преобразовать отступ
-EOL Mode = Режим _конца строки
+Loa_d Session... = За_грузить сессию...
+Sav_e Session... = Со_хранить сессию...
+_Quit = В_ыход
+_Edit = _Правка
+_Undo = _Отменить
+_Redo = Ве_рнуть
+Cu_t = _Вырезать
+_Copy = _Копировать
+_Paste = Вст_авить
+Duplicate _Line = Скопировать _строку
+_Delete = _Удалить
+D_elete Word = Уда_лить слово
+Select _All = Выделить вс_ё
+_Match Brace = _Парные скобки
+Complete _Word = Автозавершение сл_ова
+_Highlight Word = Под_светить слово
+Toggle _Block Comment = Изменить комментирование _блока
+T_ranspose Characters = Пе_реставить символы
+_Join Lines = _Объединить строки
+_Select = В_ыделить
+Select to _Matching Brace = Выделить до _парной фигурной скобки
+Select between _XML Tags = Выделить меджу _XML тегами
+Select in XML _Tag = Выделить в XML _теге
+Select in _Single Quotes = Выделить в _одинарных кавычках
+Select in _Double Quotes = Выделить в _двойных кавычках
+Select in _Parentheses = Выделить в _круглых скобках
+Select in _Brackets = Выделить в к_вадратных скобках
+Select in B_races = Веделить в _фигурных скобках
+Select _Word = Выделить с_лово
+Select _Line = Выделить ст_року
+Select Para_graph = Выделить _параграф
+Select _Indented Block = Выделить блок с _отступом
+Selectio_n = Выдел_ение
+_Upper Case Selection = Преобразовать выделение в _верхний регист
+_Lower Case Selection = Преобразовать выделение в _нижний регистр
+Enclose as _XML Tags = Поместить между _XML тегами
+Enclose as Single XML _Tag = Поместить в одном XML _теге
+Enclose in Single _Quotes = Заключить в _одинарные кавычки
+Enclose in _Double Quotes = Заключить в _двойные кавычки
+Enclose in _Parentheses = Заключить в к_руглые скобки
+Enclose in _Brackets = Заключить в к_вадратные скобки
+Enclose in B_races = Заключить в _фигурные скобки
+_Grow Selection = _Увеличить выделение
+_Shrink Selection = У_меньшить выделение
+_Move Selected Lines Up = Переместить выделенные строки _вверх
+Move Selected Lines Do_wn = Переместить выделнные строки в_низ
+_Search = _Поиск
+_Find = _Найти
+%Find _Next = Найти _следующий
+Find _Previous = Найти _предыдущий
+%_Replace = Заменить
+%Replace _All = Заменить _всё
+Find _Incremental = Найти по мере _набора
+Find in Fi_les = Найти в _файлах
+Goto Nex_t File Found = Перейти к следующему найденному файлу
+Goto Previou_s File Found = Перейти к предыдущему найденному файлу
+_Jump to = Перейти _к
+_Tools = _Инструменты
+Command _Entry = Командная _строка
+Select Co_mmand = Выбрать _команду
+_Run = _Запустить
+_Compile = _Скомпилировать
+_Filter Through = Пропустить через _фильтр
+_Adeptsense = _Adeptsense
+_Complete Symbol = _Завершить символ
+Show _Documentation = Показать _документацию
+_Bookmark = _Закладки
+_Toggle Bookmark = _Показать/скрыть закладки
+_Clear Bookmarks = _Очистить закладки
+_Next Bookmark = _Следующая закладка
+_Previous Bookmark = П_редыдущая закладка
+_Goto Bookmark... = П_ерейти к закладке...
+Snap_open = _Быстрое открытие файлов
+Snapopen _User Home = Быстрое открытие _домашнего каталога
+Snapopen _Textadept Home = Быстрое открытие домашней страницы _Textadept
+Snapopen _Current Directory = Быстрое открытие _текущего каталога
+_Snippets = _Заготовки
+_Insert Snippet... = _Вставить загтовку...
+_Expand Snippet/Next Placeholder = _Развернуть заготовку/Следующая метка
+_Previous Snippet Placeholder = _Предыдущая метка заготовки
+_Cancel Snippet = _Убрать заготовку
+Show St_yle = Показать _стиль
+_Buffer = _Буфер
+_Next Buffer = _Следующий буфер
+_Previous Buffer = _Предыдущий буфер
+_Switch to Buffer... = Переключиться на _буфер
+_Indentation = _Отступ
+Tab width: _2 = Ширина табуляции: _2
+Tab width: _3 = Ширина табуляции: _3
+Tab width: _4 = Ширина табуляции: _4
+Tab width: _8 = Ширина табуляции: _8
+_Toggle Use Tabs = Переключить использование _табуляции
+_Convert Indentation = _Преобразовать отступ
+_EOL Mode = Режим _конца строки
 %CRLF = CRLF
 %CR = CR
 %LF = LF
-Encoding = _Кодировка
-UTF-8 Encoding = Кодировка _UTF-8
-ASCII Encoding = Кодировка _ASCII
-ISO-8859-1 Encoding = Кодировка _ISO-8859-1
-MacRoman Encoding = Кодировка _MacRoman
-UTF-16 Encoding = Кодировка UTF-1_6
-Refresh Syntax Highlighting = _Обновить подсветку синтаксиса
-Select Lexer... = Выбрать тип _подсветки...
-View = _Вид
-Next View = _Следующий вид
-Previous View = _Предыдущий вид
-Split View Horizontal = Разделить по _горизонтали
-Split View Vertical = Разделить по _вертикали
-Unsplit View = _Убрать разделение
-Unsplit All Views = Убрать _все разделение
-Grow View = _Увеличить разделение
-Shrink View = У_меньшить разделение
-Toggle Current Fold = Переключить режим текущей _свёртки
-Toggle View EOL = Переключить показ _EOL
-Toggle Wrap Mode = Переключить режим _визуального переноса
-Toggle Show Indent Guides = Переключить показ указателей отступа
-Toggle View Whitespace = Переключить показ _пробелов
-Toggle Virtual Space = Переключить режим _виртульных пробелов
-Zoom In = _Приблизить
-Zoom Out = _Отдалить
-Reset Zoom = _Сбросить масштаб
-Select Theme... = Выбрать тему...
-Help = _Справка
-Show Manual = Показать _руководство
-Show LuaDoc = Показать документацию по _lua
-gtk-about = gtk-about
-Unknown command: = Неизвестная команда:
-Run Command = Выполнить команду
+E_ncoding = _Кодировка
+_UTF-8 Encoding = Кодировка _UTF-8
+_ASCII Encoding = Кодировка _ASCII
+_ISO-8859-1 Encoding = Кодировка _ISO-8859-1
+_MacRoman Encoding = Кодировка _MacRoman
+UTF-1_6 Encoding = Кодировка UTF-1_6
+Select _Lexer... = Выбрать тип _подсветки...
+_Refresh Syntax Highlighting = _Обновить подсветку синтаксиса
+_View = _Вид
+_Next View = _Следующий вид
+_Previous View = _Предыдущий вид
+Split View _Horizontal = Разделить по _горизонтали
+Split View _Vertical = Разделить по _вертикали
+_Unsplit View = _Убрать разделение
+Unsplit _All Views = Убрать _все разделение
+_Grow View = _Увеличить разделение
+Shrin_k View = У_меньшить разделение
+Toggle Current _Fold = Переключить режим текущей _свёртки
+Toggle View _EOL = Переключить показ _EOL
+Toggle _Wrap Mode = Переключить режим _визуального переноса
+Toggle Show In_dent Guides = Переключить показ указателей отступа
+Toggle View White_space = Переключить показ _пробелов
+Toggle _Virtual Space = Переключить режим _виртульных пробелов
+Zoom _In = _Приблизить
+Zoom _Out = _Отдалить
+_Reset Zoom = _Сбросить масштаб
+Select _Theme... = Выбрать тему...
+_Help = _Справка
+Show _Manual = Показать _руководство
+Show _LuaDoc = Показать документацию по _lua
+_About = _О программе
 Command = Команда
 Key Command = Команда по комбинации клавиш
+Run Command = Выполнить команду
+Unknown command: = Неизвестная команда:
 
 % modules/textadept/mime_types.lua
 Select Lexer = Выбрать подсветку
+%Name = Название
 
 % modules/textadept/run.lua
 does not exist = не существует
@@ -239,10 +255,18 @@ does not exist = не существует
 % modules/textadept/session.lua
 Session Files Not Found = Файлы сессии не найдены
 The following session files were not found = Следующие файлы сессии не найдены
+%_OK = _OK
+Load Session = Загрузить сессию
+%_Open = _Открыть
+%_Cancel = О_тменить
+Save Session = Сохранить сессию
+%_Save = Со_хранить
+%_Cancel = О_тменить
 
 % modules/textadept/snapopen.lua
 File Limit Exceeded = Превышен лимит на количество файлов
 files or more were found. Showing the first = файлов или более было найдено. Показываем первый
+%_OK = _OK
 %Open = Open
 %File = File
 
diff --git a/modules/textadept/editing.lua b/modules/textadept/editing.lua
index 6dfea6b7..06dc5ec7 100644
--- a/modules/textadept/editing.lua
+++ b/modules/textadept/editing.lua
@@ -269,9 +269,11 @@ end
 -- @name goto_line
 function M.goto_line(line)
   if not line then
-    line = tonumber(gui.dialog('standard-inputbox',
+    line = tonumber(gui.dialog('inputbox',
                                '--title', _L['Go To'],
                                '--text', _L['Line Number:'],
+                               '--button1', _L['_OK'],
+                               '--button2', _L['_Cancel'],
                                '--no-newline'):match('%-?%d+$'))
     if not line or line < 0 then return end
   end
diff --git a/modules/textadept/find.lua b/modules/textadept/find.lua
index 62fbc5fe..399eda46 100644
--- a/modules/textadept/find.lua
+++ b/modules/textadept/find.lua
@@ -50,16 +50,16 @@ local find = gui.find
 module('gui.find')]]
 
 local _L = _L
-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']
+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']
 
 local MARK_FIND = _SCINTILLA.next_marker_number()
 local MARK_FIND_COLOR = 0x4D9999
@@ -83,6 +83,8 @@ function find.find_in_files(utf8_dir)
   if not utf8_dir then
     utf8_dir = gui.dialog('fileselect',
                           '--title', _L['Find in Files'],
+                          '--button1', _L['_Open'],
+                          '--button2', _L['_Cancel'],
                           '--select-only-directories',
                           '--with-directory',
                           (buffer.filename or ''):match('^.+[/\\]') or '',
@@ -262,6 +264,8 @@ local function run(code)
                '--title', _L['Error'],
                '--text', _L['An error occured:'],
                '--informative-text', val:gsub('"', '\\"'),
+               '--button1', _L['_OK'],
+               '--button2', _L['_Cancel'],
                '--no-cancel')
     error()
   end
diff --git a/modules/textadept/keys.lua b/modules/textadept/keys.lua
index 88878a88..a16995e7 100644
--- a/modules/textadept/keys.lua
+++ b/modules/textadept/keys.lua
@@ -294,7 +294,8 @@ keys[not OSX and 'cT' or 'mT'] = gui.select_theme
 keys.f1 = { utils.open_webpage, _HOME..'/doc/01_Introduction.html' }
 keys.sf1 = { utils.open_webpage, _HOME..'/doc/api/index.html' }
 -- TODO: { gui.dialog, 'ok-msgbox', '--title', 'Textadept'
---         '--informative-text', _RELEASE, '--no-cancel' }
+--         '--informative-text', _RELEASE, '--button1', _L['_OK'],
+--         '--no-cancel' }
 
 -- Movement commands.
 if OSX then
diff --git a/modules/textadept/menu.lua b/modules/textadept/menu.lua
index 53c9d224..45621703 100644
--- a/modules/textadept/menu.lua
+++ b/modules/textadept/menu.lua
@@ -34,190 +34,191 @@ local SEPARATOR, c = { 'separator' }, _SCINTILLA.constants
 -- @class table
 -- @name menubar
 M.menubar = {
-  { title = _L['File'],
-    { _L['gtk-new'], new_buffer },
-    { _L['gtk-open'], io.open_file },
-    { _L['Open Recent...'], io.open_recent_file },
-    { _L['Reload'], buffer.reload },
-    { _L['gtk-save'], buffer.save },
-    { _L['gtk-save-as'], buffer.save_as },
+  { title = _L['_File'],
+    { _L['_New'], new_buffer },
+    { _L['_Open'], io.open_file },
+    { _L['Open _Recent...'], io.open_recent_file },
+    { _L['Re_load'], buffer.reload },
+    { _L['_Save'], buffer.save },
+    { _L['Save _As'], buffer.save_as },
     SEPARATOR,
-    { _L['gtk-close'], buffer.close },
+    { _L['_Close'], buffer.close },
     { _L['Close All'], io.close_all },
     SEPARATOR,
-    { _L['Load Session...'], m_textadept.session.prompt_load },
-    { _L['Save Session...'], m_textadept.session.prompt_save },
+    { _L['Loa_d Session...'], m_textadept.session.prompt_load },
+    { _L['Sav_e Session...'], m_textadept.session.prompt_save },
     SEPARATOR,
-    { _L['gtk-quit'], quit },
+    { _L['_Quit'], quit },
   },
-  { title = _L['Edit'],
-    { _L['gtk-undo'], buffer.undo },
-    { _L['gtk-redo'], buffer.redo },
+  { title = _L['_Edit'],
+    { _L['_Undo'], buffer.undo },
+    { _L['_Redo'], buffer.redo },
     SEPARATOR,
-    { _L['gtk-cut'], buffer.cut },
-    { _L['gtk-copy'], buffer.copy },
-    { _L['gtk-paste'], buffer.paste },
-    { _L['Duplicate Line'], buffer.line_duplicate },
-    { _L['gtk-delete'], buffer.clear },
-    { _L['Delete Word'], utils.delete_word },
-    { _L['gtk-select-all'], buffer.select_all },
+    { _L['Cu_t'], buffer.cut },
+    { _L['_Copy'], buffer.copy },
+    { _L['_Paste'], buffer.paste },
+    { _L['Duplicate _Line'], buffer.line_duplicate },
+    { _L['_Delete'], buffer.clear },
+    { _L['D_elete Word'], utils.delete_word },
+    { _L['Select _All'], buffer.select_all },
     SEPARATOR,
-    { _L['Match Brace'], m_editing.match_brace },
-    { _L['Complete Word'], { m_editing.autocomplete_word, '%w_' } },
-    { _L['Highlight Word'], m_editing.highlight_word },
-    { _L['Toggle Block Comment'], m_editing.block_comment },
-    { _L['Transpose Characters'], m_editing.transpose_chars },
-    { _L['Join Lines'], m_editing.join_lines },
-    { title = _L['Select'],
-      { _L['Select to Matching Brace'], { m_editing.match_brace, 'select' } },
-      { _L['Select between XML Tags'],
+    { _L['_Match Brace'], m_editing.match_brace },
+    { _L['Complete _Word'], { m_editing.autocomplete_word, '%w_' } },
+    { _L['_Highlight Word'], m_editing.highlight_word },
+    { _L['Toggle _Block Comment'], m_editing.block_comment },
+    { _L['T_ranspose Characters'], m_editing.transpose_chars },
+    { _L['_Join Lines'], m_editing.join_lines },
+    { title = _L['_Select'],
+      { _L['Select to _Matching Brace'], { m_editing.match_brace, 'select' } },
+      { _L['Select between _XML Tags'],
         { m_editing.select_enclosed, '>', '<' } },
-      { _L['Select in XML Tag'], { m_editing.select_enclosed, '<', '>' } },
-      { _L['Select in Single Quotes'],
+      { _L['Select in XML _Tag'], { m_editing.select_enclosed, '<', '>' } },
+      { _L['Select in _Single Quotes'],
         { m_editing.select_enclosed, "'", "'" } },
-      { _L['Select in Double Quotes'],
+      { _L['Select in _Double Quotes'],
         { m_editing.select_enclosed, '"', '"' } },
-      { _L['Select in Parentheses'], { m_editing.select_enclosed, '(', ')' } },
-      { _L['Select in Brackets'], { m_editing.select_enclosed, '[', ']' } },
-      { _L['Select in Braces'], { m_editing.select_enclosed, '{', '}' } },
-      { _L['Select Word'], m_editing.select_word },
-      { _L['Select Line'], m_editing.select_line },
-      { _L['Select Paragraph'], m_editing.select_paragraph },
-      { _L['Select Indented Block'], m_editing.select_indented_block },
+      { _L['Select in _Parentheses'], { m_editing.select_enclosed, '(', ')' } },
+      { _L['Select in _Brackets'], { m_editing.select_enclosed, '[', ']' } },
+      { _L['Select in B_races'], { m_editing.select_enclosed, '{', '}' } },
+      { _L['Select _Word'], m_editing.select_word },
+      { _L['Select _Line'], m_editing.select_line },
+      { _L['Select Para_graph'], m_editing.select_paragraph },
+      { _L['Select _Indented Block'], m_editing.select_indented_block },
     },
-    { title = _L['Selection'],
-      { _L['Upper Case Selection'], buffer.upper_case },
-      { _L['Lower Case Selection'], buffer.lower_case },
+    { title = _L['Selectio_n'],
+      { _L['_Upper Case Selection'], buffer.upper_case },
+      { _L['_Lower Case Selection'], buffer.lower_case },
       SEPARATOR,
-      { _L['Enclose as XML Tags'], utils.enclose_as_xml_tags },
-      { _L['Enclose as Single XML Tag'], { m_editing.enclose, '<', ' />' } },
-      { _L['Enclose in Single Quotes'], { m_editing.enclose, "'", "'" } },
-      { _L['Enclose in Double Quotes'], { m_editing.enclose, '"', '"' } },
-      { _L['Enclose in Parentheses'], { m_editing.enclose, '(', ')' } },
-      { _L['Enclose in Brackets'], { m_editing.enclose, '[', ']' } },
-      { _L['Enclose in Braces'], { m_editing.enclose, '{', '}' } },
+      { _L['Enclose as _XML Tags'], utils.enclose_as_xml_tags },
+      { _L['Enclose as Single XML _Tag'], { m_editing.enclose, '<', ' />' } },
+      { _L['Enclose in Single _Quotes'], { m_editing.enclose, "'", "'" } },
+      { _L['Enclose in _Double Quotes'], { m_editing.enclose, '"', '"' } },
+      { _L['Enclose in _Parentheses'], { m_editing.enclose, '(', ')' } },
+      { _L['Enclose in _Brackets'], { m_editing.enclose, '[', ']' } },
+      { _L['Enclose in B_races'], { m_editing.enclose, '{', '}' } },
       SEPARATOR,
-      { _L['Grow Selection'], { m_editing.grow_selection, 1 } },
-      { _L['Shrink Selection'], { m_editing.grow_selection, -1 } },
+      { _L['_Grow Selection'], { m_editing.grow_selection, 1 } },
+      { _L['_Shrink Selection'], { m_editing.grow_selection, -1 } },
       SEPARATOR,
-      { _L['Move Selected Lines Up'], buffer.move_selected_lines_up },
-      { _L['Move Selected Lines Down'], buffer.move_selected_lines_down },
+      { _L['_Move Selected Lines Up'], buffer.move_selected_lines_up },
+      { _L['Move Selected Lines Do_wn'], buffer.move_selected_lines_down },
     },
   },
-  { title = _L['Search'],
-    { _L['gtk-find'], gui_find.focus },
-    { _L['Find Next'], gui_find.find_next },
-    { _L['Find Previous'], gui_find.find_prev },
-    { _L['Replace'], gui_find.replace },
-    { _L['Replace All'], gui_find.replace_all },
-    { _L['Find Incremental'], gui_find.find_incremental },
+  { title = _L['_Search'],
+    { _L['_Find'], gui_find.focus },
+    { _L['Find _Next'], gui_find.find_next },
+    { _L['Find _Previous'], gui_find.find_prev },
+    { _L['_Replace'], gui_find.replace },
+    { _L['Replace _All'], gui_find.replace_all },
+    { _L['Find _Incremental'], gui_find.find_incremental },
     SEPARATOR,
-    { _L['Find in Files'], utils.find_in_files },
-    { _L['Goto Next File Found'], { gui_find.goto_file_in_list, true } },
-    { _L['Goto Previous File Found'], { gui_find.goto_file_in_list, false } },
+    { _L['Find in Fi_les'], utils.find_in_files },
+    { _L['Goto Nex_t File Found'], { gui_find.goto_file_in_list, true } },
+    { _L['Goto Previou_s File Found'], { gui_find.goto_file_in_list, false } },
     SEPARATOR,
-    { _L['gtk-jump-to'], m_editing.goto_line },
+    { _L['_Jump to'], m_editing.goto_line },
   },
-  { title = _L['Tools'],
-    { _L['Command Entry'], gui.command_entry.focus },
-    { _L['Select Command'], utils.select_command },
+  { title = _L['_Tools'],
+    { _L['Command _Entry'], gui.command_entry.focus },
+    { _L['Select Co_mmand'], utils.select_command },
     SEPARATOR,
-    { _L['Run'], m_textadept.run.run },
-    { _L['Compile'], m_textadept.run.compile },
-    { _L['Filter Through'], _M.textadept.filter_through.filter_through },
+    { _L['_Run'], m_textadept.run.run },
+    { _L['_Compile'], m_textadept.run.compile },
+    { _L['_Filter Through'], _M.textadept.filter_through.filter_through },
     SEPARATOR,
-    { title = _L['Adeptsense'],
-      { _L['Complete Symbol'], m_textadept.adeptsense.complete_symbol },
-      { _L['Show Documentation'], m_textadept.adeptsense.show_documentation },
+    { title = _L['_Adeptsense'],
+      { _L['_Complete Symbol'], m_textadept.adeptsense.complete_symbol },
+      { _L['Show _Documentation'], m_textadept.adeptsense.show_documentation },
     },
-    { title = _L['Bookmark'],
-      { _L['Toggle Bookmark'], m_bookmarks.toggle },
-      { _L['Clear Bookmarks'], m_bookmarks.clear },
-      { _L['Next Bookmark'], m_bookmarks.goto_next },
-      { _L['Previous Bookmark'], m_bookmarks.goto_prev },
-      { _L['Goto Bookmark...'], m_bookmarks.goto_bookmark },
+    { title = _L['_Bookmark'],
+      { _L['_Toggle Bookmark'], m_bookmarks.toggle },
+      { _L['_Clear Bookmarks'], m_bookmarks.clear },
+      { _L['_Next Bookmark'], m_bookmarks.goto_next },
+      { _L['_Previous Bookmark'], m_bookmarks.goto_prev },
+      { _L['_Goto Bookmark...'], m_bookmarks.goto_bookmark },
     },
-    { title = _L['Snapopen'],
-      { _L['Snapopen User Home'], { m_textadept.snapopen.open, _USERHOME } },
-      { _L['Snapopen Textadept Home'], { m_textadept.snapopen.open, _HOME } },
-      { _L['Snapopen Current Directory'], utils.snapopen_filedir },
+    { title = _L['Snap_open'],
+      { _L['Snapopen _User Home'], { m_textadept.snapopen.open, _USERHOME } },
+      { _L['Snapopen _Textadept Home'], { m_textadept.snapopen.open, _HOME } },
+      { _L['Snapopen _Current Directory'], utils.snapopen_filedir },
     },
-    { title = _L['Snippets'],
-      { _L['Insert Snippet...'], Msnippets._select },
-      { _L['Expand Snippet/Next Placeholder'], Msnippets._insert },
-      { _L['Previous Snippet Placeholder'], Msnippets._previous },
-      { _L['Cancel Snippet'], Msnippets._cancel_current },
+    { title = _L['_Snippets'],
+      { _L['_Insert Snippet...'], Msnippets._select },
+      { _L['_Expand Snippet/Next Placeholder'], Msnippets._insert },
+      { _L['_Previous Snippet Placeholder'], Msnippets._previous },
+      { _L['_Cancel Snippet'], Msnippets._cancel_current },
     },
     SEPARATOR,
-    { _L['Show Style'], utils.show_style },
+    { _L['Show St_yle'], utils.show_style },
   },
-  { title = _L['Buffer'],
-    { _L['Next Buffer'], { view.goto_buffer, view, 1, true } },
-    { _L['Previous Buffer'], { view.goto_buffer, view, -1, true } },
-    { _L['Switch to Buffer...'], gui.switch_buffer },
+  { title = _L['_Buffer'],
+    { _L['_Next Buffer'], { view.goto_buffer, view, 1, true } },
+    { _L['_Previous Buffer'], { view.goto_buffer, view, -1, true } },
+    { _L['_Switch to Buffer...'], gui.switch_buffer },
     SEPARATOR,
-    { title = _L['Indentation'],
-      { _L['Tab width: 2'], { utils.set_indentation, 2 } },
-      { _L['Tab width: 3'], { utils.set_indentation, 3 } },
-      { _L['Tab width: 4'], { utils.set_indentation, 4 } },
-      { _L['Tab width: 8'], { utils.set_indentation, 8 } },
+    { title = _L['_Indentation'],
+      { _L['Tab width: _2'], { utils.set_indentation, 2 } },
+      { _L['Tab width: _3'], { utils.set_indentation, 3 } },
+      { _L['Tab width: _4'], { utils.set_indentation, 4 } },
+      { _L['Tab width: _8'], { utils.set_indentation, 8 } },
       SEPARATOR,
-      { _L['Toggle Use Tabs'], { utils.toggle_property, 'use_tabs' } },
-      { _L['Convert Indentation'], m_editing.convert_indentation },
+      { _L['_Toggle Use Tabs'], { utils.toggle_property, 'use_tabs' } },
+      { _L['_Convert Indentation'], m_editing.convert_indentation },
     },
-    { title = _L['EOL Mode'],
+    { title = _L['_EOL Mode'],
       { _L['CRLF'], { utils.set_eol_mode, c.SC_EOL_CRLF } },
       { _L['CR'], { utils.set_eol_mode, c.SC_EOL_CR } },
       { _L['LF'], { utils.set_eol_mode, c.SC_EOL_LF } },
     },
-    { title = _L['Encoding'],
-      { _L['UTF-8 Encoding'], { utils.set_encoding, 'UTF-8' } },
-      { _L['ASCII Encoding'], { utils.set_encoding, 'ASCII' } },
-      { _L['ISO-8859-1 Encoding'], { utils.set_encoding, 'ISO-8859-1' } },
-      { _L['MacRoman Encoding'], { utils.set_encoding, 'MacRoman' } },
-      { _L['UTF-16 Encoding'], { utils.set_encoding, 'UTF-16LE' } },
+    { title = _L['E_ncoding'],
+      { _L['_UTF-8 Encoding'], { utils.set_encoding, 'UTF-8' } },
+      { _L['_ASCII Encoding'], { utils.set_encoding, 'ASCII' } },
+      { _L['_ISO-8859-1 Encoding'], { utils.set_encoding, 'ISO-8859-1' } },
+      { _L['_MacRoman Encoding'], { utils.set_encoding, 'MacRoman' } },
+      { _L['UTF-1_6 Encoding'], { utils.set_encoding, 'UTF-16LE' } },
     },
     SEPARATOR,
-    { _L['Select Lexer...'], m_textadept.mime_types.select_lexer },
-    { _L['Refresh Syntax Highlighting'],
+    { _L['Select _Lexer...'], m_textadept.mime_types.select_lexer },
+    { _L['_Refresh Syntax Highlighting'],
       { buffer.colourise, buffer, 0, -1 } },
   },
-  { title = _L['View'],
-    { _L['Next View'], { gui.goto_view, 1, true } },
-    { _L['Previous View'], { gui.goto_view, -1, true } },
+  { title = _L['_View'],
+    { _L['_Next View'], { gui.goto_view, 1, true } },
+    { _L['_Previous View'], { gui.goto_view, -1, true } },
     SEPARATOR,
-    { _L['Split View Horizontal'], { view.split, view } },
-    { _L['Split View Vertical'], { view.split, view, true } },
-    { _L['Unsplit View'], { view.unsplit, view } },
-    { _L['Unsplit All Views'], utils.unsplit_all },
-    { _L['Grow View'], { utils.grow, 10 } },
-    { _L['Shrink View'], { utils.shrink, 10 } },
+    { _L['Split View _Horizontal'], { view.split, view } },
+    { _L['Split View _Vertical'], { view.split, view, true } },
+    { _L['_Unsplit View'], { view.unsplit, view } },
+    { _L['Unsplit _All Views'], utils.unsplit_all },
+    { _L['_Grow View'], { utils.grow, 10 } },
+    { _L['Shrin_k View'], { utils.shrink, 10 } },
     SEPARATOR,
-    { _L['Toggle Current Fold'], utils.toggle_current_fold },
+    { _L['Toggle Current _Fold'], utils.toggle_current_fold },
     SEPARATOR,
-    { _L['Toggle View EOL'], { utils.toggle_property, 'view_eol' } },
-    { _L['Toggle Wrap Mode'], { utils.toggle_property, 'wrap_mode' } },
-    { _L['Toggle Show Indent Guides'],
+    { _L['Toggle View _EOL'], { utils.toggle_property, 'view_eol' } },
+    { _L['Toggle _Wrap Mode'], { utils.toggle_property, 'wrap_mode' } },
+    { _L['Toggle Show In_dent Guides'],
       { utils.toggle_property, 'indentation_guides' } },
-    { _L['Toggle View Whitespace'], { utils.toggle_property, 'view_ws' } },
-    { _L['Toggle Virtual Space'],
+    { _L['Toggle View White_space'], { utils.toggle_property, 'view_ws' } },
+    { _L['Toggle _Virtual Space'],
       { utils.toggle_property, 'virtual_space_options',
         c.SCVS_USERACCESSIBLE } },
     SEPARATOR,
-    { _L['Zoom In'], buffer.zoom_in },
-    { _L['Zoom Out'], buffer.zoom_out },
-    { _L['Reset Zoom'], utils.reset_zoom },
+    { _L['Zoom _In'], buffer.zoom_in },
+    { _L['Zoom _Out'], buffer.zoom_out },
+    { _L['_Reset Zoom'], utils.reset_zoom },
     SEPARATOR,
-    { _L['Select Theme...'], gui.select_theme },
+    { _L['Select _Theme...'], gui.select_theme },
   },
-  { title = _L['Help'],
-    { _L['Show Manual'],
+  { title = _L['_Help'],
+    { _L['Show _Manual'],
       { utils.open_webpage, _HOME..'/doc/01_Introduction.html' } },
-    { _L['Show LuaDoc'], { utils.open_webpage, _HOME..'/doc/api/index.html' } },
+    { _L['Show _LuaDoc'],
+      { utils.open_webpage, _HOME..'/doc/api/index.html' } },
     SEPARATOR,
-    { _L['gtk-about'],
+    { _L['_About'],
       { gui.dialog, 'ok-msgbox', '--title', 'Textadept', '--informative-text',
-        _RELEASE, '--no-cancel' } },
+        _RELEASE, '--button1', _L['_OK'], '--no-cancel' } },
   },
 }
 
@@ -226,15 +227,15 @@ M.menubar = {
 -- @class table
 -- @name context_menu
 M.context_menu = {
-  { _L['gtk-undo'], buffer.undo },
-  { _L['gtk-redo'], buffer.redo },
+  { _L['_Undo'], buffer.undo },
+  { _L['_Redo'], buffer.redo },
   SEPARATOR,
-  { _L['gtk-cut'], buffer.cut },
-  { _L['gtk-copy'], buffer.copy },
-  { _L['gtk-paste'], buffer.paste },
-  { _L['gtk-delete'], buffer.clear },
+  { _L['Cu_t'], buffer.cut },
+  { _L['_Copy'], buffer.copy },
+  { _L['_Paste'], buffer.paste },
+  { _L['_Delete'], buffer.clear },
   SEPARATOR,
-  { _L['gtk-select-all'], buffer.select_all }
+  { _L['Select _All'], buffer.select_all }
 }
 
 local key_shortcuts = {}
diff --git a/modules/textadept/session.lua b/modules/textadept/session.lua
index 91adf795..dd8f9847 100644
--- a/modules/textadept/session.lua
+++ b/modules/textadept/session.lua
@@ -95,7 +95,8 @@ function M.load(filename)
     gui.dialog('msgbox',
                '--title', _L['Session Files Not Found'],
                '--text', _L['The following session files were not found'],
-               '--informative-text', table.concat(not_found, '\n'))
+               '--informative-text', table.concat(not_found, '\n'),
+               '--button1', _L['_OK'])
   end
   return true
 end
@@ -177,6 +178,8 @@ end
 function M.prompt_load()
   local utf8_filename = gui.dialog('fileselect',
                                    '--title', _L['Load Session'],
+                                   '--button1', _L['_Open'],
+                                   '--button2', _L['_Cancel'],
                                    '--with-directory',
                                    M.DEFAULT_SESSION:match('.+[/\\]') or '',
                                    '--with-file',
@@ -191,6 +194,8 @@ end
 function M.prompt_save()
   local utf8_filename = gui.dialog('filesave',
                                    '--title', _L['Save Session'],
+                                   '--button1', _L['_Save'],
+                                   '--button2', _L['_Cancel'],
                                    '--with-directory',
                                    M.DEFAULT_SESSION:match('.+[/\\]') or '',
                                    '--with-file',
diff --git a/modules/textadept/snapopen.lua b/modules/textadept/snapopen.lua
index 3ccfe376..67da1ff1 100644
--- a/modules/textadept/snapopen.lua
+++ b/modules/textadept/snapopen.lua
@@ -154,7 +154,8 @@ function M.open(utf8_paths, filter, exclude_PATHS, exclude_FILTER, depth)
                '--informative-text',
                string.format('%d %s %d', M.MAX,
                              _L['files or more were found. Showing the first'],
-                             M.MAX))
+                             M.MAX),
+               '--button1', _L['_OK'])
   end
   local utf8_filenames = gui.filteredlist(_L['Open'], _L['File'], list, false,
                                           '--select-multiple') or ''