aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/keys.lua6
-rw-r--r--core/locale.conf22
2 files changed, 16 insertions, 12 deletions
diff --git a/core/keys.lua b/core/keys.lua
index b693d523..644efc18 100644
--- a/core/keys.lua
+++ b/core/keys.lua
@@ -58,9 +58,9 @@ module('keys', package.seeall)
-- `lexers/lexer.lua`; examples are `whitespace`, `comment`, and `string`.
--
-- Key commands can be chained like in Emacs using keychain sequences. By
--- default, the `Esc` key cancels the current keychain, but it can be redefined
--- by setting the `keys.clear_sequence` field. Naturally, the clear sequence
--- cannot be chained.
+-- default, the `Esc` key (`Apple+Esc` on Mac OSX) cancels the current keychain,
+-- but it can be redefined by setting the `keys.clear_sequence` field.
+-- Naturally, the clear sequence cannot be chained.
--
-- ## Settings
--
diff --git a/core/locale.conf b/core/locale.conf
index 362ff66c..f206afc7 100644
--- a/core/locale.conf
+++ b/core/locale.conf
@@ -48,7 +48,12 @@ This buffer is not the current one. = This buffer is not the current one.
Switch Buffers = Switch Buffers
Search wrapped = Search wrapped
-% core/find.lua
+% core/keys.lua
+Keychain: = Keychain:
+Invalid sequence = Invalid sequence
+Unknown command: = Unknown command:
+
+% modules/textadept/find.lua
No results found = No results found
Error = Error
An error occured: = An error occured:
@@ -57,9 +62,8 @@ Find in Files = Find in Files
[Files Found Buffer] = [Files Found Buffer]
% modules/textadept/keys.lua
-Keychain: = Keychain:
-Invalid sequence = Invalid sequence
-Unknown command: = Unknown command:
+Lexer = Lexer
+Style = Style
% modules/textadept/menu.lua
_File = _File
@@ -73,7 +77,6 @@ Close A_ll = Close A_ll
Loa_d Session... = Loa_d Session...
Sa_ve Session... = Sa_ve Session...
gtk-quit = gtk-quit
-
_Edit = _Edit
gtk-undo = gtk-undo
gtk-redo = gtk-redo
@@ -134,10 +137,9 @@ _Compile = _Compile
Fi_lter Through = Fi_lter Through
_Snippets = _Snippets
_Insert = _Insert
+In_sert... = In_sert...
_Previous Placeholder = _Previous Placeholder
_Cancel = _Cancel
-_List = _List
-_Show Scope = _Show Scope
_Bookmark = _Bookmark
_Toggle on Current Line = _Toggle on Current Line
_Clear All = _Clear All
@@ -200,8 +202,10 @@ Line Number: = Line Number:
does not exist = does not exist
% modules/textadept/snippets.lua
-Lexer = Lexer
-Style = Style
+Select Snippet = Select Snippet
+Trigger = Trigger
+Scope = Scope
+Snippet Text = Snippet Text
% modules/textadept/session.lua
Session Files Not Found = Session Files Not Found