Tweaked localization keys.

This is in anticipate of removing '_' from keys, which would have created
duplicate keys.

13 files changed, 109 insertions, 95 deletions

diff --git a/core/file_io.lua b/core/file_io.lua
index b7a0de4b..d1a61e21 100644
--- a/core/file_io.lua
+++ b/core/file_io.lua
@@ -98,7 +98,7 @@ function io.open_file(filenames, encodings)
   if type(filenames) == 'string' then filenames = {filenames} end
   if type(encodings or '') == 'string' then encodings = {encodings} end
   filenames = filenames or ui.dialogs.fileselect{
-    title = _L['Open'], select_multiple = true,
+    title = _L['Open File'], select_multiple = true,
     with_directory = (buffer.filename or ''):match('^.+[/\\]') or
                      lfs.currentdir(),
     width = CURSES and ui.size[1] - 2 or nil
@@ -230,7 +230,7 @@ end
 function io.save_file_as(filename)
   local dir, name = (buffer.filename or ''):match('^(.-[/\\]?)([^/\\]*)$')
   filename = filename or ui.dialogs.filesave{
-    title = _L['Save'], with_directory = dir,
+    title = _L['Save File'], with_directory = dir,
     with_file = name:iconv('UTF-8', _CHARSET),
     width = CURSES and ui.size[1] - 2 or nil
   }
@@ -338,7 +338,7 @@ function io.open_recent_file()
     utf8_list[#utf8_list + 1] = io.recent_files[i]:iconv('UTF-8', _CHARSET)
   end
   local button, i = ui.dialogs.filteredlist{
-    title = _L['Open'], columns = _L['File'], items = utf8_list,
+    title = _L['Open File'], columns = _L['Filename'], items = utf8_list,
     width = CURSES and ui.size[1] - 2 or nil
   }
   if button == 1 and i then io.open_file(io.recent_files[i]) end
@@ -437,7 +437,7 @@ function io.quick_open(paths, filter, opts)
     }
   end
   local options = {
-    title = _L['Open'], columns = _L['File'], items = utf8_list,
+    title = _L['Open File'], columns = _L['Filename'], items = utf8_list,
     button1 = _L['_OK'], button2 = _L['_Cancel'], select_multiple = true,
     string_output = true, width = CURSES and ui.size[1] - 2 or nil
   }
diff --git a/core/locale.conf b/core/locale.conf
index d2bbe032..7d895184 100644
--- a/core/locale.conf
+++ b/core/locale.conf
@@ -17,12 +17,12 @@ Undefined event name = Undefined event name
 
 # [core/file_io.lua]
 # The title of dialogs prompting the user to open a file.
-Open = Open
+Open File = Open File
 # The error message displayed when a file's text encoding could not be detected
 # and when that text cannot be converted into UTF-8 for display.
 Encoding conversion failed. = Encoding conversion failed.
 # The title of dialogs prompting the user to save a file.
-Save = Save
+Save File = Save File
 # The text displayed for untitled and unsaved buffers.
 Untitled = Untitled
 # The text displayed in a dialog when the user attempts to close a file with
@@ -38,7 +38,7 @@ has been modified. Reload it? = has been modified. Reload it?
 _Yes = _Yes
 _No = _No
 # The column label for lists of filenames in dialogs.
-File = File
+Filename = File
 # The text displayed in a dialog when more than X files were found in the quick
 # open dialog.
 files or more were found. Showing the first = files or more were found. Showing the first
@@ -91,9 +91,10 @@ Line Number: = Line Number:
 returned non-zero status = returned non-zero status
 
 # [modules/textadept/find.lua]
-# The text displayed in the GUI find & replace pane.
+# The text displayed in the find & replace pane.
 _Find: = _Find:
 R_eplace: = R_eplace:
+# The button text displayed in the GUI find & replace pane.
 Find _Next = Find _Next
 Find _Prev = Find _Prev
 _Replace = _Replace
@@ -102,9 +103,9 @@ _Match case = _Match case
 _Whole word = _Whole word
 Rege_x = Rege_x
 _In files = _In files
-# The text displayed in the terminal version's find & replace pane.
-Find: = Find:
-Replace: = Replace:
+# The button text displayed in the terminal version's find & replace pane.
+# These should be as short as possible, as most terminals are 80 characters in
+# width.
 [Next] = [Next]
 [Prev] = [Prev]
 [Replace] = [Replace]
@@ -119,7 +120,7 @@ Search wrapped = Search wrapped
 # The statusbar text shown when the text to search for was not found.
 No results found = No results found
 # The title of the dialog for selecting files to search in.
-Find in Files = Find in Files
+Select Directory = Select Directory
 # The name of the buffer Textadept prints "Find in Files" results to.
 [Files Found Buffer] = [Files Found Buffer]
 # The "Find in Files" result for text found in a binary file. This result is
@@ -237,7 +238,7 @@ S_top = S_top
 _Next Error = _Next Error
 _Previous Error = _Previous Error
 # Menu items for working with bookmarked lines in buffers.
-_Bookmark = _Bookmark
+_Bookmarks = _Bookmarks
 _Toggle Bookmark = _Toggle Bookmark
 _Clear Bookmarks = _Clear Bookmarks
 _Next Bookmark = _Next Bookmark
diff --git a/core/locale.lua b/core/locale.lua
index 919f9743..2c94ef1c 100644
--- a/core/locale.lua
+++ b/core/locale.lua
@@ -7,6 +7,8 @@ local M = {}
 -- Map of all messages used by Textadept to their localized form.
 -- If the table does not contain the localized version of a given message, it
 -- returns a string that starts with "No Localization:" via a metamethod.
+-- Note: the terminal version ignores any "_" mnemonics the GUI version would
+-- use.
 module('_L')]]
 
 local f = io.open(_USERHOME..'/locale.conf', 'rb')
@@ -21,7 +23,9 @@ for line in f:lines() do
   -- comment.
   if not line:find('^%s*[^%w_%[]') then
     local id, str = line:match('^(.-)%s*=%s*(.+)$')
-    if id and str then M[id] = not CURSES and str or str:gsub('_', '') end
+    if id and str and assert(not M[id], 'duplicate locale key: '..id) then
+      M[id] = not CURSES and str or str:gsub('_', '')
+    end
   end
 end
 f:close()
diff --git a/core/locales/locale.ar.conf b/core/locales/locale.ar.conf
index 91e9ac96..75bdd5ba 100644
--- a/core/locales/locale.ar.conf
+++ b/core/locales/locale.ar.conf
@@ -17,12 +17,12 @@ Undefined event name = اسم حدث غير معرّف
 
 # [core/file_io.lua]
 # The title of dialogs prompting the user to open a file.
-Open = افتح
+Open File = افتح
 # The error message displayed when a file's text encoding could not be detected
 # and when that text cannot be converted into UTF-8 for display.
 Encoding conversion failed. = فشل تحويل الترميز.
 # The title of dialogs prompting the user to save a file.
-Save = احفظ
+Save File = احفظ
 # The text displayed for untitled and unsaved buffers.
 Untitled = بدون-عنوان
 # The text displayed in a dialog when the user attempts to close a file with
@@ -38,7 +38,7 @@ has been modified. Reload it? = تم تعديل الملف. أتحدِّثه؟
 _Yes = _نعم
 _No = _لا
 # The column label for lists of filenames in dialogs.
-File = ملف
+Filename = ملف
 # The text displayed in a dialog when more than X files were found in the quick
 # open dialog.
 files or more were found. Showing the first = وجدت ملفات. سأعرض الأول
@@ -91,9 +91,10 @@ Line Number: = رقم السطر:
 returned non-zero status = returned non-zero status
 
 # [modules/textadept/find.lua]
-# The text displayed in the GUI find & replace pane.
+# The text displayed in the find & replace pane.
 _Find: = _ابحث:
 R_eplace: = ا_ستبدال:
+# The button text displayed in the GUI find & replace pane.
 Find _Next = ابحث عن ال_تالي
 Find _Prev = ابحث عن ال_سابق
 _Replace = اس_تبدل
@@ -102,9 +103,9 @@ _Match case = _طابق الحالة
 _Whole word = _كل الكلمة
 Rege_x = Rege_x
 _In files = _في الملفات
-# The text displayed in the terminal version's find & replace pane.
-Find: = ا_بحث
-Replace: = استبدل:
+# The button text displayed in the terminal version's find & replace pane.
+# These should be as short as possible, as most terminals are 80 characters in
+# width.
 [Next] = [التالي]
 [Prev] = [السابق]
 [Replace] = [استبدل]
@@ -119,7 +120,7 @@ Search wrapped = تلقائيًا عُدْ إلى البداية
 # The statusbar text shown when the text to search for was not found.
 No results found = عذرًا, لا يوجد نتائج
 # The title of the dialog for selecting files to search in.
-Find in Files = ابحث في الملفات
+Select Directory = ابحث في الملفات
 # The name of the buffer Textadept prints "Find in Files" results to.
 [Files Found Buffer] = [مذكرة الملفات التي بحثْتُ عنها]
 # The "Find in Files" result for text found in a binary file. This result is
@@ -237,7 +238,7 @@ S_top = قِفْ
 _Next Error = اذهب لل_خطأ التالي
 _Previous Error = اذهب للخطأ ال_سابق
 # Menu items for working with bookmarked lines in buffers.
-_Bookmark = ع_لامات
+_Bookmarks = ع_لامات
 _Toggle Bookmark = _بدِّل العلامة
 _Clear Bookmarks = ا_مسح العلامات
 _Next Bookmark = العلامة ال_تالية
diff --git a/core/locales/locale.de.conf b/core/locales/locale.de.conf
index aa202368..7dcfa404 100644
--- a/core/locales/locale.de.conf
+++ b/core/locales/locale.de.conf
@@ -17,12 +17,12 @@ Undefined event name = Undefinierter Eventname
 
 # [core/file_io.lua]
 # The title of dialogs prompting the user to open a file.
-Open = Öffnen
+Open File = Öffnen
 # The error message displayed when a file's text encoding could not be detected
 # and when that text cannot be converted into UTF-8 for display.
 Encoding conversion failed. = Fehler beim Wechseln der Zeichenkodierung.
 # The title of dialogs prompting the user to save a file.
-Save = Speichern
+Save File = Speichern
 # The text displayed for untitled and unsaved buffers.
 Untitled = Unbenannt
 # The text displayed in a dialog when the user attempts to close a file with
@@ -38,7 +38,7 @@ has been modified. Reload it? = wurde geändert. Erneut laden?
 _Yes = _Ja
 _No = _Nein
 # The column label for lists of filenames in dialogs.
-File = Datei
+Filename = Datei
 # The text displayed in a dialog when more than X files were found in the quick
 # open dialog.
 files or more were found. Showing the first = Dateien oder mehr gefunden. Zeige die ersten
@@ -91,9 +91,10 @@ Line Number: = Zeilennummer:
 returned non-zero status = returned non-zero status
 
 # [modules/textadept/find.lua]
-# The text displayed in the GUI find & replace pane.
+# The text displayed in the find & replace pane.
 _Find: = Suchen
 R_eplace: = Ersetzen
+# The button text displayed in the GUI find & replace pane.
 Find _Next = Vorwärts suchen
 Find _Prev = Rückwärts suchen
 _Replace = Ersetzen
@@ -102,9 +103,9 @@ _Match case = Groß-/Kleinschreibung berücksichtigen
 _Whole word = Vollständiges Wort
 Rege_x = Rege_x
 _In files = _In Dateien
-# The text displayed in the terminal version's find & replace pane.
-Find: = Suchen:
-Replace: = Ersetzen:
+# The button text displayed in the terminal version's find & replace pane.
+# These should be as short as possible, as most terminals are 80 characters in
+# width.
 [Next] = [Vorwärts]
 [Prev] = [Rückw.]
 [Replace] = [Ersetzen]
@@ -119,7 +120,7 @@ Search wrapped = Suche am Anfang fortgesetzt
 # The statusbar text shown when the text to search for was not found.
 No results found = Keine Treffer gefunden
 # The title of the dialog for selecting files to search in.
-Find in Files = In Dateien suchen
+Select Directory = In Dateien suchen
 # The name of the buffer Textadept prints "Find in Files" results to.
 [Files Found Buffer] = [Buffer mit gefundenen Dateien]
 # The "Find in Files" result for text found in a binary file. This result is
@@ -238,7 +239,7 @@ S_top = Anhalten
 _Next Error = Nächster Fehler
 _Previous Error = Vorheriger Fehler
 # Menu items for working with bookmarked lines in buffers.
-_Bookmark = Lesezeichen
+_Bookmarks = Lesezeichen
 _Toggle Bookmark = Lesezeichen umschalten
 _Clear Bookmarks = Lesezeichen löschen
 _Next Bookmark = Nächstes Lesezeichen
diff --git a/core/locales/locale.es.conf b/core/locales/locale.es.conf
index fbfb74cc..adf403df 100644
--- a/core/locales/locale.es.conf
+++ b/core/locales/locale.es.conf
@@ -17,12 +17,12 @@ Undefined event name = Nombre de evento sin definir
 
 # [core/file_io.lua]
 # The title of dialogs prompting the user to open a file.
-Open = Abrir
+Open File = Abrir
 # The error message displayed when a file's text encoding could not be detected
 # and when that text cannot be converted into UTF-8 for display.
 Encoding conversion failed. = Error al convertir codificación.
 # The title of dialogs prompting the user to save a file.
-Save = Guardar
+Save File = Guardar
 # The text displayed for untitled and unsaved buffers.
 Untitled = Sin Nombre
 # The text displayed in a dialog when the user attempts to close a file with
@@ -38,7 +38,7 @@ has been modified. Reload it? = ha sido modificado. ¿Desea volver a cargarlo?
 _Yes = _Sí
 _No = _No
 # The column label for lists of filenames in dialogs.
-File = Archivo
+Filename = Archivo
 # The text displayed in a dialog when more than X files were found in the quick
 # open dialog.
 files or more were found. Showing the first = ficheros o más han sido encontrados. Se muestran los primeros
@@ -91,9 +91,10 @@ Line Number: = Número de línea:
 returned non-zero status = returned non-zero status
 
 # [modules/textadept/find.lua]
-# The text displayed in the GUI find & replace pane.
+# The text displayed in the find & replace pane.
 _Find: = _Buscar:
 R_eplace: = Reempla_zar:
+# The button text displayed in the GUI find & replace pane.
 Find _Next = Buscar _siguiente
 Find _Prev = Buscar a_nterior
 _Replace = _Reemplazar
@@ -102,9 +103,9 @@ _Match case = Concid. _mayús/minús
 _Whole word = Palabra _completa
 Rege_x = Rege_x
 _In files = En ficher_os
-# The text displayed in the terminal version's find & replace pane.
-Find: = Buscar:
-Replace: = Reemplazar:
+# The button text displayed in the terminal version's find & replace pane.
+# These should be as short as possible, as most terminals are 80 characters in
+# width.
 [Next] = [Siguiente]
 [Prev] = [Anterior]
 [Replace] = [Reemplazar]
@@ -119,7 +120,7 @@ Search wrapped = La búsqueda ha sobrepasado el final/inicio del documento
 # The statusbar text shown when the text to search for was not found.
 No results found = No se han encontrado coincidencias
 # The title of the dialog for selecting files to search in.
-Find in Files = Buscar en ficheros
+Select Directory = Buscar en ficheros
 # The name of the buffer Textadept prints "Find in Files" results to.
 [Files Found Buffer] = [Buffer de búsqueda en ficheros]
 # The "Find in Files" result for text found in a binary file. This result is
@@ -237,7 +238,7 @@ S_top = _Detener
 _Next Error = Error sig_uiente
 _Previous Error = Error _anterior
 # Menu items for working with bookmarked lines in buffers.
-_Bookmark = _Marcadores
+_Bookmarks = _Marcadores
 _Toggle Bookmark = Activar/Desactivar _marcador
 _Clear Bookmarks = _Borrar marcadores
 _Next Bookmark = Marcador _siguiente
diff --git a/core/locales/locale.fr.conf b/core/locales/locale.fr.conf
index 30b8bf11..65ecec7d 100644
--- a/core/locales/locale.fr.conf
+++ b/core/locales/locale.fr.conf
@@ -18,12 +18,12 @@ Undefined event name = Nom d’évènement inconnu
 
 # [core/file_io.lua]
 # The title of dialogs prompting the user to open a file.
-Open = Ouvrir
+Open File = Ouvrir
 # The error message displayed when a file's text encoding could not be detected
 # and when that text cannot be converted into UTF-8 for display.
 Encoding conversion failed. = Échec de la conversion d’encodage
 # The title of dialogs prompting the user to save a file.
-Save = Enregistrer
+Save File = Enregistrer
 # The text displayed for untitled and unsaved buffers.
 Untitled = Sans titre
 # The text displayed in a dialog when the user attempts to close a file with
@@ -39,7 +39,7 @@ has been modified. Reload it? = a été modifié. Recharger?
 _Yes = _Oui
 _No = _Non
 # The column label for lists of filenames in dialogs.
-File = Fichier
+Filename = Fichier
 # The text displayed in a dialog when more than X files were found in the quick
 # open dialog.
 files or more were found. Showing the first = fichiers ou plus trouvés. Affichage des premiers
@@ -92,9 +92,10 @@ Line Number: = Numéro de ligne:
 returned non-zero status = returned non-zero status
 
 # [modules/textadept/find.lua]
-# The text displayed in the GUI find & replace pane.
+# The text displayed in the find & replace pane.
 _Find: = _Rechercher:
 R_eplace: = Remplacer p_ar:
+# The button text displayed in the GUI find & replace pane.
 Find _Next = Rechercher le _suivant
 Find _Prev = Rechercher le _précédent
 _Replace = Remp_lacer
@@ -103,9 +104,9 @@ _Match case = Respecter la _casse
 _Whole word = _Mot entier
 Rege_x = Rege_x
 _In files = Dans les f_ichiers
-# The text displayed in the terminal version's find & replace pane.
-Find: = Rechercher:
-Replace: = Remplacer:
+# The button text displayed in the terminal version's find & replace pane.
+# These should be as short as possible, as most terminals are 80 characters in
+# width.
 [Next] = [Suivant]
 [Prev] = [Précédent]
 [Replace] = [Remplacer]
@@ -120,7 +121,7 @@ Search wrapped = La recherche a recommencé
 # The statusbar text shown when the text to search for was not found.
 No results found = Aucun résultat trouvé
 # The title of the dialog for selecting files to search in.
-Find in Files = Rechercher dans les fichiers
+Select Directory = Rechercher dans les fichiers
 # The name of the buffer Textadept prints "Find in Files" results to.
 [Files Found Buffer] = [Onglet des fichiers trouvés]
 # The "Find in Files" result for text found in a binary file. This result is
@@ -238,7 +239,7 @@ S_top = _Arrêter
 _Next Error = Erreur _suivante
 _Previous Error = Erreur _précédente
 # Menu items for working with bookmarked lines in buffers.
-_Bookmark = Si_gnet
+_Bookmarks = Si_gnet
 _Toggle Bookmark = Commuter le _signet
 _Clear Bookmarks = _Supprimer les signets
 _Next Bookmark = Signet _suivant
diff --git a/core/locales/locale.it.conf b/core/locales/locale.it.conf
index 554a8dbc..c921b024 100644
--- a/core/locales/locale.it.conf
+++ b/core/locales/locale.it.conf
@@ -17,12 +17,12 @@ Undefined event name = Nome di evento indefinito
 
 # [core/file_io.lua]
 # The title of dialogs prompting the user to open a file.
-Open = Apri
+Open File = Apri
 # The error message displayed when a file's text encoding could not be detected
 # and when that text cannot be converted into UTF-8 for display.
 Encoding conversion failed. = Cambio di codifica non riuscito
 # The title of dialogs prompting the user to save a file.
-Save = Salva
+Save File = Salva
 # The text displayed for untitled and unsaved buffers.
 Untitled = Senza titolo
 # The text displayed in a dialog when the user attempts to close a file with
@@ -38,7 +38,7 @@ has been modified. Reload it? = è stato modificato. Ricaricare?
 _Yes = _Sì
 _No = _No
 # The column label for lists of filenames in dialogs.
-File = File
+Filename = File
 # The text displayed in a dialog when more than X files were found in the quick
 # open dialog.
 files or more were found. Showing the first = file o più sono stati trovati. Sono mostrati i primi
@@ -91,9 +91,10 @@ Line Number: = Numero di linea:
 returned non-zero status = returned non-zero status
 
 # [modules/textadept/find.lua]
-# The text displayed in the GUI find & replace pane.
+# The text displayed in the find & replace pane.
 _Find: = _Cerca:
 R_eplace: = Sost_ituisci con:
+# The button text displayed in the GUI find & replace pane.
 Find _Next = Cerca il _seguente
 Find _Prev = Cerca il _precedente
 _Replace = S_ostituisci
@@ -102,9 +103,9 @@ _Match case = Distin_gui min./maiusc.
 _Whole word = Paro_la intera
 Rege_x = Rege_x
 _In files = I_n più file
-# The text displayed in the terminal version's find & replace pane.
-Find: = Cerca:
-Replace: = Sostituisci:
+# The button text displayed in the terminal version's find & replace pane.
+# These should be as short as possible, as most terminals are 80 characters in
+# width.
 [Next] = [Seguente]
 [Prev] = [Precedente]
 [Replace] = [Sostituisci]
@@ -119,7 +120,7 @@ Search wrapped = La ricerca è ricominciata
 # The statusbar text shown when the text to search for was not found.
 No results found = Nessun risultato trovato
 # The title of the dialog for selecting files to search in.
-Find in Files = Trova nei file
+Select Directory = Trova nei file
 # The name of the buffer Textadept prints "Find in Files" results to.
 [Files Found Buffer] = [Scheda dei file trovati]
 # The "Find in Files" result for text found in a binary file. This result is
@@ -237,7 +238,7 @@ S_top = _Arresta
 _Next Error = Errore s_eguente
 _Previous Error = Errore p_recedente
 # Menu items for working with bookmarked lines in buffers.
-_Bookmark = Segna_libro
+_Bookmarks = Segna_libro
 _Toggle Bookmark = Segna_libro sì/no
 _Clear Bookmarks = _Annulla i segnalibri
 _Next Bookmark = Segnalibro _seguente
diff --git a/core/locales/locale.pl.conf b/core/locales/locale.pl.conf
index c2a23052..4513af08 100644
--- a/core/locales/locale.pl.conf
+++ b/core/locales/locale.pl.conf
@@ -18,12 +18,12 @@ Undefined event name = Brak nazwy zdarzenia
 
 # [core/file_io.lua]
 # The title of dialogs prompting the user to open a file.
-Open = Otwórz
+Open File = Otwórz
 # The error message displayed when a file's text encoding could not be detected
 # and when that text cannot be converted into UTF-8 for display.
 Encoding conversion failed. = Zmiana kodowania nie powiodła się.
 # The title of dialogs prompting the user to save a file.
-Save = Zapisz
+Save File = Zapisz
 # The text displayed for untitled and unsaved buffers.
 Untitled = Bez nazwy
 # The text displayed in a dialog when the user attempts to close a file with
@@ -39,7 +39,7 @@ has been modified. Reload it? = został zmodyfikowany. Wczytać ponownie?
 _Yes = _Tak
 _No = _Nie
 # The column label for lists of filenames in dialogs.
-File = Plik
+Filename = Plik
 # The text displayed in a dialog when more than X files were found in the quick
 # open dialog.
 files or more were found. Showing the first = lub więcej plików zostało znalezionych. Pokazywanie pierwszego
@@ -92,9 +92,10 @@ Line Number: = Numer wiersza:
 returned non-zero status = returned non-zero status
 
 # [modules/textadept/find.lua]
-# The text displayed in the GUI find & replace pane.
+# The text displayed in the find & replace pane.
 _Find: = _Znajdź:
 R_eplace: = Za_mień:
+# The button text displayed in the GUI find & replace pane.
 Find _Next = Znajdź _następne
 Find _Prev = Znajdź _poprzednie
 _Replace = Za_mień
@@ -103,9 +104,9 @@ _Match case = _Dopasuj wielkość liter
 _Whole word = _Cały wyraz
 Rege_x = Rege_x
 _In files = _W plikach
-# The text displayed in the terminal version's find & replace pane.
-Find: = Znajdź:
-Replace: = Zamień:
+# The button text displayed in the terminal version's find & replace pane.
+# These should be as short as possible, as most terminals are 80 characters in
+# width.
 [Next] = [Następne]
 [Prev] = [Poprzednie]
 [Replace] = [Zamień]
@@ -120,7 +121,7 @@ Search wrapped = Automatyczny powrót do początku
 # The statusbar text shown when the text to search for was not found.
 No results found = Niczego nie znaleziono
 # The title of the dialog for selecting files to search in.
-Find in Files = Znajdź w plikach
+Select Directory = Znajdź w plikach
 # The name of the buffer Textadept prints "Find in Files" results to.
 [Files Found Buffer] = [Bufor szukania w plikach]
 # The "Find in Files" result for text found in a binary file. This result is
@@ -238,7 +239,7 @@ S_top = Pr_zerwij
 _Next Error = _Następny błąd
 _Previous Error = _Poprzedni błąd
 # Menu items for working with bookmarked lines in buffers.
-_Bookmark = Zakładk_i
+_Bookmarks = Zakładk_i
 _Toggle Bookmark = _Dodaj/usuń zakładkę
 _Clear Bookmarks = _Wyczyść zakładki
 _Next Bookmark = _Następna zakładka
diff --git a/core/locales/locale.ru.conf b/core/locales/locale.ru.conf
index 69bbb59b..05413cbf 100644
--- a/core/locales/locale.ru.conf
+++ b/core/locales/locale.ru.conf
@@ -17,12 +17,12 @@ Undefined event name = Неизвестное название события
 
 # [core/file_io.lua]
 # The title of dialogs prompting the user to open a file.
-Open = Открыть
+Open File = Открыть
 # The error message displayed when a file's text encoding could not be detected
 # and when that text cannot be converted into UTF-8 for display.
 Encoding conversion failed. = Ошибка при преобразовании кодировки.
 # The title of dialogs prompting the user to save a file.
-Save = Сохранить
+Save File = Сохранить
 # The text displayed for untitled and unsaved buffers.
 Untitled = Безымянный
 # The text displayed in a dialog when the user attempts to close a file with
@@ -38,7 +38,7 @@ has been modified. Reload it? = был изменён. Открыть занов
 _Yes = _Да
 _No = _Нет
 # The column label for lists of filenames in dialogs.
-File = Файл
+Filename = Файл
 # The text displayed in a dialog when more than X files were found in the quick
 # open dialog.
 files or more were found. Showing the first = файлов или более было найдено. Показываем первый
@@ -91,9 +91,10 @@ Line Number: = Номер строки:
 returned non-zero status = returned non-zero status
 
 # [modules/textadept/find.lua]
-# The text displayed in the GUI find & replace pane.
+# The text displayed in the find & replace pane.
 _Find: = Н_айти:
 R_eplace: = _Заменить:
+# The button text displayed in the GUI find & replace pane.
 Find _Next = Найти _следующий
 Find _Prev = Найти _предыдущий
 _Replace = _Заменить
@@ -102,9 +103,9 @@ _Match case = _Учитывать регистр
 _Whole word = _Слово целиком
 Rege_x = Rege_x
 _In files = _В файлах
-# The text displayed in the terminal version's find & replace pane.
-Find: = Find:
-Replace: = Replace:
+# The button text displayed in the terminal version's find & replace pane.
+# These should be as short as possible, as most terminals are 80 characters in
+# width.
 [Next] = [Next]
 [Prev] = [Prev]
 [Replace] = [Replace]
@@ -119,7 +120,7 @@ Search wrapped = Искать по кругу
 # The statusbar text shown when the text to search for was not found.
 No results found = Ничего не найдено
 # The title of the dialog for selecting files to search in.
-Find in Files = Найти в файлах
+Select Directory = Найти в файлах
 # The name of the buffer Textadept prints "Find in Files" results to.
 [Files Found Buffer] = [Буфер поиска в файлах]
 # The "Find in Files" result for text found in a binary file. This result is
@@ -237,7 +238,7 @@ S_top = Ос_тановить
 _Next Error = Следующая Ошибка
 _Previous Error = Предыдущая Ошибка
 # Menu items for working with bookmarked lines in buffers.
-_Bookmark = _Закладки
+_Bookmarks = _Закладки
 _Toggle Bookmark = _Показать/скрыть закладки
 _Clear Bookmarks = _Очистить закладки
 _Next Bookmark = _Следующая закладка
diff --git a/core/locales/locale.sv.conf b/core/locales/locale.sv.conf
index 2a7ac0ac..2b7d1919 100644
--- a/core/locales/locale.sv.conf
+++ b/core/locales/locale.sv.conf
@@ -17,12 +17,12 @@ Undefined event name = Odefinierat event-namn
 
 # [core/file_io.lua]
 # The title of dialogs prompting the user to open a file.
-Open = Öppna
+Open File = Öppna
 # The error message displayed when a file's text encoding could not be detected
 # and when that text cannot be converted into UTF-8 for display.
 Encoding conversion failed. = Kunde inte konvertera teckenkodningen.
 # The title of dialogs prompting the user to save a file.
-Save = Spara
+Save File = Spara
 # The text displayed for untitled and unsaved buffers.
 Untitled = Namnlös
 # The text displayed in a dialog when the user attempts to close a file with
@@ -38,7 +38,7 @@ has been modified. Reload it? = har ändrats. Ladda om den?
 _Yes = _Ja
 _No = _Nej
 # The column label for lists of filenames in dialogs.
-File = Fil
+Filename = Fil
 # The text displayed in a dialog when more than X files were found in the quick
 # open dialog.
 files or more were found. Showing the first = eller fler filer funna. Visar de första
@@ -91,9 +91,10 @@ Line Number: = Radnummer:
 returned non-zero status = returned non-zero status
 
 # [modules/textadept/find.lua]
-# The text displayed in the GUI find & replace pane.
+# The text displayed in the find & replace pane.
 _Find: = _Sök:
 R_eplace: = _Ersätt:
+# The button text displayed in the GUI find & replace pane.
 Find _Next = Sök _nästa
 Find _Prev = Sök _förra
 _Replace = E_rsätt
@@ -102,9 +103,9 @@ _Match case = _Matcha gemener/versaler
 _Whole word = Helt _ord
 Rege_x = Rege_x
 _In files = _I filer
-# The text displayed in the terminal version's find & replace pane.
-Find: = Sök:
-Replace: = Replace:
+# The button text displayed in the terminal version's find & replace pane.
+# These should be as short as possible, as most terminals are 80 characters in
+# width.
 [Next] = [Next]
 [Prev] = [Prev]
 [Replace] = [Replace]
@@ -119,7 +120,7 @@ Search wrapped = Sökningen slog runt
 # The statusbar text shown when the text to search for was not found.
 No results found = Inga resultat hittades
 # The title of the dialog for selecting files to search in.
-Find in Files = Sök i filer
+Select Directory = Sök i filer
 # The name of the buffer Textadept prints "Find in Files" results to.
 [Files Found Buffer] = [Files Found Buffer]
 # The "Find in Files" result for text found in a binary file. This result is
@@ -237,7 +238,7 @@ S_top = Avbry_t
 _Next Error = _Nästa fel
 _Previous Error = _Föregående fel
 # Menu items for working with bookmarked lines in buffers.
-_Bookmark = _Bokmärke
+_Bookmarks = _Bokmärke
 _Toggle Bookmark = Växla _bokmärke
 _Clear Bookmarks = _Rensa bokmärken
 _Next Bookmark = _Nästa bokmärke
diff --git a/core/locales/locale.zh.conf b/core/locales/locale.zh.conf
index 78439441..74699c31 100644
--- a/core/locales/locale.zh.conf
+++ b/core/locales/locale.zh.conf
@@ -17,7 +17,7 @@ Undefined event name = 未定义的事件名称
 
 # [core/file_io.lua]
 # The title of dialogs prompting the user to open a file.
-Open = Open
+Open File = Open File
 # The error message displayed when a file's text encoding could not be detected
 # and when that text cannot be converted into UTF-8 for display.
 Encoding conversion failed. = Encoding conversion failed.
@@ -38,7 +38,7 @@ has been modified. Reload it? = has been modified. Reload it?
 _Yes = 是(_Y)
 _No = 否(_N)
 # The column label for lists of filenames in dialogs.
-File = 文件
+Filename = 文件
 # The text displayed in a dialog when more than X files were found in the quick
 # open dialog.
 files or more were found. Showing the first = files or more were found. Showing the first
@@ -91,9 +91,10 @@ Line Number: = 行号:
 returned non-zero status = returned non-zero status
 
 # [modules/textadept/find.lua]
-# The text displayed in the GUI find & replace pane.
+# The text displayed in the find & replace pane.
 _Find: = 查找(_F):
 R_eplace: = 替换(_E):
+# The button text displayed in the GUI find & replace pane.
 Find _Next = 查找下一个(_N)
 Find _Prev = 查找上一个(_P)
 _Replace = 替换(_R)
@@ -102,9 +103,9 @@ _Match case = 区分大小写(_M)
 _Whole word = 整个单词(_W)
 Rege_x = 正则(_X)
 _In files = 在文件中(_I)
-# The text displayed in the terminal version's find & replace pane.
-Find: = 查找:
-Replace: = 替换:
+# The button text displayed in the terminal version's find & replace pane.
+# These should be as short as possible, as most terminals are 80 characters in
+# width.
 [Next] = [下一个]
 [Prev] = [上一个]
 [Replace] = [替换]
@@ -119,7 +120,7 @@ Search wrapped = Search wrapped
 # The statusbar text shown when the text to search for was not found.
 No results found = 未找到结果
 # The title of the dialog for selecting files to search in.
-Find in Files = 在文件中查找
+Select Directory = 在文件中查找
 # The name of the buffer Textadept prints "Find in Files" results to.
 [Files Found Buffer] = [Files Found Buffer]
 # The "Find in Files" result for text found in a binary file. This result is
@@ -237,7 +238,7 @@ S_top = 停止(_T)
 _Next Error = 下一个错误(_N)
 _Previous Error = 上一个错误(_P)
 # Menu items for working with bookmarked lines in buffers.
-_Bookmark = 书签(_B)
+_Bookmarks = 书签(_B)
 _Toggle Bookmark = 设置书签(_T)
 _Clear Bookmarks = 清空书签(_C)
 _Next Bookmark = 下一个书签(_N)
diff --git a/core/ui.lua b/core/ui.lua
index 2462f98f..1f067657 100644
--- a/core/ui.lua
+++ b/core/ui.lua
@@ -205,7 +205,7 @@ events.connect(events.RESET_AFTER,
 -- @name switch_buffer
 function ui.switch_buffer(zorder)
   local buffers = not zorder and _BUFFERS or buffers_zorder
-  local columns, utf8_list = {_L['Name'], _L['File']}, {}
+  local columns, utf8_list = {_L['Name'], _L['Filename']}, {}
   for i = not zorder and 1 or 2, #buffers do
     local buffer = buffers[i]
     local filename = buffer.filename or buffer._type or _L['Untitled']