aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--core/locale.conf7
-rw-r--r--core/locales/locale.ar.conf7
-rw-r--r--core/locales/locale.de.conf6
-rw-r--r--core/locales/locale.es.conf7
-rw-r--r--core/locales/locale.fr.conf7
-rw-r--r--core/locales/locale.it.conf7
-rw-r--r--core/locales/locale.pl.conf7
-rw-r--r--core/locales/locale.ru.conf7
-rw-r--r--core/locales/locale.sv.conf7
-rw-r--r--modules/textadept/keys.lua16
-rw-r--r--modules/textadept/menu.lua7
11 files changed, 12 insertions, 73 deletions
diff --git a/core/locale.conf b/core/locale.conf
index f198f41b..0fe97d71 100644
--- a/core/locale.conf
+++ b/core/locale.conf
@@ -169,14 +169,9 @@ _Join Lines = _Join Lines
_Filter Through = _Filter Through
# Menu items for selecting text and entities.
_Select = _Select
-Select to _Matching Brace = Select to _Matching Brace
+Select between _Matching Delimiters = Select between _Matching Delimiters
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
diff --git a/core/locales/locale.ar.conf b/core/locales/locale.ar.conf
index 1dd0a9ed..e506cddc 100644
--- a/core/locales/locale.ar.conf
+++ b/core/locales/locale.ar.conf
@@ -169,14 +169,9 @@ _Join Lines = ا_دمج الأسطر
_Filter Through = _رشِّح
# Menu items for selecting text and entities.
_Select = ح_دِّد
-Select to _Matching Brace = _حدِّد حتى القوس الآخر
+Select between _Matching Delimiters = Select between _Matching Delimiters
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 = حدِّد _فقرة
diff --git a/core/locales/locale.de.conf b/core/locales/locale.de.conf
index 4bdbda42..13db9b80 100644
--- a/core/locales/locale.de.conf
+++ b/core/locales/locale.de.conf
@@ -169,13 +169,9 @@ _Join Lines = Linien verbinden
_Filter Through = Filtern durch
# Menu items for selecting text and entities.
_Select = Markieren
-Select to _Matching Brace = Zugehörige Klammern markieren
+Select between _Matching Delimiters = Select between _Matching Delimiters
Select between _XML Tags = Zwischen XML-Tags markieren
Select in XML _Tag = In XML-Tags markieren
-Select in _Single Quotes = In einfachen Anführungszeichen markieren
-Select in _Double Quotes = In doppelten Anführungszeichen markieren
-Select in _Parentheses = In runden Klammern markieren
-Select in _Brackets = In eckigen Klammern markieren
Select in B_races = In geschweiften Klammern markieren
Select _Word = Wort markieren
Select _Line = Zeile markieren
diff --git a/core/locales/locale.es.conf b/core/locales/locale.es.conf
index 584ac82b..c0128107 100644
--- a/core/locales/locale.es.conf
+++ b/core/locales/locale.es.conf
@@ -169,14 +169,9 @@ _Join Lines = U_nir líneas
_Filter Through = _Filtrar mediante
# Menu items for selecting text and entities.
_Select = Se_leccionar
-Select to _Matching Brace = Seleccionar _hasta paréntesis correspondiente
+Select between _Matching Delimiters = Select between _Matching Delimiters
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
diff --git a/core/locales/locale.fr.conf b/core/locales/locale.fr.conf
index 4cd1ac60..3b0d7e10 100644
--- a/core/locales/locale.fr.conf
+++ b/core/locales/locale.fr.conf
@@ -170,14 +170,9 @@ _Join Lines = _Joindre les lignes
_Filter Through = _Filtrer
# Menu items for selecting text and entities.
_Select = Sélect_ionner
-Select to _Matching Brace = Sélectionner jusqu’à la parenthèse _correspondante
+Select between _Matching Delimiters = Select between _Matching Delimiters
Select between _XML Tags = Sélectionner entre les balises _XML
Select in XML _Tag = Sélectionner avec les _balises XML
-Select in _Single Quotes = Sélectionner entre guillemets _simples
-Select in _Double Quotes = Sélectionner entre guillemets _doubles
-Select in _Parentheses = Sélectionner entre _parenthèses
-Select in _Brackets = Sélectionner entre c_rochets
-Select in B_races = Sélectionner entre _accolades
Select _Word = Sélectionner le _mot
Select _Line = Sélectionner la _ligne
Select Para_graph = Sélectionner l’a_linéa
diff --git a/core/locales/locale.it.conf b/core/locales/locale.it.conf
index 379df3ba..93906d5e 100644
--- a/core/locales/locale.it.conf
+++ b/core/locales/locale.it.conf
@@ -169,14 +169,9 @@ _Join Lines = Con_giungi le linee
_Filter Through = _Filtra
# Menu items for selecting text and entities.
_Select = _Seleziona
-Select to _Matching Brace = Seleziona fino alla parentesi _corrispondente
+Select between _Matching Delimiters = Select between _Matching Delimiters
Select between _XML Tags = Seleziona tra etichette _XML
Select in XML _Tag = Seleziona nell’_etichetta XML
-Select in _Single Quotes = Seleziona tra virgolette _semplici
-Select in _Double Quotes = Seleziona tra virgolette _doppie
-Select in _Parentheses = Seleziona tra parentesi _tonde
-Select in _Brackets = Seleziona tra parentesi _quadre
-Select in B_races = Seleziona tra parentesi _graffe
Select _Word = Seleziona la _parola
Select _Line = Seleziona la _linea
Select Para_graph = Seleziona il c_apoverso
diff --git a/core/locales/locale.pl.conf b/core/locales/locale.pl.conf
index 3b18ab57..757617c4 100644
--- a/core/locales/locale.pl.conf
+++ b/core/locales/locale.pl.conf
@@ -170,14 +170,9 @@ _Join Lines = Połącz w_iersze
_Filter Through = Fi_ltruj przez...
# Menu items for selecting text and entities.
_Select = _Zaznacz
-Select to _Matching Brace = Do pasującego _nawiasu
+Select between _Matching Delimiters = Select between _Matching Delimiters
Select between _XML Tags = Pomiędzy znacznikami _XML
Select in XML _Tag = W _znaczniku XML
-Select in _Single Quotes = W po_jedynczym cudzysłowie
-Select in _Double Quotes = W p_odwójnym cudzysłowie
-Select in _Parentheses = W nawiasie o_krągłym
-Select in _Brackets = W nawiasie k_wadratowym
-Select in B_races = W nawiasie k_lamrowym
Select _Word = Wy_raz
Select _Line = Wi_ersz
Select Para_graph = _Akapit
diff --git a/core/locales/locale.ru.conf b/core/locales/locale.ru.conf
index 6486cb0f..5fe91a75 100644
--- a/core/locales/locale.ru.conf
+++ b/core/locales/locale.ru.conf
@@ -169,14 +169,9 @@ _Join Lines = _Объединить строки
_Filter Through = Пропустить через _фильтр
# Menu items for selecting text and entities.
_Select = В_ыделить
-Select to _Matching Brace = Выделить до _парной фигурной скобки
+Select between _Matching Delimiters = Select between _Matching Delimiters
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 = Выделить _параграф
diff --git a/core/locales/locale.sv.conf b/core/locales/locale.sv.conf
index c232720e..174a91ed 100644
--- a/core/locales/locale.sv.conf
+++ b/core/locales/locale.sv.conf
@@ -169,14 +169,9 @@ _Join Lines = _Slå ihop rader
_Filter Through = Fi_ltrera genom...
# Menu items for selecting text and entities.
_Select = _Markera
-Select to _Matching Brace = Markera till _matchande parentes
+Select between _Matching Delimiters = Select between _Matching Delimiters
Select between _XML Tags = Markera mellan _XML-taggar
Select in XML _Tag = Markera inom XML-_tagg
-Select in _Single Quotes = Markera inom _enkelcitat
-Select in _Double Quotes = Markera inom _dubbelcitat
-Select in _Parentheses = Markera inom _parenteser
-Select in _Brackets = Markera inom _hakparenteser
-Select in B_races = Markera inom _krullparenteser
Select _Word = Markera _ord
Select _Line = Markera _rad
Select Para_graph = Markera para_graf
diff --git a/modules/textadept/keys.lua b/modules/textadept/keys.lua
index bd389775..c6713377 100644
--- a/modules/textadept/keys.lua
+++ b/modules/textadept/keys.lua
@@ -41,14 +41,9 @@ local M = {}
-- Ctrl+T |^T |^T |Transpose characters
-- Ctrl+Shift+J |^J |M-J |Join lines
-- Ctrl+| |⌘| |^\ |Filter text through
--- Ctrl+Shift+M |^⇧M |M-S-M |Select to matching brace
+-- Ctrl+Shift+M |^⇧M |M-S-M |Select between delimiters
-- Ctrl+< |⌘< |M-< |Select between XML tags
-- Ctrl+> |⌘> |None |Select in XML tag
--- Ctrl+" |⌘" |M-" |Select in double quotes
--- Ctrl+' |⌘' |M-' |Select in single quotes
--- Ctrl+( |⌘( |M-( |Select in parentheses
--- Ctrl+[ |⌘[ |M-[ |Select in brackets
--- Ctrl+{ |⌘{ |M-{ |Select in braces
-- Ctrl+Shift+D |⌘⇧D |M-S-W |Select word
-- Ctrl+Shift+N |⌘⇧N |M-S-N |Select line
-- Ctrl+Shift+P |⌘⇧P |M-S-P |Select paragraph
@@ -316,19 +311,12 @@ keys[not OSX and (GUI and 'c|' or 'c\\')
or 'm|'] = m_edit[_L['_Filter Through']][2]
-- Select.
local m_sel = m_edit[_L['_Select']]
-keys[GUI and 'cM' or 'mM'] = m_sel[_L['Select to _Matching Brace']][2]
+keys[GUI and 'cM' or 'mM'] = m_sel[_L['Select between _Matching Delimiters']][2]
keys[not OSX and GUI and 'c<'
or 'm<'] = m_sel[_L['Select between _XML Tags']][2]
if GUI then
keys[not OSX and 'c>' or 'm>'] = m_sel[_L['Select in XML _Tag']][2]
end
-keys[not OSX and GUI and "c'"
- or "m'"] = m_sel[_L['Select in _Single Quotes']][2]
-keys[not OSX and GUI and 'c"'
- or 'm"'] = m_sel[_L['Select in _Double Quotes']][2]
-keys[not OSX and GUI and 'c(' or 'm('] = m_sel[_L['Select in _Parentheses']][2]
-keys[not OSX and GUI and 'c[' or 'm['] = m_sel[_L['Select in _Brackets']][2]
-keys[not OSX and GUI and 'c{' or 'm{'] = m_sel[_L['Select in B_races']][2]
keys[not OSX and (GUI and 'cD' or 'mW') or 'mD'] = textadept.editing.select_word
keys[not OSX and GUI and 'cN' or 'mN'] = textadept.editing.select_line
keys[not OSX and GUI and 'cP' or 'mP'] = textadept.editing.select_paragraph
diff --git a/modules/textadept/menu.lua b/modules/textadept/menu.lua
index 7b2f2a81..672ddfa9 100644
--- a/modules/textadept/menu.lua
+++ b/modules/textadept/menu.lua
@@ -106,14 +106,9 @@ local default_menubar = {
end},
{
title = _L['_Select'],
- {_L['Select to _Matching Brace'], sel_enc},
+ {_L['Select between _Matching Delimiters'], sel_enc},
{_L['Select between _XML Tags'], function() sel_enc('>', '<') end},
{_L['Select in XML _Tag'], function() sel_enc('<', '>') end},
- {_L['Select in _Single Quotes'], function() sel_enc("'", "'") end},
- {_L['Select in _Double Quotes'], function() sel_enc('"', '"') end},
- {_L['Select in _Parentheses'], function() sel_enc('(', ')') end},
- {_L['Select in _Brackets'], function() sel_enc('[', ']') end},
- {_L['Select in B_races'], function() sel_enc('{', '}') end},
{_L['Select _Word'], textadept.editing.select_word},
{_L['Select _Line'], textadept.editing.select_line},
{_L['Select Para_graph'], textadept.editing.select_paragraph}