Added context to localization messages for easier translation.

8 files changed, 1194 insertions, 629 deletions

diff --git a/core/locales/locale.ar.conf b/core/locales/locale.ar.conf
index a278f5b8..7c620389 100644
--- a/core/locales/locale.ar.conf
+++ b/core/locales/locale.ar.conf
@@ -1,73 +1,94 @@
 # Copyright 2007-2016 Mitchell mitchell.att.foicica.com. See LICENSE.
-# Arabic translation by Ahed Eid <AhedEid AT gmail.com>
+# Arabic localization file for Textadept by Ahed Eid <AhedEid AT gmail.com>.
 #
-# Localization file.
-# The localized strings may contain UTF-8 characters, but not UTF-16 or UTF-32.
-# The latter must be converted manually from the \U+xxxx format. Note that if
-# you use the \ddd representation of characters, it must be in DECIMAL format,
-# not Octal.
+# When translating this file into your native language, all translated text must
+# be encoded in UTF-8. For each "key = value" line, please replace the "value"
+# part with the translation of "key". Any whitespace around '=' is ignored.
 #
-# Each line contains a "message = localized string" pair. The message should not
-# be localized. Extra spaces around '=' are ignored.
-#
-# Notes:
-#   - Buttons and menu items have a "_" character as a mnemonic (for
-#     Alt+character) access. You can put the "_" anywhere applicable in your
-#     localized version or eliminate it altogether.
+# Note: for languages that support it, buttons and menu items may have a "_"
+# before any single letter, which means that pressing the "Alt" modifier key
+# along with that letter will activate (click) the button or menu item. You are
+# free to use or omit these "_" mnemonics from your translations as you see fit.
 
-# core/events.lua
+# [core/events.lua]
+# This error message is displayed if the user accidentally emits an event with
+# no name (e.g. mistypes the name of an existing event).
 Undefined event name = اسم حدث غير معرّف
 
-# core/file_io.lua
+# [core/file_io.lua]
+# The title of dialogs prompting the user to open a file.
 Open = افتح
+# 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 = احفظ
+# The text displayed for untitled and unsaved buffers.
 Untitled = بدون-عنوان
+# The text displayed in a dialog when the user attempts to close a file with
+# unsaved changes.
 Close without saving? = أَتُغلِق بدون حفظ؟
 There are unsaved changes in = يوجد تغيرات غير محفوطة في
+_Cancel = _إلغاء
 Close _without saving = أغْلِق _بدون حفظ
+# The text displayed in a dialog when a file has been externally modified.
 Reload? = أتُحدِّث؟
 Reload modified file? = أتحدِّث الملف المعدل؟
 has been modified. Reload it? = تم تعديل الملف. أتحدِّثه؟
 _Yes = _نعم
 _No = _لا
+# The column label for lists of filenames in dialogs.
 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 Limit Exceeded = اصطدمت بالحد الأقصى
+_OK = _موافق
+
+# [core/keys.lua]
+# The statusbar text shown when the user has pressed a key that is part of a key
+# chain (e.g. "Ctrl+Alt+V" followed by "S"). Textadept is waiting for another
+# keypress.
+Keychain: = سلسلة مفاتيح:
+# The statusbar text shown when the user started a key chain, but the next
+# keypress was unrecognized. Thus the key sequence is invalid.
+Invalid sequence = تسلسل غير صالح
 
-# core/gui.lua
+# [core/ui.lua]
+# The name of the buffer Textadept prints messages and error messages to.
 [Message Buffer] = [رسالة المذكرة]
-_OK = _موافق
-_Cancel = _إلغاء
+# The column label for lists of buffer names in dialogs.
 Name = اسم
-#File = ملف
-#Untitled = بدون-عنوان
+# The title of the dialog for switching between open buffers.
 Switch Buffers = بدِّل المذكرات
-theme not found. = النسف غير موجود.
+# The line-ending, indentation, and positional buffer information shown in the
+# statusbar.
 CRLF = CRLF
 LF = LF
 Tabs: = المسافات العريضة:
 Spaces: = المسافات:
 Line: = السطر:
 Col: = العمود:
+# The statusbar text shown when the user resets Textadept's internal Lua state.
+Lua reset = Lua reset
+# The text displayed in a dialog when the user attempts to quit Textadept with
+# unsaved changes in open buffers.
 Quit without saving? = أتَخْرُج بدون حفظ؟
 The following buffers are unsaved: = المذكرات التَّالِيَة أسماؤُهم غير محفوظة
-Quit _without saving =  أخْرُج _بدون حفظ
-Lua reset = Lua reset
-
-# core/keys.lua
-Keychain: = سلسلة مفاتيح:
-Invalid sequence = تسلسل غير صالح
+Quit _without saving = أخْرُج _بدون حفظ
 
-# modules/textadept/bookmarks.lua
+# [modules/textadept/bookmarks.lua]
+# The text displayed in the dialog for selecting a bookmark to jump to.
 Select Bookmark = اختر إشارة
 Bookmark = إشارة
 
-# modules/textadept/editing.lua
+# [modules/textadept/editing.lua]
+# The text displayed in the dialog for jumping to a particular line.
 Go To = اذهب إلى
 Line Number: = رقم السطر:
-#_OK = _موافق
-#_Cancel = _إلغاء
 
-# modules/textadept/find.lua
+# [modules/textadept/find.lua]
+# The text displayed in the GUI find & replace pane.
 _Find: = _ابحث:
 R_eplace: = ا_ستبدال:
 Find _Next = ابحث عن ال_تالي
@@ -78,22 +99,8 @@ _Match case = _طابق الحالة
 _Whole word = _كل الكلمة
 Rege_x = Rege_x
 _In files = _في الملفات
-Find in Files = ابحث في الملفات
+# The text displayed in the terminal version's find & replace pane.
 Find: = ا_بحث
-No results found = عذرًا, لا يوجد نتائج
-[Files Found Buffer] = [مذكرة الملفات التي بحثْتُ عنها]
-Binary file matches. = Binary file matches.
-Search wrapped = تلقائيًا عُدْ إلى البداية
-Continue? = Continue?
-Still searching in files... Continue waiting? = Still searching in files... Continue waiting?
-Find in Files aborted = Find in Files aborted
-Error = خلل
-An error occurred: = حصل خلل ما:
-#_OK = _موافق
-#_Cancel = _إلغاء
-replacement(s) made = وضع الاستبدال
-# For curses:
-#Find: = ابحث
 Replace: = استبدل:
 [Next] = [التالي]
 [Prev] = [السابق]
@@ -103,13 +110,30 @@ Case(F1) = حالة(F1)
 Word(F2) = كلمة(F2)
 Regex(F3) = Regex(F3)
 Files(F4) = ملفات(F4)
+# The statusbar text shown when a search has wrapped back to the beginning of
+# the buffer.
+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 = ابحث في الملفات
+# 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
+# shown in place of binary buffer text.
+Binary file matches. = Binary file matches.
+# The text displayed in a dialog when the user is prompted to continue a "Find
+# in Files" search that has taken longer than X seconds to complete.
+Continue? = Continue?
+Still searching in files... Continue waiting? = Still searching in files... Continue waiting?
+# The message displayed when a "Find in Files" search is aborted by the user.
+Find in Files aborted = Find in Files aborted
+# The statusbar text shown after performing a "Replace All".
+replacement(s) made = وضع الاستبدال
 
-# modules/textadept/keys.lua
-Lexer = معجم
-Style = نسق
-Error loading webpage: = خلل ما أثناء جلب صفحة الانترنت
-
-# modules/textadept/menu.lua
+# [modules/textadept/menu.lua]
+# Typical "File" menu items for creating new files, opening, saving, and closing
+# existing files, opening and saving sessions, and quitting Textadept.
 _File = _ملف
 _New = أ_نْشِئ
 _Open = _افتح
@@ -123,6 +147,7 @@ Close All = أغلِق الكل
 Loa_d Session... = حمِّل الجلسة...
 Sav_e Session... = احْفَظ الجلسة...
 _Quit = ا_خْرُج
+# Typical "Edit" menu items for manipulating buffer text and source code.
 _Edit = _حَرّر
 _Undo = _تَرَاجع
 _Redo = أ_عِدْ
@@ -139,7 +164,10 @@ _Highlight Word = _ظلّل الكلمة
 Toggle _Block Comment = _بدِّل التعليق
 T_ranspose Characters = ا_سحب الحرف
 _Join Lines = ا_دمج الأسطر
+# The menu item for filtering text through a shell command and replacing input
+# text with that command's output text.
 _Filter Through = _رشِّح
+# Menu items for selecting text and entities.
 _Select = ح_دِّد
 Select to _Matching Brace = _حدِّد حتى القوس الآخر
 Select between _XML Tags = ح_دِّد ما بين أوسمة الXML
@@ -152,6 +180,7 @@ Select in B_races = حدِّد داخل الأقواس الم_نحنية
 Select _Word = حدِّد _كلمة
 Select _Line = حدِّد _سطر
 Select Para_graph = حدِّد _فقرة
+# Menu items for transforming selected text.
 Selectio_n = المحَدًّد
 _Upper Case Selection = حوله لأحرف ك_بيرة
 _Lower Case Selection = حوله لأحرف ص_غيرة
@@ -164,53 +193,79 @@ Enclose in _Brackets = احتويه في أقواس م_ربعة
 Enclose in B_races = احتويه في أقواس م_نحنية
 _Move Selected Lines Up = _حرّكه لأعلى
 Move Selected Lines Do_wn = ح_رّكه لأسفل
+# Menu items for searching and replacing text within buffers and files.
 _Search = _بحث
 _Find = ا_بحث
-#Find _Next = جد ال_تالي
 Find _Previous = جد ال_سابق
-#_Replace = ا_ستبدل
-#Replace _All = استبدل ال_كل
-Find _Incremental =ابحث _تتابعيًا
+Find _Incremental = ابحث _تتابعيًا
 Find in Fi_les = ابحث في ال_ملفات
 Goto Nex_t File Found = اذهب إلى الم_لف التالي
 Goto Previou_s File Found = اذهب إلى المل_ف السابق
+# Menu item for jumping to a specific line in a buffer.
 _Jump to = ا_نتقل إلى
+# Menu items for various tools and utilities for editing and working with source
+# code.
 _Tools = أ_دوات
+# Menu item for opening Textadept's Lua command entry.
 Command _Entry = أ_كتب أمرًا
+# Menu item for selecting a menu command to run.
 Select Co_mmand = ا_ختر أمرًا
+# Menu items for running or compiling the current source file.
 _Run = _شغل
 _Compile = _ترجم
+# Menu item for setting command line arguments for run and compile commands.
 Set _Arguments... = Set _Arguments...
+# The text displayed in the dialog for specifying command line arguments for run
+# and compile commands.
 Command line arguments = Command line arguments
 For Run: = For Run:
 For Compile: = For Compile:
+# Menu item for building the current project.
 Buil_d = ا_بْن ِ
+# Menu item for stopping a run, compile, or build shell command.
 S_top = قِفْ
+# Menu items for navigating through recognized shell command errors.
 _Next Error = اذهب لل_خطأ التالي
 _Previous Error = اذهب للخطأ ال_سابق
-_Complete Symbol = أكْ_مِل الرمز
-Show _Documentation = ا_عْرض الوثائق
+# Menu items for working with bookmarked lines in buffers.
 _Bookmark = ع_لامات
 _Toggle Bookmark = _بدِّل العلامة
 _Clear Bookmarks = ا_مسح العلامات
 _Next Bookmark = العلامة ال_تالية
 _Previous Bookmark = العلامة ال_سابقة
 _Goto Bookmark... = ا_ذهب إلى العلامة ..
+# Menu items for launching a quick open dialog in order to open files in certain
+# directories. A quick open dialog lists all files in a directory and its
+# subdirectories and filters the list down as the user types.
 Quick _Open = Quick _Open
 Quickly Open _User Home = Quickly Open _User Home
 Quickly Open _Textadept Home = Quickly Open _Textadept Home
 Quickly Open _Current Directory = Quickly Open _Current Directory
 Quickly Open Current _Project = Quickly Open Current _Project
+# Menu items for working with snippets, insert-able pieces of code that act like
+# templates with placeholders for user input.
 _Snippets = _قُصَاصات
 _Insert Snippet... = أ_دخِل القُصَاصة
 _Expand Snippet/Next Placeholder = _فعِّل القصاصة\الموضع التالي
 _Previous Snippet Placeholder = ا_نتقل لموضع القصاصة السابق
 _Cancel Snippet = إ_لغ ِالقُصاصة
+# Menu items for auto-completing programming language symbols and showing
+# documentation for them (e.g. typing `textadept.editing.` followed by a
+# "Complete Symbol" would show all possible completions for that symbol).
+_Complete Symbol = أكْ_مِل الرمز
+Show _Documentation = ا_عْرض الوثائق
+# Menu item for inspecting the character under the caret. The character's byte
+# information, the lexer used to syntax-highlight that character, and the
+# character's lexical style (e.g. string, comment, number, etc.) are shown.
 Show St_yle = اعرض ال_نسق
+Lexer = معجم
+Style = نسق
+# Menu items for navigating between open buffers.
 _Buffer = م_ذكرة
 _Next Buffer = المذكرة ال_تالي
 _Previous Buffer = المذكرة ال_سابق
 _Switch to Buffer... = ا_نتقل إلى المذكرة...
+# Menu items for changing the indentation settings for the current buffer.
 _Indentation = ال_بادئة
 Tab width: _2 = سعة المسافة العريضة: _2
 Tab width: _3 = سعة المسافة العريضة: _3
@@ -218,17 +273,25 @@ Tab width: _4 = سعة المسافة العريضة: _4
 Tab width: _8 = سعة المسافة العريضة: _8
 _Toggle Use Tabs = _بدِّل المسافات العريضة
 _Convert Indentation = ت_حويل البادئة
+# Menu item for changing the end-of-line mode for the current buffer.
 _EOL Mode = _علامة نهاية السطر(EOL)
-#CRLF = CRLF
-#LF = LF
+# Menu items for changing the encoding of the current buffer's text.
 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
+# Menu items for changing the way the current buffer is displayed.
+Toggle View _EOL = بدِّل عرض _نهاية السطر
+Toggle _Wrap Mode = بدِّل ال_تفاف النص
+Toggle View White_space = بدِّل عرض ال_مسافة البيضاء
+# Menu items for changing and refreshing the syntax-highlighting language for
+# the current buffer.
 Select _Lexer... = اختر ال_معجم...
 _Refresh Syntax Highlighting = أ_عِدْ التضليل النحوي
+# Menu items for navigating between views, splitting them, closing them, and
+# resizing them.
 _View = _عرض
 _Next View = انتقل للمنظر ال_تالي
 _Previous View = انتقل للمنظر ال_سابق
@@ -238,46 +301,51 @@ _Unsplit View = إ_لغِ تقسيم المنظر
 Unsplit _All Views = إلغِ ت_قسيم كل المناظر
 _Grow View = _كبِّر المنظر
 Shrin_k View = _صغِّر المنظر
+# Menu item for folding (showing/hiding) the block of code the starts on the
+# current line. Fold-able blocks of code are typically classes, functions, and
+# control structures.
 Toggle Current _Fold = بدّل ال_طوي الحالي
-Toggle View _EOL = بدِّل عرض _نهاية السطر
-Toggle _Wrap Mode = بدِّل ال_تفاف النص
+# Menu item for showing line indentation markers.
 Toggle Show In_dent Guides = بدِّل عرض علامات ال_بادئة التوضيحية
-Toggle View White_space = بدِّل عرض ال_مسافة البيضاء
+# Menu item for allowing the caret to move beyond line ends and into "virtual
+# space".
 Toggle _Virtual Space = بدِّل المسافة ال_ظاهرية
+# Menu items for changing the zoom factor of displayed buffer text.
 Zoom _In = ك_بّر
 Zoom _Out = ص_غّر
 _Reset Zoom = أع_د الضبط
+# Menu items for getting help on Textadept and its Lua API documentation.
 _Help = م_ساعدة
 Show _Manual = عرض الد_ليل
 Show _LuaDoc = عرض و_ثائق لُوَ
 _About = ع_ن
+# The error message displayed when activating a menu item associated with an
+# unknown command.
+Unknown command: = أمر مجهول:
+# The text displayed in the dialog for running an arbitrary menu command. Any
+# key binding associated with commands are also shown.
+Run Command = شغِّل الأمر
 Command = أمر
 Key Command = أمر أساسي
-Run Command = شغِّل الأمر
-Unknown command: = أمر مجهول:
 
-# modules/textadept/mime_types.lua
+# [modules/textadept/file_types.lua]
+# The title of the dialog for selecting a lexer for the current buffer. Lexers
+# perform syntax highlighting of source code.
 Select Lexer = اختر المعجم
-#Name = الاسم
-
-# modules/textadept/run.lua
-does not exist = لا يوجد
 
-# modules/textadept/session.lua
+# [modules/textadept/session.lua]
+# The title of the dialog for selecting a session file to load.
+Load Session = حمّل الجلسة
+# The text displayed in a dialog when files in a loaded session were not found.
 Session Files Not Found = ملفات المكتب غير موجودة
 The following session files were not found = ملفات المكتب التالية غير موجودة
-#_OK = ح_سنًا
-Load Session = حمّل الجلسة
+# The title of the dialog for selecting a session file to save.
 Save Session = احفظ الجلسة
 
-# modules/textadept/snapopen.lua
-File Limit Exceeded = اصطدمت بالحد الأقصى
-files or more were found. Showing the first = وجدت ملفات. سأعرض الأول
-#_OK = ح_سنً
-#Open = افتح
-#File = ملف
-
-# modules/textadept/snippets.lua
+# [modules/textadept/snippets.lua]
+# The text displayed in the dialog for selecting a snippet to insert. Snippets
+# have a trigger word (pressing the "Tab" key after that word inserts the
+# snippet) and snippet text.
 Select Snippet = اختر قصاصة
 Trigger = الدافع
 Snippet Text = نص القصاصة
diff --git a/core/locales/locale.de.conf b/core/locales/locale.de.conf
index b749fc51..e6992c7a 100644
--- a/core/locales/locale.de.conf
+++ b/core/locales/locale.de.conf
@@ -1,73 +1,94 @@
 # Copyright 2007-2016 Mitchell mitchell.att.foicica.com. See LICENSE.
-# German translation by Robert Gieseke.
+# German localization file for Textadept by Robert Gieseke.
 #
-# Localization file.
-# The localized strings may contain UTF-8 characters, but not UTF-16 or UTF-32.
-# The latter must be converted manually from the \U+xxxx format. Note that if
-# you use the \ddd representation of characters, it must be in DECIMAL format,
-# not Octal.
+# When translating this file into your native language, all translated text must
+# be encoded in UTF-8. For each "key = value" line, please replace the "value"
+# part with the translation of "key". Any whitespace around '=' is ignored.
 #
-# Each line contains a "message = localized string" pair. The message should not
-# be localized. Extra spaces around '=' are ignored.
-#
-# Notes:
-#   - Buttons and menu items have a "_" character as a mnemonic (for
-#     Alt+character) access. You can put the "_" anywhere applicable in your
-#     localized version or eliminate it altogether.
+# Note: for languages that support it, buttons and menu items may have a "_"
+# before any single letter, which means that pressing the "Alt" modifier key
+# along with that letter will activate (click) the button or menu item. You are
+# free to use or omit these "_" mnemonics from your translations as you see fit.
 
-# core/events.lua
+# [core/events.lua]
+# This error message is displayed if the user accidentally emits an event with
+# no name (e.g. mistypes the name of an existing event).
 Undefined event name = Undefinierter Eventname
 
-# core/file_io.lua
+# [core/file_io.lua]
+# The title of dialogs prompting the user to open a file.
 Open = Ö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 bei der Umwandlung der Zeichenkodierung.
+# The title of dialogs prompting the user to save a file.
 Save = 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
+# unsaved changes.
 Close without saving? = Schließen ohne zu speichern?
 There are unsaved changes in = Ungespeicherte Änderungen in
+_Cancel = _Abbrechen
 Close _without saving = Schließen ohne zu speichern
+# The text displayed in a dialog when a file has been externally modified.
 Reload? = Erneut laden?
 Reload modified file? = Geänderte Datei erneut laden?
 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
+# 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
+File Limit Exceeded = Dateilimit erreicht
+_OK = _OK
+
+# [core/keys.lua]
+# The statusbar text shown when the user has pressed a key that is part of a key
+# chain (e.g. "Ctrl+Alt+V" followed by "S"). Textadept is waiting for another
+# keypress.
+Keychain: = Keychain:
+# The statusbar text shown when the user started a key chain, but the next
+# keypress was unrecognized. Thus the key sequence is invalid.
+Invalid sequence = Ungültige Sequenz
 
-# core/gui.lua
+# [core/ui.lua]
+# The name of the buffer Textadept prints messages and error messages to.
 [Message Buffer] = [Nachrichten-Buffer]
-_OK = _OK
-_Cancel = _Abbrechen
+# The column label for lists of buffer names in dialogs.
 Name = Name
-#File = Datei
-#Untitled = Unbenannt
+# The title of the dialog for switching between open buffers.
 Switch Buffers = Wechsle Buffer
-theme not found = -Theme nicht gefunden
+# The line-ending, indentation, and positional buffer information shown in the
+# statusbar.
 CRLF = CRLF
 LF = LF
 Tabs: = Tabs:
 Spaces: = Leerzeichen:
 Line: = Zeile:
 Col: = Spalte:
+# The statusbar text shown when the user resets Textadept's internal Lua state.
+Lua reset = Lua zurückgesetzt
+# The text displayed in a dialog when the user attempts to quit Textadept with
+# unsaved changes in open buffers.
 Quit without saving? = Beenden ohne zu speichern?
 The following buffers are unsaved: = Die folgenden Buffer sind ungespeichert:
 Quit _without saving = Beenden ohne zu speichern
-Lua reset = Lua zurückgesetzt
 
-# core/keys.lua
-Keychain: = Keychain:
-Invalid sequence = Ungültige Sequenz
-
-# modules/textadept/bookmarks.lua
+# [modules/textadept/bookmarks.lua]
+# The text displayed in the dialog for selecting a bookmark to jump to.
 Select Bookmark = Wähle Lesezeichen
 Bookmark = Lesezeichen
 
-# modules/textadept/editing.lua
+# [modules/textadept/editing.lua]
+# The text displayed in the dialog for jumping to a particular line.
 Go To = Gehe zu
 Line Number: = Zeilennummer:
-#_OK = _OK
-#_Cancel = _Abbrechen
 
-# modules/textadept/find.lua
+# [modules/textadept/find.lua]
+# The text displayed in the GUI find & replace pane.
 _Find: = Suchen
 R_eplace: = Ersetzen
 Find _Next = Vorwärts suchen
@@ -78,27 +99,41 @@ _Match case = Groß-/Kleinschreibung berücksichtigen
 _Whole word = Vollständiges Wort
 Rege_x = Rege_x
 _In files = _In Dateien
-Find in Files = In Dateien suchen
-Find: = Suchen:
+# The text displayed in the terminal version's find & replace pane.
+Find: = Find:
+Replace: = Replace:
+[Next] = [Next]
+[Prev] = [Prev]
+[Replace] = [Replace]
+[All] = [All]
+Case(F1) = Case(F1)
+Word(F2) = Word(F2)
+Regex(F3) = Regex(F3)
+Files(F4) = Files(F4)
+# The statusbar text shown when a search has wrapped back to the beginning of
+# the buffer.
+Search wrapped = Suche beginnt von oben
+# 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
+# The name of the buffer Textadept prints "Find in Files" results to.
 [Files Found Buffer] = [Gefundene Dateien-Buffer]
+# The "Find in Files" result for text found in a binary file. This result is
+# shown in place of binary buffer text.
 Binary file matches. = Übereinstimmungen in Binärdatei.
-Search wrapped = Suche beginnt von oben
+# The text displayed in a dialog when the user is prompted to continue a "Find
+# in Files" search that has taken longer than X seconds to complete.
 Continue? = Continue?
 Still searching in files... Continue waiting? = Still searching in files... Continue waiting?
+# The message displayed when a "Find in Files" search is aborted by the user.
 Find in Files aborted = Find in Files aborted
-Error = Fehler
-An error occurred: = Ein Fehler ist aufgetreten:
-#_OK = _OK
-#_Cancel = _Abbrechen
+# The statusbar text shown after performing a "Replace All".
 replacement(s) made = Ersetzung(en) durchgeführt
 
-# modules/textadept/keys.lua
-Lexer = Lexer
-Style = Style
-Error loading webpage: = Fehler beim Laden der Webseite:
-
-# modules/textadept/menu.lua
+# [modules/textadept/menu.lua]
+# Typical "File" menu items for creating new files, opening, saving, and closing
+# existing files, opening and saving sessions, and quitting Textadept.
 _File = _Datei
 _New = _Neu
 _Open = Ö_ffnen
@@ -112,6 +147,7 @@ Close All = Alle schließen
 Loa_d Session... = Session laden...
 Sav_e Session... = Session speichern...
 _Quit = _Beenden
+# Typical "Edit" menu items for manipulating buffer text and source code.
 _Edit = _Bearbeiten
 _Undo = _Rückgängig
 _Redo = _Wiederholen
@@ -128,7 +164,10 @@ _Highlight Word = Wort hervorheben
 Toggle _Block Comment = Kommentar
 T_ranspose Characters = Zeichen vertauschen
 _Join Lines = Linien verbinden
+# The menu item for filtering text through a shell command and replacing input
+# text with that command's output text.
 _Filter Through = Filtern durch
+# Menu items for selecting text and entities.
 _Select = Markieren
 Select to _Matching Brace = Zugehörige Klammern markieren
 Select between _XML Tags = Zwischen XML-Tags markieren
@@ -141,6 +180,7 @@ Select in B_races = In geschweiften Klammern markieren
 Select _Word = Wort markieren
 Select _Line = Zeile markieren
 Select Para_graph = Absatz markieren
+# Menu items for transforming selected text.
 Selectio_n = Markierung
 _Upper Case Selection = Markierung in Großbuchstaben umwandeln
 _Lower Case Selection = Markierung in Kleinbuchstaben umwandeln
@@ -153,53 +193,79 @@ Enclose in _Brackets = In eckigen Klammern
 Enclose in B_races = In geschweiften Klammern
 _Move Selected Lines Up = Markierte Zeilen nach unten verschieben
 Move Selected Lines Do_wn = Markierte Zeilen nach oben verschieben
+# Menu items for searching and replacing text within buffers and files.
 _Search = _Suche
 _Find = _Suchen
-#Find _Next = Vorwärts suchen
 Find _Previous = Rückwärts suchen
-#_Replace = Ersetzen
-#Replace _All = Alle ersetzen
 Find _Incremental = Inkrementelle Suche
 Find in Fi_les = In Dateien suchen
 Goto Nex_t File Found = Zur nächsten gefundenen Datei wechseln
 Goto Previou_s File Found = Zur vorigen gefundenen Datei wechseln
+# Menu item for jumping to a specific line in a buffer.
 _Jump to = _Springe zu
+# Menu items for various tools and utilities for editing and working with source
+# code.
 _Tools = _Tools
+# Menu item for opening Textadept's Lua command entry.
 Command _Entry = Befehlseingabe
+# Menu item for selecting a menu command to run.
 Select Co_mmand = Befehl auswählen
+# Menu items for running or compiling the current source file.
 _Run = Ausführen
 _Compile = Kompilieren
+# Menu item for setting command line arguments for run and compile commands.
 Set _Arguments... = Optionen festlegen...
+# The text displayed in the dialog for specifying command line arguments for run
+# and compile commands.
 Command line arguments = Kommandzeilen-Optionen
 For Run: = Zum Ausführen:
 For Compile: = Zum Kompilieren:
+# Menu item for building the current project.
 Buil_d = Build starten
+# Menu item for stopping a run, compile, or build shell command.
 S_top = Stoppen
+# Menu items for navigating through recognized shell command errors.
 _Next Error = Nächstes Fehler
 _Previous Error = Voriger Fehler
-_Complete Symbol = Symbol vervollständigen
-Show _Documentation = Dokumentation anzeigen
+# Menu items for working with bookmarked lines in buffers.
 _Bookmark = Lesezeichen
 _Toggle Bookmark = Lesezeichen umschalten
 _Clear Bookmarks = Lesezeichen löschen
 _Next Bookmark = Nächstes Lesezeichen
 _Previous Bookmark = Voriges Lesezeichen
 _Goto Bookmark... = Gehe zu Lesezeichen...
+# Menu items for launching a quick open dialog in order to open files in certain
+# directories. A quick open dialog lists all files in a directory and its
+# subdirectories and filters the list down as the user types.
 Quick _Open = Schnelles Öffnen
 Quickly Open _User Home = _Userhome-Verzeichnis
 Quickly Open _Textadept Home = _Textadept-Verzeichnis
 Quickly Open _Current Directory = Aktuelles Verzeichnis
 Quickly Open Current _Project = Aktuelles Projekt
+# Menu items for working with snippets, insert-able pieces of code that act like
+# templates with placeholders for user input.
 _Snippets = _Snippets
 _Insert Snippet... = Snippet auswählen...
 _Expand Snippet/Next Placeholder = _Snippet einfügen/Nächster Platzhalter
 _Previous Snippet Placeholder = Voriger Snippet-Platzhalter
 _Cancel Snippet = Snippet abbrechen
+# Menu items for auto-completing programming language symbols and showing
+# documentation for them (e.g. typing `textadept.editing.` followed by a
+# "Complete Symbol" would show all possible completions for that symbol).
+_Complete Symbol = Symbol vervollständigen
+Show _Documentation = Dokumentation anzeigen
+# Menu item for inspecting the character under the caret. The character's byte
+# information, the lexer used to syntax-highlight that character, and the
+# character's lexical style (e.g. string, comment, number, etc.) are shown.
 Show St_yle = Style anzeigen
+Lexer = Lexer
+Style = Style
+# Menu items for navigating between open buffers.
 _Buffer = _Buffer
 _Next Buffer = Nächster Buffer
 _Previous Buffer = Voriger Buffer
 _Switch to Buffer... = Wechsle zu Buffer...
+# Menu items for changing the indentation settings for the current buffer.
 _Indentation = Einzug
 Tab width: _2 = Tabbreite: _2
 Tab width: _3 = Tabbreite: _3
@@ -207,66 +273,79 @@ Tab width: _4 = Tabbreite: _4
 Tab width: _8 = Tabbreite: _8
 _Toggle Use Tabs = _Tabs verwenden umschalten
 _Convert Indentation = Verwendeten Einzug ändern
+# Menu item for changing the end-of-line mode for the current buffer.
 _EOL Mode = _EOL-Modus
-#CRLF = CRLF
-#LF = LF
+# Menu items for changing the encoding of the current buffer's text.
 E_ncoding = Zeichenkodierung
 _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
+# Menu items for changing the way the current buffer is displayed.
+Toggle View _EOL = _EOL-Ansicht umschalten
+Toggle _Wrap Mode = Umbruchsmodus umschalten
+Toggle View White_space = Leerzeichen ein-/ausblenden
+# Menu items for changing and refreshing the syntax-highlighting language for
+# the current buffer.
 Select _Lexer... = Lexer auswählen...
 _Refresh Syntax Highlighting = Syntax-Highlighting aktualisieren
+# Menu items for navigating between views, splitting them, closing them, and
+# resizing them.
 _View = _View
 _Next View = _Nächste View
 _Previous View = Vorige View
-Split View _Vertical = Split-View _Vertikal
 Split View _Horizontal = Split-View _Horizontal
+Split View _Vertical = Split-View _Vertikal
 _Unsplit View = View schließen
 Unsplit _All Views = Alle Views schließen
 _Grow View = View vergrößern
 Shrin_k View = View verkleinern
+# Menu item for folding (showing/hiding) the block of code the starts on the
+# current line. Fold-able blocks of code are typically classes, functions, and
+# control structures.
 Toggle Current _Fold = Code-Faltung umschalten
-Toggle View _EOL = _EOL-Ansicht umschalten
-Toggle _Wrap Mode = Umbruchsmodus umschalten
+# Menu item for showing line indentation markers.
 Toggle Show In_dent Guides = Einrückungshilfe umschalten
-Toggle View White_space = Leerzeichen ein-/ausblenden
+# Menu item for allowing the caret to move beyond line ends and into "virtual
+# space".
 Toggle _Virtual Space = Virtuelle Leerzeichen umschalten
+# Menu items for changing the zoom factor of displayed buffer text.
 Zoom _In = Zoom vergrößern
 Zoom _Out = Zoom verkleinern
 _Reset Zoom = Zoom zurücksetzen
+# Menu items for getting help on Textadept and its Lua API documentation.
 _Help = _Hilfe
 Show _Manual = Handbuch anzeigen
 Show _LuaDoc = LuaDoc anzeigen
 _About = _Info
+# The error message displayed when activating a menu item associated with an
+# unknown command.
+Unknown command: = Unbekannte Funktion:
+# The text displayed in the dialog for running an arbitrary menu command. Any
+# key binding associated with commands are also shown.
+Run Command = Funktion ausführen
 Command = Funktion
 Key Command = Tastatur-Shortcut
-Run Command = Funktion ausführen
-Unknown command: = Unbekannte Funktion:
 
-# modules/textadept/mime_types.lua
+# [modules/textadept/file_types.lua]
+# The title of the dialog for selecting a lexer for the current buffer. Lexers
+# perform syntax highlighting of source code.
 Select Lexer = Lexer auswählen
-#Name = Name
-
-# modules/textadept/run.lua
-does not exist = nicht gefunden
 
-# modules/textadept/session.lua
+# [modules/textadept/session.lua]
+# The title of the dialog for selecting a session file to load.
+Load Session = Session laden
+# The text displayed in a dialog when files in a loaded session were not found.
 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
+# The title of the dialog for selecting a session file to save.
 Save Session = Session speichern
 
-# modules/textadept/snapopen.lua
-File Limit Exceeded = Dateilimit erreicht
-files or more were found. Showing the first = Dateien oder mehr gefunden. Zeige die ersten
-#_OK = _OK
-#Open = Öffnen
-#File = Datei
-
-# modules/textadept/snippets.lua
+# [modules/textadept/snippets.lua]
+# The text displayed in the dialog for selecting a snippet to insert. Snippets
+# have a trigger word (pressing the "Tab" key after that word inserts the
+# snippet) and snippet text.
 Select Snippet = Snippet auswählen
 Trigger = Trigger
 Snippet Text = Snippet-Text
diff --git a/core/locales/locale.es.conf b/core/locales/locale.es.conf
index 51d17893..83b9c47a 100644
--- a/core/locales/locale.es.conf
+++ b/core/locales/locale.es.conf
@@ -1,73 +1,94 @@
 # Copyright 2007-2016 Mitchell mitchell.att.foicica.com. See LICENSE.
-# Spanish translation by Manuel Montenegro Montes <manuelmont AT gmail.com>
+# Spanish localization file for Textadept by Manuel Montenegro Montes <manuelmont AT gmail.com>.
 #
-# Localization file.
-# The localized strings may contain UTF-8 characters, but not UTF-16 or UTF-32.
-# The latter must be converted manually from the \U+xxxx format. Note that if
-# you use the \ddd representation of characters, it must be in DECIMAL format,
-# not Octal.
+# When translating this file into your native language, all translated text must
+# be encoded in UTF-8. For each "key = value" line, please replace the "value"
+# part with the translation of "key". Any whitespace around '=' is ignored.
 #
-# Each line contains a "message = localized string" pair. The message should not
-# be localized. Extra spaces around '=' are ignored.
-#
-# Notes:
-#   - Buttons and menu items have a "_" character as a mnemonic (for
-#     Alt+character) access. You can put the "_" anywhere applicable in your
-#     localized version or eliminate it altogether.
+# Note: for languages that support it, buttons and menu items may have a "_"
+# before any single letter, which means that pressing the "Alt" modifier key
+# along with that letter will activate (click) the button or menu item. You are
+# free to use or omit these "_" mnemonics from your translations as you see fit.
 
-# core/events.lua
+# [core/events.lua]
+# This error message is displayed if the user accidentally emits an event with
+# no name (e.g. mistypes the name of an existing event).
 Undefined event name = Nombre de evento sin definir
 
-# core/file_io.lua
+# [core/file_io.lua]
+# The title of dialogs prompting the user to open a file.
 Open = 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
+# 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
+# unsaved changes.
 Close without saving? = ¿Cerrar sin guardar?
 There are unsaved changes in = Hay cambios sin guardar en
+_Cancel = _Cancelar
 Close _without saving = Cerrar _sin guardar
+# The text displayed in a dialog when a file has been externally modified.
 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
+# The column label for lists of filenames in dialogs.
 File = 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
+File Limit Exceeded = Límite de ficheros excedido
+_OK = _Aceptar
+
+# [core/keys.lua]
+# The statusbar text shown when the user has pressed a key that is part of a key
+# chain (e.g. "Ctrl+Alt+V" followed by "S"). Textadept is waiting for another
+# keypress.
+Keychain: = Combinación de teclas:
+# The statusbar text shown when the user started a key chain, but the next
+# keypress was unrecognized. Thus the key sequence is invalid.
+Invalid sequence = Combinación de teclas no válida
 
-# core/gui.lua
+# [core/ui.lua]
+# The name of the buffer Textadept prints messages and error messages to.
 [Message Buffer] = [Buffer de mensajes]
-_OK = _Aceptar
-_Cancel = _Cancelar
+# The column label for lists of buffer names in dialogs.
 Name = Nombre
-#File = File
-#Untitled = Sin Nombre
+# The title of the dialog for switching between open buffers.
 Switch Buffers = Cambiar Buffer
-theme not found. = tema no encontrado.
+# The line-ending, indentation, and positional buffer information shown in the
+# statusbar.
 CRLF = CRLF
 LF = LF
 Tabs: = Tabuladores:
 Spaces: = Espacios:
 Line: = Línea:
 Col: = Col:
+# The statusbar text shown when the user resets Textadept's internal Lua state.
+Lua reset = Lua reiniciado
+# The text displayed in a dialog when the user attempts to quit Textadept with
+# unsaved changes in open buffers.
 Quit without saving? = ¿Salir sin guardar?
 The following buffers are unsaved: = Los siguientes buffers no han sido guardados:
 Quit _without saving = Salir _sin guardar
-Lua reset = Lua reiniciado
-
-# core/keys.lua
-Keychain: = Combinación de teclas:
-Invalid sequence = Combinación de teclas no válida
 
-# modules/textadept/bookmarks.lua
+# [modules/textadept/bookmarks.lua]
+# The text displayed in the dialog for selecting a bookmark to jump to.
 Select Bookmark = Seleccionar marcador
 Bookmark = Marcador
 
-# modules/textadept/editing.lua
+# [modules/textadept/editing.lua]
+# The text displayed in the dialog for jumping to a particular line.
 Go To = Ir a
 Line Number: = Número de línea:
-#_OK = _Aceptar
-#_Cancel = _Cancelar
 
-# modules/textadept/find.lua
+# [modules/textadept/find.lua]
+# The text displayed in the GUI find & replace pane.
 _Find: = _Buscar:
 R_eplace: = Reempla_zar:
 Find _Next = Buscar _siguiente
@@ -78,22 +99,8 @@ _Match case = Concid. _mayús/minús
 _Whole word = Palabra _completa
 Rege_x = Rege_x
 _In files = En ficher_os
-Find in Files = Buscar en ficheros
+# The text displayed in the terminal version's find & replace pane.
 Find: = Buscar:
-No results found = No se han encontrado coincidencias
-[Files Found Buffer] = [Buffer de búsqueda en ficheros]
-Binary file matches. = Coincidencia en fichero binario.
-Search wrapped = La búsqueda ha sobrepasado el final/inicio del documento
-Continue? = Continue?
-Still searching in files... Continue waiting? = Still searching in files... Continue waiting?
-Find in Files aborted = Find in Files aborted
-Error = Error
-An error occurred: = Ha ocurrido un error:
-#_OK = _Aceptar
-#_Cancel = _Cancelar
-replacement(s) made = cambios(s) hecho(s)
-# For curses:
-#Find: = Buscar:
 Replace: = Reemplazar:
 [Next] = [Siguiente]
 [Prev] = [Anterior]
@@ -103,13 +110,30 @@ Case(F1) = Concid.(F1)
 Word(F2) = Palabra(F2)
 Regex(F3) = Regex(F3)
 Files(F4) = Ficheros(F4)
+# The statusbar text shown when a search has wrapped back to the beginning of
+# the buffer.
+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
+# 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
+# shown in place of binary buffer text.
+Binary file matches. = Coincidencia en fichero binario.
+# The text displayed in a dialog when the user is prompted to continue a "Find
+# in Files" search that has taken longer than X seconds to complete.
+Continue? = Continue?
+Still searching in files... Continue waiting? = Still searching in files... Continue waiting?
+# The message displayed when a "Find in Files" search is aborted by the user.
+Find in Files aborted = Find in Files aborted
+# The statusbar text shown after performing a "Replace All".
+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
+# [modules/textadept/menu.lua]
+# Typical "File" menu items for creating new files, opening, saving, and closing
+# existing files, opening and saving sessions, and quitting Textadept.
 _File = _Archivo
 _New = _Nuevo
 _Open = _Abrir
@@ -123,6 +147,7 @@ Close All = Cerrar _todo
 Loa_d Session... = Cargar s_esión...
 Sav_e Session... = G_uardar sesión...
 _Quit = _Salir
+# Typical "Edit" menu items for manipulating buffer text and source code.
 _Edit = _Editar
 _Undo = _Deshacer
 _Redo = _Rehacer
@@ -139,7 +164,10 @@ _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
+# The menu item for filtering text through a shell command and replacing input
+# text with that command's output text.
 _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 _XML Tags = Seleccionar _entre etiquetas XML
@@ -152,6 +180,7 @@ Select in B_races = Seleccionar entre _llaves
 Select _Word = Seleccionar pala_bra
 Select _Line = Seleccionar l_ínea
 Select Para_graph = Seleccionar párra_fo
+# Menu items for transforming selected text.
 Selectio_n = Sele_cción
 _Upper Case Selection = _Selección a mayúsculas
 _Lower Case Selection = S_eleccion a minúsculas
@@ -164,53 +193,79 @@ Enclose in _Brackets = Delimi_tar por corchetes
 Enclose in B_races = Delimit_ar por llaves
 _Move Selected Lines Up = Mover lí_neas seleccionadas arriba
 Move Selected Lines Do_wn = Mo_ver líneas seleccionadas abajo
+# Menu items for searching and replacing text within buffers and files.
 _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
+# Menu item for jumping to a specific line in a buffer.
 _Jump to = _Ir a
+# Menu items for various tools and utilities for editing and working with source
+# code.
 _Tools = _Herramientas
+# Menu item for opening Textadept's Lua command entry.
 Command _Entry = _Línea de comandos
+# Menu item for selecting a menu command to run.
 Select Co_mmand = _Seleccionar comandos
+# Menu items for running or compiling the current source file.
 _Run = _Ejecutar
 _Compile = _Compilar
+# Menu item for setting command line arguments for run and compile commands.
 Set _Arguments... = C_ambiar argumentos...
+# The text displayed in the dialog for specifying command line arguments for run
+# and compile commands.
 Command line arguments = Argumentos de línea de comandos
 For Run: = Al ejecutar:
 For Compile: = Al compilar:
+# Menu item for building the current project.
 Buil_d = Co_nstruir
+# Menu item for stopping a run, compile, or build shell command.
 S_top = _Detener
+# Menu items for navigating through recognized shell command errors.
 _Next Error = Error sig_uiente
 _Previous Error = Error _anterior
-_Complete Symbol = _Completar símbolo
-Show _Documentation = _Mostrar documentación
+# Menu items for working with bookmarked lines in buffers.
 _Bookmark = _Marcadores
 _Toggle Bookmark = Activar/Desactivar _marcador
 _Clear Bookmarks = _Borrar marcadores
 _Next Bookmark = Marcador _siguiente
 _Previous Bookmark = Marcador _anterior
 _Goto Bookmark... = _Ir a marcador...
+# Menu items for launching a quick open dialog in order to open files in certain
+# directories. A quick open dialog lists all files in a directory and its
+# subdirectories and filters the list down as the user types.
 Quick _Open = A_pertura rápida
 Quickly Open _User Home = Apertura rápida en directorio de _usuario
 Quickly Open _Textadept Home = Apertura rápida en directorio de _Textadept
 Quickly Open _Current Directory = Apertura rápida en directorio _actual
 Quickly Open Current _Project = Apertura rápida en _proyecto actual
+# Menu items for working with snippets, insert-able pieces of code that act like
+# templates with placeholders for user input.
 _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
+# Menu items for auto-completing programming language symbols and showing
+# documentation for them (e.g. typing `textadept.editing.` followed by a
+# "Complete Symbol" would show all possible completions for that symbol).
+_Complete Symbol = _Completar símbolo
+Show _Documentation = _Mostrar documentación
+# Menu item for inspecting the character under the caret. The character's byte
+# information, the lexer used to syntax-highlight that character, and the
+# character's lexical style (e.g. string, comment, number, etc.) are shown.
 Show St_yle = Mos_trar estilo
+Lexer = Analizador léxico
+Style = Estilo
+# Menu items for navigating between open buffers.
 _Buffer = Bu_ffer
 _Next Buffer = Buffer _siguiente
 _Previous Buffer = Buffer _anterior
 _Switch to Buffer... = _Cambiar de Buffer...
+# Menu items for changing the indentation settings for the current buffer.
 _Indentation = _Indentación
 Tab width: _2 = Ancho de tabulación: _2
 Tab width: _3 = Ancho de tabulación: _3
@@ -218,17 +273,25 @@ 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
+# Menu item for changing the end-of-line mode for the current buffer.
 _EOL Mode = Ca_rácter fin de línea
-#CRLF = _CRLF
-#LF = _LF
+# Menu items for changing the encoding of the current buffer's text.
 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
+# Menu items for changing the way the current buffer is displayed.
+Toggle View _EOL = _Mostrar/Ocultar fin de línea
+Toggle _Wrap Mode = _Activar/Desactivar ajuste de línea
+Toggle View White_space = M_ostrar/Ocultar espacios en blanco
+# Menu items for changing and refreshing the syntax-highlighting language for
+# the current buffer.
 Select _Lexer... = S_eleccionar analizador léxico
 _Refresh Syntax Highlighting = Ac_tualizar resaltado de sintaxis
+# Menu items for navigating between views, splitting them, closing them, and
+# resizing them.
 _View = _Ver
 _Next View = Vista _siguiente
 _Previous View = Vista _anterior
@@ -238,46 +301,51 @@ _Unsplit View = _Cerrar vista
 Unsplit _All Views = Cerrar _todas las vistas
 _Grow View = E_xpandir vista
 Shrin_k View = Enco_ger vista
+# Menu item for folding (showing/hiding) the block of code the starts on the
+# current line. Fold-able blocks of code are typically classes, functions, and
+# control structures.
 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
+# Menu item for showing line indentation markers.
 Toggle Show In_dent Guides = Act_ivar/Desactivar guias de indentación
-Toggle View White_space = M_ostrar/Ocultar espacios en blanco
+# Menu item for allowing the caret to move beyond line ends and into "virtual
+# space".
 Toggle _Virtual Space = Activa_r/Desactivar modo espacio virtual
+# Menu items for changing the zoom factor of displayed buffer text.
 Zoom _In = _Zoom: Acercar
 Zoom _Out = Zoom: Ale_jar
 _Reset Zoom = Zoom: R_estaurar
+# Menu items for getting help on Textadept and its Lua API documentation.
 _Help = A_yuda
 Show _Manual = Mostrar _manual
 Show _LuaDoc = Mostrar _LuaDoc
 _About = Acerca _de
+# The error message displayed when activating a menu item associated with an
+# unknown command.
+Unknown command: = Comando desconocido:
+# The text displayed in the dialog for running an arbitrary menu command. Any
+# key binding associated with commands are also shown.
+Run Command = Ejecutar comando
 Command = Comando
 Key Command = Teclas de comando
-Run Command = Ejecutar comando
-Unknown command: = Comando desconocido:
 
-# modules/textadept/mime_types.lua
+# [modules/textadept/file_types.lua]
+# The title of the dialog for selecting a lexer for the current buffer. Lexers
+# perform syntax highlighting of source code.
 Select Lexer = Seleccionar analizador léxico
-#Name = Nombre
-
-# modules/textadept/run.lua
-does not exist = no existe
 
-# modules/textadept/session.lua
+# [modules/textadept/session.lua]
+# The title of the dialog for selecting a session file to load.
+Load Session = Cargar sesión
+# The text displayed in a dialog when files in a loaded session were not found.
 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
+# The title of the dialog for selecting a session file to save.
 Save Session = Guardar sesión
 
-# 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
-#_OK = _Aceptar
-#Open = Abrir
-#File = Archivo
-
-# modules/textadept/snippets.lua
+# [modules/textadept/snippets.lua]
+# The text displayed in the dialog for selecting a snippet to insert. Snippets
+# have a trigger word (pressing the "Tab" key after that word inserts the
+# snippet) and snippet text.
 Select Snippet = Seleccionar fragmento
 Trigger = Disparador
 Snippet Text = Texto del fragmento
diff --git a/core/locales/locale.fr.conf b/core/locales/locale.fr.conf
index d08c934c..3e629ffc 100644
--- a/core/locales/locale.fr.conf
+++ b/core/locales/locale.fr.conf
@@ -1,74 +1,95 @@
 # Copyright 2007-2016 Mitchell mitchell.att.foicica.com. See LICENSE.
-# French translation by Gilles Grégoire <gilles.gregoire+ta AT gmail .com>
-# revised by Giovanni Salmeri <g.salmeri AT mondodomani.org>
+# French localization file for Textadept by Gilles Grégoire <gilles.gregoire+ta AT gmail .com>
+# and revised by Giovanni Salmeri <g.salmeri AT mondodomani.org>.
 #
-# Localization file.
-# The localized strings may contain UTF-8 characters, but not UTF-16 or UTF-32.
-# The latter must be converted manually from the \U+xxxx format. Note that if
-# you use the \ddd representation of characters, it must be in DECIMAL format,
-# not Octal.
+# When translating this file into your native language, all translated text must
+# be encoded in UTF-8. For each "key = value" line, please replace the "value"
+# part with the translation of "key". Any whitespace around '=' is ignored.
 #
-# Each line contains a "message = localized string" pair. The message should not
-# be localized. Extra spaces around '=' are ignored.
-#
-# Notes:
-#   - Buttons and menu items have a "_" character as a mnemonic (for
-#     Alt+character) access. You can put the "_" anywhere applicable in your
-#     localized version or eliminate it altogether.
+# Note: for languages that support it, buttons and menu items may have a "_"
+# before any single letter, which means that pressing the "Alt" modifier key
+# along with that letter will activate (click) the button or menu item. You are
+# free to use or omit these "_" mnemonics from your translations as you see fit.
 
-# core/events.lua
+# [core/events.lua]
+# This error message is displayed if the user accidentally emits an event with
+# no name (e.g. mistypes the name of an existing event).
 Undefined event name = Nom d’évènement inconnu
 
-# core/file_io.lua
+# [core/file_io.lua]
+# The title of dialogs prompting the user to open a file.
 Open = 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
+# 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
+# unsaved changes.
 Close without saving? = Fermer sans enregistrer?
 There are unsaved changes in = Il y a des modifications non sauvegardées dans
+_Cancel = _Annuler
 Close _without saving = Fermer _sans enregistrer
+# The text displayed in a dialog when a file has been externally modified.
 Reload? = Recharger?
 Reload modified file? = Recharger le fichier modifié?
 has been modified. Reload it? = a été modifié. Recharger?
 _Yes = _Oui
 _No = _Non
+# The column label for lists of filenames in dialogs.
 File = 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
+File Limit Exceeded = Limite de fichiers dépassée
+_OK = _OK
+
+# [core/keys.lua]
+# The statusbar text shown when the user has pressed a key that is part of a key
+# chain (e.g. "Ctrl+Alt+V" followed by "S"). Textadept is waiting for another
+# keypress.
+Keychain: = Chaîne de charactères:
+# The statusbar text shown when the user started a key chain, but the next
+# keypress was unrecognized. Thus the key sequence is invalid.
+Invalid sequence = Séquence non valide
 
-# core/gui.lua
+# [core/ui.lua]
+# The name of the buffer Textadept prints messages and error messages to.
 [Message Buffer] = [Onglet des messages]
-_OK = _OK
-_Cancel = _Annuler
+# The column label for lists of buffer names in dialogs.
 Name = Nom
-#File = Fichier
-#Untitled = Sans titre
+# The title of the dialog for switching between open buffers.
 Switch Buffers = Changer d’onglet
-theme not found. = thème non trouvé.
+# The line-ending, indentation, and positional buffer information shown in the
+# statusbar.
 CRLF = CRLF (Windows)
 LF = LF (Unix)
 Tabs: = Tabulations:
 Spaces: = Espaces:
 Line: = Ligne:
 Col: = Colonne:
+# The statusbar text shown when the user resets Textadept's internal Lua state.
+Lua reset = Réinitialisation de Lua
+# The text displayed in a dialog when the user attempts to quit Textadept with
+# unsaved changes in open buffers.
 Quit without saving? = Quitter sans enregistrer?
 The following buffers are unsaved: = Les onglets suivants ne sont pas sauvegardés:
 Quit _without saving = Quitter _sans enregistrer
-Lua reset = Réinitialisation de Lua
-
-# core/keys.lua
-Keychain: = Chaîne de charactères:
-Invalid sequence = Séquence non valide
 
-# modules/textadept/bookmarks.lua
+# [modules/textadept/bookmarks.lua]
+# The text displayed in the dialog for selecting a bookmark to jump to.
 Select Bookmark = Choisir le signet
 Bookmark = Signet
 
-# modules/textadept/editing.lua
+# [modules/textadept/editing.lua]
+# The text displayed in the dialog for jumping to a particular line.
 Go To = Aller à
 Line Number: = Numéro de ligne:
-#_OK = _OK
-#_Cancel = _Annuler
 
-# modules/textadept/find.lua
+# [modules/textadept/find.lua]
+# The text displayed in the GUI find & replace pane.
 _Find: = _Rechercher:
 R_eplace: = Remplacer p_ar:
 Find _Next = Rechercher le _suivant
@@ -79,22 +100,8 @@ _Match case = Respecter la _casse
 _Whole word = _Mot entier
 Rege_x = Rege_x
 _In files = Dans les f_ichiers
-Find in Files = Rechercher dans les fichiers
+# The text displayed in the terminal version's find & replace pane.
 Find: = Rechercher:
-No results found = Aucun résultat trouvé
-[Files Found Buffer] = [Onglet des fichiers trouvés]
-Binary file matches. = Correspondances dans un fichier binaire
-Search wrapped = La recherche a recommencé
-Continue? = Continue?
-Still searching in files... Continue waiting? = Still searching in files... Continue waiting?
-Find in Files aborted = Find in Files aborted
-Error = Erreur
-An error occurred: = Une erreur est survenue:
-#_OK = _OK
-#_Cancel = _Annuler
-replacement(s) made = remplacement(s) effectué(s)
-# For curses:
-#Find: = Rechercher:
 Replace: = Remplacer:
 [Next] = [Suivant]
 [Prev] = [Précédent]
@@ -104,13 +111,30 @@ Case(F1) = Casse(F1)
 Word(F2) = Mot entier(F2)
 Regex(F3) = Regex(F3)
 Files(F4) = Fichiers(F4)
+# The statusbar text shown when a search has wrapped back to the beginning of
+# the buffer.
+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
+# 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
+# shown in place of binary buffer text.
+Binary file matches. = Correspondances dans un fichier binaire
+# The text displayed in a dialog when the user is prompted to continue a "Find
+# in Files" search that has taken longer than X seconds to complete.
+Continue? = Continue?
+Still searching in files... Continue waiting? = Still searching in files... Continue waiting?
+# The message displayed when a "Find in Files" search is aborted by the user.
+Find in Files aborted = Find in Files aborted
+# The statusbar text shown after performing a "Replace All".
+replacement(s) made = remplacement(s) effectué(s)
 
-# modules/textadept/keys.lua
-Lexer = Langage
-Style = Style
-Error loading webpage: = Erreur lors du chargement de la page:
-
-# modules/textadept/menu.lua
+# [modules/textadept/menu.lua]
+# Typical "File" menu items for creating new files, opening, saving, and closing
+# existing files, opening and saving sessions, and quitting Textadept.
 _File = _Fichier
 _New = _Nouveau
 _Open = _Ouvrir
@@ -124,6 +148,7 @@ Close All = To_ut fermer
 Loa_d Session... = Ch_arger une session...
 Sav_e Session... = Enre_gistrer la session...
 _Quit = _Quitter
+# Typical "Edit" menu items for manipulating buffer text and source code.
 _Edit = É_dition
 _Undo = Ann_uler
 _Redo = _Restaurer
@@ -140,7 +165,10 @@ _Highlight Word = Sur_ligner le mot
 Toggle _Block Comment = Commenter/_Décommenter
 T_ranspose Characters = In_verser deux caractères
 _Join Lines = _Joindre les lignes
+# The menu item for filtering text through a shell command and replacing input
+# text with that command's output text.
 _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 _XML Tags = Sélectionner entre les balises _XML
@@ -153,6 +181,7 @@ 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
+# Menu items for transforming selected text.
 Selectio_n = Sélectio_n
 _Upper Case Selection = Mettre en _capitales
 _Lower Case Selection = Mettre en _minuscules
@@ -165,53 +194,79 @@ Enclose in _Brackets = Entre c_rochets
 Enclose in B_races = Entre _accolades
 _Move Selected Lines Up = Déplacer les lignes vers le _haut
 Move Selected Lines Do_wn = Déplacer les lignes vers le _bas
+# Menu items for searching and replacing text within buffers and files.
 _Search = _Recherche
 _Find = _Rechercher
-#Find _Next = Rechercher le _suivant
 Find _Previous = Rechercher le _précédent
-#_Replace = Rem_placer
-#Replace _All = _Tout remplacer
 Find _Incremental = Rechercher _incrémentalement
 Find in Fi_les = Chercher dans les _fichiers
 Goto Nex_t File Found = Fichier trouvé s_uivant
 Goto Previou_s File Found = Fichier trouvé pré_cédent
+# Menu item for jumping to a specific line in a buffer.
 _Jump to = _Aller à...
+# Menu items for various tools and utilities for editing and working with source
+# code.
 _Tools = _Outils
+# Menu item for opening Textadept's Lua command entry.
 Command _Entry = L_igne de commande
+# Menu item for selecting a menu command to run.
 Select Co_mmand = Choisir la co_mmande...
+# Menu items for running or compiling the current source file.
 _Run = _Lancer
 _Compile = _Compiler
+# Menu item for setting command line arguments for run and compile commands.
 Set _Arguments... = Définir les _arguments...
+# The text displayed in the dialog for specifying command line arguments for run
+# and compile commands.
 Command line arguments = Arguments de la ligne de commande
 For Run: = Pour lancer:
 For Compile: = Por compiler:
+# Menu item for building the current project.
 Buil_d = C_onstruire
+# Menu item for stopping a run, compile, or build shell command.
 S_top = _Arrêter
+# Menu items for navigating through recognized shell command errors.
 _Next Error = Erreur _suivante
 _Previous Error = Erreur _précédente
-_Complete Symbol = Complé_ter le symbole
-Show _Documentation = Montrer la _documentation
+# Menu items for working with bookmarked lines in buffers.
 _Bookmark = Si_gnet
 _Toggle Bookmark = Commuter le _signet
 _Clear Bookmarks = _Supprimer les signets
 _Next Bookmark = Signet _suivant
 _Previous Bookmark = Signet _précédent
 _Goto Bookmark... = _Aller au signet...
+# Menu items for launching a quick open dialog in order to open files in certain
+# directories. A quick open dialog lists all files in a directory and its
+# subdirectories and filters the list down as the user types.
 Quick _Open = Ouverture _rapide
 Quickly Open _User Home = Dossier _personnel
 Quickly Open _Textadept Home = Dossier de _Textadept
 Quickly Open _Current Directory = Dossier _courant
 Quickly Open Current _Project = _Projet courant
+# Menu items for working with snippets, insert-able pieces of code that act like
+# templates with placeholders for user input.
 _Snippets = _Fragments
 _Insert Snippet... = _Insérer le fragment...
 _Expand Snippet/Next Placeholder = _Étendre le fragment/Espace réservé suivant
 _Previous Snippet Placeholder = Espace réservé _précédent
 _Cancel Snippet = _Annuler le fragment
+# Menu items for auto-completing programming language symbols and showing
+# documentation for them (e.g. typing `textadept.editing.` followed by a
+# "Complete Symbol" would show all possible completions for that symbol).
+_Complete Symbol = Complé_ter le symbole
+Show _Documentation = Montrer la _documentation
+# Menu item for inspecting the character under the caret. The character's byte
+# information, the lexer used to syntax-highlight that character, and the
+# character's lexical style (e.g. string, comment, number, etc.) are shown.
 Show St_yle = Montrer le st_yle
+Lexer = Langage
+Style = Style
+# Menu items for navigating between open buffers.
 _Buffer = O_nglet
 _Next Buffer = Onglet _suivant
 _Previous Buffer = Onglet _précédent
 _Switch to Buffer... = _Changer d’onglet...
+# Menu items for changing the indentation settings for the current buffer.
 _Indentation = _Indentation
 Tab width: _2 = Largeur de la tabulation: _2
 Tab width: _3 = Largeur de la tabulation: _3
@@ -219,17 +274,25 @@ Tab width: _4 = Largeur de la tabulation: _4
 Tab width: _8 = Largeur de la tabulation: _8
 _Toggle Use Tabs = _Commuter l’utilisation des tabulations
 _Convert Indentation = _Convertir l’indentation
+# Menu item for changing the end-of-line mode for the current buffer.
 _EOL Mode = _Fin de ligne
-#CRLF = CRLF
-#LF = LF
+# Menu items for changing the encoding of the current buffer's text.
 E_ncoding = E_ncodage
 _UTF-8 Encoding = Encodage _UTF-8
 _ASCII Encoding = Encodage _ASCII
 _ISO-8859-1 Encoding = Encodage _ISO-8859-1
 _MacRoman Encoding = Encodage _MacRoman
 UTF-1_6 Encoding = Encodage UTF-1_6
+# Menu items for changing the way the current buffer is displayed.
+Toggle View _EOL = Commuter l’affichage des fin de _ligne
+Toggle _Wrap Mode = Commuter le _retour à la ligne automatique
+Toggle View White_space = Commuter l’affichage des _espaces
+# Menu items for changing and refreshing the syntax-highlighting language for
+# the current buffer.
 Select _Lexer... = Choisir le l_angage...
 _Refresh Syntax Highlighting = Rafraîchir la coloration s_yntaxique
+# Menu items for navigating between views, splitting them, closing them, and
+# resizing them.
 _View = _Vue
 _Next View = Vue _suivante
 _Previous View = Vue _précédente
@@ -239,46 +302,51 @@ _Unsplit View = _Unir les vues
 Unsplit _All Views = Unir _toutes les vues
 _Grow View = _Agrandir la vue
 Shrin_k View = _Réduire la vue
+# Menu item for folding (showing/hiding) the block of code the starts on the
+# current line. Fold-able blocks of code are typically classes, functions, and
+# control structures.
 Toggle Current _Fold = Commuter le p_liage courant
-Toggle View _EOL = Commuter l’affichage des fin de _ligne
-Toggle _Wrap Mode = Commuter le _retour à la ligne automatique
+# Menu item for showing line indentation markers.
 Toggle Show In_dent Guides = Commuter l’affichage des _guides d’indentation
-Toggle View White_space = Commuter l’affichage des _espaces
+# Menu item for allowing the caret to move beyond line ends and into "virtual
+# space".
 Toggle _Virtual Space = Commuter l’_espace virtuel
+# Menu items for changing the zoom factor of displayed buffer text.
 Zoom _In = _Zoomer
 Zoom _Out = _Dézoomer
 _Reset Zoom = Ré_initialiser le zoom
+# Menu items for getting help on Textadept and its Lua API documentation.
 _Help = Aid_e
 Show _Manual = Voir _manuel
 Show _LuaDoc = Voir la documentation sur l’_API
 _About = À _propos
+# The error message displayed when activating a menu item associated with an
+# unknown command.
+Unknown command: = Commande inconnue:
+# The text displayed in the dialog for running an arbitrary menu command. Any
+# key binding associated with commands are also shown.
+Run Command = Lancer une commande
 Command = Commande
 Key Command = Raccourci
-Run Command = Lancer une commande
-Unknown command: = Commande inconnue:
 
-# modules/textadept/mime_types.lua
+# [modules/textadept/file_types.lua]
+# The title of the dialog for selecting a lexer for the current buffer. Lexers
+# perform syntax highlighting of source code.
 Select Lexer = Choisir le langage
-#Name = Nom
-
-# modules/textadept/run.lua
-does not exist = n’existe pas
 
-# modules/textadept/session.lua
+# [modules/textadept/session.lua]
+# The title of the dialog for selecting a session file to load.
+Load Session = Charger une session
+# The text displayed in a dialog when files in a loaded session were not found.
 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 une session
+# The title of the dialog for selecting a session file to save.
 Save Session = Enregistrer la session
 
-# modules/textadept/snapopen.lua
-File Limit Exceeded = Limite de fichiers dépassée
-files or more were found. Showing the first = fichiers ou plus trouvés. Affichage des premiers
-#_OK = _OK
-#Open = Ouvrir
-#File = Fichier
-
-# modules/textadept/snippets.lua
+# [modules/textadept/snippets.lua]
+# The text displayed in the dialog for selecting a snippet to insert. Snippets
+# have a trigger word (pressing the "Tab" key after that word inserts the
+# snippet) and snippet text.
 Select Snippet = Choisir le fragment
 Trigger = Déclencheur
 Snippet Text = Texte du fragment
diff --git a/core/locales/locale.it.conf b/core/locales/locale.it.conf
index 192caf63..f5981433 100644
--- a/core/locales/locale.it.conf
+++ b/core/locales/locale.it.conf
@@ -1,73 +1,94 @@
 # Copyright 2007-2016 Mitchell mitchell.att.foicica.com. See LICENSE.
-# Italian translation by Giovanni Salmeri <g.salmeri AT mondodomani.org>
+# Italian localization file for Textadept by Giovanni Salmeri <g.salmeri AT mondodomani.org>.
 #
-# Localization file.
-# The localized strings may contain UTF-8 characters, but not UTF-16 or UTF-32.
-# The latter must be converted manually from the \U+xxxx format. Note that if
-# you use the \ddd representation of characters, it must be in DECIMAL format,
-# not Octal.
+# When translating this file into your native language, all translated text must
+# be encoded in UTF-8. For each "key = value" line, please replace the "value"
+# part with the translation of "key". Any whitespace around '=' is ignored.
 #
-# Each line contains a "message = localized string" pair. The message should not
-# be localized. Extra spaces around '=' are ignored.
-#
-# Notes:
-#   - Buttons and menu items have a "_" character as a mnemonic (for
-#     Alt+character) access. You can put the "_" anywhere applicable in your
-#     localized version or eliminate it altogether.
+# Note: for languages that support it, buttons and menu items may have a "_"
+# before any single letter, which means that pressing the "Alt" modifier key
+# along with that letter will activate (click) the button or menu item. You are
+# free to use or omit these "_" mnemonics from your translations as you see fit.
 
-# core/events.lua
+# [core/events.lua]
+# This error message is displayed if the user accidentally emits an event with
+# no name (e.g. mistypes the name of an existing event).
 Undefined event name = Nome di evento indefinito
 
-# core/file_io.lua
+# [core/file_io.lua]
+# The title of dialogs prompting the user to open a file.
 Open = 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
+# 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
+# unsaved changes.
 Close without saving? = Chiudere senza salvare?
 There are unsaved changes in = Ci sono modifiche non salvate in
+_Cancel = _Annulla
 Close _without saving = Chiudi _senza salvare
+# The text displayed in a dialog when a file has been externally modified.
 Reload? = Ricaricare?
 Reload modified file? = Ricaricare il file modificato?
 has been modified. Reload it? = è stato modificato. Ricaricare?
 _Yes = _Sì
 _No = _No
+# The column label for lists of filenames in dialogs.
 File = 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
+File Limit Exceeded = Limite dei file superato
+_OK = _OK
+
+# [core/keys.lua]
+# The statusbar text shown when the user has pressed a key that is part of a key
+# chain (e.g. "Ctrl+Alt+V" followed by "S"). Textadept is waiting for another
+# keypress.
+Keychain: = Combinazione di tasti:
+# The statusbar text shown when the user started a key chain, but the next
+# keypress was unrecognized. Thus the key sequence is invalid.
+Invalid sequence = Sequenza non valida
 
-# core/gui.lua
+# [core/ui.lua]
+# The name of the buffer Textadept prints messages and error messages to.
 [Message Buffer] = [Scheda dei messaggi]
-_OK = _OK
-_Cancel = _Annulla
+# The column label for lists of buffer names in dialogs.
 Name = Nome
-#File = File
-#Untitled = Senza titolo
+# The title of the dialog for switching between open buffers.
 Switch Buffers = Vai alla scheda
-theme not found. = tema non trovato.
+# The line-ending, indentation, and positional buffer information shown in the
+# statusbar.
 CRLF = CRLF (Windows)
 LF = LF (Unix)
 Tabs: = Tabulazioni:
 Spaces: = Spazi:
 Line: = Linea:
 Col: = Colonna:
+# The statusbar text shown when the user resets Textadept's internal Lua state.
+Lua reset = Lua reimpostato
+# The text displayed in a dialog when the user attempts to quit Textadept with
+# unsaved changes in open buffers.
 Quit without saving? = Uscire senza salvare?
 The following buffers are unsaved: = Le seguenti schede non sono salvate:
 Quit _without saving = Esci _senza salvare
-Lua reset = Lua reimpostato
-
-# core/keys.lua
-Keychain: = Combinazione di tasti:
-Invalid sequence = Sequenza non valida
 
-# modules/textadept/bookmarks.lua
+# [modules/textadept/bookmarks.lua]
+# The text displayed in the dialog for selecting a bookmark to jump to.
 Select Bookmark = Scegli un segnalibro
 Bookmark = Segnalibro
 
-# modules/textadept/editing.lua
+# [modules/textadept/editing.lua]
+# The text displayed in the dialog for jumping to a particular line.
 Go To = Vai a
 Line Number: = Numero di linea:
-#_OK = _OK
-#_Cancel = _Annulla
 
-# modules/textadept/find.lua
+# [modules/textadept/find.lua]
+# The text displayed in the GUI find & replace pane.
 _Find: = _Cerca:
 R_eplace: = Sost_ituisci con:
 Find _Next = Cerca il _seguente
@@ -78,22 +99,8 @@ _Match case = Distin_gui min./maiusc.
 _Whole word = Paro_la intera
 Rege_x = Rege_x
 _In files = I_n più file
-Find in Files = Trova nei file
+# The text displayed in the terminal version's find & replace pane.
 Find: = Cerca:
-No results found = Nessun risultato trovato
-[Files Found Buffer] = [Scheda dei file trovati]
-Binary file matches. = Corrispondenze in un file binario.
-Search wrapped = La ricerca è ricominciata
-Continue? = Continue?
-Still searching in files... Continue waiting? = Still searching in files... Continue waiting?
-Find in Files aborted = Find in Files aborted
-Error = Errore
-An error occurred: = È avvenuto un errore:
-#_OK = _OK
-#_Cancel = _Annulla
-replacement(s) made = sostituzione/i fatta/e
-# For curses:
-#Find: = Cerca:
 Replace: = Sostituisci:
 [Next] = [Seguente]
 [Prev] = [Precedente]
@@ -103,13 +110,30 @@ Case(F1) = Min./maiusc.(F1)
 Word(F2) = Parola intera(F2)
 Regex(F3) = Regex(F3)
 Files(F4) = File(F4)
+# The statusbar text shown when a search has wrapped back to the beginning of
+# the buffer.
+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
+# 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
+# shown in place of binary buffer text.
+Binary file matches. = Corrispondenze in un file binario.
+# The text displayed in a dialog when the user is prompted to continue a "Find
+# in Files" search that has taken longer than X seconds to complete.
+Continue? = Continue?
+Still searching in files... Continue waiting? = Still searching in files... Continue waiting?
+# The message displayed when a "Find in Files" search is aborted by the user.
+Find in Files aborted = Find in Files aborted
+# The statusbar text shown after performing a "Replace All".
+replacement(s) made = sostituzione/i fatta/e
 
-# modules/textadept/keys.lua
-Lexer = Linguaggio
-Style = Stile
-Error loading webpage: = Errore di caricamento della pagina:
-
-# modules/textadept/menu.lua
+# [modules/textadept/menu.lua]
+# Typical "File" menu items for creating new files, opening, saving, and closing
+# existing files, opening and saving sessions, and quitting Textadept.
 _File = _File
 _New = _Nuovo
 _Open = _Apri
@@ -123,6 +147,7 @@ Close All = Chiudi t_utto
 Loa_d Session... = Ca_rica una sessione...
 Sav_e Session... = Sa_lva la sessione...
 _Quit = _Esci
+# Typical "Edit" menu items for manipulating buffer text and source code.
 _Edit = _Modifica
 _Undo = _Annulla la modifica
 _Redo = _Ripristina la modifica
@@ -139,7 +164,10 @@ _Highlight Word = E_videnzia la parola
 Toggle _Block Comment = Co_mmenta/Scommenta
 T_ranspose Characters = I_nverti due caratteri
 _Join Lines = Con_giungi le linee
+# The menu item for filtering text through a shell command and replacing input
+# text with that command's output text.
 _Filter Through = _Filtra
+# Menu items for selecting text and entities.
 _Select = _Seleziona
 Select to _Matching Brace = Seleziona fino alla parentesi _corrispondente
 Select between _XML Tags = Seleziona tra etichette _XML
@@ -152,6 +180,7 @@ 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
+# Menu items for transforming selected text.
 Selectio_n = Mo_difica la selezione
 _Upper Case Selection = Metti in _maiuscolo
 _Lower Case Selection = Metti in m_inuscolo
@@ -164,53 +193,79 @@ Enclose in _Brackets = Includi tra parentesi _quadre
 Enclose in B_races = Includi tra parentesi _graffe
 _Move Selected Lines Up = Muovi le linee in _alto
 Move Selected Lines Do_wn = Muovi le linee in _basso
+# Menu items for searching and replacing text within buffers and files.
 _Search = _Ricerca
 _Find = _Cerca
-#Find _Next = Cerca il _seguente
 Find _Previous = Cerca il _precedente
-#_Replace = _Sostituisci
-#Replace _All = Sostituisci _tutto
 Find _Incremental = Cerca in modo _incrementale
 Find in Fi_les = Cerca in più _file
 Goto Nex_t File Found = Vai al file trovato s_eguente
 Goto Previou_s File Found = Vai al file trovato p_recedente
+# Menu item for jumping to a specific line in a buffer.
 _Jump to = _Vai a...
+# Menu items for various tools and utilities for editing and working with source
+# code.
 _Tools = S_trumenti
+# Menu item for opening Textadept's Lua command entry.
 Command _Entry = _Immetti un comando
+# Menu item for selecting a menu command to run.
 Select Co_mmand = _Scegli un comando...
+# Menu items for running or compiling the current source file.
 _Run = Ese_gui
 _Compile = _Compila
+# Menu item for setting command line arguments for run and compile commands.
 Set _Arguments... = Im_posta gli argomenti...
+# The text displayed in the dialog for specifying command line arguments for run
+# and compile commands.
 Command line arguments = Argomenti della riga di comando
 For Run: = Per l'esecuzione:
 For Compile: = Per la compilazione:
+# Menu item for building the current project.
 Buil_d = C_ostruisci
+# Menu item for stopping a run, compile, or build shell command.
 S_top = _Arresta
+# Menu items for navigating through recognized shell command errors.
 _Next Error = Errore s_eguente
 _Previous Error = Errore p_recedente
-_Complete Symbol = Co_mpleta il simbolo
-Show _Documentation = Mostra la _documentazione
+# Menu items for working with bookmarked lines in buffers.
 _Bookmark = Segna_libro
 _Toggle Bookmark = Segna_libro sì/no
 _Clear Bookmarks = _Annulla i segnalibri
 _Next Bookmark = Segnalibro _seguente
 _Previous Bookmark = Segnalibro _precedente
 _Goto Bookmark... = _Vai al segnalibro...
+# Menu items for launching a quick open dialog in order to open files in certain
+# directories. A quick open dialog lists all files in a directory and its
+# subdirectories and filters the list down as the user types.
 Quick _Open = Apertura _veloce
 Quickly Open _User Home = Cartella personale dell’_utente
 Quickly Open _Textadept Home = Cartella di _Textadept
 Quickly Open _Current Directory = Cartella _corrente
 Quickly Open Current _Project = _Progetto corrente
+# Menu items for working with snippets, insert-able pieces of code that act like
+# templates with placeholders for user input.
 _Snippets = _Frammenti
 _Insert Snippet... = _Inserisci un frammento...
 _Expand Snippet/Next Placeholder = Espandi/Segnaposto _seguente
 _Previous Snippet Placeholder = Segnaposto _precedente
 _Cancel Snippet = _Annulla il frammento
+# Menu items for auto-completing programming language symbols and showing
+# documentation for them (e.g. typing `textadept.editing.` followed by a
+# "Complete Symbol" would show all possible completions for that symbol).
+_Complete Symbol = Co_mpleta il simbolo
+Show _Documentation = Mostra la _documentazione
+# Menu item for inspecting the character under the caret. The character's byte
+# information, the lexer used to syntax-highlight that character, and the
+# character's lexical style (e.g. string, comment, number, etc.) are shown.
 Show St_yle = Mostra lo s_tile
+Lexer = Linguaggio
+Style = Stile
+# Menu items for navigating between open buffers.
 _Buffer = Sc_heda
 _Next Buffer = Scheda _seguente
 _Previous Buffer = Scheda _precedente
 _Switch to Buffer... = _Vai alla scheda...
+# Menu items for changing the indentation settings for the current buffer.
 _Indentation = _Rientro
 Tab width: _2 = Tabulazione: _2 spazi
 Tab width: _3 = Tabulazione: _3 spazi
@@ -218,17 +273,25 @@ Tab width: _4 = Tabulazione: _4 spazi
 Tab width: _8 = Tabulazione: _8 spazi
 _Toggle Use Tabs = _Usa le tabulazioni sì/no
 _Convert Indentation = _Converti il rientro
+# Menu item for changing the end-of-line mode for the current buffer.
 _EOL Mode = _Tipo di fine di linea
-#CRLF = CRLF
-#LF = LF
+# Menu items for changing the encoding of the current buffer's text.
 E_ncoding = _Codifica
 _UTF-8 Encoding = Codifica _UTF-8
 _ASCII Encoding = Codifica _ASCII
 _ISO-8859-1 Encoding = Codifica _ISO-8859-1
 _MacRoman Encoding = Codifica _MacRoman
 UTF-1_6 Encoding = Codifica UTF-1_6
+# Menu items for changing the way the current buffer is displayed.
+Toggle View _EOL = _Mostra la fine di linea sì/no
+Toggle _Wrap Mode = _Accapo automatico sì/no
+Toggle View White_space = M_ostra gli spazi sì/no
+# Menu items for changing and refreshing the syntax-highlighting language for
+# the current buffer.
 Select _Lexer... = Sc_egli il linguaggio...
 _Refresh Syntax Highlighting = Sincroni_zza l’evidenziazione sintattica
+# Menu items for navigating between views, splitting them, closing them, and
+# resizing them.
 _View = _Vista
 _Next View = Vista _seguente
 _Previous View = Vista _precedente
@@ -238,46 +301,51 @@ _Unsplit View = _Congiungi la vista
 Unsplit _All Views = Congiungi _tutte le viste
 _Grow View = _Aumenta la vista
 Shrin_k View = _Riduci la vista
+# Menu item for folding (showing/hiding) the block of code the starts on the
+# current line. Fold-able blocks of code are typically classes, functions, and
+# control structures.
 Toggle Current _Fold = P_iega corrente sì/no
-Toggle View _EOL = _Mostra la fine di linea sì/no
-Toggle _Wrap Mode = _Accapo automatico sì/no
+# Menu item for showing line indentation markers.
 Toggle Show In_dent Guides = Mostra le g_uide di rientro sì/no
-Toggle View White_space = M_ostra gli spazi sì/no
+# Menu item for allowing the caret to move beyond line ends and into "virtual
+# space".
 Toggle _Virtual Space = Usa lo spa_zio virtuale sì/no
+# Menu items for changing the zoom factor of displayed buffer text.
 Zoom _In = In_grandisci
 Zoom _Out = Ri_mpiccolisci
 _Reset Zoom = Ingrandimento _normale
+# Menu items for getting help on Textadept and its Lua API documentation.
 _Help = _Aiuto
 Show _Manual = _Manuale
 Show _LuaDoc = _Documentazione sull’API
 _About = _Informazioni
+# The error message displayed when activating a menu item associated with an
+# unknown command.
+Unknown command: = Comando sconosciuto:
+# The text displayed in the dialog for running an arbitrary menu command. Any
+# key binding associated with commands are also shown.
+Run Command = Scegli un comando
 Command = Comando
 Key Command = Scorciatoia del comando
-Run Command = Scegli un comando
-Unknown command: = Comando sconosciuto:
 
-# modules/textadept/mime_types.lua
+# [modules/textadept/file_types.lua]
+# The title of the dialog for selecting a lexer for the current buffer. Lexers
+# perform syntax highlighting of source code.
 Select Lexer = Scegli il linguaggio
-#Name = Nome
-
-# modules/textadept/run.lua
-does not exist = non esiste
 
-# modules/textadept/session.lua
+# [modules/textadept/session.lua]
+# The title of the dialog for selecting a session file to load.
+Load Session = Carica una sessione
+# The text displayed in a dialog when files in a loaded session were not found.
 Session Files Not Found = File di sessione non trovati
 The following session files were not found = I seguenti file di sessione non sono stati trovati:
-#_OK = _OK
-Load Session = Carica una sessione
+# The title of the dialog for selecting a session file to save.
 Save Session = Salva la sessione
 
-# modules/textadept/snapopen.lua
-File Limit Exceeded = Limite dei file superato
-files or more were found. Showing the first = file o più sono stati trovati. Sono mostrati i primi
-#_OK = _OK
-#Open = Apri
-#File = File
-
-# modules/textadept/snippets.lua
+# [modules/textadept/snippets.lua]
+# The text displayed in the dialog for selecting a snippet to insert. Snippets
+# have a trigger word (pressing the "Tab" key after that word inserts the
+# snippet) and snippet text.
 Select Snippet = Inserisci un frammento
 Trigger = Innesco
 Snippet Text = Testo del frammento
diff --git a/core/locales/locale.pl.conf b/core/locales/locale.pl.conf
index 98ed42f7..e0a4eae0 100644
--- a/core/locales/locale.pl.conf
+++ b/core/locales/locale.pl.conf
@@ -1,73 +1,94 @@
 # Copyright 2007-2016 Mitchell mitchell.att.foicica.com. See LICENSE.
-# Polish translation by Piotr "Orzech" Orzechowski [drzewo.org], 2014.
+# Polish localization file for Textadept by Piotr "Orzech" Orzechowski [drzewo.org], 2014.
 #
-# Localization file.
-# The localized strings may contain UTF-8 characters, but not UTF-16 or UTF-32.
-# The latter must be converted manually from the \U+xxxx format. Note that if
-# you use the \ddd representation of characters, it must be in DECIMAL format,
-# not Octal.
+# When translating this file into your native language, all translated text must
+# be encoded in UTF-8. For each "key = value" line, please replace the "value"
+# part with the translation of "key". Any whitespace around '=' is ignored.
 #
-# Each line contains a "message = localized string" pair. The message should not
-# be localized. Extra spaces around '=' are ignored.
-#
-# Notes:
-#   - Buttons and menu items have a "_" character as a mnemonic (for
-#     Alt+character) access. You can put the "_" anywhere applicable in your
-#     localized version or eliminate it altogether.
+# Note: for languages that support it, buttons and menu items may have a "_"
+# before any single letter, which means that pressing the "Alt" modifier key
+# along with that letter will activate (click) the button or menu item. You are
+# free to use or omit these "_" mnemonics from your translations as you see fit.
 
-# core/events.lua
+# [core/events.lua]
+# This error message is displayed if the user accidentally emits an event with
+# no name (e.g. mistypes the name of an existing event).
 Undefined event name = Brak nazwy zdarzenia
 
-# core/file_io.lua
+# [core/file_io.lua]
+# The title of dialogs prompting the user to open a file.
 Open = 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
+# 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
+# unsaved changes.
 Close without saving? = Zamknąć bez zapisywania zmian?
 There are unsaved changes in = Istnieją niezapisane zmiany w
+_Cancel = _Anuluj
 Close _without saving = Zamknij _bez zapisywania
+# The text displayed in a dialog when a file has been externally modified.
 Reload? = Wczytać ponownie?
 Reload modified file? = Wczytać ponownie zmieniony plik?
 has been modified. Reload it? = został zmodyfikowany. Wczytać ponownie?
 _Yes = _Tak
 _No = _Nie
+# The column label for lists of filenames in dialogs.
 File = 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
+File Limit Exceeded = Przekroczono limit pliku
+_OK = _OK
+
+# [core/keys.lua]
+# The statusbar text shown when the user has pressed a key that is part of a key
+# chain (e.g. "Ctrl+Alt+V" followed by "S"). Textadept is waiting for another
+# keypress.
+Keychain: = Kombinacje klawiszowe:
+# The statusbar text shown when the user started a key chain, but the next
+# keypress was unrecognized. Thus the key sequence is invalid.
+Invalid sequence = Nieprawidłowa sekwencja
 
-# core/gui.lua
+# [core/ui.lua]
+# The name of the buffer Textadept prints messages and error messages to.
 [Message Buffer] = [Bufor wiadomości]
-_OK = _OK
-_Cancel = _Anuluj
+# The column label for lists of buffer names in dialogs.
 Name = Nazwa
-#File = Plik
-#Untitled = Bez nazwy
+# The title of the dialog for switching between open buffers.
 Switch Buffers = Przełącz bufory
-theme not found. = nie znaleziony.
+# The line-ending, indentation, and positional buffer information shown in the
+# statusbar.
 CRLF = CRLF
 LF = LF
 Tabs: = Tabulacje:
 Spaces: = Spacje:
 Line: = Wrsz:
 Col: = Kol:
+# The statusbar text shown when the user resets Textadept's internal Lua state.
+Lua reset = Lua reset
+# The text displayed in a dialog when the user attempts to quit Textadept with
+# unsaved changes in open buffers.
 Quit without saving? = Zakończyć bez zapisywania zmian?
 The following buffers are unsaved: = Następujące bufory nie są zapisane:
 Quit _without saving = Zakończ _bez zapisywania
-Lua reset = Lua reset
-
-# core/keys.lua
-Keychain: = Kombinacje klawiszowe:
-Invalid sequence = Nieprawidłowa sekwencja
 
-# modules/textadept/bookmarks.lua
+# [modules/textadept/bookmarks.lua]
+# The text displayed in the dialog for selecting a bookmark to jump to.
 Select Bookmark = Wybierz zakładkę
 Bookmark = Zakładka
 
-# modules/textadept/editing.lua
+# [modules/textadept/editing.lua]
+# The text displayed in the dialog for jumping to a particular line.
 Go To = Idź do
 Line Number: = Numer wiersza:
-#_OK = _OK
-#_Cancel = _Anuluj
 
-# modules/textadept/find.lua
+# [modules/textadept/find.lua]
+# The text displayed in the GUI find & replace pane.
 _Find: = _Znajdź:
 R_eplace: = Za_mień:
 Find _Next = Znajdź _następne
@@ -78,22 +99,8 @@ _Match case = _Dopasuj wielkość liter
 _Whole word = _Cały wyraz
 Rege_x = Rege_x
 _In files = _W plikach
-Find in Files = Znajdź w plikach
+# The text displayed in the terminal version's find & replace pane.
 Find: = Znajdź:
-No results found = Niczego nie znaleziono
-[Files Found Buffer] = [Bufor szukania w plikach]
-Binary file matches. = Binary file matches.
-Search wrapped = Automatyczny powrót do początku
-Continue? = Continue?
-Still searching in files... Continue waiting? = Still searching in files... Continue waiting?
-Find in Files aborted = Find in Files aborted
-Error = Błąd
-An error occurred: = Wystąpił błąd:
-#_OK = _OK
-#_Cancel = _Anuluj
-replacement(s) made = wykonanych(-e/-a) zamian(-y/-a)
-# For curses:
-#Find: = Znajdź:
 Replace: = Zamień:
 [Next] = [Następne]
 [Prev] = [Poprzednie]
@@ -103,13 +110,30 @@ Case(F1) = Wielkość (F1)
 Word(F2) = Wyraz (F2)
 Regex(F3) = Regex(F3)
 Files(F4) = Pliki (F4)
+# The statusbar text shown when a search has wrapped back to the beginning of
+# the buffer.
+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
+# 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
+# shown in place of binary buffer text.
+Binary file matches. = Binary file matches.
+# The text displayed in a dialog when the user is prompted to continue a "Find
+# in Files" search that has taken longer than X seconds to complete.
+Continue? = Continue?
+Still searching in files... Continue waiting? = Still searching in files... Continue waiting?
+# The message displayed when a "Find in Files" search is aborted by the user.
+Find in Files aborted = Find in Files aborted
+# The statusbar text shown after performing a "Replace All".
+replacement(s) made = wykonanych(-e/-a) zamian(-y/-a)
 
-# modules/textadept/keys.lua
-Lexer = Lekser:
-Style = Styl:
-Error loading webpage: = Błąd przy otwieraniu strony:
-
-# modules/textadept/menu.lua
+# [modules/textadept/menu.lua]
+# Typical "File" menu items for creating new files, opening, saving, and closing
+# existing files, opening and saving sessions, and quitting Textadept.
 _File = _Plik
 _New = _Nowy
 _Open = _Otwórz...
@@ -123,6 +147,7 @@ Close All = Zamk_nij wszystkie
 Loa_d Session... = Wczytaj s_esję...
 Sav_e Session... = Zapisz ses_ję...
 _Quit = _Zakończ
+# Typical "Edit" menu items for manipulating buffer text and source code.
 _Edit = _Edycja
 _Undo = _Cofnij
 _Redo = _Ponów
@@ -139,7 +164,10 @@ _Highlight Word = Podświe_tl wyraz
 Toggle _Block Comment = Włącz/wyłącz komentarz _blokowy
 T_ranspose Characters = Tran_sponuj znaki
 _Join Lines = Połącz w_iersze
+# The menu item for filtering text through a shell command and replacing input
+# text with that command's output text.
 _Filter Through = Fi_ltruj przez...
+# Menu items for selecting text and entities.
 _Select = _Zaznacz
 Select to _Matching Brace = Do pasującego _nawiasu
 Select between _XML Tags = Pomiędzy znacznikami _XML
@@ -152,6 +180,7 @@ Select in B_races = W nawiasie k_lamrowym
 Select _Word = Wy_raz
 Select _Line = Wi_ersz
 Select Para_graph = _Akapit
+# Menu items for transforming selected text.
 Selectio_n = Zaz_naczenie
 _Upper Case Selection = Zmień na wi_elkie litery
 _Lower Case Selection = Zmień na _małe litery
@@ -164,53 +193,79 @@ Enclose in _Brackets = Zamknij w nawiasie k_wadratowym
 Enclose in B_races = Zamknij w nawiasie k_lamrowym
 _Move Selected Lines Up = Przenieś wiersze w _górę
 Move Selected Lines Do_wn = Przenieś wiersze w _dół
+# Menu items for searching and replacing text within buffers and files.
 _Search = Wy_szukiwanie
 _Find = _Znajdź...
-#Find _Next = Znajdź _następne
 Find _Previous = Znajdź _poprzednie
-#_Replace = Za_mień
-#Replace _All = Zamień _wszystkie
 Find _Incremental = Szukaj prz_yrostowo...
 Find in Fi_les = Znajdź w p_likach...
 Goto Nex_t File Found = Następne wystąpienie w pl_iku
 Goto Previou_s File Found = Poprzednie wystąpienie w pli_ku
+# Menu item for jumping to a specific line in a buffer.
 _Jump to = _Idź do...
+# Menu items for various tools and utilities for editing and working with source
+# code.
 _Tools = _Narzędzia
+# Menu item for opening Textadept's Lua command entry.
 Command _Entry = Wiersz po_leceń
+# Menu item for selecting a menu command to run.
 Select Co_mmand = _Wybierz polecenie...
+# Menu items for running or compiling the current source file.
 _Run = _Uruchom
 _Compile = _Skompiluj
+# Menu item for setting command line arguments for run and compile commands.
 Set _Arguments... = Set _Arguments...
+# The text displayed in the dialog for specifying command line arguments for run
+# and compile commands.
 Command line arguments = Command line arguments
 For Run: = For Run:
 For Compile: = For Compile:
+# Menu item for building the current project.
 Buil_d = Z_buduj
+# Menu item for stopping a run, compile, or build shell command.
 S_top = Pr_zerwij
+# Menu items for navigating through recognized shell command errors.
 _Next Error = _Następny błąd
 _Previous Error = _Poprzedni błąd
-_Complete Symbol = Uzupełnij sy_mbol
-Show _Documentation = Pokaż _dokumentację
+# Menu items for working with bookmarked lines in buffers.
 _Bookmark = Zakładk_i
 _Toggle Bookmark = _Dodaj/usuń zakładkę
 _Clear Bookmarks = _Wyczyść zakładki
 _Next Bookmark = _Następna zakładka
 _Previous Bookmark = _Poprzednia zakładka
 _Goto Bookmark... = Prz_ejdź do zakładki...
+# Menu items for launching a quick open dialog in order to open files in certain
+# directories. A quick open dialog lists all files in a directory and its
+# subdirectories and filters the list down as the user types.
 Quick _Open = Quick _Open
 Quickly Open _User Home = Quickly Open _User Home
 Quickly Open _Textadept Home = Quickly Open _Textadept Home
 Quickly Open _Current Directory = Quickly Open _Current Directory
 Quickly Open Current _Project = Quickly Open Current _Project
+# Menu items for working with snippets, insert-able pieces of code that act like
+# templates with placeholders for user input.
 _Snippets = Sk_rawek kodu
 _Insert Snippet... = _Wstaw...
 _Expand Snippet/Next Placeholder = Rozwiń / _Następne pole
 _Previous Snippet Placeholder = _Poprzednie pole
 _Cancel Snippet = _Anuluj
+# Menu items for auto-completing programming language symbols and showing
+# documentation for them (e.g. typing `textadept.editing.` followed by a
+# "Complete Symbol" would show all possible completions for that symbol).
+_Complete Symbol = Uzupełnij sy_mbol
+Show _Documentation = Pokaż _dokumentację
+# Menu item for inspecting the character under the caret. The character's byte
+# information, the lexer used to syntax-highlight that character, and the
+# character's lexical style (e.g. string, comment, number, etc.) are shown.
 Show St_yle = Pokaż st_yl
+Lexer = Lekser:
+Style = Styl:
+# Menu items for navigating between open buffers.
 _Buffer = _Bufor
 _Next Buffer = _Następny
 _Previous Buffer = _Poprzedni
 _Switch to Buffer... = P_rzełącz na...
+# Menu items for changing the indentation settings for the current buffer.
 _Indentation = _Wcięcia
 Tab width: _2 = Szerokość tabulacji: _2
 Tab width: _3 = Szerokość tabulacji: _3
@@ -218,17 +273,25 @@ Tab width: _4 = Szerokość tabulacji: _4
 Tab width: _8 = Szerokość tabulacji: _8
 _Toggle Use Tabs = Włącz/wyłącz _tabulacje
 _Convert Indentation = _Konwertuj
+# Menu item for changing the end-of-line mode for the current buffer.
 _EOL Mode = _Tryb końca linii
-#CRLF = C_RLF (Windows)
-#LF = _LF (UNIX/Linux)
+# Menu items for changing the encoding of the current buffer's text.
 E_ncoding = Ko_dowanie znaków
 _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
+# Menu items for changing the way the current buffer is displayed.
+Toggle View _EOL = Włącz/wyłącz znaki k_ońca linii
+Toggle _Wrap Mode = Włącz/wyłącz zawi_janie wierszy
+Toggle View White_space = Włącz/wyłącz „_białe znaki”
+# Menu items for changing and refreshing the syntax-highlighting language for
+# the current buffer.
 Select _Lexer... = Wybierz _lekser...
 _Refresh Syntax Highlighting = _Odśwież kolorowanie składni
+# Menu items for navigating between views, splitting them, closing them, and
+# resizing them.
 _View = _Widok
 _Next View = _Następny
 _Previous View = _Poprzedni
@@ -238,46 +301,51 @@ _Unsplit View = Połącz wi_doki
 Unsplit _All Views = Połącz _wszystkie widoki
 _Grow View = Powię_ksz
 Shrin_k View = Po_mniejsz
+# Menu item for folding (showing/hiding) the block of code the starts on the
+# current line. Fold-able blocks of code are typically classes, functions, and
+# control structures.
 Toggle Current _Fold = Włącz/wyłącz bi_eżące zawinięcie
-Toggle View _EOL = Włącz/wyłącz znaki k_ońca linii
-Toggle _Wrap Mode = Włącz/wyłącz zawi_janie wierszy
+# Menu item for showing line indentation markers.
 Toggle Show In_dent Guides = Włącz/wyłącz wc_ięcia
-Toggle View White_space = Włącz/wyłącz „_białe znaki”
+# Menu item for allowing the caret to move beyond line ends and into "virtual
+# space".
 Toggle _Virtual Space = Włącz/wyłącz wir_tualny obszar
+# Menu items for changing the zoom factor of displayed buffer text.
 Zoom _In = P_rzybliż
 Zoom _Out = Odd_al
 _Reset Zoom = Prz_ywróć domyślne przybliżenie
+# Menu items for getting help on Textadept and its Lua API documentation.
 _Help = P_omoc
 Show _Manual = Po_dręcznik użytkownika...
 Show _LuaDoc = _LuaDoc...
 _About = _O programie...
+# The error message displayed when activating a menu item associated with an
+# unknown command.
+Unknown command: = Nieznane polecenie:
+# The text displayed in the dialog for running an arbitrary menu command. Any
+# key binding associated with commands are also shown.
+Run Command = Wykonaj polecenie
 Command = Polecenie
 Key Command = Polecenie klawiaturowe
-Run Command = Wykonaj polecenie
-Unknown command: = Nieznane polecenie:
 
-# modules/textadept/mime_types.lua
+# [modules/textadept/file_types.lua]
+# The title of the dialog for selecting a lexer for the current buffer. Lexers
+# perform syntax highlighting of source code.
 Select Lexer = Wybierz lekser
-#Name = Nazwa
-
-# modules/textadept/run.lua
-does not exist = nie istnieje
 
-# modules/textadept/session.lua
+# [modules/textadept/session.lua]
+# The title of the dialog for selecting a session file to load.
+Load Session = Wczytaj sesję
+# The text displayed in a dialog when files in a loaded session were not found.
 Session Files Not Found = Nie znaleziono plików z sesji
 The following session files were not found = Następujące pliki z sesji nie zostały odnalezione:
-#_OK = _OK
-Load Session = Wczytaj sesję
+# The title of the dialog for selecting a session file to save.
 Save Session = Zapisz sesję
 
-# modules/textadept/snapopen.lua
-File Limit Exceeded = Przekroczono limit pliku
-files or more were found. Showing the first = lub więcej plików zostało znalezionych. Pokazywanie pierwszego
-#_OK = _OK
-#Open = Otwórz
-#File = Plik
-
-# modules/textadept/snippets.lua
+# [modules/textadept/snippets.lua]
+# The text displayed in the dialog for selecting a snippet to insert. Snippets
+# have a trigger word (pressing the "Tab" key after that word inserts the
+# snippet) and snippet text.
 Select Snippet = Wybierz skrawek
 Trigger = Wyzwalacz
 Snippet Text = Treść skrawka
diff --git a/core/locales/locale.ru.conf b/core/locales/locale.ru.conf
index e59ae521..4486db74 100644
--- a/core/locales/locale.ru.conf
+++ b/core/locales/locale.ru.conf
@@ -1,73 +1,94 @@
 # Copyright 2007-2016 Mitchell mitchell.att.foicica.com. See LICENSE.
-# Russian translation by Vladimir Lomov <irk.translatior AT gmail.com>
+# American English localization file for Textadept.
 #
-# Localization file.
-# The localized strings may contain UTF-8 characters, but not UTF-16 or UTF-32.
-# The latter must be converted manually from the \U+xxxx format. Note that if
-# you use the \ddd representation of characters, it must be in DECIMAL format,
-# not Octal.
+# When translating this file into your native language, all translated text must
+# be encoded in UTF-8. For each "key = value" line, please replace the "value"
+# part with the translation of "key". Any whitespace around '=' is ignored.
 #
-# Each line contains a "message = localized string" pair. The message should not
-# be localized. Extra spaces around '=' are ignored.
-#
-# Notes:
-#   - Buttons and menu items have a "_" character as a mnemonic (for
-#     Alt+character) access. You can put the "_" anywhere applicable in your
-#     localized version or eliminate it altogether.
+# Note: for languages that support it, buttons and menu items may have a "_"
+# before any single letter, which means that pressing the "Alt" modifier key
+# along with that letter will activate (click) the button or menu item. You are
+# free to use or omit these "_" mnemonics from your translations as you see fit.
 
-# core/events.lua
+# [core/events.lua]
+# This error message is displayed if the user accidentally emits an event with
+# no name (e.g. mistypes the name of an existing event).
 Undefined event name = Неизвестное название события
 
-# core/file_io.lua
+# [core/file_io.lua]
+# The title of dialogs prompting the user to open a file.
 Open = Открыть
+# 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 = Сохранить
+# The text displayed for untitled and unsaved buffers.
 Untitled = Безымянный
+# The text displayed in a dialog when the user attempts to close a file with
+# unsaved changes.
 Close without saving? = Закрыть без сохранения?
 There are unsaved changes in = Есть несохранённые изменения в
+_Cancel = О_тменить
 Close _without saving = Закрыть _без сохранения
+# The text displayed in a dialog when a file has been externally modified.
 Reload? = Перезагрузить?
 Reload modified file? = Перезагрузить файл с изменениями?
 has been modified. Reload it? = был изменён. Открыть заново?
 _Yes = _Да
 _No = _Нет
+# The column label for lists of filenames in dialogs.
 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 Limit Exceeded = Превышен лимит на количество файлов
+_OK = _OK
 
-# core/gui.lua
+# [core/keys.lua]
+# The statusbar text shown when the user has pressed a key that is part of a key
+# chain (e.g. "Ctrl+Alt+V" followed by "S"). Textadept is waiting for another
+# keypress.
+Keychain: = Комбинации клавиш:
+# The statusbar text shown when the user started a key chain, but the next
+# keypress was unrecognized. Thus the key sequence is invalid.
+Invalid sequence = Неизвестная комбинация
+
+# [core/ui.lua]
+# The name of the buffer Textadept prints messages and error messages to.
 [Message Buffer] = [Буфер сообщений]
-_OK = _OK
-_Cancel = О_тменить
+# The column label for lists of buffer names in dialogs.
 Name = Название
-#File = Файл
-#Untitled = Безымянный
+# The title of the dialog for switching between open buffers.
 Switch Buffers = Переключение между буферами
-theme not found. = тема не найдена.
+# The line-ending, indentation, and positional buffer information shown in the
+# statusbar.
 CRLF = CRLF
 LF = LF
 Tabs: = Табы:
 Spaces: = Пробелы:
 Line: = Строка:
 Col: = Столбец:
+# The statusbar text shown when the user resets Textadept's internal Lua state.
+Lua reset = Сброс состояния Lua
+# The text displayed in a dialog when the user attempts to quit Textadept with
+# unsaved changes in open buffers.
 Quit without saving? = Выйти без сохранения?
 The following buffers are unsaved: = Данные буферы не сохранены:
 Quit _without saving = Выйти _без сохранения
-Lua reset = Сброс состояния Lua
-
-# core/keys.lua
-Keychain: = Комбинации клавиш:
-Invalid sequence = Неизвестная комбинация
 
-# modules/textadept/bookmarks.lua
+# [modules/textadept/bookmarks.lua]
+# The text displayed in the dialog for selecting a bookmark to jump to.
 Select Bookmark = Выбрать закладку
 Bookmark = Закладки
 
-# modules/textadept/editing.lua
+# [modules/textadept/editing.lua]
+# The text displayed in the dialog for jumping to a particular line.
 Go To = Перейти к
 Line Number: = Номер строки:
-#_OK = _OK
-#_Cancel = О_тменить
 
-# modules/textadept/find.lua
+# [modules/textadept/find.lua]
+# The text displayed in the GUI find & replace pane.
 _Find: = Н_айти:
 R_eplace: = _Заменить:
 Find _Next = Найти _следующий
@@ -78,27 +99,41 @@ _Match case = _Учитывать регистр
 _Whole word = _Слово целиком
 Rege_x = Rege_x
 _In files = _В файлах
-Find in Files = Найти в файлах
-Find: = Найти:
+# The text displayed in the terminal version's find & replace pane.
+Find: = Find:
+Replace: = Replace:
+[Next] = [Next]
+[Prev] = [Prev]
+[Replace] = [Replace]
+[All] = [All]
+Case(F1) = Case(F1)
+Word(F2) = Word(F2)
+Regex(F3) = Regex(F3)
+Files(F4) = Files(F4)
+# The statusbar text shown when a search has wrapped back to the beginning of
+# the buffer.
+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 = Найти в файлах
+# 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
+# shown in place of binary buffer text.
 Binary file matches. = Соответствие в двоичном файле.
-Search wrapped = Искать по кругу
+# The text displayed in a dialog when the user is prompted to continue a "Find
+# in Files" search that has taken longer than X seconds to complete.
 Continue? = Continue?
 Still searching in files... Continue waiting? = Still searching in files... Continue waiting?
+# The message displayed when a "Find in Files" search is aborted by the user.
 Find in Files aborted = Find in Files aborted
-Error = Ошибка
-An error occurred: = Произошла ошибка:
-#_OK = _OK
-#_Cancel = О_тменить
+# The statusbar text shown after performing a "Replace All".
 replacement(s) made = замен(а/ы) сделано
 
-# modules/textadept/keys.lua
-Lexer = Подсветка
-Style = Стиль
-Error loading webpage: = Ошибка при загрузке web-страницы:
-
-# modules/textadept/menu.lua
+# [modules/textadept/menu.lua]
+# Typical "File" menu items for creating new files, opening, saving, and closing
+# existing files, opening and saving sessions, and quitting Textadept.
 _File = _Файл
 _New = _Создать
 _Open = _Открыть
@@ -112,6 +147,7 @@ Close All = Закрыть в_се
 Loa_d Session... = За_грузить сессию...
 Sav_e Session... = Со_хранить сессию...
 _Quit = В_ыход
+# Typical "Edit" menu items for manipulating buffer text and source code.
 _Edit = _Правка
 _Undo = _Отменить
 _Redo = Ве_рнуть
@@ -128,7 +164,10 @@ _Highlight Word = Под_светить слово
 Toggle _Block Comment = Изменить комментирование _блока
 T_ranspose Characters = Пе_реставить символы
 _Join Lines = _Объединить строки
+# The menu item for filtering text through a shell command and replacing input
+# text with that command's output text.
 _Filter Through = Пропустить через _фильтр
+# Menu items for selecting text and entities.
 _Select = В_ыделить
 Select to _Matching Brace = Выделить до _парной фигурной скобки
 Select between _XML Tags = Выделить меджу _XML тегами
@@ -141,6 +180,7 @@ Select in B_races = Веделить в _фигурных скобках
 Select _Word = Выделить с_лово
 Select _Line = Выделить ст_року
 Select Para_graph = Выделить _параграф
+# Menu items for transforming selected text.
 Selectio_n = Выдел_ение
 _Upper Case Selection = Преобразовать выделение в _верхний регист
 _Lower Case Selection = Преобразовать выделение в _нижний регистр
@@ -153,53 +193,79 @@ Enclose in _Brackets = Заключить в к_вадратные скобки
 Enclose in B_races = Заключить в _фигурные скобки
 _Move Selected Lines Up = Переместить выделенные строки _вверх
 Move Selected Lines Do_wn = Переместить выделнные строки в_низ
+# Menu items for searching and replacing text within buffers and files.
 _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 = Перейти к предыдущему найденному файлу
+# Menu item for jumping to a specific line in a buffer.
 _Jump to = Перейти _к
+# Menu items for various tools and utilities for editing and working with source
+# code.
 _Tools = _Инструменты
+# Menu item for opening Textadept's Lua command entry.
 Command _Entry = Командная _строка
+# Menu item for selecting a menu command to run.
 Select Co_mmand = Выбрать _команду
+# Menu items for running or compiling the current source file.
 _Run = _Запустить
 _Compile = _Скомпилировать
+# Menu item for setting command line arguments for run and compile commands.
 Set _Arguments... = Задать _Параметры...
+# The text displayed in the dialog for specifying command line arguments for run
+# and compile commands.
 Command line arguments = Параметры командной строки
 For Run: = Параметры запуска:
 For Compile: = Параметры сборки:
+# Menu item for building the current project.
 Buil_d = С_обрать
+# Menu item for stopping a run, compile, or build shell command.
 S_top = Ос_тановить
+# Menu items for navigating through recognized shell command errors.
 _Next Error = Следующая Ошибка
 _Previous Error = Предыдущая Ошибка
-_Complete Symbol = _Завершить символ
-Show _Documentation = Показать _документацию
+# Menu items for working with bookmarked lines in buffers.
 _Bookmark = _Закладки
 _Toggle Bookmark = _Показать/скрыть закладки
 _Clear Bookmarks = _Очистить закладки
 _Next Bookmark = _Следующая закладка
 _Previous Bookmark = П_редыдущая закладка
 _Goto Bookmark... = П_ерейти к закладке...
+# Menu items for launching a quick open dialog in order to open files in certain
+# directories. A quick open dialog lists all files in a directory and its
+# subdirectories and filters the list down as the user types.
 Quick _Open = _Быстрый доступ
 Quickly Open _User Home = Быстрый доступ к _домашнему каталогу
 Quickly Open _Textadept Home = Быстрый доступ к домашнему каталогу _Textadept
 Quickly Open _Current Directory = Быстрый доступ к _текущему каталогу
 Quickly Open Current _Project = Быстрый доступ к текущему _проекту
+# Menu items for working with snippets, insert-able pieces of code that act like
+# templates with placeholders for user input.
 _Snippets = _Заготовки
 _Insert Snippet... = _Вставить загтовку...
 _Expand Snippet/Next Placeholder = _Развернуть заготовку/Следующая метка
 _Previous Snippet Placeholder = _Предыдущая метка заготовки
 _Cancel Snippet = _Убрать заготовку
+# Menu items for auto-completing programming language symbols and showing
+# documentation for them (e.g. typing `textadept.editing.` followed by a
+# "Complete Symbol" would show all possible completions for that symbol).
+_Complete Symbol = _Завершить символ
+Show _Documentation = Показать _документацию
+# Menu item for inspecting the character under the caret. The character's byte
+# information, the lexer used to syntax-highlight that character, and the
+# character's lexical style (e.g. string, comment, number, etc.) are shown.
 Show St_yle = Показать _стиль
+Lexer = Подсветка
+Style = Стиль
+# Menu items for navigating between open buffers.
 _Buffer = _Буфер
 _Next Buffer = _Следующий буфер
 _Previous Buffer = _Предыдущий буфер
 _Switch to Buffer... = Переключиться на _буфер
+# Menu items for changing the indentation settings for the current buffer.
 _Indentation = _Отступ
 Tab width: _2 = Ширина табуляции: _2
 Tab width: _3 = Ширина табуляции: _3
@@ -207,17 +273,25 @@ Tab width: _4 = Ширина табуляции: _4
 Tab width: _8 = Ширина табуляции: _8
 _Toggle Use Tabs = Переключить использование _табуляции
 _Convert Indentation = _Преобразовать отступ
+# Menu item for changing the end-of-line mode for the current buffer.
 _EOL Mode = Режим _конца строки
-#CRLF = CRLF
-#LF = LF
+# Menu items for changing the encoding of the current buffer's text.
 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
+# Menu items for changing the way the current buffer is displayed.
+Toggle View _EOL = Переключить показ _EOL
+Toggle _Wrap Mode = Переключить режим _визуального переноса
+Toggle View White_space = Переключить показ _пробелов
+# Menu items for changing and refreshing the syntax-highlighting language for
+# the current buffer.
 Select _Lexer... = Выбрать тип _подсветки...
 _Refresh Syntax Highlighting = _Обновить подсветку синтаксиса
+# Menu items for navigating between views, splitting them, closing them, and
+# resizing them.
 _View = _Вид
 _Next View = _Следующий вид
 _Previous View = _Предыдущий вид
@@ -227,46 +301,51 @@ _Unsplit View = _Убрать разделение
 Unsplit _All Views = Убрать _все разделение
 _Grow View = _Увеличить разделение
 Shrin_k View = У_меньшить разделение
+# Menu item for folding (showing/hiding) the block of code the starts on the
+# current line. Fold-able blocks of code are typically classes, functions, and
+# control structures.
 Toggle Current _Fold = Переключить режим текущей _свёртки
-Toggle View _EOL = Переключить показ _EOL
-Toggle _Wrap Mode = Переключить режим _визуального переноса
+# Menu item for showing line indentation markers.
 Toggle Show In_dent Guides = Переключить показ указателей отступа
-Toggle View White_space = Переключить показ _пробелов
+# Menu item for allowing the caret to move beyond line ends and into "virtual
+# space".
 Toggle _Virtual Space = Переключить режим _виртульных пробелов
+# Menu items for changing the zoom factor of displayed buffer text.
 Zoom _In = _Приблизить
 Zoom _Out = _Отдалить
 _Reset Zoom = _Сбросить масштаб
+# Menu items for getting help on Textadept and its Lua API documentation.
 _Help = _Справка
 Show _Manual = Показать _руководство
 Show _LuaDoc = Показать документацию по _lua
 _About = _О программе
+# The error message displayed when activating a menu item associated with an
+# unknown command.
+Unknown command: = Неизвестная команда:
+# The text displayed in the dialog for running an arbitrary menu command. Any
+# key binding associated with commands are also shown.
+Run Command = Выполнить команду
 Command = Команда
 Key Command = Команда по комбинации клавиш
-Run Command = Выполнить команду
-Unknown command: = Неизвестная команда:
 
-# modules/textadept/mime_types.lua
+# [modules/textadept/file_types.lua]
+# The title of the dialog for selecting a lexer for the current buffer. Lexers
+# perform syntax highlighting of source code.
 Select Lexer = Выбрать подсветку
-#Name = Название
-
-# modules/textadept/run.lua
-does not exist = не существует
 
-# modules/textadept/session.lua
+# [modules/textadept/session.lua]
+# The title of the dialog for selecting a session file to load.
+Load Session = Загрузить сессию
+# The text displayed in a dialog when files in a loaded session were not found.
 Session Files Not Found = Файлы сессии не найдены
 The following session files were not found = Следующие файлы сессии не найдены
-#_OK = _OK
-Load Session = Загрузить сессию
+# The title of the dialog for selecting a session file to save.
 Save Session = Сохранить сессию
 
-# modules/textadept/snapopen.lua
-File Limit Exceeded = Превышен лимит на количество файлов
-files or more were found. Showing the first = файлов или более было найдено. Показываем первый
-#_OK = _OK
-#Open = Open
-#File = File
-
-# modules/textadept/snippets.lua
+# [modules/textadept/snippets.lua]
+# The text displayed in the dialog for selecting a snippet to insert. Snippets
+# have a trigger word (pressing the "Tab" key after that word inserts the
+# snippet) and snippet text.
 Select Snippet = Выбрать заготовку
 Trigger = Триггер
 Snippet Text = Текст заготовки
diff --git a/core/locales/locale.sv.conf b/core/locales/locale.sv.conf
index 7a621017..99e74a08 100644
--- a/core/locales/locale.sv.conf
+++ b/core/locales/locale.sv.conf
@@ -1,73 +1,94 @@
 # Copyright 2007-2016 Mitchell mitchell.att.foicica.com. See LICENSE.
-# Swedish translation by Niklas Wallén <nikw AT gmx .com>
+# Swedish localization file for Textadept by Niklas Wallén <nikw AT gmx .com>.
 #
-# Localization file.
-# The localized strings may contain UTF-8 characters, but not UTF-16 or UTF-32.
-# The latter must be converted manually from the \U+xxxx format. Note that if
-# you use the \ddd representation of characters, it must be in DECIMAL format,
-# not Octal.
+# When translating this file into your native language, all translated text must
+# be encoded in UTF-8. For each "key = value" line, please replace the "value"
+# part with the translation of "key". Any whitespace around '=' is ignored.
 #
-# Each line contains a "message = localized string" pair. The message should not
-# be localized. Extra spaces around '=' are ignored.
-#
-# Notes:
-#   - Buttons and menu items have a "_" character as a mnemonic (for
-#     Alt+character) access. You can put the "_" anywhere applicable in your
-#     localized version or eliminate it altogether.
+# Note: for languages that support it, buttons and menu items may have a "_"
+# before any single letter, which means that pressing the "Alt" modifier key
+# along with that letter will activate (click) the button or menu item. You are
+# free to use or omit these "_" mnemonics from your translations as you see fit.
 
-# core/events.lua
+# [core/events.lua]
+# This error message is displayed if the user accidentally emits an event with
+# no name (e.g. mistypes the name of an existing event).
 Undefined event name = Odefinierat event-namn
 
-# core/file_io.lua
+# [core/file_io.lua]
+# The title of dialogs prompting the user to open a file.
 Open = Ö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
+# 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
+# unsaved changes.
 Close without saving? = Stäng utan att spara?
 There are unsaved changes in = Det finns osparade ändringar i
+_Cancel = _Avbryt
 Close _without saving = Stäng _utan att spara
+# The text displayed in a dialog when a file has been externally modified.
 Reload? = Ladda om?
 Reload modified file? = Ladda om ändrad fil?
 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
+# 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
+File Limit Exceeded = File Limit Exceeded
+_OK = _Ok
+
+# [core/keys.lua]
+# The statusbar text shown when the user has pressed a key that is part of a key
+# chain (e.g. "Ctrl+Alt+V" followed by "S"). Textadept is waiting for another
+# keypress.
+Keychain: = Keychain:
+# The statusbar text shown when the user started a key chain, but the next
+# keypress was unrecognized. Thus the key sequence is invalid.
+Invalid sequence = Invalid sequence
 
-# core/gui.lua
+# [core/ui.lua]
+# The name of the buffer Textadept prints messages and error messages to.
 [Message Buffer] = [Message Buffer]
-_OK = _Ok
-_Cancel = _Avbryt
+# The column label for lists of buffer names in dialogs.
 Name = Namn
-#File = Fil
-#Untitled = Namnlös
+# The title of the dialog for switching between open buffers.
 Switch Buffers = Välj buffer
-theme not found. = tema kunde inte hittas.
+# The line-ending, indentation, and positional buffer information shown in the
+# statusbar.
 CRLF = CRLF (_Windows)
 LF = LF (_Unix)
 Tabs: = Tabulator:
 Spaces: = Mellanslag:
 Line: = Rad:
 Col: = Kolumn:
+# The statusbar text shown when the user resets Textadept's internal Lua state.
+Lua reset = Återställ lua
+# The text displayed in a dialog when the user attempts to quit Textadept with
+# unsaved changes in open buffers.
 Quit without saving? = Avsluta utan att spara?
 The following buffers are unsaved: = Följande buffrar är osparade:
 Quit _without saving = Avsluta _utan att spara
-Lua reset = Återställ lua
-
-# core/keys.lua
-Keychain: = Keychain:
-Invalid sequence = Invalid sequence
 
-# modules/textadept/bookmarks.lua
+# [modules/textadept/bookmarks.lua]
+# The text displayed in the dialog for selecting a bookmark to jump to.
 Select Bookmark = Välj bokmärke
 Bookmark = Bokmärke
 
-# modules/textadept/editing.lua
+# [modules/textadept/editing.lua]
+# The text displayed in the dialog for jumping to a particular line.
 Go To = Gå till
 Line Number: = Radnummer:
-#_OK = _Ok
-#_Cancel = _Avbryt
 
-# modules/textadept/find.lua
+# [modules/textadept/find.lua]
+# The text displayed in the GUI find & replace pane.
 _Find: = _Sök:
 R_eplace: = _Ersätt:
 Find _Next = Sök _nästa
@@ -78,22 +99,8 @@ _Match case = _Matcha gemener/versaler
 _Whole word = Helt _ord
 Rege_x = Rege_x
 _In files = _I filer
-Find in Files = Sök i filer
+# The text displayed in the terminal version's find & replace pane.
 Find: = Sök:
-No results found = Inga resultat hittades
-[Files Found Buffer] = [Files Found Buffer]
-Binary file matches. = Binär fil matchar.
-Search wrapped = Sökningen slog runt
-Continue? = Continue?
-Still searching in files... Continue waiting? = Still searching in files... Continue waiting?
-Find in Files aborted = Find in Files aborted
-Error = Fel
-An error occurred: = Ett fel inträffade:
-#_OK = _Ok
-#_Cancel = _Avbryt
-replacement(s) made = ersättning(ar) gjord(a)
-# For curses:
-#Find: = Find:
 Replace: = Replace:
 [Next] = [Next]
 [Prev] = [Prev]
@@ -103,13 +110,30 @@ Case(F1) = Case(F1)
 Word(F2) = Word(F2)
 Regex(F3) = Regex(F3)
 Files(F4) = Files(F4)
+# The statusbar text shown when a search has wrapped back to the beginning of
+# the buffer.
+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
+# 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
+# shown in place of binary buffer text.
+Binary file matches. = Binär fil matchar.
+# The text displayed in a dialog when the user is prompted to continue a "Find
+# in Files" search that has taken longer than X seconds to complete.
+Continue? = Continue?
+Still searching in files... Continue waiting? = Still searching in files... Continue waiting?
+# The message displayed when a "Find in Files" search is aborted by the user.
+Find in Files aborted = Find in Files aborted
+# The statusbar text shown after performing a "Replace All".
+replacement(s) made = ersättning(ar) gjord(a)
 
-# modules/textadept/keys.lua
-Lexer = Lexer
-Style = Stil
-Error loading webpage: = Kunde inte läsa in webbsida:
-
-# modules/textadept/menu.lua
+# [modules/textadept/menu.lua]
+# Typical "File" menu items for creating new files, opening, saving, and closing
+# existing files, opening and saving sessions, and quitting Textadept.
 _File = _Arkiv
 _New = _Nytt
 _Open = _Öppna...
@@ -123,7 +147,7 @@ Close All = St_äng alla
 Loa_d Session... = _Ladda session...
 Sav_e Session... = S_para session...
 _Quit = _Avsluta
-
+# Typical "Edit" menu items for manipulating buffer text and source code.
 _Edit = R_edigera
 _Undo = _Ångra
 _Redo = _Gör om
@@ -140,7 +164,10 @@ _Highlight Word = _Framhäv ord
 Toggle _Block Comment = Kommentera
 T_ranspose Characters = Transponera t_ecken
 _Join Lines = _Slå ihop rader
+# The menu item for filtering text through a shell command and replacing input
+# text with that command's output text.
 _Filter Through = Fi_ltrera genom...
+# Menu items for selecting text and entities.
 _Select = _Markera
 Select to _Matching Brace = Markera till _matchande parentes
 Select between _XML Tags = Markera mellan _XML-taggar
@@ -153,6 +180,7 @@ Select in B_races = Markera inom _krullparenteser
 Select _Word = Markera _ord
 Select _Line = Markera _rad
 Select Para_graph = Markera para_graf
+# Menu items for transforming selected text.
 Selectio_n = Markeri_ng
 _Upper Case Selection = Gör till _stora bokstäver
 _Lower Case Selection = Gör till s_må bokstäver
@@ -165,53 +193,79 @@ Enclose in _Brackets = Sätt inom _hakparenteser
 Enclose in B_races = Sätt inom _krullparenteser
 _Move Selected Lines Up = _Flytta markerade rader upp
 Move Selected Lines Do_wn = Flytta markerade rader _ner
+# Menu items for searching and replacing text within buffers and files.
 _Search = _Sök
 _Find = _Sök...
-#Find _Next = Sök _nästa
 Find _Previous = Sök _bakåt
-#_Replace = _Ersätt
-#Replace _All = Ersätt _alla
 Find _Incremental = Sök _inkrementellt...
 Find in Fi_les = Sök i fi_ler...
 Goto Nex_t File Found = Gå till näs_ta funna fil
 Goto Previou_s File Found = Gå till f_öregående funna fil
+# Menu item for jumping to a specific line in a buffer.
 _Jump to = _Gå till rad...
+# Menu items for various tools and utilities for editing and working with source
+# code.
 _Tools = Verk_tyg
+# Menu item for opening Textadept's Lua command entry.
 Command _Entry = _Kommandorad...
+# Menu item for selecting a menu command to run.
 Select Co_mmand = _Välj kommando...
+# Menu items for running or compiling the current source file.
 _Run = K_ör
 _Compile = Ko_mpilera
+# Menu item for setting command line arguments for run and compile commands.
 Set _Arguments... = Sätt _argument...
+# The text displayed in the dialog for specifying command line arguments for run
+# and compile commands.
 Command line arguments = Kommandoradsargument
 For Run: = För Kör:
 For Compile: = För Kompilera:
+# Menu item for building the current project.
 Buil_d = B_ygg
+# Menu item for stopping a run, compile, or build shell command.
 S_top = Avbry_t
+# Menu items for navigating through recognized shell command errors.
 _Next Error = _Nästa fel
 _Previous Error = _Föregående fel
-_Complete Symbol = _Komplettera symbol
-Show _Documentation = Visa _dokumentation
+# Menu items for working with bookmarked lines in buffers.
 _Bookmark = _Bokmärke
 _Toggle Bookmark = Växla _bokmärke
 _Clear Bookmarks = _Rensa bokmärken
 _Next Bookmark = _Nästa bokmärke
 _Previous Bookmark = _Föregående bokmärke
 _Goto Bookmark... = _Gå till bokmärke...
+# Menu items for launching a quick open dialog in order to open files in certain
+# directories. A quick open dialog lists all files in a directory and its
+# subdirectories and filters the list down as the user types.
 Quick _Open = _Snabböppna
 Quickly Open _User Home = Snabböppna _användarkonfiguration...
 Quickly Open _Textadept Home = Snabböppna _systemkonfiguration...
 Quickly Open _Current Directory = Snabböppna _nuvarande katalog...
 Quickly Open Current _Project = Snabböppna nuvarande _projekt...
+# Menu items for working with snippets, insert-able pieces of code that act like
+# templates with placeholders for user input.
 _Snippets = Kodsn_uttar
 _Insert Snippet... = _Infoga kodsnutt...
 _Expand Snippet/Next Placeholder = Expandera kodsnutt/_Nästa fält
 _Previous Snippet Placeholder = _Föregående fält
 _Cancel Snippet = _Avbryt kodsnutt
+# Menu items for auto-completing programming language symbols and showing
+# documentation for them (e.g. typing `textadept.editing.` followed by a
+# "Complete Symbol" would show all possible completions for that symbol).
+_Complete Symbol = _Komplettera symbol
+Show _Documentation = Visa _dokumentation
+# Menu item for inspecting the character under the caret. The character's byte
+# information, the lexer used to syntax-highlight that character, and the
+# character's lexical style (e.g. string, comment, number, etc.) are shown.
 Show St_yle = Visa st_il
+Lexer = Lexer
+Style = Stil
+# Menu items for navigating between open buffers.
 _Buffer = _Buffer
 _Next Buffer = _Nästa buffer
 _Previous Buffer = _Föregående buffer
 _Switch to Buffer... = _Välj buffer...
+# Menu items for changing the indentation settings for the current buffer.
 _Indentation = _Indentering
 Tab width: _2 = Tab-bredd: _2
 Tab width: _3 = Tab-bredd: _3
@@ -219,17 +273,25 @@ Tab width: _4 = Tab-bredd: _4
 Tab width: _8 = Tab-bredd: _8
 _Toggle Use Tabs = _Växla tab-användning
 _Convert Indentation = _Konvertera indentering
+# Menu item for changing the end-of-line mode for the current buffer.
 _EOL Mode = Ra_dbrytningstecken
-#CRLF = CRLF (Windows)
-#LF = LF (Unix)
+# Menu items for changing the encoding of the current buffer's text.
 E_ncoding = Tecken_kodning
 _UTF-8 Encoding = UTF-_8
 _ASCII Encoding = AS_CII
 _ISO-8859-1 Encoding = ISO-8859-_1
 _MacRoman Encoding = _MacRoman
 UTF-1_6 Encoding = UTF-1_6
+# Menu items for changing the way the current buffer is displayed.
+Toggle View _EOL = Visa rad_brytningstecken
+Toggle _Wrap Mode = Växla _radbrytning
+Toggle View White_space = Växla blan_ktecken
+# Menu items for changing and refreshing the syntax-highlighting language for
+# the current buffer.
 Select _Lexer... = Välj språk (_lexer)...
 _Refresh Syntax Highlighting = _Uppdatera syntaxfärgning
+# Menu items for navigating between views, splitting them, closing them, and
+# resizing them.
 _View = _Vy
 _Next View = _Nästa vy
 _Previous View = _Föregående vy
@@ -239,46 +301,51 @@ _Unsplit View = Ena vy
 Unsplit _All Views = _Endast en vy
 _Grow View = För_stora vy
 Shrin_k View = För_miska vy
+# Menu item for folding (showing/hiding) the block of code the starts on the
+# current line. Fold-able blocks of code are typically classes, functions, and
+# control structures.
 Toggle Current _Fold = Fäll in/ut block
-Toggle View _EOL = Visa rad_brytningstecken
-Toggle _Wrap Mode = Växla _radbrytning
+# Menu item for showing line indentation markers.
 Toggle Show In_dent Guides = Visa in_denteringslinjer
-Toggle View White_space = Växla blan_ktecken
+# Menu item for allowing the caret to move beyond line ends and into "virtual
+# space".
 Toggle _Virtual Space = Växla virtuella kolumner
+# Menu items for changing the zoom factor of displayed buffer text.
 Zoom _In = Förstora
 Zoom _Out = Förminska
 _Reset Zoom = _Återställ zoom
+# Menu items for getting help on Textadept and its Lua API documentation.
 _Help = _Hjälp
 Show _Manual = _Manual
 Show _LuaDoc = _LuaDoc
 _About = _Om
+# The error message displayed when activating a menu item associated with an
+# unknown command.
+Unknown command: = Okänt kommando:
+# The text displayed in the dialog for running an arbitrary menu command. Any
+# key binding associated with commands are also shown.
+Run Command = Kör kommando
 Command = Kommando
 Key Command = Key Command
-Run Command = Kör kommando
-Unknown command: = Okänt kommando:
 
-# modules/textadept/mime_types.lua
+# [modules/textadept/file_types.lua]
+# The title of the dialog for selecting a lexer for the current buffer. Lexers
+# perform syntax highlighting of source code.
 Select Lexer = Välj lexer
-#Name = Namn
-
-# modules/textadept/run.lua
-does not exist = existerar inte
 
-# modules/textadept/session.lua
+# [modules/textadept/session.lua]
+# The title of the dialog for selecting a session file to load.
+Load Session = Ladda session
+# The text displayed in a dialog when files in a loaded session were not found.
 Session Files Not Found = Sessionsfiler hittades inte
 The following session files were not found = Följande sessionsfiler hittades inte
-#_OK = _Ok
-Load Session = Ladda session
+# The title of the dialog for selecting a session file to save.
 Save Session = Spara session
 
-# modules/textadept/snapopen.lua
-File Limit Exceeded = File Limit Exceeded
-files or more were found. Showing the first = eller fler filer funna. Visar de första
-#_OK = _Ok
-#Open = Öppna
-#File = Fil
-
-# modules/textadept/snippets.lua
+# [modules/textadept/snippets.lua]
+# The text displayed in the dialog for selecting a snippet to insert. Snippets
+# have a trigger word (pressing the "Tab" key after that word inserts the
+# snippet) and snippet text.
 Select Snippet = Välj snippet
 Trigger = Trigger
 Snippet Text = Snippet-text