diff options
| -rw-r--r-- | core/file_io.lua | 4 | ||||
| -rw-r--r-- | core/locale.conf | 15 | ||||
| -rw-r--r-- | core/locales/locale.de.conf | 15 | ||||
| -rw-r--r-- | core/locales/locale.es.conf | 26 | ||||
| -rw-r--r-- | core/locales/locale.fr.conf | 15 | ||||
| -rw-r--r-- | core/locales/locale.ru.conf | 15 | ||||
| -rw-r--r-- | modules/textadept/find.lua | 2 | ||||
| -rw-r--r-- | modules/textadept/keys.lua | 4 | ||||
| -rw-r--r-- | modules/textadept/menu.lua | 4 | ||||
| -rw-r--r-- | modules/textadept/session.lua | 4 | ||||
| -rw-r--r-- | modules/textadept/snapopen.lua | 2 |
11 files changed, 31 insertions, 75 deletions
diff --git a/core/file_io.lua b/core/file_io.lua index 7243c172..fd45ac4c 100644 --- a/core/file_io.lua +++ b/core/file_io.lua @@ -149,8 +149,6 @@ 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 '') @@ -282,8 +280,6 @@ 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', diff --git a/core/locale.conf b/core/locale.conf index ad4c6dad..297d7bfc 100644 --- a/core/locale.conf +++ b/core/locale.conf @@ -19,12 +19,9 @@ Undefined event name = Undefined event name % core/file_io.lua 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 @@ -39,7 +36,7 @@ File = File % core/gui.lua [Message Buffer] = [Message Buffer] _OK = _Ok -%_Cancel = _Cancel +_Cancel = _Cancel Name = Name %File = File %Untitled = Untitled @@ -84,8 +81,6 @@ _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 @@ -114,10 +109,10 @@ Error loading webpage: = Error loading webpage: % modules/textadept/menu.lua _File = _File _New = _New -%_Open = _Open +_Open = _Open Open _Recent... = Open _Recent... Re_load = Re_load -%_Save = _Save +_Save = _Save Save _As = Save _As _Close = _Close Close All = Close All @@ -266,11 +261,7 @@ 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 diff --git a/core/locales/locale.de.conf b/core/locales/locale.de.conf index 167c3b5b..fcbc4ac3 100644 --- a/core/locales/locale.de.conf +++ b/core/locales/locale.de.conf @@ -20,12 +20,9 @@ Undefined event name = Undefinierter Eventname % core/file_io.lua Open = Öffnen -_Open = Ö_ffnen -_Cancel = _Abbrechen Encoding conversion failed. = Fehler bei der Umwandlung der Zeichenkodierung. Cannot change binary file encoding = Binäres Dateiformat kann nicht geändert werden Save = Speichern -_Save = _Speichern Untitled = Unbenannt Close without saving? = Schließen ohne zu speichern? There are unsaved changes in = Ungespeicherte Änderungen in @@ -40,7 +37,7 @@ File = Datei % core/gui.lua [Message Buffer] = [Nachrichten-Buffer] _OK = _OK -%_Cancel = _Abbrechen +_Cancel = _Abbrechen Name = Name %File = Datei %Untitled = Unbenannt @@ -85,8 +82,6 @@ _Whole word = Vollständiges Wort _Lua pattern = _Lua-Pattern _In files = _In Dateien Find in Files = In Dateien suchen -%_Open = Ö_ffnen -%_Cancel = _Abbrechen No results found = Keine Treffer gefunden [Files Found Buffer] = [Gefundene Dateien-Buffer] Search wrapped = Suche beginnt von oben @@ -104,10 +99,10 @@ Error loading webpage: = Fehler beim Laden der Webseite: % modules/textadept/menu.lua _File = _Datei _New = _Neu -%_Open = Ö_ffnen +_Open = Ö_ffnen Open _Recent... = Zuletzt verwendete Dateien öffnen... Re_load = Erneut laden -%_Save = _Speichern +_Save = _Speichern Save _As = Speichern _unter _Close = S_chließen Close All = Alle schließen @@ -256,11 +251,7 @@ Session Files Not Found = Session-Datei nicht gefunden The following session files were not found = Die folgenden Session-Dateien wurden nicht gefunden %_OK = _OK Load Session = Session laden -%_Open = Ö_ffnen -%_Cancel = _Abbrechen Save Session = Session speichern -%_Save = _Speichern -%_Cancel = _Abbrechen % modules/textadept/snapopen.lua File Limit Exceeded = Dateilimit erreicht diff --git a/core/locales/locale.es.conf b/core/locales/locale.es.conf index 7e8071b7..eb7bb7ea 100644 --- a/core/locales/locale.es.conf +++ b/core/locales/locale.es.conf @@ -20,12 +20,9 @@ Undefined event name = Nombre de evento sin definir % core/file_io.lua 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 @@ -40,7 +37,7 @@ File = Archivo % core/gui.lua [Message Buffer] = [Buffer de mensajes] _OK = _Aceptar -%_Cancel = _Cancelar +_Cancel = _Cancelar Name = Nombre %File = File %Untitled = Sin Nombre @@ -85,8 +82,6 @@ _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 @@ -95,6 +90,17 @@ An error occured: = Ha ocurrido un error: %_OK = _Aceptar %_Cancel = _Cancelar replacement(s) made = cambios(s) hecho(s) +% For ncurses: +Find: = Buscar: +Replace: = Reemplazar: +[Next] = [Siguiente] +[Prev] = [Anterior] +[Replace] = [Reemplazar] +[All] = [Todo] +Case(F1) = Concid.(F1) +Word(F2) = Palabra(F2) +Pattern(F3) = Patrón(F3) +Files(F4) = Ficheros(F4) % modules/textadept/keys.lua Lexer = Analizador léxico @@ -104,10 +110,10 @@ Error loading webpage: = Error al cargar la página web: % modules/textadept/menu.lua _File = _Archivo _New = _Nuevo -%_Open = _Abrir +_Open = _Abrir Open _Recent... = Abrir _reciente... Re_load = _Volver a cargar -%_Save = _Guardar +_Save = _Guardar Save _As = Guardar co_mo _Close = _Cerrar Close All = Cerrar _todo @@ -256,11 +262,7 @@ 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 diff --git a/core/locales/locale.fr.conf b/core/locales/locale.fr.conf index 6bd33a81..8ee12f62 100644 --- a/core/locales/locale.fr.conf +++ b/core/locales/locale.fr.conf @@ -20,12 +20,9 @@ Undefined event name = Nom d'évenement inconnu % core/file_io.lua Open = Ouvrir -_Open = _Ouvrir -_Cancel = _Annuler Encoding conversion failed. = Échec de la conversion d'encodage. Cannot change binary file encoding = Impossible de modifier l'encodage d'un fichier binaire Save = Enregistrer -_Save = _Enregistrer Untitled = Sans titre Close without saving? = Fermer sans enregistrer? There are unsaved changes in = Il y a des modifications non sauvegardées dans @@ -40,7 +37,7 @@ File = Fichier % core/gui.lua [Message Buffer] = [Buffer des messages] _OK = _Ok -%_Cancel = _Annuler +_Cancel = _Annuler Name = Nom %File = Fichier %Untitled = Sans titre @@ -85,8 +82,6 @@ _Whole word = _Mot entier _Lua pattern = Pattern _Lua _In files = _Dans les fichiers Find in Files = Rechercher dans les fichiers -%_Open = _Ouvrir -%_Cancel = _Annuler No results found = Aucun résultat trouvé [Files Found Buffer] = [Buffer des fichiers trouvés] Search wrapped = La recherche à bouclée @@ -115,10 +110,10 @@ Error loading webpage: = Erreur au chargement de la page web: % modules/textadept/menu.lua _File = _Fichier _New = _Nouveau -%_Open = _Ouvrir +_Open = _Ouvrir Open _Recent... = Ouvrir _récent... Re_load = Re_charger -%_Save = _Enregistrer +_Save = _Enregistrer Save _As = Enregistrer _sous _Close = _Fermer Close All = Fermer tout @@ -267,11 +262,7 @@ Session Files Not Found = Fichiers de session non trouvés The following session files were not found = Les fichiers de session suivants n'ont pas été trouvés %_OK = _OK Load Session = Charger session -%_Open = _Ouvrir -%_Cancel = _Annuler Save Session = Enregistrer session -%_Save = _Enregistrer -%_Cancel = _Annuler % modules/textadept/snapopen.lua File Limit Exceeded = Limite de fichiers dépassée diff --git a/core/locales/locale.ru.conf b/core/locales/locale.ru.conf index aaf0248a..d0609613 100644 --- a/core/locales/locale.ru.conf +++ b/core/locales/locale.ru.conf @@ -20,12 +20,9 @@ Undefined event name = Неизвестное название события % core/file_io.lua Open = Открыть -_Open = _Открыть -_Cancel = О_тменить Encoding conversion failed. = Ошибка при преобразовании кодировки. Cannot change binary file encoding = Невозможно изменить кодировку двоичного файла Save = Сохранить -_Save = Со_хранить Untitled = Безымянный Close without saving? = Закрыть без сохранения? There are unsaved changes in = Есть несохранённые изменения в @@ -40,7 +37,7 @@ File = Файл % core/gui.lua [Message Buffer] = [Буфер сообщений] _OK = _OK -%_Cancel = О_тменить +_Cancel = О_тменить Name = Название %File = Файл %Untitled = Безымянный @@ -85,8 +82,6 @@ _Whole word = _Слово целиком _Lua pattern = _Шаблон lua _In files = _В файлах Find in Files = Найти в файлах -%_Open = _Открыть -%_Cancel = О_тменить No results found = Ничего не найдено [Files Found Buffer] = [Буфер поиска в файлах] Search wrapped = Искать по кругу @@ -104,10 +99,10 @@ Error loading webpage: = Ошибка при загрузке web-страниц % modules/textadept/menu.lua _File = _Файл _New = _Создать -%_Open = _Открыть +_Open = _Открыть Open _Recent... = Открыть _недавние... Re_load = _Перезагрузить -%_Save = Со_хранить +_Save = Со_хранить Save _As = Сохранить _как _Close = _Закрыть Close All = Закрыть в_се @@ -256,11 +251,7 @@ 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 = Превышен лимит на количество файлов diff --git a/modules/textadept/find.lua b/modules/textadept/find.lua index 74ac9739..2bd8f4cf 100644 --- a/modules/textadept/find.lua +++ b/modules/textadept/find.lua @@ -100,8 +100,6 @@ 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 '', diff --git a/modules/textadept/keys.lua b/modules/textadept/keys.lua index c28f1ca1..2951c2b3 100644 --- a/modules/textadept/keys.lua +++ b/modules/textadept/keys.lua @@ -564,8 +564,8 @@ if not NCURSES then keys.f1 = {utils.open_webpage, _HOME..'/doc/01_Introduction.html'} keys.sf1 = {utils.open_webpage, _HOME..'/doc/api/index.html'} end --- TODO: {gui.dialog, 'ok-msgbox', '--title', 'Textadept', '--informative-text', --- _RELEASE, '--button1', _L['_OK'], '--no-cancel'} +-- TODO: {gui.dialog, 'ok-msgbox', '--title', 'Textadept', '--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 904cce9f..7c481f4b 100644 --- a/modules/textadept/menu.lua +++ b/modules/textadept/menu.lua @@ -214,8 +214,8 @@ M.menubar = { {_L['Show _LuaDoc'], {utils.open_webpage, _HOME..'/doc/api/index.html'}}, SEPARATOR, {_L['_About'], - {gui.dialog, 'ok-msgbox', '--title', 'Textadept', '--informative-text', - _RELEASE, '--button1', _L['_OK'], '--no-cancel'}}, + {gui.dialog, 'ok-msgbox', '--title', 'Textadept', '--text', _RELEASE, + '--button1', _L['_OK'], '--no-cancel'}}, }, } diff --git a/modules/textadept/session.lua b/modules/textadept/session.lua index 05b7ff58..35ecf9be 100644 --- a/modules/textadept/session.lua +++ b/modules/textadept/session.lua @@ -40,8 +40,6 @@ M.MAX_RECENT_FILES = 10 function M.load(filename) filename = filename or gui.dialog('fileselect', '--title', _L['Load Session'], - '--button1', _L['_Open'], - '--button2', _L['_Cancel'], '--with-directory', M.DEFAULT_SESSION:match('.+[/\\]') or '', '--with-file', @@ -132,8 +130,6 @@ end) function M.save(filename) filename = filename or 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 c8e5ff86..04e60002 100644 --- a/modules/textadept/snapopen.lua +++ b/modules/textadept/snapopen.lua @@ -133,7 +133,7 @@ function M.open(utf8_paths, filter, exclude_FILTER, depth) if #list >= M.MAX then gui.dialog('ok-msgbox', '--title', _L['File Limit Exceeded'], - '--informative-text', + '--text', string.format('%d %s %d', M.MAX, _L['files or more were found. Showing the first'], M.MAX), |