From 49cb559c5bad6fa79702a5d642d456c8f40de248 Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@justemail.net>
Date: Fri, 17 Jun 2016 15:49:20 +0200
Subject: [PATCH] po: regenerated POT file, and updated PO files from TP

---
 po/bg.po    | 1146 ++++++++++++++++--------------
 po/ca.po    | 1221 +++++++++++++++++--------------
 po/cs.po    | 1233 +++++++++++++++++---------------
 po/da.po    | 1208 +++++++++++++++++--------------
 po/de.po    | 1225 ++++++++++++++++++--------------
 po/eo.po    | 1191 +++++++++++++++++--------------
 po/es.po    | 1234 +++++++++++++++++---------------
 po/eu.po    | 1146 ++++++++++++++++--------------
 po/fi.po    | 1843 +++++++++++++++++++++++++----------------------
 po/fr.po    | 1430 ++++++++++++++++++++-----------------
 po/ga.po    | 1167 +++++++++++++++---------------
 po/gl.po    | 1220 +++++++++++++++++--------------
 po/hr.po    | 1656 ++++++++++++++++++++++--------------------
 po/hu.po    | 1228 +++++++++++++++++---------------
 po/id.po    | 1127 +++++++++++++++--------------
 po/it.po    | 1299 +++++++++++++++++----------------
 po/ja.po    | 1165 ++++++++++++++++--------------
 po/ms.po    | 1199 +++++++++++++++++--------------
 po/nano.pot | 1083 ++++++++++++++--------------
 po/nb.po    | 1206 +++++++++++++++++--------------
 po/nl.po    | 1202 +++++++++++++++++--------------
 po/nn.po    | 1112 +++++++++++++++--------------
 po/pl.po    | 1972 +++++++++++++++++++++++++++------------------------
 po/pt_BR.po | 1221 +++++++++++++++++--------------
 po/ro.po    | 1239 +++++++++++++++++---------------
 po/ru.po    | 1233 +++++++++++++++++---------------
 po/sl.po    | 1248 +++++++++++++++++---------------
 po/sr.po    | 1261 +++++++++++++++++---------------
 po/sv.po    | 1309 ++++++++++++++++++----------------
 po/tr.po    | 1128 +++++++++++++++--------------
 po/uk.po    | 1237 +++++++++++++++++---------------
 po/vi.po    | 1196 +++++++++++++++++--------------
 po/zh_CN.po | 1179 ++++++++++++++++--------------
 po/zh_TW.po | 1173 ++++++++++++++++--------------
 34 files changed, 23311 insertions(+), 19626 deletions(-)

diff --git a/po/bg.po b/po/bg.po
index 866d3427..695cacc2 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 1.9.99pre0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-25 16:41-0500\n"
+"POT-Creation-Date: 2016-06-17 15:41+0200\n"
 "PO-Revision-Date: 2006-08-25 00:56+0300\n"
 "Last-Translator: Anton Zinoviev <zinoviev@debian.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -18,359 +18,343 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: src/browser.c:144 src/browser.c:284 src/browser.c:334 src/files.c:996
+#: src/files.c:1003 src/files.c:1794 src/files.c:1919 src/files.c:1963
+#: src/files.c:1983 src/files.c:2099 src/files.c:3019 src/files.c:3242
+#: src/rcfile.c:540 src/rcfile.c:1280
+#, c-format
+msgid "Error reading %s: %s"
+msgstr "Грешка при четене на %s: %s"
+
 #. TRANSLATORS: This is a prompt.
-#: src/browser.c:220
+#: src/browser.c:247
 msgid "Go To Directory"
 msgstr "Отиване в директория"
 
-#: src/browser.c:227 src/browser.c:738 src/files.c:1174 src/files.c:2340
-#: src/nano.c:1120 src/search.c:202 src/search.c:290 src/search.c:895
-#: src/search.c:970 src/text.c:2935 src/text.c:3142
+#: src/browser.c:254 src/browser.c:723 src/files.c:1126 src/files.c:2292
+#: src/nano.c:1128 src/search.c:195 src/search.c:297 src/search.c:851
+#: src/search.c:918 src/text.c:3189 src/text.c:3396
 msgid "Cancelled"
 msgstr "Отменено"
 
-#: src/browser.c:253 src/browser.c:300
-#, c-format
-msgid "Can't go outside of %s in restricted mode"
+#. TRANSLATORS: This refers to the option --operatingdir,
+#. * not to --restricted.
+#: src/browser.c:274 src/browser.c:326
+#, fuzzy, c-format
+msgid "Can't go outside of %s in confined mode"
 msgstr "Не може да се излезе от %s в ограничен режим"
 
-#: src/browser.c:264 src/browser.c:310 src/browser.c:326 src/files.c:1044
-#: src/files.c:1052 src/files.c:1844 src/files.c:1971 src/files.c:2016
-#: src/files.c:2037 src/files.c:2156 src/files.c:3062 src/files.c:3285
-#: src/rcfile.c:596 src/rcfile.c:1435
-#, c-format
-msgid "Error reading %s: %s"
-msgstr "Грешка при четене на %s: %s"
-
-#: src/browser.c:290
+#: src/browser.c:317
 msgid "Can't move up a directory"
 msgstr "Не може да се премине в горната директория"
 
 #. TRANSLATORS: Try to keep this at most 7 characters.
-#: src/browser.c:615 src/browser.c:623
+#: src/browser.c:590 src/browser.c:598
 msgid "(dir)"
 msgstr "(дир)"
 
 # TODO: по-добър превод
 #. TRANSLATORS: Try to keep this at most 12 characters.
-#: src/browser.c:620
+#: src/browser.c:595
 msgid "(parent dir)"
 msgstr "(родит.дир.)"
 
 #. TRANSLATORS: Try to keep this at most 7 characters.
 #. * If necessary, you can leave out the parentheses.
-#: src/browser.c:650
+#: src/browser.c:625
 msgid "(huge)"
 msgstr ""
 
 #. TRANSLATORS: This is the main search prompt.
-#: src/browser.c:727 src/search.c:173
+#: src/browser.c:712 src/search.c:166
 msgid "Search"
 msgstr "Търсене"
 
-#: src/browser.c:777 src/search.c:466 src/search.c:536
-msgid "This is the only occurrence"
-msgstr "Това е единственото съвпадение"
-
-#: src/browser.c:793 src/search.c:364
+#: src/browser.c:754 src/search.c:368
 msgid "Search Wrapped"
 msgstr "Търсене отначало"
 
-#: src/browser.c:843 src/search.c:517
+#: src/browser.c:764 src/search.c:509
+msgid "This is the only occurrence"
+msgstr "Това е единственото съвпадение"
+
+#: src/browser.c:812 src/search.c:473
 msgid "No current search pattern"
 msgstr "Няма въведен низ за търсене"
 
-#: src/files.c:50
+#: src/color.c:186
+#, fuzzy, c-format
+msgid "Unknown syntax name: %s"
+msgstr "Дублирано име на синтаксис %s"
+
+#: src/color.c:247
+#, c-format
+msgid "magic_load() failed: %s"
+msgstr ""
+
+#: src/color.c:251
+#, c-format
+msgid "magic_file(%s) failed: %s"
+msgstr ""
+
+#: src/files.c:47
 #, c-format
 msgid "Directory '%s' does not exist"
 msgstr ""
 
-#: src/files.c:52
+#: src/files.c:49
 #, c-format
 msgid "Path '%s': %s"
 msgstr ""
 
-#: src/files.c:54
+#: src/files.c:51
 #, fuzzy, c-format
 msgid "Path '%s' is not a directory"
 msgstr "„%s“ е директория"
 
-#: src/files.c:57
+#: src/files.c:53
 #, c-format
 msgid "Path '%s' is not accessible"
 msgstr ""
 
-#. TRANSLATORS: Try to keep this at most 76 characters.
-#: src/files.c:158
+#. TRANSLATORS: Keep the next ten messages at most 76 characters.
+#: src/files.c:148
 msgid ""
 "Warning: Modifying a file which is not locked, check directory permission?"
 msgstr ""
 
-#: src/files.c:197
+#: src/files.c:187
 msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
 msgstr ""
 
-#: src/files.c:206
+#: src/files.c:196
 #, fuzzy, c-format
 msgid "Couldn't determine hostname for lock file: %s"
 msgstr "Неуспех при създаването на временен файл: %s"
 
-#: src/files.c:227 src/files.c:238 src/files.c:275 src/files.c:285
+#: src/files.c:216 src/files.c:225 src/files.c:262 src/files.c:272
 #, fuzzy, c-format
 msgid "Error writing lock file %s: %s"
 msgstr "Грешка при записа на временен файл: %s"
 
-#: src/files.c:305
+#: src/files.c:291
 #, fuzzy, c-format
 msgid "Error deleting lock file %s: %s"
 msgstr "Грешка при записа на временен файл: %s"
 
-#: src/files.c:341
+#: src/files.c:325
 #, fuzzy, c-format
 msgid "Error opening lock file %s: %s"
 msgstr "Грешка при четене на %s: %s"
 
-#: src/files.c:353
+#: src/files.c:337
 #, c-format
 msgid "Error reading lock file %s: Not enough data read"
 msgstr ""
 
 #. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
-#: src/files.c:371
+#: src/files.c:354
 #, c-format
 msgid "File %s is being edited (by %s with %s, PID %d); continue?"
 msgstr ""
 
-#: src/files.c:426
+#: src/files.c:430
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Не може да се вмъкне файл извън %s"
 
-#: src/files.c:439 src/files.c:1038 src/rcfile.c:589 src/rcfile.c:1385
-#: src/rcfile.c:1426
+#: src/files.c:445 src/files.c:991 src/rcfile.c:533 src/rcfile.c:1230
+#: src/rcfile.c:1271
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "„%s“ е директория"
 
-#: src/files.c:441
+#: src/files.c:447
 #, fuzzy, c-format
 msgid "\"%s\" is not a normal file"
 msgstr "„%s“ е файл за устройство"
 
-#: src/files.c:566
+#: src/files.c:571
 msgid "No more open file buffers"
 msgstr "Няма повече буфери за отваряне на файлове"
 
-#: src/files.c:582
+#: src/files.c:586
 #, c-format
 msgid "Switched to %s"
 msgstr "Превключено на %s"
 
-#: src/files.c:584 src/global.c:988 src/winio.c:2010
+#: src/files.c:588 src/global.c:1005 src/winio.c:1965
 msgid "New Buffer"
 msgstr "Нов буфер"
 
-#: src/files.c:943
+#. TRANSLATORS: Keep the next four messages at most 76 characters.
+#: src/files.c:913
 #, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
 msgstr[0] "Прочетен %lu ред (конвертиран от DOS и Mac формат)"
 msgstr[1] "Прочетени %lu реда (конвертирани от DOS и Mac формат)"
 
-#: src/files.c:948
-#, fuzzy, c-format
-msgid ""
-"Read %lu line (Converted from DOS and Mac format - Warning: No write "
-"permission)"
-msgid_plural ""
-"Read %lu lines (Converted from DOS and Mac format - Warning: No write "
-"permission)"
-msgstr[0] "Прочетен %lu ред (конвертиран от DOS и Mac формат)"
-msgstr[1] "Прочетени %lu реда (конвертирани от DOS и Mac формат)"
-
-#: src/files.c:954
+#: src/files.c:919
 #, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
 msgstr[0] "Прочетен %lu ред (конвертиран от Mac формат)"
 msgstr[1] "Прочетени %lu реда (конвертирани от Mac формат)"
 
-#: src/files.c:958
-#, fuzzy, c-format
-msgid ""
-"Read %lu line (Converted from Mac format - Warning: No write permission)"
-msgid_plural ""
-"Read %lu lines (Converted from Mac format - Warning: No write permission)"
-msgstr[0] "Прочетен %lu ред (конвертиран от Mac формат)"
-msgstr[1] "Прочетени %lu реда (конвертирани от Mac формат)"
-
-#: src/files.c:964
+#: src/files.c:925
 #, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
 msgstr[0] "Прочетен %lu ред (конвертиран от DOS формат)"
 msgstr[1] "Прочетени %lu реда (конвертирани от DOS формат)"
 
-#: src/files.c:968
-#, fuzzy, c-format
-msgid ""
-"Read %lu line (Converted from DOS format - Warning: No write permission)"
-msgid_plural ""
-"Read %lu lines (Converted from DOS format - Warning: No write permission)"
-msgstr[0] "Прочетен %lu ред (конвертиран от DOS формат)"
-msgstr[1] "Прочетени %lu реда (конвертирани от DOS формат)"
-
-#: src/files.c:974
+#: src/files.c:930
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "Прочетен %lu ред"
 msgstr[1] "Прочетени %lu реда"
 
-#: src/files.c:977
-#, c-format
-msgid "Read %lu line (Warning: No write permission)"
-msgid_plural "Read %lu lines (Warning: No write permission)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/files.c:1019 src/files.c:1056
+#: src/files.c:974 src/files.c:1006
 msgid "Reading File"
 msgstr "Четене на файл"
 
-#: src/files.c:1025
+#: src/files.c:980
 msgid "New File"
 msgstr "Нов файл"
 
-#: src/files.c:1028
-#, c-format
-msgid "\"%s\" not found"
+#: src/files.c:983
+#, fuzzy, c-format
+msgid "File \"%s\" not found"
 msgstr "„%s“ не е намерен"
 
-#: src/files.c:1039 src/rcfile.c:590 src/rcfile.c:1386 src/rcfile.c:1427
+#: src/files.c:992 src/rcfile.c:534 src/rcfile.c:1231 src/rcfile.c:1272
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "„%s“ е файл за устройство"
 
-#: src/files.c:1133
+#: src/files.c:1083
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Команда за изпълнение в нов буфер [от %s] "
 
-#: src/files.c:1135
+#: src/files.c:1085
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Команда за изпълнение [от %s] "
 
-#: src/files.c:1142
+#: src/files.c:1092
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Файл за вмъкване в новия буфер [от %s] "
 
-#: src/files.c:1144
+#: src/files.c:1094
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Файл за вмъкване [от %s] "
 
-#: src/files.c:1389
+#: src/files.c:1338
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Клавишът е недопустим в режим без буфери"
 
-#: src/files.c:1684
-msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+#: src/files.c:1632
+msgid "Failed to write backup file; continue saving? (Say N if unsure.) "
 msgstr ""
 
-#: src/files.c:1800
+#: src/files.c:1750
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Не може да се запише извън %s"
 
-#: src/files.c:1885 src/files.c:1910 src/files.c:1928 src/files.c:1941
-#: src/files.c:1952 src/files.c:1981
+#: src/files.c:1833 src/files.c:1858 src/files.c:1876 src/files.c:1889
+#: src/files.c:1900 src/files.c:1928
 #, fuzzy, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Грешка при записа на временен файл: %s"
 
-#: src/files.c:1886 src/nano.c:690
+#: src/files.c:1834 src/nano.c:692
 msgid "Too many backup files?"
 msgstr "Твърде много резервни копия?"
 
-#: src/files.c:2026 src/text.c:2863 src/text.c:2875 src/text.c:3244
-#: src/text.c:3253
+#: src/files.c:1972 src/text.c:3117 src/text.c:3129 src/text.c:3498
+#: src/text.c:3507
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Грешка при записа на временен файл: %s"
 
-#: src/files.c:2049 src/files.c:2068 src/files.c:2080 src/files.c:2104
-#: src/files.c:2121 src/files.c:2131 src/files.c:2164 src/files.c:2171
+#: src/files.c:1994 src/files.c:2013 src/files.c:2023 src/files.c:2047
+#: src/files.c:2064 src/files.c:2074 src/files.c:2106 src/files.c:2113
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Грешка при запис на %s: %s"
 
-#: src/files.c:2200
+#: src/files.c:2154
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "Запазен е %lu ред"
 msgstr[1] "Запазени са %lu реда"
 
-#: src/files.c:2299
+#: src/files.c:2249
 msgid " [DOS Format]"
 msgstr " [DOS формат]"
 
-#: src/files.c:2300
+#: src/files.c:2250
 msgid " [Mac Format]"
 msgstr " [Mac формат]"
 
-#: src/files.c:2302
+#: src/files.c:2252
 msgid " [Backup]"
 msgstr " [Резервно копие]"
 
-#: src/files.c:2309
+#: src/files.c:2259
 msgid "Prepend Selection to File"
 msgstr "Прикрепяне на избрания текст в началото на файл"
 
-#: src/files.c:2310
+#: src/files.c:2260
 msgid "Append Selection to File"
 msgstr "Прикрепяне на избрания текст в края на файл"
 
-#: src/files.c:2311
+#: src/files.c:2261
 msgid "Write Selection to File"
 msgstr "Запазване на избрания текст във файл"
 
-#: src/files.c:2314
+#: src/files.c:2264
 msgid "File Name to Prepend to"
 msgstr "Име на файла за прикрепяне в началото му"
 
-#: src/files.c:2315
+#: src/files.c:2265
 msgid "File Name to Append to"
 msgstr "Име на файла за прикрепяне в края му"
 
-#: src/files.c:2316
+#: src/files.c:2266
 msgid "File Name to Write"
 msgstr "Име на файл за запазване"
 
-#: src/files.c:2349
-msgid "Save modified buffer anyway ? "
+#: src/files.c:2301
+msgid "Save modified buffer anyway? "
 msgstr ""
 
-#: src/files.c:2457
-msgid "File exists, OVERWRITE ? "
-msgstr "Файлът съществува, ПРЕЗАПИСВАНЕ? "
-
-#: src/files.c:2466
-msgid "Save file under DIFFERENT NAME ? "
+#: src/files.c:2412
+#, fuzzy
+msgid "Save file under DIFFERENT NAME? "
 msgstr "Запазване под РАЗЛИЧНО ИМЕ? "
 
-#: src/files.c:2480
-msgid "File was modified since you opened it, continue saving ? "
+#: src/files.c:2420
+#, fuzzy, c-format
+msgid "File \"%s\" exists; OVERWRITE? "
+msgstr "Файлът съществува, ПРЕЗАПИСВАНЕ? "
+
+#: src/files.c:2441
+msgid "File was modified since you opened it; continue saving? "
 msgstr ""
 
-#: src/files.c:2917
+#: src/files.c:2874
 msgid "(more)"
 msgstr "(повече)"
 
-#: src/files.c:3004
+#: src/files.c:2959
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -379,28 +363,28 @@ msgstr ""
 "\n"
 "Натиснете „Enter“, за да продължи стартирането на nano\n"
 
-#: src/files.c:3020
+#: src/files.c:2975
 #, c-format
 msgid ""
 "Unable to create directory %s: %s\n"
 "It is required for saving/loading search history or cursor positions.\n"
 msgstr ""
 
-#: src/files.c:3026
+#: src/files.c:2982
 #, c-format
 msgid ""
 "Path %s is not a directory and needs to be.\n"
 "Nano will be unable to load or save search history or cursor positions.\n"
 msgstr ""
 
-#: src/files.c:3045
+#: src/files.c:3002
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I tried to move\n"
 "to the preferred location (%s) but encountered an error: %s"
 msgstr ""
 
-#: src/files.c:3049
+#: src/files.c:3006
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I moved\n"
@@ -408,761 +392,792 @@ msgid ""
 "(see the nano FAQ about this change)"
 msgstr ""
 
-#: src/files.c:3132 src/files.c:3140 src/files.c:3164 src/files.c:3176
+#: src/files.c:3089 src/files.c:3097 src/files.c:3121 src/files.c:3133
 #, fuzzy, c-format
 msgid "Error writing %s: %s\n"
 msgstr "Грешка при запис на %s: %s"
 
 #. TRANSLATORS: Try to keep the next fifteen strings at most 10 characters.
-#: src/global.c:480
+#: src/global.c:483
 msgid "Exit"
 msgstr "Изход"
 
-#: src/global.c:481
+#: src/global.c:484
 msgid "Close"
 msgstr "Затваряне"
 
-#: src/global.c:482
+#: src/global.c:485
 #, fuzzy
 msgid "Uncut Text"
 msgstr "Поставяне"
 
-#: src/global.c:484
+#: src/global.c:487
 #, fuzzy
 msgid "Unjustify"
 msgstr "Изкл.подр."
 
-#: src/global.c:490
+#: src/global.c:493
 msgid "Read File"
 msgstr "Отваряне"
 
-#: src/global.c:491
+#: src/global.c:494
 msgid "Where Is"
 msgstr "Търсене"
 
-#: src/global.c:492
+#: src/global.c:495
 msgid "Replace"
 msgstr "Замяна"
 
-#: src/global.c:493
+#: src/global.c:496
 msgid "Go To Line"
 msgstr "Отив. ред"
 
-#: src/global.c:494
+#: src/global.c:497
 msgid "Prev Line"
 msgstr "Предишен ред"
 
-#: src/global.c:495
+#: src/global.c:498
 msgid "Next Line"
 msgstr "Следващ ред"
 
-#: src/global.c:496
+#: src/global.c:499
 msgid "Prev Page"
 msgstr "ПредСтр"
 
-#: src/global.c:497
+#: src/global.c:500
 msgid "Next Page"
 msgstr "СледвСтр"
 
-#: src/global.c:499
+#: src/global.c:502
 msgid "Justify"
 msgstr "Подравн."
 
-#: src/global.c:500
+#: src/global.c:503
 msgid "FullJstify"
 msgstr "Пълно подравн."
 
-#: src/global.c:502
+#: src/global.c:505
 msgid "Refresh"
 msgstr "Опресняване"
 
 #. TRANSLATORS: Try to keep this string at most 12 characters.
-#: src/global.c:505
+#: src/global.c:508
 msgid "WhereIs Next"
 msgstr "КъдеEследв."
 
 #. TRANSLATORS: The next long series of strings are shortcut descriptions;
 #. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:512
+#: src/global.c:515
 msgid "Justify the current paragraph"
 msgstr "Подравняване на текущия абзац"
 
-#: src/global.c:514
+#: src/global.c:517
 msgid "Cancel the current function"
 msgstr "Отмяна на текущата функция"
 
-#: src/global.c:515
+#: src/global.c:518
 msgid "Display this help text"
 msgstr "Извежда тази помощна информация"
 
-#: src/global.c:518
+#: src/global.c:521
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Затваряне на текущия файлов буфер/Изход от nano"
 
-#: src/global.c:520
+#: src/global.c:523
 msgid "Exit from nano"
 msgstr "Изход от nano"
 
-#: src/global.c:524
+#: src/global.c:527
 msgid "Write the current file to disk"
 msgstr "Запазване на текущия файл на диска"
 
-#: src/global.c:526
+#: src/global.c:529
 msgid "Insert another file into the current one"
 msgstr "Вмъкване на друг файл в текущия"
 
-#: src/global.c:528
+#: src/global.c:531
 msgid "Search for a string or a regular expression"
 msgstr "Търсене на низ или регулярен израз"
 
-#: src/global.c:531
+#: src/global.c:533
 #, fuzzy
 msgid "Search for a string"
 msgstr "Търсене на низ или регулярен израз"
 
-#: src/global.c:533
+#: src/global.c:534
+msgid "Refresh the file list"
+msgstr ""
+
+#: src/global.c:535
+#, fuzzy
+msgid "Go to lefthand column"
+msgstr "Отиване на посочен ред и стълб"
+
+#: src/global.c:536
+#, fuzzy
+msgid "Go to righthand column"
+msgstr "Отиване на посочен ред и стълб"
+
+#: src/global.c:538
 msgid "Go one screenful up"
 msgstr ""
 
-#: src/global.c:534
+#: src/global.c:539
 msgid "Go one screenful down"
 msgstr ""
 
-#: src/global.c:536
+#: src/global.c:541
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Отрязване на текущия ред и съхраняване в буфера за обмен"
 
-#: src/global.c:538
+#: src/global.c:543
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Отрязване от буфера за обмен и поставяне в текущия ред"
 
-#: src/global.c:539
+#: src/global.c:544
 msgid "Display the position of the cursor"
 msgstr "Показване на положението на курсора"
 
-#: src/global.c:541
+#: src/global.c:546
 msgid "Invoke the spell checker, if available"
 msgstr "Извикване на програмата за проверка на правописа"
 
-#: src/global.c:543
+#: src/global.c:548
 msgid "Replace a string or a regular expression"
 msgstr "Замяна на низ или регулярен израз"
 
-#: src/global.c:544
+#: src/global.c:549
 msgid "Go to line and column number"
 msgstr "Отиване на посочен ред и стълб"
 
-#: src/global.c:546
+#: src/global.c:551
 #, fuzzy
 msgid "Mark text starting from the cursor position"
 msgstr "Маркиране на текст в позицията на курсора"
 
-#: src/global.c:547
+#: src/global.c:552
 #, fuzzy
 msgid "Repeat the last search"
 msgstr "Повтаряне на последното търсене"
 
-#: src/global.c:549
+#: src/global.c:554
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "Отрязване на текущия ред и съхраняване в буфера за обмен"
 
-#: src/global.c:550
+#: src/global.c:555
 msgid "Indent the current line"
 msgstr "Отстъп вдясно на текущия ред"
 
-#: src/global.c:551
+#: src/global.c:556
 msgid "Unindent the current line"
 msgstr "Маха отстъпа на текущия ред"
 
-#: src/global.c:552
+#: src/global.c:558
+msgid "Comment/uncomment the current line or marked lines"
+msgstr ""
+
+#: src/global.c:560
 msgid "Undo the last operation"
 msgstr ""
 
-#: src/global.c:553
+#: src/global.c:561
 msgid "Redo the last undone operation"
 msgstr ""
 
-#: src/global.c:555
+#: src/global.c:563
 #, fuzzy
 msgid "Go back one character"
 msgstr "Отиване един символ назад"
 
-#: src/global.c:556
+#: src/global.c:564
 #, fuzzy
 msgid "Go forward one character"
 msgstr "Отиване един символ напред"
 
-#: src/global.c:558
+#: src/global.c:566
 #, fuzzy
 msgid "Go back one word"
 msgstr "Отиване назад с една дума"
 
-#: src/global.c:559
+#: src/global.c:567
 #, fuzzy
 msgid "Go forward one word"
 msgstr "Отиване напред с една дума"
 
-#: src/global.c:561
+#: src/global.c:569
 #, fuzzy
 msgid "Go to previous line"
 msgstr "Отиване на предишния ред"
 
-#: src/global.c:562
+#: src/global.c:570
 #, fuzzy
 msgid "Go to next line"
 msgstr "Отиване на следващия ред"
 
-#: src/global.c:563
+#: src/global.c:571
 #, fuzzy
 msgid "Go to beginning of current line"
 msgstr "Отиване в началото на текущия ред"
 
-#: src/global.c:564
+#: src/global.c:572
 #, fuzzy
 msgid "Go to end of current line"
 msgstr "Отиване в края на текущия ред"
 
-#: src/global.c:567
+#: src/global.c:575
 #, fuzzy
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "Отиване в началото на текущия абзац"
 
-#: src/global.c:569
+#: src/global.c:577
 #, fuzzy
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr "Отиване в края на текущия абзац"
 
-#: src/global.c:571
+#: src/global.c:579
 #, fuzzy
 msgid "Go to the first line of the file"
 msgstr "Отиване в началото на файла"
 
-#: src/global.c:572
+#: src/global.c:580
 #, fuzzy
 msgid "Go to the last line of the file"
 msgstr "Отиване в края на файла"
 
-#: src/global.c:574
+#: src/global.c:582
 #, fuzzy
 msgid "Go to the matching bracket"
 msgstr "Отиване при съответната скоба"
 
-#: src/global.c:576
+#: src/global.c:584
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "Превърта нагоре с един ред без да мести курсора"
 
-#: src/global.c:578
+#: src/global.c:586
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "Превърта надолу с един ред без да мести курсора"
 
-#: src/global.c:581
+#: src/global.c:589
 msgid "Switch to the previous file buffer"
 msgstr "Превключване на предишния файлов буфер"
 
-#: src/global.c:582
+#: src/global.c:590
 msgid "Switch to the next file buffer"
 msgstr "Превключване на следващия файлов буфер"
 
-#: src/global.c:584
+#: src/global.c:592
 msgid "Insert the next keystroke verbatim"
 msgstr "Вмъкване на следващия клавиш дословно"
 
-#: src/global.c:585
+#: src/global.c:593
 msgid "Insert a tab at the cursor position"
 msgstr "Вмъкване на символ за табулация при курсора"
 
-#: src/global.c:586
+#: src/global.c:594
 msgid "Insert a newline at the cursor position"
 msgstr "Вмъкване на символ за нов ред при курсора"
 
-#: src/global.c:587
+#: src/global.c:595
 msgid "Delete the character under the cursor"
 msgstr "Изтриване на символа под курсора"
 
-#: src/global.c:589
+#: src/global.c:597
 msgid "Delete the character to the left of the cursor"
 msgstr "Изтриване на символа вляво от курсора"
 
-#: src/global.c:592
+#: src/global.c:600
 #, fuzzy
 msgid "Cut backward from cursor to word start"
 msgstr "Отрязване от курсора до края на реда"
 
-#: src/global.c:594
+#: src/global.c:602
 #, fuzzy
 msgid "Cut forward from cursor to next word start"
 msgstr "Отрязване от курсора до края на реда"
 
-#: src/global.c:596
+#: src/global.c:604
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Отрязване от позицията на курсора до края на файла"
 
-#: src/global.c:599
+#: src/global.c:607
 msgid "Justify the entire file"
 msgstr "Подравняване на целия файл"
 
-#: src/global.c:603
+#: src/global.c:611
 msgid "Count the number of words, lines, and characters"
 msgstr "Преброяване на думите, редовете и знаците във файла"
 
-#: src/global.c:606
+#: src/global.c:614
 msgid "Refresh (redraw) the current screen"
 msgstr "Опресняване на текущия екран"
 
-#: src/global.c:608
+#: src/global.c:616
 msgid "Suspend the editor (if suspension is enabled)"
 msgstr ""
 
-#: src/global.c:610
+#: src/global.c:618
 msgid "Save file without prompting"
 msgstr ""
 
-#: src/global.c:611
+#: src/global.c:619
 msgid "Search next occurrence backward"
 msgstr ""
 
-#: src/global.c:612
+#: src/global.c:620
 msgid "Search next occurrence forward"
 msgstr ""
 
-#: src/global.c:614
+#: src/global.c:622
 msgid "Toggle the case sensitivity of the search"
 msgstr "Зачитане малки/големи букви при търсене (вкл/изкл)"
 
-#: src/global.c:616
+#: src/global.c:624
 msgid "Reverse the direction of the search"
 msgstr "Обратна посока на търсене"
 
-#: src/global.c:620
+#: src/global.c:628
 msgid "Toggle the use of regular expressions"
 msgstr "Използване на регулярни изрази (вкл/изкл)"
 
-#: src/global.c:624
+#: src/global.c:632
 msgid "Recall the previous search/replace string"
 msgstr "Връща предишния низ за търсене/замяна"
 
-#: src/global.c:626
+#: src/global.c:634
 msgid "Recall the next search/replace string"
 msgstr "Връща следващия низ за търсене/замяна"
 
-#: src/global.c:629
+#: src/global.c:637
 msgid "Go to file browser"
 msgstr "Отиване във файлов браузър"
 
-#: src/global.c:632
+#: src/global.c:640
 msgid "Toggle the use of DOS format"
 msgstr "Запазване на файла в DOS формат (вкл/изкл)"
 
-#: src/global.c:633
+#: src/global.c:641
 msgid "Toggle the use of Mac format"
 msgstr "Запазване на файла в Mac формат (вкл/изкл)"
 
-#: src/global.c:634
+#: src/global.c:642
 msgid "Toggle appending"
 msgstr "Вмъкване в края на файла (вкл/изкл)"
 
-#: src/global.c:635
+#: src/global.c:643
 msgid "Toggle prepending"
 msgstr "Вмъкване в началото на файла (вкл/изкл)"
 
-#: src/global.c:636
+#: src/global.c:644
 msgid "Toggle backing up of the original file"
 msgstr "Резервно копира съществуващи файлове (вкл/изкл)"
 
-#: src/global.c:637
+#: src/global.c:645
 msgid "Execute external command"
 msgstr "Изпълнение на външна команда"
 
-#: src/global.c:639
+#: src/global.c:647
 msgid "Close buffer without saving it"
 msgstr ""
 
-#: src/global.c:641
+#: src/global.c:649
 msgid "Toggle the use of a new buffer"
 msgstr "Използване на нов буфер (вкл/изкл)"
 
-#: src/global.c:644
+#: src/global.c:652
 msgid "Exit from the file browser"
 msgstr "Изход от файловия браузър"
 
-#: src/global.c:645
+#: src/global.c:653
 msgid "Go to the first file in the list"
 msgstr "Отиване при първия файл от списъка"
 
-#: src/global.c:646
+#: src/global.c:654
 msgid "Go to the last file in the list"
 msgstr "Отиване при последния файл от списъка"
 
-#: src/global.c:647
+#: src/global.c:655
 #, fuzzy
 msgid "Go to the previous file in the list"
 msgstr "Отиване при първия файл от списъка"
 
-#: src/global.c:648
+#: src/global.c:656
 #, fuzzy
 msgid "Go to the next file in the list"
 msgstr "Отиване при последния файл от списъка"
 
-#: src/global.c:649
+#: src/global.c:657
 msgid "Go to directory"
 msgstr "Отиване в директория"
 
-#: src/global.c:652
+#: src/global.c:660
 #, fuzzy
 msgid "Invoke the linter, if available"
 msgstr "Извикване на програмата за проверка на правописа"
 
-#: src/global.c:653
+#: src/global.c:661
 #, fuzzy
 msgid "Go to previous linter msg"
 msgstr "Отиване на предишния ред"
 
-#: src/global.c:654
+#: src/global.c:662
 #, fuzzy
 msgid "Go to next linter msg"
 msgstr "Отиване на следващия ред"
 
-#: src/global.c:656
+#: src/global.c:664
 #, fuzzy
 msgid "Invoke formatter, if available"
 msgstr "Извикване на програмата за проверка на правописа"
 
 #. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:671
+#: src/global.c:679
 msgid "Get Help"
 msgstr "Помощ"
 
-#: src/global.c:674 src/prompt.c:858
+#: src/global.c:682 src/prompt.c:855
 msgid "Cancel"
 msgstr "Отмяна"
 
-#: src/global.c:687
+#: src/global.c:695
 #, fuzzy
 msgid "Write Out"
 msgstr "Запазване"
 
-#: src/global.c:723
+#: src/global.c:731
 msgid "Go To Dir"
 msgstr "Отиване в директория"
 
-#: src/global.c:738
+#: src/global.c:746
 msgid "Cut Text"
 msgstr "Отрязване"
 
-#: src/global.c:753
+#: src/global.c:761
 msgid "To Spell"
 msgstr "Правопис"
 
-#: src/global.c:757
+#: src/global.c:765
 #, fuzzy
 msgid "To Linter"
 msgstr "Отив. ред"
 
-#: src/global.c:760
+#: src/global.c:768
 #, fuzzy
 msgid "Formatter"
 msgstr "DOS формат"
 
-#: src/global.c:767
+#: src/global.c:775
 msgid "Case Sens"
 msgstr "Зач. м/г"
 
-#: src/global.c:772
+#: src/global.c:780
 msgid "Regexp"
 msgstr "Рег.израз"
 
-#: src/global.c:777
+#: src/global.c:785
 msgid "Backwards"
 msgstr "Назад"
 
-#: src/global.c:784
+#: src/global.c:792
 msgid "No Replace"
 msgstr "Без замяна"
 
-#: src/global.c:792
+#: src/global.c:800
 msgid "Cur Pos"
 msgstr "Поз.курсор"
 
-#: src/global.c:807
+#: src/global.c:815
 msgid "First Line"
 msgstr "Първи ред"
 
-#: src/global.c:809
+#: src/global.c:817
 msgid "Last Line"
 msgstr "Посл. ред"
 
-#: src/global.c:816
+#: src/global.c:824
 #, fuzzy
 msgid "To Bracket"
 msgstr "Не е скоба"
 
-#: src/global.c:819
+#: src/global.c:827
 msgid "Mark Text"
 msgstr "Избор на текст"
 
-#: src/global.c:822
+#: src/global.c:830
 msgid "Copy Text"
 msgstr "Копиране"
 
-#: src/global.c:825
+#: src/global.c:833
 msgid "Indent Text"
 msgstr "Отстъп"
 
-#: src/global.c:827
+#: src/global.c:835
 msgid "Unindent Text"
 msgstr "Без отстъп"
 
-#: src/global.c:830
+#: src/global.c:838
 msgid "Undo"
 msgstr ""
 
-#: src/global.c:832
+#: src/global.c:840
 msgid "Redo"
 msgstr ""
 
-#: src/global.c:836 src/global.c:842
+#: src/global.c:844 src/global.c:850
 msgid "Back"
 msgstr "Назад"
 
-#: src/global.c:838 src/global.c:844
+#: src/global.c:846 src/global.c:852
 msgid "Forward"
 msgstr "Напред"
 
-#: src/global.c:849
+#: src/global.c:857
 msgid "Prev Word"
 msgstr "Предишна дума"
 
-#: src/global.c:851
+#: src/global.c:859
 msgid "Next Word"
 msgstr "Следваща дума"
 
-#: src/global.c:855
+#: src/global.c:863
 msgid "Home"
 msgstr "Home"
 
-#: src/global.c:857
+#: src/global.c:865
 msgid "End"
 msgstr "End"
 
-#: src/global.c:866
+#: src/global.c:874
 msgid "Beg of Par"
 msgstr "Нач. абзац"
 
-#: src/global.c:868
+#: src/global.c:876
 msgid "End of Par"
 msgstr "Край абзац"
 
-#: src/global.c:873
+#: src/global.c:881
 msgid "Scroll Up"
 msgstr "Превъртане нагоре"
 
-#: src/global.c:875
+#: src/global.c:883
 msgid "Scroll Down"
 msgstr "Превъртане надолу"
 
-#: src/global.c:880
+#: src/global.c:888
 #, fuzzy
 msgid "Prev File"
 msgstr "Предишен файл"
 
-#: src/global.c:882
+#: src/global.c:890
 msgid "Next File"
 msgstr "Следващ файл"
 
-#: src/global.c:891
+#: src/global.c:899
 #, fuzzy
 msgid "Verbatim"
 msgstr "Дословен вход"
 
-#: src/global.c:894
+#: src/global.c:902
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:896
+#: src/global.c:904
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:899
+#: src/global.c:907
 msgid "Delete"
 msgstr "Delete"
 
-#: src/global.c:901
+#: src/global.c:909
 msgid "Backspace"
 msgstr "Backspace"
 
 #. TRANSLATORS: The next two strings refer to cutting words.
-#: src/global.c:912
+#: src/global.c:920
 #, fuzzy
 msgid "Cut Left"
 msgstr "Отрязване"
 
-#: src/global.c:914
+#: src/global.c:922
 msgid "Cut Right"
 msgstr ""
 
-#: src/global.c:916
+#: src/global.c:924
 msgid "CutTillEnd"
 msgstr "Отр. до края"
 
-#: src/global.c:926
+#: src/global.c:934
 msgid "Word Count"
 msgstr "Брой на думи"
 
-#: src/global.c:933
+#: src/global.c:941
 #, fuzzy
 msgid "Suspend"
 msgstr "Временно спиране"
 
-#: src/global.c:937
+#: src/global.c:945
+#, fuzzy
+msgid "Comment Lines"
+msgstr "Следващ ред"
+
+#: src/global.c:949
 msgid "Save"
 msgstr ""
 
-#: src/global.c:940
+#: src/global.c:952
 #, fuzzy
 msgid "Previous"
 msgstr "Предишен файл"
 
-#: src/global.c:942
+#: src/global.c:954
 #, fuzzy
 msgid "Next"
 msgstr "СледвСтр"
 
-#: src/global.c:948
+#: src/global.c:960
 msgid "PrevHstory"
 msgstr "ПредИстор."
 
-#: src/global.c:951
+#: src/global.c:963
 msgid "NextHstory"
 msgstr "СледИстор."
 
-#: src/global.c:955
+#: src/global.c:972
 msgid "Go To Text"
 msgstr "Отиване на текст"
 
-#: src/global.c:959
+#: src/global.c:976
 msgid "DOS Format"
 msgstr "DOS формат"
 
-#: src/global.c:961
+#: src/global.c:978
 msgid "Mac Format"
 msgstr "Mac формат"
 
-#: src/global.c:969
+#: src/global.c:986
 msgid "Append"
 msgstr "Добавяне в края"
 
-#: src/global.c:971
+#: src/global.c:988
 msgid "Prepend"
 msgstr "Добавяне в нач."
 
-#: src/global.c:974
+#: src/global.c:991
 msgid "Backup File"
 msgstr "Резервно копие"
 
-#: src/global.c:981
+#: src/global.c:998
 msgid "Execute Command"
 msgstr "Изпълнение на команда"
 
-#: src/global.c:996
+#: src/global.c:1013
 msgid "To Files"
 msgstr "Към файловете"
 
-#: src/global.c:1004
+#: src/global.c:1021
 msgid "First File"
 msgstr "Първи файл"
 
-#: src/global.c:1006
+#: src/global.c:1023
 msgid "Last File"
 msgstr "Посл. файл"
 
-#: src/global.c:1010
+#: src/global.c:1027
 msgid "Discard buffer"
 msgstr ""
 
+#: src/global.c:1038
+msgid "Left Column"
+msgstr ""
+
+#: src/global.c:1040
+msgid "Right Column"
+msgstr ""
+
 #. TRANSLATORS: Try to keep the next two strings at most 20 characters.
-#: src/global.c:1020
+#: src/global.c:1047
 #, fuzzy
 msgid "Prev Lint Msg"
 msgstr "Предишен ред"
 
-#: src/global.c:1022
+#: src/global.c:1049
 #, fuzzy
 msgid "Next Lint Msg"
 msgstr "Следващ ред"
 
 #. TRANSLATORS: The next seventeen strings are toggle descriptions;
 #. * they are best kept shorter than 40 characters, but may be longer.
-#: src/global.c:1285
+#: src/global.c:1316
 msgid "Help mode"
 msgstr "Режим на помощ"
 
-#: src/global.c:1287
+#: src/global.c:1318
 msgid "Constant cursor position display"
 msgstr "Постоянно показване на позицията на курсора"
 
-#: src/global.c:1289
+#: src/global.c:1320
 msgid "Use of one more line for editing"
 msgstr "Използване на още един ред за редактиране"
 
-#: src/global.c:1291
+#: src/global.c:1322
 msgid "Smooth scrolling"
 msgstr "Плавно превъртане"
 
-#: src/global.c:1293
+#: src/global.c:1324
 #, fuzzy
 msgid "Soft wrapping of overlong lines"
 msgstr "Без пренасяне на дългите редове"
 
-#: src/global.c:1295
+#: src/global.c:1326
 msgid "Whitespace display"
 msgstr "Показване на интервали"
 
-#: src/global.c:1297
+#: src/global.c:1328
 msgid "Color syntax highlighting"
 msgstr "Синтактично осветяване"
 
-#: src/global.c:1299
+#: src/global.c:1330
 msgid "Smart home key"
 msgstr "Интелигентен клавиш „Home“"
 
-#: src/global.c:1301
+#: src/global.c:1332
 msgid "Auto indent"
 msgstr "Автоматичен отстъп"
 
-#: src/global.c:1303
+#: src/global.c:1334
 msgid "Cut to end"
 msgstr "Отрязване до края"
 
-#: src/global.c:1305
+#: src/global.c:1336
 #, fuzzy
 msgid "Hard wrapping of overlong lines"
 msgstr "Без пренасяне на дългите редове"
 
-#: src/global.c:1307
+#: src/global.c:1338
 msgid "Conversion of typed tabs to spaces"
 msgstr "Превръщане на табулации в интервали"
 
-#: src/global.c:1309
+#: src/global.c:1340
 msgid "Backup files"
 msgstr "Запазване на резервни копия"
 
-#: src/global.c:1311
+#: src/global.c:1342
 msgid "Reading file into separate buffer"
 msgstr ""
 
-#: src/global.c:1313
+#: src/global.c:1344
 msgid "Mouse support"
 msgstr "Поддръжка на мишка"
 
-#: src/global.c:1315
+#: src/global.c:1346
 msgid "No conversion from DOS/Mac format"
 msgstr "Без конвертиране от DOS/Mac формат"
 
-#: src/global.c:1317
+#: src/global.c:1348
 msgid "Suspension"
 msgstr "Временно спиране"
 
-#: src/help.c:209
+#: src/help.c:211
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1184,7 +1199,7 @@ msgstr ""
 "търсене. Ако натиснете „Enter“, без да въвеждате текст, ще се извърши "
 "предишнто търсене.  "
 
-#: src/help.c:218
+#: src/help.c:220
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1198,7 +1213,7 @@ msgstr ""
 " Следните клавиши за достъпни в режим „Търсене“:\n"
 "\n"
 
-#: src/help.c:224
+#: src/help.c:226
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1218,7 +1233,7 @@ msgstr ""
 " Следните клавишни комбинации са налични в режим „Отиване на ред“:\n"
 "\n"
 
-#: src/help.c:233
+#: src/help.c:235
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1240,7 +1255,7 @@ msgstr ""
 "за вмъкване ще се зареди в отделен буфер. Използвайте Meta-< и >, за да "
 "превключвате между буферите.  "
 
-#: src/help.c:242
+#: src/help.c:244
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1254,7 +1269,7 @@ msgstr ""
 " Следните клавишни комбинации са налични в режим „Вмъкване на файл“:\n"
 "\n"
 
-#: src/help.c:248
+#: src/help.c:250
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1280,7 +1295,7 @@ msgstr ""
 " Следните клавишни комбинации са налични в режим „Запазване на файл“:\n"
 "\n"
 
-#: src/help.c:262
+#: src/help.c:264
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1304,7 +1319,7 @@ msgstr ""
 " Следните клавишни комбинации са налични във файловия браузър:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:277
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1328,7 +1343,7 @@ msgstr ""
 "предишното търсене.\n"
 "\n"
 
-#: src/help.c:284
+#: src/help.c:286
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1336,7 +1351,7 @@ msgstr ""
 "Следните функционални клавиши са достъпни в режим „Търсене“:\n"
 "\n"
 
-#: src/help.c:288
+#: src/help.c:290
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1359,7 +1374,7 @@ msgstr ""
 "браузъра:\n"
 "\n"
 
-#: src/help.c:301
+#: src/help.c:303
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1383,7 +1398,7 @@ msgstr ""
 " Може да се използват следните допълнителни функционални клавиши:\n"
 "\n"
 
-#: src/help.c:316
+#: src/help.c:318
 #, fuzzy
 msgid ""
 "Execute Command Help Text\n"
@@ -1404,7 +1419,7 @@ msgstr ""
 " Може да се използват следните функционални клавиши:\n"
 "\n"
 
-#: src/help.c:329
+#: src/help.c:331
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1424,15 +1439,15 @@ msgstr ""
 "редактора, показващ редактирания файл. Лентата за състоянието е третият ред "
 "от долу нагоре и е предназначен за важни съобщения.  "
 
-#: src/help.c:339
+#: src/help.c:341
+#, fuzzy
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
-" The notation for shortcuts is as follows: Control-key sequences are notated "
-"with a caret (^) symbol and can be entered either by using the Control "
-"(Ctrl) key or pressing the Escape (Esc) key twice.  Escape-key sequences are "
-"notated with the Meta (M-) symbol and can be entered using either the Esc, "
-"Alt, or Meta key depending on your keyboard setup.  "
+" Shortcuts are written as follows: Control-key sequences are notated with a "
+"'^' and can be entered either by using the Ctrl key or pressing the Esc key "
+"twice.  Meta-key sequences are notated with 'M-' and can be entered using "
+"either the Alt, Cmd, or Esc key, depending on your keyboard setup.  "
 msgstr ""
 "Долните два реда показват най-често използваните бързи клавиши в редактора.\n"
 "\n"
@@ -1461,21 +1476,21 @@ msgstr ""
 msgid "enable/disable"
 msgstr "(вкл/изкл)"
 
-#: src/nano.c:559
+#: src/nano.c:560
 #, fuzzy
 msgid "Key is invalid in view mode"
 msgstr "Непозволен клавиш в режим на преглед"
 
-#: src/nano.c:565
+#: src/nano.c:566
 #, fuzzy
 msgid "This function is disabled in restricted mode"
 msgstr "Не може да се излезе от %s в ограничен режим"
 
-#: src/nano.c:573
+#: src/nano.c:574
 msgid "Help is not available"
 msgstr ""
 
-#: src/nano.c:684
+#: src/nano.c:686
 #, c-format
 msgid ""
 "\n"
@@ -1484,7 +1499,7 @@ msgstr ""
 "\n"
 "Буферът е записан в %s\n"
 
-#: src/nano.c:686
+#: src/nano.c:688
 #, c-format
 msgid ""
 "\n"
@@ -1493,7 +1508,7 @@ msgstr ""
 "\n"
 "Буферът не е записан в %s: %s\n"
 
-#: src/nano.c:689
+#: src/nano.c:691
 #, c-format
 msgid ""
 "\n"
@@ -1760,18 +1775,23 @@ msgstr "Позволява временно спиране"
 msgid "Enable soft line wrapping"
 msgstr "Автоматично пренасяне"
 
-#: src/nano.c:937
-#, fuzzy, c-format
-msgid " GNU nano, version %s\n"
-msgstr " GNU nano, версия %s (компилиран в %s часа на %s)\n"
-
 #: src/nano.c:940
 #, c-format
+msgid " nano, version %s\n"
+msgstr ""
+
+#: src/nano.c:943
+#, c-format
+msgid " (C) 2014..%s the contributors to nano\n"
+msgstr ""
+
+#: src/nano.c:945
+#, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr ""
 " Е-поща: nano@nano-editor.org\tИнтернет адрес: http://www.nano-editor.org/"
 
-#: src/nano.c:941
+#: src/nano.c:946
 #, c-format
 msgid ""
 "\n"
@@ -1780,68 +1800,82 @@ msgstr ""
 "\n"
 " Компилирани опции:"
 
-#: src/nano.c:1073
+#: src/nano.c:1081
 msgid "No file name"
 msgstr ""
 
-#: src/nano.c:1108
-msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
+#: src/nano.c:1115
+msgid "Save modified buffer?  (Answering \"No\" will DISCARD changes.) "
 msgstr ""
-"Запазване на променения буфер? (ПРИ ОТГОВОР „Не“ ПРОМЕНИТЕ ЩЕ СЕ ЗАГУБЯТ)"
 
-#: src/nano.c:1168
+#: src/nano.c:1178
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr ""
 
-#: src/nano.c:1192
+#: src/nano.c:1202
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr ""
 
-#: src/nano.c:1256
+#: src/nano.c:1266
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Получи се SIGHUP или SIGTERM\n"
 
-#: src/nano.c:1272
+#: src/nano.c:1282
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Използвайте „fg“, за да се върнете в nano.\n"
 
-#: src/nano.c:1294
+#: src/nano.c:1304
 msgid "Suspension is not enabled"
 msgstr ""
 
-#: src/nano.c:1448
+#: src/nano.c:1459
 msgid "enabled"
 msgstr "активирано"
 
-#: src/nano.c:1448
+#: src/nano.c:1459
 msgid "disabled"
 msgstr "деактивирано"
 
-#: src/nano.c:1607 src/winio.c:1125
-msgid "Unknown Command"
-msgstr "Неизвестна команда"
+#: src/nano.c:1573
+msgid "Unbound key"
+msgstr ""
+
+#: src/nano.c:1577
+#, c-format
+msgid "Unbound key: M-%c"
+msgstr ""
+
+#: src/nano.c:1579
+#, c-format
+msgid "Unbound key: ^%c"
+msgstr ""
+
+#: src/nano.c:1581
+#, c-format
+msgid "Unbound key: %c"
+msgstr ""
 
-#: src/nano.c:1720
+#: src/nano.c:1745
 msgid "XON ignored, mumble mumble"
 msgstr "„XON“ е пренебрегнат, мън-мън."
 
-#: src/nano.c:1725
+#: src/nano.c:1750
 msgid "XOFF ignored, mumble mumble"
 msgstr "„XOFF“ е пренебрегнат, мън-мън."
 
-#: src/nano.c:2139 src/rcfile.c:1334
+#: src/nano.c:2166 src/rcfile.c:1187
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Поисканият размер на табулация „%s“ е неправилен"
 
-#: src/nano.c:2200 src/rcfile.c:1259
+#: src/nano.c:2227 src/rcfile.c:1128
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Поисканият размер „%s“ за максимална дължина на редове е неправилен"
 
-#: src/nano.c:2247
+#: src/nano.c:2276
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr ""
@@ -1849,116 +1883,120 @@ msgstr ""
 #. TRANSLATORS: For the next three strings, if possible, specify
 #. * the single-byte shortcuts for both your language and English.
 #. * For example, in French: "OoYy" for "Oui".
-#: src/prompt.c:821
+#: src/prompt.c:818
 msgid "Yy"
 msgstr "YyДд"
 
-#: src/prompt.c:822
+#: src/prompt.c:819
 msgid "Nn"
 msgstr "NnНн"
 
-#: src/prompt.c:823
+#: src/prompt.c:820
 msgid "Aa"
 msgstr "AaВв"
 
-#: src/prompt.c:845
+#: src/prompt.c:842
 msgid "Yes"
 msgstr "Да"
 
-#: src/prompt.c:850
+#: src/prompt.c:847
 msgid "All"
 msgstr "Всички"
 
-#: src/prompt.c:855
+#: src/prompt.c:852
 msgid "No"
 msgstr "Не"
 
-#: src/rcfile.c:142
+#: src/rcfile.c:144
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Грешка в %s на ред %lu: "
 
-#: src/rcfile.c:201
+#: src/rcfile.c:203
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "Аргументът „%s“ има незатворенa \""
 
-#: src/rcfile.c:228 src/rcfile.c:280 src/rcfile.c:732 src/rcfile.c:793
-#: src/rcfile.c:882 src/rcfile.c:933
+#: src/rcfile.c:231 src/rcfile.c:674 src/rcfile.c:725 src/rcfile.c:824
 msgid "Regex strings must begin and end with a \" character"
 msgstr ""
 "Низовете за регулярни изрази трябва да започват и завършват със символа \""
 
-#: src/rcfile.c:254 src/search.c:62
+#: src/rcfile.c:257 src/search.c:61
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Неправилен регулярен израз \"%s\": %s"
 
-#: src/rcfile.c:274
+#: src/rcfile.c:279
 msgid "Missing syntax name"
 msgstr "Липсва името на синтаксиса"
 
-#: src/rcfile.c:345
+#: src/rcfile.c:288
+msgid "A syntax name must be quoted"
+msgstr ""
+
+#: src/rcfile.c:297
 msgid "The \"none\" syntax is reserved"
 msgstr "Синтаксисът „none“ е запазен"
 
-#: src/rcfile.c:352
-msgid "The \"default\" syntax must take no extensions"
+#: src/rcfile.c:327
+#, fuzzy
+msgid "The \"default\" syntax does not accept extensions"
 msgstr "Синтаксисът „default“ не приема разширения"
 
-#: src/rcfile.c:424
+#: src/rcfile.c:369
 #, fuzzy
 msgid "Missing key name"
 msgstr "Липсва името на синтаксиса"
 
-#: src/rcfile.c:433 src/rcfile.c:444
+#: src/rcfile.c:378 src/rcfile.c:389
 msgid "Key name is too short"
 msgstr ""
 
-#: src/rcfile.c:454
+#: src/rcfile.c:399
 msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr ""
 
-#: src/rcfile.c:457
+#: src/rcfile.c:402
 #, fuzzy, c-format
 msgid "Key name %s is invalid"
 msgstr "Поисканият размер на табулация „%s“ е неправилен"
 
-#: src/rcfile.c:466
+#: src/rcfile.c:411
 msgid "Must specify a function to bind the key to"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the word "all".
-#: src/rcfile.c:476
+#: src/rcfile.c:421
 msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
 
-#: src/rcfile.c:483
+#: src/rcfile.c:428
 #, c-format
 msgid "Cannot map name \"%s\" to a function"
 msgstr ""
 
-#: src/rcfile.c:490
+#: src/rcfile.c:435
 #, c-format
 msgid "Cannot map name \"%s\" to a menu"
 msgstr ""
 
-#: src/rcfile.c:522
+#: src/rcfile.c:467
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr ""
 
-#: src/rcfile.c:534
+#: src/rcfile.c:479
 #, c-format
 msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr ""
 
-#: src/rcfile.c:631
+#: src/rcfile.c:576
 #, fuzzy, c-format
 msgid "Error expanding %s: %s"
 msgstr "Грешка при четене на %s: %s"
 
-#: src/rcfile.c:674
+#: src/rcfile.c:616
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1973,129 +2011,112 @@ msgstr ""
 "„black“, с възможна представка „bright“\n"
 "за цветове на преден план."
 
-#: src/rcfile.c:696
-msgid "Cannot add a color command without a syntax command"
-msgstr "Не може да бъде добавена команда за цвят без синтактична команда"
+#: src/rcfile.c:637 src/rcfile.c:795 src/rcfile.c:858
+#, c-format
+msgid "A '%s' command requires a preceding 'syntax' command"
+msgstr ""
 
-#: src/rcfile.c:701
+#: src/rcfile.c:643
 msgid "Missing color name"
 msgstr "Липсва името на цвета"
 
-#: src/rcfile.c:711 src/rcfile.c:872
-msgid "Missing regex string"
+#: src/rcfile.c:653 src/rcfile.c:807
+#, fuzzy, c-format
+msgid "Missing regex string after '%s' command"
 msgstr "Липсва низът за регулярния израз"
 
-#: src/rcfile.c:787
+#: src/rcfile.c:719
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "„start=“ изисква съответстващ „end=“"
 
-#: src/rcfile.c:839
+#: src/rcfile.c:768
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
 msgstr "Цветът за фон „%s“ не може да бъде ярък"
 
-#: src/rcfile.c:867
-#, fuzzy
-msgid "Cannot add a header regex without a syntax command"
-msgstr "Не може да бъде добавена команда за цвят без синтактична команда"
-
-#: src/rcfile.c:922
-#, fuzzy
-msgid "Cannot add a magic string regex without a syntax command"
-msgstr "Не може да бъде добавена команда за цвят без синтактична команда"
-
-#: src/rcfile.c:927
-#, fuzzy
-msgid "Missing magic string name"
-msgstr "Липсва низът за регулярния израз"
-
-#: src/rcfile.c:985
-#, fuzzy
-msgid "Cannot add a linter without a syntax command"
-msgstr "Не може да бъде добавена команда за цвят без синтактична команда"
-
-#: src/rcfile.c:990
-#, fuzzy
-msgid "Missing linter command"
-msgstr "Липсва името на цвета"
-
-#: src/rcfile.c:1011
-#, fuzzy
-msgid "Cannot add formatter without a syntax command"
-msgstr "Не може да бъде добавена команда за цвят без синтактична команда"
+#: src/rcfile.c:802
+#, fuzzy, c-format
+msgid "The \"default\" syntax does not accept '%s' regexes"
+msgstr "Синтаксисът „default“ не приема разширения"
 
-#: src/rcfile.c:1016
-msgid "Missing formatter command"
+#: src/rcfile.c:863
+#, c-format
+msgid "Missing command after '%s'"
 msgstr ""
 
-#: src/rcfile.c:1046
+#: src/rcfile.c:879
+#, fuzzy, c-format
+msgid "Argument of '%s' lacks closing \""
+msgstr "Аргументът „%s“ има незатворенa \""
+
+#: src/rcfile.c:910
 #, c-format
 msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr ""
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:912
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
 
-#: src/rcfile.c:1109
+#: src/rcfile.c:971
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr ""
 
-#: src/rcfile.c:1125 src/rcfile.c:1134 src/rcfile.c:1144
-#, c-format
-msgid "Command \"%s\" not allowed in included file"
-msgstr "Командата „%s“ не е позволена във вмъкван файл"
-
-#: src/rcfile.c:1150 src/rcfile.c:1359
+#: src/rcfile.c:993 src/rcfile.c:1202
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Синтаксисът „%s“ няма команди за цветове"
 
-#: src/rcfile.c:1180
+#: src/rcfile.c:1024
+#, c-format
+msgid "Command \"%s\" not allowed in included file"
+msgstr "Командата „%s“ не е позволена във вмъкван файл"
+
+#: src/rcfile.c:1039
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Командата „%s“ е неизвестна"
 
-#: src/rcfile.c:1195
+#: src/rcfile.c:1051
 #, fuzzy
 msgid "Missing option"
 msgstr "Липсва името на цвета"
 
-#: src/rcfile.c:1217
+#: src/rcfile.c:1065
+#, fuzzy, c-format
+msgid "Unknown option \"%s\""
+msgstr "Неизвестен флаг „%s“"
+
+#: src/rcfile.c:1077
+#, fuzzy, c-format
+msgid "Cannot unset option \"%s\""
+msgstr "Не може да се отмени флаг „%s“"
+
+#: src/rcfile.c:1089
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Опцията „%s“ изисква аргумент"
 
-#: src/rcfile.c:1235
+#: src/rcfile.c:1105
 msgid "Option is not a valid multibyte string"
 msgstr "Опцията не е правилен многобайтов низ"
 
-#: src/rcfile.c:1272 src/rcfile.c:1300 src/rcfile.c:1309
+#: src/rcfile.c:1139 src/rcfile.c:1160 src/rcfile.c:1167
 msgid "Non-blank characters required"
 msgstr "Необходими са символи, които не са празни"
 
-#: src/rcfile.c:1282
+#: src/rcfile.c:1146
 msgid "Two single-column characters required"
 msgstr "Необходими са два символа с нормална ширина"
 
-#: src/rcfile.c:1348
-#, fuzzy, c-format
-msgid "Cannot unset option \"%s\""
-msgstr "Не може да се отмени флаг „%s“"
-
-#: src/rcfile.c:1354
-#, fuzzy, c-format
-msgid "Unknown option \"%s\""
-msgstr "Неизвестен флаг „%s“"
-
-#: src/rcfile.c:1413
+#: src/rcfile.c:1258
 msgid "I can't find my home directory!  Wah!"
 msgstr "Не може да бъде намерена домашната директория! Ах!"
 
-#: src/rcfile.c:1451
+#: src/rcfile.c:1295
 #, c-format
 msgid ""
 "\n"
@@ -2104,44 +2125,49 @@ msgstr ""
 "\n"
 "Натиснете „Enter“, за да продължи стартирането на nano\n"
 
-#: src/search.c:96
+#: src/search.c:95
 #, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "„%.*s%s“ не е намерен"
 
 #. TRANSLATORS: The next three strings are modifiers of the search prompt.
-#: src/search.c:176
+#: src/search.c:169
 msgid " [Case Sensitive]"
 msgstr " [Зачитане на малки/големи]"
 
-#: src/search.c:180
+#: src/search.c:173
 msgid " [Regexp]"
 msgstr " [Рег.израз]"
 
-#: src/search.c:184
+#: src/search.c:177
 msgid " [Backwards]"
 msgstr " [Назад]"
 
 #. TRANSLATORS: The next two strings are modifiers of the search prompt.
-#: src/search.c:189
+#: src/search.c:182
 msgid " (to replace) in selection"
 msgstr " (за замяна) в избрания текст"
 
-#: src/search.c:191
+#: src/search.c:184
 msgid " (to replace)"
 msgstr " (за замяна)"
 
+#: src/search.c:305
+#, fuzzy
+msgid "Searching..."
+msgstr "Търсене"
+
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:718
+#: src/search.c:693
 msgid "Replace this instance?"
 msgstr "Замяна на това съвпадение?"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:883
+#: src/search.c:840
 msgid "Replace with"
 msgstr "Замяна с"
 
-#: src/search.c:924
+#: src/search.c:875
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
@@ -2149,297 +2175,325 @@ msgstr[0] "Заменено е %lu съвпадение"
 msgstr[1] "Заменени са %lu съвпадения"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:964
+#: src/search.c:914
 msgid "Enter line number, column number"
 msgstr "Въведете номер на ред и стълб"
 
-#: src/search.c:991
+#: src/search.c:939
 #, fuzzy
 msgid "Invalid line or column number"
 msgstr "Въведете номер на ред и стълб"
 
-#: src/search.c:1124
+#: src/search.c:1080
 msgid "Not a bracket"
 msgstr "Не е скоба"
 
-#: src/search.c:1191
+#: src/search.c:1146
 msgid "No matching bracket"
 msgstr "Няма съвпадаща скоба"
 
-#: src/text.c:54
+#: src/text.c:53
 msgid "Mark Set"
 msgstr "Уставено е маркиране"
 
-#: src/text.c:58
+#: src/text.c:57
 msgid "Mark Unset"
 msgstr "Отменено е маркирането"
 
-#: src/text.c:70
+#: src/text.c:69
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Грешка при извикване на „%s“"
 
-#: src/text.c:475
-msgid "Nothing in undo buffer!"
+#: src/text.c:468
+msgid "Commenting is not supported for this file type"
 msgstr ""
 
-#: src/text.c:481 src/text.c:634
-#, c-format
-msgid "Internal error: can't match line %d.  Please save your work."
+#: src/text.c:484
+msgid "Cannot comment past end of file"
+msgstr ""
+
+#: src/text.c:677
+msgid "Nothing in undo buffer!"
 msgstr ""
 
 #. TRANSLATORS: Eight of the next nine strings describe actions
 #. * that are undone or redone.  It are all nouns, not verbs.
-#: src/text.c:495 src/text.c:524 src/text.c:645 src/text.c:686
+#: src/text.c:695 src/text.c:724 src/text.c:857 src/text.c:898
 msgid "text add"
 msgstr ""
 
-#: src/text.c:505 src/text.c:656
+#: src/text.c:705 src/text.c:868
 #, fuzzy
 msgid "text delete"
 msgstr "Следващ файл"
 
-#: src/text.c:528 src/text.c:694
+#: src/text.c:728 src/text.c:907
 msgid "line join"
 msgstr ""
 
-#: src/text.c:547 src/text.c:710
+#: src/text.c:747 src/text.c:923
 msgid "text cut"
 msgstr ""
 
-#: src/text.c:552 src/text.c:714
+#: src/text.c:752 src/text.c:927
 msgid "text uncut"
 msgstr ""
 
-#: src/text.c:558 src/text.c:691
+#: src/text.c:758 src/text.c:903
 msgid "Internal error: line is missing.  Please save your work."
 msgstr ""
 
-#: src/text.c:561 src/text.c:665
+#: src/text.c:762 src/text.c:877
 msgid "line break"
 msgstr ""
 
-#: src/text.c:569 src/text.c:725
+#: src/text.c:772 src/text.c:947
+msgid "comment"
+msgstr ""
+
+#: src/text.c:776 src/text.c:951
+msgid "uncomment"
+msgstr ""
+
+#: src/text.c:780 src/text.c:938
 #, fuzzy
 msgid "text insert"
 msgstr "Следващ ред"
 
-#: src/text.c:589 src/text.c:718
+#: src/text.c:800 src/text.c:931
 #, fuzzy
 msgid "text replace"
 msgstr " (за замяна)"
 
-#: src/text.c:596 src/text.c:732 src/text.c:1030 src/text.c:1174
+#: src/text.c:807 src/text.c:955 src/text.c:1267 src/text.c:1437
 msgid "Internal error: unknown type.  Please save your work."
 msgstr ""
 
-#: src/text.c:601
+#: src/text.c:813
 #, c-format
 msgid "Undid action (%s)"
 msgstr ""
 
-#: src/text.c:619
+#: src/text.c:832
 msgid "Nothing to re-do!"
 msgstr ""
 
-#: src/text.c:628
+#: src/text.c:841
 msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
 
-#: src/text.c:737
+#: src/text.c:961
 #, c-format
 msgid "Redid action (%s)"
 msgstr ""
 
-#: src/text.c:827 src/text.c:2508 src/text.c:2944
+#: src/text.c:1051 src/text.c:2765 src/text.c:3198
 msgid "Could not create pipe"
 msgstr "Неуспех при създаването на pipe"
 
-#: src/text.c:853 src/text.c:2595 src/text.c:2750 src/text.c:2992
-#: src/text.c:3286
+#: src/text.c:1077 src/text.c:2852 src/text.c:3005 src/text.c:3246
+#: src/text.c:3540
 msgid "Could not fork"
 msgstr "Неуспех при fork"
 
-#: src/text.c:1853
+#: src/text.c:2117
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Неправилен низ за цитиране %s: %s"
 
-#: src/text.c:2241
+#: src/text.c:2499
 msgid "Can now UnJustify!"
 msgstr "Сега може да се отмени подравняването!"
 
-#: src/text.c:2435
+#: src/text.c:2697
 msgid "Edit a replacement"
 msgstr "Редактиране на замяна"
 
-#: src/text.c:2510
+#. TRANSLATORS: Shown after fixing misspellings in one word.
+#: src/text.c:2713
+#, fuzzy
+msgid "Next word..."
+msgstr "Следваща дума"
+
+#: src/text.c:2767
 msgid "Creating misspelled word list, please wait..."
 msgstr "Създаване на списък със сгрешени думи, изчакайте..."
 
-#: src/text.c:2601 src/text.c:2999
+#: src/text.c:2858 src/text.c:3253
 msgid "Could not get size of pipe buffer"
 msgstr "Не може да се определи размера на буфера на pipe"
 
-#: src/text.c:2652
+#: src/text.c:2907
 msgid "Error invoking \"spell\""
 msgstr "Грешка при извикване на „spell“"
 
-#: src/text.c:2655
+#: src/text.c:2910
 msgid "Error invoking \"sort -f\""
 msgstr "Грешка при извикване на „sort -f“"
 
-#: src/text.c:2658
+#: src/text.c:2913
 msgid "Error invoking \"uniq\""
 msgstr "Грешка при извикване на „uniq“"
 
-#: src/text.c:2881
+#: src/text.c:3135
 #, fuzzy
 msgid "Invoking spell checker, please wait"
 msgstr "Извикване на програмата за проверка на правописа"
 
-#: src/text.c:2897
+#: src/text.c:3151
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Неуспех при проверката на правописа: %s"
 
-#: src/text.c:2899
+#: src/text.c:3153
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Неуспех при проверката на правописа: %s: %s"
 
-#: src/text.c:2902
+#: src/text.c:3156
 msgid "Finished checking spelling"
 msgstr "Проверката на правописа завърши"
 
-#: src/text.c:2927
+#: src/text.c:3181
 #, fuzzy
 msgid "No linter defined for this type of file!"
 msgstr "Без знак за нов ред в края на файловете"
 
-#: src/text.c:2932
+#: src/text.c:3186
 msgid "Save modified buffer before linting?"
 msgstr ""
 
-#: src/text.c:2949
+#: src/text.c:3203
 msgid "Invoking linter, please wait"
 msgstr ""
 
-#: src/text.c:3105
+#: src/text.c:3358
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr ""
 
-#: src/text.c:3134
+#: src/text.c:3388
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
 
-#: src/text.c:3153
+#: src/text.c:3407
 msgid "No more errors in unopened files, cancelling"
 msgstr ""
 
-#: src/text.c:3192
+#: src/text.c:3446
 #, fuzzy
 msgid "At last message"
 msgstr "Показва тази справка"
 
-#: src/text.c:3197
+#: src/text.c:3451
 #, fuzzy
 msgid "At first message"
 msgstr "Показва тази справка"
 
-#: src/text.c:3237
+#: src/text.c:3491
 msgid "Finished"
 msgstr ""
 
-#: src/text.c:3259
+#: src/text.c:3513
 msgid "Invoking formatter, please wait"
 msgstr ""
 
-#: src/text.c:3314
+#: src/text.c:3568
 msgid "Finished formatting"
 msgstr ""
 
-#: src/text.c:3396
+#: src/text.c:3650
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sДуми: %lu  Редове: %ld  Знаци: %lu"
 
-#: src/text.c:3397
+#: src/text.c:3651
 msgid "In Selection:  "
 msgstr "В избрания текст: "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3411
+#: src/text.c:3665
 msgid "Verbatim Input"
 msgstr "Дословен вход"
 
-#: src/utils.c:391 src/utils.c:403
+#: src/utils.c:392 src/utils.c:404
 msgid "nano is out of memory!"
 msgstr "nano е в недостиг на памет!"
 
+#: src/utils.c:625
+#, c-format
+msgid "Internal error: can't match line %d.  Please save your work."
+msgstr ""
+
+#. TRANSLATORS: This refers to a sequence of escape codes
+#. * (from the keyboard) that nano does not know about.
+#: src/winio.c:1121
+msgid "Unknown sequence"
+msgstr ""
+
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
 #: src/winio.c:1427
 msgid "Unicode Input"
 msgstr "Вход уникод"
 
-#: src/winio.c:1991 src/winio.c:1995
-msgid "Modified"
-msgstr "Променен"
-
-#: src/winio.c:1992
-msgid "View"
-msgstr "Преглед"
-
-#: src/winio.c:2006
+#: src/winio.c:1960
 msgid "DIR:"
 msgstr "ДИР:"
 
-#: src/winio.c:2013
+#: src/winio.c:1968
 msgid "File:"
 msgstr "Файл:"
 
-#: src/winio.c:3141
+#: src/winio.c:1972 src/winio.c:1976
+msgid "Modified"
+msgstr "Променен"
+
+#: src/winio.c:1974
+msgid "View"
+msgstr "Преглед"
+
+#: src/winio.c:3105
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "ред %ld/%ld (%d%%), стълб %lu/%lu (%d%%), символ %lu/%lu (%d%%)"
 
-#: src/winio.c:3271
+#: src/winio.c:3235
 msgid "The nano text editor"
 msgstr "Текстов редактор nano"
 
-#: src/winio.c:3272
+#: src/winio.c:3236
 msgid "version"
 msgstr "версия"
 
-#: src/winio.c:3273
+#: src/winio.c:3237
 msgid "Brought to you by:"
 msgstr "Създадено от:"
 
-#: src/winio.c:3274
+#: src/winio.c:3238
 msgid "Special thanks to:"
 msgstr "Специални благодарности на:"
 
-#: src/winio.c:3275
+#: src/winio.c:3239
 msgid "The Free Software Foundation"
 msgstr "Фондация „Свободен софтуер“"
 
-#: src/winio.c:3276
+#: src/winio.c:3240
 msgid "the many translators and the TP"
 msgstr ""
 
-#: src/winio.c:3277
+#: src/winio.c:3241
 msgid "For ncurses:"
 msgstr "За ncurses:"
 
-#: src/winio.c:3278
+#: src/winio.c:3242
 msgid "and anyone else we forgot..."
 msgstr "и всички останали, които сме забравили..."
 
-#: src/winio.c:3279
+#: src/winio.c:3243
 msgid "Thank you for using nano!"
 msgstr "Благодарим, че използвате nano!"
 
@@ -2474,9 +2528,22 @@ msgstr "Благодарим, че използвате nano!"
 #~ msgid "(ignored, for Pico compatibility)"
 #~ msgstr "(не се използват,за съвместимост с Pico)"
 
+#~ msgid " GNU nano version %s (compiled %s, %s)\n"
+#~ msgstr " GNU nano, версия %s (компилиран в %s часа на %s)\n"
+
 #~ msgid "Sorry, support for this function has been disabled"
 #~ msgstr "За съжаление поддръжката за тази функция е изключена"
 
+#~ msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
+#~ msgstr ""
+#~ "Запазване на променения буфер? (ПРИ ОТГОВОР „Не“ ПРОМЕНИТЕ ЩЕ СЕ ЗАГУБЯТ)"
+
+#~ msgid "Unknown Command"
+#~ msgstr "Неизвестна команда"
+
+#~ msgid "Cannot add a color command without a syntax command"
+#~ msgstr "Не може да бъде добавена команда за цвят без синтактична команда"
+
 #~ msgid "Missing flag"
 #~ msgstr "Липсващ флаг"
 
@@ -2553,9 +2620,6 @@ msgstr "Благодарим, че използвате nano!"
 #~ "Употреба: nano [+РЕД,СТЪЛБ] [дълга опция на GNU] [опция] [файл]\n"
 #~ "\n"
 
-#~ msgid "Duplicate syntax name %s"
-#~ msgstr "Дублирано име на синтаксис %s"
-
 #~ msgid "Find other bracket"
 #~ msgstr "Намиране на друга скоба"
 
diff --git a/po/ca.po b/po/ca.po
index efbda994..21b61d34 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 2.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-25 16:41-0500\n"
+"POT-Creation-Date: 2016-06-17 15:41+0200\n"
 "PO-Revision-Date: 2016-02-12 12:07+0100\n"
 "Last-Translator: Jordi Mallach <jordi@gnu.org>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@@ -18,122 +18,139 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n!=1;\n"
 
+#: src/browser.c:144 src/browser.c:284 src/browser.c:334 src/files.c:996
+#: src/files.c:1003 src/files.c:1794 src/files.c:1919 src/files.c:1963
+#: src/files.c:1983 src/files.c:2099 src/files.c:3019 src/files.c:3242
+#: src/rcfile.c:540 src/rcfile.c:1280
+#, c-format
+msgid "Error reading %s: %s"
+msgstr "S'ha produït un error en llegir %s: %s"
+
 #. TRANSLATORS: This is a prompt.
-#: src/browser.c:220
+#: src/browser.c:247
 msgid "Go To Directory"
 msgstr "Vés a un directori"
 
-#: src/browser.c:227 src/browser.c:738 src/files.c:1174 src/files.c:2340
-#: src/nano.c:1120 src/search.c:202 src/search.c:290 src/search.c:895
-#: src/search.c:970 src/text.c:2935 src/text.c:3142
+#: src/browser.c:254 src/browser.c:723 src/files.c:1126 src/files.c:2292
+#: src/nano.c:1128 src/search.c:195 src/search.c:297 src/search.c:851
+#: src/search.c:918 src/text.c:3189 src/text.c:3396
 msgid "Cancelled"
 msgstr "Cancel·lat"
 
-#: src/browser.c:253 src/browser.c:300
-#, c-format
-msgid "Can't go outside of %s in restricted mode"
+#. TRANSLATORS: This refers to the option --operatingdir,
+#. * not to --restricted.
+#: src/browser.c:274 src/browser.c:326
+#, fuzzy, c-format
+msgid "Can't go outside of %s in confined mode"
 msgstr "No es pot anar fora de %s en mode restringit"
 
-#: src/browser.c:264 src/browser.c:310 src/browser.c:326 src/files.c:1044
-#: src/files.c:1052 src/files.c:1844 src/files.c:1971 src/files.c:2016
-#: src/files.c:2037 src/files.c:2156 src/files.c:3062 src/files.c:3285
-#: src/rcfile.c:596 src/rcfile.c:1435
-#, c-format
-msgid "Error reading %s: %s"
-msgstr "S'ha produït un error en llegir %s: %s"
-
-#: src/browser.c:290
+#: src/browser.c:317
 msgid "Can't move up a directory"
 msgstr "No es pot ascendir de directori"
 
 #. TRANSLATORS: Try to keep this at most 7 characters.
-#: src/browser.c:615 src/browser.c:623
+#: src/browser.c:590 src/browser.c:598
 msgid "(dir)"
 msgstr "(dir)"
 
 #. TRANSLATORS: Try to keep this at most 12 characters.
-#: src/browser.c:620
+#: src/browser.c:595
 msgid "(parent dir)"
 msgstr "(directori pare)"
 
 #. TRANSLATORS: Try to keep this at most 7 characters.
 #. * If necessary, you can leave out the parentheses.
-#: src/browser.c:650
+#: src/browser.c:625
 msgid "(huge)"
 msgstr "(enorme)"
 
 #. TRANSLATORS: This is the main search prompt.
-#: src/browser.c:727 src/search.c:173
+#: src/browser.c:712 src/search.c:166
 msgid "Search"
 msgstr "Cerca"
 
-#: src/browser.c:777 src/search.c:466 src/search.c:536
-msgid "This is the only occurrence"
-msgstr "Aquesta és la única coincidència"
-
-#: src/browser.c:793 src/search.c:364
+#: src/browser.c:754 src/search.c:368
 msgid "Search Wrapped"
 msgstr "Recerca recomençada"
 
-#: src/browser.c:843 src/search.c:517
+#: src/browser.c:764 src/search.c:509
+msgid "This is the only occurrence"
+msgstr "Aquesta és la única coincidència"
+
+#: src/browser.c:812 src/search.c:473
 msgid "No current search pattern"
 msgstr "No hi ha cap patró de recerca actual"
 
-#: src/files.c:50
+#: src/color.c:186
+#, fuzzy, c-format
+msgid "Unknown syntax name: %s"
+msgstr "El nom de la sintaxi %s és duplicat"
+
+#: src/color.c:247
+#, c-format
+msgid "magic_load() failed: %s"
+msgstr ""
+
+#: src/color.c:251
+#, c-format
+msgid "magic_file(%s) failed: %s"
+msgstr ""
+
+#: src/files.c:47
 #, c-format
 msgid "Directory '%s' does not exist"
 msgstr "El directori «%s» no existeix"
 
-#: src/files.c:52
+#: src/files.c:49
 #, c-format
 msgid "Path '%s': %s"
 msgstr "Camí «%s»: %s"
 
-#: src/files.c:54
+#: src/files.c:51
 #, c-format
 msgid "Path '%s' is not a directory"
 msgstr "El camí «%s» no és un directori"
 
-#: src/files.c:57
+#: src/files.c:53
 #, c-format
 msgid "Path '%s' is not accessible"
 msgstr "El camí «%s» no és accessible"
 
-#. TRANSLATORS: Try to keep this at most 76 characters.
-#: src/files.c:158
+#. TRANSLATORS: Keep the next ten messages at most 76 characters.
+#: src/files.c:148
 msgid ""
 "Warning: Modifying a file which is not locked, check directory permission?"
 msgstr ""
 "Avís: s'està modificant un fitxer no blocat, comproveu permisos del directori"
 
-#: src/files.c:197
+#: src/files.c:187
 msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
 msgstr ""
 "No s'ha pogut determinar la identitat per al fitxer de blocatge (ha fallat "
 "getpwuid())"
 
-#: src/files.c:206
+#: src/files.c:196
 #, c-format
 msgid "Couldn't determine hostname for lock file: %s"
 msgstr ""
 "No s'ha pogut determinar el nom de l'ordinador per al fitxer de blocatge: %s"
 
-#: src/files.c:227 src/files.c:238 src/files.c:275 src/files.c:285
+#: src/files.c:216 src/files.c:225 src/files.c:262 src/files.c:272
 #, c-format
 msgid "Error writing lock file %s: %s"
 msgstr "S'ha produït un error en escriure el fitxer de blocatge %s: %s"
 
-#: src/files.c:305
+#: src/files.c:291
 #, c-format
 msgid "Error deleting lock file %s: %s"
 msgstr "S'ha produït un error en suprimir el fitxer de blocatge %s: %s"
 
-#: src/files.c:341
+#: src/files.c:325
 #, c-format
 msgid "Error opening lock file %s: %s"
 msgstr "S'ha produït un error en obrir el fitxer de blocatge %s: %s"
 
-#: src/files.c:353
+#: src/files.c:337
 #, c-format
 msgid "Error reading lock file %s: Not enough data read"
 msgstr ""
@@ -141,255 +158,213 @@ msgstr ""
 "prous dades"
 
 #. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
-#: src/files.c:371
+#: src/files.c:354
 #, c-format
 msgid "File %s is being edited (by %s with %s, PID %d); continue?"
 msgstr "El fitxer %s s'està editant (per %s amb %s, PID %d); voleu continuar?"
 
-#: src/files.c:426
+#: src/files.c:430
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "No es poden inserir fitxers des de fora de %s"
 
-#: src/files.c:439 src/files.c:1038 src/rcfile.c:589 src/rcfile.c:1385
-#: src/rcfile.c:1426
+#: src/files.c:445 src/files.c:991 src/rcfile.c:533 src/rcfile.c:1230
+#: src/rcfile.c:1271
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "«%s» és un directori"
 
-#: src/files.c:441
+#: src/files.c:447
 #, c-format
 msgid "\"%s\" is not a normal file"
 msgstr "«%s» no és un fitxer normal"
 
-#: src/files.c:566
+#: src/files.c:571
 msgid "No more open file buffers"
 msgstr "No hi ha més búfers de fitxer oberts"
 
-#: src/files.c:582
+#: src/files.c:586
 #, c-format
 msgid "Switched to %s"
 msgstr "S'ha canviat a %s"
 
-#: src/files.c:584 src/global.c:988 src/winio.c:2010
+#: src/files.c:588 src/global.c:1005 src/winio.c:1965
 msgid "New Buffer"
 msgstr "Nou búfer"
 
-#: src/files.c:943
+#. TRANSLATORS: Keep the next four messages at most 76 characters.
+#: src/files.c:913
 #, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
 msgstr[0] "%lu línia llegida (convertida des del format DOS i Mac)"
 msgstr[1] "%lu línies llegides (convertides des del format DOS i Mac)"
 
-#: src/files.c:948
-#, c-format
-msgid ""
-"Read %lu line (Converted from DOS and Mac format - Warning: No write "
-"permission)"
-msgid_plural ""
-"Read %lu lines (Converted from DOS and Mac format - Warning: No write "
-"permission)"
-msgstr[0] ""
-"%lu línia llegida (convertida des del format DOS i Mac - Avís: no hi ha "
-"permís d'escriptura)"
-msgstr[1] ""
-"%lu línies llegides (convertides des del format DOS i Mac - Avís: no hi ha "
-"permís d'escriptura)"
-
-#: src/files.c:954
+#: src/files.c:919
 #, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
 msgstr[0] "%lu línia llegida (convertida des del format Mac)"
 msgstr[1] "%lu línies llegides (convertides des del format Mac)"
 
-#: src/files.c:958
-#, c-format
-msgid ""
-"Read %lu line (Converted from Mac format - Warning: No write permission)"
-msgid_plural ""
-"Read %lu lines (Converted from Mac format - Warning: No write permission)"
-msgstr[0] ""
-"%lu línia llegida (convertida des del format Mac - Avís: no hi ha permís "
-"d'escriptura)"
-msgstr[1] ""
-"%lu línies llegides (convertides des del format Mac - Avís: no hi ha permís "
-"d'escriptura)"
-
-#: src/files.c:964
+#: src/files.c:925
 #, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
 msgstr[0] "%lu línia llegida (convertida des del format DOS)"
 msgstr[1] "%lu línies llegides (convertides des del format DOS)"
 
-#: src/files.c:968
-#, c-format
-msgid ""
-"Read %lu line (Converted from DOS format - Warning: No write permission)"
-msgid_plural ""
-"Read %lu lines (Converted from DOS format - Warning: No write permission)"
-msgstr[0] ""
-"%lu línia llegida (convertida des del format DOS - Avís: no hi ha permís "
-"d'escriptura)"
-msgstr[1] ""
-"%lu línies llegides (convertides des del format DOS - Avís: no hi ha permís "
-"d'escriptura)"
-
-#: src/files.c:974
+#: src/files.c:930
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "%lu línia llegida"
 msgstr[1] "%lu línies llegides"
 
-#: src/files.c:977
-#, c-format
-msgid "Read %lu line (Warning: No write permission)"
-msgid_plural "Read %lu lines (Warning: No write permission)"
-msgstr[0] "S'ha llegit %lu línia (Avís: no hi ha permís d'escriptura)"
-msgstr[1] "S'han llegit %lu línies (Avís: no hi ha permís d'escriptura)"
-
-#: src/files.c:1019 src/files.c:1056
+#: src/files.c:974 src/files.c:1006
 msgid "Reading File"
 msgstr "S'està llegint el fitxer"
 
-#: src/files.c:1025
+#: src/files.c:980
 msgid "New File"
 msgstr "Nou fitxer"
 
-#: src/files.c:1028
-#, c-format
-msgid "\"%s\" not found"
+#: src/files.c:983
+#, fuzzy, c-format
+msgid "File \"%s\" not found"
 msgstr "«%s» no trobat"
 
-#: src/files.c:1039 src/rcfile.c:590 src/rcfile.c:1386 src/rcfile.c:1427
+#: src/files.c:992 src/rcfile.c:534 src/rcfile.c:1231 src/rcfile.c:1272
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "«%s» és un fitxer de dispositiu"
 
-#: src/files.c:1133
+#: src/files.c:1083
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Fitxer a executar a un nou búfer [des de %s] "
 
-#: src/files.c:1135
+#: src/files.c:1085
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Ordre a executar [des de %s] "
 
-#: src/files.c:1142
+#: src/files.c:1092
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Fitxer a inserir a un nou búfer [des de %s] "
 
-#: src/files.c:1144
+#: src/files.c:1094
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Fitxer a inserir [des de %s] "
 
-#: src/files.c:1389
+#: src/files.c:1338
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Tecla il·legal en mode no-multibuffer"
 
-#: src/files.c:1684
-msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+#: src/files.c:1632
+#, fuzzy
+msgid "Failed to write backup file; continue saving? (Say N if unsure.) "
 msgstr ""
 "No s'ha pogut escriure la còpia de seguretat, voleu continuar desant (Digueu "
 "N si no n'esteu segur)"
 
-#: src/files.c:1800
+#: src/files.c:1750
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "No es pot escriure fora de %s"
 
-#: src/files.c:1885 src/files.c:1910 src/files.c:1928 src/files.c:1941
-#: src/files.c:1952 src/files.c:1981
+#: src/files.c:1833 src/files.c:1858 src/files.c:1876 src/files.c:1889
+#: src/files.c:1900 src/files.c:1928
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "S'ha produït un error en escriure la còpia de seguretat %s: %s"
 
-#: src/files.c:1886 src/nano.c:690
+#: src/files.c:1834 src/nano.c:692
 msgid "Too many backup files?"
 msgstr "Massa fitxers de còpia de seguretat?"
 
-#: src/files.c:2026 src/text.c:2863 src/text.c:2875 src/text.c:3244
-#: src/text.c:3253
+#: src/files.c:1972 src/text.c:3117 src/text.c:3129 src/text.c:3498
+#: src/text.c:3507
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "S'ha produït un error en escriure un fitxer temporal: %s"
 
-#: src/files.c:2049 src/files.c:2068 src/files.c:2080 src/files.c:2104
-#: src/files.c:2121 src/files.c:2131 src/files.c:2164 src/files.c:2171
+#: src/files.c:1994 src/files.c:2013 src/files.c:2023 src/files.c:2047
+#: src/files.c:2064 src/files.c:2074 src/files.c:2106 src/files.c:2113
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "S'ha produït un error en escriure %s: %s"
 
-#: src/files.c:2200
+#: src/files.c:2154
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "S'ha escrit %lu línia"
 msgstr[1] "S'han escrit %lu línies"
 
-#: src/files.c:2299
+#: src/files.c:2249
 msgid " [DOS Format]"
 msgstr " [Format DOS]"
 
-#: src/files.c:2300
+#: src/files.c:2250
 msgid " [Mac Format]"
 msgstr " [Format Mac]"
 
-#: src/files.c:2302
+#: src/files.c:2252
 msgid " [Backup]"
 msgstr " [Còpia de seguretat]"
 
-#: src/files.c:2309
+#: src/files.c:2259
 msgid "Prepend Selection to File"
 msgstr "Avantposa sel·lecció a un fitxer"
 
-#: src/files.c:2310
+#: src/files.c:2260
 msgid "Append Selection to File"
 msgstr "Afegeix la sel·lecció a un fitxer"
 
-#: src/files.c:2311
+#: src/files.c:2261
 msgid "Write Selection to File"
 msgstr "Escriu la sel·lecció a un fitxer"
 
-#: src/files.c:2314
+#: src/files.c:2264
 msgid "File Name to Prepend to"
 msgstr "Nom del fitxer en el qual avantposar"
 
-#: src/files.c:2315
+#: src/files.c:2265
 msgid "File Name to Append to"
 msgstr "Nom del fitxer en el qual afegir"
 
-#: src/files.c:2316
+#: src/files.c:2266
 msgid "File Name to Write"
 msgstr "Nom del fitxer a escriure"
 
-#: src/files.c:2349
-msgid "Save modified buffer anyway ? "
+#: src/files.c:2301
+#, fuzzy
+msgid "Save modified buffer anyway? "
 msgstr "Voleu desar el búfer de totes formes?"
 
-#: src/files.c:2457
-msgid "File exists, OVERWRITE ? "
-msgstr "El fitxer existeix, el voleu SOBREESCRIURE? "
-
-#: src/files.c:2466
-msgid "Save file under DIFFERENT NAME ? "
+#: src/files.c:2412
+#, fuzzy
+msgid "Save file under DIFFERENT NAME? "
 msgstr "Voleu desar el fitxer sota un NOM DIFERENT? "
 
-#: src/files.c:2480
-msgid "File was modified since you opened it, continue saving ? "
+#: src/files.c:2420
+#, fuzzy, c-format
+msgid "File \"%s\" exists; OVERWRITE? "
+msgstr "El fitxer existeix, el voleu SOBREESCRIURE? "
+
+#: src/files.c:2441
+#, fuzzy
+msgid "File was modified since you opened it; continue saving? "
 msgstr "S'ha modificat el fitxer des de que l'heu obert, voleu desar-lo?"
 
-#: src/files.c:2917
+#: src/files.c:2874
 msgid "(more)"
 msgstr "(més)"
 
-#: src/files.c:3004
+#: src/files.c:2959
 #, c-format
 msgid ""
 "\n"
@@ -398,7 +373,7 @@ msgstr ""
 "\n"
 "Premeu Intro per a continuar\n"
 
-#: src/files.c:3020
+#: src/files.c:2975
 #, c-format
 msgid ""
 "Unable to create directory %s: %s\n"
@@ -407,7 +382,7 @@ msgstr ""
 "No s'ha pogut crear el directori %s: %s\n"
 "És requerit per desar/carregar l'historial de cerca o posició del cursor.\n"
 
-#: src/files.c:3026
+#: src/files.c:2982
 #, c-format
 msgid ""
 "Path %s is not a directory and needs to be.\n"
@@ -417,7 +392,7 @@ msgstr ""
 "Nano no podrà carregar o desar l'historial de cerca o la posició del "
 "cursor.\n"
 
-#: src/files.c:3045
+#: src/files.c:3002
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I tried to move\n"
@@ -426,7 +401,7 @@ msgstr ""
 "S'ha detectat un fitxer d'historial antic (%s) que s'ha intentat moure\n"
 "al lloc aconsellat (%s), però s'ha produït un error: %s"
 
-#: src/files.c:3049
+#: src/files.c:3006
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I moved\n"
@@ -437,724 +412,755 @@ msgstr ""
 "al lloc aconsellat (%s)\n"
 "(Vegeu les PMF del nano per a obtenir més informació sobre aquest canvi)"
 
-#: src/files.c:3132 src/files.c:3140 src/files.c:3164 src/files.c:3176
+#: src/files.c:3089 src/files.c:3097 src/files.c:3121 src/files.c:3133
 #, c-format
 msgid "Error writing %s: %s\n"
 msgstr "S'ha produït un error en escriure %s: %s\n"
 
 #. TRANSLATORS: Try to keep the next fifteen strings at most 10 characters.
-#: src/global.c:480
+#: src/global.c:483
 msgid "Exit"
 msgstr "Surt"
 
-#: src/global.c:481
+#: src/global.c:484
 msgid "Close"
 msgstr "Tanca"
 
-#: src/global.c:482
+#: src/global.c:485
 msgid "Uncut Text"
 msgstr "Destalla el text"
 
-#: src/global.c:484
+#: src/global.c:487
 msgid "Unjustify"
 msgstr "Desjustifica"
 
-#: src/global.c:490
+#: src/global.c:493
 msgid "Read File"
 msgstr "Llegeix"
 
-#: src/global.c:491
+#: src/global.c:494
 msgid "Where Is"
 msgstr "Cerca"
 
-#: src/global.c:492
+#: src/global.c:495
 msgid "Replace"
 msgstr "Reemplaça"
 
-#: src/global.c:493
+#: src/global.c:496
 msgid "Go To Line"
 msgstr "Vés a línia"
 
-#: src/global.c:494
+#: src/global.c:497
 msgid "Prev Line"
 msgstr "Ant Línia"
 
-#: src/global.c:495
+#: src/global.c:498
 msgid "Next Line"
 msgstr "Seg Línia"
 
-#: src/global.c:496
+#: src/global.c:499
 msgid "Prev Page"
 msgstr "Pàg Ant"
 
-#: src/global.c:497
+#: src/global.c:500
 msgid "Next Page"
 msgstr "Pàg Seg"
 
-#: src/global.c:499
+#: src/global.c:502
 msgid "Justify"
 msgstr "Justifica"
 
-#: src/global.c:500
+#: src/global.c:503
 msgid "FullJstify"
 msgstr "JustCompl"
 
-#: src/global.c:502
+#: src/global.c:505
 msgid "Refresh"
 msgstr "Refresca"
 
 #. TRANSLATORS: Try to keep this string at most 12 characters.
-#: src/global.c:505
+#: src/global.c:508
 msgid "WhereIs Next"
 msgstr "On és la següent"
 
 #. TRANSLATORS: The next long series of strings are shortcut descriptions;
 #. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:512
+#: src/global.c:515
 msgid "Justify the current paragraph"
 msgstr "Justifica el paràgraf actual"
 
-#: src/global.c:514
+#: src/global.c:517
 msgid "Cancel the current function"
 msgstr "Cancel·la la funció actual"
 
-#: src/global.c:515
+#: src/global.c:518
 msgid "Display this help text"
 msgstr "Mostra aquest text d'ajuda"
 
-#: src/global.c:518
+#: src/global.c:521
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Tanca el búfer de fitxer actual / Surt del nano"
 
-#: src/global.c:520
+#: src/global.c:523
 msgid "Exit from nano"
 msgstr "Surt del nano"
 
-#: src/global.c:524
+#: src/global.c:527
 msgid "Write the current file to disk"
 msgstr "Escriu el fitxer actual al disc"
 
-#: src/global.c:526
+#: src/global.c:529
 msgid "Insert another file into the current one"
 msgstr "Insereix un altre fitxer dins de l'actual"
 
-#: src/global.c:528
+#: src/global.c:531
 msgid "Search for a string or a regular expression"
 msgstr "Cerca una cadena o expressió regular"
 
-#: src/global.c:531
+#: src/global.c:533
 msgid "Search for a string"
 msgstr "Cerca una cadena"
 
-#: src/global.c:533
+#: src/global.c:534
+msgid "Refresh the file list"
+msgstr ""
+
+#: src/global.c:535
+#, fuzzy
+msgid "Go to lefthand column"
+msgstr "Vés a un número de línia i columna"
+
+#: src/global.c:536
+#, fuzzy
+msgid "Go to righthand column"
+msgstr "Vés a un número de línia i columna"
+
+#: src/global.c:538
 msgid "Go one screenful up"
 msgstr "Vés a la pantalla anterior"
 
-#: src/global.c:534
+#: src/global.c:539
 msgid "Go one screenful down"
 msgstr "Vés a la pantalla següent"
 
-#: src/global.c:536
+#: src/global.c:541
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Retalla la línia actual i desa-la al cutbuffer"
 
-#: src/global.c:538
+#: src/global.c:543
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Enganxa el cutbuffer a la línia actual"
 
-#: src/global.c:539
+#: src/global.c:544
 msgid "Display the position of the cursor"
 msgstr "Mostra la posició del cursor"
 
-#: src/global.c:541
+#: src/global.c:546
 msgid "Invoke the spell checker, if available"
 msgstr "Invoca el corrector ortogràfic, si està disponible"
 
-#: src/global.c:543
+#: src/global.c:548
 msgid "Replace a string or a regular expression"
 msgstr "Reemplaça una cadena o una expressió regular"
 
-#: src/global.c:544
+#: src/global.c:549
 msgid "Go to line and column number"
 msgstr "Vés a un número de línia i columna"
 
-#: src/global.c:546
+#: src/global.c:551
 msgid "Mark text starting from the cursor position"
 msgstr "Marca text començant des de la posició del cursor"
 
-#: src/global.c:547
+#: src/global.c:552
 msgid "Repeat the last search"
 msgstr "Repeteix l'última recerca"
 
-#: src/global.c:549
+#: src/global.c:554
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "Copia la línia actual i emmagatzema-la al cutbuffer"
 
-#: src/global.c:550
+#: src/global.c:555
 msgid "Indent the current line"
 msgstr "Ajusta el fitxer actual"
 
-#: src/global.c:551
+#: src/global.c:556
 msgid "Unindent the current line"
 msgstr "Desajusta el fitxer actual"
 
-#: src/global.c:552
+#: src/global.c:558
+msgid "Comment/uncomment the current line or marked lines"
+msgstr ""
+
+#: src/global.c:560
 msgid "Undo the last operation"
 msgstr "Desfés l'última operació"
 
-#: src/global.c:553
+#: src/global.c:561
 msgid "Redo the last undone operation"
 msgstr "Refés l'última operació"
 
-#: src/global.c:555
+#: src/global.c:563
 msgid "Go back one character"
 msgstr "Vés enrere un caràcter"
 
-#: src/global.c:556
+#: src/global.c:564
 msgid "Go forward one character"
 msgstr "Vés endavant un caràcter"
 
-#: src/global.c:558
+#: src/global.c:566
 msgid "Go back one word"
 msgstr "Vés enrere una paraula"
 
-#: src/global.c:559
+#: src/global.c:567
 msgid "Go forward one word"
 msgstr "Vés endavant una paraula"
 
-#: src/global.c:561
+#: src/global.c:569
 msgid "Go to previous line"
 msgstr "Vés a la línia anterior"
 
-#: src/global.c:562
+#: src/global.c:570
 msgid "Go to next line"
 msgstr "Vés a la línia següent"
 
-#: src/global.c:563
+#: src/global.c:571
 msgid "Go to beginning of current line"
 msgstr "Vés al principi de la línia actual"
 
-#: src/global.c:564
+#: src/global.c:572
 msgid "Go to end of current line"
 msgstr "Vés al final de la línia actual"
 
-#: src/global.c:567
+#: src/global.c:575
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr ""
 "Vés al principi del paràgraf actual; posteriorment del paràgraf anterior"
 
-#: src/global.c:569
+#: src/global.c:577
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr "Vés al final del paràgraf actual; posteriorment del paràgraf següent"
 
-#: src/global.c:571
+#: src/global.c:579
 msgid "Go to the first line of the file"
 msgstr "Vés a la primera línia del fitxer"
 
-#: src/global.c:572
+#: src/global.c:580
 msgid "Go to the last line of the file"
 msgstr "Vés a l'última línia del fitxer"
 
-#: src/global.c:574
+#: src/global.c:582
 msgid "Go to the matching bracket"
 msgstr "Vés a la clau corresponent"
 
-#: src/global.c:576
+#: src/global.c:584
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "Desplaça amunt una línia sense desplaçar el cursor"
 
-#: src/global.c:578
+#: src/global.c:586
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "Desplaça avall una línia sense desplaçar el cursor"
 
-#: src/global.c:581
+#: src/global.c:589
 msgid "Switch to the previous file buffer"
 msgstr "Canvia a l'anterior búfer de fitxer"
 
-#: src/global.c:582
+#: src/global.c:590
 msgid "Switch to the next file buffer"
 msgstr "Canvia al següent búfer de fitxer"
 
 # Verbatim -> textualment segons un diccionari online.
 # S'accepten altres propostes. jm
-#: src/global.c:584
+#: src/global.c:592
 msgid "Insert the next keystroke verbatim"
 msgstr "Insereix la següent premuda de tecla textualment"
 
-#: src/global.c:585
+#: src/global.c:593
 msgid "Insert a tab at the cursor position"
 msgstr "Insereix una tabulació a la posició del cursor"
 
-#: src/global.c:586
+#: src/global.c:594
 msgid "Insert a newline at the cursor position"
 msgstr "Insereix una línia nova a la posició del cursor"
 
-#: src/global.c:587
+#: src/global.c:595
 msgid "Delete the character under the cursor"
 msgstr "Suprimeix el caràcter sota el cursor"
 
-#: src/global.c:589
+#: src/global.c:597
 msgid "Delete the character to the left of the cursor"
 msgstr "Suprimeix el caràcter a l'esquerra del cursor"
 
-#: src/global.c:592
+#: src/global.c:600
 msgid "Cut backward from cursor to word start"
 msgstr "Retalla cap enrere des del cursor al principi de la paraula"
 
-#: src/global.c:594
+#: src/global.c:602
 msgid "Cut forward from cursor to next word start"
 msgstr "Retalla cap avant des del cursor al principi de la següent paraula"
 
-#: src/global.c:596
+#: src/global.c:604
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Retalla des de la posició del cursor al final del fitxer"
 
-#: src/global.c:599
+#: src/global.c:607
 msgid "Justify the entire file"
 msgstr "Justifica el fitxer sencer"
 
-#: src/global.c:603
+#: src/global.c:611
 msgid "Count the number of words, lines, and characters"
 msgstr "Compta el nombre de paraules, línies i caràcters"
 
-#: src/global.c:606
+#: src/global.c:614
 msgid "Refresh (redraw) the current screen"
 msgstr "Redibuixa la pantalla actual"
 
-#: src/global.c:608
+#: src/global.c:616
 msgid "Suspend the editor (if suspension is enabled)"
 msgstr "Suspèn l'editor (si la suspensió és habilitada)"
 
-#: src/global.c:610
+#: src/global.c:618
 msgid "Save file without prompting"
 msgstr "Desa el fitxer sense preguntar"
 
-#: src/global.c:611
+#: src/global.c:619
 msgid "Search next occurrence backward"
 msgstr "Cerca la següent coincidència cap enrere"
 
-#: src/global.c:612
+#: src/global.c:620
 msgid "Search next occurrence forward"
 msgstr "Cerca la següent coincidència cap a avant"
 
-#: src/global.c:614
+#: src/global.c:622
 msgid "Toggle the case sensitivity of the search"
 msgstr "Commuta la sensibilitat a majúscules de la cerca"
 
-#: src/global.c:616
+#: src/global.c:624
 msgid "Reverse the direction of the search"
 msgstr "Inverteix la direcció de la cerca"
 
-#: src/global.c:620
+#: src/global.c:628
 msgid "Toggle the use of regular expressions"
 msgstr "Commuta l'ús d'expressions regulars"
 
-#: src/global.c:624
+#: src/global.c:632
 msgid "Recall the previous search/replace string"
 msgstr "Recupera la cadena de cerca/reemplaça anterior"
 
-#: src/global.c:626
+#: src/global.c:634
 msgid "Recall the next search/replace string"
 msgstr "Recupera la cadena de cerca/reemplaça següent"
 
-#: src/global.c:629
+#: src/global.c:637
 msgid "Go to file browser"
 msgstr "Vés al navegador de fitxers"
 
-#: src/global.c:632
+#: src/global.c:640
 msgid "Toggle the use of DOS format"
 msgstr "Commuta l'ús del format DOS"
 
-#: src/global.c:633
+#: src/global.c:641
 msgid "Toggle the use of Mac format"
 msgstr "Commuta l'ús del format Mac"
 
-#: src/global.c:634
+#: src/global.c:642
 msgid "Toggle appending"
 msgstr "Commuta l'afegiment"
 
-#: src/global.c:635
+#: src/global.c:643
 msgid "Toggle prepending"
 msgstr "Commuta l'avantposat"
 
-#: src/global.c:636
+#: src/global.c:644
 msgid "Toggle backing up of the original file"
 msgstr "Commuta la creació d'una còpia de seguretat del fitxer original"
 
-#: src/global.c:637
+#: src/global.c:645
 msgid "Execute external command"
 msgstr "Executa una ordre externa"
 
-#: src/global.c:639
+#: src/global.c:647
 msgid "Close buffer without saving it"
 msgstr "Tanca el búfer sense desar-lo"
 
-#: src/global.c:641
+#: src/global.c:649
 msgid "Toggle the use of a new buffer"
 msgstr "Commuta l'ús d'un búfer nou"
 
-#: src/global.c:644
+#: src/global.c:652
 msgid "Exit from the file browser"
 msgstr "Surt del navegador de fitxers"
 
-#: src/global.c:645
+#: src/global.c:653
 msgid "Go to the first file in the list"
 msgstr "Vés al primer fitxer de la llista"
 
-#: src/global.c:646
+#: src/global.c:654
 msgid "Go to the last file in the list"
 msgstr "Vés a l'últim fitxer de la llista"
 
-#: src/global.c:647
+#: src/global.c:655
 msgid "Go to the previous file in the list"
 msgstr "Vés al fitxer previ de la llista"
 
-#: src/global.c:648
+#: src/global.c:656
 msgid "Go to the next file in the list"
 msgstr "Vés al fitxer següent de la llista"
 
-#: src/global.c:649
+#: src/global.c:657
 msgid "Go to directory"
 msgstr "Vés al directori"
 
-#: src/global.c:652
+#: src/global.c:660
 msgid "Invoke the linter, if available"
 msgstr "Invoca l'analitzador sintàctic, si està disponible"
 
-#: src/global.c:653
+#: src/global.c:661
 msgid "Go to previous linter msg"
 msgstr "Vés al missatge anterior de l'analitzador"
 
-#: src/global.c:654
+#: src/global.c:662
 msgid "Go to next linter msg"
 msgstr "Vés al missatge següent de l'analitzador"
 
-#: src/global.c:656
+#: src/global.c:664
 msgid "Invoke formatter, if available"
 msgstr "Invoca el formatador, si està disponible"
 
 #. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:671
+#: src/global.c:679
 msgid "Get Help"
 msgstr "Ajuda"
 
-#: src/global.c:674 src/prompt.c:858
+#: src/global.c:682 src/prompt.c:855
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#: src/global.c:687
+#: src/global.c:695
 msgid "Write Out"
 msgstr "Desa"
 
-#: src/global.c:723
+#: src/global.c:731
 msgid "Go To Dir"
 msgstr "Vés a directori"
 
-#: src/global.c:738
+#: src/global.c:746
 msgid "Cut Text"
 msgstr "Retalla"
 
-#: src/global.c:753
+#: src/global.c:761
 msgid "To Spell"
 msgstr "Ortografia"
 
-#: src/global.c:757
+#: src/global.c:765
 msgid "To Linter"
 msgstr "Analitzador"
 
-#: src/global.c:760
+#: src/global.c:768
 msgid "Formatter"
 msgstr "Formatador"
 
-#: src/global.c:767
+#: src/global.c:775
 msgid "Case Sens"
 msgstr "Maj/Min"
 
-#: src/global.c:772
+#: src/global.c:780
 msgid "Regexp"
 msgstr "Expreg"
 
-#: src/global.c:777
+#: src/global.c:785
 msgid "Backwards"
 msgstr "Cap Enrere"
 
-#: src/global.c:784
+#: src/global.c:792
 msgid "No Replace"
 msgstr "No reemplaces"
 
-#: src/global.c:792
+#: src/global.c:800
 msgid "Cur Pos"
 msgstr "Pos Act"
 
-#: src/global.c:807
+#: src/global.c:815
 msgid "First Line"
 msgstr "Primera línia"
 
-#: src/global.c:809
+#: src/global.c:817
 msgid "Last Line"
 msgstr "Última línia"
 
-#: src/global.c:816
+#: src/global.c:824
 msgid "To Bracket"
 msgstr "Vés a la clau"
 
-#: src/global.c:819
+#: src/global.c:827
 msgid "Mark Text"
 msgstr "Marca text"
 
-#: src/global.c:822
+#: src/global.c:830
 msgid "Copy Text"
 msgstr "Copia text"
 
-#: src/global.c:825
+#: src/global.c:833
 msgid "Indent Text"
 msgstr "Sagna text"
 
-#: src/global.c:827
+#: src/global.c:835
 msgid "Unindent Text"
 msgstr "Desagna text"
 
-#: src/global.c:830
+#: src/global.c:838
 msgid "Undo"
 msgstr "Desfés"
 
-#: src/global.c:832
+#: src/global.c:840
 msgid "Redo"
 msgstr "Refés"
 
-#: src/global.c:836 src/global.c:842
+#: src/global.c:844 src/global.c:850
 msgid "Back"
 msgstr "Enrere"
 
-#: src/global.c:838 src/global.c:844
+#: src/global.c:846 src/global.c:852
 msgid "Forward"
 msgstr "Endavant"
 
-#: src/global.c:849
+#: src/global.c:857
 msgid "Prev Word"
 msgstr "Paraula anterior"
 
-#: src/global.c:851
+#: src/global.c:859
 msgid "Next Word"
 msgstr "Paraula següent"
 
-#: src/global.c:855
+#: src/global.c:863
 msgid "Home"
 msgstr "Inici"
 
-#: src/global.c:857
+#: src/global.c:865
 msgid "End"
 msgstr "Fi"
 
-#: src/global.c:866
+#: src/global.c:874
 msgid "Beg of Par"
 msgstr "Princ de par"
 
-#: src/global.c:868
+#: src/global.c:876
 msgid "End of Par"
 msgstr "Final de par"
 
-#: src/global.c:873
+#: src/global.c:881
 msgid "Scroll Up"
 msgstr "Desplaça amunt"
 
-#: src/global.c:875
+#: src/global.c:883
 msgid "Scroll Down"
 msgstr "Desplaça avall"
 
-#: src/global.c:880
+#: src/global.c:888
 msgid "Prev File"
 msgstr "Fitxer anterior"
 
-#: src/global.c:882
+#: src/global.c:890
 msgid "Next File"
 msgstr "Fitxer següent"
 
-#: src/global.c:891
+#: src/global.c:899
 msgid "Verbatim"
 msgstr "Textual"
 
-#: src/global.c:894
+#: src/global.c:902
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:896
+#: src/global.c:904
 msgid "Enter"
 msgstr "Retorn"
 
-#: src/global.c:899
+#: src/global.c:907
 msgid "Delete"
 msgstr "Suprimeix"
 
-#: src/global.c:901
+#: src/global.c:909
 msgid "Backspace"
 msgstr "Retrocés"
 
 #. TRANSLATORS: The next two strings refer to cutting words.
-#: src/global.c:912
+#: src/global.c:920
 msgid "Cut Left"
 msgstr "Retalla cap a l'esquerra"
 
-#: src/global.c:914
+#: src/global.c:922
 msgid "Cut Right"
 msgstr "Retalla cap a la dreta"
 
-#: src/global.c:916
+#: src/global.c:924
 msgid "CutTillEnd"
 msgstr "RetallaFinsFinal"
 
-#: src/global.c:926
+#: src/global.c:934
 msgid "Word Count"
 msgstr "Compte de paraules"
 
-#: src/global.c:933
+#: src/global.c:941
 msgid "Suspend"
 msgstr "Suspèn"
 
-#: src/global.c:937
+#: src/global.c:945
+#, fuzzy
+msgid "Comment Lines"
+msgstr "Seg Línia"
+
+#: src/global.c:949
 msgid "Save"
 msgstr "Desa"
 
-#: src/global.c:940
+#: src/global.c:952
 msgid "Previous"
 msgstr "Anterior"
 
-#: src/global.c:942
+#: src/global.c:954
 msgid "Next"
 msgstr "Següent"
 
-#: src/global.c:948
+#: src/global.c:960
 msgid "PrevHstory"
 msgstr "HistPrèv"
 
-#: src/global.c:951
+#: src/global.c:963
 msgid "NextHstory"
 msgstr "HistSeg"
 
-#: src/global.c:955
+#: src/global.c:972
 msgid "Go To Text"
 msgstr "Vés al text"
 
-#: src/global.c:959
+#: src/global.c:976
 msgid "DOS Format"
 msgstr "Format DOS"
 
-#: src/global.c:961
+#: src/global.c:978
 msgid "Mac Format"
 msgstr "Format Mac"
 
-#: src/global.c:969
+#: src/global.c:986
 msgid "Append"
 msgstr "Afegeix"
 
-#: src/global.c:971
+#: src/global.c:988
 msgid "Prepend"
 msgstr "Avantposa"
 
-#: src/global.c:974
+#: src/global.c:991
 msgid "Backup File"
 msgstr "Fes còpia de seguretat"
 
-#: src/global.c:981
+#: src/global.c:998
 msgid "Execute Command"
 msgstr "Executa una ordre"
 
-#: src/global.c:996
+#: src/global.c:1013
 msgid "To Files"
 msgstr "A fitxers"
 
-#: src/global.c:1004
+#: src/global.c:1021
 msgid "First File"
 msgstr "Primer fitxer"
 
-#: src/global.c:1006
+#: src/global.c:1023
 msgid "Last File"
 msgstr "Últim fitxer"
 
-#: src/global.c:1010
+#: src/global.c:1027
 msgid "Discard buffer"
 msgstr "Descarte el búfer"
 
+#: src/global.c:1038
+msgid "Left Column"
+msgstr ""
+
+#: src/global.c:1040
+msgid "Right Column"
+msgstr ""
+
 #. TRANSLATORS: Try to keep the next two strings at most 20 characters.
-#: src/global.c:1020
+#: src/global.c:1047
 msgid "Prev Lint Msg"
 msgstr "Miss lint ant"
 
-#: src/global.c:1022
+#: src/global.c:1049
 msgid "Next Lint Msg"
 msgstr "Miss lint seg"
 
 #. TRANSLATORS: The next seventeen strings are toggle descriptions;
 #. * they are best kept shorter than 40 characters, but may be longer.
-#: src/global.c:1285
+#: src/global.c:1316
 msgid "Help mode"
 msgstr "Mode ajuda"
 
-#: src/global.c:1287
+#: src/global.c:1318
 msgid "Constant cursor position display"
 msgstr "Visualització constant de la posició del cursor"
 
-#: src/global.c:1289
+#: src/global.c:1320
 msgid "Use of one more line for editing"
 msgstr "Utilitza una línia més per a editar"
 
-#: src/global.c:1291
+#: src/global.c:1322
 msgid "Smooth scrolling"
 msgstr "Desplaçament suau"
 
-#: src/global.c:1293
+#: src/global.c:1324
 msgid "Soft wrapping of overlong lines"
 msgstr "Ajusta suaument les línies llargues"
 
-#: src/global.c:1295
+#: src/global.c:1326
 msgid "Whitespace display"
 msgstr "Mostra l'espai en blanc"
 
-#: src/global.c:1297
+#: src/global.c:1328
 msgid "Color syntax highlighting"
 msgstr "Resaltat de sintaxi en color"
 
-#: src/global.c:1299
+#: src/global.c:1330
 msgid "Smart home key"
 msgstr "Tecla «Inici» intel·ligent"
 
-#: src/global.c:1301
+#: src/global.c:1332
 msgid "Auto indent"
 msgstr "Sagna automàticament"
 
-#: src/global.c:1303
+#: src/global.c:1334
 msgid "Cut to end"
 msgstr "Retalla fins al final"
 
-#: src/global.c:1305
+#: src/global.c:1336
 msgid "Hard wrapping of overlong lines"
 msgstr "Ajusta completament les línies llargues"
 
-#: src/global.c:1307
+#: src/global.c:1338
 msgid "Conversion of typed tabs to spaces"
 msgstr "Conversió de les tabulacions introduïdes a espais"
 
-#: src/global.c:1309
+#: src/global.c:1340
 msgid "Backup files"
 msgstr "Fitxers de còpia de seguretat"
 
-#: src/global.c:1311
+#: src/global.c:1342
 msgid "Reading file into separate buffer"
 msgstr "S'està llegint el fitxer en un búfer distint"
 
-#: src/global.c:1313
+#: src/global.c:1344
 msgid "Mouse support"
 msgstr "Suport per a ratolí"
 
-#: src/global.c:1315
+#: src/global.c:1346
 msgid "No conversion from DOS/Mac format"
 msgstr "Sense conversió des del format DOS/Mac"
 
-#: src/global.c:1317
+#: src/global.c:1348
 msgid "Suspension"
 msgstr "Suspensió"
 
-#: src/help.c:209
+#: src/help.c:211
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1177,7 +1183,7 @@ msgstr ""
 "l'indicatiu de recerca. Prémer Retorn sense introduir cap text durà a terme "
 "l'anterior recerca. "
 
-#: src/help.c:218
+#: src/help.c:220
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1191,7 +1197,7 @@ msgstr ""
 " Les següents tecles de funció estan disponibles en el mode Cerca:\n"
 "\n"
 
-#: src/help.c:224
+#: src/help.c:226
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1211,7 +1217,7 @@ msgstr ""
 " Les següents tecles de funció estan disponibles en el mode anar a línia:\n"
 "\n"
 
-#: src/help.c:233
+#: src/help.c:235
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1233,7 +1239,7 @@ msgstr ""
 "F o amb un fitxer nanorc, la inserció d'un fitxer farà que es carregue en un "
 "búfer diferent (feu servir Meta-< i > per a canviar de búfers de fitxer). "
 
-#: src/help.c:242
+#: src/help.c:244
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1248,7 +1254,7 @@ msgstr ""
 "fitxer:\n"
 "\n"
 
-#: src/help.c:248
+#: src/help.c:250
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1276,7 +1282,7 @@ msgstr ""
 " Les següents tecles de funció estan disponibles en el mode desa el fitxer:\n"
 "\n"
 
-#: src/help.c:262
+#: src/help.c:264
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1302,7 +1308,7 @@ msgstr ""
 "fitxers:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:277
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1327,7 +1333,7 @@ msgstr ""
 "l'anterior recerca.\n"
 "\n"
 
-#: src/help.c:284
+#: src/help.c:286
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1336,7 +1342,7 @@ msgstr ""
 "navegador:\n"
 "\n"
 
-#: src/help.c:288
+#: src/help.c:290
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1359,7 +1365,7 @@ msgstr ""
 "«anar a un directori»:\n"
 "\n"
 
-#: src/help.c:301
+#: src/help.c:303
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1384,7 +1390,7 @@ msgstr ""
 "d'ortografia:\n"
 "\n"
 
-#: src/help.c:316
+#: src/help.c:318
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1404,7 +1410,7 @@ msgstr ""
 " Les següents tecles de funció estan disponibles al mode Executa una ordre:\n"
 "\n"
 
-#: src/help.c:329
+#: src/help.c:331
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1425,15 +1431,15 @@ msgstr ""
 "inferior i mostra missatges importants. Les últimes dues línies mostren les "
 "dreceres més utilitzades a l'editor."
 
-#: src/help.c:339
+#: src/help.c:341
+#, fuzzy
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
-" The notation for shortcuts is as follows: Control-key sequences are notated "
-"with a caret (^) symbol and can be entered either by using the Control "
-"(Ctrl) key or pressing the Escape (Esc) key twice.  Escape-key sequences are "
-"notated with the Meta (M-) symbol and can be entered using either the Esc, "
-"Alt, or Meta key depending on your keyboard setup.  "
+" Shortcuts are written as follows: Control-key sequences are notated with a "
+"'^' and can be entered either by using the Ctrl key or pressing the Esc key "
+"twice.  Meta-key sequences are notated with 'M-' and can be entered using "
+"either the Alt, Cmd, or Esc key, depending on your keyboard setup.  "
 msgstr ""
 "Les dos línies inferiors mostren les dreceres més usades a l'editor.\n"
 "\n"
@@ -1462,19 +1468,19 @@ msgstr ""
 msgid "enable/disable"
 msgstr "habilita/inhabilita"
 
-#: src/nano.c:559
+#: src/nano.c:560
 msgid "Key is invalid in view mode"
 msgstr "La tecla és invàlida al mode visualització"
 
-#: src/nano.c:565
+#: src/nano.c:566
 msgid "This function is disabled in restricted mode"
 msgstr "Aquesta funció està inhabilitada en mode restringit"
 
-#: src/nano.c:573
+#: src/nano.c:574
 msgid "Help is not available"
 msgstr "L'ajuda no és disponible"
 
-#: src/nano.c:684
+#: src/nano.c:686
 #, c-format
 msgid ""
 "\n"
@@ -1483,7 +1489,7 @@ msgstr ""
 "\n"
 "S'ha escrit el búfer en %s\n"
 
-#: src/nano.c:686
+#: src/nano.c:688
 #, c-format
 msgid ""
 "\n"
@@ -1492,7 +1498,7 @@ msgstr ""
 "\n"
 "No s'ha escrit el búfer a %s: %s\n"
 
-#: src/nano.c:689
+#: src/nano.c:691
 #, c-format
 msgid ""
 "\n"
@@ -1752,17 +1758,22 @@ msgstr "Habilita la suspensió"
 msgid "Enable soft line wrapping"
 msgstr "Habilita l'ajustament suau de línies"
 
-#: src/nano.c:937
-#, c-format
-msgid " GNU nano, version %s\n"
+#: src/nano.c:940
+#, fuzzy, c-format
+msgid " nano, version %s\n"
 msgstr " GNU nano, versió %s\n"
 
-#: src/nano.c:940
+#: src/nano.c:943
+#, c-format
+msgid " (C) 2014..%s the contributors to nano\n"
+msgstr ""
+
+#: src/nano.c:945
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr " Correu-e: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 
-#: src/nano.c:941
+#: src/nano.c:946
 #, c-format
 msgid ""
 "\n"
@@ -1771,67 +1782,82 @@ msgstr ""
 "\n"
 " Opcions compilades:"
 
-#: src/nano.c:1073
+#: src/nano.c:1081
 msgid "No file name"
 msgstr "Cap nom de fitxer"
 
-#: src/nano.c:1108
-msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
-msgstr "Voleu desar el búfer modificat (RESPONDRE «No» DESTRUIRÀ ELS CANVIS) ?"
+#: src/nano.c:1115
+msgid "Save modified buffer?  (Answering \"No\" will DISCARD changes.) "
+msgstr ""
 
-#: src/nano.c:1168
+#: src/nano.c:1178
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "No s'ha pogut tornar a obrir l'entrada estàndard des del teclat\n"
 
-#: src/nano.c:1192
+#: src/nano.c:1202
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "S'està llegint des de l'entrada estàndard, ^C per a avortar-ho\n"
 
-#: src/nano.c:1256
+#: src/nano.c:1266
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "S'ha rebut SIGHUP o SIGTERM\n"
 
-#: src/nano.c:1272
+#: src/nano.c:1282
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Empreu «fg» per a tornar al nano.\n"
 
-#: src/nano.c:1294
+#: src/nano.c:1304
 msgid "Suspension is not enabled"
 msgstr "La suspensió no està habilitada"
 
-#: src/nano.c:1448
+#: src/nano.c:1459
 msgid "enabled"
 msgstr "habilitat"
 
-#: src/nano.c:1448
+#: src/nano.c:1459
 msgid "disabled"
 msgstr "inhabilitat"
 
-#: src/nano.c:1607 src/winio.c:1125
-msgid "Unknown Command"
-msgstr "L'ordre és desconeguda"
+#: src/nano.c:1573
+msgid "Unbound key"
+msgstr ""
+
+#: src/nano.c:1577
+#, c-format
+msgid "Unbound key: M-%c"
+msgstr ""
+
+#: src/nano.c:1579
+#, c-format
+msgid "Unbound key: ^%c"
+msgstr ""
+
+#: src/nano.c:1581
+#, c-format
+msgid "Unbound key: %c"
+msgstr ""
 
-#: src/nano.c:1720
+#: src/nano.c:1745
 msgid "XON ignored, mumble mumble"
 msgstr "XON ignorat, blah, blah"
 
-#: src/nano.c:1725
+#: src/nano.c:1750
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF ignorat, blah, blah"
 
-#: src/nano.c:2139 src/rcfile.c:1334
+#: src/nano.c:2166 src/rcfile.c:1187
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "La mida de tabulador demanada «%s» és invàlida"
 
-#: src/nano.c:2200 src/rcfile.c:1259
+#: src/nano.c:2227 src/rcfile.c:1128
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "La mida de plenat demanada «%s» és invàlida"
 
-#: src/nano.c:2247
+#: src/nano.c:2276
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr "Introduïu «%s -h» per obtenir una llista de les opcions disponibles.\n"
@@ -1839,116 +1865,120 @@ msgstr "Introduïu «%s -h» per obtenir una llista de les opcions disponibles.\
 #. TRANSLATORS: For the next three strings, if possible, specify
 #. * the single-byte shortcuts for both your language and English.
 #. * For example, in French: "OoYy" for "Oui".
-#: src/prompt.c:821
+#: src/prompt.c:818
 msgid "Yy"
 msgstr "SsYy"
 
-#: src/prompt.c:822
+#: src/prompt.c:819
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:823
+#: src/prompt.c:820
 msgid "Aa"
 msgstr "TtAa"
 
-#: src/prompt.c:845
+#: src/prompt.c:842
 msgid "Yes"
 msgstr "Sí"
 
-#: src/prompt.c:850
+#: src/prompt.c:847
 msgid "All"
 msgstr "Totes"
 
-#: src/prompt.c:855
+#: src/prompt.c:852
 msgid "No"
 msgstr "No"
 
-#: src/rcfile.c:142
+#: src/rcfile.c:144
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Error en %s en la línia %lu: "
 
-#: src/rcfile.c:201
+#: src/rcfile.c:203
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "L'argument «%s» té una «\"» no terminada"
 
-#: src/rcfile.c:228 src/rcfile.c:280 src/rcfile.c:732 src/rcfile.c:793
-#: src/rcfile.c:882 src/rcfile.c:933
+#: src/rcfile.c:231 src/rcfile.c:674 src/rcfile.c:725 src/rcfile.c:824
 msgid "Regex strings must begin and end with a \" character"
 msgstr ""
 "Les cadenes d'expressió regular han de començar i acabar amb un caràcter \""
 
-#: src/rcfile.c:254 src/search.c:62
+#: src/rcfile.c:257 src/search.c:61
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "L'expreg «%s» és invàlida: %s"
 
-#: src/rcfile.c:274
+#: src/rcfile.c:279
 msgid "Missing syntax name"
 msgstr "Manca el nom de la sintaxi"
 
-#: src/rcfile.c:345
+#: src/rcfile.c:288
+msgid "A syntax name must be quoted"
+msgstr ""
+
+#: src/rcfile.c:297
 msgid "The \"none\" syntax is reserved"
 msgstr "La sintaxi «none» és reservada"
 
-#: src/rcfile.c:352
-msgid "The \"default\" syntax must take no extensions"
+#: src/rcfile.c:327
+#, fuzzy
+msgid "The \"default\" syntax does not accept extensions"
 msgstr "La sintaxi «default» no admet extensions"
 
-#: src/rcfile.c:424
+#: src/rcfile.c:369
 msgid "Missing key name"
 msgstr "Manca el nom de la clau"
 
-#: src/rcfile.c:433 src/rcfile.c:444
+#: src/rcfile.c:378 src/rcfile.c:389
 msgid "Key name is too short"
 msgstr "El nom de la tecla és massa curt"
 
-#: src/rcfile.c:454
+#: src/rcfile.c:399
 msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr "El nom de la tecla ha de començar amb «^», «M» o «F»"
 
-#: src/rcfile.c:457
+#: src/rcfile.c:402
 #, c-format
 msgid "Key name %s is invalid"
 msgstr "El nom de tecla «%s» és invàlid"
 
-#: src/rcfile.c:466
+#: src/rcfile.c:411
 msgid "Must specify a function to bind the key to"
 msgstr "Heu d'especificar una funció a la qual assignar la tecla"
 
 #. TRANSLATORS: Do not translate the word "all".
-#: src/rcfile.c:476
+#: src/rcfile.c:421
 msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
 "Heu d'especificar un menú (o «all») en què assignar/desassignar la tecla"
 
-#: src/rcfile.c:483
+#: src/rcfile.c:428
 #, c-format
 msgid "Cannot map name \"%s\" to a function"
 msgstr "No es pot assignar el nom «%s» a una funció"
 
-#: src/rcfile.c:490
+#: src/rcfile.c:435
 #, c-format
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "No es pot assignar el nom «%s» a un menú"
 
-#: src/rcfile.c:522
+#: src/rcfile.c:467
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr "La funció «%s» no existeix al menú «%s»"
 
-#: src/rcfile.c:534
+#: src/rcfile.c:479
 #, c-format
 msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "La combinació «%s» no es pot reassignar"
 
-#: src/rcfile.c:631
+#: src/rcfile.c:576
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr "S'ha produït un error en expandir %s: %s"
 
-#: src/rcfile.c:674
+#: src/rcfile.c:616
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1963,64 +1993,52 @@ msgstr ""
 "«black», amb el prefix opcional «bright»\n"
 "per als colors de primer pla."
 
-#: src/rcfile.c:696
-msgid "Cannot add a color command without a syntax command"
-msgstr "No es pot afegir una ordre de color sense una ordre de sintaxi"
+#: src/rcfile.c:637 src/rcfile.c:795 src/rcfile.c:858
+#, c-format
+msgid "A '%s' command requires a preceding 'syntax' command"
+msgstr ""
 
-#: src/rcfile.c:701
+#: src/rcfile.c:643
 msgid "Missing color name"
 msgstr "Manca el nom del color"
 
-#: src/rcfile.c:711 src/rcfile.c:872
-msgid "Missing regex string"
-msgstr "Manca la cadena d'expreg"
+#: src/rcfile.c:653 src/rcfile.c:807
+#, fuzzy, c-format
+msgid "Missing regex string after '%s' command"
+msgstr "Manca l'ordre de l'analitzador"
 
-#: src/rcfile.c:787
+#: src/rcfile.c:719
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "«start=» requereix el seu «end=» corresponent"
 
-#: src/rcfile.c:839
+#: src/rcfile.c:768
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
 msgstr "El color de fons «%s» no pot ser brillant"
 
-#: src/rcfile.c:867
-msgid "Cannot add a header regex without a syntax command"
-msgstr "No es pot afegir una expreg de capçalera sense una ordre de sintaxi"
-
-#: src/rcfile.c:922
-msgid "Cannot add a magic string regex without a syntax command"
-msgstr ""
-"No es pot afegir una expreg de cadena de «magic» sense una ordre de sintaxi"
-
-#: src/rcfile.c:927
-msgid "Missing magic string name"
-msgstr "Manca el nom de cadena de «magic»"
-
-#: src/rcfile.c:985
-msgid "Cannot add a linter without a syntax command"
-msgstr "No es pot afegir un analitzador sense una ordre de sintaxi"
+#: src/rcfile.c:802
+#, fuzzy, c-format
+msgid "The \"default\" syntax does not accept '%s' regexes"
+msgstr "La sintaxi «default» no admet extensions"
 
-#: src/rcfile.c:990
-msgid "Missing linter command"
+#: src/rcfile.c:863
+#, fuzzy, c-format
+msgid "Missing command after '%s'"
 msgstr "Manca l'ordre de l'analitzador"
 
-#: src/rcfile.c:1011
-msgid "Cannot add formatter without a syntax command"
-msgstr "No es pot afegir un formatador sense una ordre de sintaxi"
-
-#: src/rcfile.c:1016
-msgid "Missing formatter command"
-msgstr "Manca l'ordre del formatador"
+#: src/rcfile.c:879
+#, fuzzy, c-format
+msgid "Argument of '%s' lacks closing \""
+msgstr "L'argument «%s» té una «\"» no terminada"
 
-#: src/rcfile.c:1046
+#: src/rcfile.c:910
 #, c-format
 msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr ""
 "Error fatal: no hi ha lletres asignades per a la funció «%s». S'està "
 "sortint.\n"
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:912
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
@@ -2028,62 +2046,62 @@ msgstr ""
 "Si és necessari, empreu el nano amb l'opció -I  per a ajustar les vostres "
 "preferències.\n"
 
-#: src/rcfile.c:1109
+#: src/rcfile.c:971
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "No s'ha trobat la sintaxi «%s» a estendre"
 
-#: src/rcfile.c:1125 src/rcfile.c:1134 src/rcfile.c:1144
-#, c-format
-msgid "Command \"%s\" not allowed in included file"
-msgstr "L'ordre «%s» no es pot utilitzar a un fitxer inclós"
-
-#: src/rcfile.c:1150 src/rcfile.c:1359
+#: src/rcfile.c:993 src/rcfile.c:1202
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "La sintaxi «%s» no té ordres de colors"
 
-#: src/rcfile.c:1180
+#: src/rcfile.c:1024
+#, c-format
+msgid "Command \"%s\" not allowed in included file"
+msgstr "L'ordre «%s» no es pot utilitzar a un fitxer inclós"
+
+#: src/rcfile.c:1039
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "No es pot entendre l'ordre «%s»"
 
-#: src/rcfile.c:1195
+#: src/rcfile.c:1051
 msgid "Missing option"
 msgstr "Manca l'opció"
 
-#: src/rcfile.c:1217
+#: src/rcfile.c:1065
+#, c-format
+msgid "Unknown option \"%s\""
+msgstr "L'opció «%s» és desconeguda"
+
+#: src/rcfile.c:1077
+#, c-format
+msgid "Cannot unset option \"%s\""
+msgstr "No es pot desestablir l'opció «%s»"
+
+#: src/rcfile.c:1089
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "L'opció «%s» requereix un argument"
 
-#: src/rcfile.c:1235
+#: src/rcfile.c:1105
 msgid "Option is not a valid multibyte string"
 msgstr "L'opció no és una cadena d'octets múltiples vàlida"
 
-#: src/rcfile.c:1272 src/rcfile.c:1300 src/rcfile.c:1309
+#: src/rcfile.c:1139 src/rcfile.c:1160 src/rcfile.c:1167
 msgid "Non-blank characters required"
 msgstr "Es requereixen caràcters que no siguen d'espaiat"
 
-#: src/rcfile.c:1282
+#: src/rcfile.c:1146
 msgid "Two single-column characters required"
 msgstr "Es necessiten dos caràcters d'una columna"
 
-#: src/rcfile.c:1348
-#, c-format
-msgid "Cannot unset option \"%s\""
-msgstr "No es pot desestablir l'opció «%s»"
-
-#: src/rcfile.c:1354
-#, c-format
-msgid "Unknown option \"%s\""
-msgstr "L'opció «%s» és desconeguda"
-
-#: src/rcfile.c:1413
+#: src/rcfile.c:1258
 msgid "I can't find my home directory!  Wah!"
 msgstr "No s'ha pogut trobar el directori d'usuari! Ai!"
 
-#: src/rcfile.c:1451
+#: src/rcfile.c:1295
 #, c-format
 msgid ""
 "\n"
@@ -2092,44 +2110,49 @@ msgstr ""
 "\n"
 "Premeu Intro per a continuar carregant el nano.\n"
 
-#: src/search.c:96
+#: src/search.c:95
 #, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "«%.*s%s» no trobat"
 
 #. TRANSLATORS: The next three strings are modifiers of the search prompt.
-#: src/search.c:176
+#: src/search.c:169
 msgid " [Case Sensitive]"
 msgstr " [Maj/Min]"
 
-#: src/search.c:180
+#: src/search.c:173
 msgid " [Regexp]"
 msgstr " [ExpReg]"
 
-#: src/search.c:184
+#: src/search.c:177
 msgid " [Backwards]"
 msgstr " [Cap Enrere]"
 
 #. TRANSLATORS: The next two strings are modifiers of the search prompt.
-#: src/search.c:189
+#: src/search.c:182
 msgid " (to replace) in selection"
 msgstr " (a reemplaçar) dins de la selecció"
 
-#: src/search.c:191
+#: src/search.c:184
 msgid " (to replace)"
 msgstr " (a reemplaçar)"
 
+#: src/search.c:305
+#, fuzzy
+msgid "Searching..."
+msgstr "Cerca"
+
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:718
+#: src/search.c:693
 msgid "Replace this instance?"
 msgstr "Voleu reemplaçar aquesta instància?"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:883
+#: src/search.c:840
 msgid "Replace with"
 msgstr "Reemplaça amb"
 
-#: src/search.c:924
+#: src/search.c:875
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
@@ -2137,295 +2160,396 @@ msgstr[0] "S'ha reemplaçat %lu coincidència"
 msgstr[1] "S'han reemplaçat %lu coincidències"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:964
+#: src/search.c:914
 msgid "Enter line number, column number"
 msgstr "Introduïu el número de línia, número de columna"
 
-#: src/search.c:991
+#: src/search.c:939
 msgid "Invalid line or column number"
 msgstr "El número de línia o columna és invàlid"
 
-#: src/search.c:1124
+#: src/search.c:1080
 msgid "Not a bracket"
 msgstr "No és una clau"
 
-#: src/search.c:1191
+#: src/search.c:1146
 msgid "No matching bracket"
 msgstr "No hi ha clau corresponent"
 
-#: src/text.c:54
+#: src/text.c:53
 msgid "Mark Set"
 msgstr "Marca establida"
 
-#: src/text.c:58
+#: src/text.c:57
 msgid "Mark Unset"
 msgstr "Marca esborrada"
 
-#: src/text.c:70
+#: src/text.c:69
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "S'ha produït un error en iniciar executar «%s»"
 
-#: src/text.c:475
-msgid "Nothing in undo buffer!"
-msgstr "No hi ha res al búfer de desfer."
+#: src/text.c:468
+msgid "Commenting is not supported for this file type"
+msgstr ""
 
-#: src/text.c:481 src/text.c:634
-#, c-format
-msgid "Internal error: can't match line %d.  Please save your work."
+#: src/text.c:484
+msgid "Cannot comment past end of file"
 msgstr ""
-"Error intern: no hi ha coincidència per a la línia %d. Deseu el vostre "
-"treball."
+
+#: src/text.c:677
+msgid "Nothing in undo buffer!"
+msgstr "No hi ha res al búfer de desfer."
 
 #. TRANSLATORS: Eight of the next nine strings describe actions
 #. * that are undone or redone.  It are all nouns, not verbs.
-#: src/text.c:495 src/text.c:524 src/text.c:645 src/text.c:686
+#: src/text.c:695 src/text.c:724 src/text.c:857 src/text.c:898
 msgid "text add"
 msgstr "afegiment de text"
 
-#: src/text.c:505 src/text.c:656
+#: src/text.c:705 src/text.c:868
 msgid "text delete"
 msgstr "supressió de text"
 
-#: src/text.c:528 src/text.c:694
+#: src/text.c:728 src/text.c:907
 msgid "line join"
 msgstr "unió de línia"
 
-#: src/text.c:547 src/text.c:710
+#: src/text.c:747 src/text.c:923
 msgid "text cut"
 msgstr "tall de text"
 
-#: src/text.c:552 src/text.c:714
+#: src/text.c:752 src/text.c:927
 msgid "text uncut"
 msgstr "enganxada de text"
 
-#: src/text.c:558 src/text.c:691
+#: src/text.c:758 src/text.c:903
 msgid "Internal error: line is missing.  Please save your work."
 msgstr "Error intern: manca la línia. Deseu el vostre treball."
 
-#: src/text.c:561 src/text.c:665
+#: src/text.c:762 src/text.c:877
 msgid "line break"
 msgstr "trencat de línia"
 
-#: src/text.c:569 src/text.c:725
+#: src/text.c:772 src/text.c:947
+msgid "comment"
+msgstr ""
+
+#: src/text.c:776 src/text.c:951
+msgid "uncomment"
+msgstr ""
+
+#: src/text.c:780 src/text.c:938
 msgid "text insert"
 msgstr "inserció de text"
 
-#: src/text.c:589 src/text.c:718
+#: src/text.c:800 src/text.c:931
 msgid "text replace"
 msgstr "reemplaçament de text"
 
-#: src/text.c:596 src/text.c:732 src/text.c:1030 src/text.c:1174
+#: src/text.c:807 src/text.c:955 src/text.c:1267 src/text.c:1437
 msgid "Internal error: unknown type.  Please save your work."
 msgstr "Error intern: tipus desconegut. Deseu el vostre treball."
 
-#: src/text.c:601
+#: src/text.c:813
 #, c-format
 msgid "Undid action (%s)"
 msgstr "S'ha desfet l'acció (%s)"
 
-#: src/text.c:619
+#: src/text.c:832
 msgid "Nothing to re-do!"
 msgstr "No hi ha res a refer."
 
-#: src/text.c:628
+#: src/text.c:841
 msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr "Error intern: no es pot configurar el desfer. Deseu el vostre treball."
 
-#: src/text.c:737
+#: src/text.c:961
 #, c-format
 msgid "Redid action (%s)"
 msgstr "S'ha refet l'acció (%s)"
 
-#: src/text.c:827 src/text.c:2508 src/text.c:2944
+#: src/text.c:1051 src/text.c:2765 src/text.c:3198
 msgid "Could not create pipe"
 msgstr "No s'ha pogut crear un conducte"
 
-#: src/text.c:853 src/text.c:2595 src/text.c:2750 src/text.c:2992
-#: src/text.c:3286
+#: src/text.c:1077 src/text.c:2852 src/text.c:3005 src/text.c:3246
+#: src/text.c:3540
 msgid "Could not fork"
 msgstr "No s'ha pogut iniciar un altre procés"
 
-#: src/text.c:1853
+#: src/text.c:2117
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "El marcador de cita %s és erroni: %s"
 
-#: src/text.c:2241
+#: src/text.c:2499
 msgid "Can now UnJustify!"
 msgstr "Ara podeu desjustificar!"
 
-#: src/text.c:2435
+#: src/text.c:2697
 msgid "Edit a replacement"
 msgstr "Edita un reemplaçament"
 
-#: src/text.c:2510
+#. TRANSLATORS: Shown after fixing misspellings in one word.
+#: src/text.c:2713
+#, fuzzy
+msgid "Next word..."
+msgstr "Paraula següent"
+
+#: src/text.c:2767
 msgid "Creating misspelled word list, please wait..."
 msgstr "S'està creant una llista de paraules incorrectes, espereu..."
 
-#: src/text.c:2601 src/text.c:2999
+#: src/text.c:2858 src/text.c:3253
 msgid "Could not get size of pipe buffer"
 msgstr "No s'ha pogut obtindre la mida de la memòria intermèdia del conducte"
 
-#: src/text.c:2652
+#: src/text.c:2907
 msgid "Error invoking \"spell\""
 msgstr "S'ha produït un error en iniciar «spell»"
 
-#: src/text.c:2655
+#: src/text.c:2910
 msgid "Error invoking \"sort -f\""
 msgstr "S'ha produït un error en iniciar «sort -f»"
 
-#: src/text.c:2658
+#: src/text.c:2913
 msgid "Error invoking \"uniq\""
 msgstr "S'ha produït un error en iniciar «uniq»"
 
-#: src/text.c:2881
+#: src/text.c:3135
 msgid "Invoking spell checker, please wait"
 msgstr "S'està invocant el corrector ortogràfic, espereu"
 
-#: src/text.c:2897
+#: src/text.c:3151
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "La comprovació d'ortografia ha fallat: %s"
 
-#: src/text.c:2899
+#: src/text.c:3153
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "La comprovació d'ortografia ha fallat: %s: %s"
 
-#: src/text.c:2902
+#: src/text.c:3156
 msgid "Finished checking spelling"
 msgstr "Revisió d'ortografia finalitzada"
 
-#: src/text.c:2927
+#: src/text.c:3181
 msgid "No linter defined for this type of file!"
 msgstr "No hi ha cap analitzador definit per a aquest tipus de fitxer!"
 
-#: src/text.c:2932
+#: src/text.c:3186
 msgid "Save modified buffer before linting?"
 msgstr "Voleu desar el búfer abans d'analitzar-ho?"
 
-#: src/text.c:2949
+#: src/text.c:3203
 msgid "Invoking linter, please wait"
 msgstr "S'esta invocant l'analitzador, espereu"
 
-#: src/text.c:3105
+#: src/text.c:3358
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr "S'han rebut 0 línies analitzables de l'ordre: %s"
 
-#: src/text.c:3134
+#: src/text.c:3388
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
 "Aquest missatge és pel fitxer no obert %s, voleu obrir-lo en un nou búfer?"
 
-#: src/text.c:3153
+#: src/text.c:3407
 msgid "No more errors in unopened files, cancelling"
 msgstr "No hi ha més errades en fitxers no oberts, s'està cancel·lant"
 
-#: src/text.c:3192
+#: src/text.c:3446
 msgid "At last message"
 msgstr "A l'últim missatge"
 
-#: src/text.c:3197
+#: src/text.c:3451
 msgid "At first message"
 msgstr "Al primer missatge"
 
-#: src/text.c:3237
+#: src/text.c:3491
 msgid "Finished"
 msgstr "Finalitzat"
 
-#: src/text.c:3259
+#: src/text.c:3513
 msgid "Invoking formatter, please wait"
 msgstr "S'esta invocant el formatador, espereu"
 
-#: src/text.c:3314
+#: src/text.c:3568
 msgid "Finished formatting"
 msgstr "Ha finalitzat el format"
 
-#: src/text.c:3396
+#: src/text.c:3650
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sParaules: %lu  Línies: %ld  Caràcters: %lu"
 
-#: src/text.c:3397
+#: src/text.c:3651
 msgid "In Selection:  "
 msgstr "A la selecció:  "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3411
+#: src/text.c:3665
 msgid "Verbatim Input"
 msgstr "Entrada textual"
 
-#: src/utils.c:391 src/utils.c:403
+#: src/utils.c:392 src/utils.c:404
 msgid "nano is out of memory!"
 msgstr "nano s'ha quedat sense memòria!"
 
+#: src/utils.c:625
+#, c-format
+msgid "Internal error: can't match line %d.  Please save your work."
+msgstr ""
+"Error intern: no hi ha coincidència per a la línia %d. Deseu el vostre "
+"treball."
+
+#. TRANSLATORS: This refers to a sequence of escape codes
+#. * (from the keyboard) that nano does not know about.
+#: src/winio.c:1121
+msgid "Unknown sequence"
+msgstr ""
+
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
 #: src/winio.c:1427
 msgid "Unicode Input"
 msgstr "Entrada d'Unicode"
 
-#: src/winio.c:1991 src/winio.c:1995
-msgid "Modified"
-msgstr "Modificat"
-
-#: src/winio.c:1992
-msgid "View"
-msgstr "Visualitza"
-
-#: src/winio.c:2006
+#: src/winio.c:1960
 msgid "DIR:"
 msgstr "DIR:"
 
-#: src/winio.c:2013
+#: src/winio.c:1968
 msgid "File:"
 msgstr "Fitxer:"
 
-#: src/winio.c:3141
+#: src/winio.c:1972 src/winio.c:1976
+msgid "Modified"
+msgstr "Modificat"
+
+#: src/winio.c:1974
+msgid "View"
+msgstr "Visualitza"
+
+#: src/winio.c:3105
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "línia %ld/%ld (%d%%), col %lu/%lu (%d%%), car %lu/%lu (%d%%)"
 
-#: src/winio.c:3271
+#: src/winio.c:3235
 msgid "The nano text editor"
 msgstr "L'editor de text GNU nano"
 
-#: src/winio.c:3272
+#: src/winio.c:3236
 msgid "version"
 msgstr "versió"
 
-#: src/winio.c:3273
+#: src/winio.c:3237
 msgid "Brought to you by:"
 msgstr "Per cortesia de:"
 
-#: src/winio.c:3274
+#: src/winio.c:3238
 msgid "Special thanks to:"
 msgstr "Agraïments especials per a:"
 
-#: src/winio.c:3275
+#: src/winio.c:3239
 msgid "The Free Software Foundation"
 msgstr "La Fundació per al Software Lliure (FSF)"
 
-#: src/winio.c:3276
+#: src/winio.c:3240
 msgid "the many translators and the TP"
 msgstr "els molts traductors i el TP"
 
-#: src/winio.c:3277
+#: src/winio.c:3241
 msgid "For ncurses:"
 msgstr "Per ncurses:"
 
-#: src/winio.c:3278
+#: src/winio.c:3242
 msgid "and anyone else we forgot..."
 msgstr "i per qualsevol dels qui ens hem oblidat esmentar..."
 
-#: src/winio.c:3279
+#: src/winio.c:3243
 msgid "Thank you for using nano!"
 msgstr "Gràcies per fer servir nano!"
 
+#~ msgid ""
+#~ "Read %lu line (Converted from DOS and Mac format - Warning: No write "
+#~ "permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from DOS and Mac format - Warning: No write "
+#~ "permission)"
+#~ msgstr[0] ""
+#~ "%lu línia llegida (convertida des del format DOS i Mac - Avís: no hi ha "
+#~ "permís d'escriptura)"
+#~ msgstr[1] ""
+#~ "%lu línies llegides (convertides des del format DOS i Mac - Avís: no hi "
+#~ "ha permís d'escriptura)"
+
+#~ msgid ""
+#~ "Read %lu line (Converted from Mac format - Warning: No write permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from Mac format - Warning: No write permission)"
+#~ msgstr[0] ""
+#~ "%lu línia llegida (convertida des del format Mac - Avís: no hi ha permís "
+#~ "d'escriptura)"
+#~ msgstr[1] ""
+#~ "%lu línies llegides (convertides des del format Mac - Avís: no hi ha "
+#~ "permís d'escriptura)"
+
+#~ msgid ""
+#~ "Read %lu line (Converted from DOS format - Warning: No write permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from DOS format - Warning: No write permission)"
+#~ msgstr[0] ""
+#~ "%lu línia llegida (convertida des del format DOS - Avís: no hi ha permís "
+#~ "d'escriptura)"
+#~ msgstr[1] ""
+#~ "%lu línies llegides (convertides des del format DOS - Avís: no hi ha "
+#~ "permís d'escriptura)"
+
+#~ msgid "Read %lu line (Warning: No write permission)"
+#~ msgid_plural "Read %lu lines (Warning: No write permission)"
+#~ msgstr[0] "S'ha llegit %lu línia (Avís: no hi ha permís d'escriptura)"
+#~ msgstr[1] "S'han llegit %lu línies (Avís: no hi ha permís d'escriptura)"
+
+#~ msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
+#~ msgstr ""
+#~ "Voleu desar el búfer modificat (RESPONDRE «No» DESTRUIRÀ ELS CANVIS) ?"
+
+#~ msgid "Unknown Command"
+#~ msgstr "L'ordre és desconeguda"
+
+#~ msgid "Cannot add a color command without a syntax command"
+#~ msgstr "No es pot afegir una ordre de color sense una ordre de sintaxi"
+
+#~ msgid "Missing regex string"
+#~ msgstr "Manca la cadena d'expreg"
+
+#~ msgid "Cannot add a header regex without a syntax command"
+#~ msgstr "No es pot afegir una expreg de capçalera sense una ordre de sintaxi"
+
+#~ msgid "Cannot add a magic string regex without a syntax command"
+#~ msgstr ""
+#~ "No es pot afegir una expreg de cadena de «magic» sense una ordre de "
+#~ "sintaxi"
+
+#~ msgid "Missing magic string name"
+#~ msgstr "Manca el nom de cadena de «magic»"
+
+#~ msgid "Cannot add a linter without a syntax command"
+#~ msgstr "No es pot afegir un analitzador sense una ordre de sintaxi"
+
+#~ msgid "Cannot add formatter without a syntax command"
+#~ msgstr "No es pot afegir un formatador sense una ordre de sintaxi"
+
+#~ msgid "Missing formatter command"
+#~ msgstr "Manca l'ordre del formatador"
+
 #~ msgid "Cannot prepend or append to a symlink with --nofollow set"
 #~ msgstr ""
 #~ "No es pot avantposar o afegir a un enllaç simbòlic amb --nofollow "
@@ -2564,9 +2688,6 @@ msgstr "Gràcies per fer servir nano!"
 #~ "Forma d'ús: nano [+LÍNIA,COLUMNA] [opció llarga GNU] [opció] [fitxer]\n"
 #~ "\n"
 
-#~ msgid "Duplicate syntax name %s"
-#~ msgstr "El nom de la sintaxi %s és duplicat"
-
 #~ msgid "Find other bracket"
 #~ msgstr "Troba la clau corresponent"
 
diff --git a/po/cs.po b/po/cs.po
index 4bb226ca..e65afec6 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 2.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-25 16:41-0500\n"
+"POT-Creation-Date: 2016-06-17 15:41+0200\n"
 "PO-Revision-Date: 2015-12-30 21:32+0100\n"
 "Last-Translator: Pavel Fric <pavelfric@seznam.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
@@ -19,159 +19,177 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 "X-Generator: Lokalize 1.5\n"
 
+#: src/browser.c:144 src/browser.c:284 src/browser.c:334 src/files.c:996
+#: src/files.c:1003 src/files.c:1794 src/files.c:1919 src/files.c:1963
+#: src/files.c:1983 src/files.c:2099 src/files.c:3019 src/files.c:3242
+#: src/rcfile.c:540 src/rcfile.c:1280
+#, c-format
+msgid "Error reading %s: %s"
+msgstr "Chyba při čtení: %s: %s"
+
 #. TRANSLATORS: This is a prompt.
-#: src/browser.c:220
+#: src/browser.c:247
 msgid "Go To Directory"
 msgstr "Jít do adresáře"
 
-#: src/browser.c:227 src/browser.c:738 src/files.c:1174 src/files.c:2340
-#: src/nano.c:1120 src/search.c:202 src/search.c:290 src/search.c:895
-#: src/search.c:970 src/text.c:2935 src/text.c:3142
+#: src/browser.c:254 src/browser.c:723 src/files.c:1126 src/files.c:2292
+#: src/nano.c:1128 src/search.c:195 src/search.c:297 src/search.c:851
+#: src/search.c:918 src/text.c:3189 src/text.c:3396
 msgid "Cancelled"
 msgstr "Zrušeno"
 
-#: src/browser.c:253 src/browser.c:300
-#, c-format
-msgid "Can't go outside of %s in restricted mode"
+#. TRANSLATORS: This refers to the option --operatingdir,
+#. * not to --restricted.
+#: src/browser.c:274 src/browser.c:326
+#, fuzzy, c-format
+msgid "Can't go outside of %s in confined mode"
 msgstr "V omezeném režimu nelze jít mimo %s"
 
-#: src/browser.c:264 src/browser.c:310 src/browser.c:326 src/files.c:1044
-#: src/files.c:1052 src/files.c:1844 src/files.c:1971 src/files.c:2016
-#: src/files.c:2037 src/files.c:2156 src/files.c:3062 src/files.c:3285
-#: src/rcfile.c:596 src/rcfile.c:1435
-#, c-format
-msgid "Error reading %s: %s"
-msgstr "Chyba při čtení: %s: %s"
-
-#: src/browser.c:290
+#: src/browser.c:317
 msgid "Can't move up a directory"
 msgstr "Nepodařilo se přejít do nadřazeného adresáře"
 
 #. TRANSLATORS: Try to keep this at most 7 characters.
-#: src/browser.c:615 src/browser.c:623
+#: src/browser.c:590 src/browser.c:598
 msgid "(dir)"
 msgstr "(adresář)"
 
 #. TRANSLATORS: Try to keep this at most 12 characters.
-#: src/browser.c:620
+#: src/browser.c:595
 msgid "(parent dir)"
 msgstr "(rodičovský adresář)"
 
 #. TRANSLATORS: Try to keep this at most 7 characters.
 #. * If necessary, you can leave out the parentheses.
-#: src/browser.c:650
+#: src/browser.c:625
 msgid "(huge)"
 msgstr "(obrovský)"
 
 #. TRANSLATORS: This is the main search prompt.
-#: src/browser.c:727 src/search.c:173
+#: src/browser.c:712 src/search.c:166
 msgid "Search"
 msgstr "Hledat"
 
-#: src/browser.c:777 src/search.c:466 src/search.c:536
-msgid "This is the only occurrence"
-msgstr "Toto je jediný výskyt"
-
-#: src/browser.c:793 src/search.c:364
+#: src/browser.c:754 src/search.c:368
 msgid "Search Wrapped"
 msgstr "Hledání dokončeno"
 
-#: src/browser.c:843 src/search.c:517
+#: src/browser.c:764 src/search.c:509
+msgid "This is the only occurrence"
+msgstr "Toto je jediný výskyt"
+
+#: src/browser.c:812 src/search.c:473
 msgid "No current search pattern"
 msgstr "Žádný současný vzor hledání"
 
-#: src/files.c:50
+#: src/color.c:186
+#, fuzzy, c-format
+msgid "Unknown syntax name: %s"
+msgstr "Chybí název skladby"
+
+#: src/color.c:247
+#, c-format
+msgid "magic_load() failed: %s"
+msgstr ""
+
+#: src/color.c:251
+#, c-format
+msgid "magic_file(%s) failed: %s"
+msgstr ""
+
+#: src/files.c:47
 #, fuzzy, c-format
 msgid "Directory '%s' does not exist"
 msgstr "Chyba při zápisu souboru lock: Adresář '%s' neexistuje"
 
-#: src/files.c:52
+#: src/files.c:49
 #, c-format
 msgid "Path '%s': %s"
 msgstr ""
 
-#: src/files.c:54
+#: src/files.c:51
 #, fuzzy, c-format
 msgid "Path '%s' is not a directory"
 msgstr "„%s“ je adresář"
 
-#: src/files.c:57
+#: src/files.c:53
 #, c-format
 msgid "Path '%s' is not accessible"
 msgstr ""
 
-#. TRANSLATORS: Try to keep this at most 76 characters.
-#: src/files.c:158
+#. TRANSLATORS: Keep the next ten messages at most 76 characters.
+#: src/files.c:148
 msgid ""
 "Warning: Modifying a file which is not locked, check directory permission?"
 msgstr ""
 "Varování: Mění se soubor, který není zamčen. Ověřit oprávnění k adresáři?"
 
-#: src/files.c:197
+#: src/files.c:187
 msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
 msgstr "Nepodařilo se určit moji identitu pro soubor lock (getpwuid() selhal)"
 
-#: src/files.c:206
+#: src/files.c:196
 #, c-format
 msgid "Couldn't determine hostname for lock file: %s"
 msgstr "Nepodařilo se určit název počítače pro soubor lock: %s"
 
-#: src/files.c:227 src/files.c:238 src/files.c:275 src/files.c:285
+#: src/files.c:216 src/files.c:225 src/files.c:262 src/files.c:272
 #, c-format
 msgid "Error writing lock file %s: %s"
 msgstr "Chyba při zápisu souboru lock %s: %s"
 
-#: src/files.c:305
+#: src/files.c:291
 #, c-format
 msgid "Error deleting lock file %s: %s"
 msgstr "Chyba při mazání souboru lock %s: %s"
 
-#: src/files.c:341
+#: src/files.c:325
 #, c-format
 msgid "Error opening lock file %s: %s"
 msgstr "Chyba při otevírání souboru lock %s: %s"
 
-#: src/files.c:353
+#: src/files.c:337
 #, c-format
 msgid "Error reading lock file %s: Not enough data read"
 msgstr "Chyba čtení souboru lock %s: Nepřečten dostatek dat"
 
 #. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
-#: src/files.c:371
+#: src/files.c:354
 #, c-format
 msgid "File %s is being edited (by %s with %s, PID %d); continue?"
 msgstr "Soubor %s je upravován (%s s %s, ID procesu %d); pokračovat?"
 
-#: src/files.c:426
+#: src/files.c:430
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Nelze vložit soubor z vně %s"
 
-#: src/files.c:439 src/files.c:1038 src/rcfile.c:589 src/rcfile.c:1385
-#: src/rcfile.c:1426
+#: src/files.c:445 src/files.c:991 src/rcfile.c:533 src/rcfile.c:1230
+#: src/rcfile.c:1271
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "„%s“ je adresář"
 
-#: src/files.c:441
+#: src/files.c:447
 #, c-format
 msgid "\"%s\" is not a normal file"
 msgstr "\"%s\" není normální soubor"
 
-#: src/files.c:566
+#: src/files.c:571
 msgid "No more open file buffers"
 msgstr "Žádné další otevřené souborové vyrovnávací paměti"
 
-#: src/files.c:582
+#: src/files.c:586
 #, c-format
 msgid "Switched to %s"
 msgstr "Přepnuto na %s"
 
-#: src/files.c:584 src/global.c:988 src/winio.c:2010
+#: src/files.c:588 src/global.c:1005 src/winio.c:1965
 msgid "New Buffer"
 msgstr "Nová vyrovnávací paměť"
 
-#: src/files.c:943
+#. TRANSLATORS: Keep the next four messages at most 76 characters.
+#: src/files.c:913
 #, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
@@ -179,25 +197,7 @@ msgstr[0] "Přečten jeden řádek (převeden z formátu DOS a Mac)"
 msgstr[1] "Přečteny %lu řádky (převedeny z formátu DOS a Mac)"
 msgstr[2] "Přečteno %lu řádků (převedeny z formátu DOS a Mac)"
 
-#: src/files.c:948
-#, c-format
-msgid ""
-"Read %lu line (Converted from DOS and Mac format - Warning: No write "
-"permission)"
-msgid_plural ""
-"Read %lu lines (Converted from DOS and Mac format - Warning: No write "
-"permission)"
-msgstr[0] ""
-"Přečten jeden řádek (převeden z formátu DOS a Mac - Varování: Žádné "
-"oprávnění pro zápis)"
-msgstr[1] ""
-"Přečteny %lu řádky (převedeny z formátu DOS a Mac - Varování: Žádné "
-"oprávnění pro zápis)"
-msgstr[2] ""
-"Přečteno %lu řádků (převedeny z formátu DOS a Mac - Varování: Žádné "
-"oprávnění pro zápis)"
-
-#: src/files.c:954
+#: src/files.c:919
 #, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
@@ -205,23 +205,7 @@ msgstr[0] "Přečten jeden řádek (převeden z formátu Mac)"
 msgstr[1] "Přečteny %lu řádky (převedeny z formátu Mac)"
 msgstr[2] "Přečteno %lu řádků (převedeny z formátu Mac)"
 
-#: src/files.c:958
-#, c-format
-msgid ""
-"Read %lu line (Converted from Mac format - Warning: No write permission)"
-msgid_plural ""
-"Read %lu lines (Converted from Mac format - Warning: No write permission)"
-msgstr[0] ""
-"Přečten jeden řádek (převeden z formátu Mac - Varování: Žádné oprávnění pro "
-"zápis)"
-msgstr[1] ""
-"Přečteny %lu řádky (převedeny z formátu Mac - Varování: Žádné oprávnění pro "
-"zápis)"
-msgstr[2] ""
-"Přečteno %lu řádků (převedeny z formátu Mac - Varování: Žádné oprávnění pro "
-"zápis)"
-
-#: src/files.c:964
+#: src/files.c:925
 #, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
@@ -229,23 +213,7 @@ msgstr[0] "Přečten jeden řádek (převeden z formátu DOS)"
 msgstr[1] "Přečteny %lu řádky (převedeny z formátu DOS)"
 msgstr[2] "Přečteno %lu řádků (převedeny z formátu DOS)"
 
-#: src/files.c:968
-#, c-format
-msgid ""
-"Read %lu line (Converted from DOS format - Warning: No write permission)"
-msgid_plural ""
-"Read %lu lines (Converted from DOS format - Warning: No write permission)"
-msgstr[0] ""
-"Přečten jeden řádek (převeden z formátu DOS - Varování: Žádné oprávnění pro "
-"zápis)"
-msgstr[1] ""
-"Přečteny %lu řádky (převedeny z formátu DOS - Varování: Žádné oprávnění pro "
-"zápis)"
-msgstr[2] ""
-"Přečteno %lu řádků (převedeny z formátu DOSc - Varování: Žádné oprávnění pro "
-"zápis)"
-
-#: src/files.c:974
+#: src/files.c:930
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
@@ -253,90 +221,83 @@ msgstr[0] "Přečten jeden řádek"
 msgstr[1] "Přečteny %lu řádky"
 msgstr[2] "Přečteno %lu řádků"
 
-#: src/files.c:977
-#, c-format
-msgid "Read %lu line (Warning: No write permission)"
-msgid_plural "Read %lu lines (Warning: No write permission)"
-msgstr[0] "Přečten jeden řádek (Varování: Žádné oprávnění pro zápis)"
-msgstr[1] "Přečteny %lu řádky (Varování: Žádné oprávnění pro zápis)"
-msgstr[2] "Přečteno %lu řádků (Varování: Žádné oprávnění pro zápis)"
-
-#: src/files.c:1019 src/files.c:1056
+#: src/files.c:974 src/files.c:1006
 msgid "Reading File"
 msgstr "ÄŒte se soubor"
 
-#: src/files.c:1025
+#: src/files.c:980
 msgid "New File"
 msgstr "Nový soubor"
 
-#: src/files.c:1028
-#, c-format
-msgid "\"%s\" not found"
+#: src/files.c:983
+#, fuzzy, c-format
+msgid "File \"%s\" not found"
 msgstr "\"%s\" nenalezen"
 
-#: src/files.c:1039 src/rcfile.c:590 src/rcfile.c:1386 src/rcfile.c:1427
+#: src/files.c:992 src/rcfile.c:534 src/rcfile.c:1231 src/rcfile.c:1272
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" je soubor zařízení"
 
-#: src/files.c:1133
+#: src/files.c:1083
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Příkaz k provedení v nové vyrovnávací paměti [z %s] "
 
-#: src/files.c:1135
+#: src/files.c:1085
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Příkaz k provedení [z %s] "
 
-#: src/files.c:1142
+#: src/files.c:1092
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Soubor k vložení do nové vyrovnávací paměti [z %s] "
 
-#: src/files.c:1144
+#: src/files.c:1094
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Soubor k vložení [z %s] "
 
-#: src/files.c:1389
+#: src/files.c:1338
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Klávesa nepřípustná, když není v režimu více vyrovnávacích pamětí"
 
-#: src/files.c:1684
-msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+#: src/files.c:1632
+#, fuzzy
+msgid "Failed to write backup file; continue saving? (Say N if unsure.) "
 msgstr ""
 "Nepodařilo se zapsat zálohovací soubor. Pokračovat v ukládání? (N, nejste-li "
 "si jisti) "
 
-#: src/files.c:1800
+#: src/files.c:1750
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Nelze zapsat vnÄ› %s"
 
-#: src/files.c:1885 src/files.c:1910 src/files.c:1928 src/files.c:1941
-#: src/files.c:1952 src/files.c:1981
+#: src/files.c:1833 src/files.c:1858 src/files.c:1876 src/files.c:1889
+#: src/files.c:1900 src/files.c:1928
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Chyba při zápisu zálohovacího souboru %s: %s"
 
-#: src/files.c:1886 src/nano.c:690
+#: src/files.c:1834 src/nano.c:692
 msgid "Too many backup files?"
 msgstr "Příliš mnoho zálohovacích souborů?"
 
-#: src/files.c:2026 src/text.c:2863 src/text.c:2875 src/text.c:3244
-#: src/text.c:3253
+#: src/files.c:1972 src/text.c:3117 src/text.c:3129 src/text.c:3498
+#: src/text.c:3507
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Chyba při zápisu dočasného souboru s: %s"
 
-#: src/files.c:2049 src/files.c:2068 src/files.c:2080 src/files.c:2104
-#: src/files.c:2121 src/files.c:2131 src/files.c:2164 src/files.c:2171
+#: src/files.c:1994 src/files.c:2013 src/files.c:2023 src/files.c:2047
+#: src/files.c:2064 src/files.c:2074 src/files.c:2106 src/files.c:2113
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Chyba při zápisu %s: %s"
 
-#: src/files.c:2200
+#: src/files.c:2154
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
@@ -344,64 +305,67 @@ msgstr[0] "Zapsán jeden řádek"
 msgstr[1] "Zapsány %lu řádky"
 msgstr[2] "Zapsáno %lu řádků"
 
-#: src/files.c:2299
+#: src/files.c:2249
 msgid " [DOS Format]"
 msgstr " [Formát DOS]"
 
-#: src/files.c:2300
+#: src/files.c:2250
 msgid " [Mac Format]"
 msgstr " [Formát Mac]"
 
-#: src/files.c:2302
+#: src/files.c:2252
 msgid " [Backup]"
 msgstr " [Záloha]"
 
-#: src/files.c:2309
+#: src/files.c:2259
 msgid "Prepend Selection to File"
 msgstr "Připojit výběr na začátek souboru"
 
-#: src/files.c:2310
+#: src/files.c:2260
 msgid "Append Selection to File"
 msgstr "Připojit výběr na konec souboru"
 
-#: src/files.c:2311
+#: src/files.c:2261
 msgid "Write Selection to File"
 msgstr "Zapsat výběr do souboru"
 
-#: src/files.c:2314
+#: src/files.c:2264
 msgid "File Name to Prepend to"
 msgstr "Název souboru, na jehož začátek provést připojení"
 
-#: src/files.c:2315
+#: src/files.c:2265
 msgid "File Name to Append to"
 msgstr "Název souboru, na jehož konec provést připojení"
 
-#: src/files.c:2316
+#: src/files.c:2266
 msgid "File Name to Write"
 msgstr "Název souboru k zapsání"
 
-#: src/files.c:2349
+#: src/files.c:2301
 #, fuzzy
-msgid "Save modified buffer anyway ? "
+msgid "Save modified buffer anyway? "
 msgstr "Uložit před statickým rozborem změněnou vyrovnávací paměť?"
 
-#: src/files.c:2457
-msgid "File exists, OVERWRITE ? "
-msgstr "Soubor existuje. PŘEPSAT?"
-
-#: src/files.c:2466
-msgid "Save file under DIFFERENT NAME ? "
+#: src/files.c:2412
+#, fuzzy
+msgid "Save file under DIFFERENT NAME? "
 msgstr "Uložit soubor pod JINÝM NÁZVEM? "
 
-#: src/files.c:2480
-msgid "File was modified since you opened it, continue saving ? "
+#: src/files.c:2420
+#, fuzzy, c-format
+msgid "File \"%s\" exists; OVERWRITE? "
+msgstr "Soubor existuje. PŘEPSAT?"
+
+#: src/files.c:2441
+#, fuzzy
+msgid "File was modified since you opened it; continue saving? "
 msgstr "Soubor byl poté, co jste jej otevřel, upraven. Pokračovat v ukládání?"
 
-#: src/files.c:2917
+#: src/files.c:2874
 msgid "(more)"
 msgstr "(více)"
 
-#: src/files.c:3004
+#: src/files.c:2959
 #, c-format
 msgid ""
 "\n"
@@ -410,7 +374,7 @@ msgstr ""
 "\n"
 "Stiskněte klávesu Enter pro pokračování \n"
 
-#: src/files.c:3020
+#: src/files.c:2975
 #, c-format
 msgid ""
 "Unable to create directory %s: %s\n"
@@ -419,7 +383,7 @@ msgstr ""
 "Nelze vytvořit adresář %s: %s\n"
 "Je vyžadován pro ukládání/nahrávání historie hledání nebo poloh ukazatele.\n"
 
-#: src/files.c:3026
+#: src/files.c:2982
 #, c-format
 msgid ""
 "Path %s is not a directory and needs to be.\n"
@@ -429,7 +393,7 @@ msgstr ""
 "Nano nebude schopen nahrát nebo uložit historii hledání nebo poloh "
 "ukazatele.\n"
 
-#: src/files.c:3045
+#: src/files.c:3002
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I tried to move\n"
@@ -438,7 +402,7 @@ msgstr ""
 "Zjištěn zděděný soubor s historií nano (%s). Byl učiněn pokus o jeho přesun\n"
 "do upřednostňovaného umístění (%s), ale vyskytla se chyba: %s"
 
-#: src/files.c:3049
+#: src/files.c:3006
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I moved\n"
@@ -449,721 +413,752 @@ msgstr ""
 "do upřednostňovaného umístění (%s)\n"
 "(viz FAQ pro nano k této změně)"
 
-#: src/files.c:3132 src/files.c:3140 src/files.c:3164 src/files.c:3176
+#: src/files.c:3089 src/files.c:3097 src/files.c:3121 src/files.c:3133
 #, fuzzy, c-format
 msgid "Error writing %s: %s\n"
 msgstr "Chyba při zápisu %s: %s"
 
 #. TRANSLATORS: Try to keep the next fifteen strings at most 10 characters.
-#: src/global.c:480
+#: src/global.c:483
 msgid "Exit"
 msgstr "Ukončit"
 
-#: src/global.c:481
+#: src/global.c:484
 msgid "Close"
 msgstr "Zavřít"
 
-#: src/global.c:482
+#: src/global.c:485
 msgid "Uncut Text"
 msgstr "Vložit text"
 
-#: src/global.c:484
+#: src/global.c:487
 msgid "Unjustify"
 msgstr "Zrušit zarovnání"
 
-#: src/global.c:490
+#: src/global.c:493
 msgid "Read File"
 msgstr "Otevřít soubor"
 
-#: src/global.c:491
+#: src/global.c:494
 msgid "Where Is"
 msgstr "Hledat"
 
-#: src/global.c:492
+#: src/global.c:495
 msgid "Replace"
 msgstr "Nahradit"
 
-#: src/global.c:493
+#: src/global.c:496
 msgid "Go To Line"
 msgstr "Přejít na řádek"
 
-#: src/global.c:494
+#: src/global.c:497
 msgid "Prev Line"
 msgstr "Předchozí řádek"
 
-#: src/global.c:495
+#: src/global.c:498
 msgid "Next Line"
 msgstr "Další řádek"
 
-#: src/global.c:496
+#: src/global.c:499
 msgid "Prev Page"
 msgstr "Předchozí strana"
 
-#: src/global.c:497
+#: src/global.c:500
 msgid "Next Page"
 msgstr "Další strana"
 
-#: src/global.c:499
+#: src/global.c:502
 msgid "Justify"
 msgstr "Zarovnat"
 
-#: src/global.c:500
+#: src/global.c:503
 msgid "FullJstify"
 msgstr "Plné zarovnání"
 
-#: src/global.c:502
+#: src/global.c:505
 msgid "Refresh"
 msgstr "Obnovit"
 
 #. TRANSLATORS: Try to keep this string at most 12 characters.
-#: src/global.c:505
+#: src/global.c:508
 msgid "WhereIs Next"
 msgstr "Hledat další"
 
 #. TRANSLATORS: The next long series of strings are shortcut descriptions;
 #. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:512
+#: src/global.c:515
 msgid "Justify the current paragraph"
 msgstr "Zarovnat nynější odstavec"
 
-#: src/global.c:514
+#: src/global.c:517
 msgid "Cancel the current function"
 msgstr "Zrušit současnou funkci"
 
-#: src/global.c:515
+#: src/global.c:518
 msgid "Display this help text"
 msgstr "Zobrazit tento text s nápovědou"
 
-#: src/global.c:518
+#: src/global.c:521
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Zavřít nynější souborovou vyrovnávací paměť/Ukončit nano"
 
-#: src/global.c:520
+#: src/global.c:523
 msgid "Exit from nano"
 msgstr "Ukončit nano"
 
-#: src/global.c:524
+#: src/global.c:527
 msgid "Write the current file to disk"
 msgstr "Zapsat nynější soubor na disk"
 
-#: src/global.c:526
+#: src/global.c:529
 msgid "Insert another file into the current one"
 msgstr "Vložit další soubor do nynějšího"
 
-#: src/global.c:528
+#: src/global.c:531
 msgid "Search for a string or a regular expression"
 msgstr "Hledat řetězec nebo regulární výraz"
 
-#: src/global.c:531
+#: src/global.c:533
 msgid "Search for a string"
 msgstr "Hledat řetězec"
 
-#: src/global.c:533
+#: src/global.c:534
+msgid "Refresh the file list"
+msgstr ""
+
+#: src/global.c:535
+#, fuzzy
+msgid "Go to lefthand column"
+msgstr "Jít na určitý řádek a sloupec"
+
+#: src/global.c:536
+#, fuzzy
+msgid "Go to righthand column"
+msgstr "Jít na určitý řádek a sloupec"
+
+#: src/global.c:538
 msgid "Go one screenful up"
 msgstr "Jít o jednu obrazovku nahoru"
 
-#: src/global.c:534
+#: src/global.c:539
 msgid "Go one screenful down"
 msgstr "Jít o jednu obrazovku dolů"
 
-#: src/global.c:536
+#: src/global.c:541
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Vyjmout nynější řádek a uložit jej ve schránce"
 
-#: src/global.c:538
+#: src/global.c:543
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Vložit ze schránky do nynějšího řádku"
 
-#: src/global.c:539
+#: src/global.c:544
 msgid "Display the position of the cursor"
 msgstr "Zobrazit polohu ukazatele"
 
-#: src/global.c:541
+#: src/global.c:546
 msgid "Invoke the spell checker, if available"
 msgstr "Vyvolat ověřování pravopisu (je-li dostupné)"
 
-#: src/global.c:543
+#: src/global.c:548
 msgid "Replace a string or a regular expression"
 msgstr "Nahradit řetězec nebo regulární výraz"
 
-#: src/global.c:544
+#: src/global.c:549
 msgid "Go to line and column number"
 msgstr "Jít na určitý řádek a sloupec"
 
-#: src/global.c:546
+#: src/global.c:551
 msgid "Mark text starting from the cursor position"
 msgstr "Označit text počínaje od polohy ukazatele"
 
-#: src/global.c:547
+#: src/global.c:552
 msgid "Repeat the last search"
 msgstr "Opakovat poslední hledání"
 
-#: src/global.c:549
+#: src/global.c:554
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "Zkopírovat nynější řádek a uložit jej ve schránce"
 
-#: src/global.c:550
+#: src/global.c:555
 msgid "Indent the current line"
 msgstr "Odsadit nynější řádek"
 
-#: src/global.c:551
+#: src/global.c:556
 msgid "Unindent the current line"
 msgstr "Zrušit odsazení nynějšího řádku"
 
-#: src/global.c:552
+#: src/global.c:558
+msgid "Comment/uncomment the current line or marked lines"
+msgstr ""
+
+#: src/global.c:560
 msgid "Undo the last operation"
 msgstr "Zrušit poslední operaci"
 
-#: src/global.c:553
+#: src/global.c:561
 msgid "Redo the last undone operation"
 msgstr "Zopakovat poslední zrušenou operaci"
 
-#: src/global.c:555
+#: src/global.c:563
 msgid "Go back one character"
 msgstr "Jít o jeden znak zpět"
 
-#: src/global.c:556
+#: src/global.c:564
 msgid "Go forward one character"
 msgstr "Jít o jeden znak vpřed"
 
-#: src/global.c:558
+#: src/global.c:566
 msgid "Go back one word"
 msgstr "Jít o jedno slovo zpět"
 
-#: src/global.c:559
+#: src/global.c:567
 msgid "Go forward one word"
 msgstr "Jít o jedno slovo vpřed"
 
-#: src/global.c:561
+#: src/global.c:569
 msgid "Go to previous line"
 msgstr "Jít na předchozí řádek"
 
-#: src/global.c:562
+#: src/global.c:570
 msgid "Go to next line"
 msgstr "Jít na další řádek"
 
-#: src/global.c:563
+#: src/global.c:571
 msgid "Go to beginning of current line"
 msgstr "Jít na začátek nynějšího řádku"
 
-#: src/global.c:564
+#: src/global.c:572
 msgid "Go to end of current line"
 msgstr "Jít na konec nynějšího řádku"
 
-#: src/global.c:567
+#: src/global.c:575
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "Jít na začátek odstavce; potom předchozího odstavce"
 
-#: src/global.c:569
+#: src/global.c:577
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr "Jít za konec odstavce; potom dalšího odstavce"
 
-#: src/global.c:571
+#: src/global.c:579
 msgid "Go to the first line of the file"
 msgstr "Jít na první řádek souboru"
 
-#: src/global.c:572
+#: src/global.c:580
 msgid "Go to the last line of the file"
 msgstr "Jít na poslední řádek souboru"
 
-#: src/global.c:574
+#: src/global.c:582
 msgid "Go to the matching bracket"
 msgstr "Jít na odpovídající závorky"
 
-#: src/global.c:576
+#: src/global.c:584
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "Posunout obraz o jeden řádek nahoru, aniž by se pohnul ukazatel"
 
-#: src/global.c:578
+#: src/global.c:586
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "Posunout obraz o jeden řádek dolů, aniž by se pohnul ukazatel"
 
-#: src/global.c:581
+#: src/global.c:589
 msgid "Switch to the previous file buffer"
 msgstr "Přepnout na předchozí souborovou vyrovnávací paměť"
 
-#: src/global.c:582
+#: src/global.c:590
 msgid "Switch to the next file buffer"
 msgstr "Přepnout na další souborovou vyrovnávací paměť"
 
-#: src/global.c:584
+#: src/global.c:592
 msgid "Insert the next keystroke verbatim"
 msgstr "Vložit další znak přímo (takový jaký je)"
 
-#: src/global.c:585
+#: src/global.c:593
 msgid "Insert a tab at the cursor position"
 msgstr "Vložit zarážku v poloze ukazatele"
 
-#: src/global.c:586
+#: src/global.c:594
 msgid "Insert a newline at the cursor position"
 msgstr "Vložit zalomení řádku v poloze ukazatele"
 
-#: src/global.c:587
+#: src/global.c:595
 msgid "Delete the character under the cursor"
 msgstr "Smazat znak v poloze ukazatele"
 
-#: src/global.c:589
+#: src/global.c:597
 msgid "Delete the character to the left of the cursor"
 msgstr "Smazat znak nalevo od polohy ukazatele"
 
-#: src/global.c:592
+#: src/global.c:600
 msgid "Cut backward from cursor to word start"
 msgstr "Vyjmout zpět za ukazatelem po začátek slova"
 
-#: src/global.c:594
+#: src/global.c:602
 msgid "Cut forward from cursor to next word start"
 msgstr "Vyjmout od ukazatele po začátek dalšího slova"
 
-#: src/global.c:596
+#: src/global.c:604
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Vyjmout od polohy ukazatele po konec souboru"
 
-#: src/global.c:599
+#: src/global.c:607
 msgid "Justify the entire file"
 msgstr "Zarovnat celý soubor"
 
-#: src/global.c:603
+#: src/global.c:611
 msgid "Count the number of words, lines, and characters"
 msgstr "Spočítat počet slov, řádků a znaků"
 
-#: src/global.c:606
+#: src/global.c:614
 msgid "Refresh (redraw) the current screen"
 msgstr "Obnovit (překreslit) současnou obrazovku"
 
-#: src/global.c:608
+#: src/global.c:616
 msgid "Suspend the editor (if suspension is enabled)"
 msgstr "Odložit editor na pozadí (pokud je povoleno uspání)"
 
-#: src/global.c:610
+#: src/global.c:618
 msgid "Save file without prompting"
 msgstr "Uložit soubor bez optání"
 
-#: src/global.c:611
+#: src/global.c:619
 msgid "Search next occurrence backward"
 msgstr "Hledat další výskyt dozadu"
 
-#: src/global.c:612
+#: src/global.c:620
 msgid "Search next occurrence forward"
 msgstr "Hledat další výskyt dopředu"
 
-#: src/global.c:614
+#: src/global.c:622
 msgid "Toggle the case sensitivity of the search"
 msgstr "Přepnout při hledání rozlišování mezi psaním velkých a malých písmen"
 
-#: src/global.c:616
+#: src/global.c:624
 msgid "Reverse the direction of the search"
 msgstr "Obrátit směr hledání"
 
-#: src/global.c:620
+#: src/global.c:628
 msgid "Toggle the use of regular expressions"
 msgstr "Přepnout používání regulárních výrazů"
 
-#: src/global.c:624
+#: src/global.c:632
 msgid "Recall the previous search/replace string"
 msgstr "Vyvolat předchozí řetězec hledání/nahrazení"
 
-#: src/global.c:626
+#: src/global.c:634
 msgid "Recall the next search/replace string"
 msgstr "Vyvolat další řetězec hledání/nahrazení"
 
-#: src/global.c:629
+#: src/global.c:637
 msgid "Go to file browser"
 msgstr "Jít do prohlížeče souborů"
 
-#: src/global.c:632
+#: src/global.c:640
 msgid "Toggle the use of DOS format"
 msgstr "Přepnout zápis ve formátu DOS"
 
-#: src/global.c:633
+#: src/global.c:641
 msgid "Toggle the use of Mac format"
 msgstr "Přepnout zápis ve formátu Mac"
 
-#: src/global.c:634
+#: src/global.c:642
 msgid "Toggle appending"
 msgstr "Přepnout připojování na konec souboru"
 
-#: src/global.c:635
+#: src/global.c:643
 msgid "Toggle prepending"
 msgstr "Přepnout připojování na začátek souboru"
 
-#: src/global.c:636
+#: src/global.c:644
 msgid "Toggle backing up of the original file"
 msgstr "Přepnout zálohování původního souboru při ukládání"
 
-#: src/global.c:637
+#: src/global.c:645
 msgid "Execute external command"
 msgstr "Provést vnější příkaz"
 
-#: src/global.c:639
+#: src/global.c:647
 msgid "Close buffer without saving it"
 msgstr ""
 
-#: src/global.c:641
+#: src/global.c:649
 msgid "Toggle the use of a new buffer"
 msgstr "Přepnout používání nové vyrovnávací paměti"
 
-#: src/global.c:644
+#: src/global.c:652
 msgid "Exit from the file browser"
 msgstr "Ukončit prohlížeč souborů"
 
-#: src/global.c:645
+#: src/global.c:653
 msgid "Go to the first file in the list"
 msgstr "Jít na první řádek v seznamu"
 
-#: src/global.c:646
+#: src/global.c:654
 msgid "Go to the last file in the list"
 msgstr "Jít na poslední řádek v seznamu"
 
-#: src/global.c:647
+#: src/global.c:655
 msgid "Go to the previous file in the list"
 msgstr "Jít na předchozí řádek v seznamu"
 
-#: src/global.c:648
+#: src/global.c:656
 msgid "Go to the next file in the list"
 msgstr "Jít na další řádek v seznamu"
 
-#: src/global.c:649
+#: src/global.c:657
 msgid "Go to directory"
 msgstr "Jít do adresáře"
 
-#: src/global.c:652
+#: src/global.c:660
 msgid "Invoke the linter, if available"
 msgstr "Vyvolat statický rozbor (je-li dostupný)"
 
-#: src/global.c:653
+#: src/global.c:661
 msgid "Go to previous linter msg"
 msgstr "Jít na předchozí zprávu statického rozboru"
 
-#: src/global.c:654
+#: src/global.c:662
 msgid "Go to next linter msg"
 msgstr "Jít na další zprávu statického rozboru"
 
-#: src/global.c:656
+#: src/global.c:664
 msgid "Invoke formatter, if available"
 msgstr "Vyvolat formátovač (je-li dostupný)"
 
 #. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:671
+#: src/global.c:679
 msgid "Get Help"
 msgstr "Nápověda"
 
-#: src/global.c:674 src/prompt.c:858
+#: src/global.c:682 src/prompt.c:855
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: src/global.c:687
+#: src/global.c:695
 msgid "Write Out"
 msgstr "Zapsat"
 
-#: src/global.c:723
+#: src/global.c:731
 msgid "Go To Dir"
 msgstr "Jít do adresáře"
 
-#: src/global.c:738
+#: src/global.c:746
 msgid "Cut Text"
 msgstr "Vyjmout text"
 
-#: src/global.c:753
+#: src/global.c:761
 msgid "To Spell"
 msgstr "Pravopis"
 
-#: src/global.c:757
+#: src/global.c:765
 msgid "To Linter"
 msgstr "Statický rozbor"
 
-#: src/global.c:760
+#: src/global.c:768
 msgid "Formatter"
 msgstr "Formátovač"
 
-#: src/global.c:767
+#: src/global.c:775
 msgid "Case Sens"
 msgstr "VELKÁ PÍSMENA/malá písmena"
 
-#: src/global.c:772
+#: src/global.c:780
 msgid "Regexp"
 msgstr "Regulární výraz"
 
-#: src/global.c:777
+#: src/global.c:785
 msgid "Backwards"
 msgstr "Zpět"
 
-#: src/global.c:784
+#: src/global.c:792
 msgid "No Replace"
 msgstr "Žádné nahrazení"
 
-#: src/global.c:792
+#: src/global.c:800
 msgid "Cur Pos"
 msgstr "Ukazatel"
 
-#: src/global.c:807
+#: src/global.c:815
 msgid "First Line"
 msgstr "První řádek"
 
-#: src/global.c:809
+#: src/global.c:817
 msgid "Last Line"
 msgstr "Poslední řádek"
 
-#: src/global.c:816
+#: src/global.c:824
 msgid "To Bracket"
 msgstr "K závorce"
 
-#: src/global.c:819
+#: src/global.c:827
 msgid "Mark Text"
 msgstr "Označit text"
 
-#: src/global.c:822
+#: src/global.c:830
 msgid "Copy Text"
 msgstr "Kopírovat text"
 
-#: src/global.c:825
+#: src/global.c:833
 msgid "Indent Text"
 msgstr "Odsadit text"
 
-#: src/global.c:827
+#: src/global.c:835
 msgid "Unindent Text"
 msgstr "Zrušit odsazení textu"
 
-#: src/global.c:830
+#: src/global.c:838
 msgid "Undo"
 msgstr "Zpět"
 
-#: src/global.c:832
+#: src/global.c:840
 msgid "Redo"
 msgstr "Znovu"
 
-#: src/global.c:836 src/global.c:842
+#: src/global.c:844 src/global.c:850
 msgid "Back"
 msgstr "Zpět"
 
-#: src/global.c:838 src/global.c:844
+#: src/global.c:846 src/global.c:852
 msgid "Forward"
 msgstr "Vpřed"
 
-#: src/global.c:849
+#: src/global.c:857
 msgid "Prev Word"
 msgstr "Předchozí slovo"
 
-#: src/global.c:851
+#: src/global.c:859
 msgid "Next Word"
 msgstr "Další slovo"
 
-#: src/global.c:855
+#: src/global.c:863
 msgid "Home"
 msgstr "Začátek"
 
-#: src/global.c:857
+#: src/global.c:865
 msgid "End"
 msgstr "Konec"
 
-#: src/global.c:866
+#: src/global.c:874
 msgid "Beg of Par"
 msgstr "Začátek odstavce"
 
-#: src/global.c:868
+#: src/global.c:876
 msgid "End of Par"
 msgstr "Konec odstavce"
 
-#: src/global.c:873
+#: src/global.c:881
 msgid "Scroll Up"
 msgstr "Posunout obraz nahoru"
 
-#: src/global.c:875
+#: src/global.c:883
 msgid "Scroll Down"
 msgstr "Posunout obraz dolů"
 
-#: src/global.c:880
+#: src/global.c:888
 msgid "Prev File"
 msgstr "Předchozí soubor"
 
-#: src/global.c:882
+#: src/global.c:890
 msgid "Next File"
 msgstr "Další soubor"
 
-#: src/global.c:891
+#: src/global.c:899
 msgid "Verbatim"
 msgstr "Přímé zadání"
 
-#: src/global.c:894
+#: src/global.c:902
 msgid "Tab"
 msgstr "Zarážka"
 
-#: src/global.c:896
+#: src/global.c:904
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:899
+#: src/global.c:907
 msgid "Delete"
 msgstr "Smazat následující znak"
 
-#: src/global.c:901
+#: src/global.c:909
 msgid "Backspace"
 msgstr "Smazat předcházející znak"
 
 #. TRANSLATORS: The next two strings refer to cutting words.
-#: src/global.c:912
+#: src/global.c:920
 msgid "Cut Left"
 msgstr "Vyjmout vlevo"
 
-#: src/global.c:914
+#: src/global.c:922
 msgid "Cut Right"
 msgstr "Vyjmout vpravo"
 
-#: src/global.c:916
+#: src/global.c:924
 msgid "CutTillEnd"
 msgstr "Vyjmout až po konec"
 
-#: src/global.c:926
+#: src/global.c:934
 msgid "Word Count"
 msgstr "Počet slov"
 
-#: src/global.c:933
+#: src/global.c:941
 msgid "Suspend"
 msgstr "Odložit na pozadí"
 
-#: src/global.c:937
+#: src/global.c:945
+#, fuzzy
+msgid "Comment Lines"
+msgstr "Další řádek"
+
+#: src/global.c:949
 msgid "Save"
 msgstr "Uložit"
 
-#: src/global.c:940
+#: src/global.c:952
 msgid "Previous"
 msgstr "Předchozí"
 
-#: src/global.c:942
+#: src/global.c:954
 msgid "Next"
 msgstr "Další"
 
-#: src/global.c:948
+#: src/global.c:960
 msgid "PrevHstory"
 msgstr "Předchozí historie"
 
-#: src/global.c:951
+#: src/global.c:963
 msgid "NextHstory"
 msgstr "Další historie"
 
-#: src/global.c:955
+#: src/global.c:972
 msgid "Go To Text"
 msgstr "Jít na text"
 
-#: src/global.c:959
+#: src/global.c:976
 msgid "DOS Format"
 msgstr "Formát DOS"
 
-#: src/global.c:961
+#: src/global.c:978
 msgid "Mac Format"
 msgstr "Formát Mac"
 
-#: src/global.c:969
+#: src/global.c:986
 msgid "Append"
 msgstr "Připojit na konec"
 
-#: src/global.c:971
+#: src/global.c:988
 msgid "Prepend"
 msgstr "Připojit na začátek"
 
-#: src/global.c:974
+#: src/global.c:991
 msgid "Backup File"
 msgstr "Soubor se zálohou"
 
-#: src/global.c:981
+#: src/global.c:998
 msgid "Execute Command"
 msgstr "Provést příkaz"
 
-#: src/global.c:996
+#: src/global.c:1013
 msgid "To Files"
 msgstr "Jít na soubory"
 
-#: src/global.c:1004
+#: src/global.c:1021
 msgid "First File"
 msgstr "První soubor"
 
-#: src/global.c:1006
+#: src/global.c:1023
 msgid "Last File"
 msgstr "Poslední soubor"
 
-#: src/global.c:1010
+#: src/global.c:1027
 msgid "Discard buffer"
 msgstr ""
 
+#: src/global.c:1038
+msgid "Left Column"
+msgstr ""
+
+#: src/global.c:1040
+msgid "Right Column"
+msgstr ""
+
 #. TRANSLATORS: Try to keep the next two strings at most 20 characters.
-#: src/global.c:1020
+#: src/global.c:1047
 msgid "Prev Lint Msg"
 msgstr "Předchozí rozbor"
 
-#: src/global.c:1022
+#: src/global.c:1049
 msgid "Next Lint Msg"
 msgstr "Další rozbor"
 
 #. TRANSLATORS: The next seventeen strings are toggle descriptions;
 #. * they are best kept shorter than 40 characters, but may be longer.
-#: src/global.c:1285
+#: src/global.c:1316
 msgid "Help mode"
 msgstr "Režim s nápovědou"
 
-#: src/global.c:1287
+#: src/global.c:1318
 msgid "Constant cursor position display"
 msgstr "Ukazovat stálou polohu ukazatele"
 
-#: src/global.c:1289
+#: src/global.c:1320
 msgid "Use of one more line for editing"
 msgstr "Používání ještě jednoho řádku k úpravám"
 
-#: src/global.c:1291
+#: src/global.c:1322
 msgid "Smooth scrolling"
 msgstr "Plynulé posunování obrazu"
 
-#: src/global.c:1293
+#: src/global.c:1324
 msgid "Soft wrapping of overlong lines"
 msgstr "Plynulé zalamování dlouhých řádků"
 
-#: src/global.c:1295
+#: src/global.c:1326
 msgid "Whitespace display"
 msgstr "Zobrazování bílých znaků"
 
-#: src/global.c:1297
+#: src/global.c:1328
 msgid "Color syntax highlighting"
 msgstr "Barevné zvýrazňování skladby"
 
-#: src/global.c:1299
+#: src/global.c:1330
 msgid "Smart home key"
 msgstr "Chytrá klávesa pro začátek dokumentu (Poloha 1)"
 
-#: src/global.c:1301
+#: src/global.c:1332
 msgid "Auto indent"
 msgstr "Automaticky odsadit"
 
-#: src/global.c:1303
+#: src/global.c:1334
 msgid "Cut to end"
 msgstr "Vyjmout po konec"
 
-#: src/global.c:1305
+#: src/global.c:1336
 msgid "Hard wrapping of overlong lines"
 msgstr "Tvrdé zalamování dlouhých řádků"
 
-#: src/global.c:1307
+#: src/global.c:1338
 msgid "Conversion of typed tabs to spaces"
 msgstr "Převod zadaných zarážek na mezery"
 
-#: src/global.c:1309
+#: src/global.c:1340
 msgid "Backup files"
 msgstr "Zálohovací soubory"
 
-#: src/global.c:1311
+#: src/global.c:1342
 msgid "Reading file into separate buffer"
 msgstr "Soubor se načte v samostatné vyrovnávací paměti"
 
-#: src/global.c:1313
+#: src/global.c:1344
 msgid "Mouse support"
 msgstr "Podpora pro myš"
 
-#: src/global.c:1315
+#: src/global.c:1346
 msgid "No conversion from DOS/Mac format"
 msgstr "Žádný převod z formátů DOS/Mac"
 
-#: src/global.c:1317
+#: src/global.c:1348
 msgid "Suspension"
 msgstr "Odložit na pozadí"
 
-#: src/help.c:209
+#: src/help.c:211
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1185,7 +1180,7 @@ msgstr ""
 "závorkách. Stisknutí klávesy Enter bez zadání nějakého textu povede k "
 "provedení předchozího požadavku na hledání.  "
 
-#: src/help.c:218
+#: src/help.c:220
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1199,7 +1194,7 @@ msgstr ""
 " Následující funkční klávesy jsou dostupné v režimu Hledání:\n"
 "\n"
 
-#: src/help.c:224
+#: src/help.c:226
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1219,7 +1214,7 @@ msgstr ""
 " Následující funkční klávesy jsou dostupné v režimu Přejít na řádek:\n"
 "\n"
 
-#: src/help.c:233
+#: src/help.c:235
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1243,7 +1238,7 @@ msgstr ""
 "oddělené vyrovnávací paměti (použijte Meta-< a > pro přepínání mezi "
 "souborovými vyrovnávacími paměťmi)."
 
-#: src/help.c:242
+#: src/help.c:244
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1258,7 +1253,7 @@ msgstr ""
 " Následující funkční klávesy jsou dostupné v režimu Vložit soubor:\n"
 "\n"
 
-#: src/help.c:248
+#: src/help.c:250
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1286,7 +1281,7 @@ msgstr ""
 " Následující funkční klávesy jsou dostupné v režimu Zapsat soubor:\n"
 "\n"
 
-#: src/help.c:262
+#: src/help.c:264
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1311,7 +1306,7 @@ msgstr ""
 " Následující funkční klávesy jsou dostupné v prohlížeči souborů:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:277
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1335,7 +1330,7 @@ msgstr ""
 "provedení předchozího požadavku na hledání.\n"
 "\n"
 
-#: src/help.c:284
+#: src/help.c:286
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1344,7 +1339,7 @@ msgstr ""
 "souborů:\n"
 "\n"
 
-#: src/help.c:288
+#: src/help.c:290
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1368,7 +1363,7 @@ msgstr ""
 "prohlížeči souborů:\n"
 "\n"
 
-#: src/help.c:301
+#: src/help.c:303
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1392,7 +1387,7 @@ msgstr ""
 "\":\n"
 "\n"
 
-#: src/help.c:316
+#: src/help.c:318
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1413,7 +1408,7 @@ msgstr ""
 " Následující funkční klávesy jsou dostupné v režimu \"Provést příkaz\":\n"
 "\n"
 
-#: src/help.c:329
+#: src/help.c:331
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1432,15 +1427,15 @@ msgstr ""
 "soubor změněn, nebo nebyl. Hlavní okno obsahuje soubor, který je upravován. "
 "Stavový řádek (třetí řádek zdola) ukazuje důležité zprávy.  "
 
-#: src/help.c:339
+#: src/help.c:341
+#, fuzzy
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
-" The notation for shortcuts is as follows: Control-key sequences are notated "
-"with a caret (^) symbol and can be entered either by using the Control "
-"(Ctrl) key or pressing the Escape (Esc) key twice.  Escape-key sequences are "
-"notated with the Meta (M-) symbol and can be entered using either the Esc, "
-"Alt, or Meta key depending on your keyboard setup.  "
+" Shortcuts are written as follows: Control-key sequences are notated with a "
+"'^' and can be entered either by using the Ctrl key or pressing the Esc key "
+"twice.  Meta-key sequences are notated with 'M-' and can be entered using "
+"either the Alt, Cmd, or Esc key, depending on your keyboard setup.  "
 msgstr ""
 "Nejspodnější dva řádky ukazují v editoru nejčastěji používané zkratky.\n"
 "\n"
@@ -1469,19 +1464,19 @@ msgstr ""
 msgid "enable/disable"
 msgstr "Zapnout/Vypnout"
 
-#: src/nano.c:559
+#: src/nano.c:560
 msgid "Key is invalid in view mode"
 msgstr "Klávesa nepřípustná v režimu pouze pro čtení"
 
-#: src/nano.c:565
+#: src/nano.c:566
 msgid "This function is disabled in restricted mode"
 msgstr "V omezeném režimu je tato funkce vypnuta"
 
-#: src/nano.c:573
+#: src/nano.c:574
 msgid "Help is not available"
 msgstr "Nápověda není dostupná"
 
-#: src/nano.c:684
+#: src/nano.c:686
 #, c-format
 msgid ""
 "\n"
@@ -1490,7 +1485,7 @@ msgstr ""
 "\n"
 "Vyrovnávací paměť zapsána do %s\n"
 
-#: src/nano.c:686
+#: src/nano.c:688
 #, c-format
 msgid ""
 "\n"
@@ -1499,7 +1494,7 @@ msgstr ""
 "\n"
 "Vyrovnávací paměť nezapsána do %s: %s\n"
 
-#: src/nano.c:689
+#: src/nano.c:691
 #, c-format
 msgid ""
 "\n"
@@ -1761,19 +1756,24 @@ msgstr "Povolit odložení na pozadí (zastavit a zpět k shellu)"
 msgid "Enable soft line wrapping"
 msgstr "Povolit plynulé zalamování dlouhých řádků"
 
-#: src/nano.c:937
-#, c-format
-msgid " GNU nano, version %s\n"
+#: src/nano.c:940
+#, fuzzy, c-format
+msgid " nano, version %s\n"
 msgstr " Verze GNU nano %s\n"
 
-#: src/nano.c:940
+#: src/nano.c:943
+#, c-format
+msgid " (C) 2014..%s the contributors to nano\n"
+msgstr ""
+
+#: src/nano.c:945
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr ""
 "Adresa elektronické pošty: nano@nano-editor.org\tWWW: http://www.nano-editor."
 "org/"
 
-#: src/nano.c:941
+#: src/nano.c:946
 #, c-format
 msgid ""
 "\n"
@@ -1782,68 +1782,83 @@ msgstr ""
 "\n"
 " Volby při sestavování:"
 
-#: src/nano.c:1073
+#: src/nano.c:1081
 msgid "No file name"
 msgstr "Žádný název souboru"
 
-#: src/nano.c:1108
-msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
-msgstr "Uložit změněnou vyrovnávací paměť (odpověď \"Ne\" zahodí změny)?"
+#: src/nano.c:1115
+msgid "Save modified buffer?  (Answering \"No\" will DISCARD changes.) "
+msgstr ""
 
-#: src/nano.c:1168
+#: src/nano.c:1178
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr ""
 "Obvyklý vstup (stdin) se z klávesnice znovu otevřít nepodařilo. Promiňte\n"
 
-#: src/nano.c:1192
+#: src/nano.c:1202
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "Čte se z obvyklého vstupu (stdin), ^C k pro přerušení\n"
 
-#: src/nano.c:1256
+#: src/nano.c:1266
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Přijat SIGHUP nebo SIGTERM\n"
 
-#: src/nano.c:1272
+#: src/nano.c:1282
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Použijte \"fg\" pro návrat do nano.\n"
 
-#: src/nano.c:1294
+#: src/nano.c:1304
 msgid "Suspension is not enabled"
 msgstr "Uspání není povoleno"
 
-#: src/nano.c:1448
+#: src/nano.c:1459
 msgid "enabled"
 msgstr "povoleno"
 
-#: src/nano.c:1448
+#: src/nano.c:1459
 msgid "disabled"
 msgstr "zakázáno"
 
-#: src/nano.c:1607 src/winio.c:1125
-msgid "Unknown Command"
-msgstr "Neznámý příkaz"
+#: src/nano.c:1573
+msgid "Unbound key"
+msgstr ""
 
-#: src/nano.c:1720
+#: src/nano.c:1577
+#, c-format
+msgid "Unbound key: M-%c"
+msgstr ""
+
+#: src/nano.c:1579
+#, c-format
+msgid "Unbound key: ^%c"
+msgstr ""
+
+#: src/nano.c:1581
+#, c-format
+msgid "Unbound key: %c"
+msgstr ""
+
+#: src/nano.c:1745
 msgid "XON ignored, mumble mumble"
 msgstr "XON nebrán na vědomí, huhňání"
 
-#: src/nano.c:1725
+#: src/nano.c:1750
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF nebrán na vědomí, huhňání"
 
-#: src/nano.c:2139 src/rcfile.c:1334
+#: src/nano.c:2166 src/rcfile.c:1187
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Požadovaná velikost zarážky \"%s\" je neplatná"
 
-#: src/nano.c:2200 src/rcfile.c:1259
+#: src/nano.c:2227 src/rcfile.c:1128
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Požadovaná velikost výplně \"%s\" je neplatná"
 
-#: src/nano.c:2247
+#: src/nano.c:2276
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr "Pište '%s -h' pro seznam dostupných voleb.\n"
@@ -1851,116 +1866,120 @@ msgstr "Pište '%s -h' pro seznam dostupných voleb.\n"
 #. TRANSLATORS: For the next three strings, if possible, specify
 #. * the single-byte shortcuts for both your language and English.
 #. * For example, in French: "OoYy" for "Oui".
-#: src/prompt.c:821
+#: src/prompt.c:818
 msgid "Yy"
 msgstr "Yy"
 
-#: src/prompt.c:822
+#: src/prompt.c:819
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:823
+#: src/prompt.c:820
 msgid "Aa"
 msgstr "Aa"
 
-#: src/prompt.c:845
+#: src/prompt.c:842
 msgid "Yes"
 msgstr "Ano"
 
-#: src/prompt.c:850
+#: src/prompt.c:847
 msgid "All"
 msgstr "VÅ¡e"
 
-#: src/prompt.c:855
+#: src/prompt.c:852
 msgid "No"
 msgstr "Ne"
 
-#: src/rcfile.c:142
+#: src/rcfile.c:144
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Chyba v %s na řádku %lu: "
 
-#: src/rcfile.c:201
+#: src/rcfile.c:203
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "Argument „%s“ má neukončené \""
 
-#: src/rcfile.c:228 src/rcfile.c:280 src/rcfile.c:732 src/rcfile.c:793
-#: src/rcfile.c:882 src/rcfile.c:933
+#: src/rcfile.c:231 src/rcfile.c:674 src/rcfile.c:725 src/rcfile.c:824
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Řetězce znaků pro regulární výrazy musí začínat a končit znakem \""
 
-#: src/rcfile.c:254 src/search.c:62
+#: src/rcfile.c:257 src/search.c:61
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Špatný regulární výraz \"%s\": %s"
 
-#: src/rcfile.c:274
+#: src/rcfile.c:279
 msgid "Missing syntax name"
 msgstr "Chybí název skladby"
 
-#: src/rcfile.c:345
+#: src/rcfile.c:288
+msgid "A syntax name must be quoted"
+msgstr ""
+
+#: src/rcfile.c:297
 msgid "The \"none\" syntax is reserved"
 msgstr "Skladba \"none\" je zamluvena"
 
-#: src/rcfile.c:352
-msgid "The \"default\" syntax must take no extensions"
+#: src/rcfile.c:327
+#, fuzzy
+msgid "The \"default\" syntax does not accept extensions"
 msgstr "Skladba \"default\" nesmí mít žádné přípony"
 
-#: src/rcfile.c:424
+#: src/rcfile.c:369
 msgid "Missing key name"
 msgstr "Chybí název klíče"
 
-#: src/rcfile.c:433 src/rcfile.c:444
+#: src/rcfile.c:378 src/rcfile.c:389
 msgid "Key name is too short"
 msgstr "Název klávesy zkratky je příliš krátký"
 
-#: src/rcfile.c:454
+#: src/rcfile.c:399
 msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr "Klávesové zkratky musí začínat \"^\", \"M\", nebo \"F\""
 
-#: src/rcfile.c:457
+#: src/rcfile.c:402
 #, fuzzy, c-format
 msgid "Key name %s is invalid"
 msgstr "Požadovaná velikost zarážky \"%s\" je neplatná"
 
-#: src/rcfile.c:466
+#: src/rcfile.c:411
 msgid "Must specify a function to bind the key to"
 msgstr "Musí být zadána funkce spojená s klávesovou zkratkou"
 
 #. TRANSLATORS: Do not translate the word "all".
-#: src/rcfile.c:476
+#: src/rcfile.c:421
 msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
 "Musí být zadána nabídka (funkce) (nebo \"all\" pro vše), se kterou je "
 "klávesová zkratka spojena"
 
-#: src/rcfile.c:483
+#: src/rcfile.c:428
 #, c-format
 msgid "Cannot map name \"%s\" to a function"
 msgstr "Nelze spojit název \"%s\" s funkcí"
 
-#: src/rcfile.c:490
+#: src/rcfile.c:435
 #, c-format
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "Nelze spojit název \"%s\" s nabídkou"
 
-#: src/rcfile.c:522
+#: src/rcfile.c:467
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr "Funkce '%s' neexistuje v nabídce '%s'"
 
-#: src/rcfile.c:534
+#: src/rcfile.c:479
 #, c-format
 msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "Promiňte, ale klávesu \"%s\" nelze znovu přiřadit"
 
-#: src/rcfile.c:631
+#: src/rcfile.c:576
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr "Chyba při rozšíření %s: %s"
 
-#: src/rcfile.c:674
+#: src/rcfile.c:616
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1976,62 +1995,50 @@ msgstr ""
 "a „black“ (černá), s volitelnou předponou „bright“ (světlá)\n"
 "pro barvy popředí."
 
-#: src/rcfile.c:696
-msgid "Cannot add a color command without a syntax command"
-msgstr "Nelze přidat pokyn pro barvu bez příkazu pro skladbu"
+#: src/rcfile.c:637 src/rcfile.c:795 src/rcfile.c:858
+#, c-format
+msgid "A '%s' command requires a preceding 'syntax' command"
+msgstr ""
 
-#: src/rcfile.c:701
+#: src/rcfile.c:643
 msgid "Missing color name"
 msgstr "Chybí název barvy"
 
-#: src/rcfile.c:711 src/rcfile.c:872
-msgid "Missing regex string"
-msgstr "Chybí řetězec regulárního výrazu"
+#: src/rcfile.c:653 src/rcfile.c:807
+#, fuzzy, c-format
+msgid "Missing regex string after '%s' command"
+msgstr "Chybí příkaz pro statický rozbor"
 
-#: src/rcfile.c:787
+#: src/rcfile.c:719
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "„start=“ vyžaduje odpovídající „end=“"
 
-#: src/rcfile.c:839
+#: src/rcfile.c:768
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
 msgstr "Barva pozadí \"%s\" nemůže být světlá (\"bright\")"
 
-#: src/rcfile.c:867
-msgid "Cannot add a header regex without a syntax command"
-msgstr "Nelze přidat regulární výraz pro záhlaví bez příkazu pro skladbu"
-
-#: src/rcfile.c:922
-msgid "Cannot add a magic string regex without a syntax command"
-msgstr ""
-"Nelze přidat regulární výraz kouzelného řetězce bez příkazu pro skladbu"
-
-#: src/rcfile.c:927
-msgid "Missing magic string name"
-msgstr "Chybí název kouzelného řetězce"
-
-#: src/rcfile.c:985
-msgid "Cannot add a linter without a syntax command"
-msgstr "Nelze přidat statický rozbor bez příkazu pro skladbu - syntax"
+#: src/rcfile.c:802
+#, fuzzy, c-format
+msgid "The \"default\" syntax does not accept '%s' regexes"
+msgstr "Skladba \"default\" nesmí mít žádné přípony"
 
-#: src/rcfile.c:990
-msgid "Missing linter command"
+#: src/rcfile.c:863
+#, fuzzy, c-format
+msgid "Missing command after '%s'"
 msgstr "Chybí příkaz pro statický rozbor"
 
-#: src/rcfile.c:1011
-msgid "Cannot add formatter without a syntax command"
-msgstr "Nelze přidat formátovač bez příkazu pro skladbu (syntax)"
-
-#: src/rcfile.c:1016
-msgid "Missing formatter command"
-msgstr "Chybí příkaz pro formátovač"
+#: src/rcfile.c:879
+#, fuzzy, c-format
+msgid "Argument of '%s' lacks closing \""
+msgstr "Argument „%s“ má neukončené \""
 
-#: src/rcfile.c:1046
+#: src/rcfile.c:910
 #, c-format
 msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr "Závažná chyba: S funkcí \"%s\" není spojena žádná klávesová zkratka.\n"
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:912
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
@@ -2039,62 +2046,62 @@ msgstr ""
 "Spusťte, prosím, v případě potřeby nano s volbou \"-l\", chcete-li změnit "
 "svá nastavení nanorc.\n"
 
-#: src/rcfile.c:1109
+#: src/rcfile.c:971
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "Nepodařilo se najít skladbu \"%s\" k rozšíření"
 
-#: src/rcfile.c:1125 src/rcfile.c:1134 src/rcfile.c:1144
-#, c-format
-msgid "Command \"%s\" not allowed in included file"
-msgstr "Příkaz \"%s\" nedovolen v zahrnutém souboru"
-
-#: src/rcfile.c:1150 src/rcfile.c:1359
+#: src/rcfile.c:993 src/rcfile.c:1202
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Skladba \"%s\" nemá pokyny pro barvy"
 
-#: src/rcfile.c:1180
+#: src/rcfile.c:1024
+#, c-format
+msgid "Command \"%s\" not allowed in included file"
+msgstr "Příkaz \"%s\" nedovolen v zahrnutém souboru"
+
+#: src/rcfile.c:1039
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Příkazu \"%s\" neporozuměno"
 
-#: src/rcfile.c:1195
+#: src/rcfile.c:1051
 msgid "Missing option"
 msgstr "Chybějící volba"
 
-#: src/rcfile.c:1217
+#: src/rcfile.c:1065
+#, c-format
+msgid "Unknown option \"%s\""
+msgstr "Neznámá volba \"%s\""
+
+#: src/rcfile.c:1077
+#, c-format
+msgid "Cannot unset option \"%s\""
+msgstr "Nelze vypnout volbu \"%s\""
+
+#: src/rcfile.c:1089
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Volba \"%s\" vyžaduje argument"
 
-#: src/rcfile.c:1235
+#: src/rcfile.c:1105
 msgid "Option is not a valid multibyte string"
 msgstr "Volba není žádným platným řetězcem znaků multibyte"
 
-#: src/rcfile.c:1272 src/rcfile.c:1300 src/rcfile.c:1309
+#: src/rcfile.c:1139 src/rcfile.c:1160 src/rcfile.c:1167
 msgid "Non-blank characters required"
 msgstr "Požadovány ne-prázdné znaky"
 
-#: src/rcfile.c:1282
+#: src/rcfile.c:1146
 msgid "Two single-column characters required"
 msgstr "Požadovány dva znaky v rozsahu jednoho sloupce"
 
-#: src/rcfile.c:1348
-#, c-format
-msgid "Cannot unset option \"%s\""
-msgstr "Nelze vypnout volbu \"%s\""
-
-#: src/rcfile.c:1354
-#, c-format
-msgid "Unknown option \"%s\""
-msgstr "Neznámá volba \"%s\""
-
-#: src/rcfile.c:1413
+#: src/rcfile.c:1258
 msgid "I can't find my home directory!  Wah!"
 msgstr "Nemohu najít svůj domovský adresář! Jau!"
 
-#: src/rcfile.c:1451
+#: src/rcfile.c:1295
 #, c-format
 msgid ""
 "\n"
@@ -2103,44 +2110,49 @@ msgstr ""
 "\n"
 "Stiskněte klávesu Enter pro pokračování ve spouštění programu nano.\n"
 
-#: src/search.c:96
+#: src/search.c:95
 #, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "\"%.*s%s\" nenalezen"
 
 #. TRANSLATORS: The next three strings are modifiers of the search prompt.
-#: src/search.c:176
+#: src/search.c:169
 msgid " [Case Sensitive]"
 msgstr " [Rozlišovat velikost písmen]"
 
-#: src/search.c:180
+#: src/search.c:173
 msgid " [Regexp]"
 msgstr " [regulární výraz]"
 
-#: src/search.c:184
+#: src/search.c:177
 msgid " [Backwards]"
 msgstr " [Zpět]"
 
 #. TRANSLATORS: The next two strings are modifiers of the search prompt.
-#: src/search.c:189
+#: src/search.c:182
 msgid " (to replace) in selection"
 msgstr " (k nahrazení) ve výběru"
 
-#: src/search.c:191
+#: src/search.c:184
 msgid " (to replace)"
 msgstr " (k nahrazení)"
 
+#: src/search.c:305
+#, fuzzy
+msgid "Searching..."
+msgstr "Hledat"
+
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:718
+#: src/search.c:693
 msgid "Replace this instance?"
 msgstr "Nahradit tento případ?"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:883
+#: src/search.c:840
 msgid "Replace with"
 msgstr "Nahradit"
 
-#: src/search.c:924
+#: src/search.c:875
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
@@ -2149,296 +2161,374 @@ msgstr[1] "Nahrazeny %lu výskyty"
 msgstr[2] "Nahrazeno %lu výskytů"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:964
+#: src/search.c:914
 msgid "Enter line number, column number"
 msgstr "Zadat číslo řádku, číslo sloupce"
 
-#: src/search.c:991
+#: src/search.c:939
 msgid "Invalid line or column number"
 msgstr "Neplatné číslo řádku nebo, číslo sloupce"
 
-#: src/search.c:1124
+#: src/search.c:1080
 msgid "Not a bracket"
 msgstr "Žádná závorka"
 
-#: src/search.c:1191
+#: src/search.c:1146
 msgid "No matching bracket"
 msgstr "Žádná odpovídající závorka"
 
-#: src/text.c:54
+#: src/text.c:53
 msgid "Mark Set"
 msgstr "Značka nastavena"
 
-#: src/text.c:58
+#: src/text.c:57
 msgid "Mark Unset"
 msgstr "Značka odstraněna"
 
-#: src/text.c:70
+#: src/text.c:69
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Chyba při vyvolání „%s“"
 
-#: src/text.c:475
-msgid "Nothing in undo buffer!"
-msgstr "Nic ve vyrovnávací paměti pro \"Zpět\"!"
+#: src/text.c:468
+msgid "Commenting is not supported for this file type"
+msgstr ""
 
-#: src/text.c:481 src/text.c:634
-#, c-format
-msgid "Internal error: can't match line %d.  Please save your work."
+#: src/text.c:484
+msgid "Cannot comment past end of file"
 msgstr ""
-"Vnitřní chyba: Nelze nalézt shodu pro řádek %d. Uložte, prosím, svou práci."
+
+#: src/text.c:677
+msgid "Nothing in undo buffer!"
+msgstr "Nic ve vyrovnávací paměti pro \"Zpět\"!"
 
 #. TRANSLATORS: Eight of the next nine strings describe actions
 #. * that are undone or redone.  It are all nouns, not verbs.
-#: src/text.c:495 src/text.c:524 src/text.c:645 src/text.c:686
+#: src/text.c:695 src/text.c:724 src/text.c:857 src/text.c:898
 msgid "text add"
 msgstr "Přidat text"
 
-#: src/text.c:505 src/text.c:656
+#: src/text.c:705 src/text.c:868
 msgid "text delete"
 msgstr "Smazat text"
 
-#: src/text.c:528 src/text.c:694
+#: src/text.c:728 src/text.c:907
 msgid "line join"
 msgstr "Spojit řádek"
 
-#: src/text.c:547 src/text.c:710
+#: src/text.c:747 src/text.c:923
 msgid "text cut"
 msgstr "Vyjmout text"
 
-#: src/text.c:552 src/text.c:714
+#: src/text.c:752 src/text.c:927
 msgid "text uncut"
 msgstr "Zrušit vyjmutí textu"
 
-#: src/text.c:558 src/text.c:691
+#: src/text.c:758 src/text.c:903
 msgid "Internal error: line is missing.  Please save your work."
 msgstr "Vnitřní chyba: Chybí řádek. Uložte, prosím, svoji práci."
 
-#: src/text.c:561 src/text.c:665
+#: src/text.c:762 src/text.c:877
 msgid "line break"
 msgstr "Zalamovat řádky"
 
-#: src/text.c:569 src/text.c:725
+#: src/text.c:772 src/text.c:947
+msgid "comment"
+msgstr ""
+
+#: src/text.c:776 src/text.c:951
+msgid "uncomment"
+msgstr ""
+
+#: src/text.c:780 src/text.c:938
 msgid "text insert"
 msgstr "Vložit text"
 
-#: src/text.c:589 src/text.c:718
+#: src/text.c:800 src/text.c:931
 msgid "text replace"
 msgstr "Nahradit text"
 
-#: src/text.c:596 src/text.c:732 src/text.c:1030 src/text.c:1174
+#: src/text.c:807 src/text.c:955 src/text.c:1267 src/text.c:1437
 msgid "Internal error: unknown type.  Please save your work."
 msgstr "Vnitřní chyba: neznámý typ. Uložte, prosím, svou práci."
 
-#: src/text.c:601
+#: src/text.c:813
 #, c-format
 msgid "Undid action (%s)"
 msgstr "Operace vrácena zpět (%s)"
 
-#: src/text.c:619
+#: src/text.c:832
 msgid "Nothing to re-do!"
 msgstr "Nic k zopakování!"
 
-#: src/text.c:628
+#: src/text.c:841
 msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
 "Vnitřní chyba: Nelze připravit \"provést znovu\". Uložte, prosím, svou práci."
 
-#: src/text.c:737
+#: src/text.c:961
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Operace zopakována (%s)"
 
-#: src/text.c:827 src/text.c:2508 src/text.c:2944
+#: src/text.c:1051 src/text.c:2765 src/text.c:3198
 msgid "Could not create pipe"
 msgstr "Nepodařilo se vytvořit přenos dat"
 
-#: src/text.c:853 src/text.c:2595 src/text.c:2750 src/text.c:2992
-#: src/text.c:3286
+#: src/text.c:1077 src/text.c:2852 src/text.c:3005 src/text.c:3246
+#: src/text.c:3540
 msgid "Could not fork"
 msgstr "Vidlici se nepodařilo provést"
 
-#: src/text.c:1853
+#: src/text.c:2117
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Neplatný řetězec znaku uvozovek %s: %s"
 
-#: src/text.c:2241
+#: src/text.c:2499
 msgid "Can now UnJustify!"
 msgstr "Nyní lze zrušit zarovnání odstavce!"
 
-#: src/text.c:2435
+#: src/text.c:2697
 msgid "Edit a replacement"
 msgstr "Upravit nahrazení"
 
-#: src/text.c:2510
+#. TRANSLATORS: Shown after fixing misspellings in one word.
+#: src/text.c:2713
+#, fuzzy
+msgid "Next word..."
+msgstr "Další slovo"
+
+#: src/text.c:2767
 msgid "Creating misspelled word list, please wait..."
 msgstr "Vytváří se seznam nesprávně napsaných slov. Čekejte, prosím,..."
 
-#: src/text.c:2601 src/text.c:2999
+#: src/text.c:2858 src/text.c:3253
 msgid "Could not get size of pipe buffer"
 msgstr "Nepodařilo se získat velikost vyrovnávací paměti přenosu dat"
 
-#: src/text.c:2652
+#: src/text.c:2907
 msgid "Error invoking \"spell\""
 msgstr "Chyba při vyvolání „spell“"
 
-#: src/text.c:2655
+#: src/text.c:2910
 msgid "Error invoking \"sort -f\""
 msgstr "Chyba při vyvolání „sort -f“"
 
-#: src/text.c:2658
+#: src/text.c:2913
 msgid "Error invoking \"uniq\""
 msgstr "Chyba při vyvolání „uniq“"
 
-#: src/text.c:2881
+#: src/text.c:3135
 msgid "Invoking spell checker, please wait"
 msgstr "Vyvolat ověření správného psaní. Počkejte, prosím"
 
-#: src/text.c:2897
+#: src/text.c:3151
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Ověření pravopisu se nezdařilo: %s"
 
-#: src/text.c:2899
+#: src/text.c:3153
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Ověření pravopisu se nezdařilo: %s: %s"
 
-#: src/text.c:2902
+#: src/text.c:3156
 msgid "Finished checking spelling"
 msgstr "Ověřování pravopisu dokončeno"
 
-#: src/text.c:2927
+#: src/text.c:3181
 msgid "No linter defined for this type of file!"
 msgstr "Pro tento typ souboru není stanoven žádný statický rozbor!"
 
-#: src/text.c:2932
+#: src/text.c:3186
 msgid "Save modified buffer before linting?"
 msgstr "Uložit před statickým rozborem změněnou vyrovnávací paměť?"
 
-#: src/text.c:2949
+#: src/text.c:3203
 msgid "Invoking linter, please wait"
 msgstr "Volá se statický rozbor. Počkejte, prosím"
 
-#: src/text.c:3105
+#: src/text.c:3358
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr "Příkaz %s nevytvořil žádný zpracovatelný řádek"
 
-#: src/text.c:3134
+#: src/text.c:3388
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
 "Tato zpráva se týká neotevřeného souboru %s. Otevřít v nové vyrovnávací "
 "paměti?"
 
-#: src/text.c:3153
+#: src/text.c:3407
 msgid "No more errors in unopened files, cancelling"
 msgstr ""
 
-#: src/text.c:3192
+#: src/text.c:3446
 msgid "At last message"
 msgstr "Při poslední zprávě"
 
-#: src/text.c:3197
+#: src/text.c:3451
 msgid "At first message"
 msgstr "Při první zprávě"
 
-#: src/text.c:3237
+#: src/text.c:3491
 msgid "Finished"
 msgstr "Dokončeno"
 
-#: src/text.c:3259
+#: src/text.c:3513
 msgid "Invoking formatter, please wait"
 msgstr "Volá se formátovač. Počkejte, prosím"
 
-#: src/text.c:3314
+#: src/text.c:3568
 msgid "Finished formatting"
 msgstr "Formátování dokončeno"
 
-#: src/text.c:3396
+#: src/text.c:3650
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sSlov: %lu  Řádků: %ld  Znaků: %lu"
 
-#: src/text.c:3397
+#: src/text.c:3651
 msgid "In Selection:  "
 msgstr "Ve výběru:  "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3411
+#: src/text.c:3665
 msgid "Verbatim Input"
 msgstr "Přímé zadání"
 
-#: src/utils.c:391 src/utils.c:403
+#: src/utils.c:392 src/utils.c:404
 msgid "nano is out of memory!"
 msgstr "nano už nemá paměti!"
 
+#: src/utils.c:625
+#, c-format
+msgid "Internal error: can't match line %d.  Please save your work."
+msgstr ""
+"Vnitřní chyba: Nelze nalézt shodu pro řádek %d. Uložte, prosím, svou práci."
+
+#. TRANSLATORS: This refers to a sequence of escape codes
+#. * (from the keyboard) that nano does not know about.
+#: src/winio.c:1121
+msgid "Unknown sequence"
+msgstr ""
+
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
 #: src/winio.c:1427
 msgid "Unicode Input"
 msgstr "Vstup Unicode"
 
-#: src/winio.c:1991 src/winio.c:1995
-msgid "Modified"
-msgstr "Změněno"
-
-#: src/winio.c:1992
-msgid "View"
-msgstr "Pohled"
-
-#: src/winio.c:2006
+#: src/winio.c:1960
 msgid "DIR:"
 msgstr "Adresář:"
 
-#: src/winio.c:2013
+#: src/winio.c:1968
 msgid "File:"
 msgstr "Soubor:"
 
-#: src/winio.c:3141
+#: src/winio.c:1972 src/winio.c:1976
+msgid "Modified"
+msgstr "Změněno"
+
+#: src/winio.c:1974
+msgid "View"
+msgstr "Pohled"
+
+#: src/winio.c:3105
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "Řádek %ld/%ld (%d%%), Sloupec %lu/%lu (%d%%), Znak %lu/%lu (%d%%)"
 
-#: src/winio.c:3271
+#: src/winio.c:3235
 msgid "The nano text editor"
 msgstr "Textový editor nano"
 
-#: src/winio.c:3272
+#: src/winio.c:3236
 msgid "version"
 msgstr "Verze"
 
-#: src/winio.c:3273
+#: src/winio.c:3237
 msgid "Brought to you by:"
 msgstr "Vyvíjeno:"
 
-#: src/winio.c:3274
+#: src/winio.c:3238
 msgid "Special thanks to:"
 msgstr "Zvláštní poděkování:"
 
-#: src/winio.c:3275
+#: src/winio.c:3239
 msgid "The Free Software Foundation"
 msgstr "The Free Software Foundation"
 
-#: src/winio.c:3276
+#: src/winio.c:3240
 msgid "the many translators and the TP"
 msgstr "překladatelům a TP"
 
-#: src/winio.c:3277
+#: src/winio.c:3241
 msgid "For ncurses:"
 msgstr "Pro ncurses:"
 
-#: src/winio.c:3278
+#: src/winio.c:3242
 msgid "and anyone else we forgot..."
 msgstr "a všem nejmenovaným osobám, na které se zapomnělo..."
 
-#: src/winio.c:3279
+#: src/winio.c:3243
 msgid "Thank you for using nano!"
 msgstr "Děkujeme vám za to, že používáte nano!"
 
+#~ msgid ""
+#~ "Read %lu line (Converted from DOS and Mac format - Warning: No write "
+#~ "permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from DOS and Mac format - Warning: No write "
+#~ "permission)"
+#~ msgstr[0] ""
+#~ "Přečten jeden řádek (převeden z formátu DOS a Mac - Varování: Žádné "
+#~ "oprávnění pro zápis)"
+#~ msgstr[1] ""
+#~ "Přečteny %lu řádky (převedeny z formátu DOS a Mac - Varování: Žádné "
+#~ "oprávnění pro zápis)"
+#~ msgstr[2] ""
+#~ "Přečteno %lu řádků (převedeny z formátu DOS a Mac - Varování: Žádné "
+#~ "oprávnění pro zápis)"
+
+#~ msgid ""
+#~ "Read %lu line (Converted from Mac format - Warning: No write permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from Mac format - Warning: No write permission)"
+#~ msgstr[0] ""
+#~ "Přečten jeden řádek (převeden z formátu Mac - Varování: Žádné oprávnění "
+#~ "pro zápis)"
+#~ msgstr[1] ""
+#~ "Přečteny %lu řádky (převedeny z formátu Mac - Varování: Žádné oprávnění "
+#~ "pro zápis)"
+#~ msgstr[2] ""
+#~ "Přečteno %lu řádků (převedeny z formátu Mac - Varování: Žádné oprávnění "
+#~ "pro zápis)"
+
+#~ msgid ""
+#~ "Read %lu line (Converted from DOS format - Warning: No write permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from DOS format - Warning: No write permission)"
+#~ msgstr[0] ""
+#~ "Přečten jeden řádek (převeden z formátu DOS - Varování: Žádné oprávnění "
+#~ "pro zápis)"
+#~ msgstr[1] ""
+#~ "Přečteny %lu řádky (převedeny z formátu DOS - Varování: Žádné oprávnění "
+#~ "pro zápis)"
+#~ msgstr[2] ""
+#~ "Přečteno %lu řádků (převedeny z formátu DOSc - Varování: Žádné oprávnění "
+#~ "pro zápis)"
+
+#~ msgid "Read %lu line (Warning: No write permission)"
+#~ msgid_plural "Read %lu lines (Warning: No write permission)"
+#~ msgstr[0] "Přečten jeden řádek (Varování: Žádné oprávnění pro zápis)"
+#~ msgstr[1] "Přečteny %lu řádky (Varování: Žádné oprávnění pro zápis)"
+#~ msgstr[2] "Přečteno %lu řádků (Varování: Žádné oprávnění pro zápis)"
+
 #~ msgid "Cannot prepend or append to a symlink with --nofollow set"
 #~ msgstr ""
 #~ "Nelze připojit na začátek nebo připojit na konec k symbolickému odkazu, "
@@ -2447,6 +2537,37 @@ msgstr "Děkujeme vám za to, že používáte nano!"
 #~ msgid "Don't follow symbolic links, overwrite"
 #~ msgstr "Nenásledovat symbolické odkazy, nýbrž přepsat"
 
+#~ msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
+#~ msgstr "Uložit změněnou vyrovnávací paměť (odpověď \"Ne\" zahodí změny)?"
+
+#~ msgid "Unknown Command"
+#~ msgstr "Neznámý příkaz"
+
+#~ msgid "Cannot add a color command without a syntax command"
+#~ msgstr "Nelze přidat pokyn pro barvu bez příkazu pro skladbu"
+
+#~ msgid "Missing regex string"
+#~ msgstr "Chybí řetězec regulárního výrazu"
+
+#~ msgid "Cannot add a header regex without a syntax command"
+#~ msgstr "Nelze přidat regulární výraz pro záhlaví bez příkazu pro skladbu"
+
+#~ msgid "Cannot add a magic string regex without a syntax command"
+#~ msgstr ""
+#~ "Nelze přidat regulární výraz kouzelného řetězce bez příkazu pro skladbu"
+
+#~ msgid "Missing magic string name"
+#~ msgstr "Chybí název kouzelného řetězce"
+
+#~ msgid "Cannot add a linter without a syntax command"
+#~ msgstr "Nelze přidat statický rozbor bez příkazu pro skladbu - syntax"
+
+#~ msgid "Cannot add formatter without a syntax command"
+#~ msgstr "Nelze přidat formátovač bez příkazu pro skladbu (syntax)"
+
+#~ msgid "Missing formatter command"
+#~ msgstr "Chybí příkaz pro formátovač"
+
 #~ msgid "Multiple file buffers"
 #~ msgstr "Více souborových vyrovnávacích pamětí"
 
diff --git a/po/da.po b/po/da.po
index 65d7e904..7512fa13 100644
--- a/po/da.po
+++ b/po/da.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 2.3.99pre4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-25 16:41-0500\n"
+"POT-Creation-Date: 2016-06-17 15:41+0200\n"
 "PO-Revision-Date: 2015-04-05 22:53+0100\n"
 "Last-Translator: Ask Hjorth Larsen <asklarsen@gmail.com>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -27,369 +27,347 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: src/browser.c:144 src/browser.c:284 src/browser.c:334 src/files.c:996
+#: src/files.c:1003 src/files.c:1794 src/files.c:1919 src/files.c:1963
+#: src/files.c:1983 src/files.c:2099 src/files.c:3019 src/files.c:3242
+#: src/rcfile.c:540 src/rcfile.c:1280
+#, c-format
+msgid "Error reading %s: %s"
+msgstr "Fejl ved læsning af %s: %s"
+
 #. TRANSLATORS: This is a prompt.
-#: src/browser.c:220
+#: src/browser.c:247
 msgid "Go To Directory"
 msgstr "GÃ¥ til katalog"
 
-#: src/browser.c:227 src/browser.c:738 src/files.c:1174 src/files.c:2340
-#: src/nano.c:1120 src/search.c:202 src/search.c:290 src/search.c:895
-#: src/search.c:970 src/text.c:2935 src/text.c:3142
+#: src/browser.c:254 src/browser.c:723 src/files.c:1126 src/files.c:2292
+#: src/nano.c:1128 src/search.c:195 src/search.c:297 src/search.c:851
+#: src/search.c:918 src/text.c:3189 src/text.c:3396
 msgid "Cancelled"
 msgstr "Afbrudt"
 
-#: src/browser.c:253 src/browser.c:300
-#, c-format
-msgid "Can't go outside of %s in restricted mode"
+#. TRANSLATORS: This refers to the option --operatingdir,
+#. * not to --restricted.
+#: src/browser.c:274 src/browser.c:326
+#, fuzzy, c-format
+msgid "Can't go outside of %s in confined mode"
 msgstr "Kan ikke gå uden for %s i begrænset tilstand"
 
-#: src/browser.c:264 src/browser.c:310 src/browser.c:326 src/files.c:1044
-#: src/files.c:1052 src/files.c:1844 src/files.c:1971 src/files.c:2016
-#: src/files.c:2037 src/files.c:2156 src/files.c:3062 src/files.c:3285
-#: src/rcfile.c:596 src/rcfile.c:1435
-#, c-format
-msgid "Error reading %s: %s"
-msgstr "Fejl ved læsning af %s: %s"
-
-#: src/browser.c:290
+#: src/browser.c:317
 msgid "Can't move up a directory"
 msgstr "Kan ikke gå et katalog op"
 
 #. TRANSLATORS: Try to keep this at most 7 characters.
-#: src/browser.c:615 src/browser.c:623
+#: src/browser.c:590 src/browser.c:598
 msgid "(dir)"
 msgstr "(kat)"
 
 #. TRANSLATORS: Try to keep this at most 12 characters.
-#: src/browser.c:620
+#: src/browser.c:595
 msgid "(parent dir)"
 msgstr "(ophavs-kat)"
 
 #. TRANSLATORS: Try to keep this at most 7 characters.
 #. * If necessary, you can leave out the parentheses.
-#: src/browser.c:650
+#: src/browser.c:625
 msgid "(huge)"
 msgstr ""
 
 #. TRANSLATORS: This is the main search prompt.
-#: src/browser.c:727 src/search.c:173
+#: src/browser.c:712 src/search.c:166
 msgid "Search"
 msgstr "Søg"
 
-#: src/browser.c:777 src/search.c:466 src/search.c:536
-msgid "This is the only occurrence"
-msgstr "Dette er det eneste tilfælde"
-
-#: src/browser.c:793 src/search.c:364
+#: src/browser.c:754 src/search.c:368
 msgid "Search Wrapped"
 msgstr "Søgningen genstartet fra begyndelsen"
 
-#: src/browser.c:843 src/search.c:517
+#: src/browser.c:764 src/search.c:509
+msgid "This is the only occurrence"
+msgstr "Dette er det eneste tilfælde"
+
+#: src/browser.c:812 src/search.c:473
 msgid "No current search pattern"
 msgstr "Intet aktuelt søgemønster"
 
-#: src/files.c:50
+#: src/color.c:186
+#, fuzzy, c-format
+msgid "Unknown syntax name: %s"
+msgstr "Mangler syntaksnavn"
+
+#: src/color.c:247
+#, c-format
+msgid "magic_load() failed: %s"
+msgstr ""
+
+#: src/color.c:251
+#, c-format
+msgid "magic_file(%s) failed: %s"
+msgstr ""
+
+#: src/files.c:47
 #, fuzzy, c-format
 msgid "Directory '%s' does not exist"
 msgstr "Fejl ved skrivning af låsefil: Katalog %s findes ikke"
 
-#: src/files.c:52
+#: src/files.c:49
 #, c-format
 msgid "Path '%s': %s"
 msgstr ""
 
-#: src/files.c:54
+#: src/files.c:51
 #, fuzzy, c-format
 msgid "Path '%s' is not a directory"
 msgstr "\"%s\" er et katalog"
 
-#: src/files.c:57
+#: src/files.c:53
 #, c-format
 msgid "Path '%s' is not accessible"
 msgstr ""
 
-#. TRANSLATORS: Try to keep this at most 76 characters.
-#: src/files.c:158
+#. TRANSLATORS: Keep the next ten messages at most 76 characters.
+#: src/files.c:148
 msgid ""
 "Warning: Modifying a file which is not locked, check directory permission?"
 msgstr "Advarsel: Ændrer en fil som ikke er låst, kontroller katalogrettighed?"
 
-#: src/files.c:197
+#: src/files.c:187
 msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
 msgstr "Kunne ikke bestemme min identitet for låsefil (getpwuid() mislykkedes)"
 
-#: src/files.c:206
+#: src/files.c:196
 #, c-format
 msgid "Couldn't determine hostname for lock file: %s"
 msgstr "Kunne ikke bestemme værtsnavn for låsefil:%s"
 
-#: src/files.c:227 src/files.c:238 src/files.c:275 src/files.c:285
+#: src/files.c:216 src/files.c:225 src/files.c:262 src/files.c:272
 #, c-format
 msgid "Error writing lock file %s: %s"
 msgstr "Fejl ved skrivning af låsefil %s: %s"
 
-#: src/files.c:305
+#: src/files.c:291
 #, c-format
 msgid "Error deleting lock file %s: %s"
 msgstr "Fejl ved sletning af låsefil %s: %s"
 
-#: src/files.c:341
+#: src/files.c:325
 #, c-format
 msgid "Error opening lock file %s: %s"
 msgstr "Fejl ved åbning af låsefil %s: %s"
 
-#: src/files.c:353
+#: src/files.c:337
 #, c-format
 msgid "Error reading lock file %s: Not enough data read"
 msgstr "Fejl ved læsning af låsefil %s: Ikke nok data læst"
 
 #. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
-#: src/files.c:371
+#: src/files.c:354
 #, c-format
 msgid "File %s is being edited (by %s with %s, PID %d); continue?"
 msgstr "Filen %s bliver redigeret (af %s med %s, PID %d); fortsæt?"
 
-#: src/files.c:426
+#: src/files.c:430
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Kan ikke indsætte fil fra ydersiden af %s"
 
-#: src/files.c:439 src/files.c:1038 src/rcfile.c:589 src/rcfile.c:1385
-#: src/rcfile.c:1426
+#: src/files.c:445 src/files.c:991 src/rcfile.c:533 src/rcfile.c:1230
+#: src/rcfile.c:1271
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" er et katalog"
 
-#: src/files.c:441
+#: src/files.c:447
 #, fuzzy, c-format
 msgid "\"%s\" is not a normal file"
 msgstr "\"%s\" er en enhedsfil"
 
-#: src/files.c:566
+#: src/files.c:571
 msgid "No more open file buffers"
 msgstr "Ikke flere åbne filbuffere"
 
-#: src/files.c:582
+#: src/files.c:586
 #, c-format
 msgid "Switched to %s"
 msgstr "Skiftede til %s"
 
-#: src/files.c:584 src/global.c:988 src/winio.c:2010
+#: src/files.c:588 src/global.c:1005 src/winio.c:1965
 msgid "New Buffer"
 msgstr "Ny buffer"
 
-#: src/files.c:943
+#. TRANSLATORS: Keep the next four messages at most 76 characters.
+#: src/files.c:913
 #, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
 msgstr[0] "Læste %lu linje (Konverteret fra DOS- og Mac-format)"
 msgstr[1] "Læste %lu linjer (Konverteret fra DOS- og Mac-format)"
 
-#: src/files.c:948
-#, c-format
-msgid ""
-"Read %lu line (Converted from DOS and Mac format - Warning: No write "
-"permission)"
-msgid_plural ""
-"Read %lu lines (Converted from DOS and Mac format - Warning: No write "
-"permission)"
-msgstr[0] ""
-"Læste %lu linje (Konverteret fra DOS- og Mac-format - Advarsel: Ingen "
-"skriveadgang)"
-msgstr[1] ""
-"Læste %lu linjer (Konverteret fra DOS- og Mac-format - Advarsel: Ingen "
-"skriveadgang)"
-
-#: src/files.c:954
+#: src/files.c:919
 #, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
 msgstr[0] "Læste %lu linje (Konverteret fra Mac-format)"
 msgstr[1] "Læste %lu linjer (Konverteret fra Mac-format)"
 
-#: src/files.c:958
-#, c-format
-msgid ""
-"Read %lu line (Converted from Mac format - Warning: No write permission)"
-msgid_plural ""
-"Read %lu lines (Converted from Mac format - Warning: No write permission)"
-msgstr[0] ""
-"Læste %lu linje (Konverteret fra Mac-format - Advarsel: Ingen skriveadgang)"
-msgstr[1] ""
-"Læste %lu linjer (Konverteret fra Mac-format - Advarsel: Ingen skriveadgang)"
-
-#: src/files.c:964
+#: src/files.c:925
 #, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
 msgstr[0] "Læste %lu linje (Konverteret fra DOS-format)"
 msgstr[1] "Læste %lu linjer (Konverteret fra DOS-format)"
 
-#: src/files.c:968
-#, c-format
-msgid ""
-"Read %lu line (Converted from DOS format - Warning: No write permission)"
-msgid_plural ""
-"Read %lu lines (Converted from DOS format - Warning: No write permission)"
-msgstr[0] ""
-"Læste %lu linje (Konverteret fra DOS-format - Advarsel: Ingen skriveadgang)"
-msgstr[1] ""
-"Læste %lu linjer (Konverteret fra DOS-format - Advarsel: Ingen skriveadgang)"
-
-#: src/files.c:974
+#: src/files.c:930
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "Læste %lu linje"
 msgstr[1] "Læste %lu linjer"
 
-#: src/files.c:977
-#, fuzzy, c-format
-msgid "Read %lu line (Warning: No write permission)"
-msgid_plural "Read %lu lines (Warning: No write permission)"
-msgstr[0] "Læs %lu linje (Advarsel: Ingen skriveadgang)"
-msgstr[1] "Læs %lu linjer (Advarsel: Ingen skriveadgang)"
-
-#: src/files.c:1019 src/files.c:1056
+#: src/files.c:974 src/files.c:1006
 msgid "Reading File"
 msgstr "Læser filen"
 
-#: src/files.c:1025
+#: src/files.c:980
 msgid "New File"
 msgstr "Ny fil"
 
-#: src/files.c:1028
-#, c-format
-msgid "\"%s\" not found"
+#: src/files.c:983
+#, fuzzy, c-format
+msgid "File \"%s\" not found"
 msgstr "\"%s\" kunne ikke findes"
 
-#: src/files.c:1039 src/rcfile.c:590 src/rcfile.c:1386 src/rcfile.c:1427
+#: src/files.c:992 src/rcfile.c:534 src/rcfile.c:1231 src/rcfile.c:1272
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" er en enhedsfil"
 
-#: src/files.c:1133
+#: src/files.c:1083
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Kommando at køre i ny buffer [fra %s] "
 
-#: src/files.c:1135
+#: src/files.c:1085
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Kommando der skal køres [fra %s] "
 
-#: src/files.c:1142
+#: src/files.c:1092
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Fil at indsætte i ny buffer [fra %s] "
 
-#: src/files.c:1144
+#: src/files.c:1094
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Fil at indsætte [fra %s] "
 
-#: src/files.c:1389
+#: src/files.c:1338
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Tasten ugyldig i ikke-multibuffer-tilstand"
 
 # afsluttende mellemrum efter strengen bevirker sandsynligvis at tekstmarkøren står rigtigt
-#: src/files.c:1684
-msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+#: src/files.c:1632
+#, fuzzy
+msgid "Failed to write backup file; continue saving? (Say N if unsure.) "
 msgstr ""
 "Kunne ikke skrive sikkerhedskopi; fortsæt med at gemme? (Sig N hvis usikker) "
 
-#: src/files.c:1800
+#: src/files.c:1750
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Kan ikke skrive uden for %s"
 
-#: src/files.c:1885 src/files.c:1910 src/files.c:1928 src/files.c:1941
-#: src/files.c:1952 src/files.c:1981
+#: src/files.c:1833 src/files.c:1858 src/files.c:1876 src/files.c:1889
+#: src/files.c:1900 src/files.c:1928
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Fejl ved skrivning af sikkerhedskopifil %s: %s"
 
-#: src/files.c:1886 src/nano.c:690
+#: src/files.c:1834 src/nano.c:692
 msgid "Too many backup files?"
 msgstr "For mange sikkerhedskopifiler?"
 
-#: src/files.c:2026 src/text.c:2863 src/text.c:2875 src/text.c:3244
-#: src/text.c:3253
+#: src/files.c:1972 src/text.c:3117 src/text.c:3129 src/text.c:3498
+#: src/text.c:3507
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Fejl ved skrivning af midlertidig fil: %s"
 
-#: src/files.c:2049 src/files.c:2068 src/files.c:2080 src/files.c:2104
-#: src/files.c:2121 src/files.c:2131 src/files.c:2164 src/files.c:2171
+#: src/files.c:1994 src/files.c:2013 src/files.c:2023 src/files.c:2047
+#: src/files.c:2064 src/files.c:2074 src/files.c:2106 src/files.c:2113
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Fejl ved skrivning af %s: %s"
 
-#: src/files.c:2200
+#: src/files.c:2154
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "Skrev %lu linje"
 msgstr[1] "Skrev %lu linjer"
 
-#: src/files.c:2299
+#: src/files.c:2249
 msgid " [DOS Format]"
 msgstr " [DOS-format]"
 
-#: src/files.c:2300
+#: src/files.c:2250
 msgid " [Mac Format]"
 msgstr " [Mac-format]"
 
-#: src/files.c:2302
+#: src/files.c:2252
 msgid " [Backup]"
 msgstr " [Sikkerhedskopi]"
 
-#: src/files.c:2309
+#: src/files.c:2259
 msgid "Prepend Selection to File"
 msgstr "Foranstil udvalg til fil"
 
-#: src/files.c:2310
+#: src/files.c:2260
 msgid "Append Selection to File"
 msgstr "Tilføj udvalg til fil"
 
-#: src/files.c:2311
+#: src/files.c:2261
 msgid "Write Selection to File"
 msgstr "Skriv udvalg til fil"
 
-#: src/files.c:2314
+#: src/files.c:2264
 msgid "File Name to Prepend to"
 msgstr "Filnavn at foranstille på"
 
-#: src/files.c:2315
+#: src/files.c:2265
 msgid "File Name to Append to"
 msgstr "Filnavn at tilføje på"
 
-#: src/files.c:2316
+#: src/files.c:2266
 msgid "File Name to Write"
 msgstr "Filnavn at skrive"
 
-#: src/files.c:2349
+#: src/files.c:2301
 #, fuzzy
-msgid "Save modified buffer anyway ? "
+msgid "Save modified buffer anyway? "
 msgstr "Gem ændret buffer før linting?"
 
-#: src/files.c:2457
-msgid "File exists, OVERWRITE ? "
-msgstr "Filen findes, OVERSKRIV? "
-
-#: src/files.c:2466
-msgid "Save file under DIFFERENT NAME ? "
+#: src/files.c:2412
+#, fuzzy
+msgid "Save file under DIFFERENT NAME? "
 msgstr "Gem filen under ET ANDET NAVN? "
 
-#: src/files.c:2480
-msgid "File was modified since you opened it, continue saving ? "
+#: src/files.c:2420
+#, fuzzy, c-format
+msgid "File \"%s\" exists; OVERWRITE? "
+msgstr "Filen findes, OVERSKRIV? "
+
+#: src/files.c:2441
+#, fuzzy
+msgid "File was modified since you opened it; continue saving? "
 msgstr "Filen blev ændret siden du sidst åbnede den, gem alligevel? "
 
-#: src/files.c:2917
+#: src/files.c:2874
 msgid "(more)"
 msgstr "(mere)"
 
-#: src/files.c:3004
+#: src/files.c:2959
 #, c-format
 msgid ""
 "\n"
@@ -398,7 +376,7 @@ msgstr ""
 "\n"
 "Tryk retur for at fortsætte\n"
 
-#: src/files.c:3020
+#: src/files.c:2975
 #, c-format
 msgid ""
 "Unable to create directory %s: %s\n"
@@ -407,7 +385,7 @@ msgstr ""
 "Kan ikke oprette kataloget %s: %s\n"
 "Dette kræves for at kunne gemme/hente søgehistorik eller markørposition.\n"
 
-#: src/files.c:3026
+#: src/files.c:2982
 #, c-format
 msgid ""
 "Path %s is not a directory and needs to be.\n"
@@ -417,7 +395,7 @@ msgstr ""
 "Nano vil ikke kunne indlæse eller gemme søge- eller "
 "markørpositionshistorik.\n"
 
-#: src/files.c:3045
+#: src/files.c:3002
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I tried to move\n"
@@ -426,7 +404,7 @@ msgstr ""
 "Fandt en ældre nanohistorikfil (%s), som jeg forsøgte at flytte\n"
 "til den foretrukne placering (%s), men stødte på en fejl: %s"
 
-#: src/files.c:3049
+#: src/files.c:3006
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I moved\n"
@@ -437,750 +415,781 @@ msgstr ""
 "til den foretrukne placering (%s)\n"
 "(se OSS om nano vedrørende denne ændring)"
 
-#: src/files.c:3132 src/files.c:3140 src/files.c:3164 src/files.c:3176
+#: src/files.c:3089 src/files.c:3097 src/files.c:3121 src/files.c:3133
 #, fuzzy, c-format
 msgid "Error writing %s: %s\n"
 msgstr "Fejl ved skrivning af %s: %s"
 
 # max 10 tegn
 #. TRANSLATORS: Try to keep the next fifteen strings at most 10 characters.
-#: src/global.c:480
+#: src/global.c:483
 msgid "Exit"
 msgstr "Afslut"
 
-#: src/global.c:481
+#: src/global.c:484
 msgid "Close"
 msgstr "Luk"
 
-#: src/global.c:482
+#: src/global.c:485
 msgid "Uncut Text"
 msgstr "Indsæt"
 
-#: src/global.c:484
+#: src/global.c:487
 msgid "Unjustify"
 msgstr "Afombryd"
 
-#: src/global.c:490
+#: src/global.c:493
 msgid "Read File"
 msgstr "Læs fil"
 
 # max 10 tegn
-#: src/global.c:491
+#: src/global.c:494
 msgid "Where Is"
 msgstr "Hvor er"
 
 # max 10 tegn
-#: src/global.c:492
+#: src/global.c:495
 msgid "Replace"
 msgstr "Erstat"
 
-#: src/global.c:493
+#: src/global.c:496
 msgid "Go To Line"
 msgstr "GÃ¥ til linje"
 
-#: src/global.c:494
+#: src/global.c:497
 msgid "Prev Line"
 msgstr "Forrige linje"
 
-#: src/global.c:495
+#: src/global.c:498
 msgid "Next Line"
 msgstr "Næste linje"
 
 # max 10 tegn
-#: src/global.c:496
+#: src/global.c:499
 msgid "Prev Page"
 msgstr "ForrigSide"
 
 # max 10 tegn
-#: src/global.c:497
+#: src/global.c:500
 msgid "Next Page"
 msgstr "NæsteSide"
 
-#: src/global.c:499
+#: src/global.c:502
 msgid "Justify"
 msgstr "Ombryd"
 
 # max 10 tegn
-#: src/global.c:500
+#: src/global.c:503
 msgid "FullJstify"
 msgstr "FuldOmbryd"
 
 # max 10 tegn
-#: src/global.c:502
+#: src/global.c:505
 msgid "Refresh"
 msgstr "Opdatér"
 
 #. TRANSLATORS: Try to keep this string at most 12 characters.
-#: src/global.c:505
+#: src/global.c:508
 msgid "WhereIs Next"
 msgstr "Find næste"
 
 #. TRANSLATORS: The next long series of strings are shortcut descriptions;
 #. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:512
+#: src/global.c:515
 msgid "Justify the current paragraph"
 msgstr "Ombryd den aktuelle paragraf"
 
-#: src/global.c:514
+#: src/global.c:517
 msgid "Cancel the current function"
 msgstr "Afbryd den aktuelle funktion"
 
-#: src/global.c:515
+#: src/global.c:518
 msgid "Display this help text"
 msgstr "Vis denne hjælpetekst"
 
-#: src/global.c:518
+#: src/global.c:521
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Luk nuværende filbuffer / afslut nano"
 
-#: src/global.c:520
+#: src/global.c:523
 msgid "Exit from nano"
 msgstr "Afslut nano"
 
-#: src/global.c:524
+#: src/global.c:527
 msgid "Write the current file to disk"
 msgstr "Skriv den aktuelle fil til disk"
 
-#: src/global.c:526
+#: src/global.c:529
 msgid "Insert another file into the current one"
 msgstr "Indsæt en anden fil i den nuværende"
 
-#: src/global.c:528
+#: src/global.c:531
 msgid "Search for a string or a regular expression"
 msgstr "Søg efter en streng eller et regulært udtryk"
 
-#: src/global.c:531
+#: src/global.c:533
 msgid "Search for a string"
 msgstr "Søg efter en streng"
 
-#: src/global.c:533
+#: src/global.c:534
+msgid "Refresh the file list"
+msgstr ""
+
+#: src/global.c:535
+#, fuzzy
+msgid "Go to lefthand column"
+msgstr "GÃ¥ til linje- og kolonnenummer"
+
+#: src/global.c:536
+#, fuzzy
+msgid "Go to righthand column"
+msgstr "GÃ¥ til linje- og kolonnenummer"
+
+#: src/global.c:538
 msgid "Go one screenful up"
 msgstr "Gå en skærm op"
 
-#: src/global.c:534
+#: src/global.c:539
 msgid "Go one screenful down"
 msgstr "Gå en skærm ned"
 
-#: src/global.c:536
+#: src/global.c:541
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Klip den aktuelle linje ud og gem den i udklipsbufferen"
 
-#: src/global.c:538
+#: src/global.c:543
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Indsæt fra udklipsbufferen i aktuel linje"
 
-#: src/global.c:539
+#: src/global.c:544
 msgid "Display the position of the cursor"
 msgstr "Vis markørens position"
 
-#: src/global.c:541
+#: src/global.c:546
 msgid "Invoke the spell checker, if available"
 msgstr "Start stavekontrollen, hvis tilgængelig"
 
-#: src/global.c:543
+#: src/global.c:548
 msgid "Replace a string or a regular expression"
 msgstr "Erstat en streng eller et regulært udtryk"
 
-#: src/global.c:544
+#: src/global.c:549
 msgid "Go to line and column number"
 msgstr "GÃ¥ til linje- og kolonnenummer"
 
-#: src/global.c:546
+#: src/global.c:551
 msgid "Mark text starting from the cursor position"
 msgstr "Markér tekst startende fra markørposition"
 
-#: src/global.c:547
+#: src/global.c:552
 msgid "Repeat the last search"
 msgstr "Gentag den sidste søgning"
 
-#: src/global.c:549
+#: src/global.c:554
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "Kopiér aktuelle linje ud og gem den i udklipsbufferen"
 
-#: src/global.c:550
+#: src/global.c:555
 msgid "Indent the current line"
 msgstr "Indryk den aktuelle linje"
 
-#: src/global.c:551
+#: src/global.c:556
 msgid "Unindent the current line"
 msgstr "Fjern indrykning af aktuel linje"
 
-#: src/global.c:552
+#: src/global.c:558
+msgid "Comment/uncomment the current line or marked lines"
+msgstr ""
+
+#: src/global.c:560
 msgid "Undo the last operation"
 msgstr "Fortryd sidste handling"
 
-#: src/global.c:553
+#: src/global.c:561
 msgid "Redo the last undone operation"
 msgstr "Omgør sidste fortrudte handling"
 
-#: src/global.c:555
+#: src/global.c:563
 msgid "Go back one character"
 msgstr "GÃ¥ et tegn bagud"
 
-#: src/global.c:556
+#: src/global.c:564
 msgid "Go forward one character"
 msgstr "GÃ¥ et tegn fremad"
 
-#: src/global.c:558
+#: src/global.c:566
 msgid "Go back one word"
 msgstr "GÃ¥ et ord bagud"
 
-#: src/global.c:559
+#: src/global.c:567
 msgid "Go forward one word"
 msgstr "GÃ¥ et ord fremad"
 
-#: src/global.c:561
+#: src/global.c:569
 msgid "Go to previous line"
 msgstr "GÃ¥ til forrige linje"
 
-#: src/global.c:562
+#: src/global.c:570
 msgid "Go to next line"
 msgstr "Gå til næste linje"
 
-#: src/global.c:563
+#: src/global.c:571
 msgid "Go to beginning of current line"
 msgstr "GÃ¥ til begyndelsen af aktuel linje"
 
-#: src/global.c:564
+#: src/global.c:572
 msgid "Go to end of current line"
 msgstr "GÃ¥ til enden af aktuel linje"
 
-#: src/global.c:567
+#: src/global.c:575
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "Gå til starten af afsnittet; dernæst af forrige afsnit"
 
-#: src/global.c:569
+#: src/global.c:577
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr "Gå til lige efter afsnittets slutning; dernæst efter næste afsnit"
 
-#: src/global.c:571
+#: src/global.c:579
 msgid "Go to the first line of the file"
 msgstr "Gå til filens første linje"
 
-#: src/global.c:572
+#: src/global.c:580
 msgid "Go to the last line of the file"
 msgstr "GÃ¥ til filens sidste linje"
 
-#: src/global.c:574
+#: src/global.c:582
 msgid "Go to the matching bracket"
 msgstr "GÃ¥ til modsvarende klamme"
 
-#: src/global.c:576
+#: src/global.c:584
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "Rul en linje op uden at flytte markøren"
 
-#: src/global.c:578
+#: src/global.c:586
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "Rul en linje ned uden at flytte markøren"
 
-#: src/global.c:581
+#: src/global.c:589
 msgid "Switch to the previous file buffer"
 msgstr "GÃ¥ til forrige filbuffer"
 
-#: src/global.c:582
+#: src/global.c:590
 msgid "Switch to the next file buffer"
 msgstr "Gå til næste filbuffer"
 
-#: src/global.c:584
+#: src/global.c:592
 msgid "Insert the next keystroke verbatim"
 msgstr "Indsæt næste tasteanslag ordret"
 
-#: src/global.c:585
+#: src/global.c:593
 msgid "Insert a tab at the cursor position"
 msgstr "Indsæt et tabulatortegn ved markørpositionen"
 
-#: src/global.c:586
+#: src/global.c:594
 msgid "Insert a newline at the cursor position"
 msgstr "Indsæt et linjeskift ved markørpositionen"
 
-#: src/global.c:587
+#: src/global.c:595
 msgid "Delete the character under the cursor"
 msgstr "Fjern tegnet under markøren"
 
-#: src/global.c:589
+#: src/global.c:597
 msgid "Delete the character to the left of the cursor"
 msgstr "Fjern tegnet til venstre for markøren"
 
-#: src/global.c:592
+#: src/global.c:600
 #, fuzzy
 msgid "Cut backward from cursor to word start"
 msgstr "Klip fra markøren til linjens slutning"
 
-#: src/global.c:594
+#: src/global.c:602
 #, fuzzy
 msgid "Cut forward from cursor to next word start"
 msgstr "Klip fra markøren til linjens slutning"
 
-#: src/global.c:596
+#: src/global.c:604
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Klip fra markørpositionen til filens slutning"
 
-#: src/global.c:599
+#: src/global.c:607
 msgid "Justify the entire file"
 msgstr "Ombryd hele filen"
 
-#: src/global.c:603
+#: src/global.c:611
 msgid "Count the number of words, lines, and characters"
 msgstr "Tæl ord, linjer og tegn"
 
-#: src/global.c:606
+#: src/global.c:614
 msgid "Refresh (redraw) the current screen"
 msgstr "Opdatér (genskriv) den aktuelle skærm"
 
-#: src/global.c:608
+#: src/global.c:616
 #, fuzzy
 msgid "Suspend the editor (if suspension is enabled)"
 msgstr "Kør i baggrunden (hvis suspend er slået til)"
 
-#: src/global.c:610
+#: src/global.c:618
 msgid "Save file without prompting"
 msgstr ""
 
-#: src/global.c:611
+#: src/global.c:619
 #, fuzzy
 msgid "Search next occurrence backward"
 msgstr "Søg bagud"
 
-#: src/global.c:612
+#: src/global.c:620
 msgid "Search next occurrence forward"
 msgstr ""
 
-#: src/global.c:614
+#: src/global.c:622
 msgid "Toggle the case sensitivity of the search"
 msgstr "Slå forskel på store og små bogstaver til eller fra"
 
-#: src/global.c:616
+#: src/global.c:624
 msgid "Reverse the direction of the search"
 msgstr "Omvend søgeretning"
 
-#: src/global.c:620
+#: src/global.c:628
 msgid "Toggle the use of regular expressions"
 msgstr "Slå brug af regulære udtryk til eller fra"
 
-#: src/global.c:624
+#: src/global.c:632
 msgid "Recall the previous search/replace string"
 msgstr "Husk de foregående søg og erstat-strenge"
 
-#: src/global.c:626
+#: src/global.c:634
 msgid "Recall the next search/replace string"
 msgstr "Husk de følgende søg og erstat-strenge"
 
-#: src/global.c:629
+#: src/global.c:637
 msgid "Go to file browser"
 msgstr "GÃ¥ til filbrowser"
 
-#: src/global.c:632
+#: src/global.c:640
 msgid "Toggle the use of DOS format"
 msgstr "Slå DOS-format til eller fra"
 
-#: src/global.c:633
+#: src/global.c:641
 msgid "Toggle the use of Mac format"
 msgstr "Slå Mac-format til eller fra"
 
-#: src/global.c:634
+#: src/global.c:642
 msgid "Toggle appending"
 msgstr "Slå efterstillet tilføjelse til eller fra"
 
-#: src/global.c:635
+#: src/global.c:643
 msgid "Toggle prepending"
 msgstr "Slå foranstillet tilføjelse til eller fra"
 
-#: src/global.c:636
+#: src/global.c:644
 msgid "Toggle backing up of the original file"
 msgstr "Slå sikkerhedskopiering af originalfil til eller fra"
 
-#: src/global.c:637
+#: src/global.c:645
 msgid "Execute external command"
 msgstr "Udfør ekstern kommando"
 
-#: src/global.c:639
+#: src/global.c:647
 msgid "Close buffer without saving it"
 msgstr ""
 
-#: src/global.c:641
+#: src/global.c:649
 msgid "Toggle the use of a new buffer"
 msgstr "Slå brug af ny buffer til eller fra"
 
-#: src/global.c:644
+#: src/global.c:652
 msgid "Exit from the file browser"
 msgstr "GÃ¥ ud af filbrowseren"
 
-#: src/global.c:645
+#: src/global.c:653
 msgid "Go to the first file in the list"
 msgstr "Gå til første fil i listen"
 
-#: src/global.c:646
+#: src/global.c:654
 msgid "Go to the last file in the list"
 msgstr "GÃ¥ til sidste fil i listen"
 
-#: src/global.c:647
+#: src/global.c:655
 msgid "Go to the previous file in the list"
 msgstr "GÃ¥ til forrige fil i listen"
 
-#: src/global.c:648
+#: src/global.c:656
 msgid "Go to the next file in the list"
 msgstr "Gå til næste fil i listen"
 
-#: src/global.c:649
+#: src/global.c:657
 msgid "Go to directory"
 msgstr "GÃ¥ til katalog"
 
-#: src/global.c:652
+#: src/global.c:660
 msgid "Invoke the linter, if available"
 msgstr "Start linteren, hvis tilgængelig"
 
-#: src/global.c:653
+#: src/global.c:661
 msgid "Go to previous linter msg"
 msgstr "GÃ¥ til forrige linter-besked"
 
-#: src/global.c:654
+#: src/global.c:662
 msgid "Go to next linter msg"
 msgstr "Gå til næste linter-besked"
 
-#: src/global.c:656
+#: src/global.c:664
 msgid "Invoke formatter, if available"
 msgstr "Start formateringsprogram, hvis tilgængelig"
 
 #. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:671
+#: src/global.c:679
 msgid "Get Help"
 msgstr "Få hjælp"
 
-#: src/global.c:674 src/prompt.c:858
+#: src/global.c:682 src/prompt.c:855
 msgid "Cancel"
 msgstr "Annullér"
 
-#: src/global.c:687
+#: src/global.c:695
 msgid "Write Out"
 msgstr "Gem"
 
 # max 16 tegn
-#: src/global.c:723
+#: src/global.c:731
 msgid "Go To Dir"
 msgstr "GÃ¥ til katalog"
 
-#: src/global.c:738
+#: src/global.c:746
 msgid "Cut Text"
 msgstr "Klip ud"
 
-#: src/global.c:753
+#: src/global.c:761
 msgid "To Spell"
 msgstr "Stavetjek"
 
-#: src/global.c:757
+#: src/global.c:765
 msgid "To Linter"
 msgstr "Til Linter"
 
 # max 16 tegn
-#: src/global.c:760
+#: src/global.c:768
 msgid "Formatter"
 msgstr "Formateringsp."
 
 # max 10 tegn
-#: src/global.c:767
+#: src/global.c:775
 msgid "Case Sens"
 msgstr "VersalFøls"
 
-#: src/global.c:772
+#: src/global.c:780
 msgid "Regexp"
 msgstr "Regudtr"
 
 # max 10 tegn
-#: src/global.c:777
+#: src/global.c:785
 msgid "Backwards"
 msgstr "Baglæns"
 
 # max 10 tegn
-#: src/global.c:784
+#: src/global.c:792
 msgid "No Replace"
 msgstr "ErstatIkke"
 
-#: src/global.c:792
+#: src/global.c:800
 msgid "Cur Pos"
 msgstr "Akt. pos"
 
 # max 10 tegn
-#: src/global.c:807
+#: src/global.c:815
 msgid "First Line"
 msgstr "FørstLinje"
 
 # max 10 tegn
-#: src/global.c:809
+#: src/global.c:817
 msgid "Last Line"
 msgstr "SidstLinje"
 
-#: src/global.c:816
+#: src/global.c:824
 msgid "To Bracket"
 msgstr "Til klamme"
 
-#: src/global.c:819
+#: src/global.c:827
 msgid "Mark Text"
 msgstr "Markér tekst"
 
-#: src/global.c:822
+#: src/global.c:830
 msgid "Copy Text"
 msgstr "Kopiér tekst"
 
-#: src/global.c:825
+#: src/global.c:833
 msgid "Indent Text"
 msgstr "Indryk tekst"
 
-#: src/global.c:827
+#: src/global.c:835
 msgid "Unindent Text"
 msgstr "Fjern indrykning"
 
-#: src/global.c:830
+#: src/global.c:838
 msgid "Undo"
 msgstr "Fortryd"
 
-#: src/global.c:832
+#: src/global.c:840
 msgid "Redo"
 msgstr "Omgør"
 
-#: src/global.c:836 src/global.c:842
+#: src/global.c:844 src/global.c:850
 msgid "Back"
 msgstr "Bagud"
 
-#: src/global.c:838 src/global.c:844
+#: src/global.c:846 src/global.c:852
 msgid "Forward"
 msgstr "Fremad"
 
-#: src/global.c:849
+#: src/global.c:857
 msgid "Prev Word"
 msgstr "Forrige ord"
 
-#: src/global.c:851
+#: src/global.c:859
 msgid "Next Word"
 msgstr "Næste ord"
 
-#: src/global.c:855
+#: src/global.c:863
 msgid "Home"
 msgstr "Hjem"
 
-#: src/global.c:857
+#: src/global.c:865
 msgid "End"
 msgstr "Slut"
 
 # max 10 tegn
-#: src/global.c:866
+#: src/global.c:874
 msgid "Beg of Par"
 msgstr "AfsnitStrt"
 
 # max 10 tegn
-#: src/global.c:868
+#: src/global.c:876
 msgid "End of Par"
 msgstr "AfsnitSlut"
 
-#: src/global.c:873
+#: src/global.c:881
 msgid "Scroll Up"
 msgstr "Rul op"
 
-#: src/global.c:875
+#: src/global.c:883
 msgid "Scroll Down"
 msgstr "Rul ned"
 
-#: src/global.c:880
+#: src/global.c:888
 msgid "Prev File"
 msgstr "Foreg. fil"
 
-#: src/global.c:882
+#: src/global.c:890
 msgid "Next File"
 msgstr "Næste fil"
 
-#: src/global.c:891
+#: src/global.c:899
 msgid "Verbatim"
 msgstr "Ordret"
 
-#: src/global.c:894
+#: src/global.c:902
 msgid "Tab"
 msgstr "Tabulator"
 
-#: src/global.c:896
+#: src/global.c:904
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:899
+#: src/global.c:907
 msgid "Delete"
 msgstr "Fjern"
 
-#: src/global.c:901
+#: src/global.c:909
 msgid "Backspace"
 msgstr "Slet baglæns"
 
 #. TRANSLATORS: The next two strings refer to cutting words.
-#: src/global.c:912
+#: src/global.c:920
 #, fuzzy
 msgid "Cut Left"
 msgstr "Klip ud"
 
-#: src/global.c:914
+#: src/global.c:922
 msgid "Cut Right"
 msgstr ""
 
-#: src/global.c:916
+#: src/global.c:924
 msgid "CutTillEnd"
 msgstr "KlipResten"
 
-#: src/global.c:926
+#: src/global.c:934
 msgid "Word Count"
 msgstr "Ordtælling"
 
 # max 10 tegn
-#: src/global.c:933
+#: src/global.c:941
 msgid "Suspend"
 msgstr "I baggrund"
 
-#: src/global.c:937
+#: src/global.c:945
+#, fuzzy
+msgid "Comment Lines"
+msgstr "Næste linje"
+
+#: src/global.c:949
 msgid "Save"
 msgstr ""
 
-#: src/global.c:940
+#: src/global.c:952
 msgid "Previous"
 msgstr ""
 
-#: src/global.c:942
+#: src/global.c:954
 #, fuzzy
 msgid "Next"
 msgstr "Næste linje"
 
-#: src/global.c:948
+#: src/global.c:960
 msgid "PrevHstory"
 msgstr "ForrigHist"
 
-#: src/global.c:951
+#: src/global.c:963
 msgid "NextHstory"
 msgstr "NæstHist"
 
-#: src/global.c:955
+#: src/global.c:972
 msgid "Go To Text"
 msgstr "GÃ¥ til tekst"
 
 # max 16 tegn
-#: src/global.c:959
+#: src/global.c:976
 msgid "DOS Format"
 msgstr "DOS-format"
 
 # max 16 tegn
-#: src/global.c:961
+#: src/global.c:978
 msgid "Mac Format"
 msgstr "Mac-format"
 
 # max 16 tegn
-#: src/global.c:969
+#: src/global.c:986
 msgid "Append"
 msgstr "Tilføj ved enden"
 
 # max 16 tegn
-#: src/global.c:971
+#: src/global.c:988
 msgid "Prepend"
 msgstr "Tilføj ved start"
 
 # max 16 tegn
-#: src/global.c:974
+#: src/global.c:991
 msgid "Backup File"
 msgstr "SikrKopiér fil"
 
 # max 16 tegn
-#: src/global.c:981
+#: src/global.c:998
 msgid "Execute Command"
 msgstr "Kør kommando"
 
-#: src/global.c:996
+#: src/global.c:1013
 msgid "To Files"
 msgstr "Til filer"
 
-#: src/global.c:1004
+#: src/global.c:1021
 msgid "First File"
 msgstr "Første fil"
 
-#: src/global.c:1006
+#: src/global.c:1023
 msgid "Last File"
 msgstr "Sidste fil"
 
-#: src/global.c:1010
+#: src/global.c:1027
 msgid "Discard buffer"
 msgstr ""
 
+#: src/global.c:1038
+msgid "Left Column"
+msgstr ""
+
+#: src/global.c:1040
+msgid "Right Column"
+msgstr ""
+
 #. TRANSLATORS: Try to keep the next two strings at most 20 characters.
-#: src/global.c:1020
+#: src/global.c:1047
 msgid "Prev Lint Msg"
 msgstr "Forrige Lint-besked"
 
-#: src/global.c:1022
+#: src/global.c:1049
 msgid "Next Lint Msg"
 msgstr "Næste Lint-besked"
 
 #. TRANSLATORS: The next seventeen strings are toggle descriptions;
 #. * they are best kept shorter than 40 characters, but may be longer.
-#: src/global.c:1285
+#: src/global.c:1316
 msgid "Help mode"
 msgstr "Hjælpetilstand"
 
-#: src/global.c:1287
+#: src/global.c:1318
 msgid "Constant cursor position display"
 msgstr "Konstant visning af markørposition"
 
-#: src/global.c:1289
+#: src/global.c:1320
 msgid "Use of one more line for editing"
 msgstr "Brug af en ekstra linje til redigering"
 
-#: src/global.c:1291
+#: src/global.c:1322
 msgid "Smooth scrolling"
 msgstr "Jævn rulning"
 
-#: src/global.c:1293
+#: src/global.c:1324
 msgid "Soft wrapping of overlong lines"
 msgstr "Blød ombrydning af for lange linjer"
 
-#: src/global.c:1295
+#: src/global.c:1326
 msgid "Whitespace display"
 msgstr "Visning af mellemrum"
 
-#: src/global.c:1297
+#: src/global.c:1328
 msgid "Color syntax highlighting"
 msgstr "Farvefremhævelse af syntaks"
 
-#: src/global.c:1299
+#: src/global.c:1330
 msgid "Smart home key"
 msgstr "Smart home-tast"
 
-#: src/global.c:1301
+#: src/global.c:1332
 msgid "Auto indent"
 msgstr "Automatisk indrykning"
 
-#: src/global.c:1303
+#: src/global.c:1334
 msgid "Cut to end"
 msgstr "Klip ud til enden"
 
-#: src/global.c:1305
+#: src/global.c:1336
 msgid "Hard wrapping of overlong lines"
 msgstr "HÃ¥rd ombrydning af for lange linjer"
 
-#: src/global.c:1307
+#: src/global.c:1338
 msgid "Conversion of typed tabs to spaces"
 msgstr "Konvertering af skrevne tab-tegn til mellemrum"
 
-#: src/global.c:1309
+#: src/global.c:1340
 msgid "Backup files"
 msgstr "Sikkerhedskopiér filer"
 
-#: src/global.c:1311
+#: src/global.c:1342
 msgid "Reading file into separate buffer"
 msgstr ""
 
-#: src/global.c:1313
+#: src/global.c:1344
 msgid "Mouse support"
 msgstr "Museunderstøttelse"
 
-#: src/global.c:1315
+#: src/global.c:1346
 msgid "No conversion from DOS/Mac format"
 msgstr "Ingen konvertering fra DOS/Mac-format"
 
-#: src/global.c:1317
+#: src/global.c:1348
 msgid "Suspension"
 msgstr "Suspension"
 
-#: src/help.c:209
+#: src/help.c:211
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1202,7 +1211,7 @@ msgstr ""
 "teksten. Hvis du taster enter uden at indtaste nogen tekst vil den "
 "foregående søgning blive udført.  "
 
-#: src/help.c:218
+#: src/help.c:220
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1215,7 +1224,7 @@ msgstr ""
 "\n"
 "Følgende funktionstaster er tilgængelige i søgetilstand:\n"
 
-#: src/help.c:224
+#: src/help.c:226
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1235,7 +1244,7 @@ msgstr ""
 " Følgende funktionstaster er til stede i Gå til linje-tilstand:\n"
 "\n"
 
-#: src/help.c:233
+#: src/help.c:235
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1258,7 +1267,7 @@ msgstr ""
 "få den til at blive indlæst i en separat buffer (brug Meta-< og > til at "
 "skifte mellem filbuffere).  "
 
-#: src/help.c:242
+#: src/help.c:244
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1271,7 +1280,7 @@ msgstr ""
 "\n"
 " Følgende funktionstaster er tilgængelige i Indsæt fil-tilstand:\n"
 
-#: src/help.c:248
+#: src/help.c:250
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1299,7 +1308,7 @@ msgstr ""
 " Følgende funktionstaster er til stede i Skriv fil-tilstand:\n"
 "\n"
 
-#: src/help.c:262
+#: src/help.c:264
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1323,7 +1332,7 @@ msgstr ""
 " Følgende funktionstaster er til stede i filskimmeren:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:277
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1347,7 +1356,7 @@ msgstr ""
 "foregående søgning blive udført. \n"
 "\n"
 
-#: src/help.c:284
+#: src/help.c:286
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1355,7 +1364,7 @@ msgstr ""
 " Følgende funktionstaster er til stede i browsersøgetilstand:\n"
 "\n"
 
-#: src/help.c:288
+#: src/help.c:290
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1378,7 +1387,7 @@ msgstr ""
 "filbrowser:\n"
 "\n"
 
-#: src/help.c:301
+#: src/help.c:303
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1402,7 +1411,7 @@ msgstr ""
 " Følgende andre funktioner er til stede i stavekontrol-tilstand:\n"
 "\n"
 
-#: src/help.c:316
+#: src/help.c:318
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1422,7 +1431,7 @@ msgstr ""
 " Følgende taster er tilgængelige i denne tilstand:\n"
 "\n"
 
-#: src/help.c:329
+#: src/help.c:331
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1442,15 +1451,15 @@ msgstr ""
 "hovedvinduet som viser filen der redigeres. Statuslinjen er tredje linje fra "
 "underkanten og viser vigtige meddelelser.  "
 
-#: src/help.c:339
+#: src/help.c:341
+#, fuzzy
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
-" The notation for shortcuts is as follows: Control-key sequences are notated "
-"with a caret (^) symbol and can be entered either by using the Control "
-"(Ctrl) key or pressing the Escape (Esc) key twice.  Escape-key sequences are "
-"notated with the Meta (M-) symbol and can be entered using either the Esc, "
-"Alt, or Meta key depending on your keyboard setup.  "
+" Shortcuts are written as follows: Control-key sequences are notated with a "
+"'^' and can be entered either by using the Ctrl key or pressing the Esc key "
+"twice.  Meta-key sequences are notated with 'M-' and can be entered using "
+"either the Alt, Cmd, or Esc key, depending on your keyboard setup.  "
 msgstr ""
 "De nederste to linjer viser de mest brugte genveje i redigeringsprogrammet.\n"
 "\n"
@@ -1478,21 +1487,21 @@ msgstr ""
 msgid "enable/disable"
 msgstr "aktivér/deaktivér"
 
-#: src/nano.c:559
+#: src/nano.c:560
 #, fuzzy
 msgid "Key is invalid in view mode"
 msgstr "Tasten ugyldig i visningstilstand"
 
-#: src/nano.c:565
+#: src/nano.c:566
 #, fuzzy
 msgid "This function is disabled in restricted mode"
 msgstr "Kan ikke besøge forælder i begrænset tilstand"
 
-#: src/nano.c:573
+#: src/nano.c:574
 msgid "Help is not available"
 msgstr ""
 
-#: src/nano.c:684
+#: src/nano.c:686
 #, c-format
 msgid ""
 "\n"
@@ -1501,7 +1510,7 @@ msgstr ""
 "\n"
 "Bufferen skrevet til %s\n"
 
-#: src/nano.c:686
+#: src/nano.c:688
 #, c-format
 msgid ""
 "\n"
@@ -1510,7 +1519,7 @@ msgstr ""
 "\n"
 "Buffer ikke skrevet til %s: %s\n"
 
-#: src/nano.c:689
+#: src/nano.c:691
 #, c-format
 msgid ""
 "\n"
@@ -1774,17 +1783,22 @@ msgstr "Slå suspend til"
 msgid "Enable soft line wrapping"
 msgstr "Brug blød linjeombrydning"
 
-#: src/nano.c:937
-#, c-format
-msgid " GNU nano, version %s\n"
+#: src/nano.c:940
+#, fuzzy, c-format
+msgid " nano, version %s\n"
 msgstr " GNU nano version %s\n"
 
-#: src/nano.c:940
+#: src/nano.c:943
+#, c-format
+msgid " (C) 2014..%s the contributors to nano\n"
+msgstr ""
+
+#: src/nano.c:945
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr " E-post: nano@nano-editor.org\tHjemmeside: http://www.nano-editor.org/"
 
-#: src/nano.c:941
+#: src/nano.c:946
 #, c-format
 msgid ""
 "\n"
@@ -1793,67 +1807,82 @@ msgstr ""
 "\n"
 " Kompileringstilvalg:"
 
-#: src/nano.c:1073
+#: src/nano.c:1081
 msgid "No file name"
 msgstr "Intet filnavn"
 
-#: src/nano.c:1108
-msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
-msgstr "Gem ændret buffer (AT SVARE \"Nej\" VIL ØDELÆGGE ÆNDRINGER)? "
+#: src/nano.c:1115
+msgid "Save modified buffer?  (Answering \"No\" will DISCARD changes.) "
+msgstr ""
 
-#: src/nano.c:1168
+#: src/nano.c:1178
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "Kunne ikke genåbne stdin fra tastaturet, beklager\n"
 
-#: src/nano.c:1192
+#: src/nano.c:1202
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "Læser fra stdin, ^C for at afbryde\n"
 
-#: src/nano.c:1256
+#: src/nano.c:1266
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Modtog SIGHUP eller SIGTERM\n"
 
-#: src/nano.c:1272
+#: src/nano.c:1282
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Brug \"fg\" for at returnere til nano\n"
 
-#: src/nano.c:1294
+#: src/nano.c:1304
 msgid "Suspension is not enabled"
 msgstr ""
 
-#: src/nano.c:1448
+#: src/nano.c:1459
 msgid "enabled"
 msgstr "aktiveret"
 
-#: src/nano.c:1448
+#: src/nano.c:1459
 msgid "disabled"
 msgstr "deaktiveret"
 
-#: src/nano.c:1607 src/winio.c:1125
-msgid "Unknown Command"
-msgstr "Ukendt kommando"
+#: src/nano.c:1573
+msgid "Unbound key"
+msgstr ""
+
+#: src/nano.c:1577
+#, c-format
+msgid "Unbound key: M-%c"
+msgstr ""
+
+#: src/nano.c:1579
+#, c-format
+msgid "Unbound key: ^%c"
+msgstr ""
+
+#: src/nano.c:1581
+#, c-format
+msgid "Unbound key: %c"
+msgstr ""
 
-#: src/nano.c:1720
+#: src/nano.c:1745
 msgid "XON ignored, mumble mumble"
 msgstr "XON ignoreret, mumle mumle"
 
-#: src/nano.c:1725
+#: src/nano.c:1750
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF ignoreret, mumle mumle"
 
-#: src/nano.c:2139 src/rcfile.c:1334
+#: src/nano.c:2166 src/rcfile.c:1187
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Ønsket tab-størrelse \"%s\" er ugyldig"
 
-#: src/nano.c:2200 src/rcfile.c:1259
+#: src/nano.c:2227 src/rcfile.c:1128
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Ønsket fyld-størrelse \"%s\" er ugyldig"
 
-#: src/nano.c:2247
+#: src/nano.c:2276
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr "Tast \"%s -h\" for en liste over tilgængelige tilvalg.\n"
@@ -1861,115 +1890,119 @@ msgstr "Tast \"%s -h\" for en liste over tilgængelige tilvalg.\n"
 #. TRANSLATORS: For the next three strings, if possible, specify
 #. * the single-byte shortcuts for both your language and English.
 #. * For example, in French: "OoYy" for "Oui".
-#: src/prompt.c:821
+#: src/prompt.c:818
 msgid "Yy"
 msgstr "JjYy"
 
-#: src/prompt.c:822
+#: src/prompt.c:819
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:823
+#: src/prompt.c:820
 msgid "Aa"
 msgstr "Aa"
 
-#: src/prompt.c:845
+#: src/prompt.c:842
 msgid "Yes"
 msgstr "Ja"
 
-#: src/prompt.c:850
+#: src/prompt.c:847
 msgid "All"
 msgstr "Alle"
 
-#: src/prompt.c:855
+#: src/prompt.c:852
 msgid "No"
 msgstr "Nej"
 
-#: src/rcfile.c:142
+#: src/rcfile.c:144
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Fejl i %s på linje %lu: "
 
-#: src/rcfile.c:201
+#: src/rcfile.c:203
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "Argument \"%s\" har et uafsluttet \""
 
-#: src/rcfile.c:228 src/rcfile.c:280 src/rcfile.c:732 src/rcfile.c:793
-#: src/rcfile.c:882 src/rcfile.c:933
+#: src/rcfile.c:231 src/rcfile.c:674 src/rcfile.c:725 src/rcfile.c:824
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Regex-strenge skal begynde og ende med et \"-tegn"
 
-#: src/rcfile.c:254 src/search.c:62
+#: src/rcfile.c:257 src/search.c:61
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Dårligt regulært udtryk \"%s\": %s"
 
-#: src/rcfile.c:274
+#: src/rcfile.c:279
 msgid "Missing syntax name"
 msgstr "Mangler syntaksnavn"
 
-#: src/rcfile.c:345
+#: src/rcfile.c:288
+msgid "A syntax name must be quoted"
+msgstr ""
+
+#: src/rcfile.c:297
 msgid "The \"none\" syntax is reserved"
 msgstr "\"none\"-syntaksen er reserveret"
 
 # Extension skal her forstås som f.eks. 'nano --something extension', altså en slags argument, der kræves af et andet argument
-#: src/rcfile.c:352
-msgid "The \"default\" syntax must take no extensions"
+#: src/rcfile.c:327
+#, fuzzy
+msgid "The \"default\" syntax does not accept extensions"
 msgstr "\"default\"-syntaksen kan ikke tage udvidelser"
 
-#: src/rcfile.c:424
+#: src/rcfile.c:369
 msgid "Missing key name"
 msgstr "Mangler tastenavn"
 
-#: src/rcfile.c:433 src/rcfile.c:444
+#: src/rcfile.c:378 src/rcfile.c:389
 msgid "Key name is too short"
 msgstr "Tastenavn er for kort"
 
-#: src/rcfile.c:454
+#: src/rcfile.c:399
 msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr "Tastenavn skal starte med \"^\", \"M\" eller \"F\""
 
-#: src/rcfile.c:457
+#: src/rcfile.c:402
 #, fuzzy, c-format
 msgid "Key name %s is invalid"
 msgstr "Ønsket tab-størrelse \"%s\" er ugyldig"
 
-#: src/rcfile.c:466
+#: src/rcfile.c:411
 msgid "Must specify a function to bind the key to"
 msgstr "Skal angive en funktion at binde tast til"
 
 #. TRANSLATORS: Do not translate the word "all".
-#: src/rcfile.c:476
+#: src/rcfile.c:421
 msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr "Skal angive en menu (eller \"all\") hvori tasten bindes/løsnes"
 
-#: src/rcfile.c:483
+#: src/rcfile.c:428
 #, c-format
 msgid "Cannot map name \"%s\" to a function"
 msgstr "Kan ikke associere navnet \"%s\" med en funktion"
 
-#: src/rcfile.c:490
+#: src/rcfile.c:435
 #, c-format
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "Kan ikke associere navnet \"%s\" med en menu"
 
-#: src/rcfile.c:522
+#: src/rcfile.c:467
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr "Funktion \"%s\" findes ikke i menuen \"%s\""
 
-#: src/rcfile.c:534
+#: src/rcfile.c:479
 #, c-format
 msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "Beklager, tastetryk \"%s\" kan ikke være rebound"
 
-#: src/rcfile.c:631
+#: src/rcfile.c:576
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr "Fejl ved udvidelse af %s: %s"
 
-#: src/rcfile.c:674
+#: src/rcfile.c:616
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1984,62 +2017,51 @@ msgstr ""
 "\"black\", med den valgfri forstavelse \"bright\"\n"
 "til forgrundsfarver."
 
-#: src/rcfile.c:696
-msgid "Cannot add a color command without a syntax command"
-msgstr "Kan ikke tilføje farvekommando uden en syntakskommando"
+#: src/rcfile.c:637 src/rcfile.c:795 src/rcfile.c:858
+#, c-format
+msgid "A '%s' command requires a preceding 'syntax' command"
+msgstr ""
 
-#: src/rcfile.c:701
+#: src/rcfile.c:643
 msgid "Missing color name"
 msgstr "Mangler farvenavn"
 
-#: src/rcfile.c:711 src/rcfile.c:872
-msgid "Missing regex string"
-msgstr "Mangler regex-streng"
+#: src/rcfile.c:653 src/rcfile.c:807
+#, fuzzy, c-format
+msgid "Missing regex string after '%s' command"
+msgstr "Mangler linter-kommando"
 
-#: src/rcfile.c:787
+#: src/rcfile.c:719
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\" kræver et tilsvarende \"end=\""
 
-#: src/rcfile.c:839
+#: src/rcfile.c:768
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
 msgstr "Baggrundsfarven \"%s\" må ikke være lys"
 
-# Headeren/filhovedet er første linje i rc-filen, så vidt jeg kan se
-#: src/rcfile.c:867
-msgid "Cannot add a header regex without a syntax command"
-msgstr "Kan ikke tilføje filhoved-regex uden en syntakskommando"
-
-#: src/rcfile.c:922
-msgid "Cannot add a magic string regex without a syntax command"
-msgstr "Kan ikke tilføje magisk strengregex uden syntakskommando"
-
-#: src/rcfile.c:927
-msgid "Missing magic string name"
-msgstr "Mangler magisk strengnavn"
-
-#: src/rcfile.c:985
-msgid "Cannot add a linter without a syntax command"
-msgstr "Kan ikke tilføje en linter uden en syntakskommando"
+# Extension skal her forstås som f.eks. 'nano --something extension', altså en slags argument, der kræves af et andet argument
+#: src/rcfile.c:802
+#, fuzzy, c-format
+msgid "The \"default\" syntax does not accept '%s' regexes"
+msgstr "\"default\"-syntaksen kan ikke tage udvidelser"
 
-#: src/rcfile.c:990
-msgid "Missing linter command"
+#: src/rcfile.c:863
+#, fuzzy, c-format
+msgid "Missing command after '%s'"
 msgstr "Mangler linter-kommando"
 
-#: src/rcfile.c:1011
-msgid "Cannot add formatter without a syntax command"
-msgstr "Kan ikke tilføje formateringsprogram uden en syntakskommando"
-
-#: src/rcfile.c:1016
-msgid "Missing formatter command"
-msgstr "Mangler kommando for formateringsprogram"
+#: src/rcfile.c:879
+#, fuzzy, c-format
+msgid "Argument of '%s' lacks closing \""
+msgstr "Argument \"%s\" har et uafsluttet \""
 
-#: src/rcfile.c:1046
+#: src/rcfile.c:910
 #, c-format
 msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr "Fatal fejl: ingen taster bundet til funktionen \"%s\". Afslutter.\n"
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:912
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
@@ -2047,62 +2069,62 @@ msgstr ""
 "Hvis krævet, så brug nano med tilvalget -I for at justere dine nanorc-"
 "indstillinger.\n"
 
-#: src/rcfile.c:1109
+#: src/rcfile.c:971
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "Kunne ikke finde syntaks \"%s\" at udvide"
 
-#: src/rcfile.c:1125 src/rcfile.c:1134 src/rcfile.c:1144
-#, c-format
-msgid "Command \"%s\" not allowed in included file"
-msgstr "Kommandoen \"%s\" tillades ikke i inkluderet fil"
-
-#: src/rcfile.c:1150 src/rcfile.c:1359
+#: src/rcfile.c:993 src/rcfile.c:1202
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Syntaksen \"%s\" har ingen farvekommandoer"
 
-#: src/rcfile.c:1180
+#: src/rcfile.c:1024
+#, c-format
+msgid "Command \"%s\" not allowed in included file"
+msgstr "Kommandoen \"%s\" tillades ikke i inkluderet fil"
+
+#: src/rcfile.c:1039
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Kommando \"%s\" ikke forstået"
 
-#: src/rcfile.c:1195
+#: src/rcfile.c:1051
 msgid "Missing option"
 msgstr "Mangler tilvalg"
 
-#: src/rcfile.c:1217
+#: src/rcfile.c:1065
+#, c-format
+msgid "Unknown option \"%s\""
+msgstr "Ukendt tilvalg \"%s\""
+
+#: src/rcfile.c:1077
+#, c-format
+msgid "Cannot unset option \"%s\""
+msgstr "Kan ikke fjerne tilvalget \"%s\""
+
+#: src/rcfile.c:1089
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Tilvalget \"%s\" kræver et argument"
 
-#: src/rcfile.c:1235
+#: src/rcfile.c:1105
 msgid "Option is not a valid multibyte string"
 msgstr "Tilvalget er ikke en gyldig flerbytestreng"
 
-#: src/rcfile.c:1272 src/rcfile.c:1300 src/rcfile.c:1309
+#: src/rcfile.c:1139 src/rcfile.c:1160 src/rcfile.c:1167
 msgid "Non-blank characters required"
 msgstr "Kræver ikke-blanke tegn"
 
-#: src/rcfile.c:1282
+#: src/rcfile.c:1146
 msgid "Two single-column characters required"
 msgstr "Der kræves to enkelt-kolonnetegn"
 
-#: src/rcfile.c:1348
-#, c-format
-msgid "Cannot unset option \"%s\""
-msgstr "Kan ikke fjerne tilvalget \"%s\""
-
-#: src/rcfile.c:1354
-#, c-format
-msgid "Unknown option \"%s\""
-msgstr "Ukendt tilvalg \"%s\""
-
-#: src/rcfile.c:1413
+#: src/rcfile.c:1258
 msgid "I can't find my home directory!  Wah!"
 msgstr "Jeg kan ikke finde mit hjemmekatalog!  Hulk!"
 
-#: src/rcfile.c:1451
+#: src/rcfile.c:1295
 #, c-format
 msgid ""
 "\n"
@@ -2111,44 +2133,49 @@ msgstr ""
 "\n"
 "Tryk enter for at fortsætte opstart af nano.\n"
 
-#: src/search.c:96
+#: src/search.c:95
 #, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "\"%.*s%s\" ikke fundet"
 
 #. TRANSLATORS: The next three strings are modifiers of the search prompt.
-#: src/search.c:176
+#: src/search.c:169
 msgid " [Case Sensitive]"
 msgstr " [Versalfølsom]"
 
-#: src/search.c:180
+#: src/search.c:173
 msgid " [Regexp]"
 msgstr " [Regudtr]"
 
-#: src/search.c:184
+#: src/search.c:177
 msgid " [Backwards]"
 msgstr " [Bagud]"
 
 #. TRANSLATORS: The next two strings are modifiers of the search prompt.
-#: src/search.c:189
+#: src/search.c:182
 msgid " (to replace) in selection"
 msgstr " (at erstatte) i markering"
 
-#: src/search.c:191
+#: src/search.c:184
 msgid " (to replace)"
 msgstr " (at erstatte)"
 
+#: src/search.c:305
+#, fuzzy
+msgid "Searching..."
+msgstr "Søg"
+
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:718
+#: src/search.c:693
 msgid "Replace this instance?"
 msgstr "Erstat denne forekomst?"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:883
+#: src/search.c:840
 msgid "Replace with"
 msgstr "Erstat med"
 
-#: src/search.c:924
+#: src/search.c:875
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
@@ -2156,295 +2183,363 @@ msgstr[0] "Erstattede %lu forekomst"
 msgstr[1] "Erstattede %lu forekomster"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:964
+#: src/search.c:914
 msgid "Enter line number, column number"
 msgstr "Indtast linjenummer, kolonnenummer"
 
-#: src/search.c:991
+#: src/search.c:939
 msgid "Invalid line or column number"
 msgstr "Ugyldigt linje- eller kolonnenummer"
 
-#: src/search.c:1124
+#: src/search.c:1080
 msgid "Not a bracket"
 msgstr "Ikke en klamme"
 
-#: src/search.c:1191
+#: src/search.c:1146
 msgid "No matching bracket"
 msgstr "Ingen modsvarende klamme"
 
-#: src/text.c:54
+#: src/text.c:53
 msgid "Mark Set"
 msgstr "Markering sat"
 
-#: src/text.c:58
+#: src/text.c:57
 msgid "Mark Unset"
 msgstr "Markering fjernet"
 
-#: src/text.c:70
+#: src/text.c:69
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Fejl ved kald af \"%s\""
 
-#: src/text.c:475
+#: src/text.c:468
+msgid "Commenting is not supported for this file type"
+msgstr ""
+
+#: src/text.c:484
+msgid "Cannot comment past end of file"
+msgstr ""
+
+#: src/text.c:677
 msgid "Nothing in undo buffer!"
 msgstr "Intet i fortrydelsesbufferen!"
 
-#: src/text.c:481 src/text.c:634
-#, c-format
-msgid "Internal error: can't match line %d.  Please save your work."
-msgstr "Intern fejl: Kan ikke matche linje %d.  Gem venligst dit arbejde."
-
 # De her mystiske "text add" og den slags indgår i strengen "Undid action (%s)" hvor %s er en af disse
 #. TRANSLATORS: Eight of the next nine strings describe actions
 #. * that are undone or redone.  It are all nouns, not verbs.
-#: src/text.c:495 src/text.c:524 src/text.c:645 src/text.c:686
+#: src/text.c:695 src/text.c:724 src/text.c:857 src/text.c:898
 msgid "text add"
 msgstr "tilføj tekst"
 
-#: src/text.c:505 src/text.c:656
+#: src/text.c:705 src/text.c:868
 msgid "text delete"
 msgstr "slet tekst"
 
-#: src/text.c:528 src/text.c:694
+#: src/text.c:728 src/text.c:907
 msgid "line join"
 msgstr "sammenføj linje"
 
-#: src/text.c:547 src/text.c:710
+#: src/text.c:747 src/text.c:923
 msgid "text cut"
 msgstr "klip tekst"
 
-#: src/text.c:552 src/text.c:714
+#: src/text.c:752 src/text.c:927
 msgid "text uncut"
 msgstr "indsæt tekst"
 
-#: src/text.c:558 src/text.c:691
+#: src/text.c:758 src/text.c:903
 #, fuzzy
 msgid "Internal error: line is missing.  Please save your work."
 msgstr "Intern fejl: Opsætning af Omgør slog fejl.  Gem venligst dit arbejde"
 
-#: src/text.c:561 src/text.c:665
+#: src/text.c:762 src/text.c:877
 msgid "line break"
 msgstr "linje bryd"
 
+#: src/text.c:772 src/text.c:947
+msgid "comment"
+msgstr ""
+
+#: src/text.c:776 src/text.c:951
+msgid "uncomment"
+msgstr ""
+
 # dette sker hvis teksten f.eks. er læst fra en fil
-#: src/text.c:569 src/text.c:725
+#: src/text.c:780 src/text.c:938
 msgid "text insert"
 msgstr "import af tekst"
 
-#: src/text.c:589 src/text.c:718
+#: src/text.c:800 src/text.c:931
 msgid "text replace"
 msgstr "tekst erstat"
 
-#: src/text.c:596 src/text.c:732 src/text.c:1030 src/text.c:1174
+#: src/text.c:807 src/text.c:955 src/text.c:1267 src/text.c:1437
 msgid "Internal error: unknown type.  Please save your work."
 msgstr "Intern fejl: ukendt type.  Gem venligst dit arbejde."
 
-#: src/text.c:601
+#: src/text.c:813
 #, c-format
 msgid "Undid action (%s)"
 msgstr "Fortrød handling (%s)"
 
-#: src/text.c:619
+#: src/text.c:832
 msgid "Nothing to re-do!"
 msgstr "Intet at omgøre!"
 
-#: src/text.c:628
+#: src/text.c:841
 msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr "Intern fejl: Kan ikke opsætte omgør. Gem venligst dit arbejde."
 
-#: src/text.c:737
+#: src/text.c:961
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Omgjorde handling (%s)"
 
-#: src/text.c:827 src/text.c:2508 src/text.c:2944
+#: src/text.c:1051 src/text.c:2765 src/text.c:3198
 msgid "Could not create pipe"
 msgstr "Kunne ikke oprette datakanal"
 
-#: src/text.c:853 src/text.c:2595 src/text.c:2750 src/text.c:2992
-#: src/text.c:3286
+#: src/text.c:1077 src/text.c:2852 src/text.c:3005 src/text.c:3246
+#: src/text.c:3540
 msgid "Could not fork"
 msgstr "Kunne ikke forgrene"
 
-#: src/text.c:1853
+#: src/text.c:2117
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Dårlig anførselsstreng %s: %s"
 
-#: src/text.c:2241
+#: src/text.c:2499
 msgid "Can now UnJustify!"
 msgstr "Kan nu af-ombryde!"
 
-#: src/text.c:2435
+#: src/text.c:2697
 msgid "Edit a replacement"
 msgstr "Redigér en erstatning"
 
-#: src/text.c:2510
+#. TRANSLATORS: Shown after fixing misspellings in one word.
+#: src/text.c:2713
+#, fuzzy
+msgid "Next word..."
+msgstr "Næste ord"
+
+#: src/text.c:2767
 msgid "Creating misspelled word list, please wait..."
 msgstr "Opretter ordliste med fejlstavelser, vent venligst..."
 
-#: src/text.c:2601 src/text.c:2999
+#: src/text.c:2858 src/text.c:3253
 msgid "Could not get size of pipe buffer"
 msgstr "Kunde ikke få størrelse af datakanals-buffer"
 
-#: src/text.c:2652
+#: src/text.c:2907
 msgid "Error invoking \"spell\""
 msgstr "Fejl ved kald af \"spell\""
 
-#: src/text.c:2655
+#: src/text.c:2910
 msgid "Error invoking \"sort -f\""
 msgstr "Fejl ved kald af \"sort -f\""
 
-#: src/text.c:2658
+#: src/text.c:2913
 msgid "Error invoking \"uniq\""
 msgstr "Fejl ved kald af \"uniq\""
 
-#: src/text.c:2881
+#: src/text.c:3135
 msgid "Invoking spell checker, please wait"
 msgstr "Start stavekontrollen, vent venligst"
 
-#: src/text.c:2897
+#: src/text.c:3151
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Stavekontrollen mislykkedes: %s"
 
-#: src/text.c:2899
+#: src/text.c:3153
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Stavekontrollen mislykkedes: %s: %s"
 
-#: src/text.c:2902
+#: src/text.c:3156
 msgid "Finished checking spelling"
 msgstr "Stavekontrol færdiggjort"
 
-#: src/text.c:2927
+#: src/text.c:3181
 msgid "No linter defined for this type of file!"
 msgstr "Ingen linter defineret for denne filtype!"
 
-#: src/text.c:2932
+#: src/text.c:3186
 msgid "Save modified buffer before linting?"
 msgstr "Gem ændret buffer før linting?"
 
-#: src/text.c:2949
+#: src/text.c:3203
 msgid "Invoking linter, please wait"
 msgstr "Starter linter, vent venligst"
 
-#: src/text.c:3105
+#: src/text.c:3358
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr "Fik 0 linjer der kunne fortolkes fra kommando: %s"
 
-#: src/text.c:3134
+#: src/text.c:3388
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr "Denne besked er for uåbnet fil %s, åbn den i en ny buffer?"
 
-#: src/text.c:3153
+#: src/text.c:3407
 msgid "No more errors in unopened files, cancelling"
 msgstr ""
 
-#: src/text.c:3192
+#: src/text.c:3446
 msgid "At last message"
 msgstr "Ved sidste besked"
 
-#: src/text.c:3197
+#: src/text.c:3451
 msgid "At first message"
 msgstr "Ved første besked"
 
-#: src/text.c:3237
+#: src/text.c:3491
 msgid "Finished"
 msgstr "Afsluttet"
 
-#: src/text.c:3259
+#: src/text.c:3513
 msgid "Invoking formatter, please wait"
 msgstr "Starter formateringsprogram, vent venligst"
 
-#: src/text.c:3314
+#: src/text.c:3568
 msgid "Finished formatting"
 msgstr "Afsluttet formatering"
 
-#: src/text.c:3396
+#: src/text.c:3650
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sOrd: %lu  Linjer: %ld  Tegn: %lu"
 
-#: src/text.c:3397
+#: src/text.c:3651
 msgid "In Selection:  "
 msgstr "I markering:  "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3411
+#: src/text.c:3665
 msgid "Verbatim Input"
 msgstr "Ordret input"
 
-#: src/utils.c:391 src/utils.c:403
+#: src/utils.c:392 src/utils.c:404
 msgid "nano is out of memory!"
 msgstr "nano har ikke mere hukommelse!"
 
+#: src/utils.c:625
+#, c-format
+msgid "Internal error: can't match line %d.  Please save your work."
+msgstr "Intern fejl: Kan ikke matche linje %d.  Gem venligst dit arbejde."
+
+#. TRANSLATORS: This refers to a sequence of escape codes
+#. * (from the keyboard) that nano does not know about.
+#: src/winio.c:1121
+msgid "Unknown sequence"
+msgstr ""
+
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
 #: src/winio.c:1427
 msgid "Unicode Input"
 msgstr "Unicode-input"
 
-#: src/winio.c:1991 src/winio.c:1995
-msgid "Modified"
-msgstr "Ændret"
-
-#: src/winio.c:1992
-msgid "View"
-msgstr "Se"
-
-#: src/winio.c:2006
+#: src/winio.c:1960
 msgid "DIR:"
 msgstr "KAT:"
 
-#: src/winio.c:2013
+#: src/winio.c:1968
 msgid "File:"
 msgstr "Fil:"
 
-#: src/winio.c:3141
+#: src/winio.c:1972 src/winio.c:1976
+msgid "Modified"
+msgstr "Ændret"
+
+#: src/winio.c:1974
+msgid "View"
+msgstr "Se"
+
+#: src/winio.c:3105
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "linje %ld/%ld (%d%%), kol %lu/%lu (%d%%), tegn %lu/%lu (%d%%)"
 
-#: src/winio.c:3271
+#: src/winio.c:3235
 msgid "The nano text editor"
 msgstr "Tekstredigereren nano"
 
-#: src/winio.c:3272
+#: src/winio.c:3236
 msgid "version"
 msgstr "version"
 
-#: src/winio.c:3273
+#: src/winio.c:3237
 msgid "Brought to you by:"
 msgstr "Præsenteres af:"
 
-#: src/winio.c:3274
+#: src/winio.c:3238
 msgid "Special thanks to:"
 msgstr "Særlig tak til:"
 
-#: src/winio.c:3275
+#: src/winio.c:3239
 msgid "The Free Software Foundation"
 msgstr "Free Software Foundation"
 
-#: src/winio.c:3276
+#: src/winio.c:3240
 msgid "the many translators and the TP"
 msgstr "de mange oversættere og TP"
 
-#: src/winio.c:3277
+#: src/winio.c:3241
 msgid "For ncurses:"
 msgstr "For ncurses:"
 
-#: src/winio.c:3278
+#: src/winio.c:3242
 msgid "and anyone else we forgot..."
 msgstr "og alle andre som vi har glemt..."
 
-#: src/winio.c:3279
+#: src/winio.c:3243
 msgid "Thank you for using nano!"
 msgstr "Tak for at du bruger nano!"
 
+#~ msgid ""
+#~ "Read %lu line (Converted from DOS and Mac format - Warning: No write "
+#~ "permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from DOS and Mac format - Warning: No write "
+#~ "permission)"
+#~ msgstr[0] ""
+#~ "Læste %lu linje (Konverteret fra DOS- og Mac-format - Advarsel: Ingen "
+#~ "skriveadgang)"
+#~ msgstr[1] ""
+#~ "Læste %lu linjer (Konverteret fra DOS- og Mac-format - Advarsel: Ingen "
+#~ "skriveadgang)"
+
+#~ msgid ""
+#~ "Read %lu line (Converted from Mac format - Warning: No write permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from Mac format - Warning: No write permission)"
+#~ msgstr[0] ""
+#~ "Læste %lu linje (Konverteret fra Mac-format - Advarsel: Ingen "
+#~ "skriveadgang)"
+#~ msgstr[1] ""
+#~ "Læste %lu linjer (Konverteret fra Mac-format - Advarsel: Ingen "
+#~ "skriveadgang)"
+
+#~ msgid ""
+#~ "Read %lu line (Converted from DOS format - Warning: No write permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from DOS format - Warning: No write permission)"
+#~ msgstr[0] ""
+#~ "Læste %lu linje (Konverteret fra DOS-format - Advarsel: Ingen "
+#~ "skriveadgang)"
+#~ msgstr[1] ""
+#~ "Læste %lu linjer (Konverteret fra DOS-format - Advarsel: Ingen "
+#~ "skriveadgang)"
+
+#~ msgid "Read %lu line ( Warning: No write permission)"
+#~ msgid_plural "Read %lu lines (Warning: No write permission)"
+#~ msgstr[0] "Læs %lu linje (Advarsel: Ingen skriveadgang)"
+#~ msgstr[1] "Læs %lu linjer (Advarsel: Ingen skriveadgang)"
+
 #~ msgid "Cannot prepend or append to a symlink with --nofollow set"
 #~ msgstr "Kan ikke foran- eller efterstille til symlænke med --nofollow givet"
 
@@ -2460,6 +2555,37 @@ msgstr "Tak for at du bruger nano!"
 #~ msgid "Sorry, support for this function has been disabled"
 #~ msgstr "Desværre, understøttelse af denne funktion er blevet deaktiveret"
 
+#~ msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
+#~ msgstr "Gem ændret buffer (AT SVARE \"Nej\" VIL ØDELÆGGE ÆNDRINGER)? "
+
+#~ msgid "Unknown Command"
+#~ msgstr "Ukendt kommando"
+
+#~ msgid "Cannot add a color command without a syntax command"
+#~ msgstr "Kan ikke tilføje farvekommando uden en syntakskommando"
+
+#~ msgid "Missing regex string"
+#~ msgstr "Mangler regex-streng"
+
+# Headeren/filhovedet er første linje i rc-filen, så vidt jeg kan se
+#~ msgid "Cannot add a header regex without a syntax command"
+#~ msgstr "Kan ikke tilføje filhoved-regex uden en syntakskommando"
+
+#~ msgid "Cannot add a magic string regex without a syntax command"
+#~ msgstr "Kan ikke tilføje magisk strengregex uden syntakskommando"
+
+#~ msgid "Missing magic string name"
+#~ msgstr "Mangler magisk strengnavn"
+
+#~ msgid "Cannot add a linter without a syntax command"
+#~ msgstr "Kan ikke tilføje en linter uden en syntakskommando"
+
+#~ msgid "Cannot add formatter without a syntax command"
+#~ msgstr "Kan ikke tilføje formateringsprogram uden en syntakskommando"
+
+#~ msgid "Missing formatter command"
+#~ msgstr "Mangler kommando for formateringsprogram"
+
 #~ msgid "Internal error: can't match line %ld.  Please save your work."
 #~ msgstr "Intern fejl: Kan ikke matche linje %ld. Gem venligst dit arbejde."
 
diff --git a/po/de.po b/po/de.po
index e4981a7d..4580d25f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 2.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-25 16:41-0500\n"
+"POT-Creation-Date: 2016-06-17 15:41+0200\n"
 "PO-Revision-Date: 2016-02-18 10:38+0100\n"
 "Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
@@ -21,374 +21,353 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Poedit 1.8.7\n"
 
+#: src/browser.c:144 src/browser.c:284 src/browser.c:334 src/files.c:996
+#: src/files.c:1003 src/files.c:1794 src/files.c:1919 src/files.c:1963
+#: src/files.c:1983 src/files.c:2099 src/files.c:3019 src/files.c:3242
+#: src/rcfile.c:540 src/rcfile.c:1280
+#, c-format
+msgid "Error reading %s: %s"
+msgstr "Fehler beim Lesen von %s: %s"
+
 #. TRANSLATORS: This is a prompt.
-#: src/browser.c:220
+#: src/browser.c:247
 msgid "Go To Directory"
 msgstr "Gehe zu Verzeichnis"
 
-#: src/browser.c:227 src/browser.c:738 src/files.c:1174 src/files.c:2340
-#: src/nano.c:1120 src/search.c:202 src/search.c:290 src/search.c:895
-#: src/search.c:970 src/text.c:2935 src/text.c:3142
+#: src/browser.c:254 src/browser.c:723 src/files.c:1126 src/files.c:2292
+#: src/nano.c:1128 src/search.c:195 src/search.c:297 src/search.c:851
+#: src/search.c:918 src/text.c:3189 src/text.c:3396
 msgid "Cancelled"
 msgstr "Abgebrochen"
 
-#: src/browser.c:253 src/browser.c:300
-#, c-format
-msgid "Can't go outside of %s in restricted mode"
+#. TRANSLATORS: This refers to the option --operatingdir,
+#. * not to --restricted.
+#: src/browser.c:274 src/browser.c:326
+#, fuzzy, c-format
+msgid "Can't go outside of %s in confined mode"
 msgstr ""
 "Im eingeschränkten Modus kann nicht zu Orten außerhalb von %s gewechselt "
 "werden."
 
-#: src/browser.c:264 src/browser.c:310 src/browser.c:326 src/files.c:1044
-#: src/files.c:1052 src/files.c:1844 src/files.c:1971 src/files.c:2016
-#: src/files.c:2037 src/files.c:2156 src/files.c:3062 src/files.c:3285
-#: src/rcfile.c:596 src/rcfile.c:1435
-#, c-format
-msgid "Error reading %s: %s"
-msgstr "Fehler beim Lesen von %s: %s"
-
-#: src/browser.c:290
+#: src/browser.c:317
 msgid "Can't move up a directory"
 msgstr "Ins übergeordnete Verzeichnis kann nicht gewechselt werden."
 
 #. TRANSLATORS: Try to keep this at most 7 characters.
-#: src/browser.c:615 src/browser.c:623
+#: src/browser.c:590 src/browser.c:598
 msgid "(dir)"
 msgstr "(Verz.)"
 
 #. TRANSLATORS: Try to keep this at most 12 characters.
-#: src/browser.c:620
+#: src/browser.c:595
 msgid "(parent dir)"
 msgstr "(Verz. höher)"
 
 #. TRANSLATORS: Try to keep this at most 7 characters.
 #. * If necessary, you can leave out the parentheses.
-#: src/browser.c:650
+#: src/browser.c:625
 msgid "(huge)"
 msgstr "(riesig)"
 
 #. TRANSLATORS: This is the main search prompt.
-#: src/browser.c:727 src/search.c:173
+#: src/browser.c:712 src/search.c:166
 msgid "Search"
 msgstr "Suche"
 
-#: src/browser.c:777 src/search.c:466 src/search.c:536
-msgid "This is the only occurrence"
-msgstr "Das ist das einzige Auftreten"
-
-#: src/browser.c:793 src/search.c:364
+#: src/browser.c:754 src/search.c:368
 msgid "Search Wrapped"
 msgstr "Suche umbrechen"
 
-#: src/browser.c:843 src/search.c:517
+#: src/browser.c:764 src/search.c:509
+msgid "This is the only occurrence"
+msgstr "Das ist das einzige Auftreten"
+
+#: src/browser.c:812 src/search.c:473
 msgid "No current search pattern"
 msgstr "Kein aktuelles Suchmuster"
 
-#: src/files.c:50
+#: src/color.c:186
+#, fuzzy, c-format
+msgid "Unknown syntax name: %s"
+msgstr "Fehlender Syntaxname"
+
+#: src/color.c:247
+#, c-format
+msgid "magic_load() failed: %s"
+msgstr ""
+
+#: src/color.c:251
+#, c-format
+msgid "magic_file(%s) failed: %s"
+msgstr ""
+
+#: src/files.c:47
 #, c-format
 msgid "Directory '%s' does not exist"
 msgstr "Verzeichnis „%s“ existiert nicht"
 
-#: src/files.c:52
+#: src/files.c:49
 #, c-format
 msgid "Path '%s': %s"
 msgstr "Pfad „%s“: %s"
 
-#: src/files.c:54
+#: src/files.c:51
 #, c-format
 msgid "Path '%s' is not a directory"
 msgstr "Pfad „%s“ ist kein Verzeichnis"
 
-#: src/files.c:57
+#: src/files.c:53
 #, c-format
 msgid "Path '%s' is not accessible"
 msgstr "Auf Pfad „%s“ kann nicht zugegriffen werden"
 
-#. TRANSLATORS: Try to keep this at most 76 characters.
-#: src/files.c:158
+#. TRANSLATORS: Keep the next ten messages at most 76 characters.
+#: src/files.c:148
 msgid ""
 "Warning: Modifying a file which is not locked, check directory permission?"
 msgstr ""
 "Warnung: Datei wird geändert, die nicht gesperrt ist, Verzeichnis-Rechte "
 "prüfen?"
 
-#: src/files.c:197
+#: src/files.c:187
 msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
 msgstr ""
 "Identität für die Sperrdatei konnte nicht bestimmt werden (getpwuid() "
 "fehlgeschlagen)"
 
-#: src/files.c:206
+#: src/files.c:196
 #, c-format
 msgid "Couldn't determine hostname for lock file: %s"
 msgstr "Rechnername für Sperrdatei konnte nicht bestimmt werden: %s"
 
-#: src/files.c:227 src/files.c:238 src/files.c:275 src/files.c:285
+#: src/files.c:216 src/files.c:225 src/files.c:262 src/files.c:272
 #, c-format
 msgid "Error writing lock file %s: %s"
 msgstr "Fehler beim Schreiben der Sperrdatei %s: %s"
 
-#: src/files.c:305
+#: src/files.c:291
 #, c-format
 msgid "Error deleting lock file %s: %s"
 msgstr "Fehler beim Löschen der Sperrdatei %s: %s"
 
-#: src/files.c:341
+#: src/files.c:325
 #, c-format
 msgid "Error opening lock file %s: %s"
 msgstr "Fehler beim Öffnen der Sperrdatei %s: %s"
 
-#: src/files.c:353
+#: src/files.c:337
 #, c-format
 msgid "Error reading lock file %s: Not enough data read"
 msgstr "Fehler beim Lesen der Sperrdatei %s: Nicht genügend Daten gelesen"
 
 #. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
-#: src/files.c:371
+#: src/files.c:354
 #, c-format
 msgid "File %s is being edited (by %s with %s, PID %d); continue?"
 msgstr "Datei %s wird bearbeitet (von %s mit %s, Prozess-ID %d); fortsetzen?"
 
-#: src/files.c:426
+#: src/files.c:430
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Datei kann außerhalb von %s nicht eingefügt werden"
 
-#: src/files.c:439 src/files.c:1038 src/rcfile.c:589 src/rcfile.c:1385
-#: src/rcfile.c:1426
+#: src/files.c:445 src/files.c:991 src/rcfile.c:533 src/rcfile.c:1230
+#: src/rcfile.c:1271
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "„%s“ ist ein Verzeichnis"
 
-#: src/files.c:441
+#: src/files.c:447
 #, c-format
 msgid "\"%s\" is not a normal file"
 msgstr "„%s“ ist keine normale Datei"
 
-#: src/files.c:566
+#: src/files.c:571
 msgid "No more open file buffers"
 msgstr "Keine weiteren offenen Dateipuffer"
 
-#: src/files.c:582
+#: src/files.c:586
 #, c-format
 msgid "Switched to %s"
 msgstr "Umgeschaltet zu %s"
 
-#: src/files.c:584 src/global.c:988 src/winio.c:2010
+#: src/files.c:588 src/global.c:1005 src/winio.c:1965
 msgid "New Buffer"
 msgstr "Neuer Puffer"
 
-#: src/files.c:943
+#. TRANSLATORS: Keep the next four messages at most 76 characters.
+#: src/files.c:913
 #, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
 msgstr[0] "%lu Zeile gelesen (aus DOS- und Mac-Format konvertiert)"
 msgstr[1] "%lu Zeilen gelesen (aus DOS- und Mac-Format konvertiert)"
 
-#: src/files.c:948
-#, c-format
-msgid ""
-"Read %lu line (Converted from DOS and Mac format - Warning: No write "
-"permission)"
-msgid_plural ""
-"Read %lu lines (Converted from DOS and Mac format - Warning: No write "
-"permission)"
-msgstr[0] ""
-"%lu Zeile gelesen (aus DOS- und Mac-Format konvertiert – Warnung: Kein "
-"Schreibrecht)"
-msgstr[1] ""
-"%lu Zeilen gelesen (aus DOS- und Mac-Format konvertiert – Warnung: Kein "
-"Schreibrecht)"
-
-#: src/files.c:954
+#: src/files.c:919
 #, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
 msgstr[0] "%lu Zeile gelesen (aus Mac-Format konvertiert)"
 msgstr[1] "%lu Zeilen gelesen (aus Mac-Format konvertiert)"
 
-#: src/files.c:958
-#, c-format
-msgid ""
-"Read %lu line (Converted from Mac format - Warning: No write permission)"
-msgid_plural ""
-"Read %lu lines (Converted from Mac format - Warning: No write permission)"
-msgstr[0] ""
-"%lu Zeile gelesen (aus Mac-Format konvertiert – Warnung: Kein Schreibrecht)"
-msgstr[1] ""
-"%lu Zeilen gelesen (aus Mac-Format konvertiert – Warnung: Kein Schreibrecht)"
-
-#: src/files.c:964
+#: src/files.c:925
 #, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
 msgstr[0] "%lu Zeile gelesen (aus DOS-Format konvertiert)"
 msgstr[1] "%lu Zeilen gelesen (aus DOS-Format konvertiert)"
 
-#: src/files.c:968
-#, c-format
-msgid ""
-"Read %lu line (Converted from DOS format - Warning: No write permission)"
-msgid_plural ""
-"Read %lu lines (Converted from DOS format - Warning: No write permission)"
-msgstr[0] ""
-"%lu Zeile gelesen (aus DOS-Format konvertiert – Warnung: Kein Schreibrecht)"
-msgstr[1] ""
-"%lu Zeilen gelesen (aus DOS-Format konvertiert – Warnung: Kein Schreibrecht)"
-
-#: src/files.c:974
+#: src/files.c:930
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "%lu Zeile gelesen"
 msgstr[1] "%lu Zeilen gelesen"
 
-#: src/files.c:977
-#, c-format
-msgid "Read %lu line (Warning: No write permission)"
-msgid_plural "Read %lu lines (Warning: No write permission)"
-msgstr[0] "%lu Zeile gelesen (Warnung: Kein Schreibrecht)"
-msgstr[1] "%lu Zeilen gelesen (Warnung: Kein Schreibrecht)"
-
-#: src/files.c:1019 src/files.c:1056
+#: src/files.c:974 src/files.c:1006
 msgid "Reading File"
 msgstr "Datei wird gelesen"
 
-#: src/files.c:1025
+#: src/files.c:980
 msgid "New File"
 msgstr "Neue Datei"
 
-#: src/files.c:1028
-#, c-format
-msgid "\"%s\" not found"
+#: src/files.c:983
+#, fuzzy, c-format
+msgid "File \"%s\" not found"
 msgstr "„%s“ nicht gefunden"
 
-#: src/files.c:1039 src/rcfile.c:590 src/rcfile.c:1386 src/rcfile.c:1427
+#: src/files.c:992 src/rcfile.c:534 src/rcfile.c:1231 src/rcfile.c:1272
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "„%s“ ist eine Gerätedatei"
 
-#: src/files.c:1133
+#: src/files.c:1083
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "In neuem Puffer auszuführender Befehl [von %s] "
 
-#: src/files.c:1135
+#: src/files.c:1085
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Auszuführender Befehl [von %s] "
 
-#: src/files.c:1142
+#: src/files.c:1092
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "In neuen Puffer einzufügende Datei [von %s] "
 
-#: src/files.c:1144
+#: src/files.c:1094
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Einzufügende Datei [von %s] "
 
-#: src/files.c:1389
+#: src/files.c:1338
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Taste unzulässig, wenn nicht im Multibuffer-Modus"
 
-#: src/files.c:1684
-msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+#: src/files.c:1632
+#, fuzzy
+msgid "Failed to write backup file; continue saving? (Say N if unsure.) "
 msgstr ""
 "Sicherungsdatei konnte nicht geschrieben werden, weiter speichern? (N wenn "
 "unsicher)"
 
-#: src/files.c:1800
+#: src/files.c:1750
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Außerhalb von %s kann nicht geschrieben werden."
 
-#: src/files.c:1885 src/files.c:1910 src/files.c:1928 src/files.c:1941
-#: src/files.c:1952 src/files.c:1981
+#: src/files.c:1833 src/files.c:1858 src/files.c:1876 src/files.c:1889
+#: src/files.c:1900 src/files.c:1928
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Fehler beim Schreiben der Sicherungsdatei %s: %s"
 
-#: src/files.c:1886 src/nano.c:690
+#: src/files.c:1834 src/nano.c:692
 msgid "Too many backup files?"
 msgstr "Zu viele Sicherungsdateien?"
 
-#: src/files.c:2026 src/text.c:2863 src/text.c:2875 src/text.c:3244
-#: src/text.c:3253
+#: src/files.c:1972 src/text.c:3117 src/text.c:3129 src/text.c:3498
+#: src/text.c:3507
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Fehler beim Schreiben der temporären Datei: %s"
 
-#: src/files.c:2049 src/files.c:2068 src/files.c:2080 src/files.c:2104
-#: src/files.c:2121 src/files.c:2131 src/files.c:2164 src/files.c:2171
+#: src/files.c:1994 src/files.c:2013 src/files.c:2023 src/files.c:2047
+#: src/files.c:2064 src/files.c:2074 src/files.c:2106 src/files.c:2113
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Fehler beim Schreiben von %s: %s"
 
-#: src/files.c:2200
+#: src/files.c:2154
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "%lu Zeile geschrieben"
 msgstr[1] "%lu Zeilen geschrieben"
 
-#: src/files.c:2299
+#: src/files.c:2249
 msgid " [DOS Format]"
 msgstr " [DOS-Format]"
 
-#: src/files.c:2300
+#: src/files.c:2250
 msgid " [Mac Format]"
 msgstr " [Mac-Format]"
 
-#: src/files.c:2302
+#: src/files.c:2252
 msgid " [Backup]"
 msgstr " [Sicherungsdatei]"
 
-#: src/files.c:2309
+#: src/files.c:2259
 msgid "Prepend Selection to File"
 msgstr "Auswahl vorne an Datei anfügen"
 
-#: src/files.c:2310
+#: src/files.c:2260
 msgid "Append Selection to File"
 msgstr "Auswahl an Datei anhängen"
 
-#: src/files.c:2311
+#: src/files.c:2261
 msgid "Write Selection to File"
 msgstr "Auswahl in Datei schreiben"
 
-#: src/files.c:2314
+#: src/files.c:2264
 msgid "File Name to Prepend to"
 msgstr "Dateiname zum vorn Anfügen"
 
-#: src/files.c:2315
+#: src/files.c:2265
 msgid "File Name to Append to"
 msgstr "Dateiname zum Anhängen"
 
-#: src/files.c:2316
+#: src/files.c:2266
 msgid "File Name to Write"
 msgstr "Dateiname zum Speichern"
 
-#: src/files.c:2349
-msgid "Save modified buffer anyway ? "
+#: src/files.c:2301
+#, fuzzy
+msgid "Save modified buffer anyway? "
 msgstr "Geänderten Puffer trotzdem speichern? "
 
-#: src/files.c:2457
-msgid "File exists, OVERWRITE ? "
-msgstr "Datei exisitiert, ÃœBERSCHREIBEN? "
-
-#: src/files.c:2466
-msgid "Save file under DIFFERENT NAME ? "
+#: src/files.c:2412
+#, fuzzy
+msgid "Save file under DIFFERENT NAME? "
 msgstr "Datei unter einem ANDEREN NAMEN speichern? "
 
-#: src/files.c:2480
-msgid "File was modified since you opened it, continue saving ? "
+#: src/files.c:2420
+#, fuzzy, c-format
+msgid "File \"%s\" exists; OVERWRITE? "
+msgstr "Datei exisitiert, ÃœBERSCHREIBEN? "
+
+#: src/files.c:2441
+#, fuzzy
+msgid "File was modified since you opened it; continue saving? "
 msgstr "Datei wurde seit dem Öffnen geändert, dennoch speichern? "
 
-#: src/files.c:2917
+#: src/files.c:2874
 msgid "(more)"
 msgstr "(mehr)"
 
-#: src/files.c:3004
+#: src/files.c:2959
 #, c-format
 msgid ""
 "\n"
@@ -397,7 +376,7 @@ msgstr ""
 "\n"
 "Drücken Sie die Eingabetaste zum Fortfahren\n"
 
-#: src/files.c:3020
+#: src/files.c:2975
 #, c-format
 msgid ""
 "Unable to create directory %s: %s\n"
@@ -407,7 +386,7 @@ msgstr ""
 "Es wird benötigt, um Suchverlauf und Cursorposition zu speichern und zu "
 "laden.\n"
 
-#: src/files.c:3026
+#: src/files.c:2982
 #, c-format
 msgid ""
 "Path %s is not a directory and needs to be.\n"
@@ -416,7 +395,7 @@ msgstr ""
 "Pfad %s ist kein Verzeichnis, obwohl er eines sein muss.\n"
 "Nano wird Suchverlauf und Cursorposition nicht laden oder speichern können.\n"
 
-#: src/files.c:3045
+#: src/files.c:3002
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I tried to move\n"
@@ -426,7 +405,7 @@ msgstr ""
 "versucht, diese an die neue bevorzugte Stelle (%s) zu schieben,\n"
 "was aber Fehler verursachte: %s"
 
-#: src/files.c:3049
+#: src/files.c:3006
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I moved\n"
@@ -437,723 +416,754 @@ msgstr ""
 "an die neue bevorzugte Stelle (%s) verschoben.\n"
 "(siehe die Nano-FAQ bezüglich dieser Änderung)"
 
-#: src/files.c:3132 src/files.c:3140 src/files.c:3164 src/files.c:3176
+#: src/files.c:3089 src/files.c:3097 src/files.c:3121 src/files.c:3133
 #, c-format
 msgid "Error writing %s: %s\n"
 msgstr "Fehler beim Schreiben von %s: %s\n"
 
 #. TRANSLATORS: Try to keep the next fifteen strings at most 10 characters.
-#: src/global.c:480
+#: src/global.c:483
 msgid "Exit"
 msgstr "Beenden"
 
-#: src/global.c:481
+#: src/global.c:484
 msgid "Close"
 msgstr "Schließen"
 
-#: src/global.c:482
+#: src/global.c:485
 msgid "Uncut Text"
 msgstr "Ausschn. r"
 
-#: src/global.c:484
+#: src/global.c:487
 msgid "Unjustify"
 msgstr "Ausr.rückgängig"
 
-#: src/global.c:490
+#: src/global.c:493
 msgid "Read File"
 msgstr "Datei öffnen"
 
-#: src/global.c:491
+#: src/global.c:494
 msgid "Where Is"
 msgstr "Wo ist"
 
-#: src/global.c:492
+#: src/global.c:495
 msgid "Replace"
 msgstr "Ersetzen"
 
-#: src/global.c:493
+#: src/global.c:496
 msgid "Go To Line"
 msgstr "Zu Zeile"
 
-#: src/global.c:494
+#: src/global.c:497
 msgid "Prev Line"
 msgstr "Zeile zurück"
 
-#: src/global.c:495
+#: src/global.c:498
 msgid "Next Line"
 msgstr "Zeile vor"
 
-#: src/global.c:496
+#: src/global.c:499
 msgid "Prev Page"
 msgstr "Seite zurück"
 
-#: src/global.c:497
+#: src/global.c:500
 msgid "Next Page"
 msgstr "Seite vor"
 
-#: src/global.c:499
+#: src/global.c:502
 msgid "Justify"
 msgstr "Ausrichten"
 
-#: src/global.c:500
+#: src/global.c:503
 msgid "FullJstify"
 msgstr "Kompl. Ausr."
 
-#: src/global.c:502
+#: src/global.c:505
 msgid "Refresh"
 msgstr "Auffrischen"
 
 #. TRANSLATORS: Try to keep this string at most 12 characters.
-#: src/global.c:505
+#: src/global.c:508
 msgid "WhereIs Next"
 msgstr "Wo ist nächstes"
 
 #. TRANSLATORS: The next long series of strings are shortcut descriptions;
 #. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:512
+#: src/global.c:515
 msgid "Justify the current paragraph"
 msgstr "Absatz ausrichten"
 
-#: src/global.c:514
+#: src/global.c:517
 msgid "Cancel the current function"
 msgstr "Funktion abbrechen"
 
-#: src/global.c:515
+#: src/global.c:518
 msgid "Display this help text"
 msgstr "Diese Hilfe anzeigen"
 
-#: src/global.c:518
+#: src/global.c:521
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Aktuellen Dateipuffer schließen / Nano beenden"
 
-#: src/global.c:520
+#: src/global.c:523
 msgid "Exit from nano"
 msgstr "Nano beenden"
 
-#: src/global.c:524
+#: src/global.c:527
 msgid "Write the current file to disk"
 msgstr "Datei speichern"
 
-#: src/global.c:526
+#: src/global.c:529
 msgid "Insert another file into the current one"
 msgstr "Weitere Datei in die aktuelle Datei einfügen"
 
-#: src/global.c:528
+#: src/global.c:531
 msgid "Search for a string or a regular expression"
 msgstr "Nach einer Zeichenkette oder einem regulären Ausdruck suchen"
 
-#: src/global.c:531
+#: src/global.c:533
 msgid "Search for a string"
 msgstr "Nach einer Zeichenkette suchen"
 
-#: src/global.c:533
+#: src/global.c:534
+msgid "Refresh the file list"
+msgstr ""
+
+#: src/global.c:535
+#, fuzzy
+msgid "Go to lefthand column"
+msgstr "Zu einer bestimmten Zeile und Spalte springen"
+
+#: src/global.c:536
+#, fuzzy
+msgid "Go to righthand column"
+msgstr "Zu einer bestimmten Zeile und Spalte springen"
+
+#: src/global.c:538
 msgid "Go one screenful up"
 msgstr "Eine Bildschirmseite hoch gehen"
 
-#: src/global.c:534
+#: src/global.c:539
 msgid "Go one screenful down"
 msgstr "Eine Bildschirmseite runter gehen"
 
-#: src/global.c:536
+#: src/global.c:541
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Die aktuelle Zeile ausschneiden und in der Zwischenablage speichern"
 
-#: src/global.c:538
+#: src/global.c:543
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Aus der Zwischenablage einfügen"
 
-#: src/global.c:539
+#: src/global.c:544
 msgid "Display the position of the cursor"
 msgstr "Die aktuelle Cursorposition anzeigen"
 
-#: src/global.c:541
+#: src/global.c:546
 msgid "Invoke the spell checker, if available"
 msgstr "Rechtschreibprüfung aufrufen (wenn verfügbar)"
 
-#: src/global.c:543
+#: src/global.c:548
 msgid "Replace a string or a regular expression"
 msgstr "Eine Zeichenkette oder einen regulären Ausdruck ersetzen"
 
-#: src/global.c:544
+#: src/global.c:549
 msgid "Go to line and column number"
 msgstr "Zu einer bestimmten Zeile und Spalte springen"
 
-#: src/global.c:546
+#: src/global.c:551
 msgid "Mark text starting from the cursor position"
 msgstr "Text beginnend an Cursorposition markieren"
 
-#: src/global.c:547
+#: src/global.c:552
 msgid "Repeat the last search"
 msgstr "Die letzte Suche wiederholen"
 
-#: src/global.c:549
+#: src/global.c:554
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "Die aktuelle Zeile kopieren und in der Zwischenablage speichern"
 
-#: src/global.c:550
+#: src/global.c:555
 msgid "Indent the current line"
 msgstr "Die aktuelle Zeile einrücken"
 
-#: src/global.c:551
+#: src/global.c:556
 msgid "Unindent the current line"
 msgstr "Die aktuelle Zeile ausrücken"
 
-#: src/global.c:552
+#: src/global.c:558
+msgid "Comment/uncomment the current line or marked lines"
+msgstr ""
+
+#: src/global.c:560
 msgid "Undo the last operation"
 msgstr "Letzte Operation rückgängig machen"
 
-#: src/global.c:553
+#: src/global.c:561
 msgid "Redo the last undone operation"
 msgstr "Rückgängig gemachte Operation wiederholen"
 
-#: src/global.c:555
+#: src/global.c:563
 msgid "Go back one character"
 msgstr "Ein Zeichen rückwärts gehen"
 
-#: src/global.c:556
+#: src/global.c:564
 msgid "Go forward one character"
 msgstr "Ein Zeichen vorwärts gehen"
 
-#: src/global.c:558
+#: src/global.c:566
 msgid "Go back one word"
 msgstr "Ein Wort rückwärts gehen"
 
-#: src/global.c:559
+#: src/global.c:567
 msgid "Go forward one word"
 msgstr "Ein Wort vorwärts gehen"
 
-#: src/global.c:561
+#: src/global.c:569
 msgid "Go to previous line"
 msgstr "Zur vorhergehenden Zeile gehen"
 
-#: src/global.c:562
+#: src/global.c:570
 msgid "Go to next line"
 msgstr "Zur folgenden Zeile gehen"
 
-#: src/global.c:563
+#: src/global.c:571
 msgid "Go to beginning of current line"
 msgstr "Zum Anfang der aktuellen Zeile springen"
 
-#: src/global.c:564
+#: src/global.c:572
 msgid "Go to end of current line"
 msgstr "Zum Ende der aktuellen Zeile springen"
 
-#: src/global.c:567
+#: src/global.c:575
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "Zum Anfang des aktuellen Absatzes springen; dann des vorigen Absatzes"
 
-#: src/global.c:569
+#: src/global.c:577
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr ""
 "Hinter das Ende des aktuellen Absatzes springen; dann des vorigen Absatzes"
 
-#: src/global.c:571
+#: src/global.c:579
 msgid "Go to the first line of the file"
 msgstr "Zur ersten Zeile der Datei springen"
 
-#: src/global.c:572
+#: src/global.c:580
 msgid "Go to the last line of the file"
 msgstr "Zur letzten Zeile der Datei springen"
 
-#: src/global.c:574
+#: src/global.c:582
 msgid "Go to the matching bracket"
 msgstr "Zur passenden Klammer springen"
 
-#: src/global.c:576
+#: src/global.c:584
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "Eine Zeile hochrollen, ohne den Cursor zu bewegen"
 
-#: src/global.c:578
+#: src/global.c:586
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "Eine Zeile hinunterrollen, ohne den Cursor zu bewegen"
 
-#: src/global.c:581
+#: src/global.c:589
 msgid "Switch to the previous file buffer"
 msgstr "Zum vorhergehenden Dateipuffer umschalten"
 
-#: src/global.c:582
+#: src/global.c:590
 msgid "Switch to the next file buffer"
 msgstr "Zum folgenden Dateipuffer umschalten"
 
-#: src/global.c:584
+#: src/global.c:592
 msgid "Insert the next keystroke verbatim"
 msgstr "Nächstes Zeichen direkt (nicht interpretiert) einfügen"
 
-#: src/global.c:585
+#: src/global.c:593
 msgid "Insert a tab at the cursor position"
 msgstr "Einen Tabulator an der Cursorposition einfügen"
 
-#: src/global.c:586
+#: src/global.c:594
 msgid "Insert a newline at the cursor position"
 msgstr "Einen Zeilenumbruch an der Cursorposition einfügen"
 
-#: src/global.c:587
+#: src/global.c:595
 msgid "Delete the character under the cursor"
 msgstr "Zeichen an der Cursorposition löschen"
 
-#: src/global.c:589
+#: src/global.c:597
 msgid "Delete the character to the left of the cursor"
 msgstr "Zeichen links vom Cursor löschen"
 
-#: src/global.c:592
+#: src/global.c:600
 msgid "Cut backward from cursor to word start"
 msgstr "Vom Cursor bis zum Beginn des Wortes ausschneiden"
 
-#: src/global.c:594
+#: src/global.c:602
 msgid "Cut forward from cursor to next word start"
 msgstr "Vom Cursor bis zum Beginn des nächsten Wortes ausschneiden"
 
-#: src/global.c:596
+#: src/global.c:604
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Vom Cursor bis zum Dateiende ausschneiden"
 
-#: src/global.c:599
+#: src/global.c:607
 msgid "Justify the entire file"
 msgstr "Die gesamte Datei ausrichten"
 
-#: src/global.c:603
+#: src/global.c:611
 msgid "Count the number of words, lines, and characters"
 msgstr "Die Wörter, Zeilen und Zeichen zählen"
 
-#: src/global.c:606
+#: src/global.c:614
 msgid "Refresh (redraw) the current screen"
 msgstr "Bildschirm auffrischen (neu zeichnen)"
 
-#: src/global.c:608
+#: src/global.c:616
 msgid "Suspend the editor (if suspension is enabled)"
 msgstr ""
 "Den Editor in den Hintergrund schieben (wenn „suspend“ angeschaltet ist)"
 
-#: src/global.c:610
+#: src/global.c:618
 msgid "Save file without prompting"
 msgstr "Datei ohne Nachfrage speichern"
 
-#: src/global.c:611
+#: src/global.c:619
 msgid "Search next occurrence backward"
 msgstr "Nächstes Vorkommen rückwärts suchen"
 
-#: src/global.c:612
+#: src/global.c:620
 msgid "Search next occurrence forward"
 msgstr "Nächstes Vorkommen vorwärts suchen"
 
-#: src/global.c:614
+#: src/global.c:622
 msgid "Toggle the case sensitivity of the search"
 msgstr "Unterscheidung von Groß- und Kleinschreibung bei Suche umschalten"
 
-#: src/global.c:616
+#: src/global.c:624
 msgid "Reverse the direction of the search"
 msgstr "Die Richtung der Suche umkehren"
 
-#: src/global.c:620
+#: src/global.c:628
 msgid "Toggle the use of regular expressions"
 msgstr "Benutzung regulärer Ausdrücke umschalten"
 
-#: src/global.c:624
+#: src/global.c:632
 msgid "Recall the previous search/replace string"
 msgstr "Den vorhergehenden Suchen-/Ersetzen-Begriff hervorholen"
 
-#: src/global.c:626
+#: src/global.c:634
 msgid "Recall the next search/replace string"
 msgstr "Den nächsten Suchen-/Ersetzen-Begriff hervorholen"
 
-#: src/global.c:629
+#: src/global.c:637
 msgid "Go to file browser"
 msgstr "Zum Dateibrowser gehen"
 
-#: src/global.c:632
+#: src/global.c:640
 msgid "Toggle the use of DOS format"
 msgstr "Schreiben im DOS-Format umschalten"
 
-#: src/global.c:633
+#: src/global.c:641
 msgid "Toggle the use of Mac format"
 msgstr "Schreiben im Mac-Format umschalten"
 
-#: src/global.c:634
+#: src/global.c:642
 msgid "Toggle appending"
 msgstr "Anhängen umschalten"
 
-#: src/global.c:635
+#: src/global.c:643
 msgid "Toggle prepending"
 msgstr "Vorn Anfügen umschalten"
 
-#: src/global.c:636
+#: src/global.c:644
 msgid "Toggle backing up of the original file"
 msgstr "Sicherung existierender Dateien beim Speichern umschalten"
 
-#: src/global.c:637
+#: src/global.c:645
 msgid "Execute external command"
 msgstr "Externen Befehl ausführen"
 
-#: src/global.c:639
+#: src/global.c:647
 msgid "Close buffer without saving it"
 msgstr "Puffer schließen, ohne zu speichern"
 
-#: src/global.c:641
+#: src/global.c:649
 msgid "Toggle the use of a new buffer"
 msgstr "Benutzung eines neuen Puffers umschalten"
 
-#: src/global.c:644
+#: src/global.c:652
 msgid "Exit from the file browser"
 msgstr "Den Dateibrowser beenden"
 
-#: src/global.c:645
+#: src/global.c:653
 msgid "Go to the first file in the list"
 msgstr "Zur ersten Datei der Liste springen"
 
-#: src/global.c:646
+#: src/global.c:654
 msgid "Go to the last file in the list"
 msgstr "Zur letzten Datei der Liste springen"
 
-#: src/global.c:647
+#: src/global.c:655
 msgid "Go to the previous file in the list"
 msgstr "Zur vorigen Datei der Liste springen"
 
-#: src/global.c:648
+#: src/global.c:656
 msgid "Go to the next file in the list"
 msgstr "Zur nächsten Datei der Liste springen"
 
-#: src/global.c:649
+#: src/global.c:657
 msgid "Go to directory"
 msgstr "Zu Verzeichnis gehen"
 
-#: src/global.c:652
+#: src/global.c:660
 msgid "Invoke the linter, if available"
 msgstr "Den Linter aufrufen (wenn verfügbar)"
 
-#: src/global.c:653
+#: src/global.c:661
 msgid "Go to previous linter msg"
 msgstr "Zur vorhergehenden Linter-Meldung gehen"
 
-#: src/global.c:654
+#: src/global.c:662
 msgid "Go to next linter msg"
 msgstr "Zur nächsten Linter-Meldung gehen"
 
-#: src/global.c:656
+#: src/global.c:664
 msgid "Invoke formatter, if available"
 msgstr "Den Formatierer aufrufen (wenn verfügbar)"
 
 #. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:671
+#: src/global.c:679
 msgid "Get Help"
 msgstr "Hilfe"
 
-#: src/global.c:674 src/prompt.c:858
+#: src/global.c:682 src/prompt.c:855
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: src/global.c:687
+#: src/global.c:695
 msgid "Write Out"
 msgstr "Speichern"
 
-#: src/global.c:723
+#: src/global.c:731
 msgid "Go To Dir"
 msgstr "Gehe zu Verz."
 
-#: src/global.c:738
+#: src/global.c:746
 msgid "Cut Text"
 msgstr "Ausschneiden"
 
-#: src/global.c:753
+#: src/global.c:761
 msgid "To Spell"
 msgstr "Rechtschr."
 
-#: src/global.c:757
+#: src/global.c:765
 msgid "To Linter"
 msgstr "Zum Linter"
 
-#: src/global.c:760
+#: src/global.c:768
 msgid "Formatter"
 msgstr "Formatierer"
 
-#: src/global.c:767
+#: src/global.c:775
 msgid "Case Sens"
 msgstr "GROSS/klein"
 
-#: src/global.c:772
+#: src/global.c:780
 msgid "Regexp"
 msgstr "Reg. Ausdruck"
 
-#: src/global.c:777
+#: src/global.c:785
 msgid "Backwards"
 msgstr "Rückwärts"
 
-#: src/global.c:784
+#: src/global.c:792
 msgid "No Replace"
 msgstr "Keine Ersetzung"
 
-#: src/global.c:792
+#: src/global.c:800
 msgid "Cur Pos"
 msgstr "Cursor"
 
-#: src/global.c:807
+#: src/global.c:815
 msgid "First Line"
 msgstr "Erste Zeile"
 
-#: src/global.c:809
+#: src/global.c:817
 msgid "Last Line"
 msgstr "Letzte Zeile"
 
-#: src/global.c:816
+#: src/global.c:824
 msgid "To Bracket"
 msgstr "Zu Klammer"
 
-#: src/global.c:819
+#: src/global.c:827
 msgid "Mark Text"
 msgstr "Text markieren"
 
-#: src/global.c:822
+#: src/global.c:830
 msgid "Copy Text"
 msgstr "Kopieren"
 
-#: src/global.c:825
+#: src/global.c:833
 msgid "Indent Text"
 msgstr "Einrücken"
 
-#: src/global.c:827
+#: src/global.c:835
 msgid "Unindent Text"
 msgstr "Ausrücken"
 
-#: src/global.c:830
+#: src/global.c:838
 msgid "Undo"
 msgstr "Rückgängig"
 
-#: src/global.c:832
+#: src/global.c:840
 msgid "Redo"
 msgstr "Wiederholen"
 
-#: src/global.c:836 src/global.c:842
+#: src/global.c:844 src/global.c:850
 msgid "Back"
 msgstr "Zurück"
 
-#: src/global.c:838 src/global.c:844
+#: src/global.c:846 src/global.c:852
 msgid "Forward"
 msgstr "Vorwärts"
 
-#: src/global.c:849
+#: src/global.c:857
 msgid "Prev Word"
 msgstr "Vorheriges Wort"
 
-#: src/global.c:851
+#: src/global.c:859
 msgid "Next Word"
 msgstr "Nächstes Wort"
 
-#: src/global.c:855
+#: src/global.c:863
 msgid "Home"
 msgstr "Pos 1"
 
-#: src/global.c:857
+#: src/global.c:865
 msgid "End"
 msgstr "Ende"
 
-#: src/global.c:866
+#: src/global.c:874
 msgid "Beg of Par"
 msgstr "Anf des Abs."
 
-#: src/global.c:868
+#: src/global.c:876
 msgid "End of Par"
 msgstr "Ende des Abs."
 
-#: src/global.c:873
+#: src/global.c:881
 msgid "Scroll Up"
 msgstr "Hochrollen"
 
-#: src/global.c:875
+#: src/global.c:883
 msgid "Scroll Down"
 msgstr "Herunterrollen"
 
-#: src/global.c:880
+#: src/global.c:888
 msgid "Prev File"
 msgstr "Vorh. Datei"
 
-#: src/global.c:882
+#: src/global.c:890
 msgid "Next File"
 msgstr "Nächste Datei"
 
-#: src/global.c:891
+#: src/global.c:899
 msgid "Verbatim"
 msgstr "Direkt"
 
-#: src/global.c:894
+#: src/global.c:902
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:896
+#: src/global.c:904
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:899
+#: src/global.c:907
 msgid "Delete"
 msgstr "Löschen"
 
-#: src/global.c:901
+#: src/global.c:909
 msgid "Backspace"
 msgstr "Rücktaste"
 
 #. TRANSLATORS: The next two strings refer to cutting words.
-#: src/global.c:912
+#: src/global.c:920
 msgid "Cut Left"
 msgstr "Links ausschneiden"
 
-#: src/global.c:914
+#: src/global.c:922
 msgid "Cut Right"
 msgstr "Rechts ausschneiden"
 
-#: src/global.c:916
+#: src/global.c:924
 msgid "CutTillEnd"
 msgstr "AusschnBisEnde"
 
-#: src/global.c:926
+#: src/global.c:934
 msgid "Word Count"
 msgstr "Wortanzahl"
 
-#: src/global.c:933
+#: src/global.c:941
 msgid "Suspend"
 msgstr "In den Hintergrund"
 
-#: src/global.c:937
+#: src/global.c:945
+#, fuzzy
+msgid "Comment Lines"
+msgstr "Zeile vor"
+
+#: src/global.c:949
 msgid "Save"
 msgstr "Speichern"
 
-#: src/global.c:940
+#: src/global.c:952
 msgid "Previous"
 msgstr "Vorige"
 
-#: src/global.c:942
+#: src/global.c:954
 msgid "Next"
 msgstr "Nächste"
 
-#: src/global.c:948
+#: src/global.c:960
 msgid "PrevHstory"
 msgstr "Verl. zurück"
 
-#: src/global.c:951
+#: src/global.c:963
 msgid "NextHstory"
 msgstr "Verlauf vor"
 
-#: src/global.c:955
+#: src/global.c:972
 msgid "Go To Text"
 msgstr "Zu Text"
 
-#: src/global.c:959
+#: src/global.c:976
 msgid "DOS Format"
 msgstr "DOS-Format"
 
-#: src/global.c:961
+#: src/global.c:978
 msgid "Mac Format"
 msgstr "Mac-Format"
 
-#: src/global.c:969
+#: src/global.c:986
 msgid "Append"
 msgstr "Anhängen"
 
-#: src/global.c:971
+#: src/global.c:988
 msgid "Prepend"
 msgstr "Vorn anfügen"
 
-#: src/global.c:974
+#: src/global.c:991
 msgid "Backup File"
 msgstr "Sicherungsdatei"
 
-#: src/global.c:981
+#: src/global.c:998
 msgid "Execute Command"
 msgstr "Befehl ausführen"
 
-#: src/global.c:996
+#: src/global.c:1013
 msgid "To Files"
 msgstr "In Dateien"
 
-#: src/global.c:1004
+#: src/global.c:1021
 msgid "First File"
 msgstr "Erste Datei"
 
-#: src/global.c:1006
+#: src/global.c:1023
 msgid "Last File"
 msgstr "Letzte Datei"
 
-#: src/global.c:1010
+#: src/global.c:1027
 msgid "Discard buffer"
 msgstr "Puffer verwerfen"
 
+#: src/global.c:1038
+msgid "Left Column"
+msgstr ""
+
+#: src/global.c:1040
+msgid "Right Column"
+msgstr ""
+
 #. TRANSLATORS: Try to keep the next two strings at most 20 characters.
-#: src/global.c:1020
+#: src/global.c:1047
 msgid "Prev Lint Msg"
 msgstr "Lintmld. zurück"
 
-#: src/global.c:1022
+#: src/global.c:1049
 msgid "Next Lint Msg"
 msgstr "Lintmld. vor"
 
 #. TRANSLATORS: The next seventeen strings are toggle descriptions;
 #. * they are best kept shorter than 40 characters, but may be longer.
-#: src/global.c:1285
+#: src/global.c:1316
 msgid "Help mode"
 msgstr "Hilfe-Modus"
 
-#: src/global.c:1287
+#: src/global.c:1318
 msgid "Constant cursor position display"
 msgstr "Cursorposition ständig anzeigen"
 
-#: src/global.c:1289
+#: src/global.c:1320
 msgid "Use of one more line for editing"
 msgstr "Verwendung einer Zeile mehr zum Editieren"
 
-#: src/global.c:1291
+#: src/global.c:1322
 msgid "Smooth scrolling"
 msgstr "Sanftes Rollen"
 
-#: src/global.c:1293
+#: src/global.c:1324
 msgid "Soft wrapping of overlong lines"
 msgstr "Überlange Zeilen fließend umbrechen"
 
-#: src/global.c:1295
+#: src/global.c:1326
 msgid "Whitespace display"
 msgstr "Leerzeichenanzeige"
 
-#: src/global.c:1297
+#: src/global.c:1328
 msgid "Color syntax highlighting"
 msgstr "Farbige Syntaxhervorhebung"
 
-#: src/global.c:1299
+#: src/global.c:1330
 msgid "Smart home key"
 msgstr "Intelligente Pos1-Taste"
 
-#: src/global.c:1301
+#: src/global.c:1332
 msgid "Auto indent"
 msgstr "Automatische Einrückung"
 
-#: src/global.c:1303
+#: src/global.c:1334
 msgid "Cut to end"
 msgstr "Bis Ende ausschneiden"
 
-#: src/global.c:1305
+#: src/global.c:1336
 msgid "Hard wrapping of overlong lines"
 msgstr "Ãœberlange Zeilen hart umbrechen"
 
-#: src/global.c:1307
+#: src/global.c:1338
 msgid "Conversion of typed tabs to spaces"
 msgstr "Umwandlungen eingegebener Tabulatoren in Leerzeichen"
 
-#: src/global.c:1309
+#: src/global.c:1340
 msgid "Backup files"
 msgstr "Sicherungsdateien"
 
-#: src/global.c:1311
+#: src/global.c:1342
 msgid "Reading file into separate buffer"
 msgstr "Datei wird in separaten Puffer eingelesen"
 
-#: src/global.c:1313
+#: src/global.c:1344
 msgid "Mouse support"
 msgstr "Mausunterstützung"
 
-#: src/global.c:1315
+#: src/global.c:1346
 msgid "No conversion from DOS/Mac format"
 msgstr "Keine Umwandlung aus DOS/Mac-Format"
 
-#: src/global.c:1317
+#: src/global.c:1348
 msgid "Suspension"
 msgstr "In den Hintergrund"
 
-#: src/help.c:209
+#: src/help.c:211
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1176,7 +1186,7 @@ msgstr ""
 "Aufforderung angezeigt. Drücken der Eingabetaste ohne Eingabe irgendwelchen "
 "Textes führt die vorhergehende Suche durch.  "
 
-#: src/help.c:218
+#: src/help.c:220
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1190,7 +1200,7 @@ msgstr ""
 " Die folgenden Funktionstasten sind im Suchmodus verfügbar:\n"
 "\n"
 
-#: src/help.c:224
+#: src/help.c:226
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1210,7 +1220,7 @@ msgstr ""
 " Die folgenden Funktionstasten sind im Zu-Zeile-Modus verfügbar:\n"
 "\n"
 
-#: src/help.c:233
+#: src/help.c:235
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1234,7 +1244,7 @@ msgstr ""
 "laden. (Benutzen Sie Meta-< und >, um zwischen den Dateipuffern "
 "umzuschalten.)  "
 
-#: src/help.c:242
+#: src/help.c:244
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1249,7 +1259,7 @@ msgstr ""
 " Die folgenden Funktionstasten sind im Datei-Einfügen-Modus verfügbar:\n"
 "\n"
 
-#: src/help.c:248
+#: src/help.c:250
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1278,7 +1288,7 @@ msgstr ""
 " Die folgenden Funktionstasten sind im Datei-Schreiben-Modus verfügbar:\n"
 "\n"
 
-#: src/help.c:262
+#: src/help.c:264
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1303,7 +1313,7 @@ msgstr ""
 " Die folgenden Funktionstasten sind im Dateibrowser verfügbar:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:277
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1327,7 +1337,7 @@ msgstr ""
 "Textes führt die vorhergehende Suche durch.\n"
 "\n"
 
-#: src/help.c:284
+#: src/help.c:286
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1336,7 +1346,7 @@ msgstr ""
 "verfügbar:\n"
 "\n"
 
-#: src/help.c:288
+#: src/help.c:290
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1360,7 +1370,7 @@ msgstr ""
 "Dateibrowsers verfügbar:\n"
 "\n"
 
-#: src/help.c:301
+#: src/help.c:303
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1384,7 +1394,7 @@ msgstr ""
 " Die folgenden Funktionstasten sind in der Rechtschreibprüfung verfügbar:\n"
 "\n"
 
-#: src/help.c:316
+#: src/help.c:318
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1405,7 +1415,7 @@ msgstr ""
 " Die folgenden Funktionstasten sind im Befehl-Ausführen-Modus verfügbar:\n"
 "\n"
 
-#: src/help.c:329
+#: src/help.c:331
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1425,15 +1435,15 @@ msgstr ""
 "Hauptfenster enthält die zu bearbeitende Datei.  Die Statuszeile (die dritte "
 "Zeile von unten) zeigt wichtige Meldungen.  "
 
-#: src/help.c:339
+#: src/help.c:341
+#, fuzzy
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
-" The notation for shortcuts is as follows: Control-key sequences are notated "
-"with a caret (^) symbol and can be entered either by using the Control "
-"(Ctrl) key or pressing the Escape (Esc) key twice.  Escape-key sequences are "
-"notated with the Meta (M-) symbol and can be entered using either the Esc, "
-"Alt, or Meta key depending on your keyboard setup.  "
+" Shortcuts are written as follows: Control-key sequences are notated with a "
+"'^' and can be entered either by using the Ctrl key or pressing the Esc key "
+"twice.  Meta-key sequences are notated with 'M-' and can be entered using "
+"either the Alt, Cmd, or Esc key, depending on your keyboard setup.  "
 msgstr ""
 "Die untersten zwei Zeilen listen die meistgebrauchten Tastenkombinationen "
 "von Nano auf.\n"
@@ -1462,19 +1472,19 @@ msgstr ""
 msgid "enable/disable"
 msgstr "aktivieren/deaktivieren"
 
-#: src/nano.c:559
+#: src/nano.c:560
 msgid "Key is invalid in view mode"
 msgstr "Taste unzulässig im Nur-Lese-Modus"
 
-#: src/nano.c:565
+#: src/nano.c:566
 msgid "This function is disabled in restricted mode"
 msgstr "Im eingeschränkten Modus ist diese Funktion deaktiviert."
 
-#: src/nano.c:573
+#: src/nano.c:574
 msgid "Help is not available"
 msgstr "Hilfe ist nicht verfügbar"
 
-#: src/nano.c:684
+#: src/nano.c:686
 #, c-format
 msgid ""
 "\n"
@@ -1483,7 +1493,7 @@ msgstr ""
 "\n"
 "Puffer in %s geschrieben\n"
 
-#: src/nano.c:686
+#: src/nano.c:688
 #, c-format
 msgid ""
 "\n"
@@ -1492,7 +1502,7 @@ msgstr ""
 "\n"
 "Puffer nicht in %s geschrieben: %s\n"
 
-#: src/nano.c:689
+#: src/nano.c:691
 #, c-format
 msgid ""
 "\n"
@@ -1754,17 +1764,22 @@ msgstr "Schieben in den Hintergrund (anhalten und zurück zur Shell) aktivieren"
 msgid "Enable soft line wrapping"
 msgstr "Fließenden Zeilenumbruch aktivieren"
 
-#: src/nano.c:937
-#, c-format
-msgid " GNU nano, version %s\n"
+#: src/nano.c:940
+#, fuzzy, c-format
+msgid " nano, version %s\n"
 msgstr " GNU Nano Version %s\n"
 
-#: src/nano.c:940
+#: src/nano.c:943
+#, c-format
+msgid " (C) 2014..%s the contributors to nano\n"
+msgstr ""
+
+#: src/nano.c:945
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr " Email: nano@nano-editor.org\tWWW: http://www.nano-editor.org/"
 
-#: src/nano.c:941
+#: src/nano.c:946
 #, c-format
 msgid ""
 "\n"
@@ -1773,69 +1788,84 @@ msgstr ""
 "\n"
 " Kompilierte Optionen:"
 
-#: src/nano.c:1073
+#: src/nano.c:1081
 msgid "No file name"
 msgstr "Kein Dateiname"
 
-#: src/nano.c:1108
-msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
-msgstr "Veränderten Puffer speichern („Nein“ VERWIRFT DIE ÄNDERUNGEN)? "
+#: src/nano.c:1115
+msgid "Save modified buffer?  (Answering \"No\" will DISCARD changes.) "
+msgstr ""
 
-#: src/nano.c:1168
+#: src/nano.c:1178
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr ""
 "Standardeingabe konnte leider nicht erneut mit der Tastatur geöffnet "
 "werden.\n"
 
-#: src/nano.c:1192
+#: src/nano.c:1202
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "Von Standardeingabe wird gelesen, ^C zum Abbrechen\n"
 
-#: src/nano.c:1256
+#: src/nano.c:1266
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "SIGHUP oder SIGTERM empfangen\n"
 
-#: src/nano.c:1272
+#: src/nano.c:1282
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Benutzen Sie „fg“, um zu Nano zurückzukehren.\n"
 
-#: src/nano.c:1294
+#: src/nano.c:1304
 msgid "Suspension is not enabled"
 msgstr "Suspend ist nicht aktiviert"
 
-#: src/nano.c:1448
+#: src/nano.c:1459
 msgid "enabled"
 msgstr "aktiviert"
 
-#: src/nano.c:1448
+#: src/nano.c:1459
 msgid "disabled"
 msgstr "deaktiviert"
 
-#: src/nano.c:1607 src/winio.c:1125
-msgid "Unknown Command"
-msgstr "Unbekannter Befehl"
+#: src/nano.c:1573
+msgid "Unbound key"
+msgstr ""
+
+#: src/nano.c:1577
+#, c-format
+msgid "Unbound key: M-%c"
+msgstr ""
+
+#: src/nano.c:1579
+#, c-format
+msgid "Unbound key: ^%c"
+msgstr ""
 
-#: src/nano.c:1720
+#: src/nano.c:1581
+#, c-format
+msgid "Unbound key: %c"
+msgstr ""
+
+#: src/nano.c:1745
 msgid "XON ignored, mumble mumble"
 msgstr "XON ignoriert, murmel murmel"
 
-#: src/nano.c:1725
+#: src/nano.c:1750
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF ignoriert, murmel murmel"
 
-#: src/nano.c:2139 src/rcfile.c:1334
+#: src/nano.c:2166 src/rcfile.c:1187
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Angeforderte Tabulatorbreite „%s“ ist ungültig."
 
-#: src/nano.c:2200 src/rcfile.c:1259
+#: src/nano.c:2227 src/rcfile.c:1128
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Angeforderte Füllgröße „%s“ ist ungültig."
 
-#: src/nano.c:2247
+#: src/nano.c:2276
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr "Benutzen Sie „%s -h“ für eine Liste verfügbarer Optionen.\n"
@@ -1843,115 +1873,119 @@ msgstr "Benutzen Sie „%s -h“ für eine Liste verfügbarer Optionen.\n"
 #. TRANSLATORS: For the next three strings, if possible, specify
 #. * the single-byte shortcuts for both your language and English.
 #. * For example, in French: "OoYy" for "Oui".
-#: src/prompt.c:821
+#: src/prompt.c:818
 msgid "Yy"
 msgstr "JjYy"
 
-#: src/prompt.c:822
+#: src/prompt.c:819
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:823
+#: src/prompt.c:820
 msgid "Aa"
 msgstr "Aa"
 
-#: src/prompt.c:845
+#: src/prompt.c:842
 msgid "Yes"
 msgstr "Ja"
 
-#: src/prompt.c:850
+#: src/prompt.c:847
 msgid "All"
 msgstr "Alle"
 
-#: src/prompt.c:855
+#: src/prompt.c:852
 msgid "No"
 msgstr "Nein"
 
-#: src/rcfile.c:142
+#: src/rcfile.c:144
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Fehler in %s in Zeile %lu: "
 
-#: src/rcfile.c:201
+#: src/rcfile.c:203
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "Argument „%s“ hat nicht beendetes \""
 
-#: src/rcfile.c:228 src/rcfile.c:280 src/rcfile.c:732 src/rcfile.c:793
-#: src/rcfile.c:882 src/rcfile.c:933
+#: src/rcfile.c:231 src/rcfile.c:674 src/rcfile.c:725 src/rcfile.c:824
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Zeichenketten für reguläre Ausdrücke müssen mit \" anfangen und enden"
 
-#: src/rcfile.c:254 src/search.c:62
+#: src/rcfile.c:257 src/search.c:61
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Ungültiger regulärer Ausdruck „%s“: %s"
 
-#: src/rcfile.c:274
+#: src/rcfile.c:279
 msgid "Missing syntax name"
 msgstr "Fehlender Syntaxname"
 
-#: src/rcfile.c:345
+#: src/rcfile.c:288
+msgid "A syntax name must be quoted"
+msgstr ""
+
+#: src/rcfile.c:297
 msgid "The \"none\" syntax is reserved"
 msgstr "Die Syntax „none“ ist reserviert"
 
-#: src/rcfile.c:352
-msgid "The \"default\" syntax must take no extensions"
+#: src/rcfile.c:327
+#, fuzzy
+msgid "The \"default\" syntax does not accept extensions"
 msgstr "Die Syntax „default“ darf keine Erweiterungen haben"
 
-#: src/rcfile.c:424
+#: src/rcfile.c:369
 msgid "Missing key name"
 msgstr "Fehlender Schlüsselname"
 
-#: src/rcfile.c:433 src/rcfile.c:444
+#: src/rcfile.c:378 src/rcfile.c:389
 msgid "Key name is too short"
 msgstr "Schlüsselname ist zu kurz"
 
-#: src/rcfile.c:454
+#: src/rcfile.c:399
 msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr "Schlüsselnamen müssen mit „^“, „M“ oder „F“ beginnen"
 
-#: src/rcfile.c:457
+#: src/rcfile.c:402
 #, c-format
 msgid "Key name %s is invalid"
 msgstr "Schlüsselname „%s“ ist ungültig"
 
-#: src/rcfile.c:466
+#: src/rcfile.c:411
 msgid "Must specify a function to bind the key to"
 msgstr "Die an die Taste zu bindende Funktion muss angegeben werden"
 
 #. TRANSLATORS: Do not translate the word "all".
-#: src/rcfile.c:476
+#: src/rcfile.c:421
 msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
 "Ein Menü (oder „all“) muss angegeben werden, um Tasten zu binden/zu lösen"
 
-#: src/rcfile.c:483
+#: src/rcfile.c:428
 #, c-format
 msgid "Cannot map name \"%s\" to a function"
 msgstr "„%s“ kann nicht auf eine Funktion gebunden werden"
 
-#: src/rcfile.c:490
+#: src/rcfile.c:435
 #, c-format
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "„%s“ kann nicht auf ein Menü gebunden werden"
 
-#: src/rcfile.c:522
+#: src/rcfile.c:467
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr "Funktion „%s“ existiert im Menü „%s“ nicht"
 
-#: src/rcfile.c:534
+#: src/rcfile.c:479
 #, c-format
 msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "Taste „%s“ kann leider nicht neu zugewiesen werden."
 
-#: src/rcfile.c:631
+#: src/rcfile.c:576
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr "Fehler beim Erweitern von %s: %s"
 
-#: src/rcfile.c:674
+#: src/rcfile.c:616
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1966,71 +2000,52 @@ msgstr ""
 "und „black“ (schwarz), mit dem optionalen Präfix „bright“ (hell)\n"
 "für Vordergrundfarben."
 
-#: src/rcfile.c:696
-msgid "Cannot add a color command without a syntax command"
+#: src/rcfile.c:637 src/rcfile.c:795 src/rcfile.c:858
+#, c-format
+msgid "A '%s' command requires a preceding 'syntax' command"
 msgstr ""
-"Farbdirektive kann nicht hinzugefügt werden, ohne einen Syntaxbefehl zu "
-"haben."
 
-#: src/rcfile.c:701
+#: src/rcfile.c:643
 msgid "Missing color name"
 msgstr "Fehlender Farbname"
 
-#: src/rcfile.c:711 src/rcfile.c:872
-msgid "Missing regex string"
-msgstr "Fehlender regulärer Ausdruck"
+#: src/rcfile.c:653 src/rcfile.c:807
+#, fuzzy, c-format
+msgid "Missing regex string after '%s' command"
+msgstr "Fehlender Linter-Name"
 
-#: src/rcfile.c:787
+#: src/rcfile.c:719
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "„start=“ erfordert ein entsprechendes „end=“"
 
-#: src/rcfile.c:839
+#: src/rcfile.c:768
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
 msgstr "Hintergrundfarbe „%s“ kann nicht hell („bright“) sein"
 
-#: src/rcfile.c:867
-msgid "Cannot add a header regex without a syntax command"
-msgstr ""
-"Regulärer Ausdruck für Header kann nicht hinzugefügt werden, ohne einen "
-"Syntaxbefehl zu haben."
-
-#: src/rcfile.c:922
-msgid "Cannot add a magic string regex without a syntax command"
-msgstr ""
-"Magischer regulärer Ausdruck kann nicht hinzugefügt werden, ohne einen "
-"Syntaxbefehl zu haben."
-
-#: src/rcfile.c:927
-msgid "Missing magic string name"
-msgstr "Fehlender Name für magische Zeichenkette"
-
-#: src/rcfile.c:985
-msgid "Cannot add a linter without a syntax command"
-msgstr ""
-"Linter kann nicht hinzugefügt werden, ohne einen Syntaxbefehl zu haben."
+#: src/rcfile.c:802
+#, fuzzy, c-format
+msgid "The \"default\" syntax does not accept '%s' regexes"
+msgstr "Die Syntax „default“ darf keine Erweiterungen haben"
 
-#: src/rcfile.c:990
-msgid "Missing linter command"
+#: src/rcfile.c:863
+#, fuzzy, c-format
+msgid "Missing command after '%s'"
 msgstr "Fehlender Linter-Name"
 
-#: src/rcfile.c:1011
-msgid "Cannot add formatter without a syntax command"
-msgstr ""
-"Formatierer kann nicht hinzugefügt werden, ohne einen Syntaxbefehl zu haben."
-
-#: src/rcfile.c:1016
-msgid "Missing formatter command"
-msgstr "Formatierer-Befehl fehlt"
+#: src/rcfile.c:879
+#, fuzzy, c-format
+msgid "Argument of '%s' lacks closing \""
+msgstr "Argument „%s“ hat nicht beendetes \""
 
-#: src/rcfile.c:1046
+#: src/rcfile.c:910
 #, c-format
 msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr ""
 "Schwerwiegender Fehler: keine Tasten an Funktion „%s“ gebunden. Wird "
 "beendet.\n"
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:912
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
@@ -2038,62 +2053,62 @@ msgstr ""
 "Bitte starten Sie nano bei Bedarf mit der Option „-I“, um Ihre nanorc-"
 "Einstellungen anzupassen\n"
 
-#: src/rcfile.c:1109
+#: src/rcfile.c:971
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "Zu erweiternde Syntax „%s“ konnte nicht gefunden werden."
 
-#: src/rcfile.c:1125 src/rcfile.c:1134 src/rcfile.c:1144
-#, c-format
-msgid "Command \"%s\" not allowed in included file"
-msgstr "Befehl „%s“ nicht in eingebundener Datei erlaubt"
-
-#: src/rcfile.c:1150 src/rcfile.c:1359
+#: src/rcfile.c:993 src/rcfile.c:1202
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Syntax „%s“ hat keine Farbbefehle"
 
-#: src/rcfile.c:1180
+#: src/rcfile.c:1024
+#, c-format
+msgid "Command \"%s\" not allowed in included file"
+msgstr "Befehl „%s“ nicht in eingebundener Datei erlaubt"
+
+#: src/rcfile.c:1039
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Befehl „%s“ nicht verstanden"
 
-#: src/rcfile.c:1195
+#: src/rcfile.c:1051
 msgid "Missing option"
 msgstr "Fehlende Option"
 
-#: src/rcfile.c:1217
+#: src/rcfile.c:1065
+#, c-format
+msgid "Unknown option \"%s\""
+msgstr "Unbekannte Option „%s“"
+
+#: src/rcfile.c:1077
+#, c-format
+msgid "Cannot unset option \"%s\""
+msgstr "Option „%s“ kann nicht zurückgesetzt werden"
+
+#: src/rcfile.c:1089
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Option „%s“ erfordert ein Argument"
 
-#: src/rcfile.c:1235
+#: src/rcfile.c:1105
 msgid "Option is not a valid multibyte string"
 msgstr "Option ist keine gültige Multibyte-Zeichenkette"
 
-#: src/rcfile.c:1272 src/rcfile.c:1300 src/rcfile.c:1309
+#: src/rcfile.c:1139 src/rcfile.c:1160 src/rcfile.c:1167
 msgid "Non-blank characters required"
 msgstr "Nicht-Leerraum-Zeichen erforderlich"
 
-#: src/rcfile.c:1282
+#: src/rcfile.c:1146
 msgid "Two single-column characters required"
 msgstr "Zwei einspaltige Zeichen erforderlich"
 
-#: src/rcfile.c:1348
-#, c-format
-msgid "Cannot unset option \"%s\""
-msgstr "Option „%s“ kann nicht zurückgesetzt werden"
-
-#: src/rcfile.c:1354
-#, c-format
-msgid "Unknown option \"%s\""
-msgstr "Unbekannte Option „%s“"
-
-#: src/rcfile.c:1413
+#: src/rcfile.c:1258
 msgid "I can't find my home directory!  Wah!"
 msgstr "Heimatverzeichnis kann nicht gefunden werden! Autsch!"
 
-#: src/rcfile.c:1451
+#: src/rcfile.c:1295
 #, c-format
 msgid ""
 "\n"
@@ -2102,44 +2117,49 @@ msgstr ""
 "\n"
 "Drücken Sie die Eingabetaste, um mit dem Starten von nano fortzufahren.\n"
 
-#: src/search.c:96
+#: src/search.c:95
 #, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "„%.*s%s“ nicht gefunden"
 
 #. TRANSLATORS: The next three strings are modifiers of the search prompt.
-#: src/search.c:176
+#: src/search.c:169
 msgid " [Case Sensitive]"
 msgstr " [GROSS/klein]"
 
-#: src/search.c:180
+#: src/search.c:173
 msgid " [Regexp]"
 msgstr " [reg. Ausdruck]"
 
-#: src/search.c:184
+#: src/search.c:177
 msgid " [Backwards]"
 msgstr " [Rückwärts]"
 
 #. TRANSLATORS: The next two strings are modifiers of the search prompt.
-#: src/search.c:189
+#: src/search.c:182
 msgid " (to replace) in selection"
 msgstr " (zu ersetzen) in Auswahl"
 
-#: src/search.c:191
+#: src/search.c:184
 msgid " (to replace)"
 msgstr " (zu ersetzen)"
 
+#: src/search.c:305
+#, fuzzy
+msgid "Searching..."
+msgstr "Suche"
+
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:718
+#: src/search.c:693
 msgid "Replace this instance?"
 msgstr "Fundstelle ersetzen?"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:883
+#: src/search.c:840
 msgid "Replace with"
 msgstr "Ersetzen durch"
 
-#: src/search.c:924
+#: src/search.c:875
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
@@ -2147,297 +2167,404 @@ msgstr[0] "%lu Ersetzung vorgenommen"
 msgstr[1] "%lu Ersetzungen vorgenommen"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:964
+#: src/search.c:914
 msgid "Enter line number, column number"
 msgstr "Zeilennummer, Spaltennummer eingeben"
 
-#: src/search.c:991
+#: src/search.c:939
 msgid "Invalid line or column number"
 msgstr "Ungültige Zeilen- oder Spaltennummer"
 
-#: src/search.c:1124
+#: src/search.c:1080
 msgid "Not a bracket"
 msgstr "Keine Klammer"
 
-#: src/search.c:1191
+#: src/search.c:1146
 msgid "No matching bracket"
 msgstr "Keine passende Klammer"
 
-#: src/text.c:54
+#: src/text.c:53
 msgid "Mark Set"
 msgstr "Markierung gesetzt"
 
-#: src/text.c:58
+#: src/text.c:57
 msgid "Mark Unset"
 msgstr "Markierung entfernt"
 
-#: src/text.c:70
+#: src/text.c:69
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Fehler beim Aufruf von „%s“"
 
-#: src/text.c:475
-msgid "Nothing in undo buffer!"
-msgstr "Nichts im Rückgängig-Puffer!"
+#: src/text.c:468
+msgid "Commenting is not supported for this file type"
+msgstr ""
 
-#: src/text.c:481 src/text.c:634
-#, c-format
-msgid "Internal error: can't match line %d.  Please save your work."
+#: src/text.c:484
+msgid "Cannot comment past end of file"
 msgstr ""
-"Interner Fehler: Zeile %d kann nicht gefunden werden. Bitte speichern Sie "
-"Ihre Arbeit."
+
+#: src/text.c:677
+msgid "Nothing in undo buffer!"
+msgstr "Nichts im Rückgängig-Puffer!"
 
 #. TRANSLATORS: Eight of the next nine strings describe actions
 #. * that are undone or redone.  It are all nouns, not verbs.
-#: src/text.c:495 src/text.c:524 src/text.c:645 src/text.c:686
+#: src/text.c:695 src/text.c:724 src/text.c:857 src/text.c:898
 msgid "text add"
 msgstr "Text hinzu"
 
-#: src/text.c:505 src/text.c:656
+#: src/text.c:705 src/text.c:868
 msgid "text delete"
 msgstr "Text löschen"
 
-#: src/text.c:528 src/text.c:694
+#: src/text.c:728 src/text.c:907
 msgid "line join"
 msgstr "Zeile verbinden"
 
-#: src/text.c:547 src/text.c:710
+#: src/text.c:747 src/text.c:923
 msgid "text cut"
 msgstr "Text ausschneiden"
 
-#: src/text.c:552 src/text.c:714
+#: src/text.c:752 src/text.c:927
 msgid "text uncut"
 msgstr "Text ausschneiden zurücknehmen"
 
-#: src/text.c:558 src/text.c:691
+#: src/text.c:758 src/text.c:903
 msgid "Internal error: line is missing.  Please save your work."
 msgstr "Interner Fehler: Zeile fehlt. Bitte speichern Sie Ihre Arbeit."
 
-#: src/text.c:561 src/text.c:665
+#: src/text.c:762 src/text.c:877
 msgid "line break"
 msgstr "Zeilenvorschub"
 
-#: src/text.c:569 src/text.c:725
+#: src/text.c:772 src/text.c:947
+msgid "comment"
+msgstr ""
+
+#: src/text.c:776 src/text.c:951
+msgid "uncomment"
+msgstr ""
+
+#: src/text.c:780 src/text.c:938
 msgid "text insert"
 msgstr "Text einfügen"
 
-#: src/text.c:589 src/text.c:718
+#: src/text.c:800 src/text.c:931
 msgid "text replace"
 msgstr "Text ersetzen"
 
-#: src/text.c:596 src/text.c:732 src/text.c:1030 src/text.c:1174
+#: src/text.c:807 src/text.c:955 src/text.c:1267 src/text.c:1437
 msgid "Internal error: unknown type.  Please save your work."
 msgstr "Interner Fehler: Unbekannter Typ. Bitte speichern Sie Ihre Arbeit."
 
-#: src/text.c:601
+#: src/text.c:813
 #, c-format
 msgid "Undid action (%s)"
 msgstr "Operation rückgängig gemacht (%s)"
 
-#: src/text.c:619
+#: src/text.c:832
 msgid "Nothing to re-do!"
 msgstr "Nichts zu wiederholen!"
 
-#: src/text.c:628
+#: src/text.c:841
 msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
 "Interner Fehler: „Wiederholen“ kann nicht aufgesetzt werden. Bitte speichern "
 "Sie Ihre Arbeit."
 
-#: src/text.c:737
+#: src/text.c:961
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Operation wiederholt (%s)"
 
-#: src/text.c:827 src/text.c:2508 src/text.c:2944
+#: src/text.c:1051 src/text.c:2765 src/text.c:3198
 msgid "Could not create pipe"
 msgstr "Pipe konnte nicht erstellt werden"
 
-#: src/text.c:853 src/text.c:2595 src/text.c:2750 src/text.c:2992
-#: src/text.c:3286
+#: src/text.c:1077 src/text.c:2852 src/text.c:3005 src/text.c:3246
+#: src/text.c:3540
 msgid "Could not fork"
 msgstr "Fork konnte nicht durchgeführt werden"
 
-#: src/text.c:1853
+#: src/text.c:2117
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Ungültiges Zitatzeichen %s: %s"
 
-#: src/text.c:2241
+#: src/text.c:2499
 msgid "Can now UnJustify!"
 msgstr "Absatzausrichtung kann jetzt rückgängig gemacht werden!"
 
-#: src/text.c:2435
+#: src/text.c:2697
 msgid "Edit a replacement"
 msgstr "Ersetzung editieren"
 
-#: src/text.c:2510
+#. TRANSLATORS: Shown after fixing misspellings in one word.
+#: src/text.c:2713
+#, fuzzy
+msgid "Next word..."
+msgstr "Nächstes Wort"
+
+#: src/text.c:2767
 msgid "Creating misspelled word list, please wait..."
 msgstr "Liste falsch geschriebener Wörter wird erstellt, bitte warten..."
 
-#: src/text.c:2601 src/text.c:2999
+#: src/text.c:2858 src/text.c:3253
 msgid "Could not get size of pipe buffer"
 msgstr "Größe des Pipe-Puffers konnte nicht bestimmt werden"
 
-#: src/text.c:2652
+#: src/text.c:2907
 msgid "Error invoking \"spell\""
 msgstr "Fehler beim Aufruf von „spell“"
 
-#: src/text.c:2655
+#: src/text.c:2910
 msgid "Error invoking \"sort -f\""
 msgstr "Fehler beim Aufruf von „sort -f“"
 
-#: src/text.c:2658
+#: src/text.c:2913
 msgid "Error invoking \"uniq\""
 msgstr "Fehler beim Aufruf von „uniq“"
 
-#: src/text.c:2881
+#: src/text.c:3135
 msgid "Invoking spell checker, please wait"
 msgstr "Rechtschreibprüfung wird aufgerufen, bitte warten"
 
-#: src/text.c:2897
+#: src/text.c:3151
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Rechtschreibprüfung fehlgeschlagen: %s"
 
-#: src/text.c:2899
+#: src/text.c:3153
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Rechtschreibprüfung fehlgeschlagen: %s: %s"
 
-#: src/text.c:2902
+#: src/text.c:3156
 msgid "Finished checking spelling"
 msgstr "Rechtschreibprüfung abgeschlossen"
 
-#: src/text.c:2927
+#: src/text.c:3181
 msgid "No linter defined for this type of file!"
 msgstr "Kein Linter für diesen Dateitype definiert"
 
-#: src/text.c:2932
+#: src/text.c:3186
 msgid "Save modified buffer before linting?"
 msgstr "Geänderten Puffer vor dem Linter-Aufruf speichern?"
 
-#: src/text.c:2949
+#: src/text.c:3203
 msgid "Invoking linter, please wait"
 msgstr "Linter wird aufgerufen, bitte warten"
 
-#: src/text.c:3105
+#: src/text.c:3358
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr "Keine verarbeitbaren Zeilen vom Befehl erhalten: %s"
 
-#: src/text.c:3134
+#: src/text.c:3388
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
 "Diese Meldung ist für nicht geöffnete Datei %s, in neuem Puffer öffnen?"
 
-#: src/text.c:3153
+#: src/text.c:3407
 msgid "No more errors in unopened files, cancelling"
 msgstr "Keine weiteren Fehler in ungeöffneten Dateien, Abbruch"
 
-#: src/text.c:3192
+#: src/text.c:3446
 msgid "At last message"
 msgstr "Bei letzter Meldung"
 
-#: src/text.c:3197
+#: src/text.c:3451
 msgid "At first message"
 msgstr "Bei erster Meldung"
 
-#: src/text.c:3237
+#: src/text.c:3491
 msgid "Finished"
 msgstr "Abgeschlossen"
 
-#: src/text.c:3259
+#: src/text.c:3513
 msgid "Invoking formatter, please wait"
 msgstr "Formatierer wird aufgerufen, bitte warten"
 
-#: src/text.c:3314
+#: src/text.c:3568
 msgid "Finished formatting"
 msgstr "Formatierung abgeschlossen"
 
-#: src/text.c:3396
+#: src/text.c:3650
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sWörter: %lu  Zeilen: %ld  Zeichen: %lu"
 
-#: src/text.c:3397
+#: src/text.c:3651
 msgid "In Selection:  "
 msgstr "In Auswahl:  "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3411
+#: src/text.c:3665
 msgid "Verbatim Input"
 msgstr "Direkte Eingabe"
 
-#: src/utils.c:391 src/utils.c:403
+#: src/utils.c:392 src/utils.c:404
 msgid "nano is out of memory!"
 msgstr "Nano hat keinen Speicher mehr!"
 
+#: src/utils.c:625
+#, c-format
+msgid "Internal error: can't match line %d.  Please save your work."
+msgstr ""
+"Interner Fehler: Zeile %d kann nicht gefunden werden. Bitte speichern Sie "
+"Ihre Arbeit."
+
+#. TRANSLATORS: This refers to a sequence of escape codes
+#. * (from the keyboard) that nano does not know about.
+#: src/winio.c:1121
+msgid "Unknown sequence"
+msgstr ""
+
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
 #: src/winio.c:1427
 msgid "Unicode Input"
 msgstr "Unicode-Eingabe"
 
-#: src/winio.c:1991 src/winio.c:1995
-msgid "Modified"
-msgstr "Verändert"
-
-#: src/winio.c:1992
-msgid "View"
-msgstr "Ansehen"
-
-#: src/winio.c:2006
+#: src/winio.c:1960
 msgid "DIR:"
 msgstr "Verz.:"
 
-#: src/winio.c:2013
+#: src/winio.c:1968
 msgid "File:"
 msgstr "Datei:"
 
-#: src/winio.c:3141
+#: src/winio.c:1972 src/winio.c:1976
+msgid "Modified"
+msgstr "Verändert"
+
+#: src/winio.c:1974
+msgid "View"
+msgstr "Ansehen"
+
+#: src/winio.c:3105
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "Zeile %ld/%ld (%d%%), Spalte %lu/%lu (%d%%), Zeichen %lu/%lu (%d%%)"
 
-#: src/winio.c:3271
+#: src/winio.c:3235
 msgid "The nano text editor"
 msgstr "Der Nano-Text-Editor"
 
-#: src/winio.c:3272
+#: src/winio.c:3236
 msgid "version"
 msgstr "Version"
 
-#: src/winio.c:3273
+#: src/winio.c:3237
 msgid "Brought to you by:"
 msgstr "Entwickelt von:"
 
-#: src/winio.c:3274
+#: src/winio.c:3238
 msgid "Special thanks to:"
 msgstr "Speziellen Dank an:"
 
-#: src/winio.c:3275
+#: src/winio.c:3239
 msgid "The Free Software Foundation"
 msgstr "The Free Software Foundation"
 
-#: src/winio.c:3276
+#: src/winio.c:3240
 msgid "the many translators and the TP"
 msgstr "die zahlreichen Ãœbersetzer und das TP"
 
-#: src/winio.c:3277
+#: src/winio.c:3241
 msgid "For ncurses:"
 msgstr "Für ncurses:"
 
-#: src/winio.c:3278
+#: src/winio.c:3242
 msgid "and anyone else we forgot..."
 msgstr "und alle Nichtgenannten …"
 
-#: src/winio.c:3279
+#: src/winio.c:3243
 msgid "Thank you for using nano!"
 msgstr "Danke für die Benutzung von nano!"
 
+#~ msgid ""
+#~ "Read %lu line (Converted from DOS and Mac format - Warning: No write "
+#~ "permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from DOS and Mac format - Warning: No write "
+#~ "permission)"
+#~ msgstr[0] ""
+#~ "%lu Zeile gelesen (aus DOS- und Mac-Format konvertiert – Warnung: Kein "
+#~ "Schreibrecht)"
+#~ msgstr[1] ""
+#~ "%lu Zeilen gelesen (aus DOS- und Mac-Format konvertiert – Warnung: Kein "
+#~ "Schreibrecht)"
+
+#~ msgid ""
+#~ "Read %lu line (Converted from Mac format - Warning: No write permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from Mac format - Warning: No write permission)"
+#~ msgstr[0] ""
+#~ "%lu Zeile gelesen (aus Mac-Format konvertiert – Warnung: Kein "
+#~ "Schreibrecht)"
+#~ msgstr[1] ""
+#~ "%lu Zeilen gelesen (aus Mac-Format konvertiert – Warnung: Kein "
+#~ "Schreibrecht)"
+
+#~ msgid ""
+#~ "Read %lu line (Converted from DOS format - Warning: No write permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from DOS format - Warning: No write permission)"
+#~ msgstr[0] ""
+#~ "%lu Zeile gelesen (aus DOS-Format konvertiert – Warnung: Kein "
+#~ "Schreibrecht)"
+#~ msgstr[1] ""
+#~ "%lu Zeilen gelesen (aus DOS-Format konvertiert – Warnung: Kein "
+#~ "Schreibrecht)"
+
+#~ msgid "Read %lu line (Warning: No write permission)"
+#~ msgid_plural "Read %lu lines (Warning: No write permission)"
+#~ msgstr[0] "%lu Zeile gelesen (Warnung: Kein Schreibrecht)"
+#~ msgstr[1] "%lu Zeilen gelesen (Warnung: Kein Schreibrecht)"
+
+#~ msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
+#~ msgstr "Veränderten Puffer speichern („Nein“ VERWIRFT DIE ÄNDERUNGEN)? "
+
+#~ msgid "Unknown Command"
+#~ msgstr "Unbekannter Befehl"
+
+#~ msgid "Cannot add a color command without a syntax command"
+#~ msgstr ""
+#~ "Farbdirektive kann nicht hinzugefügt werden, ohne einen Syntaxbefehl zu "
+#~ "haben."
+
+#~ msgid "Missing regex string"
+#~ msgstr "Fehlender regulärer Ausdruck"
+
+#~ msgid "Cannot add a header regex without a syntax command"
+#~ msgstr ""
+#~ "Regulärer Ausdruck für Header kann nicht hinzugefügt werden, ohne einen "
+#~ "Syntaxbefehl zu haben."
+
+#~ msgid "Cannot add a magic string regex without a syntax command"
+#~ msgstr ""
+#~ "Magischer regulärer Ausdruck kann nicht hinzugefügt werden, ohne einen "
+#~ "Syntaxbefehl zu haben."
+
+#~ msgid "Missing magic string name"
+#~ msgstr "Fehlender Name für magische Zeichenkette"
+
+#~ msgid "Cannot add a linter without a syntax command"
+#~ msgstr ""
+#~ "Linter kann nicht hinzugefügt werden, ohne einen Syntaxbefehl zu haben."
+
+#~ msgid "Cannot add formatter without a syntax command"
+#~ msgstr ""
+#~ "Formatierer kann nicht hinzugefügt werden, ohne einen Syntaxbefehl zu "
+#~ "haben."
+
+#~ msgid "Missing formatter command"
+#~ msgstr "Formatierer-Befehl fehlt"
+
 #~ msgid "Cannot prepend or append to a symlink with --nofollow set"
 #~ msgstr ""
 #~ "Voranstellen oder Anhängen an eine symbolische Verknüpfung ist nicht "
diff --git a/po/eo.po b/po/eo.po
index af20ec5d..f800cad4 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 2.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-25 16:41-0500\n"
+"POT-Creation-Date: 2016-06-17 15:41+0200\n"
 "PO-Revision-Date: 2016-02-14 16:29+0100\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
@@ -21,362 +21,347 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Lokalize 1.0\n"
 
+#: src/browser.c:144 src/browser.c:284 src/browser.c:334 src/files.c:996
+#: src/files.c:1003 src/files.c:1794 src/files.c:1919 src/files.c:1963
+#: src/files.c:1983 src/files.c:2099 src/files.c:3019 src/files.c:3242
+#: src/rcfile.c:540 src/rcfile.c:1280
+#, c-format
+msgid "Error reading %s: %s"
+msgstr "Eraro dum legado de %s: %s"
+
 #. TRANSLATORS: This is a prompt.
-#: src/browser.c:220
+#: src/browser.c:247
 msgid "Go To Directory"
 msgstr "Iri dosierujon"
 
-#: src/browser.c:227 src/browser.c:738 src/files.c:1174 src/files.c:2340
-#: src/nano.c:1120 src/search.c:202 src/search.c:290 src/search.c:895
-#: src/search.c:970 src/text.c:2935 src/text.c:3142
+#: src/browser.c:254 src/browser.c:723 src/files.c:1126 src/files.c:2292
+#: src/nano.c:1128 src/search.c:195 src/search.c:297 src/search.c:851
+#: src/search.c:918 src/text.c:3189 src/text.c:3396
 msgid "Cancelled"
 msgstr "Rezignita"
 
-#: src/browser.c:253 src/browser.c:300
-#, c-format
-msgid "Can't go outside of %s in restricted mode"
+#. TRANSLATORS: This refers to the option --operatingdir,
+#. * not to --restricted.
+#: src/browser.c:274 src/browser.c:326
+#, fuzzy, c-format
+msgid "Can't go outside of %s in confined mode"
 msgstr "Ne eblas iri ekstere de %s en limigita reĝimo"
 
-#: src/browser.c:264 src/browser.c:310 src/browser.c:326 src/files.c:1044
-#: src/files.c:1052 src/files.c:1844 src/files.c:1971 src/files.c:2016
-#: src/files.c:2037 src/files.c:2156 src/files.c:3062 src/files.c:3285
-#: src/rcfile.c:596 src/rcfile.c:1435
-#, c-format
-msgid "Error reading %s: %s"
-msgstr "Eraro dum legado de %s: %s"
-
-#: src/browser.c:290
+#: src/browser.c:317
 msgid "Can't move up a directory"
 msgstr "Ne eblas iri al supra dosierujo"
 
 #. TRANSLATORS: Try to keep this at most 7 characters.
-#: src/browser.c:615 src/browser.c:623
+#: src/browser.c:590 src/browser.c:598
 msgid "(dir)"
 msgstr "(ujo)"
 
 #. TRANSLATORS: Try to keep this at most 12 characters.
-#: src/browser.c:620
+#: src/browser.c:595
 msgid "(parent dir)"
 msgstr "(patra ujo)"
 
 #. TRANSLATORS: Try to keep this at most 7 characters.
 #. * If necessary, you can leave out the parentheses.
-#: src/browser.c:650
+#: src/browser.c:625
 msgid "(huge)"
 msgstr "(ega)"
 
 #. TRANSLATORS: This is the main search prompt.
-#: src/browser.c:727 src/search.c:173
+#: src/browser.c:712 src/search.c:166
 msgid "Search"
 msgstr "Serĉi"
 
-#: src/browser.c:777 src/search.c:466 src/search.c:536
-msgid "This is the only occurrence"
-msgstr "Ĉi tiu estas la ununura aperaĵo"
-
-#: src/browser.c:793 src/search.c:364
+#: src/browser.c:754 src/search.c:368
 msgid "Search Wrapped"
 msgstr "Serĉado ĉirkaŭiris"
 
-#: src/browser.c:843 src/search.c:517
+#: src/browser.c:764 src/search.c:509
+msgid "This is the only occurrence"
+msgstr "Ĉi tiu estas la ununura aperaĵo"
+
+#: src/browser.c:812 src/search.c:473
 msgid "No current search pattern"
 msgstr "Mankas ankoraŭ serĉendaĵo"
 
-#: src/files.c:50
+#: src/color.c:186
+#, fuzzy, c-format
+msgid "Unknown syntax name: %s"
+msgstr "Mankas nomo de sintakso"
+
+#: src/color.c:247
+#, c-format
+msgid "magic_load() failed: %s"
+msgstr ""
+
+#: src/color.c:251
+#, c-format
+msgid "magic_file(%s) failed: %s"
+msgstr ""
+
+#: src/files.c:47
 #, c-format
 msgid "Directory '%s' does not exist"
 msgstr "Dosierujo '%s' ne ekzistas"
 
-#: src/files.c:52
+#: src/files.c:49
 #, c-format
 msgid "Path '%s': %s"
 msgstr "Pado '%s': %s"
 
-#: src/files.c:54
+#: src/files.c:51
 #, c-format
 msgid "Path '%s' is not a directory"
 msgstr "Pado '%s' ne estas dosierujo"
 
-#: src/files.c:57
+#: src/files.c:53
 #, c-format
 msgid "Path '%s' is not accessible"
 msgstr "Pado '%s' ne alireblas"
 
-#. TRANSLATORS: Try to keep this at most 76 characters.
-#: src/files.c:158
+#. TRANSLATORS: Keep the next ten messages at most 76 characters.
+#: src/files.c:148
 msgid ""
 "Warning: Modifying a file which is not locked, check directory permission?"
 msgstr ""
 "Averto: modifiĝas senrigla dosiero; eble kontrolu dosierujajn permesojn?"
 
-#: src/files.c:197
+#: src/files.c:187
 msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
 msgstr ""
 "Malsukcesis eltrovi mian identecon por rigla dosiero (getpwuid() fiaskis)"
 
-#: src/files.c:206
+#: src/files.c:196
 #, c-format
 msgid "Couldn't determine hostname for lock file: %s"
 msgstr "Malsukcesis eltrovi komputilretnomon por rigla dosiero: %s"
 
-#: src/files.c:227 src/files.c:238 src/files.c:275 src/files.c:285
+#: src/files.c:216 src/files.c:225 src/files.c:262 src/files.c:272
 #, c-format
 msgid "Error writing lock file %s: %s"
 msgstr "Eraro dum skribado de rigla dosiero %s: %s"
 
-#: src/files.c:305
+#: src/files.c:291
 #, c-format
 msgid "Error deleting lock file %s: %s"
 msgstr "Eraro dum forigo de rigla dosiero %s: %s"
 
-#: src/files.c:341
+#: src/files.c:325
 #, c-format
 msgid "Error opening lock file %s: %s"
 msgstr "Eraro dum malfermo de rigla dosiero %s: %s"
 
-#: src/files.c:353
+#: src/files.c:337
 #, c-format
 msgid "Error reading lock file %s: Not enough data read"
 msgstr "Eraro dum legado de rigla dosiero %s: nesufiĉaj datumoj legiĝis"
 
 #. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
-#: src/files.c:371
+#: src/files.c:354
 #, c-format
 msgid "File %s is being edited (by %s with %s, PID %d); continue?"
 msgstr "Dosiero %s jam redaktiĝas (por %s kun %s, PID %d); ĉu daŭrigi? "
 
-#: src/files.c:426
+#: src/files.c:430
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Ne eblas enmeti dosieron el ekstere de %s"
 
-#: src/files.c:439 src/files.c:1038 src/rcfile.c:589 src/rcfile.c:1385
-#: src/rcfile.c:1426
+#: src/files.c:445 src/files.c:991 src/rcfile.c:533 src/rcfile.c:1230
+#: src/rcfile.c:1271
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "'%s' estas dosierujo"
 
-#: src/files.c:441
+#: src/files.c:447
 #, c-format
 msgid "\"%s\" is not a normal file"
 msgstr "'%s' ne estas normala dosiero"
 
-#: src/files.c:566
+#: src/files.c:571
 msgid "No more open file buffers"
 msgstr "Ne ekzistas pliaj malfermaj bufroj"
 
-#: src/files.c:582
+#: src/files.c:586
 #, c-format
 msgid "Switched to %s"
 msgstr "Åœaltita al %s"
 
-#: src/files.c:584 src/global.c:988 src/winio.c:2010
+#: src/files.c:588 src/global.c:1005 src/winio.c:1965
 msgid "New Buffer"
 msgstr "Nova bufro"
 
-#: src/files.c:943
+#. TRANSLATORS: Keep the next four messages at most 76 characters.
+#: src/files.c:913
 #, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
 msgstr[0] "Legiĝis %lu linio (konvertita el DOS- kaj Mac-aranĝo)"
 msgstr[1] "Legiĝis %lu linioj (konvertitaj el DOS- kaj Mac-aranĝo)"
 
-#: src/files.c:948
-#, c-format
-msgid ""
-"Read %lu line (Converted from DOS and Mac format - Warning: No write "
-"permission)"
-msgid_plural ""
-"Read %lu lines (Converted from DOS and Mac format - Warning: No write "
-"permission)"
-msgstr[0] ""
-"Legiĝis %lu linio (konvertita el DOS- kaj Mac-aranĝo -- NE skribeblas)"
-msgstr[1] ""
-"Legiĝis %lu linioj (konvertitaj el DOS- kaj Mac-aranĝo -- NE skribeblas)"
-
-#: src/files.c:954
+#: src/files.c:919
 #, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
 msgstr[0] "Legiĝis %lu linio (konvertita el Mac-aranĝo)"
 msgstr[1] "Legiĝis %lu linioj (konvertitaj el Mac-aranĝo)"
 
-#: src/files.c:958
-#, c-format
-msgid ""
-"Read %lu line (Converted from Mac format - Warning: No write permission)"
-msgid_plural ""
-"Read %lu lines (Converted from Mac format - Warning: No write permission)"
-msgstr[0] "Legiĝis %lu linio (konvertita el Mac-aranĝo -- NE skribeblas)"
-msgstr[1] "Legiĝis %lu linioj (konvertitaj el Mac-aranĝo -- NE skribeblas)"
-
-#: src/files.c:964
+#: src/files.c:925
 #, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
 msgstr[0] "Legiĝis %lu linio (konvertita el DOS-aranĝo)"
 msgstr[1] "Legiĝis %lu linioj (konvertitaj el DOS-aranĝo)"
 
-#: src/files.c:968
-#, c-format
-msgid ""
-"Read %lu line (Converted from DOS format - Warning: No write permission)"
-msgid_plural ""
-"Read %lu lines (Converted from DOS format - Warning: No write permission)"
-msgstr[0] "Legiĝis %lu linio (konvertita el DOS-aranĝo -- NE skribeblas)"
-msgstr[1] "Legiĝis %lu linioj (konvertitaj el DOS-aranĝo -- NE skribeblas)"
-
-#: src/files.c:974
+#: src/files.c:930
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "Legiĝis %lu linio"
 msgstr[1] "Legiĝis %lu linioj"
 
-#: src/files.c:977
-#, c-format
-msgid "Read %lu line (Warning: No write permission)"
-msgid_plural "Read %lu lines (Warning: No write permission)"
-msgstr[0] "Legiĝis %lu linio  (Averto: dosiero NE skribeblas)"
-msgstr[1] "Legiĝis %lu linioj  (Averto: dosiero NE skribeblas)"
-
-#: src/files.c:1019 src/files.c:1056
+#: src/files.c:974 src/files.c:1006
 msgid "Reading File"
 msgstr "Legado de dosiero"
 
-#: src/files.c:1025
+#: src/files.c:980
 msgid "New File"
 msgstr "Nova dosiero"
 
-#: src/files.c:1028
-#, c-format
-msgid "\"%s\" not found"
+#: src/files.c:983
+#, fuzzy, c-format
+msgid "File \"%s\" not found"
 msgstr "'%s' ne trovatas"
 
-#: src/files.c:1039 src/rcfile.c:590 src/rcfile.c:1386 src/rcfile.c:1427
+#: src/files.c:992 src/rcfile.c:534 src/rcfile.c:1231 src/rcfile.c:1272
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "'%s' estas aparato"
 
-#: src/files.c:1133
+#: src/files.c:1083
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Rulenda komando en nova bufro [el %s] "
 
-#: src/files.c:1135
+#: src/files.c:1085
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Rulenda komando [el %s] "
 
-#: src/files.c:1142
+#: src/files.c:1092
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Enmetenda dosiero en nova bufro [el %s] "
 
-#: src/files.c:1144
+#: src/files.c:1094
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Enmetenda dosiero [el %s] "
 
-#: src/files.c:1389
+#: src/files.c:1338
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Klavo nur validas en multbufra moduso"
 
-#: src/files.c:1684
-msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+#: src/files.c:1632
+#, fuzzy
+msgid "Failed to write backup file; continue saving? (Say N if unsure.) "
 msgstr "Malsukcesis skribi savkopion; ĉu tamen konservi? (N se vi ne certas) "
 
-#: src/files.c:1800
+#: src/files.c:1750
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Ne eblas skribi ekstere de %s"
 
-#: src/files.c:1885 src/files.c:1910 src/files.c:1928 src/files.c:1941
-#: src/files.c:1952 src/files.c:1981
+#: src/files.c:1833 src/files.c:1858 src/files.c:1876 src/files.c:1889
+#: src/files.c:1900 src/files.c:1928
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Eraro dum skribado de savkopio %s: %s"
 
-#: src/files.c:1886 src/nano.c:690
+#: src/files.c:1834 src/nano.c:692
 msgid "Too many backup files?"
 msgstr "Ĉu troaj savkopioj?"
 
-#: src/files.c:2026 src/text.c:2863 src/text.c:2875 src/text.c:3244
-#: src/text.c:3253
+#: src/files.c:1972 src/text.c:3117 src/text.c:3129 src/text.c:3498
+#: src/text.c:3507
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Eraro dum skribado de portempa dosiero: %s"
 
-#: src/files.c:2049 src/files.c:2068 src/files.c:2080 src/files.c:2104
-#: src/files.c:2121 src/files.c:2131 src/files.c:2164 src/files.c:2171
+#: src/files.c:1994 src/files.c:2013 src/files.c:2023 src/files.c:2047
+#: src/files.c:2064 src/files.c:2074 src/files.c:2106 src/files.c:2113
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Eraro dum skribado de %s: %s"
 
-#: src/files.c:2200
+#: src/files.c:2154
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "Skribiĝis %lu linio"
 msgstr[1] "Skribiĝis %lu linioj"
 
-#: src/files.c:2299
+#: src/files.c:2249
 msgid " [DOS Format]"
 msgstr " [DOS-aranĝo]"
 
-#: src/files.c:2300
+#: src/files.c:2250
 msgid " [Mac Format]"
 msgstr " [Mac-aranĝo]"
 
-#: src/files.c:2302
+#: src/files.c:2252
 msgid " [Backup]"
 msgstr " [savkopii]"
 
-#: src/files.c:2309
+#: src/files.c:2259
 msgid "Prepend Selection to File"
 msgstr "Antaŭglui markaĵon al dosiero"
 
-#: src/files.c:2310
+#: src/files.c:2260
 msgid "Append Selection to File"
 msgstr "Postglui markaĵon al dosiero"
 
-#: src/files.c:2311
+#: src/files.c:2261
 msgid "Write Selection to File"
 msgstr "Konservi markaĵon en dosiero"
 
-#: src/files.c:2314
+#: src/files.c:2264
 msgid "File Name to Prepend to"
 msgstr "Nomo de dosiero al kiu antaÅ­glui"
 
-#: src/files.c:2315
+#: src/files.c:2265
 msgid "File Name to Append to"
 msgstr "Nomo de dosiero al kiu postglui"
 
-#: src/files.c:2316
+#: src/files.c:2266
 msgid "File Name to Write"
 msgstr "Nomo de skribota dosiero"
 
-#: src/files.c:2349
-msgid "Save modified buffer anyway ? "
+#: src/files.c:2301
+#, fuzzy
+msgid "Save modified buffer anyway? "
 msgstr "Ĉu tamen konservi modifitan bufron? "
 
-#: src/files.c:2457
-msgid "File exists, OVERWRITE ? "
-msgstr "Dosiero jam ekzistas; ĉu ANSTATAŬIGI? "
-
-#: src/files.c:2466
-msgid "Save file under DIFFERENT NAME ? "
+#: src/files.c:2412
+#, fuzzy
+msgid "Save file under DIFFERENT NAME? "
 msgstr "Ĉu konservi ALINOME? "
 
-#: src/files.c:2480
-msgid "File was modified since you opened it, continue saving ? "
+#: src/files.c:2420
+#, fuzzy, c-format
+msgid "File \"%s\" exists; OVERWRITE? "
+msgstr "Dosiero jam ekzistas; ĉu ANSTATAŬIGI? "
+
+#: src/files.c:2441
+#, fuzzy
+msgid "File was modified since you opened it; continue saving? "
 msgstr "Dosiero modifiĝis post malfermo; ĉu tamen surskribi ĝin? "
 
-#: src/files.c:2917
+#: src/files.c:2874
 msgid "(more)"
 msgstr "(plu)"
 
-#: src/files.c:3004
+#: src/files.c:2959
 #, c-format
 msgid ""
 "\n"
@@ -385,7 +370,7 @@ msgstr ""
 "\n"
 "Premu 'Enter' por daÅ­rigi.\n"
 
-#: src/files.c:3020
+#: src/files.c:2975
 #, c-format
 msgid ""
 "Unable to create directory %s: %s\n"
@@ -395,7 +380,7 @@ msgstr ""
 "Ĉi tiu dosierujo bezonatas por konservi/relegi serĉan historion kaj kursoran "
 "pozicion.\n"
 
-#: src/files.c:3026
+#: src/files.c:2982
 #, c-format
 msgid ""
 "Path %s is not a directory and needs to be.\n"
@@ -405,7 +390,7 @@ msgstr ""
 "'Nano' ne kapablos konservi/relegi serĉan historion nek kursorajn "
 "poziciojn.\n"
 
-#: src/files.c:3045
+#: src/files.c:3002
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I tried to move\n"
@@ -415,7 +400,7 @@ msgstr ""
 "dum movo al preferata loko (%s)\n"
 "okazis eraro: %s"
 
-#: src/files.c:3049
+#: src/files.c:3006
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I moved\n"
@@ -426,721 +411,752 @@ msgstr ""
 "kiu nun moviĝis al preferata loko (%s).\n"
 "(Vidu la 'nano-FAQ' por informo pri ĉi tiu ŝanĝo.)"
 
-#: src/files.c:3132 src/files.c:3140 src/files.c:3164 src/files.c:3176
+#: src/files.c:3089 src/files.c:3097 src/files.c:3121 src/files.c:3133
 #, c-format
 msgid "Error writing %s: %s\n"
 msgstr "Eraro dum skribado de %s: %s\n"
 
 #. TRANSLATORS: Try to keep the next fifteen strings at most 10 characters.
-#: src/global.c:480
+#: src/global.c:483
 msgid "Exit"
 msgstr "Fini"
 
-#: src/global.c:481
+#: src/global.c:484
 msgid "Close"
 msgstr "Fermi"
 
-#: src/global.c:482
+#: src/global.c:485
 msgid "Uncut Text"
 msgstr "Alglui"
 
-#: src/global.c:484
+#: src/global.c:487
 msgid "Unjustify"
 msgstr "Malrektigi"
 
-#: src/global.c:490
+#: src/global.c:493
 msgid "Read File"
 msgstr "Enmeti"
 
-#: src/global.c:491
+#: src/global.c:494
 msgid "Where Is"
 msgstr "Serĉi"
 
-#: src/global.c:492
+#: src/global.c:495
 msgid "Replace"
 msgstr "AnstataÅ­igi"
 
-#: src/global.c:493
+#: src/global.c:496
 msgid "Go To Line"
 msgstr "Iri linion"
 
-#: src/global.c:494
+#: src/global.c:497
 msgid "Prev Line"
 msgstr "Linio supren"
 
-#: src/global.c:495
+#: src/global.c:498
 msgid "Next Line"
 msgstr "Linio suben"
 
-#: src/global.c:496
+#: src/global.c:499
 msgid "Prev Page"
 msgstr "Paĝo supren"
 
-#: src/global.c:497
+#: src/global.c:500
 msgid "Next Page"
 msgstr "Paĝo suben"
 
-#: src/global.c:499
+#: src/global.c:502
 msgid "Justify"
 msgstr "Rektigi"
 
-#: src/global.c:500
+#: src/global.c:503
 msgid "FullJstify"
 msgstr "Rektigi ĉion"
 
-#: src/global.c:502
+#: src/global.c:505
 msgid "Refresh"
 msgstr "Remontri"
 
 #. TRANSLATORS: Try to keep this string at most 12 characters.
-#: src/global.c:505
+#: src/global.c:508
 msgid "WhereIs Next"
 msgstr "Serĉi sekvan"
 
 #. TRANSLATORS: The next long series of strings are shortcut descriptions;
 #. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:512
+#: src/global.c:515
 msgid "Justify the current paragraph"
 msgstr "Rektigi la nunan alineon"
 
-#: src/global.c:514
+#: src/global.c:517
 msgid "Cancel the current function"
 msgstr "Rezigni la nunan operacion"
 
-#: src/global.c:515
+#: src/global.c:518
 msgid "Display this help text"
 msgstr "Montri ĉi tiun helptekston"
 
-#: src/global.c:518
+#: src/global.c:521
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Fermi la nunan bufron / Eliri el 'nano'"
 
-#: src/global.c:520
+#: src/global.c:523
 msgid "Exit from nano"
 msgstr "Eliri el 'nano'"
 
-#: src/global.c:524
+#: src/global.c:527
 msgid "Write the current file to disk"
 msgstr "Konservi la nunan dosieron sur disko"
 
-#: src/global.c:526
+#: src/global.c:529
 msgid "Insert another file into the current one"
 msgstr "Enmeti alian dosieron en la nuna bufro"
 
-#: src/global.c:528
+#: src/global.c:531
 msgid "Search for a string or a regular expression"
 msgstr "Serĉi signoĉenon aŭ regulesprimon"
 
-#: src/global.c:531
+#: src/global.c:533
 msgid "Search for a string"
 msgstr "Serĉi parton de dosiernomo"
 
-#: src/global.c:533
+#: src/global.c:534
+msgid "Refresh the file list"
+msgstr ""
+
+#: src/global.c:535
+#, fuzzy
+msgid "Go to lefthand column"
+msgstr "Iri al linionumero (kaj kolumnonumero)"
+
+#: src/global.c:536
+#, fuzzy
+msgid "Go to righthand column"
+msgstr "Iri al linionumero (kaj kolumnonumero)"
+
+#: src/global.c:538
 msgid "Go one screenful up"
 msgstr "Iri unu paĝo supren"
 
-#: src/global.c:534
+#: src/global.c:539
 msgid "Go one screenful down"
 msgstr "Iri unu paĝo suben"
 
-#: src/global.c:536
+#: src/global.c:541
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Eltondi la nunan linion kaj konservi ĝin en tondbufro"
 
-#: src/global.c:538
+#: src/global.c:543
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Glui tekstaĵon el la tondbufro en la nuna linio"
 
-#: src/global.c:539
+#: src/global.c:544
 msgid "Display the position of the cursor"
 msgstr "Montri la pozicion de la kursoro"
 
-#: src/global.c:541
+#: src/global.c:546
 msgid "Invoke the spell checker, if available"
 msgstr "Ruli literumilon (se disponeblas)"
 
-#: src/global.c:543
+#: src/global.c:548
 msgid "Replace a string or a regular expression"
 msgstr "Anstataŭigi signoĉenon aŭ regulesprimon"
 
-#: src/global.c:544
+#: src/global.c:549
 msgid "Go to line and column number"
 msgstr "Iri al linionumero (kaj kolumnonumero)"
 
-#: src/global.c:546
+#: src/global.c:551
 msgid "Mark text starting from the cursor position"
 msgstr "Marki tekston ekde la kursora pozicio"
 
-#: src/global.c:547
+#: src/global.c:552
 msgid "Repeat the last search"
 msgstr "Ripeti lastan serĉon"
 
-#: src/global.c:549
+#: src/global.c:554
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "Kopii la nunan linion kaj konservi ĝin en tondbufro"
 
-#: src/global.c:550
+#: src/global.c:555
 msgid "Indent the current line"
 msgstr "Deŝovi enen la nunan linion"
 
-#: src/global.c:551
+#: src/global.c:556
 msgid "Unindent the current line"
 msgstr "Deŝovi eksteren la nunan linion"
 
-#: src/global.c:552
+#: src/global.c:558
+msgid "Comment/uncomment the current line or marked lines"
+msgstr ""
+
+#: src/global.c:560
 msgid "Undo the last operation"
 msgstr "Malfari la lastan operacion"
 
-#: src/global.c:553
+#: src/global.c:561
 msgid "Redo the last undone operation"
 msgstr "Refari la lastan malfaratan operacion"
 
-#: src/global.c:555
+#: src/global.c:563
 msgid "Go back one character"
 msgstr "Iri unu signon malantaÅ­en"
 
-#: src/global.c:556
+#: src/global.c:564
 msgid "Go forward one character"
 msgstr "Iri unu signon antaÅ­en"
 
-#: src/global.c:558
+#: src/global.c:566
 msgid "Go back one word"
 msgstr "Iri unu vorton malantaÅ­en"
 
-#: src/global.c:559
+#: src/global.c:567
 msgid "Go forward one word"
 msgstr "Iri unu vorton antaÅ­en"
 
-#: src/global.c:561
+#: src/global.c:569
 msgid "Go to previous line"
 msgstr "Iri al la supra linio"
 
-#: src/global.c:562
+#: src/global.c:570
 msgid "Go to next line"
 msgstr "Iri al la suba linio"
 
-#: src/global.c:563
+#: src/global.c:571
 msgid "Go to beginning of current line"
 msgstr "Iri al la komenco de la nuna linio"
 
-#: src/global.c:564
+#: src/global.c:572
 msgid "Go to end of current line"
 msgstr "Iri al la fino de la nuna linio"
 
-#: src/global.c:567
+#: src/global.c:575
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "Iri al komenco de alineo; poste al ĝi de antaŭa alineo"
 
-#: src/global.c:569
+#: src/global.c:577
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr "Iri al postfino de alineo; poste al ĝi de posta alineo"
 
-#: src/global.c:571
+#: src/global.c:579
 msgid "Go to the first line of the file"
 msgstr "Iri al la unua linio de la dosiero"
 
-#: src/global.c:572
+#: src/global.c:580
 msgid "Go to the last line of the file"
 msgstr "Iri al la lasta linio de la dosiero"
 
-#: src/global.c:574
+#: src/global.c:582
 msgid "Go to the matching bracket"
 msgstr "Iri al para krampo"
 
-#: src/global.c:576
+#: src/global.c:584
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "Rulumi unu linion supren sen movi la kursoron"
 
-#: src/global.c:578
+#: src/global.c:586
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "Rulumi unu linion suben sen movi la kursoron"
 
-#: src/global.c:581
+#: src/global.c:589
 msgid "Switch to the previous file buffer"
 msgstr "Åœalti al malsekva dosierbufro"
 
-#: src/global.c:582
+#: src/global.c:590
 msgid "Switch to the next file buffer"
 msgstr "Åœalti al sekva dosierbufro"
 
-#: src/global.c:584
+#: src/global.c:592
 msgid "Insert the next keystroke verbatim"
 msgstr "Enmeti la tujsekvan klavon tielkiel"
 
-#: src/global.c:585
+#: src/global.c:593
 msgid "Insert a tab at the cursor position"
 msgstr "Enmeti tabon je la kursora pozicio"
 
-#: src/global.c:586
+#: src/global.c:594
 msgid "Insert a newline at the cursor position"
 msgstr "Enmeti novlinion je la kursora pozicio"
 
-#: src/global.c:587
+#: src/global.c:595
 msgid "Delete the character under the cursor"
 msgstr "Forigi la signon sub la kursoro"
 
-#: src/global.c:589
+#: src/global.c:597
 msgid "Delete the character to the left of the cursor"
 msgstr "Forigi la signon maldekstran de la kursoro"
 
-#: src/global.c:592
+#: src/global.c:600
 msgid "Cut backward from cursor to word start"
 msgstr "Forigi ekde de la kursoro ĝis antaŭa vortkomenco"
 
-#: src/global.c:594
+#: src/global.c:602
 msgid "Cut forward from cursor to next word start"
 msgstr "Forigi ekde de la kursoro ĝis posta vortkomenco"
 
-#: src/global.c:596
+#: src/global.c:604
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Forigi ĉion ekde de la kursoro ĝis la dosierfino"
 
-#: src/global.c:599
+#: src/global.c:607
 msgid "Justify the entire file"
 msgstr "Rektigi la tutan dosieron"
 
-#: src/global.c:603
+#: src/global.c:611
 msgid "Count the number of words, lines, and characters"
 msgstr "Nombri la vortojn, liniojn, kaj signojn"
 
-#: src/global.c:606
+#: src/global.c:614
 msgid "Refresh (redraw) the current screen"
 msgstr "Aktualigi (redesegni) la nunan ekranon"
 
-#: src/global.c:608
+#: src/global.c:616
 msgid "Suspend the editor (if suspension is enabled)"
 msgstr "Paŭzigi la redaktilon (se paŭzigebleco enŝaltitas)"
 
-#: src/global.c:610
+#: src/global.c:618
 msgid "Save file without prompting"
 msgstr "Konservi dosieron sen demandi"
 
-#: src/global.c:611
+#: src/global.c:619
 msgid "Search next occurrence backward"
 msgstr "Serĉi sekvan okazon malantaŭen"
 
-#: src/global.c:612
+#: src/global.c:620
 msgid "Search next occurrence forward"
 msgstr "Serĉi sekvan okazon antaŭen"
 
-#: src/global.c:614
+#: src/global.c:622
 msgid "Toggle the case sensitivity of the search"
 msgstr "Ŝalti la usklecdistingon de serĉo"
 
-#: src/global.c:616
+#: src/global.c:624
 msgid "Reverse the direction of the search"
 msgstr "Mali la direkton de serĉo"
 
-#: src/global.c:620
+#: src/global.c:628
 msgid "Toggle the use of regular expressions"
 msgstr "Åœalti la uzon de regulesprimoj"
 
-#: src/global.c:624
+#: src/global.c:632
 msgid "Recall the previous search/replace string"
 msgstr "Repreni la antaŭan serĉitan signoĉenon"
 
-#: src/global.c:626
+#: src/global.c:634
 msgid "Recall the next search/replace string"
 msgstr "Repreni la postan serĉitan signoĉenon"
 
-#: src/global.c:629
+#: src/global.c:637
 msgid "Go to file browser"
 msgstr "Iri al dosieresplorilo"
 
-#: src/global.c:632
+#: src/global.c:640
 msgid "Toggle the use of DOS format"
 msgstr "Ŝalti la uzon de DOS-aranĝo"
 
-#: src/global.c:633
+#: src/global.c:641
 msgid "Toggle the use of Mac format"
 msgstr "Ŝalti la uzon de Mac-aranĝo"
 
-#: src/global.c:634
+#: src/global.c:642
 msgid "Toggle appending"
 msgstr "Åœalti postgluon"
 
-#: src/global.c:635
+#: src/global.c:643
 msgid "Toggle prepending"
 msgstr "Åœalti antaÅ­gluon"
 
-#: src/global.c:636
+#: src/global.c:644
 msgid "Toggle backing up of the original file"
 msgstr "Åœalti fari savkopion de redaktota dosiero"
 
-#: src/global.c:637
+#: src/global.c:645
 msgid "Execute external command"
 msgstr "Ruli eksteran komandon"
 
-#: src/global.c:639
+#: src/global.c:647
 msgid "Close buffer without saving it"
 msgstr "Fermi bufron sen konservi ĝin"
 
-#: src/global.c:641
+#: src/global.c:649
 msgid "Toggle the use of a new buffer"
 msgstr "Åœalti la uzon de nova bufro"
 
-#: src/global.c:644
+#: src/global.c:652
 msgid "Exit from the file browser"
 msgstr "Eliri el dosieresplorilo"
 
-#: src/global.c:645
+#: src/global.c:653
 msgid "Go to the first file in the list"
 msgstr "Iri al la unua dosiero en la listo"
 
-#: src/global.c:646
+#: src/global.c:654
 msgid "Go to the last file in the list"
 msgstr "Iri al la lasta dosiero en la listo"
 
-#: src/global.c:647
+#: src/global.c:655
 msgid "Go to the previous file in the list"
 msgstr "Iri al la malsekva dosiero en la listo"
 
-#: src/global.c:648
+#: src/global.c:656
 msgid "Go to the next file in the list"
 msgstr "Iri al la sekva dosiero en la listo"
 
-#: src/global.c:649
+#: src/global.c:657
 msgid "Go to directory"
 msgstr "Iri al indikota dosierujo"
 
-#: src/global.c:652
+#: src/global.c:660
 msgid "Invoke the linter, if available"
 msgstr "Ruli sintaks-kontrolilon (se disponeblas)"
 
-#: src/global.c:653
+#: src/global.c:661
 msgid "Go to previous linter msg"
 msgstr "Iri al la antaŭa mesaĝo de la kontrolilo"
 
-#: src/global.c:654
+#: src/global.c:662
 msgid "Go to next linter msg"
 msgstr "Iri al la sekva mesaĝo de la kontrolilo"
 
-#: src/global.c:656
+#: src/global.c:664
 msgid "Invoke formatter, if available"
 msgstr "Ruli aranĝilon (se disponeblas)"
 
 #. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:671
+#: src/global.c:679
 msgid "Get Help"
 msgstr "Helpo"
 
-#: src/global.c:674 src/prompt.c:858
+#: src/global.c:682 src/prompt.c:855
 msgid "Cancel"
 msgstr "Rezigni"
 
-#: src/global.c:687
+#: src/global.c:695
 msgid "Write Out"
 msgstr "Konservi"
 
-#: src/global.c:723
+#: src/global.c:731
 msgid "Go To Dir"
 msgstr "Iri dosierujon"
 
-#: src/global.c:738
+#: src/global.c:746
 msgid "Cut Text"
 msgstr "Eltondi"
 
-#: src/global.c:753
+#: src/global.c:761
 msgid "To Spell"
 msgstr "Literumo"
 
-#: src/global.c:757
+#: src/global.c:765
 msgid "To Linter"
 msgstr "Trakombi"
 
-#: src/global.c:760
+#: src/global.c:768
 msgid "Formatter"
 msgstr "Aranĝilo"
 
-#: src/global.c:767
+#: src/global.c:775
 msgid "Case Sens"
 msgstr "Usklece"
 
-#: src/global.c:772
+#: src/global.c:780
 msgid "Regexp"
 msgstr "Regulesprime"
 
-#: src/global.c:777
+#: src/global.c:785
 msgid "Backwards"
 msgstr "MalantaÅ­en"
 
-#: src/global.c:784
+#: src/global.c:792
 msgid "No Replace"
 msgstr "Ne anstataÅ­igi"
 
-#: src/global.c:792
+#: src/global.c:800
 msgid "Cur Pos"
 msgstr "Pozicio"
 
-#: src/global.c:807
+#: src/global.c:815
 msgid "First Line"
 msgstr "Unua linio"
 
-#: src/global.c:809
+#: src/global.c:817
 msgid "Last Line"
 msgstr "Lasta linio"
 
-#: src/global.c:816
+#: src/global.c:824
 msgid "To Bracket"
 msgstr "Al krampo"
 
-#: src/global.c:819
+#: src/global.c:827
 msgid "Mark Text"
 msgstr "Markŝalto"
 
-#: src/global.c:822
+#: src/global.c:830
 msgid "Copy Text"
 msgstr "Kopii tekston"
 
-#: src/global.c:825
+#: src/global.c:833
 msgid "Indent Text"
 msgstr "Deŝovi enen"
 
-#: src/global.c:827
+#: src/global.c:835
 msgid "Unindent Text"
 msgstr "Deŝovi eksteren"
 
-#: src/global.c:830
+#: src/global.c:838
 msgid "Undo"
 msgstr "Malfari"
 
-#: src/global.c:832
+#: src/global.c:840
 msgid "Redo"
 msgstr "Refari"
 
-#: src/global.c:836 src/global.c:842
+#: src/global.c:844 src/global.c:850
 msgid "Back"
 msgstr "MalantaÅ­en"
 
-#: src/global.c:838 src/global.c:844
+#: src/global.c:846 src/global.c:852
 msgid "Forward"
 msgstr "AntaÅ­en"
 
-#: src/global.c:849
+#: src/global.c:857
 msgid "Prev Word"
 msgstr "AntaÅ­a vorto"
 
-#: src/global.c:851
+#: src/global.c:859
 msgid "Next Word"
 msgstr "Posta vorto"
 
-#: src/global.c:855
+#: src/global.c:863
 msgid "Home"
 msgstr "Linikomencen"
 
-#: src/global.c:857
+#: src/global.c:865
 msgid "End"
 msgstr "Linifinen"
 
-#: src/global.c:866
+#: src/global.c:874
 msgid "Beg of Par"
 msgstr "Alineo-eken"
 
-#: src/global.c:868
+#: src/global.c:876
 msgid "End of Par"
 msgstr "Alineo-finen"
 
-#: src/global.c:873
+#: src/global.c:881
 msgid "Scroll Up"
 msgstr "Rulumi supren"
 
-#: src/global.c:875
+#: src/global.c:883
 msgid "Scroll Down"
 msgstr "Rulumi suben"
 
-#: src/global.c:880
+#: src/global.c:888
 msgid "Prev File"
 msgstr "Malsekvan"
 
-#: src/global.c:882
+#: src/global.c:890
 msgid "Next File"
 msgstr "Sekvan"
 
-#: src/global.c:891
+#: src/global.c:899
 msgid "Verbatim"
 msgstr "Konforme"
 
-#: src/global.c:894
+#: src/global.c:902
 msgid "Tab"
 msgstr "«Tabo»"
 
-#: src/global.c:896
+#: src/global.c:904
 msgid "Enter"
 msgstr "«Enigo»"
 
-#: src/global.c:899
+#: src/global.c:907
 msgid "Delete"
 msgstr "«Forigo»"
 
-#: src/global.c:901
+#: src/global.c:909
 msgid "Backspace"
 msgstr "«Retropaŝo»"
 
 #. TRANSLATORS: The next two strings refer to cutting words.
-#: src/global.c:912
+#: src/global.c:920
 msgid "Cut Left"
 msgstr "Vorttondi liven"
 
-#: src/global.c:914
+#: src/global.c:922
 msgid "Cut Right"
 msgstr "Vorttondi dekstren"
 
-#: src/global.c:916
+#: src/global.c:924
 msgid "CutTillEnd"
 msgstr "Tondi reston"
 
-#: src/global.c:926
+#: src/global.c:934
 msgid "Word Count"
 msgstr "Nombri vortojn"
 
-#: src/global.c:933
+#: src/global.c:941
 msgid "Suspend"
 msgstr "PaÅ­zigi"
 
-#: src/global.c:937
+#: src/global.c:945
+#, fuzzy
+msgid "Comment Lines"
+msgstr "Linio suben"
+
+#: src/global.c:949
 msgid "Save"
 msgstr "Konservi nun"
 
-#: src/global.c:940
+#: src/global.c:952
 msgid "Previous"
 msgstr "AntaÅ­an okazon"
 
-#: src/global.c:942
+#: src/global.c:954
 msgid "Next"
 msgstr "Sekvan okazon"
 
-#: src/global.c:948
+#: src/global.c:960
 msgid "PrevHstory"
 msgstr "Pli olda"
 
-#: src/global.c:951
+#: src/global.c:963
 msgid "NextHstory"
 msgstr "Malpli olda"
 
-#: src/global.c:955
+#: src/global.c:972
 msgid "Go To Text"
 msgstr "Serĉi"
 
-#: src/global.c:959
+#: src/global.c:976
 msgid "DOS Format"
 msgstr "DOS-aranĝo"
 
-#: src/global.c:961
+#: src/global.c:978
 msgid "Mac Format"
 msgstr "Mac-aranĝo"
 
-#: src/global.c:969
+#: src/global.c:986
 msgid "Append"
 msgstr "Postglui"
 
-#: src/global.c:971
+#: src/global.c:988
 msgid "Prepend"
 msgstr "AntaÅ­glui"
 
-#: src/global.c:974
+#: src/global.c:991
 msgid "Backup File"
 msgstr "Savkopii"
 
-#: src/global.c:981
+#: src/global.c:998
 msgid "Execute Command"
 msgstr "Ruli komandon"
 
-#: src/global.c:996
+#: src/global.c:1013
 msgid "To Files"
 msgstr "Dosierlisto"
 
-#: src/global.c:1004
+#: src/global.c:1021
 msgid "First File"
 msgstr "Unua dosiero"
 
-#: src/global.c:1006
+#: src/global.c:1023
 msgid "Last File"
 msgstr "Lasta dosiero"
 
-#: src/global.c:1010
+#: src/global.c:1027
 msgid "Discard buffer"
 msgstr "Forĵeti"
 
+#: src/global.c:1038
+msgid "Left Column"
+msgstr ""
+
+#: src/global.c:1040
+msgid "Right Column"
+msgstr ""
+
 #. TRANSLATORS: Try to keep the next two strings at most 20 characters.
-#: src/global.c:1020
+#: src/global.c:1047
 msgid "Prev Lint Msg"
 msgstr "Antaŭa mesaĝo"
 
-#: src/global.c:1022
+#: src/global.c:1049
 msgid "Next Lint Msg"
 msgstr "Sekva mesaĝo"
 
 #. TRANSLATORS: The next seventeen strings are toggle descriptions;
 #. * they are best kept shorter than 40 characters, but may be longer.
-#: src/global.c:1285
+#: src/global.c:1316
 msgid "Help mode"
 msgstr "Helpaj linioj"
 
-#: src/global.c:1287
+#: src/global.c:1318
 msgid "Constant cursor position display"
 msgstr "DaÅ­ra montro de kursora pozicio"
 
-#: src/global.c:1289
+#: src/global.c:1320
 msgid "Use of one more line for editing"
 msgstr "Uzi unu plian linion por redakti"
 
-#: src/global.c:1291
+#: src/global.c:1322
 msgid "Smooth scrolling"
 msgstr "Rulumi linie"
 
-#: src/global.c:1293
+#: src/global.c:1324
 msgid "Soft wrapping of overlong lines"
 msgstr "Ĉirkaŭfluigo de tro longaj linioj"
 
-#: src/global.c:1295
+#: src/global.c:1326
 msgid "Whitespace display"
 msgstr "Montri blankan spacon"
 
-#: src/global.c:1297
+#: src/global.c:1328
 msgid "Color syntax highlighting"
 msgstr "Kolore montri sintakson"
 
-#: src/global.c:1299
+#: src/global.c:1330
 msgid "Smart home key"
 msgstr "Inteligenta klavo «Komencen»"
 
-#: src/global.c:1301
+#: src/global.c:1332
 msgid "Auto indent"
 msgstr "Aŭtomate deŝovi"
 
-#: src/global.c:1303
+#: src/global.c:1334
 msgid "Cut to end"
 msgstr "Tondi ekde kursoro ĝis linifino"
 
-#: src/global.c:1305
+#: src/global.c:1336
 msgid "Hard wrapping of overlong lines"
 msgstr "Faldi longajn liniojn (enmeti linifinon)"
 
-#: src/global.c:1307
+#: src/global.c:1338
 msgid "Conversion of typed tabs to spaces"
 msgstr "Konverti tajpatajn tabojn al spacoj"
 
-#: src/global.c:1309
+#: src/global.c:1340
 msgid "Backup files"
 msgstr "Fari savkopion de redaktota dosiero"
 
-#: src/global.c:1311
+#: src/global.c:1342
 msgid "Reading file into separate buffer"
 msgstr "Enmeti en nova bufro"
 
-#: src/global.c:1313
+#: src/global.c:1344
 msgid "Mouse support"
 msgstr "Subteno de muso"
 
-#: src/global.c:1315
+#: src/global.c:1346
 msgid "No conversion from DOS/Mac format"
 msgstr "Ne konverti el DOS-/Mac-aranĝo"
 
-#: src/global.c:1317
+#: src/global.c:1348
 msgid "Suspension"
 msgstr "PaÅ­zigebleco"
 
-#: src/help.c:209
+#: src/help.c:211
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1161,7 +1177,7 @@ msgstr ""
 " La antaŭa serĉendaĵo montriĝas inter krampoj post la serĉa invito -- premo "
 "de «Enigo» sen enigi iun ajn tekston kontinuigos tiun antaŭan serĉon.  "
 
-#: src/help.c:218
+#: src/help.c:220
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1175,7 +1191,7 @@ msgstr ""
 " La subaj klavkomandoj disponeblas en serĉa moduso:\n"
 "\n"
 
-#: src/help.c:224
+#: src/help.c:226
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1195,7 +1211,7 @@ msgstr ""
 " La subaj klavkomandoj disponeblas dum «Iri linion»:\n"
 "\n"
 
-#: src/help.c:233
+#: src/help.c:235
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1217,7 +1233,7 @@ msgstr ""
 "aŭ per ŝalto Meta-F), enmeti dosieron ŝargos ĝin en aparta bufro.  Uzu Meta-"
 "< kaj Meta-> por ŝalti inter bufroj.  "
 
-#: src/help.c:242
+#: src/help.c:244
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1231,7 +1247,7 @@ msgstr ""
 " La subaj klavkomandoj disponeblas dum «Enmeti dosieron»:\n"
 "\n"
 
-#: src/help.c:248
+#: src/help.c:250
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1257,7 +1273,7 @@ msgstr ""
 " La subaj klavkomandoj disponeblas dum «Konservi dosieron»:\n"
 "\n"
 
-#: src/help.c:262
+#: src/help.c:264
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1281,7 +1297,7 @@ msgstr ""
 " La subaj klavkomandoj disponeblas en la dosieresplorilo:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:277
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1304,7 +1320,7 @@ msgstr ""
 "«Enigo» sen enigi iun ajn tekston, kontinuigos tiun antaŭan serĉon.\n"
 "\n"
 
-#: src/help.c:284
+#: src/help.c:286
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1312,7 +1328,7 @@ msgstr ""
 " La subaj klavkomandoj disponeblas dum «Serĉi dosieron»:\n"
 "\n"
 
-#: src/help.c:288
+#: src/help.c:290
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1334,7 +1350,7 @@ msgstr ""
 " La subaj klavkomandoj disponeblas dum «Iri dosierujon»:\n"
 "\n"
 
-#: src/help.c:301
+#: src/help.c:303
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1358,7 +1374,7 @@ msgstr ""
 " La subaj klavkomandoj disponeblas dum «Literuma kontrolo»:\n"
 "\n"
 
-#: src/help.c:316
+#: src/help.c:318
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1378,7 +1394,7 @@ msgstr ""
 " La subaj klavkomandoj disponeblas dum «Ruli komandon»:\n"
 "\n"
 
-#: src/help.c:329
+#: src/help.c:331
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1398,15 +1414,15 @@ msgstr ""
 "redaktatan dosieron.  La tria linio ekde la fundo estas la stata linio, kiu "
 "montras gravajn mesaĝojn.  "
 
-#: src/help.c:339
+#: src/help.c:341
+#, fuzzy
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
-" The notation for shortcuts is as follows: Control-key sequences are notated "
-"with a caret (^) symbol and can be entered either by using the Control "
-"(Ctrl) key or pressing the Escape (Esc) key twice.  Escape-key sequences are "
-"notated with the Meta (M-) symbol and can be entered using either the Esc, "
-"Alt, or Meta key depending on your keyboard setup.  "
+" Shortcuts are written as follows: Control-key sequences are notated with a "
+"'^' and can be entered either by using the Ctrl key or pressing the Esc key "
+"twice.  Meta-key sequences are notated with 'M-' and can be entered using "
+"either the Alt, Cmd, or Esc key, depending on your keyboard setup.  "
 msgstr ""
 "La du fundaj linioj montras la plej uzatajn klavkomandojn de la redaktilo.\n"
 "\n"
@@ -1435,19 +1451,19 @@ msgstr ""
 msgid "enable/disable"
 msgstr " (ŝalto)"
 
-#: src/nano.c:559
+#: src/nano.c:560
 msgid "Key is invalid in view mode"
 msgstr "Klavo ne validas en rigarda reĝimo"
 
-#: src/nano.c:565
+#: src/nano.c:566
 msgid "This function is disabled in restricted mode"
 msgstr "Ĉi tiu funkcio malebligatas dum limigita reĝimo"
 
-#: src/nano.c:573
+#: src/nano.c:574
 msgid "Help is not available"
 msgstr "Helpo ne haveblas"
 
-#: src/nano.c:684
+#: src/nano.c:686
 #, c-format
 msgid ""
 "\n"
@@ -1456,7 +1472,7 @@ msgstr ""
 "\n"
 "Bufro skribiĝis al %s\n"
 
-#: src/nano.c:686
+#: src/nano.c:688
 #, c-format
 msgid ""
 "\n"
@@ -1465,7 +1481,7 @@ msgstr ""
 "\n"
 "Bufro ne skribiĝis al %s: %s\n"
 
-#: src/nano.c:689
+#: src/nano.c:691
 #, c-format
 msgid ""
 "\n"
@@ -1727,17 +1743,22 @@ msgstr "ebligi paÅ­zigon"
 msgid "Enable soft line wrapping"
 msgstr "ĉirkaŭfluigi longajn liniojn"
 
-#: src/nano.c:937
-#, c-format
-msgid " GNU nano, version %s\n"
+#: src/nano.c:940
+#, fuzzy, c-format
+msgid " nano, version %s\n"
 msgstr " GNU nano, versio %s\n"
 
-#: src/nano.c:940
+#: src/nano.c:943
+#, c-format
+msgid " (C) 2014..%s the contributors to nano\n"
+msgstr ""
+
+#: src/nano.c:945
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr " Retpoŝto: <nano@nano-editor.org>    TTT: http://www.nano-editor.org/"
 
-#: src/nano.c:941
+#: src/nano.c:946
 #, c-format
 msgid ""
 "\n"
@@ -1746,67 +1767,82 @@ msgstr ""
 "\n"
 " Kompilaj opcioj:"
 
-#: src/nano.c:1073
+#: src/nano.c:1081
 msgid "No file name"
 msgstr "Vaka dosiernomo"
 
-#: src/nano.c:1108
-msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
-msgstr "Ĉu konservi modifitan bufron? ('N' DETRUOS ŜANĜOJN) "
+#: src/nano.c:1115
+msgid "Save modified buffer?  (Answering \"No\" will DISCARD changes.) "
+msgstr ""
 
-#: src/nano.c:1168
+#: src/nano.c:1178
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "Maleblas remalfermi klavaron kiel ĉefenigujon\n"
 
-#: src/nano.c:1192
+#: src/nano.c:1202
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "Legado el ĉefenigujo; ^C por ĉesigi\n"
 
-#: src/nano.c:1256
+#: src/nano.c:1266
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Ricevitas SIGHUP aÅ­ SIGTERM\n"
 
-#: src/nano.c:1272
+#: src/nano.c:1282
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Uzu 'fg' por reveni al 'nano'.\n"
 
-#: src/nano.c:1294
+#: src/nano.c:1304
 msgid "Suspension is not enabled"
 msgstr "Paŭzigebleco ne enŝaltitas"
 
-#: src/nano.c:1448
+#: src/nano.c:1459
 msgid "enabled"
 msgstr "(enŝaltitas)"
 
-#: src/nano.c:1448
+#: src/nano.c:1459
 msgid "disabled"
 msgstr "(malŝaltitas)"
 
-#: src/nano.c:1607 src/winio.c:1125
-msgid "Unknown Command"
-msgstr "Nekonata komando"
+#: src/nano.c:1573
+msgid "Unbound key"
+msgstr ""
+
+#: src/nano.c:1577
+#, c-format
+msgid "Unbound key: M-%c"
+msgstr ""
+
+#: src/nano.c:1579
+#, c-format
+msgid "Unbound key: ^%c"
+msgstr ""
 
-#: src/nano.c:1720
+#: src/nano.c:1581
+#, c-format
+msgid "Unbound key: %c"
+msgstr ""
+
+#: src/nano.c:1745
 msgid "XON ignored, mumble mumble"
 msgstr "Mmm-mmm, XON ignoratas"
 
-#: src/nano.c:1725
+#: src/nano.c:1750
 msgid "XOFF ignored, mumble mumble"
 msgstr "Mmm-mmm, XOFF ignoratas"
 
-#: src/nano.c:2139 src/rcfile.c:1334
+#: src/nano.c:2166 src/rcfile.c:1187
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Petata tablarĝo '%s' ne validas"
 
-#: src/nano.c:2200 src/rcfile.c:1259
+#: src/nano.c:2227 src/rcfile.c:1128
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Petata faldlarĝo '%s' ne validas"
 
-#: src/nano.c:2247
+#: src/nano.c:2276
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr "Tajpu '%s -h' por vidi liston de eblaj opcioj.\n"
@@ -1814,116 +1850,120 @@ msgstr "Tajpu '%s -h' por vidi liston de eblaj opcioj.\n"
 #. TRANSLATORS: For the next three strings, if possible, specify
 #. * the single-byte shortcuts for both your language and English.
 #. * For example, in French: "OoYy" for "Oui".
-#: src/prompt.c:821
+#: src/prompt.c:818
 msgid "Yy"
 msgstr "JjYy"
 
-#: src/prompt.c:822
+#: src/prompt.c:819
 msgid "Nn"
 msgstr "Nn"
 
 # Tute, All.
 # "Ĉiujn" ne eblas, ĉar plurbitokajn klavojn 'nano' ĉi tie ne komprenas.
-#: src/prompt.c:823
+#: src/prompt.c:820
 msgid "Aa"
 msgstr "TtCcAa"
 
-#: src/prompt.c:845
+#: src/prompt.c:842
 msgid "Yes"
 msgstr "Jes"
 
-#: src/prompt.c:850
+#: src/prompt.c:847
 msgid "All"
 msgstr "Tute"
 
-#: src/prompt.c:855
+#: src/prompt.c:852
 msgid "No"
 msgstr "Ne"
 
-#: src/rcfile.c:142
+#: src/rcfile.c:144
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Eraro en %s en linio %lu: "
 
-#: src/rcfile.c:201
+#: src/rcfile.c:203
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "Argumento '%s' havas senparan citilon \""
 
-#: src/rcfile.c:228 src/rcfile.c:280 src/rcfile.c:732 src/rcfile.c:793
-#: src/rcfile.c:882 src/rcfile.c:933
+#: src/rcfile.c:231 src/rcfile.c:674 src/rcfile.c:725 src/rcfile.c:824
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Regulesprimaj signoĉenoj devas komenci kaj fini kun citilo \""
 
-#: src/rcfile.c:254 src/search.c:62
+#: src/rcfile.c:257 src/search.c:61
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Malbonas regulesprimo \"%s\": %s"
 
-#: src/rcfile.c:274
+#: src/rcfile.c:279
 msgid "Missing syntax name"
 msgstr "Mankas nomo de sintakso"
 
-#: src/rcfile.c:345
+#: src/rcfile.c:288
+msgid "A syntax name must be quoted"
+msgstr ""
+
+#: src/rcfile.c:297
 msgid "The \"none\" syntax is reserved"
 msgstr "Sintakso 'none' estas rezervita"
 
-#: src/rcfile.c:352
-msgid "The \"default\" syntax must take no extensions"
+#: src/rcfile.c:327
+#, fuzzy
+msgid "The \"default\" syntax does not accept extensions"
 msgstr "Sintakso 'default' ne permesas finaĵojn"
 
-#: src/rcfile.c:424
+#: src/rcfile.c:369
 msgid "Missing key name"
 msgstr "Mankas nomo de klavo"
 
-#: src/rcfile.c:433 src/rcfile.c:444
+#: src/rcfile.c:378 src/rcfile.c:389
 msgid "Key name is too short"
 msgstr "Klavnomo tro mallongas"
 
-#: src/rcfile.c:454
+#: src/rcfile.c:399
 msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr "Klavnomo devas komenci kun '^', 'M', aÅ­ 'F'"
 
-#: src/rcfile.c:457
+#: src/rcfile.c:402
 #, c-format
 msgid "Key name %s is invalid"
 msgstr "Klavnomo '%s' ne validas"
 
-#: src/rcfile.c:466
+#: src/rcfile.c:411
 msgid "Must specify a function to bind the key to"
 msgstr "Mankas funkcio al kiu ligi klavon"
 
 #. TRANSLATORS: Do not translate the word "all".
-#: src/rcfile.c:476
+#: src/rcfile.c:421
 msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr "Mankas menuo (aÅ­ 'all') en kiu ligi/malligi la klavon"
 
-#: src/rcfile.c:483
+#: src/rcfile.c:428
 #, c-format
 msgid "Cannot map name \"%s\" to a function"
 msgstr "Ĉeno '%s' ne estas nomo de funkcio"
 
-#: src/rcfile.c:490
+#: src/rcfile.c:435
 #, c-format
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "Ĉeno '%s' ne estas nomo de menuo"
 
-#: src/rcfile.c:522
+#: src/rcfile.c:467
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr "Funkcio '%s' ne ekzistas en menuo '%s'"
 
-#: src/rcfile.c:534
+#: src/rcfile.c:479
 #, c-format
 msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "Ne eblas religi klavĉenon '%s'"
 
-#: src/rcfile.c:631
+#: src/rcfile.c:576
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr "Eraro dum malvolvo de %s: %s"
 
-#: src/rcfile.c:674
+#: src/rcfile.c:616
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1938,122 +1978,111 @@ msgstr ""
 "'magenta' (fuksina), 'yellow' (flava), 'cyan' (cejana), 'black' (nigra) kaj\n"
 "'white' (blanka), kun la ebla prefikso 'bright' (hela) por malfonaj koloroj."
 
-#: src/rcfile.c:696
-msgid "Cannot add a color command without a syntax command"
-msgstr "Ne eblas aldoni komandon 'color' sen komando 'syntax'"
+#: src/rcfile.c:637 src/rcfile.c:795 src/rcfile.c:858
+#, c-format
+msgid "A '%s' command requires a preceding 'syntax' command"
+msgstr ""
 
-#: src/rcfile.c:701
+#: src/rcfile.c:643
 msgid "Missing color name"
 msgstr "Mankas nomo de koloro"
 
-#: src/rcfile.c:711 src/rcfile.c:872
-msgid "Missing regex string"
-msgstr "Mankas regulesprima signoĉeno"
+#: src/rcfile.c:653 src/rcfile.c:807
+#, fuzzy, c-format
+msgid "Missing regex string after '%s' command"
+msgstr "Mankas programnomo post 'linter'"
 
-#: src/rcfile.c:787
+#: src/rcfile.c:719
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "'start=' bezonas paran 'end='"
 
-#: src/rcfile.c:839
+#: src/rcfile.c:768
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
 msgstr "Fona koloro '%s' ne povas esti hela"
 
-#: src/rcfile.c:867
-msgid "Cannot add a header regex without a syntax command"
-msgstr "Ne eblas aldoni regulesprimon por kaplinio sen komando 'syntax'"
-
-#: src/rcfile.c:922
-msgid "Cannot add a magic string regex without a syntax command"
-msgstr "Ne eblas aldoni regulesprimon por magia signoĉeno sen komando 'syntax'"
-
-#: src/rcfile.c:927
-msgid "Missing magic string name"
-msgstr "Mankas nomo de magia signoĉeno"
-
-#: src/rcfile.c:985
-msgid "Cannot add a linter without a syntax command"
-msgstr "Ne eblas aldoni komandon por 'linter' sen komando 'syntax'"
+#: src/rcfile.c:802
+#, fuzzy, c-format
+msgid "The \"default\" syntax does not accept '%s' regexes"
+msgstr "Sintakso 'default' ne permesas finaĵojn"
 
-#: src/rcfile.c:990
-msgid "Missing linter command"
+#: src/rcfile.c:863
+#, fuzzy, c-format
+msgid "Missing command after '%s'"
 msgstr "Mankas programnomo post 'linter'"
 
-#: src/rcfile.c:1011
-msgid "Cannot add formatter without a syntax command"
-msgstr "Ne eblas aldoni komandon por 'formatter' sen komando 'syntax'"
-
-#: src/rcfile.c:1016
-msgid "Missing formatter command"
-msgstr "Mankas programnomo post 'formatter'"
+#: src/rcfile.c:879
+#, fuzzy, c-format
+msgid "Argument of '%s' lacks closing \""
+msgstr "Argumento '%s' havas senparan citilon \""
 
-#: src/rcfile.c:1046
+#: src/rcfile.c:910
 #, c-format
 msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr "Neignorebla eraro: neniu klavo ligita al funkcio '%s'.  Eliro.\n"
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:912
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr "Se necesas, uzu 'nano -I' por ĝustigi la agordojn en 'nanorc'.\n"
 
-#: src/rcfile.c:1109
+#: src/rcfile.c:971
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "Ne troviĝas sintakso '%s' por pliampleksigi"
 
-#: src/rcfile.c:1125 src/rcfile.c:1134 src/rcfile.c:1144
-#, c-format
-msgid "Command \"%s\" not allowed in included file"
-msgstr "Komando '%s' ne permesatas en inkluda dosiero"
-
-#: src/rcfile.c:1150 src/rcfile.c:1359
+#: src/rcfile.c:993 src/rcfile.c:1202
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Sintakso '%s' ne havas kolorajn komandojn"
 
-#: src/rcfile.c:1180
+#: src/rcfile.c:1024
+#, c-format
+msgid "Command \"%s\" not allowed in included file"
+msgstr "Komando '%s' ne permesatas en inkluda dosiero"
+
+#: src/rcfile.c:1039
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Komando '%s' ne estas komprenata"
 
-#: src/rcfile.c:1195
+#: src/rcfile.c:1051
 msgid "Missing option"
 msgstr "Mankas opcio"
 
-#: src/rcfile.c:1217
+#: src/rcfile.c:1065
+#, c-format
+msgid "Unknown option \"%s\""
+msgstr "Nekonata opcio '%s'"
+
+#: src/rcfile.c:1077
+#, c-format
+msgid "Cannot unset option \"%s\""
+msgstr "Ne eblas malŝalti opcion '%s'"
+
+#: src/rcfile.c:1089
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Opcio '%s' bezonas argumenton"
 
-#: src/rcfile.c:1235
+#: src/rcfile.c:1105
 msgid "Option is not a valid multibyte string"
 msgstr "Opcia argumento ne estas valida plurbitoka signoĉeno"
 
-#: src/rcfile.c:1272 src/rcfile.c:1300 src/rcfile.c:1309
+#: src/rcfile.c:1139 src/rcfile.c:1160 src/rcfile.c:1167
 msgid "Non-blank characters required"
 msgstr "Neblankaj signoj bezonatas"
 
-#: src/rcfile.c:1282
+#: src/rcfile.c:1146
 msgid "Two single-column characters required"
 msgstr "Du unukolumnaj signoj bezonatas"
 
-#: src/rcfile.c:1348
-#, c-format
-msgid "Cannot unset option \"%s\""
-msgstr "Ne eblas malŝalti opcion '%s'"
-
-#: src/rcfile.c:1354
-#, c-format
-msgid "Unknown option \"%s\""
-msgstr "Nekonata opcio '%s'"
-
-#: src/rcfile.c:1413
+#: src/rcfile.c:1258
 msgid "I can't find my home directory!  Wah!"
 msgstr "Malsukcesis trovi hejman dosierujon.  Ve!"
 
-#: src/rcfile.c:1451
+#: src/rcfile.c:1295
 #, c-format
 msgid ""
 "\n"
@@ -2062,44 +2091,49 @@ msgstr ""
 "\n"
 "Premu 'Enter' por daŭrigi la lanĉon de 'nano'.\n"
 
-#: src/search.c:96
+#: src/search.c:95
 #, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "'%.*s%s' ne trovatas"
 
 #. TRANSLATORS: The next three strings are modifiers of the search prompt.
-#: src/search.c:176
+#: src/search.c:169
 msgid " [Case Sensitive]"
 msgstr " [usklecdistinge]"
 
-#: src/search.c:180
+#: src/search.c:173
 msgid " [Regexp]"
 msgstr " [regulesprime]"
 
-#: src/search.c:184
+#: src/search.c:177
 msgid " [Backwards]"
 msgstr " [malantaÅ­en]"
 
 #. TRANSLATORS: The next two strings are modifiers of the search prompt.
-#: src/search.c:189
+#: src/search.c:182
 msgid " (to replace) in selection"
 msgstr " (por anstataŭigi) en markaĵo"
 
-#: src/search.c:191
+#: src/search.c:184
 msgid " (to replace)"
 msgstr " (por anstataÅ­igi)"
 
+#: src/search.c:305
+#, fuzzy
+msgid "Searching..."
+msgstr "Serĉi"
+
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:718
+#: src/search.c:693
 msgid "Replace this instance?"
 msgstr "Anstataŭigi ĉi tiun aperaĵon?"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:883
+#: src/search.c:840
 msgid "Replace with"
 msgstr "AnstataÅ­igi per"
 
-#: src/search.c:924
+#: src/search.c:875
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
@@ -2107,297 +2141,386 @@ msgstr[0] "Anstataŭiĝis %lu aperaĵo"
 msgstr[1] "Anstataŭiĝis %lu aperaĵoj"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:964
+#: src/search.c:914
 msgid "Enter line number, column number"
 msgstr "Enigu linionumeron, kolumnonumeron"
 
-#: src/search.c:991
+#: src/search.c:939
 msgid "Invalid line or column number"
 msgstr "Ne validas numero de linio aÅ­ kolumno"
 
-#: src/search.c:1124
+#: src/search.c:1080
 msgid "Not a bracket"
 msgstr "Ne estas krampo"
 
-#: src/search.c:1191
+#: src/search.c:1146
 msgid "No matching bracket"
 msgstr "Ne ekzistas para krampo"
 
-#: src/text.c:54
+#: src/text.c:53
 msgid "Mark Set"
 msgstr "Markado enŝaltitas"
 
-#: src/text.c:58
+#: src/text.c:57
 msgid "Mark Unset"
 msgstr "Malŝaltitas"
 
-#: src/text.c:70
+#: src/text.c:69
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Eraro dum lanĉo de '%s'"
 
-#: src/text.c:475
+#: src/text.c:468
+msgid "Commenting is not supported for this file type"
+msgstr ""
+
+#: src/text.c:484
+msgid "Cannot comment past end of file"
+msgstr ""
+
+#: src/text.c:677
 msgid "Nothing in undo buffer!"
 msgstr "Nenio por malfari!"
 
-#: src/text.c:481 src/text.c:634
-#, c-format
-msgid "Internal error: can't match line %d.  Please save your work."
-msgstr "**Programeraro**: ne eblas kongrui linion %d.  Konservu vian laboron."
-
 #. TRANSLATORS: Eight of the next nine strings describe actions
 #. * that are undone or redone.  It are all nouns, not verbs.
-#: src/text.c:495 src/text.c:524 src/text.c:645 src/text.c:686
+#: src/text.c:695 src/text.c:724 src/text.c:857 src/text.c:898
 msgid "text add"
 msgstr "teksta aldono"
 
-#: src/text.c:505 src/text.c:656
+#: src/text.c:705 src/text.c:868
 msgid "text delete"
 msgstr "teksta forigo"
 
-#: src/text.c:528 src/text.c:694
+#: src/text.c:728 src/text.c:907
 msgid "line join"
 msgstr "linikunigo"
 
-#: src/text.c:547 src/text.c:710
+#: src/text.c:747 src/text.c:923
 msgid "text cut"
 msgstr "teksta eltondo"
 
-#: src/text.c:552 src/text.c:714
+#: src/text.c:752 src/text.c:927
 msgid "text uncut"
 msgstr "teksta algluo"
 
-#: src/text.c:558 src/text.c:691
+#: src/text.c:758 src/text.c:903
 msgid "Internal error: line is missing.  Please save your work."
 msgstr "**Programeraro**: mankas linio.  Konservu vian laboron."
 
-#: src/text.c:561 src/text.c:665
+#: src/text.c:762 src/text.c:877
 msgid "line break"
 msgstr "linifaldo"
 
-#: src/text.c:569 src/text.c:725
+#: src/text.c:772 src/text.c:947
+msgid "comment"
+msgstr ""
+
+#: src/text.c:776 src/text.c:951
+msgid "uncomment"
+msgstr ""
+
+#: src/text.c:780 src/text.c:938
 msgid "text insert"
 msgstr "teksta enmeto"
 
-#: src/text.c:589 src/text.c:718
+#: src/text.c:800 src/text.c:931
 msgid "text replace"
 msgstr "teksta anstataÅ­igo"
 
-#: src/text.c:596 src/text.c:732 src/text.c:1030 src/text.c:1174
+#: src/text.c:807 src/text.c:955 src/text.c:1267 src/text.c:1437
 msgid "Internal error: unknown type.  Please save your work."
 msgstr "**Programeraro**: nekonata tipo.  Konservu vian laboron."
 
-#: src/text.c:601
+#: src/text.c:813
 #, c-format
 msgid "Undid action (%s)"
 msgstr "Malfariĝis ago (%s)"
 
-#: src/text.c:619
+#: src/text.c:832
 msgid "Nothing to re-do!"
 msgstr "Nenio por refari!"
 
-#: src/text.c:628
+#: src/text.c:841
 msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr "**Programeraro**: ne eblas prepari refaron.  Konservu vian laboron."
 
-#: src/text.c:737
+#: src/text.c:961
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Refariĝis ago (%s)"
 
-#: src/text.c:827 src/text.c:2508 src/text.c:2944
+#: src/text.c:1051 src/text.c:2765 src/text.c:3198
 msgid "Could not create pipe"
 msgstr "Malsukcesis krei dukton"
 
-#: src/text.c:853 src/text.c:2595 src/text.c:2750 src/text.c:2992
-#: src/text.c:3286
+#: src/text.c:1077 src/text.c:2852 src/text.c:3005 src/text.c:3246
+#: src/text.c:3540
 msgid "Could not fork"
 msgstr "Malsukcesis krei novan procezon"
 
-#: src/text.c:1853
+#: src/text.c:2117
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Signoĉeno de citiloj %s ne validas: %s"
 
-#: src/text.c:2241
+#: src/text.c:2499
 msgid "Can now UnJustify!"
 msgstr "Nun eblas malrektigi!"
 
-#: src/text.c:2435
+#: src/text.c:2697
 msgid "Edit a replacement"
 msgstr "Redakti anstataÅ­igon"
 
-#: src/text.c:2510
+#. TRANSLATORS: Shown after fixing misspellings in one word.
+#: src/text.c:2713
+#, fuzzy
+msgid "Next word..."
+msgstr "Posta vorto"
+
+#: src/text.c:2767
 msgid "Creating misspelled word list, please wait..."
 msgstr "Kreado de listo de misliterumataj vortoj; bonvolu atendi..."
 
-#: src/text.c:2601 src/text.c:2999
+#: src/text.c:2858 src/text.c:3253
 msgid "Could not get size of pipe buffer"
 msgstr "Ne eblas scii grandon de dukta bufro"
 
-#: src/text.c:2652
+#: src/text.c:2907
 msgid "Error invoking \"spell\""
 msgstr "Eraro dum lanĉo de 'spell'"
 
-#: src/text.c:2655
+#: src/text.c:2910
 msgid "Error invoking \"sort -f\""
 msgstr "Eraro dum lanĉo de 'sort -f'"
 
-#: src/text.c:2658
+#: src/text.c:2913
 msgid "Error invoking \"uniq\""
 msgstr "Eraro dum lanĉo de 'uniq'"
 
-#: src/text.c:2881
+#: src/text.c:3135
 msgid "Invoking spell checker, please wait"
 msgstr "Ekruliĝas literumilo; bonvolu atendi..."
 
-#: src/text.c:2897
+#: src/text.c:3151
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Literuma kontrolo malsukcesis: %s"
 
-#: src/text.c:2899
+#: src/text.c:3153
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Literuma kontrolo malsukcesis: %s: %s"
 
-#: src/text.c:2902
+#: src/text.c:3156
 msgid "Finished checking spelling"
 msgstr "Finiĝis literuma kontrolo"
 
-#: src/text.c:2927
+#: src/text.c:3181
 msgid "No linter defined for this type of file!"
 msgstr "Ne definiĝis sintaks-kontrolilo por ĉi tiu tipo de dosiero"
 
-#: src/text.c:2932
+#: src/text.c:3186
 msgid "Save modified buffer before linting?"
 msgstr "Ĉu konservi modifitan bufron antaŭ la kontrolo? "
 
-#: src/text.c:2949
+#: src/text.c:3203
 msgid "Invoking linter, please wait"
 msgstr "Ekruliĝas sintaks-kontrolilo; bonvolu atendi..."
 
-#: src/text.c:3105
+#: src/text.c:3358
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr "Riceviĝis nul analizeblaj linioj de la komando «%s»"
 
-#: src/text.c:3134
+#: src/text.c:3388
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
 "Ĉi tiu mesaĝo estas por malferma dosiero %s; ĉu malfermi ĝin en nova bufro? "
 
-#: src/text.c:3153
+#: src/text.c:3407
 msgid "No more errors in unopened files, cancelling"
 msgstr "Ne estas pliaj eraroj en malfermitaj dosieroj; rezigno"
 
 # La sekvaj mesaĝoj komencas en traduko per minusklo,
 # ĉar ili estas komandlinia helpteksto, kaj tiel normalas.
-#: src/text.c:3192
+#: src/text.c:3446
 msgid "At last message"
 msgstr "Ĉi tiu estas la lasta mesaĝo"
 
 # La sekvaj mesaĝoj komencas en traduko per minusklo,
 # ĉar ili estas komandlinia helpteksto, kaj tiel normalas.
-#: src/text.c:3197
+#: src/text.c:3451
 msgid "At first message"
 msgstr "Ĉi tiu estas la unua mesaĝo"
 
-#: src/text.c:3237
+#: src/text.c:3491
 msgid "Finished"
 msgstr "Pretas"
 
-#: src/text.c:3259
+#: src/text.c:3513
 msgid "Invoking formatter, please wait"
 msgstr "Ekruliĝas aranĝilo; bonvolu atendi..."
 
-#: src/text.c:3314
+#: src/text.c:3568
 msgid "Finished formatting"
 msgstr "Pretas la aranĝado"
 
-#: src/text.c:3396
+#: src/text.c:3650
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%svortoj: %lu  linioj: %ld  literoj: %lu"
 
-#: src/text.c:3397
+#: src/text.c:3651
 msgid "In Selection:  "
 msgstr "En markaĵo:  "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3411
+#: src/text.c:3665
 msgid "Verbatim Input"
 msgstr "Konforma enigo"
 
-#: src/utils.c:391 src/utils.c:403
+#: src/utils.c:392 src/utils.c:404
 msgid "nano is out of memory!"
 msgstr "Mankas sufiĉa memoro por 'nano'!"
 
+#: src/utils.c:625
+#, c-format
+msgid "Internal error: can't match line %d.  Please save your work."
+msgstr "**Programeraro**: ne eblas kongrui linion %d.  Konservu vian laboron."
+
+#. TRANSLATORS: This refers to a sequence of escape codes
+#. * (from the keyboard) that nano does not know about.
+#: src/winio.c:1121
+msgid "Unknown sequence"
+msgstr ""
+
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
 #: src/winio.c:1427
 msgid "Unicode Input"
 msgstr "Enigo de Unikodo"
 
-#: src/winio.c:1991 src/winio.c:1995
-msgid "Modified"
-msgstr "Ŝanĝita"
-
-#: src/winio.c:1992
-msgid "View"
-msgstr "Nur rigardi"
-
-#: src/winio.c:2006
+#: src/winio.c:1960
 msgid "DIR:"
 msgstr "DOSIERUJO:"
 
-#: src/winio.c:2013
+#: src/winio.c:1968
 msgid "File:"
 msgstr "Dosiero:"
 
-#: src/winio.c:3141
+#: src/winio.c:1972 src/winio.c:1976
+msgid "Modified"
+msgstr "Ŝanĝita"
+
+#: src/winio.c:1974
+msgid "View"
+msgstr "Nur rigardi"
+
+#: src/winio.c:3105
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "linio %ld/%ld (%d%%), kolumno %lu/%lu (%d%%), litero %lu/%lu (%d%%)"
 
-#: src/winio.c:3271
+#: src/winio.c:3235
 msgid "The nano text editor"
 msgstr "La tekstredaktilo 'nano'"
 
-#: src/winio.c:3272
+#: src/winio.c:3236
 msgid "version"
 msgstr "versio"
 
-#: src/winio.c:3273
+#: src/winio.c:3237
 msgid "Brought to you by:"
 msgstr "Prezentita al vi per:"
 
-#: src/winio.c:3274
+#: src/winio.c:3238
 msgid "Special thanks to:"
 msgstr "Specialan dankon al:"
 
-#: src/winio.c:3275
+#: src/winio.c:3239
 msgid "The Free Software Foundation"
 msgstr "la “Free Software Foundation”"
 
-#: src/winio.c:3276
+#: src/winio.c:3240
 msgid "the many translators and the TP"
 msgstr "la multaj tradukantoj kaj la TP"
 
-#: src/winio.c:3277
+#: src/winio.c:3241
 msgid "For ncurses:"
 msgstr "por 'ncurses':"
 
-#: src/winio.c:3278
+#: src/winio.c:3242
 msgid "and anyone else we forgot..."
 msgstr "kaj iuj ajn kiujn ni forgesis..."
 
-#: src/winio.c:3279
+#: src/winio.c:3243
 msgid "Thank you for using nano!"
 msgstr "Dankon pro via uzo de 'nano'!"
 
+#~ msgid ""
+#~ "Read %lu line (Converted from DOS and Mac format - Warning: No write "
+#~ "permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from DOS and Mac format - Warning: No write "
+#~ "permission)"
+#~ msgstr[0] ""
+#~ "Legiĝis %lu linio (konvertita el DOS- kaj Mac-aranĝo -- NE skribeblas)"
+#~ msgstr[1] ""
+#~ "Legiĝis %lu linioj (konvertitaj el DOS- kaj Mac-aranĝo -- NE skribeblas)"
+
+#~ msgid ""
+#~ "Read %lu line (Converted from Mac format - Warning: No write permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from Mac format - Warning: No write permission)"
+#~ msgstr[0] "Legiĝis %lu linio (konvertita el Mac-aranĝo -- NE skribeblas)"
+#~ msgstr[1] "Legiĝis %lu linioj (konvertitaj el Mac-aranĝo -- NE skribeblas)"
+
+#~ msgid ""
+#~ "Read %lu line (Converted from DOS format - Warning: No write permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from DOS format - Warning: No write permission)"
+#~ msgstr[0] "Legiĝis %lu linio (konvertita el DOS-aranĝo -- NE skribeblas)"
+#~ msgstr[1] "Legiĝis %lu linioj (konvertitaj el DOS-aranĝo -- NE skribeblas)"
+
+#~ msgid "Read %lu line (Warning: No write permission)"
+#~ msgid_plural "Read %lu lines (Warning: No write permission)"
+#~ msgstr[0] "Legiĝis %lu linio  (Averto: dosiero NE skribeblas)"
+#~ msgstr[1] "Legiĝis %lu linioj  (Averto: dosiero NE skribeblas)"
+
+#~ msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
+#~ msgstr "Ĉu konservi modifitan bufron? ('N' DETRUOS ŜANĜOJN) "
+
+#~ msgid "Unknown Command"
+#~ msgstr "Nekonata komando"
+
+#~ msgid "Cannot add a color command without a syntax command"
+#~ msgstr "Ne eblas aldoni komandon 'color' sen komando 'syntax'"
+
+#~ msgid "Missing regex string"
+#~ msgstr "Mankas regulesprima signoĉeno"
+
+#~ msgid "Cannot add a header regex without a syntax command"
+#~ msgstr "Ne eblas aldoni regulesprimon por kaplinio sen komando 'syntax'"
+
+#~ msgid "Cannot add a magic string regex without a syntax command"
+#~ msgstr ""
+#~ "Ne eblas aldoni regulesprimon por magia signoĉeno sen komando 'syntax'"
+
+#~ msgid "Missing magic string name"
+#~ msgstr "Mankas nomo de magia signoĉeno"
+
+#~ msgid "Cannot add a linter without a syntax command"
+#~ msgstr "Ne eblas aldoni komandon por 'linter' sen komando 'syntax'"
+
+#~ msgid "Cannot add formatter without a syntax command"
+#~ msgstr "Ne eblas aldoni komandon por 'formatter' sen komando 'syntax'"
+
+#~ msgid "Missing formatter command"
+#~ msgstr "Mankas programnomo post 'formatter'"
+
 #~ msgid "Cannot prepend or append to a symlink with --nofollow set"
 #~ msgstr ""
 #~ "Kun \"--nofollow\" ne eblas antaÅ­glui nek postglui al simbola ligilo"
diff --git a/po/es.po b/po/es.po
index 32316aee..551a16bd 100644
--- a/po/es.po
+++ b/po/es.po
@@ -10,10 +10,10 @@
 # Antonio Ceballos <aceballos@gmail.com>, 2015, 2016.
 msgid ""
 msgstr ""
-"Project-Id-Version: nano-2.5.1\n"
+"Project-Id-Version: nano-2.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-25 16:41-0500\n"
-"PO-Revision-Date: 2016-01-23 20:05+0100\n"
+"POT-Creation-Date: 2016-06-17 15:41+0200\n"
+"PO-Revision-Date: 2016-02-28 17:12+0100\n"
 "Last-Translator: Antonio Ceballos <aceballos@gmail.com>\n"
 "Language-Team: Spanish <es@tp.org.es>\n"
 "Language: es\n"
@@ -23,381 +23,356 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Lokalize 1.0\n"
 
+#: src/browser.c:144 src/browser.c:284 src/browser.c:334 src/files.c:996
+#: src/files.c:1003 src/files.c:1794 src/files.c:1919 src/files.c:1963
+#: src/files.c:1983 src/files.c:2099 src/files.c:3019 src/files.c:3242
+#: src/rcfile.c:540 src/rcfile.c:1280
+#, c-format
+msgid "Error reading %s: %s"
+msgstr "Error leyendo «%s»: %s"
+
 #. TRANSLATORS: This is a prompt.
-#: src/browser.c:220
+#: src/browser.c:247
 msgid "Go To Directory"
 msgstr "Ir al directorio"
 
-#: src/browser.c:227 src/browser.c:738 src/files.c:1174 src/files.c:2340
-#: src/nano.c:1120 src/search.c:202 src/search.c:290 src/search.c:895
-#: src/search.c:970 src/text.c:2935 src/text.c:3142
+#: src/browser.c:254 src/browser.c:723 src/files.c:1126 src/files.c:2292
+#: src/nano.c:1128 src/search.c:195 src/search.c:297 src/search.c:851
+#: src/search.c:918 src/text.c:3189 src/text.c:3396
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: src/browser.c:253 src/browser.c:300
-#, c-format
-msgid "Can't go outside of %s in restricted mode"
+#. TRANSLATORS: This refers to the option --operatingdir,
+#. * not to --restricted.
+#: src/browser.c:274 src/browser.c:326
+#, fuzzy, c-format
+msgid "Can't go outside of %s in confined mode"
 msgstr "No se puede salir de %s en modo restringido"
 
-#: src/browser.c:264 src/browser.c:310 src/browser.c:326 src/files.c:1044
-#: src/files.c:1052 src/files.c:1844 src/files.c:1971 src/files.c:2016
-#: src/files.c:2037 src/files.c:2156 src/files.c:3062 src/files.c:3285
-#: src/rcfile.c:596 src/rcfile.c:1435
-#, c-format
-msgid "Error reading %s: %s"
-msgstr "Error leyendo «%s»: %s"
-
-#: src/browser.c:290
+#: src/browser.c:317
 msgid "Can't move up a directory"
 msgstr "No se puede ascender de directorio"
 
 #. TRANSLATORS: Try to keep this at most 7 characters.
-#: src/browser.c:615 src/browser.c:623
+#: src/browser.c:590 src/browser.c:598
 msgid "(dir)"
 msgstr "(dir)"
 
 #. TRANSLATORS: Try to keep this at most 12 characters.
-#: src/browser.c:620
+#: src/browser.c:595
 msgid "(parent dir)"
 msgstr "(dir padre)"
 
 #. TRANSLATORS: Try to keep this at most 7 characters.
 #. * If necessary, you can leave out the parentheses.
-#: src/browser.c:650
+#: src/browser.c:625
 msgid "(huge)"
 msgstr "enorme"
 
 #. TRANSLATORS: This is the main search prompt.
-#: src/browser.c:727 src/search.c:173
+#: src/browser.c:712 src/search.c:166
 msgid "Search"
 msgstr "Buscar"
 
-#: src/browser.c:777 src/search.c:466 src/search.c:536
-msgid "This is the only occurrence"
-msgstr "Ésta es la única coincidencia"
-
-#: src/browser.c:793 src/search.c:364
+#: src/browser.c:754 src/search.c:368
 msgid "Search Wrapped"
 msgstr "Búsqueda recomenzada"
 
-#: src/browser.c:843 src/search.c:517
+#: src/browser.c:764 src/search.c:509
+msgid "This is the only occurrence"
+msgstr "Ésta es la única coincidencia"
+
+#: src/browser.c:812 src/search.c:473
 msgid "No current search pattern"
 msgstr "No hay patrón de búsqueda"
 
-#: src/files.c:50
+#: src/color.c:186
 #, fuzzy, c-format
+msgid "Unknown syntax name: %s"
+msgstr "Falta el nombre para la sintaxis"
+
+#: src/color.c:247
+#, c-format
+msgid "magic_load() failed: %s"
+msgstr ""
+
+#: src/color.c:251
+#, c-format
+msgid "magic_file(%s) failed: %s"
+msgstr ""
+
+#: src/files.c:47
+#, c-format
 msgid "Directory '%s' does not exist"
-msgstr "Error al escribir el fichero de bloqueo: el directorio «%s» no existe"
+msgstr "El directorio «%s» no existe"
 
-#: src/files.c:52
+#: src/files.c:49
 #, c-format
 msgid "Path '%s': %s"
-msgstr ""
+msgstr "Ruta «%s»: %s"
 
 # Aquí pegaría poner "El fichero...", como en el mensaje siguiente. sv
-#: src/files.c:54
-#, fuzzy, c-format
+#: src/files.c:51
+#, c-format
 msgid "Path '%s' is not a directory"
-msgstr "«%s» es un directorio"
+msgstr "La ruta «%s» no es un directorio"
 
-#: src/files.c:57
+#: src/files.c:53
 #, c-format
 msgid "Path '%s' is not accessible"
-msgstr ""
+msgstr "No hay acceso a la ruta «%s»"
 
-#. TRANSLATORS: Try to keep this at most 76 characters.
-#: src/files.c:158
+#. TRANSLATORS: Keep the next ten messages at most 76 characters.
+#: src/files.c:148
 msgid ""
 "Warning: Modifying a file which is not locked, check directory permission?"
 msgstr ""
 "Aviso: modificando un fichero no bloqueado; ¿comprobar permisos del dir.?"
 
-#: src/files.c:197
+#: src/files.c:187
 msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
 msgstr ""
 "No se pudo determinar mi identidad para el fichero de bloqueo (falló "
 "getpwuid())"
 
-#: src/files.c:206
+#: src/files.c:196
 #, c-format
 msgid "Couldn't determine hostname for lock file: %s"
 msgstr ""
 "No se pudo determinar el nombre del equipo para el fichero de bloqueo: %s"
 
-#: src/files.c:227 src/files.c:238 src/files.c:275 src/files.c:285
+#: src/files.c:216 src/files.c:225 src/files.c:262 src/files.c:272
 #, c-format
 msgid "Error writing lock file %s: %s"
 msgstr "Error al escribir el fichero de bloqueo «%s»: %s"
 
-#: src/files.c:305
+#: src/files.c:291
 #, c-format
 msgid "Error deleting lock file %s: %s"
 msgstr "Error al eliminar el fichero de bloqueo «%s»: %s"
 
-#: src/files.c:341
+#: src/files.c:325
 #, c-format
 msgid "Error opening lock file %s: %s"
 msgstr "Error al abrir el fichero de bloqueo «%s»: %s"
 
-#: src/files.c:353
+#: src/files.c:337
 #, c-format
 msgid "Error reading lock file %s: Not enough data read"
 msgstr ""
 "Error al leer el fichero de bloqueo «%s»: no se han leído suficientes datos"
 
 #. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
-#: src/files.c:371
+#: src/files.c:354
 #, c-format
 msgid "File %s is being edited (by %s with %s, PID %d); continue?"
 msgstr ""
 "Se está editando el fichero «%s» (usuario %s con %s, PID %d); ¿continuar?"
 
-#: src/files.c:426
+#: src/files.c:430
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "No se puede insertar un fichero desde fuera de %s"
 
 # Aquí pegaría poner "El fichero...", como en el mensaje siguiente. sv
-#: src/files.c:439 src/files.c:1038 src/rcfile.c:589 src/rcfile.c:1385
-#: src/rcfile.c:1426
+#: src/files.c:445 src/files.c:991 src/rcfile.c:533 src/rcfile.c:1230
+#: src/rcfile.c:1271
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "«%s» es un directorio"
 
-#: src/files.c:441
+#: src/files.c:447
 #, c-format
 msgid "\"%s\" is not a normal file"
 msgstr "«%s» no es un fichero normal"
 
-#: src/files.c:566
+#: src/files.c:571
 msgid "No more open file buffers"
 msgstr "No hay más búferes de ficheros abiertos"
 
-#: src/files.c:582
+#: src/files.c:586
 #, c-format
 msgid "Switched to %s"
 msgstr "Se ha cambiado a %s"
 
-#: src/files.c:584 src/global.c:988 src/winio.c:2010
+#: src/files.c:588 src/global.c:1005 src/winio.c:1965
 msgid "New Buffer"
 msgstr "Búfer nuevo"
 
-#: src/files.c:943
+#. TRANSLATORS: Keep the next four messages at most 76 characters.
+#: src/files.c:913
 #, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
 msgstr[0] "%lu línea leída (convertida desde formatos DOS y Mac)"
 msgstr[1] "%lu líneas leídas (convertidas desde formatos DOS y Mac)"
 
-#: src/files.c:948
-#, c-format
-msgid ""
-"Read %lu line (Converted from DOS and Mac format - Warning: No write "
-"permission)"
-msgid_plural ""
-"Read %lu lines (Converted from DOS and Mac format - Warning: No write "
-"permission)"
-msgstr[0] ""
-"%lu línea leída (convertida desde formatos DOS y Mac; aviso: no hay permiso "
-"de escritura)"
-msgstr[1] ""
-"%lu líneas leídas (convertidas desde formatos DOS y Mac; aviso: no hay "
-"permiso de escritura)"
-
-#: src/files.c:954
+#: src/files.c:919
 #, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
 msgstr[0] "%lu línea leída (convertida desde formato Mac)"
 msgstr[1] "%lu líneas leídas (convertidas desde formato Mac)"
 
-#: src/files.c:958
-#, c-format
-msgid ""
-"Read %lu line (Converted from Mac format - Warning: No write permission)"
-msgid_plural ""
-"Read %lu lines (Converted from Mac format - Warning: No write permission)"
-msgstr[0] ""
-"%lu línea leída (convertida desde formato Mac; aviso: no hay permiso de "
-"escritura)"
-msgstr[1] ""
-"%lu líneas leídas (convertidas desde formato Mac; aviso: no hay permiso de "
-"escritura)"
-
-#: src/files.c:964
+#: src/files.c:925
 #, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
 msgstr[0] "%lu línea leída (convertida desde formato DOS)"
 msgstr[1] "%lu líneas leídas (convertidas desde formato DOS)"
 
-#: src/files.c:968
-#, c-format
-msgid ""
-"Read %lu line (Converted from DOS format - Warning: No write permission)"
-msgid_plural ""
-"Read %lu lines (Converted from DOS format - Warning: No write permission)"
-msgstr[0] ""
-"%lu línea leída (convertida desde formato DOS; aviso: no hay permiso de "
-"escritura)"
-msgstr[1] ""
-"%lu líneas leídas (convertidas desde formato DOS; aviso: no hay permiso de "
-"escritura)"
-
-#: src/files.c:974
+#: src/files.c:930
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "%lu línea leída"
 msgstr[1] "%lu líneas leídas"
 
-#: src/files.c:977
-#, c-format
-msgid "Read %lu line (Warning: No write permission)"
-msgid_plural "Read %lu lines (Warning: No write permission)"
-msgstr[0] "%lu línea leída (aviso: no hay permiso de escritura)"
-msgstr[1] "%lu líneas leídas (aviso: no hay permiso de escritura)"
-
-#: src/files.c:1019 src/files.c:1056
+#: src/files.c:974 src/files.c:1006
 msgid "Reading File"
 msgstr "Leyendo fichero"
 
-#: src/files.c:1025
+#: src/files.c:980
 msgid "New File"
 msgstr "Nuevo fichero"
 
-#: src/files.c:1028
-#, c-format
-msgid "\"%s\" not found"
+#: src/files.c:983
+#, fuzzy, c-format
+msgid "File \"%s\" not found"
 msgstr "No se encontró «%s»"
 
-#: src/files.c:1039 src/rcfile.c:590 src/rcfile.c:1386 src/rcfile.c:1427
+#: src/files.c:992 src/rcfile.c:534 src/rcfile.c:1231 src/rcfile.c:1272
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "«%s» es un fichero de dispositivo"
 
-#: src/files.c:1133
+#: src/files.c:1083
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Orden que ejecutar en el nuevo búfer [desde %s] "
 
-#: src/files.c:1135
+#: src/files.c:1085
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Orden que ejecutar [desde %s]"
 
-#: src/files.c:1142
+#: src/files.c:1092
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Fichero que insertar en el nuevo búfer [desde %s] "
 
-#: src/files.c:1144
+#: src/files.c:1094
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Fichero que insertar [desde %s] "
 
-#: src/files.c:1389
+#: src/files.c:1338
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Tecla no válida en modo no-multibúfer"
 
-#: src/files.c:1684
-msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+#: src/files.c:1632
+#, fuzzy
+msgid "Failed to write backup file; continue saving? (Say N if unsure.) "
 msgstr ""
 "Fallo al escribir el fichero de respaldo, ¿continuar guardándolo? (responda "
 "N si no está seguro) "
 
-#: src/files.c:1800
+#: src/files.c:1750
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "No se puede escribir fuera de %s"
 
-#: src/files.c:1885 src/files.c:1910 src/files.c:1928 src/files.c:1941
-#: src/files.c:1952 src/files.c:1981
+#: src/files.c:1833 src/files.c:1858 src/files.c:1876 src/files.c:1889
+#: src/files.c:1900 src/files.c:1928
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Error al escribir el fichero de respaldo «%s»: %s"
 
-#: src/files.c:1886 src/nano.c:690
+#: src/files.c:1834 src/nano.c:692
 msgid "Too many backup files?"
 msgstr "¿Demasiados ficheros de respaldo?"
 
-#: src/files.c:2026 src/text.c:2863 src/text.c:2875 src/text.c:3244
-#: src/text.c:3253
+#: src/files.c:1972 src/text.c:3117 src/text.c:3129 src/text.c:3498
+#: src/text.c:3507
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Error al escribir en el fichero temporal: %s"
 
-#: src/files.c:2049 src/files.c:2068 src/files.c:2080 src/files.c:2104
-#: src/files.c:2121 src/files.c:2131 src/files.c:2164 src/files.c:2171
+#: src/files.c:1994 src/files.c:2013 src/files.c:2023 src/files.c:2047
+#: src/files.c:2064 src/files.c:2074 src/files.c:2106 src/files.c:2113
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Error al escribir «%s»: %s"
 
-#: src/files.c:2200
+#: src/files.c:2154
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "%lu línea escrita"
 msgstr[1] "%lu líneas escritas"
 
-#: src/files.c:2299
+#: src/files.c:2249
 msgid " [DOS Format]"
 msgstr " [Formato DOS]"
 
-#: src/files.c:2300
+#: src/files.c:2250
 msgid " [Mac Format]"
 msgstr " [Formato Mac]"
 
-#: src/files.c:2302
+#: src/files.c:2252
 msgid " [Backup]"
 msgstr " [Respaldo]"
 
-#: src/files.c:2309
+#: src/files.c:2259
 msgid "Prepend Selection to File"
 msgstr "Anteponer selección al fichero"
 
-#: src/files.c:2310
+#: src/files.c:2260
 msgid "Append Selection to File"
 msgstr "Añadir selección al fichero"
 
-#: src/files.c:2311
+#: src/files.c:2261
 msgid "Write Selection to File"
 msgstr "Escribir selección al fichero"
 
-#: src/files.c:2314
+#: src/files.c:2264
 msgid "File Name to Prepend to"
 msgstr "Nombre del fichero al que anteponer"
 
-#: src/files.c:2315
+#: src/files.c:2265
 msgid "File Name to Append to"
 msgstr "Nombre del fichero al que añadir"
 
-#: src/files.c:2316
+#: src/files.c:2266
 msgid "File Name to Write"
 msgstr "Nombre del fichero a escribir"
 
-#: src/files.c:2349
-msgid "Save modified buffer anyway ? "
+#: src/files.c:2301
+#, fuzzy
+msgid "Save modified buffer anyway? "
 msgstr "¿Guardar el búfer modificado de todos modos? "
 
-#: src/files.c:2457
-msgid "File exists, OVERWRITE ? "
-msgstr "El fichero existe, ¿SOBREESCRIBIR? "
-
-#: src/files.c:2466
-msgid "Save file under DIFFERENT NAME ? "
+#: src/files.c:2412
+#, fuzzy
+msgid "Save file under DIFFERENT NAME? "
 msgstr "¿Guardar el fichero con un NOMBRE DIFERENTE? "
 
-#: src/files.c:2480
-msgid "File was modified since you opened it, continue saving ? "
+#: src/files.c:2420
+#, fuzzy, c-format
+msgid "File \"%s\" exists; OVERWRITE? "
+msgstr "El fichero existe, ¿SOBREESCRIBIR? "
+
+#: src/files.c:2441
+#, fuzzy
+msgid "File was modified since you opened it; continue saving? "
 msgstr ""
 "Se ha modificado el fichero desde que lo abrió, ¿continuar guardándolo? "
 
-#: src/files.c:2917
+#: src/files.c:2874
 msgid "(more)"
 msgstr "(más)"
 
-#: src/files.c:3004
+#: src/files.c:2959
 #, c-format
 msgid ""
 "\n"
@@ -406,7 +381,7 @@ msgstr ""
 "\n"
 "Pulse Intro para continuar\n"
 
-#: src/files.c:3020
+#: src/files.c:2975
 #, c-format
 msgid ""
 "Unable to create directory %s: %s\n"
@@ -416,7 +391,7 @@ msgstr ""
 "Se necesita para guardar/cargar el histórico de búsquedas o las posiciones "
 "del cursor.\n"
 
-#: src/files.c:3026
+#: src/files.c:2982
 #, c-format
 msgid ""
 "Path %s is not a directory and needs to be.\n"
@@ -426,7 +401,7 @@ msgstr ""
 "Nano no podrá cargar ni guardar el histórico de búsquedas ni las posiciones "
 "del cursor.\n"
 
-#: src/files.c:3045
+#: src/files.c:3002
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I tried to move\n"
@@ -435,7 +410,7 @@ msgstr ""
 "Se detectó un antiguo fichero histórico de nano (%s) que se intentó mover\n"
 "a la ubicación preferida (%s) pero se encontró un error: %s"
 
-#: src/files.c:3049
+#: src/files.c:3006
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I moved\n"
@@ -446,727 +421,758 @@ msgstr ""
 "a la ubicación preferida (%s).\n"
 "(Consulte las P+F de nano acerca de este cambio.)"
 
-#: src/files.c:3132 src/files.c:3140 src/files.c:3164 src/files.c:3176
+#: src/files.c:3089 src/files.c:3097 src/files.c:3121 src/files.c:3133
 #, c-format
 msgid "Error writing %s: %s\n"
 msgstr "Error al escribir «%s»: %s\n"
 
 #. TRANSLATORS: Try to keep the next fifteen strings at most 10 characters.
-#: src/global.c:480
+#: src/global.c:483
 msgid "Exit"
 msgstr "Salir"
 
-#: src/global.c:481
+#: src/global.c:484
 msgid "Close"
 msgstr "Cerrar"
 
-#: src/global.c:482
+#: src/global.c:485
 msgid "Uncut Text"
 msgstr "Pegar txt"
 
-#: src/global.c:484
+#: src/global.c:487
 msgid "Unjustify"
 msgstr "Desjustif."
 
-#: src/global.c:490
+#: src/global.c:493
 msgid "Read File"
 msgstr "Leer fich."
 
-#: src/global.c:491
+#: src/global.c:494
 msgid "Where Is"
 msgstr "Buscar"
 
-#: src/global.c:492
+#: src/global.c:495
 msgid "Replace"
 msgstr "Reemplazar"
 
-#: src/global.c:493
+#: src/global.c:496
 msgid "Go To Line"
 msgstr "Ir a línea"
 
-#: src/global.c:494
+#: src/global.c:497
 msgid "Prev Line"
 msgstr "Línea ant."
 
-#: src/global.c:495
+#: src/global.c:498
 msgid "Next Line"
 msgstr "Línea sig."
 
-#: src/global.c:496
+#: src/global.c:499
 msgid "Prev Page"
 msgstr "Pág. ant."
 
-#: src/global.c:497
+#: src/global.c:500
 msgid "Next Page"
 msgstr "Pág. sig."
 
-#: src/global.c:499
+#: src/global.c:502
 msgid "Justify"
 msgstr "Justificar"
 
-#: src/global.c:500
+#: src/global.c:503
 msgid "FullJstify"
 msgstr "JustifTodo"
 
-#: src/global.c:502
+#: src/global.c:505
 msgid "Refresh"
 msgstr "Actualizar"
 
 #. TRANSLATORS: Try to keep this string at most 12 characters.
-#: src/global.c:505
+#: src/global.c:508
 msgid "WhereIs Next"
 msgstr "Siguiente"
 
 #. TRANSLATORS: The next long series of strings are shortcut descriptions;
 #. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:512
+#: src/global.c:515
 msgid "Justify the current paragraph"
 msgstr "Justificar el párrafo actual"
 
-#: src/global.c:514
+#: src/global.c:517
 msgid "Cancel the current function"
 msgstr "Cancelar la función actual"
 
-#: src/global.c:515
+#: src/global.c:518
 msgid "Display this help text"
 msgstr "Mostrar esta ayuda"
 
-#: src/global.c:518
+#: src/global.c:521
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Cerrar el fichero mostrado / Salir de nano"
 
-#: src/global.c:520
+#: src/global.c:523
 msgid "Exit from nano"
 msgstr "Salir de nano"
 
-#: src/global.c:524
+#: src/global.c:527
 msgid "Write the current file to disk"
 msgstr "Escribir el fichero actual a disco"
 
-#: src/global.c:526
+#: src/global.c:529
 msgid "Insert another file into the current one"
 msgstr "Insertar otro fichero en el actual"
 
-#: src/global.c:528
+#: src/global.c:531
 msgid "Search for a string or a regular expression"
 msgstr "Buscar una cadena o expresión regular"
 
-#: src/global.c:531
+#: src/global.c:533
 msgid "Search for a string"
 msgstr "Buscar una cadena"
 
-#: src/global.c:533
+#: src/global.c:534
+msgid "Refresh the file list"
+msgstr ""
+
+#: src/global.c:535
+#, fuzzy
+msgid "Go to lefthand column"
+msgstr "Ir a una línea y columna"
+
+#: src/global.c:536
+#, fuzzy
+msgid "Go to righthand column"
+msgstr "Ir a una línea y columna"
+
+#: src/global.c:538
 msgid "Go one screenful up"
 msgstr "Ir una pantalla hacia arriba"
 
-#: src/global.c:534
+#: src/global.c:539
 msgid "Go one screenful down"
 msgstr "Ir una pantalla hacia abajo"
 
-#: src/global.c:536
+#: src/global.c:541
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Cortar la línea actual y guardarla en el cutbuffer"
 
-#: src/global.c:538
+#: src/global.c:543
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Pegar el cutbuffer en la línea actual"
 
-#: src/global.c:539
+#: src/global.c:544
 msgid "Display the position of the cursor"
 msgstr "Mostrar la posición del cursor"
 
-#: src/global.c:541
+#: src/global.c:546
 msgid "Invoke the spell checker, if available"
 msgstr "Invocar el corrector ortográfico (si está disponible)"
 
-#: src/global.c:543
+#: src/global.c:548
 msgid "Replace a string or a regular expression"
 msgstr "Reemplazar una cadena o expresión regular"
 
-#: src/global.c:544
+#: src/global.c:549
 msgid "Go to line and column number"
 msgstr "Ir a una línea y columna"
 
-#: src/global.c:546
+#: src/global.c:551
 msgid "Mark text starting from the cursor position"
 msgstr "Marcar texto desde la posición actual del cursor"
 
-#: src/global.c:547
+#: src/global.c:552
 msgid "Repeat the last search"
 msgstr "Repetir la última búsqueda"
 
-#: src/global.c:549
+#: src/global.c:554
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "Copiar la línea actual y guardarla en el cutbuffer"
 
-#: src/global.c:550
+#: src/global.c:555
 msgid "Indent the current line"
 msgstr "Sangrar la línea actual"
 
-#: src/global.c:551
+#: src/global.c:556
 msgid "Unindent the current line"
 msgstr "Quitar sangrado a la línea actual"
 
-#: src/global.c:552
+#: src/global.c:558
+msgid "Comment/uncomment the current line or marked lines"
+msgstr ""
+
+#: src/global.c:560
 msgid "Undo the last operation"
 msgstr "Deshacer la última operación"
 
-#: src/global.c:553
+#: src/global.c:561
 msgid "Redo the last undone operation"
 msgstr "Rehacer la última operación deshecha"
 
-#: src/global.c:555
+#: src/global.c:563
 msgid "Go back one character"
 msgstr "Ir hacia atrás un carácter"
 
-#: src/global.c:556
+#: src/global.c:564
 msgid "Go forward one character"
 msgstr "Ir hacia delante un carácter"
 
-#: src/global.c:558
+#: src/global.c:566
 msgid "Go back one word"
 msgstr "Ir hacia atrás una palabra"
 
-#: src/global.c:559
+#: src/global.c:567
 msgid "Go forward one word"
 msgstr "Ir hacia delante una palabra"
 
-#: src/global.c:561
+#: src/global.c:569
 msgid "Go to previous line"
 msgstr "Ir a la línea anterior"
 
-#: src/global.c:562
+#: src/global.c:570
 msgid "Go to next line"
 msgstr "Ir a la siguiente línea"
 
-#: src/global.c:563
+#: src/global.c:571
 msgid "Go to beginning of current line"
 msgstr "Ir al principio de la línea actual"
 
-#: src/global.c:564
+#: src/global.c:572
 msgid "Go to end of current line"
 msgstr "Ir al final de la línea actual"
 
-#: src/global.c:567
+#: src/global.c:575
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "Ir al principio del párrafo; después, al del párrafo anterior"
 
-#: src/global.c:569
+#: src/global.c:577
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr "Ir al final del párrafo; después, al del párrafo siguiente"
 
-#: src/global.c:571
+#: src/global.c:579
 msgid "Go to the first line of the file"
 msgstr "Ir a la primera línea del fichero"
 
-#: src/global.c:572
+#: src/global.c:580
 msgid "Go to the last line of the file"
 msgstr "Ir a la última línea del fichero"
 
-#: src/global.c:574
+#: src/global.c:582
 msgid "Go to the matching bracket"
 msgstr "Ir a la llave correspondiente"
 
-#: src/global.c:576
+#: src/global.c:584
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "Desplazar el texto una línea arriba sin mover el cursor"
 
-#: src/global.c:578
+#: src/global.c:586
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "Desplazar el texto una línea abajo sin mover el cursor"
 
-#: src/global.c:581
+#: src/global.c:589
 msgid "Switch to the previous file buffer"
 msgstr "Cambiar al búfer de fichero anterior"
 
-#: src/global.c:582
+#: src/global.c:590
 msgid "Switch to the next file buffer"
 msgstr "Cambiar al siguiente búfer de fichero"
 
-#: src/global.c:584
+#: src/global.c:592
 msgid "Insert the next keystroke verbatim"
 msgstr "Insertar la próxima pulsación literalmente"
 
-#: src/global.c:585
+#: src/global.c:593
 msgid "Insert a tab at the cursor position"
 msgstr "Insertar un carácter de tabulación en la posición del cursor"
 
-#: src/global.c:586
+#: src/global.c:594
 msgid "Insert a newline at the cursor position"
 msgstr "Insertar un retorno de carro en la posición del cursor"
 
-#: src/global.c:587
+#: src/global.c:595
 msgid "Delete the character under the cursor"
 msgstr "Borrar el carácter bajo el cursor"
 
-#: src/global.c:589
+#: src/global.c:597
 msgid "Delete the character to the left of the cursor"
 msgstr "Borrar el carácter a la izquierda del cursor"
 
-#: src/global.c:592
+#: src/global.c:600
 msgid "Cut backward from cursor to word start"
 msgstr "Cortar hacia atrás desde cursor a principio de palabra"
 
-#: src/global.c:594
+#: src/global.c:602
 msgid "Cut forward from cursor to next word start"
 msgstr "Cortar desde cursor a principio de siguiente palabra"
 
-#: src/global.c:596
+#: src/global.c:604
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Cortar desde el cursor hasta el final de línea"
 
-#: src/global.c:599
+#: src/global.c:607
 msgid "Justify the entire file"
 msgstr "Justificar el fichero completo"
 
-#: src/global.c:603
+#: src/global.c:611
 msgid "Count the number of words, lines, and characters"
 msgstr "Contar el número de palabras, líneas y caracteres"
 
-#: src/global.c:606
+#: src/global.c:614
 msgid "Refresh (redraw) the current screen"
 msgstr "Redibujar la pantalla actual"
 
-#: src/global.c:608
+#: src/global.c:616
 msgid "Suspend the editor (if suspension is enabled)"
 msgstr "Suspender el editor (si la suspensión está activada)"
 
-#: src/global.c:610
+#: src/global.c:618
 msgid "Save file without prompting"
 msgstr "Guardar fichero sin preguntar"
 
-#: src/global.c:611
+#: src/global.c:619
 msgid "Search next occurrence backward"
 msgstr "Seguir buscando hacia atrás"
 
-#: src/global.c:612
+#: src/global.c:620
 msgid "Search next occurrence forward"
 msgstr "Seguir buscando hacia delante"
 
-#: src/global.c:614
+#: src/global.c:622
 msgid "Toggle the case sensitivity of the search"
 msgstr "Cambiar la distinción mayús./minús. en la búsqueda"
 
-#: src/global.c:616
+#: src/global.c:624
 msgid "Reverse the direction of the search"
 msgstr "Cambiar la dirección de búsqueda"
 
-#: src/global.c:620
+#: src/global.c:628
 msgid "Toggle the use of regular expressions"
 msgstr "Cambiar el uso de expresiones regulares"
 
-#: src/global.c:624
+#: src/global.c:632
 msgid "Recall the previous search/replace string"
 msgstr "Recuperar la cadena previa de búsqueda/reemplazo"
 
-#: src/global.c:626
+#: src/global.c:634
 msgid "Recall the next search/replace string"
 msgstr "Recuperar la siguiente cadena de búsqueda/reemplazo"
 
-#: src/global.c:629
+#: src/global.c:637
 msgid "Go to file browser"
 msgstr "Ir al navegador de ficheros"
 
-#: src/global.c:632
+#: src/global.c:640
 msgid "Toggle the use of DOS format"
 msgstr "Conmutar el uso de formato DOS"
 
-#: src/global.c:633
+#: src/global.c:641
 msgid "Toggle the use of Mac format"
 msgstr "Conmutar el uso de formato Mac"
 
-#: src/global.c:634
+#: src/global.c:642
 msgid "Toggle appending"
 msgstr "Conmutar el añadir texto"
 
-#: src/global.c:635
+#: src/global.c:643
 msgid "Toggle prepending"
 msgstr "Conmutar el prefijar texto"
 
-#: src/global.c:636
+#: src/global.c:644
 msgid "Toggle backing up of the original file"
 msgstr "Conmutar la creación de ficheros de respaldo"
 
-#: src/global.c:637
+#: src/global.c:645
 msgid "Execute external command"
 msgstr "Ejecutar una orden externa"
 
-#: src/global.c:639
+#: src/global.c:647
 msgid "Close buffer without saving it"
 msgstr "¿Cerrar el búfer sin guardarlo?"
 
-#: src/global.c:641
+#: src/global.c:649
 msgid "Toggle the use of a new buffer"
 msgstr "Conmutar el uso de nuevo búfer"
 
-#: src/global.c:644
+#: src/global.c:652
 msgid "Exit from the file browser"
 msgstr "Salir del navegador de ficheros"
 
-#: src/global.c:645
+#: src/global.c:653
 msgid "Go to the first file in the list"
 msgstr "Ir al primer fichero de la lista"
 
-#: src/global.c:646
+#: src/global.c:654
 msgid "Go to the last file in the list"
 msgstr "Ir al último fichero de la lista"
 
-#: src/global.c:647
+#: src/global.c:655
 msgid "Go to the previous file in the list"
 msgstr "Ir al fichero anterior en la lista"
 
-#: src/global.c:648
+#: src/global.c:656
 msgid "Go to the next file in the list"
 msgstr "Ir al siguiente fichero en la lista"
 
-#: src/global.c:649
+#: src/global.c:657
 msgid "Go to directory"
 msgstr "Ir a un directorio"
 
-#: src/global.c:652
+#: src/global.c:660
 msgid "Invoke the linter, if available"
 msgstr "Invocar el corrector de sintaxis (si está disponible)"
 
-#: src/global.c:653
+#: src/global.c:661
 msgid "Go to previous linter msg"
 msgstr "Ir al mensaje anterior del corrector"
 
-#: src/global.c:654
+#: src/global.c:662
 msgid "Go to next linter msg"
 msgstr "Ir al siguiente mensaje del corrector"
 
-#: src/global.c:656
+#: src/global.c:664
 msgid "Invoke formatter, if available"
 msgstr "Invocar el arreglador (si está disponible)"
 
 #. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:671
+#: src/global.c:679
 msgid "Get Help"
 msgstr "Ver ayuda"
 
-#: src/global.c:674 src/prompt.c:858
+#: src/global.c:682 src/prompt.c:855
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/global.c:687
+#: src/global.c:695
 msgid "Write Out"
 msgstr "Guardar"
 
-#: src/global.c:723
+#: src/global.c:731
 msgid "Go To Dir"
 msgstr "Ir a dir"
 
-#: src/global.c:738
+#: src/global.c:746
 msgid "Cut Text"
 msgstr "Cortar txt"
 
-#: src/global.c:753
+#: src/global.c:761
 msgid "To Spell"
 msgstr "Ortografía"
 
-#: src/global.c:757
+#: src/global.c:765
 msgid "To Linter"
 msgstr "Corrector"
 
-#: src/global.c:760
+#: src/global.c:768
 msgid "Formatter"
 msgstr "Arreglador"
 
-#: src/global.c:767
+#: src/global.c:775
 msgid "Case Sens"
 msgstr "Mayús/minú"
 
-#: src/global.c:772
+#: src/global.c:780
 msgid "Regexp"
 msgstr "Exp. reg."
 
-#: src/global.c:777
+#: src/global.c:785
 msgid "Backwards"
 msgstr "Ir atrás"
 
-#: src/global.c:784
+#: src/global.c:792
 msgid "No Replace"
 msgstr "No sustit."
 
-#: src/global.c:792
+#: src/global.c:800
 msgid "Cur Pos"
 msgstr "Posición"
 
-#: src/global.c:807
+#: src/global.c:815
 msgid "First Line"
 msgstr "Pri. línea"
 
-#: src/global.c:809
+#: src/global.c:817
 msgid "Last Line"
 msgstr "Últ. línea"
 
-#: src/global.c:816
+#: src/global.c:824
 msgid "To Bracket"
 msgstr "A llave"
 
-#: src/global.c:819
+#: src/global.c:827
 msgid "Mark Text"
 msgstr "Marcar txt"
 
-#: src/global.c:822
+#: src/global.c:830
 msgid "Copy Text"
 msgstr "Copiar txt"
 
-#: src/global.c:825
+#: src/global.c:833
 msgid "Indent Text"
 msgstr "Sangrar txt"
 
-#: src/global.c:827
+#: src/global.c:835
 msgid "Unindent Text"
 msgstr "Desang. txt"
 
-#: src/global.c:830
+#: src/global.c:838
 msgid "Undo"
 msgstr "Deshacer"
 
-#: src/global.c:832
+#: src/global.c:840
 msgid "Redo"
 msgstr "Rehacer"
 
-#: src/global.c:836 src/global.c:842
+#: src/global.c:844 src/global.c:850
 msgid "Back"
 msgstr "Atrás"
 
-#: src/global.c:838 src/global.c:844
+#: src/global.c:846 src/global.c:852
 msgid "Forward"
 msgstr "Adelante"
 
-#: src/global.c:849
+#: src/global.c:857
 msgid "Prev Word"
 msgstr "Palabr ant"
 
-#: src/global.c:851
+#: src/global.c:859
 msgid "Next Word"
 msgstr "Palabr sig"
 
-#: src/global.c:855
+#: src/global.c:863
 msgid "Home"
 msgstr "Inicio"
 
-#: src/global.c:857
+#: src/global.c:865
 msgid "End"
 msgstr "Fin"
 
-#: src/global.c:866
+#: src/global.c:874
 msgid "Beg of Par"
 msgstr "Ini de pár."
 
-#: src/global.c:868
+#: src/global.c:876
 msgid "End of Par"
 msgstr "Fin de pár."
 
-#: src/global.c:873
+#: src/global.c:881
 msgid "Scroll Up"
 msgstr "Despl arri"
 
-#: src/global.c:875
+#: src/global.c:883
 msgid "Scroll Down"
 msgstr "Despl abaj"
 
-#: src/global.c:880
+#: src/global.c:888
 msgid "Prev File"
 msgstr "Fich ant"
 
-#: src/global.c:882
+#: src/global.c:890
 msgid "Next File"
 msgstr "Fich sig"
 
-#: src/global.c:891
+#: src/global.c:899
 msgid "Verbatim"
 msgstr "Literal"
 
-#: src/global.c:894
+#: src/global.c:902
 msgid "Tab"
 msgstr "Tab"
 
 # Intro (?). sv
 # O introducir, no encuentro el contexto...
 # Ok, es Intro (pero no se usa, parece, reportaré el bug) jm
-#: src/global.c:896
+#: src/global.c:904
 msgid "Enter"
 msgstr "Intro"
 
-#: src/global.c:899
+#: src/global.c:907
 msgid "Delete"
 msgstr "Suprimir"
 
-#: src/global.c:901
+#: src/global.c:909
 msgid "Backspace"
 msgstr "Borrar"
 
 #. TRANSLATORS: The next two strings refer to cutting words.
-#: src/global.c:912
+#: src/global.c:920
 msgid "Cut Left"
 msgstr "Cortar izquierda"
 
-#: src/global.c:914
+#: src/global.c:922
 msgid "Cut Right"
 msgstr "Cortar derecha"
 
-#: src/global.c:916
+#: src/global.c:924
 msgid "CutTillEnd"
 msgstr "CortHastFin"
 
-#: src/global.c:926
+#: src/global.c:934
 msgid "Word Count"
 msgstr "Cont palab"
 
-#: src/global.c:933
+#: src/global.c:941
 msgid "Suspend"
 msgstr "Suspender"
 
-#: src/global.c:937
+#: src/global.c:945
+#, fuzzy
+msgid "Comment Lines"
+msgstr "Línea sig."
+
+#: src/global.c:949
 msgid "Save"
 msgstr "Guardar"
 
-#: src/global.c:940
+#: src/global.c:952
 msgid "Previous"
 msgstr "Anterior"
 
-#: src/global.c:942
+#: src/global.c:954
 msgid "Next"
 msgstr "Siguiente"
 
-#: src/global.c:948
+#: src/global.c:960
 msgid "PrevHstory"
 msgstr "Prev hist."
 
-#: src/global.c:951
+#: src/global.c:963
 msgid "NextHstory"
 msgstr "Sig. hist."
 
-#: src/global.c:955
+#: src/global.c:972
 msgid "Go To Text"
 msgstr "Ir a texto"
 
-#: src/global.c:959
+#: src/global.c:976
 msgid "DOS Format"
 msgstr "Format DOS"
 
-#: src/global.c:961
+#: src/global.c:978
 msgid "Mac Format"
 msgstr "Format Mac"
 
-#: src/global.c:969
+#: src/global.c:986
 msgid "Append"
 msgstr "Añadir"
 
-#: src/global.c:971
+#: src/global.c:988
 msgid "Prepend"
 msgstr "Anteponer"
 
-#: src/global.c:974
+#: src/global.c:991
 msgid "Backup File"
 msgstr "Respald fich"
 
-#: src/global.c:981
+#: src/global.c:998
 msgid "Execute Command"
 msgstr "Ejec orden"
 
-#: src/global.c:996
+#: src/global.c:1013
 msgid "To Files"
 msgstr "A ficheros"
 
-#: src/global.c:1004
+#: src/global.c:1021
 msgid "First File"
 msgstr "Pri. fich."
 
-#: src/global.c:1006
+#: src/global.c:1023
 msgid "Last File"
 msgstr "Últ. fich."
 
-#: src/global.c:1010
+#: src/global.c:1027
 msgid "Discard buffer"
 msgstr "Descartar búfer"
 
+#: src/global.c:1038
+msgid "Left Column"
+msgstr ""
+
+#: src/global.c:1040
+msgid "Right Column"
+msgstr ""
+
 #. TRANSLATORS: Try to keep the next two strings at most 20 characters.
-#: src/global.c:1020
+#: src/global.c:1047
 msgid "Prev Lint Msg"
 msgstr "Mens. ant."
 
-#: src/global.c:1022
+#: src/global.c:1049
 msgid "Next Lint Msg"
 msgstr "Mens. sig."
 
 #. TRANSLATORS: The next seventeen strings are toggle descriptions;
 #. * they are best kept shorter than 40 characters, but may be longer.
-#: src/global.c:1285
+#: src/global.c:1316
 msgid "Help mode"
 msgstr "Modo de ayuda"
 
-#: src/global.c:1287
+#: src/global.c:1318
 msgid "Constant cursor position display"
 msgstr "Muestra constante de la posición del cursor"
 
-#: src/global.c:1289
+#: src/global.c:1320
 msgid "Use of one more line for editing"
 msgstr "Uso de una línea más para editar"
 
-#: src/global.c:1291
+#: src/global.c:1322
 msgid "Smooth scrolling"
 msgstr "Desplazamiento suave"
 
-#: src/global.c:1293
+#: src/global.c:1324
 msgid "Soft wrapping of overlong lines"
 msgstr "Ajuste suave de líneas largas"
 
-#: src/global.c:1295
+#: src/global.c:1326
 msgid "Whitespace display"
 msgstr "Muestra los blancos"
 
-#: src/global.c:1297
+#: src/global.c:1328
 msgid "Color syntax highlighting"
 msgstr "Coloreado de sintaxis"
 
-#: src/global.c:1299
+#: src/global.c:1330
 msgid "Smart home key"
 msgstr "Tecla de inicio inteligente"
 
 # En español se dice sangrar. Es un término tipográfico que se usa
 # desde hace mucho, pero que la gente olvida por influencia del inglés. sv
-#: src/global.c:1301
+#: src/global.c:1332
 msgid "Auto indent"
 msgstr "Auto-sangrado"
 
-#: src/global.c:1303
+#: src/global.c:1334
 msgid "Cut to end"
 msgstr "Cortado desde el cursor hasta el final de línea"
 
-#: src/global.c:1305
+#: src/global.c:1336
 msgid "Hard wrapping of overlong lines"
 msgstr "Ajuste estricto de líneas largas"
 
-#: src/global.c:1307
+#: src/global.c:1338
 msgid "Conversion of typed tabs to spaces"
 msgstr "Conversión de pulsaciones de tabulador a espacios"
 
-#: src/global.c:1309
+#: src/global.c:1340
 msgid "Backup files"
 msgstr "Respaldo de ficheros"
 
-#: src/global.c:1311
+#: src/global.c:1342
 msgid "Reading file into separate buffer"
 msgstr "Leer fichero dejándolo en un buffer diferente"
 
-#: src/global.c:1313
+#: src/global.c:1344
 msgid "Mouse support"
 msgstr "Soporte para ratón"
 
-#: src/global.c:1315
+#: src/global.c:1346
 msgid "No conversion from DOS/Mac format"
 msgstr "Sin conversión desde formato DOS/Mac"
 
-#: src/global.c:1317
+#: src/global.c:1348
 msgid "Suspension"
 msgstr "Suspensión"
 
 # TODO: 'se actualizará en el lugar donde esté la...' -> 'se actualizará para mostrar la...'
-#: src/help.c:209
+#: src/help.c:211
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1188,7 +1194,7 @@ msgstr ""
 "el indicador. Si pulsa Intro sin introducir texto repetirá la última "
 "búsqueda."
 
-#: src/help.c:218
+#: src/help.c:220
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1202,7 +1208,7 @@ msgstr ""
 " Dispone de las siguientes teclas de función en modo Búsqueda:\n"
 "\n"
 
-#: src/help.c:224
+#: src/help.c:226
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1222,7 +1228,7 @@ msgstr ""
 " Se dispone de las siguientes teclas de función en el modo Ir a Línea:\n"
 "\n"
 
-#: src/help.c:233
+#: src/help.c:235
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1244,7 +1250,7 @@ msgstr ""
 "usando un fichero nanorc, el fichero será insertado en un búfer diferente "
 "(use Meta-< y > para cambiar de búfers de fichero). "
 
-#: src/help.c:242
+#: src/help.c:244
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1258,7 +1264,7 @@ msgstr ""
 " Dispone de las siguientes teclas de función en el modo Insertar Fichero:\n"
 "\n"
 
-#: src/help.c:248
+#: src/help.c:250
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1286,7 +1292,7 @@ msgstr ""
 "Dispone de las siguientes teclas de función en el modo Guardar fichero:\n"
 "\n"
 
-#: src/help.c:262
+#: src/help.c:264
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1312,7 +1318,7 @@ msgstr ""
 "\n"
 
 # TODO: 'se actualizará en el lugar donde esté la...' -> 'se actualizará para mostrar la...'
-#: src/help.c:275
+#: src/help.c:277
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1336,7 +1342,7 @@ msgstr ""
 "búsqueda.\n"
 "\n"
 
-#: src/help.c:284
+#: src/help.c:286
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1344,7 +1350,7 @@ msgstr ""
 " Se dispone de las siguientes teclas de función en el modo Búsqueda:\n"
 "\n"
 
-#: src/help.c:288
+#: src/help.c:290
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1367,7 +1373,7 @@ msgstr ""
 "del Navegador:\n"
 "\n"
 
-#: src/help.c:301
+#: src/help.c:303
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1392,7 +1398,7 @@ msgstr ""
 "ortografía:\n"
 "\n"
 
-#: src/help.c:316
+#: src/help.c:318
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1413,7 +1419,7 @@ msgstr ""
 "de órdenes:\n"
 "\n"
 
-#: src/help.c:329
+#: src/help.c:331
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1433,15 +1439,15 @@ msgstr ""
 "principal del editor muestra lo que está siendo editado. La línea de estado "
 "es la tercera empezando por abajo y muestra mensajes importantes. "
 
-#: src/help.c:339
+#: src/help.c:341
+#, fuzzy
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
-" The notation for shortcuts is as follows: Control-key sequences are notated "
-"with a caret (^) symbol and can be entered either by using the Control "
-"(Ctrl) key or pressing the Escape (Esc) key twice.  Escape-key sequences are "
-"notated with the Meta (M-) symbol and can be entered using either the Esc, "
-"Alt, or Meta key depending on your keyboard setup.  "
+" Shortcuts are written as follows: Control-key sequences are notated with a "
+"'^' and can be entered either by using the Ctrl key or pressing the Esc key "
+"twice.  Meta-key sequences are notated with 'M-' and can be entered using "
+"either the Alt, Cmd, or Esc key, depending on your keyboard setup.  "
 msgstr ""
 "Las dos últimas líneas muestran las combinaciones de teclas usadas más a "
 "menudo en el editor.\n"
@@ -1471,19 +1477,19 @@ msgstr ""
 msgid "enable/disable"
 msgstr "activar/desactivar"
 
-#: src/nano.c:559
+#: src/nano.c:560
 msgid "Key is invalid in view mode"
 msgstr "La tecla no es válida en modo de visualización"
 
-#: src/nano.c:565
+#: src/nano.c:566
 msgid "This function is disabled in restricted mode"
 msgstr "Esta función está desactivada en modo restringido"
 
-#: src/nano.c:573
+#: src/nano.c:574
 msgid "Help is not available"
 msgstr "No hay ayuda disponible"
 
-#: src/nano.c:684
+#: src/nano.c:686
 #, c-format
 msgid ""
 "\n"
@@ -1492,7 +1498,7 @@ msgstr ""
 "\n"
 "Buffer escrito en %s\n"
 
-#: src/nano.c:686
+#: src/nano.c:688
 #, c-format
 msgid ""
 "\n"
@@ -1501,7 +1507,7 @@ msgstr ""
 "\n"
 "No se ha escrito el búfer a %s: %s\n"
 
-#: src/nano.c:689
+#: src/nano.c:691
 #, c-format
 msgid ""
 "\n"
@@ -1769,17 +1775,22 @@ msgstr "Habilitar suspensión"
 msgid "Enable soft line wrapping"
 msgstr "Habilitar ajuste de línea suave"
 
-#: src/nano.c:937
-#, c-format
-msgid " GNU nano, version %s\n"
+#: src/nano.c:940
+#, fuzzy, c-format
+msgid " nano, version %s\n"
 msgstr " GNU nano, versión %s\n"
 
-#: src/nano.c:940
+#: src/nano.c:943
+#, c-format
+msgid " (C) 2014..%s the contributors to nano\n"
+msgstr ""
+
+#: src/nano.c:945
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr " Correo: nano@nano-editor.org\tWeb: http://www.nano-editor.org"
 
-#: src/nano.c:941
+#: src/nano.c:946
 #, c-format
 msgid ""
 "\n"
@@ -1788,68 +1799,82 @@ msgstr ""
 "\n"
 " Opciones compiladas:"
 
-#: src/nano.c:1073
+#: src/nano.c:1081
 msgid "No file name"
 msgstr "Sin nombre de fichero"
 
-#: src/nano.c:1108
-msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
+#: src/nano.c:1115
+msgid "Save modified buffer?  (Answering \"No\" will DISCARD changes.) "
 msgstr ""
-"¿Guardar el búfer modificado (RESPONDER \"No\" DESTRUIRÁ LOS CAMBIOS)? "
 
-#: src/nano.c:1168
+#: src/nano.c:1178
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "No se pudo reabrir stdin desde el teclado\n"
 
-#: src/nano.c:1192
+#: src/nano.c:1202
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "Leyendo de stdin, ^C para abortar\n"
 
-#: src/nano.c:1256
+#: src/nano.c:1266
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Recibido SIGHUP o SIGTERM\n"
 
-#: src/nano.c:1272
+#: src/nano.c:1282
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Use «fg» para volver a nano.\n"
 
-#: src/nano.c:1294
+#: src/nano.c:1304
 msgid "Suspension is not enabled"
 msgstr "La suspensión no está activada"
 
-#: src/nano.c:1448
+#: src/nano.c:1459
 msgid "enabled"
 msgstr "habilitado"
 
-#: src/nano.c:1448
+#: src/nano.c:1459
 msgid "disabled"
 msgstr "deshabilitado"
 
-#: src/nano.c:1607 src/winio.c:1125
-msgid "Unknown Command"
-msgstr "Orden desconocida"
+#: src/nano.c:1573
+msgid "Unbound key"
+msgstr ""
+
+#: src/nano.c:1577
+#, c-format
+msgid "Unbound key: M-%c"
+msgstr ""
 
-#: src/nano.c:1720
+#: src/nano.c:1579
+#, c-format
+msgid "Unbound key: ^%c"
+msgstr ""
+
+#: src/nano.c:1581
+#, c-format
+msgid "Unbound key: %c"
+msgstr ""
+
+#: src/nano.c:1745
 msgid "XON ignored, mumble mumble"
 msgstr "Se ignora XON, mmh mmh"
 
-#: src/nano.c:1725
+#: src/nano.c:1750
 msgid "XOFF ignored, mumble mumble"
 msgstr "Se ignora XOFF, mmh mmh"
 
-#: src/nano.c:2139 src/rcfile.c:1334
+#: src/nano.c:2166 src/rcfile.c:1187
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "El tamaño «%s» de tabulador no es válido"
 
-#: src/nano.c:2200 src/rcfile.c:1259
+#: src/nano.c:2227 src/rcfile.c:1128
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "El tamaño «%s» de llenado no es válido"
 
-#: src/nano.c:2247
+#: src/nano.c:2276
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr "Teclea «%s -h» para la lista de opciones.\n"
@@ -1857,115 +1882,119 @@ msgstr "Teclea «%s -h» para la lista de opciones.\n"
 #. TRANSLATORS: For the next three strings, if possible, specify
 #. * the single-byte shortcuts for both your language and English.
 #. * For example, in French: "OoYy" for "Oui".
-#: src/prompt.c:821
+#: src/prompt.c:818
 msgid "Yy"
 msgstr "SsYy"
 
-#: src/prompt.c:822
+#: src/prompt.c:819
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:823
+#: src/prompt.c:820
 msgid "Aa"
 msgstr "TtAa"
 
-#: src/prompt.c:845
+#: src/prompt.c:842
 msgid "Yes"
 msgstr "Sí"
 
-#: src/prompt.c:850
+#: src/prompt.c:847
 msgid "All"
 msgstr "Todas"
 
-#: src/prompt.c:855
+#: src/prompt.c:852
 msgid "No"
 msgstr "No"
 
-#: src/rcfile.c:142
+#: src/rcfile.c:144
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Error en %s en la línea %lu: "
 
-#: src/rcfile.c:201
+#: src/rcfile.c:203
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "El argumento «%s» tiene una \" sin terminar"
 
-#: src/rcfile.c:228 src/rcfile.c:280 src/rcfile.c:732 src/rcfile.c:793
-#: src/rcfile.c:882 src/rcfile.c:933
+#: src/rcfile.c:231 src/rcfile.c:674 src/rcfile.c:725 src/rcfile.c:824
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Las cadenas de regex han de empezar y acabar con un carácter \""
 
-#: src/rcfile.c:254 src/search.c:62
+#: src/rcfile.c:257 src/search.c:61
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Regex «%s» incorrecta: %s"
 
-#: src/rcfile.c:274
+#: src/rcfile.c:279
 msgid "Missing syntax name"
 msgstr "Falta el nombre para la sintaxis"
 
-#: src/rcfile.c:345
+#: src/rcfile.c:288
+msgid "A syntax name must be quoted"
+msgstr ""
+
+#: src/rcfile.c:297
 msgid "The \"none\" syntax is reserved"
 msgstr "La sintaxis «none» está reservada"
 
-#: src/rcfile.c:352
-msgid "The \"default\" syntax must take no extensions"
+#: src/rcfile.c:327
+#, fuzzy
+msgid "The \"default\" syntax does not accept extensions"
 msgstr "La sintaxis «default» no toma extensiones"
 
-#: src/rcfile.c:424
+#: src/rcfile.c:369
 msgid "Missing key name"
 msgstr "Falta el nombre de la combinación"
 
-#: src/rcfile.c:433 src/rcfile.c:444
+#: src/rcfile.c:378 src/rcfile.c:389
 msgid "Key name is too short"
 msgstr "El nombre de la combinación es demasiado corto"
 
-#: src/rcfile.c:454
+#: src/rcfile.c:399
 msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr "El nombre de una combinación debe comenzar por «^», «M» o «F»"
 
-#: src/rcfile.c:457
-#, fuzzy, c-format
+#: src/rcfile.c:402
+#, c-format
 msgid "Key name %s is invalid"
-msgstr "El tamaño «%s» de tabulador no es válido"
+msgstr "El nombre de combinación «%s» no es válido"
 
-#: src/rcfile.c:466
+#: src/rcfile.c:411
 msgid "Must specify a function to bind the key to"
 msgstr "Debe especificar una función a la cual vincular la tecla"
 
 #. TRANSLATORS: Do not translate the word "all".
-#: src/rcfile.c:476
+#: src/rcfile.c:421
 msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
 "Debe especificar un menú (o «all») en el cual vincular/desvincular la tecla"
 
-#: src/rcfile.c:483
+#: src/rcfile.c:428
 #, c-format
 msgid "Cannot map name \"%s\" to a function"
 msgstr "El «%s» no es un nombre de función"
 
-#: src/rcfile.c:490
+#: src/rcfile.c:435
 #, c-format
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "El «%s» no es un nombre de menú"
 
-#: src/rcfile.c:522
+#: src/rcfile.c:467
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr "La función «%s» no existe en el menú «%s»"
 
-#: src/rcfile.c:534
+#: src/rcfile.c:479
 #, c-format
 msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "La combinación «%s» no puede ser revinculada"
 
-#: src/rcfile.c:631
+#: src/rcfile.c:576
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr "Error al expandir «%s»: %s"
 
-#: src/rcfile.c:674
+#: src/rcfile.c:616
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1980,64 +2009,51 @@ msgstr ""
 "«black», con el prefijo opcional «bright»\n"
 "para los de primer plano."
 
-#: src/rcfile.c:696
-msgid "Cannot add a color command without a syntax command"
-msgstr "No se puede añadir una directiva de color sin una orden de sintaxis"
+#: src/rcfile.c:637 src/rcfile.c:795 src/rcfile.c:858
+#, c-format
+msgid "A '%s' command requires a preceding 'syntax' command"
+msgstr ""
 
-#: src/rcfile.c:701
+#: src/rcfile.c:643
 msgid "Missing color name"
 msgstr "Falta un nombre de color"
 
-#: src/rcfile.c:711 src/rcfile.c:872
-msgid "Missing regex string"
-msgstr "Falta la cadena regex"
+#: src/rcfile.c:653 src/rcfile.c:807
+#, fuzzy, c-format
+msgid "Missing regex string after '%s' command"
+msgstr "Falta un nombre de programa detrás de «linter»"
 
-#: src/rcfile.c:787
+#: src/rcfile.c:719
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "«start=» requiere su «end=» correspondiente"
 
-#: src/rcfile.c:839
+#: src/rcfile.c:768
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
 msgstr "El color de fondo «%s» no puede ser brillante"
 
-#: src/rcfile.c:867
-msgid "Cannot add a header regex without a syntax command"
-msgstr ""
-"No se puede añadir una expresión regular para «header» sin una orden «syntax»"
-
-#: src/rcfile.c:922
-msgid "Cannot add a magic string regex without a syntax command"
-msgstr ""
-"No se puede añadir una expresión regular para «magic» sin una orden «syntax»"
-
-#: src/rcfile.c:927
-msgid "Missing magic string name"
-msgstr "Falta el nombre de la cadena mágica"
-
-#: src/rcfile.c:985
-msgid "Cannot add a linter without a syntax command"
-msgstr "No se puede añadir un «linter» sin una orden «syntax»"
+#: src/rcfile.c:802
+#, fuzzy, c-format
+msgid "The \"default\" syntax does not accept '%s' regexes"
+msgstr "La sintaxis «default» no toma extensiones"
 
-#: src/rcfile.c:990
-msgid "Missing linter command"
+#: src/rcfile.c:863
+#, fuzzy, c-format
+msgid "Missing command after '%s'"
 msgstr "Falta un nombre de programa detrás de «linter»"
 
-#: src/rcfile.c:1011
-msgid "Cannot add formatter without a syntax command"
-msgstr "No se puede añadir un «formatter» sin una orden «syntax»"
-
-#: src/rcfile.c:1016
-msgid "Missing formatter command"
-msgstr "Falta un nombre de programa detrás de «formatter»"
+#: src/rcfile.c:879
+#, fuzzy, c-format
+msgid "Argument of '%s' lacks closing \""
+msgstr "El argumento «%s» tiene una \" sin terminar"
 
-#: src/rcfile.c:1046
+#: src/rcfile.c:910
 #, c-format
 msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr ""
 "Error fatal: no hay teclas vinculadas a la función «%s».  Terminando.\n"
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:912
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
@@ -2045,62 +2061,62 @@ msgstr ""
 "Si es necesario, use nano con la opción -I para ajustar su configuración "
 "nanorc.\n"
 
-#: src/rcfile.c:1109
+#: src/rcfile.c:971
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "No se pudo encontrar la sintaxis «%s» para extender"
 
-#: src/rcfile.c:1125 src/rcfile.c:1134 src/rcfile.c:1144
-#, c-format
-msgid "Command \"%s\" not allowed in included file"
-msgstr "No se admite la orden «%s» en el fichero incluido"
-
-#: src/rcfile.c:1150 src/rcfile.c:1359
+#: src/rcfile.c:993 src/rcfile.c:1202
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "La sintaxis «%s» no tiene órdenes de color"
 
-#: src/rcfile.c:1180
+#: src/rcfile.c:1024
+#, c-format
+msgid "Command \"%s\" not allowed in included file"
+msgstr "No se admite la orden «%s» en el fichero incluido"
+
+#: src/rcfile.c:1039
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Orden «%s» no reconocida"
 
-#: src/rcfile.c:1195
+#: src/rcfile.c:1051
 msgid "Missing option"
 msgstr "Falta una opción"
 
-#: src/rcfile.c:1217
+#: src/rcfile.c:1065
+#, c-format
+msgid "Unknown option \"%s\""
+msgstr "Opción «%s» desconocida"
+
+#: src/rcfile.c:1077
+#, c-format
+msgid "Cannot unset option \"%s\""
+msgstr "No es posible desactivar la opción «%s»"
+
+#: src/rcfile.c:1089
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "La opción «%s» precisa un argumento"
 
-#: src/rcfile.c:1235
+#: src/rcfile.c:1105
 msgid "Option is not a valid multibyte string"
 msgstr "La opción no es una cadena multibyte válida"
 
-#: src/rcfile.c:1272 src/rcfile.c:1300 src/rcfile.c:1309
+#: src/rcfile.c:1139 src/rcfile.c:1160 src/rcfile.c:1167
 msgid "Non-blank characters required"
 msgstr "Se precisan caracteres que no sean blancos"
 
-#: src/rcfile.c:1282
+#: src/rcfile.c:1146
 msgid "Two single-column characters required"
 msgstr "Se precisan dos caracteres de una sola columna"
 
-#: src/rcfile.c:1348
-#, c-format
-msgid "Cannot unset option \"%s\""
-msgstr "No es posible desactivar la opción «%s»"
-
-#: src/rcfile.c:1354
-#, c-format
-msgid "Unknown option \"%s\""
-msgstr "Opción «%s» desconocida"
-
-#: src/rcfile.c:1413
+#: src/rcfile.c:1258
 msgid "I can't find my home directory!  Wah!"
 msgstr "No se encontró el directorio del usuario.  ¡Ay!"
 
-#: src/rcfile.c:1451
+#: src/rcfile.c:1295
 #, c-format
 msgid ""
 "\n"
@@ -2109,44 +2125,49 @@ msgstr ""
 "\n"
 "Pulsa Intro para continuar iniciando nano.\n"
 
-#: src/search.c:96
+#: src/search.c:95
 #, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "No se encontró «%.*s%s»"
 
 #. TRANSLATORS: The next three strings are modifiers of the search prompt.
-#: src/search.c:176
+#: src/search.c:169
 msgid " [Case Sensitive]"
 msgstr " [Mayúsc/minúsc]"
 
-#: src/search.c:180
+#: src/search.c:173
 msgid " [Regexp]"
 msgstr " [ExpReg]"
 
-#: src/search.c:184
+#: src/search.c:177
 msgid " [Backwards]"
 msgstr " [Hacia atrás]"
 
 #. TRANSLATORS: The next two strings are modifiers of the search prompt.
-#: src/search.c:189
+#: src/search.c:182
 msgid " (to replace) in selection"
 msgstr " (a reemplazar) en la selección"
 
-#: src/search.c:191
+#: src/search.c:184
 msgid " (to replace)"
 msgstr " (a reemplazar)"
 
+#: src/search.c:305
+#, fuzzy
+msgid "Searching..."
+msgstr "Buscar"
+
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:718
+#: src/search.c:693
 msgid "Replace this instance?"
 msgstr "¿Reemplazar esta instancia?"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:883
+#: src/search.c:840
 msgid "Replace with"
 msgstr "Reemplazar con"
 
-#: src/search.c:924
+#: src/search.c:875
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
@@ -2154,294 +2175,397 @@ msgstr[0] "%lu ocurrencia reemplazada"
 msgstr[1] "%lu ocurrencias reemplazadas"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:964
+#: src/search.c:914
 msgid "Enter line number, column number"
 msgstr "Introduzca número de línea, número de columna"
 
-#: src/search.c:991
+#: src/search.c:939
 msgid "Invalid line or column number"
 msgstr "Número de línea o columna no válido"
 
-#: src/search.c:1124
+#: src/search.c:1080
 msgid "Not a bracket"
 msgstr "No es una llave"
 
-#: src/search.c:1191
+#: src/search.c:1146
 msgid "No matching bracket"
 msgstr "No hay una llave correspondiente"
 
-#: src/text.c:54
+#: src/text.c:53
 msgid "Mark Set"
 msgstr "Marca establecida"
 
-#: src/text.c:58
+#: src/text.c:57
 msgid "Mark Unset"
 msgstr "Marca borrada"
 
-#: src/text.c:70
+#: src/text.c:69
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Error al invocar «%s»"
 
-#: src/text.c:475
+#: src/text.c:468
+msgid "Commenting is not supported for this file type"
+msgstr ""
+
+#: src/text.c:484
+msgid "Cannot comment past end of file"
+msgstr ""
+
+#: src/text.c:677
 msgid "Nothing in undo buffer!"
 msgstr "Nada para deshacer en el búfer"
 
-#: src/text.c:481 src/text.c:634
-#, c-format
-msgid "Internal error: can't match line %d.  Please save your work."
-msgstr "Error interno: no se puede encontrar la línea %d.  Guarde su trabajo."
-
 #. TRANSLATORS: Eight of the next nine strings describe actions
 #. * that are undone or redone.  It are all nouns, not verbs.
-#: src/text.c:495 src/text.c:524 src/text.c:645 src/text.c:686
+#: src/text.c:695 src/text.c:724 src/text.c:857 src/text.c:898
 msgid "text add"
 msgstr "adición de texto"
 
-#: src/text.c:505 src/text.c:656
+#: src/text.c:705 src/text.c:868
 msgid "text delete"
 msgstr "eliminación de texto"
 
-#: src/text.c:528 src/text.c:694
+#: src/text.c:728 src/text.c:907
 msgid "line join"
 msgstr "unión de líneas"
 
-#: src/text.c:547 src/text.c:710
+#: src/text.c:747 src/text.c:923
 msgid "text cut"
 msgstr "corte de texto"
 
-#: src/text.c:552 src/text.c:714
+#: src/text.c:752 src/text.c:927
 msgid "text uncut"
 msgstr "pegado de texto"
 
-#: src/text.c:558 src/text.c:691
+#: src/text.c:758 src/text.c:903
 msgid "Internal error: line is missing.  Please save your work."
 msgstr "Error interno: falta línea. Guarde su trabajo."
 
-#: src/text.c:561 src/text.c:665
+#: src/text.c:762 src/text.c:877
 msgid "line break"
 msgstr "salto de línea"
 
-#: src/text.c:569 src/text.c:725
+#: src/text.c:772 src/text.c:947
+msgid "comment"
+msgstr ""
+
+#: src/text.c:776 src/text.c:951
+msgid "uncomment"
+msgstr ""
+
+#: src/text.c:780 src/text.c:938
 msgid "text insert"
 msgstr "inserción de texto"
 
-#: src/text.c:589 src/text.c:718
+#: src/text.c:800 src/text.c:931
 msgid "text replace"
 msgstr "reemplazamiento de texto"
 
-#: src/text.c:596 src/text.c:732 src/text.c:1030 src/text.c:1174
+#: src/text.c:807 src/text.c:955 src/text.c:1267 src/text.c:1437
 msgid "Internal error: unknown type.  Please save your work."
 msgstr "Error interno: tipo desconocido.  Guarde su trabajo."
 
-#: src/text.c:601
+#: src/text.c:813
 #, c-format
 msgid "Undid action (%s)"
 msgstr "Acción deshecha (%s)"
 
-#: src/text.c:619
+#: src/text.c:832
 msgid "Nothing to re-do!"
 msgstr "Nada para rehacer"
 
-#: src/text.c:628
+#: src/text.c:841
 msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr "Error interno: no se puede configurar un rehacer.  Guarde su trabajo."
 
-#: src/text.c:737
+#: src/text.c:961
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Acción rehecha (%s)"
 
-#: src/text.c:827 src/text.c:2508 src/text.c:2944
+#: src/text.c:1051 src/text.c:2765 src/text.c:3198
 msgid "Could not create pipe"
 msgstr "No se pudo crear una tubería («pipe»)"
 
-#: src/text.c:853 src/text.c:2595 src/text.c:2750 src/text.c:2992
-#: src/text.c:3286
+#: src/text.c:1077 src/text.c:2852 src/text.c:3005 src/text.c:3246
+#: src/text.c:3540
 msgid "Could not fork"
 msgstr "No se pudo crear otro proceso"
 
-#: src/text.c:1853
+#: src/text.c:2117
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "El marcador de cita «%s» no es válido: %s"
 
-#: src/text.c:2241
+#: src/text.c:2499
 msgid "Can now UnJustify!"
 msgstr "Ahora se puede desjustificar."
 
-#: src/text.c:2435
+#: src/text.c:2697
 msgid "Edit a replacement"
 msgstr "Editar un reemplazamiento"
 
-#: src/text.c:2510
+#. TRANSLATORS: Shown after fixing misspellings in one word.
+#: src/text.c:2713
+#, fuzzy
+msgid "Next word..."
+msgstr "Palabr sig"
+
+#: src/text.c:2767
 msgid "Creating misspelled word list, please wait..."
 msgstr "Creando una lista de palabras mal escritas.  Espere, por favor..."
 
-#: src/text.c:2601 src/text.c:2999
+#: src/text.c:2858 src/text.c:3253
 msgid "Could not get size of pipe buffer"
 msgstr "No se pudo obtener el tamaño del búfer de la tubería («pipe»)"
 
-#: src/text.c:2652
+#: src/text.c:2907
 msgid "Error invoking \"spell\""
 msgstr "Error al invocar «spell»"
 
-#: src/text.c:2655
+#: src/text.c:2910
 msgid "Error invoking \"sort -f\""
 msgstr "Error al invocar «sort -f»"
 
-#: src/text.c:2658
+#: src/text.c:2913
 msgid "Error invoking \"uniq\""
 msgstr "Error al invocar «uniq»"
 
-#: src/text.c:2881
+#: src/text.c:3135
 msgid "Invoking spell checker, please wait"
 msgstr "Invocando el corrector ortográfico.  Espere, por favor..."
 
-#: src/text.c:2897
+#: src/text.c:3151
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Comprobación de ortografía fallida: %s"
 
-#: src/text.c:2899
+#: src/text.c:3153
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Comprobación de ortografía fallida: %s: %s"
 
-#: src/text.c:2902
+#: src/text.c:3156
 msgid "Finished checking spelling"
 msgstr "Revisión de ortografía finalizada"
 
-#: src/text.c:2927
+#: src/text.c:3181
 msgid "No linter defined for this type of file!"
 msgstr "No se ha definido un corrector de sintaxis para este tipo de fichero"
 
-#: src/text.c:2932
+#: src/text.c:3186
 msgid "Save modified buffer before linting?"
 msgstr "¿Guardar el búfer modificado antes de invocar el corrector?"
 
-#: src/text.c:2949
+#: src/text.c:3203
 msgid "Invoking linter, please wait"
 msgstr "Invocando el corrector de sintaxis.  Espere, por favor..."
 
-#: src/text.c:3105
+#: src/text.c:3358
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr "Se han recibido cero líneas analizables de la orden «%s»"
 
-#: src/text.c:3134
+#: src/text.c:3388
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
 "Este mensaje es para el fichero no abierto %s; ¿abrirlo en un nuevo búfer?"
 
-#: src/text.c:3153
+#: src/text.c:3407
 msgid "No more errors in unopened files, cancelling"
 msgstr "No hay más errores en los ficheros sin abrir; cancelar"
 
-#: src/text.c:3192
+#: src/text.c:3446
 msgid "At last message"
 msgstr "Este es el último mensaje"
 
-#: src/text.c:3197
+#: src/text.c:3451
 msgid "At first message"
 msgstr "Este es el primer mensaje"
 
-#: src/text.c:3237
+#: src/text.c:3491
 msgid "Finished"
 msgstr "Acabado"
 
-#: src/text.c:3259
+#: src/text.c:3513
 msgid "Invoking formatter, please wait"
 msgstr "Invocando el «formatter».  Espere, por favor..."
 
-#: src/text.c:3314
+#: src/text.c:3568
 msgid "Finished formatting"
 msgstr "Se acabó de aplicar formato"
 
-#: src/text.c:3396
+#: src/text.c:3650
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sPalabras: %lu Líneas: %ld Caracteres: %lu "
 
-#: src/text.c:3397
+#: src/text.c:3651
 msgid "In Selection:  "
 msgstr "En la selección: "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3411
+#: src/text.c:3665
 msgid "Verbatim Input"
 msgstr "Entrada literal"
 
 # ¡memoria insuficiente! sv
-#: src/utils.c:391 src/utils.c:403
+#: src/utils.c:392 src/utils.c:404
 msgid "nano is out of memory!"
 msgstr "nano se ha quedado sin memoria"
 
+#: src/utils.c:625
+#, c-format
+msgid "Internal error: can't match line %d.  Please save your work."
+msgstr "Error interno: no se puede encontrar la línea %d.  Guarde su trabajo."
+
+#. TRANSLATORS: This refers to a sequence of escape codes
+#. * (from the keyboard) that nano does not know about.
+#: src/winio.c:1121
+msgid "Unknown sequence"
+msgstr ""
+
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
 #: src/winio.c:1427
 msgid "Unicode Input"
 msgstr "Entrada de Unicode"
 
-#: src/winio.c:1991 src/winio.c:1995
-msgid "Modified"
-msgstr "Modificado"
-
-#: src/winio.c:1992
-msgid "View"
-msgstr "Ver"
-
-#: src/winio.c:2006
+#: src/winio.c:1960
 msgid "DIR:"
 msgstr "DIR:"
 
-#: src/winio.c:2013
+#: src/winio.c:1968
 msgid "File:"
 msgstr "Fichero:"
 
-#: src/winio.c:3141
+#: src/winio.c:1972 src/winio.c:1976
+msgid "Modified"
+msgstr "Modificado"
+
+#: src/winio.c:1974
+msgid "View"
+msgstr "Ver"
+
+#: src/winio.c:3105
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "línea %ld/%ld (%d%%), col %lu/%lu (%d%%), car %lu/%lu (%d%%)"
 
-#: src/winio.c:3271
+#: src/winio.c:3235
 msgid "The nano text editor"
 msgstr "El editor de textos GNU nano"
 
-#: src/winio.c:3272
+#: src/winio.c:3236
 msgid "version"
 msgstr "versión"
 
-#: src/winio.c:3273
+#: src/winio.c:3237
 msgid "Brought to you by:"
 msgstr "Por cortesía de:"
 
-#: src/winio.c:3274
+#: src/winio.c:3238
 msgid "Special thanks to:"
 msgstr "Agradecimientos especiales para:"
 
-#: src/winio.c:3275
+#: src/winio.c:3239
 msgid "The Free Software Foundation"
 msgstr "La Free Software Foundation"
 
-#: src/winio.c:3276
+#: src/winio.c:3240
 msgid "the many translators and the TP"
 msgstr "los traductores y el TP"
 
-#: src/winio.c:3277
+#: src/winio.c:3241
 msgid "For ncurses:"
 msgstr "Por ncurses:"
 
-#: src/winio.c:3278
+#: src/winio.c:3242
 msgid "and anyone else we forgot..."
 msgstr "y cualquiera de quien nos hayamos olvidado..."
 
-#: src/winio.c:3279
+#: src/winio.c:3243
 msgid "Thank you for using nano!"
 msgstr "Gracias por usar nano."
 
+#~ msgid ""
+#~ "Read %lu line (Converted from DOS and Mac format - Warning: No write "
+#~ "permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from DOS and Mac format - Warning: No write "
+#~ "permission)"
+#~ msgstr[0] ""
+#~ "%lu línea leída (convertida desde formatos DOS y Mac; aviso: no hay "
+#~ "permiso de escritura)"
+#~ msgstr[1] ""
+#~ "%lu líneas leídas (convertidas desde formatos DOS y Mac; aviso: no hay "
+#~ "permiso de escritura)"
+
+#~ msgid ""
+#~ "Read %lu line (Converted from Mac format - Warning: No write permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from Mac format - Warning: No write permission)"
+#~ msgstr[0] ""
+#~ "%lu línea leída (convertida desde formato Mac; aviso: no hay permiso de "
+#~ "escritura)"
+#~ msgstr[1] ""
+#~ "%lu líneas leídas (convertidas desde formato Mac; aviso: no hay permiso "
+#~ "de escritura)"
+
+#~ msgid ""
+#~ "Read %lu line (Converted from DOS format - Warning: No write permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from DOS format - Warning: No write permission)"
+#~ msgstr[0] ""
+#~ "%lu línea leída (convertida desde formato DOS; aviso: no hay permiso de "
+#~ "escritura)"
+#~ msgstr[1] ""
+#~ "%lu líneas leídas (convertidas desde formato DOS; aviso: no hay permiso "
+#~ "de escritura)"
+
+#~ msgid "Read %lu line (Warning: No write permission)"
+#~ msgid_plural "Read %lu lines (Warning: No write permission)"
+#~ msgstr[0] "%lu línea leída (aviso: no hay permiso de escritura)"
+#~ msgstr[1] "%lu líneas leídas (aviso: no hay permiso de escritura)"
+
+#~ msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
+#~ msgstr ""
+#~ "¿Guardar el búfer modificado (RESPONDER \"No\" DESTRUIRÁ LOS CAMBIOS)? "
+
+#~ msgid "Unknown Command"
+#~ msgstr "Orden desconocida"
+
+#~ msgid "Cannot add a color command without a syntax command"
+#~ msgstr "No se puede añadir una directiva de color sin una orden de sintaxis"
+
+#~ msgid "Missing regex string"
+#~ msgstr "Falta la cadena regex"
+
+#~ msgid "Cannot add a header regex without a syntax command"
+#~ msgstr ""
+#~ "No se puede añadir una expresión regular para «header» sin una orden "
+#~ "«syntax»"
+
+#~ msgid "Cannot add a magic string regex without a syntax command"
+#~ msgstr ""
+#~ "No se puede añadir una expresión regular para «magic» sin una orden "
+#~ "«syntax»"
+
+#~ msgid "Missing magic string name"
+#~ msgstr "Falta el nombre de la cadena mágica"
+
+#~ msgid "Cannot add a linter without a syntax command"
+#~ msgstr "No se puede añadir un «linter» sin una orden «syntax»"
+
+#~ msgid "Cannot add formatter without a syntax command"
+#~ msgstr "No se puede añadir un «formatter» sin una orden «syntax»"
+
+#~ msgid "Missing formatter command"
+#~ msgstr "Falta un nombre de programa detrás de «formatter»"
+
 #~ msgid "Cannot prepend or append to a symlink with --nofollow set"
 #~ msgstr ""
 #~ "No se puede añadir nada a un enlace simbólico ni al principio ni al final "
diff --git a/po/eu.po b/po/eu.po
index fee69d3d..fec25684 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 1.9.99pre0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-25 16:41-0500\n"
+"POT-Creation-Date: 2016-06-17 15:41+0200\n"
 "PO-Revision-Date: 2006-09-25 19:59+0200\n"
 "Last-Translator: Mikel Olasagasti <hey_neken@mundurat.net>\n"
 "Language-Team: Basque <translation-team-eu@lists.sourceforge.net>\n"
@@ -18,358 +18,342 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
+#: src/browser.c:144 src/browser.c:284 src/browser.c:334 src/files.c:996
+#: src/files.c:1003 src/files.c:1794 src/files.c:1919 src/files.c:1963
+#: src/files.c:1983 src/files.c:2099 src/files.c:3019 src/files.c:3242
+#: src/rcfile.c:540 src/rcfile.c:1280
+#, c-format
+msgid "Error reading %s: %s"
+msgstr "Errorea %s irakurtzen: %s"
+
 #. TRANSLATORS: This is a prompt.
-#: src/browser.c:220
+#: src/browser.c:247
 msgid "Go To Directory"
 msgstr "Joan direktorio honetara"
 
-#: src/browser.c:227 src/browser.c:738 src/files.c:1174 src/files.c:2340
-#: src/nano.c:1120 src/search.c:202 src/search.c:290 src/search.c:895
-#: src/search.c:970 src/text.c:2935 src/text.c:3142
+#: src/browser.c:254 src/browser.c:723 src/files.c:1126 src/files.c:2292
+#: src/nano.c:1128 src/search.c:195 src/search.c:297 src/search.c:851
+#: src/search.c:918 src/text.c:3189 src/text.c:3396
 msgid "Cancelled"
 msgstr "Bertan behera utzita"
 
-#: src/browser.c:253 src/browser.c:300
-#, c-format
-msgid "Can't go outside of %s in restricted mode"
+#. TRANSLATORS: This refers to the option --operatingdir,
+#. * not to --restricted.
+#: src/browser.c:274 src/browser.c:326
+#, fuzzy, c-format
+msgid "Can't go outside of %s in confined mode"
 msgstr "Ezin da %stik kanpora joan era murriztuan"
 
-#: src/browser.c:264 src/browser.c:310 src/browser.c:326 src/files.c:1044
-#: src/files.c:1052 src/files.c:1844 src/files.c:1971 src/files.c:2016
-#: src/files.c:2037 src/files.c:2156 src/files.c:3062 src/files.c:3285
-#: src/rcfile.c:596 src/rcfile.c:1435
-#, c-format
-msgid "Error reading %s: %s"
-msgstr "Errorea %s irakurtzen: %s"
-
-#: src/browser.c:290
+#: src/browser.c:317
 msgid "Can't move up a directory"
 msgstr "Ezin da direktorioan gora egin"
 
 #. TRANSLATORS: Try to keep this at most 7 characters.
-#: src/browser.c:615 src/browser.c:623
+#: src/browser.c:590 src/browser.c:598
 msgid "(dir)"
 msgstr "(dir)"
 
 #. TRANSLATORS: Try to keep this at most 12 characters.
-#: src/browser.c:620
+#: src/browser.c:595
 msgid "(parent dir)"
 msgstr "(aita dir.)"
 
 #. TRANSLATORS: Try to keep this at most 7 characters.
 #. * If necessary, you can leave out the parentheses.
-#: src/browser.c:650
+#: src/browser.c:625
 msgid "(huge)"
 msgstr ""
 
 #. TRANSLATORS: This is the main search prompt.
-#: src/browser.c:727 src/search.c:173
+#: src/browser.c:712 src/search.c:166
 msgid "Search"
 msgstr "Bilatu"
 
-#: src/browser.c:777 src/search.c:466 src/search.c:536
-msgid "This is the only occurrence"
-msgstr "Hau da kointzidentzia bakarra"
-
-#: src/browser.c:793 src/search.c:364
+#: src/browser.c:754 src/search.c:368
 msgid "Search Wrapped"
 msgstr "Bilaketa berriz hasia"
 
-#: src/browser.c:843 src/search.c:517
+#: src/browser.c:764 src/search.c:509
+msgid "This is the only occurrence"
+msgstr "Hau da kointzidentzia bakarra"
+
+#: src/browser.c:812 src/search.c:473
 msgid "No current search pattern"
 msgstr "Ez dago bilatzeko eredurik"
 
-#: src/files.c:50
+#: src/color.c:186
+#, fuzzy, c-format
+msgid "Unknown syntax name: %s"
+msgstr "Bikoiztutako %s sintaxi izena"
+
+#: src/color.c:247
+#, c-format
+msgid "magic_load() failed: %s"
+msgstr ""
+
+#: src/color.c:251
+#, c-format
+msgid "magic_file(%s) failed: %s"
+msgstr ""
+
+#: src/files.c:47
 #, c-format
 msgid "Directory '%s' does not exist"
 msgstr ""
 
-#: src/files.c:52
+#: src/files.c:49
 #, c-format
 msgid "Path '%s': %s"
 msgstr ""
 
-#: src/files.c:54
+#: src/files.c:51
 #, fuzzy, c-format
 msgid "Path '%s' is not a directory"
 msgstr "\"%s\" direktorio bat da"
 
-#: src/files.c:57
+#: src/files.c:53
 #, c-format
 msgid "Path '%s' is not accessible"
 msgstr ""
 
-#. TRANSLATORS: Try to keep this at most 76 characters.
-#: src/files.c:158
+#. TRANSLATORS: Keep the next ten messages at most 76 characters.
+#: src/files.c:148
 msgid ""
 "Warning: Modifying a file which is not locked, check directory permission?"
 msgstr ""
 
-#: src/files.c:197
+#: src/files.c:187
 msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
 msgstr ""
 
-#: src/files.c:206
+#: src/files.c:196
 #, fuzzy, c-format
 msgid "Couldn't determine hostname for lock file: %s"
 msgstr "Ezin izan da aldi baterako fitxategia sortu: %s"
 
-#: src/files.c:227 src/files.c:238 src/files.c:275 src/files.c:285
+#: src/files.c:216 src/files.c:225 src/files.c:262 src/files.c:272
 #, fuzzy, c-format
 msgid "Error writing lock file %s: %s"
 msgstr "Errorea aldi baterako fitxategia idazten: %s"
 
-#: src/files.c:305
+#: src/files.c:291
 #, fuzzy, c-format
 msgid "Error deleting lock file %s: %s"
 msgstr "Errorea aldi baterako fitxategia idazten: %s"
 
-#: src/files.c:341
+#: src/files.c:325
 #, fuzzy, c-format
 msgid "Error opening lock file %s: %s"
 msgstr "Errorea %s irakurtzen: %s"
 
-#: src/files.c:353
+#: src/files.c:337
 #, c-format
 msgid "Error reading lock file %s: Not enough data read"
 msgstr ""
 
 #. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
-#: src/files.c:371
+#: src/files.c:354
 #, c-format
 msgid "File %s is being edited (by %s with %s, PID %d); continue?"
 msgstr ""
 
-#: src/files.c:426
+#: src/files.c:430
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Ezin da artxiboa txertatu %s-tik kanpo"
 
-#: src/files.c:439 src/files.c:1038 src/rcfile.c:589 src/rcfile.c:1385
-#: src/rcfile.c:1426
+#: src/files.c:445 src/files.c:991 src/rcfile.c:533 src/rcfile.c:1230
+#: src/rcfile.c:1271
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" direktorio bat da"
 
-#: src/files.c:441
+#: src/files.c:447
 #, fuzzy, c-format
 msgid "\"%s\" is not a normal file"
 msgstr "\"%s\" fitxategia dispositibo-fitxategi bat da"
 
-#: src/files.c:566
+#: src/files.c:571
 msgid "No more open file buffers"
 msgstr "Ez dago irekitako fitxategi buffer gehiagorik"
 
-#: src/files.c:582
+#: src/files.c:586
 #, c-format
 msgid "Switched to %s"
 msgstr "%s-ra aldatua"
 
-#: src/files.c:584 src/global.c:988 src/winio.c:2010
+#: src/files.c:588 src/global.c:1005 src/winio.c:1965
 msgid "New Buffer"
 msgstr "Bufer berria"
 
-#: src/files.c:943
+#. TRANSLATORS: Keep the next four messages at most 76 characters.
+#: src/files.c:913
 #, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
 msgstr[0] "Lerro %lu irakurria (DOS eta Mac formatutik bihurtuak)"
 msgstr[1] "%lu lerro irakurriak (DOS eta Mac formatutik bihurtuak)"
 
-#: src/files.c:948
-#, fuzzy, c-format
-msgid ""
-"Read %lu line (Converted from DOS and Mac format - Warning: No write "
-"permission)"
-msgid_plural ""
-"Read %lu lines (Converted from DOS and Mac format - Warning: No write "
-"permission)"
-msgstr[0] "Lerro %lu irakurria (DOS eta Mac formatutik bihurtuak)"
-msgstr[1] "%lu lerro irakurriak (DOS eta Mac formatutik bihurtuak)"
-
-#: src/files.c:954
+#: src/files.c:919
 #, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
 msgstr[0] "Lerro %lu irakurria (Mac formatutik bihurtuak)"
 msgstr[1] "%lu lerro irakurriak (Mac formatutik bihurtuak)"
 
-#: src/files.c:958
-#, fuzzy, c-format
-msgid ""
-"Read %lu line (Converted from Mac format - Warning: No write permission)"
-msgid_plural ""
-"Read %lu lines (Converted from Mac format - Warning: No write permission)"
-msgstr[0] "Lerro %lu irakurria (Mac formatutik bihurtuak)"
-msgstr[1] "%lu lerro irakurriak (Mac formatutik bihurtuak)"
-
-#: src/files.c:964
+#: src/files.c:925
 #, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
 msgstr[0] "Lerro %lu irakurria (DOS formatutik bihurtuak)"
 msgstr[1] "%lu lerro irakurriak (DOS formatutik bihurtuak)"
 
-#: src/files.c:968
-#, fuzzy, c-format
-msgid ""
-"Read %lu line (Converted from DOS format - Warning: No write permission)"
-msgid_plural ""
-"Read %lu lines (Converted from DOS format - Warning: No write permission)"
-msgstr[0] "Lerro %lu irakurria (DOS formatutik bihurtuak)"
-msgstr[1] "%lu lerro irakurriak (DOS formatutik bihurtuak)"
-
-#: src/files.c:974
+#: src/files.c:930
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "Lerro %lu irakurria"
 msgstr[1] "%lu lerro irakurriak"
 
-#: src/files.c:977
-#, c-format
-msgid "Read %lu line (Warning: No write permission)"
-msgid_plural "Read %lu lines (Warning: No write permission)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/files.c:1019 src/files.c:1056
+#: src/files.c:974 src/files.c:1006
 msgid "Reading File"
 msgstr "Fitxategia irakurtzen"
 
-#: src/files.c:1025
+#: src/files.c:980
 msgid "New File"
 msgstr "Fitxategi berria"
 
-#: src/files.c:1028
-#, c-format
-msgid "\"%s\" not found"
+#: src/files.c:983
+#, fuzzy, c-format
+msgid "File \"%s\" not found"
 msgstr "\"%s\" ezin aurkitu"
 
-#: src/files.c:1039 src/rcfile.c:590 src/rcfile.c:1386 src/rcfile.c:1427
+#: src/files.c:992 src/rcfile.c:534 src/rcfile.c:1231 src/rcfile.c:1272
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" fitxategia dispositibo-fitxategi bat da"
 
-#: src/files.c:1133
+#: src/files.c:1083
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Buffer berrian exekutatzeko komandoa [%s-tik] "
 
-#: src/files.c:1135
+#: src/files.c:1085
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Exekutatutzeko komandoa [%s-(e)tik] "
 
-#: src/files.c:1142
+#: src/files.c:1092
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Buffer berrian txertatzeko fitxategia [%s-tik]"
 
-#: src/files.c:1144
+#: src/files.c:1094
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Txertatzeko fitxategia [%s-tik] "
 
-#: src/files.c:1389
+#: src/files.c:1338
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Baligabeko tekla ez-multibuffer moduan"
 
-#: src/files.c:1684
-msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+#: src/files.c:1632
+msgid "Failed to write backup file; continue saving? (Say N if unsure.) "
 msgstr ""
 
-#: src/files.c:1800
+#: src/files.c:1750
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Ezin da %staz kanpo idatzi"
 
-#: src/files.c:1885 src/files.c:1910 src/files.c:1928 src/files.c:1941
-#: src/files.c:1952 src/files.c:1981
+#: src/files.c:1833 src/files.c:1858 src/files.c:1876 src/files.c:1889
+#: src/files.c:1900 src/files.c:1928
 #, fuzzy, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Errorea aldi baterako fitxategia idazten: %s"
 
-#: src/files.c:1886 src/nano.c:690
+#: src/files.c:1834 src/nano.c:692
 msgid "Too many backup files?"
 msgstr "Babes-kopia fitxategi gehiegi?"
 
-#: src/files.c:2026 src/text.c:2863 src/text.c:2875 src/text.c:3244
-#: src/text.c:3253
+#: src/files.c:1972 src/text.c:3117 src/text.c:3129 src/text.c:3498
+#: src/text.c:3507
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Errorea aldi baterako fitxategia idazten: %s"
 
-#: src/files.c:2049 src/files.c:2068 src/files.c:2080 src/files.c:2104
-#: src/files.c:2121 src/files.c:2131 src/files.c:2164 src/files.c:2171
+#: src/files.c:1994 src/files.c:2013 src/files.c:2023 src/files.c:2047
+#: src/files.c:2064 src/files.c:2074 src/files.c:2106 src/files.c:2113
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Errorea %s idazten: %s"
 
-#: src/files.c:2200
+#: src/files.c:2154
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "Lerro %lu idatzia"
 msgstr[1] "%lu lerro idatziak"
 
-#: src/files.c:2299
+#: src/files.c:2249
 msgid " [DOS Format]"
 msgstr "[DOS formatua]"
 
-#: src/files.c:2300
+#: src/files.c:2250
 msgid " [Mac Format]"
 msgstr "[Mac formatua]"
 
-#: src/files.c:2302
+#: src/files.c:2252
 msgid " [Backup]"
 msgstr " [Babeskopia]"
 
-#: src/files.c:2309
+#: src/files.c:2259
 msgid "Prepend Selection to File"
 msgstr "Gehitu aukeraketa fitxategiaren hasieran"
 
-#: src/files.c:2310
+#: src/files.c:2260
 msgid "Append Selection to File"
 msgstr "Gehitu aukeraketa fitxategian"
 
-#: src/files.c:2311
+#: src/files.c:2261
 msgid "Write Selection to File"
 msgstr "Ahuatespena artxiboan idatzi"
 
-#: src/files.c:2314
+#: src/files.c:2264
 msgid "File Name to Prepend to"
 msgstr "Gehitu nahi duzun fitxategiaren izena"
 
-#: src/files.c:2315
+#: src/files.c:2265
 msgid "File Name to Append to"
 msgstr "Gehituko zaion fitxategiaren izena "
 
-#: src/files.c:2316
+#: src/files.c:2266
 msgid "File Name to Write"
 msgstr "Idatzi nahi duzun artxiboaren izena"
 
-#: src/files.c:2349
-msgid "Save modified buffer anyway ? "
+#: src/files.c:2301
+msgid "Save modified buffer anyway? "
 msgstr ""
 
-#: src/files.c:2457
-msgid "File exists, OVERWRITE ? "
-msgstr "Fitxategia existitzen da dagoeneko, GAINIDATZI?"
-
-#: src/files.c:2466
-msgid "Save file under DIFFERENT NAME ? "
+#: src/files.c:2412
+#, fuzzy
+msgid "Save file under DIFFERENT NAME? "
 msgstr "Gorde fitxategia BESTE izen batekin?"
 
-#: src/files.c:2480
-msgid "File was modified since you opened it, continue saving ? "
+#: src/files.c:2420
+#, fuzzy, c-format
+msgid "File \"%s\" exists; OVERWRITE? "
+msgstr "Fitxategia existitzen da dagoeneko, GAINIDATZI?"
+
+#: src/files.c:2441
+msgid "File was modified since you opened it; continue saving? "
 msgstr ""
 
-#: src/files.c:2917
+#: src/files.c:2874
 msgid "(more)"
 msgstr "(gehiago)"
 
-#: src/files.c:3004
+#: src/files.c:2959
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -378,28 +362,28 @@ msgstr ""
 "\n"
 "Nanorekin jarraitzeko return sakatu\n"
 
-#: src/files.c:3020
+#: src/files.c:2975
 #, c-format
 msgid ""
 "Unable to create directory %s: %s\n"
 "It is required for saving/loading search history or cursor positions.\n"
 msgstr ""
 
-#: src/files.c:3026
+#: src/files.c:2982
 #, c-format
 msgid ""
 "Path %s is not a directory and needs to be.\n"
 "Nano will be unable to load or save search history or cursor positions.\n"
 msgstr ""
 
-#: src/files.c:3045
+#: src/files.c:3002
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I tried to move\n"
 "to the preferred location (%s) but encountered an error: %s"
 msgstr ""
 
-#: src/files.c:3049
+#: src/files.c:3006
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I moved\n"
@@ -407,773 +391,804 @@ msgid ""
 "(see the nano FAQ about this change)"
 msgstr ""
 
-#: src/files.c:3132 src/files.c:3140 src/files.c:3164 src/files.c:3176
+#: src/files.c:3089 src/files.c:3097 src/files.c:3121 src/files.c:3133
 #, fuzzy, c-format
 msgid "Error writing %s: %s\n"
 msgstr "Errorea %s idazten: %s"
 
 #. TRANSLATORS: Try to keep the next fifteen strings at most 10 characters.
-#: src/global.c:480
+#: src/global.c:483
 msgid "Exit"
 msgstr "Irten"
 
-#: src/global.c:481
+#: src/global.c:484
 msgid "Close"
 msgstr "Itxi"
 
-#: src/global.c:482
+#: src/global.c:485
 #, fuzzy
 msgid "Uncut Text"
 msgstr "Ezmoztu testua"
 
-#: src/global.c:484
+#: src/global.c:487
 #, fuzzy
 msgid "Unjustify"
 msgstr "Justifikazioa ezeztatu"
 
-#: src/global.c:490
+#: src/global.c:493
 msgid "Read File"
 msgstr "Artxiboa irakurri"
 
-#: src/global.c:491
+#: src/global.c:494
 msgid "Where Is"
 msgstr "Bilatu"
 
-#: src/global.c:492
+#: src/global.c:495
 msgid "Replace"
 msgstr "Ordezkatu"
 
-#: src/global.c:493
+#: src/global.c:496
 msgid "Go To Line"
 msgstr "Joan lerro hontara"
 
-#: src/global.c:494
+#: src/global.c:497
 msgid "Prev Line"
 msgstr "Aurreko lerroa"
 
-#: src/global.c:495
+#: src/global.c:498
 msgid "Next Line"
 msgstr "Hurrengo lerroa"
 
-#: src/global.c:496
+#: src/global.c:499
 msgid "Prev Page"
 msgstr "Aurreko orrialdea"
 
-#: src/global.c:497
+#: src/global.c:500
 msgid "Next Page"
 msgstr "Hurrengo orrialdea"
 
-#: src/global.c:499
+#: src/global.c:502
 msgid "Justify"
 msgstr "Justifikatu"
 
-#: src/global.c:500
+#: src/global.c:503
 msgid "FullJstify"
 msgstr "Justifikatu"
 
-#: src/global.c:502
+#: src/global.c:505
 msgid "Refresh"
 msgstr "Freskatu"
 
 #. TRANSLATORS: Try to keep this string at most 12 characters.
-#: src/global.c:505
+#: src/global.c:508
 msgid "WhereIs Next"
 msgstr "Non dago Hur."
 
 #. TRANSLATORS: The next long series of strings are shortcut descriptions;
 #. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:512
+#: src/global.c:515
 msgid "Justify the current paragraph"
 msgstr "Uneko parrafoa justifikatu"
 
-#: src/global.c:514
+#: src/global.c:517
 msgid "Cancel the current function"
 msgstr "Uneko funtzioa bertan behera utzi"
 
-#: src/global.c:515
+#: src/global.c:518
 msgid "Display this help text"
 msgstr "Erakutsi laguntza testu hau"
 
-#: src/global.c:518
+#: src/global.c:521
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Unean kargatutako fitxategi bufferra itxi/Nanotik irten"
 
-#: src/global.c:520
+#: src/global.c:523
 msgid "Exit from nano"
 msgstr "Nanotik irten"
 
-#: src/global.c:524
+#: src/global.c:527
 msgid "Write the current file to disk"
 msgstr "Uneko artxiboa diskoan idatzi"
 
-#: src/global.c:526
+#: src/global.c:529
 msgid "Insert another file into the current one"
 msgstr "Uneko lerroan beste lerro bat txertatu"
 
-#: src/global.c:528
+#: src/global.c:531
 msgid "Search for a string or a regular expression"
 msgstr "Bilatu kate bat edo expresio erregular bat"
 
-#: src/global.c:531
+#: src/global.c:533
 #, fuzzy
 msgid "Search for a string"
 msgstr "Bilatu kate bat edo expresio erregular bat"
 
-#: src/global.c:533
+#: src/global.c:534
+msgid "Refresh the file list"
+msgstr ""
+
+#: src/global.c:535
+#, fuzzy
+msgid "Go to lefthand column"
+msgstr "Joan espezifikatutako lerro eta zutabera"
+
+#: src/global.c:536
+#, fuzzy
+msgid "Go to righthand column"
+msgstr "Joan espezifikatutako lerro eta zutabera"
+
+#: src/global.c:538
 msgid "Go one screenful up"
 msgstr ""
 
-#: src/global.c:534
+#: src/global.c:539
 msgid "Go one screenful down"
 msgstr ""
 
-#: src/global.c:536
+#: src/global.c:541
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Uneko lerroa moztu eta cutbufferean gorde"
 
-#: src/global.c:538
+#: src/global.c:543
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Cutbufferekoa uneko lerroan txertatu"
 
-#: src/global.c:539
+#: src/global.c:544
 msgid "Display the position of the cursor"
 msgstr "Kurtsorearen posisioa erakutsi"
 
-#: src/global.c:541
+#: src/global.c:546
 msgid "Invoke the spell checker, if available"
 msgstr "Deitu zuzentzaileari, eskuragarri badago"
 
-#: src/global.c:543
+#: src/global.c:548
 msgid "Replace a string or a regular expression"
 msgstr "Ordezkatu kate bat edo expresio erregular bat"
 
-#: src/global.c:544
+#: src/global.c:549
 msgid "Go to line and column number"
 msgstr "Joan espezifikatutako lerro eta zutabera"
 
-#: src/global.c:546
+#: src/global.c:551
 #, fuzzy
 msgid "Mark text starting from the cursor position"
 msgstr "Markatu testua kurtsorearen uneko posizioan"
 
-#: src/global.c:547
+#: src/global.c:552
 #, fuzzy
 msgid "Repeat the last search"
 msgstr "Errepikatu azken bilaketa"
 
-#: src/global.c:549
+#: src/global.c:554
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "Uneko lerroa kopiatu eta cutbufferean gorde"
 
-#: src/global.c:550
+#: src/global.c:555
 msgid "Indent the current line"
 msgstr "Koskatu uneko lerroa"
 
-#: src/global.c:551
+#: src/global.c:556
 msgid "Unindent the current line"
 msgstr "Koska kendu uneko lerroari"
 
-#: src/global.c:552
+#: src/global.c:558
+msgid "Comment/uncomment the current line or marked lines"
+msgstr ""
+
+#: src/global.c:560
 msgid "Undo the last operation"
 msgstr ""
 
-#: src/global.c:553
+#: src/global.c:561
 msgid "Redo the last undone operation"
 msgstr ""
 
-#: src/global.c:555
+#: src/global.c:563
 #, fuzzy
 msgid "Go back one character"
 msgstr "Karaktere bat atzeruntz mugitu"
 
-#: src/global.c:556
+#: src/global.c:564
 #, fuzzy
 msgid "Go forward one character"
 msgstr "Karaktere bat aurreruntz mugitu"
 
-#: src/global.c:558
+#: src/global.c:566
 #, fuzzy
 msgid "Go back one word"
 msgstr "Mugitu hitz bat atzeruntz"
 
-#: src/global.c:559
+#: src/global.c:567
 #, fuzzy
 msgid "Go forward one word"
 msgstr "Mugitu hitz bat atzera"
 
-#: src/global.c:561
+#: src/global.c:569
 #, fuzzy
 msgid "Go to previous line"
 msgstr "Aurreko lerrora mugitu"
 
-#: src/global.c:562
+#: src/global.c:570
 #, fuzzy
 msgid "Go to next line"
 msgstr "Mugitu hurrengo lerrora"
 
-#: src/global.c:563
+#: src/global.c:571
 #, fuzzy
 msgid "Go to beginning of current line"
 msgstr "Uneko lerroaren hasierara mugitu"
 
-#: src/global.c:564
+#: src/global.c:572
 #, fuzzy
 msgid "Go to end of current line"
 msgstr "Uneko lerroaren bukaerara mugitu"
 
-#: src/global.c:567
+#: src/global.c:575
 #, fuzzy
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "Mugitu uneko parrafoaren hasierara"
 
-#: src/global.c:569
+#: src/global.c:577
 #, fuzzy
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr "Mugitu uneko parrafoaren amaierara"
 
-#: src/global.c:571
+#: src/global.c:579
 #, fuzzy
 msgid "Go to the first line of the file"
 msgstr "Mugitu fitxategiaren lehen lerrora"
 
-#: src/global.c:572
+#: src/global.c:580
 #, fuzzy
 msgid "Go to the last line of the file"
 msgstr "Mugitu fitxategiaren azken lerrora"
 
-#: src/global.c:574
+#: src/global.c:582
 #, fuzzy
 msgid "Go to the matching bracket"
 msgstr "Ez dago giltz egokirik"
 
-#: src/global.c:576
+#: src/global.c:584
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "Korritu gora lerro bat kurtsorea korritu gabe"
 
-#: src/global.c:578
+#: src/global.c:586
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "Korritu behera lerro bat kurtsorea korritu gabe"
 
-#: src/global.c:581
+#: src/global.c:589
 msgid "Switch to the previous file buffer"
 msgstr "Aldatu aurreko fitxategi buffer-era"
 
-#: src/global.c:582
+#: src/global.c:590
 msgid "Switch to the next file buffer"
 msgstr "Aldatu hurrengo fitxategi buffer-era"
 
-#: src/global.c:584
+#: src/global.c:592
 msgid "Insert the next keystroke verbatim"
 msgstr "Hurrengo tekla-sakatzea literalki sartu"
 
-#: src/global.c:585
+#: src/global.c:593
 msgid "Insert a tab at the cursor position"
 msgstr "Txertatu tabuladore karaktere bat kurtsorearen posizioan"
 
-#: src/global.c:586
+#: src/global.c:594
 #, fuzzy
 msgid "Insert a newline at the cursor position"
 msgstr "Orga-itzulera bat kurtsorearen posizioan txertatu"
 
-#: src/global.c:587
+#: src/global.c:595
 msgid "Delete the character under the cursor"
 msgstr "Kurtsorearen azpiko karaterea ezabatu"
 
-#: src/global.c:589
+#: src/global.c:597
 msgid "Delete the character to the left of the cursor"
 msgstr "Kurtsorearen ezkerraldeko karaterea ezabatu"
 
-#: src/global.c:592
+#: src/global.c:600
 #, fuzzy
 msgid "Cut backward from cursor to word start"
 msgstr "Moztu kurtsoretik lerro amaierara"
 
-#: src/global.c:594
+#: src/global.c:602
 #, fuzzy
 msgid "Cut forward from cursor to next word start"
 msgstr "Moztu kurtsoretik lerro amaierara"
 
-#: src/global.c:596
+#: src/global.c:604
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Moztu kurtsoretik posiziotik lerro amaierara arte"
 
-#: src/global.c:599
+#: src/global.c:607
 msgid "Justify the entire file"
 msgstr "Justifikatu lerro osoa"
 
-#: src/global.c:603
+#: src/global.c:611
 msgid "Count the number of words, lines, and characters"
 msgstr "Zenbatu hitz, lerro eta karaktere kopurua"
 
-#: src/global.c:606
+#: src/global.c:614
 msgid "Refresh (redraw) the current screen"
 msgstr "Freskatu uneko pantaila"
 
-#: src/global.c:608
+#: src/global.c:616
 msgid "Suspend the editor (if suspension is enabled)"
 msgstr ""
 
-#: src/global.c:610
+#: src/global.c:618
 msgid "Save file without prompting"
 msgstr ""
 
-#: src/global.c:611
+#: src/global.c:619
 #, fuzzy
 msgid "Search next occurrence backward"
 msgstr "Atzerantza bilatu"
 
-#: src/global.c:612
+#: src/global.c:620
 msgid "Search next occurrence forward"
 msgstr ""
 
-#: src/global.c:614
+#: src/global.c:622
 #, fuzzy
 msgid "Toggle the case sensitivity of the search"
 msgstr "Mayuskula/minuskulaz egindako bilaketa"
 
-#: src/global.c:616
+#: src/global.c:624
 #, fuzzy
 msgid "Reverse the direction of the search"
 msgstr "kurtsorearen posisioa erakutsi"
 
-#: src/global.c:620
+#: src/global.c:628
 #, fuzzy
 msgid "Toggle the use of regular expressions"
 msgstr "Expresio erregularrak erabili"
 
-#: src/global.c:624
+#: src/global.c:632
 #, fuzzy
 msgid "Recall the previous search/replace string"
 msgstr "Editatu aurreko bilaketa/aldaketa kateak"
 
-#: src/global.c:626
+#: src/global.c:634
 #, fuzzy
 msgid "Recall the next search/replace string"
 msgstr "Editatu aurreko bilaketa/aldaketa kateak"
 
-#: src/global.c:629
+#: src/global.c:637
 msgid "Go to file browser"
 msgstr "Fitxategi nabigatzailera joan"
 
-#: src/global.c:632
+#: src/global.c:640
 #, fuzzy
 msgid "Toggle the use of DOS format"
 msgstr "Dos formatoan fitxategia idazten"
 
-#: src/global.c:633
+#: src/global.c:641
 #, fuzzy
 msgid "Toggle the use of Mac format"
 msgstr "Idatzi fitxategia Mac formatuan"
 
-#: src/global.c:634
+#: src/global.c:642
 #, fuzzy
 msgid "Toggle appending"
 msgstr "Auto-doitu lerro luzeak"
 
-#: src/global.c:635
+#: src/global.c:643
 msgid "Toggle prepending"
 msgstr ""
 
-#: src/global.c:636
+#: src/global.c:644
 #, fuzzy
 msgid "Toggle backing up of the original file"
 msgstr "Gorde existitzen diren fitxategien babeskopiak"
 
-#: src/global.c:637
+#: src/global.c:645
 msgid "Execute external command"
 msgstr "Exekutatu kanpo-komandoa"
 
-#: src/global.c:639
+#: src/global.c:647
 msgid "Close buffer without saving it"
 msgstr ""
 
-#: src/global.c:641
+#: src/global.c:649
 #, fuzzy
 msgid "Toggle the use of a new buffer"
 msgstr "Ezin izan da hodi buffer-aren tamainua lortu"
 
-#: src/global.c:644
+#: src/global.c:652
 msgid "Exit from the file browser"
 msgstr "Irten fitxategi nabigatzailetik"
 
-#: src/global.c:645
+#: src/global.c:653
 msgid "Go to the first file in the list"
 msgstr "Joan zerrendako lehen fitxategira"
 
-#: src/global.c:646
+#: src/global.c:654
 msgid "Go to the last file in the list"
 msgstr "Joan zerrendako azken fitxategira"
 
-#: src/global.c:647
+#: src/global.c:655
 #, fuzzy
 msgid "Go to the previous file in the list"
 msgstr "Joan zerrendako lehen fitxategira"
 
-#: src/global.c:648
+#: src/global.c:656
 #, fuzzy
 msgid "Go to the next file in the list"
 msgstr "Joan zerrendako azken fitxategira"
 
-#: src/global.c:649
+#: src/global.c:657
 msgid "Go to directory"
 msgstr "Joan direktorio honetara"
 
-#: src/global.c:652
+#: src/global.c:660
 #, fuzzy
 msgid "Invoke the linter, if available"
 msgstr "Deitu zuzentzaileari, eskuragarri badago"
 
-#: src/global.c:653
+#: src/global.c:661
 #, fuzzy
 msgid "Go to previous linter msg"
 msgstr "Aurreko lerrora mugitu"
 
-#: src/global.c:654
+#: src/global.c:662
 #, fuzzy
 msgid "Go to next linter msg"
 msgstr "Mugitu hurrengo lerrora"
 
-#: src/global.c:656
+#: src/global.c:664
 #, fuzzy
 msgid "Invoke formatter, if available"
 msgstr "Deitu zuzentzaileari, eskuragarri badago"
 
 #. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:671
+#: src/global.c:679
 msgid "Get Help"
 msgstr "Laguntza begiratu"
 
-#: src/global.c:674 src/prompt.c:858
+#: src/global.c:682 src/prompt.c:855
 msgid "Cancel"
 msgstr "Bertan behera utzi"
 
-#: src/global.c:687
+#: src/global.c:695
 #, fuzzy
 msgid "Write Out"
 msgstr "Gorde"
 
-#: src/global.c:723
+#: src/global.c:731
 msgid "Go To Dir"
 msgstr "Joan direktorio honetara"
 
-#: src/global.c:738
+#: src/global.c:746
 msgid "Cut Text"
 msgstr "Textua moztu"
 
-#: src/global.c:753
+#: src/global.c:761
 msgid "To Spell"
 msgstr "Ortografia"
 
-#: src/global.c:757
+#: src/global.c:765
 #, fuzzy
 msgid "To Linter"
 msgstr "Joan lerro hontara"
 
-#: src/global.c:760
+#: src/global.c:768
 #, fuzzy
 msgid "Formatter"
 msgstr "DOS formatua"
 
-#: src/global.c:767
+#: src/global.c:775
 msgid "Case Sens"
 msgstr "May/Min"
 
-#: src/global.c:772
+#: src/global.c:780
 msgid "Regexp"
 msgstr "Regexp"
 
-#: src/global.c:777
+#: src/global.c:785
 msgid "Backwards"
 msgstr "Atzeruntza"
 
-#: src/global.c:784
+#: src/global.c:792
 msgid "No Replace"
 msgstr "Ez ordezkatu"
 
-#: src/global.c:792
+#: src/global.c:800
 msgid "Cur Pos"
 msgstr "Uneko posizioa"
 
-#: src/global.c:807
+#: src/global.c:815
 msgid "First Line"
 msgstr "Lehen lerroa"
 
-#: src/global.c:809
+#: src/global.c:817
 msgid "Last Line"
 msgstr "Azken lerroa"
 
-#: src/global.c:816
+#: src/global.c:824
 #, fuzzy
 msgid "To Bracket"
 msgstr "Ez da hori giltza"
 
-#: src/global.c:819
+#: src/global.c:827
 msgid "Mark Text"
 msgstr "Textua markatu"
 
-#: src/global.c:822
+#: src/global.c:830
 msgid "Copy Text"
 msgstr "Kopiatu testua"
 
-#: src/global.c:825
+#: src/global.c:833
 msgid "Indent Text"
 msgstr "Koskatu testua"
 
-#: src/global.c:827
+#: src/global.c:835
 msgid "Unindent Text"
 msgstr "Ez koskatu testua"
 
-#: src/global.c:830
+#: src/global.c:838
 msgid "Undo"
 msgstr ""
 
-#: src/global.c:832
+#: src/global.c:840
 msgid "Redo"
 msgstr ""
 
-#: src/global.c:836 src/global.c:842
+#: src/global.c:844 src/global.c:850
 msgid "Back"
 msgstr "Atzean"
 
-#: src/global.c:838 src/global.c:844
+#: src/global.c:846 src/global.c:852
 msgid "Forward"
 msgstr "Aurrean"
 
-#: src/global.c:849
+#: src/global.c:857
 msgid "Prev Word"
 msgstr "Aurreko hitza"
 
-#: src/global.c:851
+#: src/global.c:859
 msgid "Next Word"
 msgstr "Hurrengo hitza"
 
-#: src/global.c:855
+#: src/global.c:863
 msgid "Home"
 msgstr "Etxea"
 
-#: src/global.c:857
+#: src/global.c:865
 msgid "End"
 msgstr "Bukaera"
 
-#: src/global.c:866
+#: src/global.c:874
 msgid "Beg of Par"
 msgstr "Par hasi"
 
-#: src/global.c:868
+#: src/global.c:876
 msgid "End of Par"
 msgstr "Par amai"
 
-#: src/global.c:873
+#: src/global.c:881
 msgid "Scroll Up"
 msgstr "Korritu gora"
 
-#: src/global.c:875
+#: src/global.c:883
 msgid "Scroll Down"
 msgstr "Korritu behera"
 
-#: src/global.c:880
+#: src/global.c:888
 #, fuzzy
 msgid "Prev File"
 msgstr "Aurreko fitxategia"
 
-#: src/global.c:882
+#: src/global.c:890
 msgid "Next File"
 msgstr "Hurrengo fitxategia"
 
-#: src/global.c:891
+#: src/global.c:899
 #, fuzzy
 msgid "Verbatim"
 msgstr "Sarrera literala"
 
-#: src/global.c:894
+#: src/global.c:902
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:896
+#: src/global.c:904
 msgid "Enter"
 msgstr "Sartu"
 
-#: src/global.c:899
+#: src/global.c:907
 msgid "Delete"
 msgstr "Ezabatu"
 
-#: src/global.c:901
+#: src/global.c:909
 msgid "Backspace"
 msgstr "Atzera tekla"
 
 #. TRANSLATORS: The next two strings refer to cutting words.
-#: src/global.c:912
+#: src/global.c:920
 #, fuzzy
 msgid "Cut Left"
 msgstr "Textua moztu"
 
-#: src/global.c:914
+#: src/global.c:922
 msgid "Cut Right"
 msgstr ""
 
-#: src/global.c:916
+#: src/global.c:924
 msgid "CutTillEnd"
 msgstr "MoztuAmaieraraArte"
 
-#: src/global.c:926
+#: src/global.c:934
 msgid "Word Count"
 msgstr "Hitz kopurua"
 
-#: src/global.c:933
+#: src/global.c:941
 #, fuzzy
 msgid "Suspend"
 msgstr "Eseki"
 
-#: src/global.c:937
+#: src/global.c:945
+#, fuzzy
+msgid "Comment Lines"
+msgstr "Hurrengo lerroa"
+
+#: src/global.c:949
 msgid "Save"
 msgstr ""
 
-#: src/global.c:940
+#: src/global.c:952
 #, fuzzy
 msgid "Previous"
 msgstr "Aurreko fitxategia"
 
-#: src/global.c:942
+#: src/global.c:954
 #, fuzzy
 msgid "Next"
 msgstr "Hurrengo orrialdea"
 
-#: src/global.c:948
+#: src/global.c:960
 msgid "PrevHstory"
 msgstr "Aurreko historikoa"
 
-#: src/global.c:951
+#: src/global.c:963
 msgid "NextHstory"
 msgstr "Hurrengo historikoa"
 
-#: src/global.c:955
+#: src/global.c:972
 msgid "Go To Text"
 msgstr "Joan testu hontara"
 
-#: src/global.c:959
+#: src/global.c:976
 msgid "DOS Format"
 msgstr "DOS formatua"
 
-#: src/global.c:961
+#: src/global.c:978
 msgid "Mac Format"
 msgstr "Mac formatua"
 
-#: src/global.c:969
+#: src/global.c:986
 msgid "Append"
 msgstr "Gehitu"
 
-#: src/global.c:971
+#: src/global.c:988
 msgid "Prepend"
 msgstr "Gehitu"
 
-#: src/global.c:974
+#: src/global.c:991
 msgid "Backup File"
 msgstr "Babeskopia fitxategia"
 
-#: src/global.c:981
+#: src/global.c:998
 msgid "Execute Command"
 msgstr "Exekutatu komandoa"
 
-#: src/global.c:996
+#: src/global.c:1013
 msgid "To Files"
 msgstr "Fitxategietara"
 
-#: src/global.c:1004
+#: src/global.c:1021
 msgid "First File"
 msgstr "Lehen fitxategia"
 
-#: src/global.c:1006
+#: src/global.c:1023
 msgid "Last File"
 msgstr "Azken Fitxategia"
 
-#: src/global.c:1010
+#: src/global.c:1027
 msgid "Discard buffer"
 msgstr ""
 
+#: src/global.c:1038
+msgid "Left Column"
+msgstr ""
+
+#: src/global.c:1040
+msgid "Right Column"
+msgstr ""
+
 #. TRANSLATORS: Try to keep the next two strings at most 20 characters.
-#: src/global.c:1020
+#: src/global.c:1047
 #, fuzzy
 msgid "Prev Lint Msg"
 msgstr "Aurreko lerroa"
 
-#: src/global.c:1022
+#: src/global.c:1049
 #, fuzzy
 msgid "Next Lint Msg"
 msgstr "Hurrengo lerroa"
 
 #. TRANSLATORS: The next seventeen strings are toggle descriptions;
 #. * they are best kept shorter than 40 characters, but may be longer.
-#: src/global.c:1285
+#: src/global.c:1316
 msgid "Help mode"
 msgstr "Laguntza modua"
 
-#: src/global.c:1287
+#: src/global.c:1318
 msgid "Constant cursor position display"
 msgstr "Kurtzorearen posizioa bistaratu beti"
 
-#: src/global.c:1289
+#: src/global.c:1320
 msgid "Use of one more line for editing"
 msgstr "Erabili lerro bat edo gehiago editatzeko"
 
-#: src/global.c:1291
+#: src/global.c:1322
 msgid "Smooth scrolling"
 msgstr "Korritze leuna"
 
-#: src/global.c:1293
+#: src/global.c:1324
 #, fuzzy
 msgid "Soft wrapping of overlong lines"
 msgstr "Ez doitu lerro luzeak"
 
-#: src/global.c:1295
+#: src/global.c:1326
 msgid "Whitespace display"
 msgstr "Erakutsi txuriguneak"
 
-#: src/global.c:1297
+#: src/global.c:1328
 msgid "Color syntax highlighting"
 msgstr "Kolore sintaxi nabarmentzea"
 
-#: src/global.c:1299
+#: src/global.c:1330
 msgid "Smart home key"
 msgstr "'Smart home' tekla"
 
-#: src/global.c:1301
+#: src/global.c:1332
 msgid "Auto indent"
 msgstr "Auto indentatu"
 
-#: src/global.c:1303
+#: src/global.c:1334
 msgid "Cut to end"
 msgstr "Lerroaren bukaeraraino ebaki"
 
-#: src/global.c:1305
+#: src/global.c:1336
 #, fuzzy
 msgid "Hard wrapping of overlong lines"
 msgstr "Ez doitu lerro luzeak"
 
-#: src/global.c:1307
+#: src/global.c:1338
 msgid "Conversion of typed tabs to spaces"
 msgstr "Bihurtu idatzitako tabulazioak zuriuneetara"
 
-#: src/global.c:1309
+#: src/global.c:1340
 msgid "Backup files"
 msgstr "Babeskopia fitxategiak"
 
-#: src/global.c:1311
+#: src/global.c:1342
 msgid "Reading file into separate buffer"
 msgstr ""
 
-#: src/global.c:1313
+#: src/global.c:1344
 msgid "Mouse support"
 msgstr "Xagu euskarria"
 
-#: src/global.c:1315
+#: src/global.c:1346
 msgid "No conversion from DOS/Mac format"
 msgstr "Ez bihurtu DOS/Mac formatuak"
 
-#: src/global.c:1317
+#: src/global.c:1348
 msgid "Suspension"
 msgstr "Eseki"
 
-#: src/help.c:209
+#: src/help.c:211
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1194,7 +1209,7 @@ msgstr ""
 "Enter sakatuz karaktere berririk sartu gabe aurreko bilaketa berriz burutuko "
 "du.  "
 
-#: src/help.c:218
+#: src/help.c:220
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1208,7 +1223,7 @@ msgstr ""
 " Honako funtzio teklak daude Bilaketa moduan:\n"
 "\n"
 
-#: src/help.c:224
+#: src/help.c:226
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1227,7 +1242,7 @@ msgstr ""
 " Honako funtzio teklak daude joan lerrora moduan:\n"
 "\n"
 
-#: src/help.c:233
+#: src/help.c:235
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1250,7 +1265,7 @@ msgstr ""
 "beste buffer batean kargatzen du (erabili Meta-< edo > buffer-ez "
 "aldatzeko).  "
 
-#: src/help.c:242
+#: src/help.c:244
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1264,7 +1279,7 @@ msgstr ""
 " Honako funtzio teklak daude eskuragarri fitxategi txertaketa moduan:\n"
 "\n"
 
-#: src/help.c:248
+#: src/help.c:250
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1290,7 +1305,7 @@ msgstr ""
 "Honako funtzio teklak daude eskuragarri fitxategia idatzi moduan:\n"
 "\n"
 
-#: src/help.c:262
+#: src/help.c:264
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1315,7 +1330,7 @@ msgstr ""
 " Honako funtzio teklak daude eskuragarri fitxategi nabigatzaile moduan:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:277
 #, fuzzy
 msgid ""
 "Browser Search Command Help Text\n"
@@ -1338,7 +1353,7 @@ msgstr ""
 "Enter sakatuz karaktere berririk sartu gabe aurreko bilaketa berriz burutuko "
 "du.  "
 
-#: src/help.c:284
+#: src/help.c:286
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1346,7 +1361,7 @@ msgstr ""
 " Honako funtzio teklak daude eskuragarri Bilaketa Nabigatzaile moduan:\n"
 "\n"
 
-#: src/help.c:288
+#: src/help.c:290
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1369,7 +1384,7 @@ msgstr ""
 "moduan:\n"
 "\n"
 
-#: src/help.c:301
+#: src/help.c:303
 #, fuzzy
 msgid ""
 "Spell Check Help Text\n"
@@ -1393,7 +1408,7 @@ msgstr ""
 " Honako funtzio teklak daude eskuragarri zuzenketa moduan:\n"
 "\n"
 
-#: src/help.c:316
+#: src/help.c:318
 #, fuzzy
 msgid ""
 "Execute Command Help Text\n"
@@ -1414,7 +1429,7 @@ msgstr ""
 " Honako teklak gaituak daude modu hontan:\n"
 "\n"
 
-#: src/help.c:329
+#: src/help.c:331
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1434,16 +1449,15 @@ msgstr ""
 "erakutsiz.  Egoera lerroa da hirugarrena eta informazio garrantzitsuak "
 "ematen ditu  "
 
-#: src/help.c:339
+#: src/help.c:341
 #, fuzzy
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
-" The notation for shortcuts is as follows: Control-key sequences are notated "
-"with a caret (^) symbol and can be entered either by using the Control "
-"(Ctrl) key or pressing the Escape (Esc) key twice.  Escape-key sequences are "
-"notated with the Meta (M-) symbol and can be entered using either the Esc, "
-"Alt, or Meta key depending on your keyboard setup.  "
+" Shortcuts are written as follows: Control-key sequences are notated with a "
+"'^' and can be entered either by using the Ctrl key or pressing the Esc key "
+"twice.  Meta-key sequences are notated with 'M-' and can be entered using "
+"either the Alt, Cmd, or Esc key, depending on your keyboard setup.  "
 msgstr ""
 "Laster-teklan erabilera: Kontrol teklarekin erabiltzen direnak (^) "
 "karakterearekin erakusten dira, eta Kontrol tekla edo ESC tekla bi aldiz "
@@ -1469,21 +1483,21 @@ msgstr ""
 msgid "enable/disable"
 msgstr "gaitu/ezgaitu"
 
-#: src/nano.c:559
+#: src/nano.c:560
 #, fuzzy
 msgid "Key is invalid in view mode"
 msgstr "Tekla baliogabea ikuskatze moduan"
 
-#: src/nano.c:565
+#: src/nano.c:566
 #, fuzzy
 msgid "This function is disabled in restricted mode"
 msgstr "Ezin da maila nagusia era murriztuan bisitatu"
 
-#: src/nano.c:573
+#: src/nano.c:574
 msgid "Help is not available"
 msgstr ""
 
-#: src/nano.c:684
+#: src/nano.c:686
 #, c-format
 msgid ""
 "\n"
@@ -1492,7 +1506,7 @@ msgstr ""
 "\n"
 "Bufferra hemen idatzia: %s\n"
 
-#: src/nano.c:686
+#: src/nano.c:688
 #, c-format
 msgid ""
 "\n"
@@ -1501,7 +1515,7 @@ msgstr ""
 "\n"
 "Bufferra ez da %s-(e)n idatzi: %s\n"
 
-#: src/nano.c:689
+#: src/nano.c:691
 #, c-format
 msgid ""
 "\n"
@@ -1770,17 +1784,22 @@ msgstr "Gaitu esekitzea"
 msgid "Enable soft line wrapping"
 msgstr "Auto-doitu lerro luzeak"
 
-#: src/nano.c:937
-#, fuzzy, c-format
-msgid " GNU nano, version %s\n"
-msgstr "GNU nano %s bertsioa (%s %s konpilatua)\n"
-
 #: src/nano.c:940
 #, c-format
+msgid " nano, version %s\n"
+msgstr ""
+
+#: src/nano.c:943
+#, c-format
+msgid " (C) 2014..%s the contributors to nano\n"
+msgstr ""
+
+#: src/nano.c:945
+#, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr "E-posta: nano@nano-editor.org\tWebgunea: http://www.nano-editor.org"
 
-#: src/nano.c:941
+#: src/nano.c:946
 #, c-format
 msgid ""
 "\n"
@@ -1789,68 +1808,82 @@ msgstr ""
 "\n"
 "Konpilazio aukerak:"
 
-#: src/nano.c:1073
+#: src/nano.c:1081
 msgid "No file name"
 msgstr ""
 
-#: src/nano.c:1108
-msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
+#: src/nano.c:1115
+msgid "Save modified buffer?  (Answering \"No\" will DISCARD changes.) "
 msgstr ""
-"Buffer aldatua gorde? (\"Ez\" ERANTZUTEKOTAN ALDAKETAK DEUZESTUEGINGO DIRA) ?"
 
-#: src/nano.c:1168
+#: src/nano.c:1178
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr ""
 
-#: src/nano.c:1192
+#: src/nano.c:1202
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr ""
 
-#: src/nano.c:1256
+#: src/nano.c:1266
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "SIGHUP edo SIGTERM jaso da\n"
 
-#: src/nano.c:1272
+#: src/nano.c:1282
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Erabili \"fg\" nano-ra itzultzeko.\n"
 
-#: src/nano.c:1294
+#: src/nano.c:1304
 msgid "Suspension is not enabled"
 msgstr ""
 
-#: src/nano.c:1448
+#: src/nano.c:1459
 msgid "enabled"
 msgstr "gaitua"
 
-#: src/nano.c:1448
+#: src/nano.c:1459
 msgid "disabled"
 msgstr "ez gaitua"
 
-#: src/nano.c:1607 src/winio.c:1125
-msgid "Unknown Command"
-msgstr "Komando ezezaguna"
+#: src/nano.c:1573
+msgid "Unbound key"
+msgstr ""
+
+#: src/nano.c:1577
+#, c-format
+msgid "Unbound key: M-%c"
+msgstr ""
+
+#: src/nano.c:1579
+#, c-format
+msgid "Unbound key: ^%c"
+msgstr ""
+
+#: src/nano.c:1581
+#, c-format
+msgid "Unbound key: %c"
+msgstr ""
 
-#: src/nano.c:1720
+#: src/nano.c:1745
 msgid "XON ignored, mumble mumble"
 msgstr "XON ignoratua, kaka zarra"
 
-#: src/nano.c:1725
+#: src/nano.c:1750
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF ignoratua, kaka zarra"
 
-#: src/nano.c:2139 src/rcfile.c:1334
+#: src/nano.c:2166 src/rcfile.c:1187
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Eskatutako \"%s\" tab tamainua baliogabea da"
 
-#: src/nano.c:2200 src/rcfile.c:1259
+#: src/nano.c:2227 src/rcfile.c:1128
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Eskatutako \"%s\" betetze tamainua baliogabea da"
 
-#: src/nano.c:2247
+#: src/nano.c:2276
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr ""
@@ -1858,115 +1891,119 @@ msgstr ""
 #. TRANSLATORS: For the next three strings, if possible, specify
 #. * the single-byte shortcuts for both your language and English.
 #. * For example, in French: "OoYy" for "Oui".
-#: src/prompt.c:821
+#: src/prompt.c:818
 msgid "Yy"
 msgstr "Bb"
 
-#: src/prompt.c:822
+#: src/prompt.c:819
 msgid "Nn"
 msgstr "Ee"
 
-#: src/prompt.c:823
+#: src/prompt.c:820
 msgid "Aa"
 msgstr "Dd"
 
-#: src/prompt.c:845
+#: src/prompt.c:842
 msgid "Yes"
 msgstr "Bai"
 
-#: src/prompt.c:850
+#: src/prompt.c:847
 msgid "All"
 msgstr "Guztiak"
 
-#: src/prompt.c:855
+#: src/prompt.c:852
 msgid "No"
 msgstr "Ez"
 
-#: src/rcfile.c:142
+#: src/rcfile.c:144
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Errorea %s-n %lu lerroan: "
 
-#: src/rcfile.c:201
+#: src/rcfile.c:203
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "'%s' argumentuak amaitu gabeko \" bat dauka"
 
-#: src/rcfile.c:228 src/rcfile.c:280 src/rcfile.c:732 src/rcfile.c:793
-#: src/rcfile.c:882 src/rcfile.c:933
+#: src/rcfile.c:231 src/rcfile.c:674 src/rcfile.c:725 src/rcfile.c:824
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Regex kateak \" karaktearekin hasi eta amaitu behar dute"
 
-#: src/rcfile.c:254 src/search.c:62
+#: src/rcfile.c:257 src/search.c:61
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "\"%s\" regex okerra: %s"
 
-#: src/rcfile.c:274
+#: src/rcfile.c:279
 msgid "Missing syntax name"
 msgstr "Sintaxiaren izena falta da"
 
-#: src/rcfile.c:345
+#: src/rcfile.c:288
+msgid "A syntax name must be quoted"
+msgstr ""
+
+#: src/rcfile.c:297
 msgid "The \"none\" syntax is reserved"
 msgstr "\"none\" sintaxia erreserbaturik dago"
 
-#: src/rcfile.c:352
-msgid "The \"default\" syntax must take no extensions"
+#: src/rcfile.c:327
+#, fuzzy
+msgid "The \"default\" syntax does not accept extensions"
 msgstr "\"default\" sintaxiak ez du extentsiorik hartu behar"
 
-#: src/rcfile.c:424
+#: src/rcfile.c:369
 #, fuzzy
 msgid "Missing key name"
 msgstr "Sintaxiaren izena falta da"
 
-#: src/rcfile.c:433 src/rcfile.c:444
+#: src/rcfile.c:378 src/rcfile.c:389
 msgid "Key name is too short"
 msgstr ""
 
-#: src/rcfile.c:454
+#: src/rcfile.c:399
 msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr ""
 
-#: src/rcfile.c:457
+#: src/rcfile.c:402
 #, fuzzy, c-format
 msgid "Key name %s is invalid"
 msgstr "Eskatutako \"%s\" tab tamainua baliogabea da"
 
-#: src/rcfile.c:466
+#: src/rcfile.c:411
 msgid "Must specify a function to bind the key to"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the word "all".
-#: src/rcfile.c:476
+#: src/rcfile.c:421
 msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
 
-#: src/rcfile.c:483
+#: src/rcfile.c:428
 #, c-format
 msgid "Cannot map name \"%s\" to a function"
 msgstr ""
 
-#: src/rcfile.c:490
+#: src/rcfile.c:435
 #, c-format
 msgid "Cannot map name \"%s\" to a menu"
 msgstr ""
 
-#: src/rcfile.c:522
+#: src/rcfile.c:467
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr ""
 
-#: src/rcfile.c:534
+#: src/rcfile.c:479
 #, c-format
 msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr ""
 
-#: src/rcfile.c:631
+#: src/rcfile.c:576
 #, fuzzy, c-format
 msgid "Error expanding %s: %s"
 msgstr "Errorea %s irakurtzen: %s"
 
-#: src/rcfile.c:674
+#: src/rcfile.c:616
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1982,129 +2019,112 @@ msgstr ""
 "\"black\", \"bright\" aukerazko aurrizkiarekin\n"
 "aurreplanoko koloreentzat."
 
-#: src/rcfile.c:696
-msgid "Cannot add a color command without a syntax command"
-msgstr "Ezin izan da kolorea komando bat gehitu sintaxi komando bat gabe"
+#: src/rcfile.c:637 src/rcfile.c:795 src/rcfile.c:858
+#, c-format
+msgid "A '%s' command requires a preceding 'syntax' command"
+msgstr ""
 
-#: src/rcfile.c:701
+#: src/rcfile.c:643
 msgid "Missing color name"
 msgstr "Kolorearen izena falta da"
 
-#: src/rcfile.c:711 src/rcfile.c:872
-msgid "Missing regex string"
+#: src/rcfile.c:653 src/rcfile.c:807
+#, fuzzy, c-format
+msgid "Missing regex string after '%s' command"
 msgstr "Regex katea falta da"
 
-#: src/rcfile.c:787
+#: src/rcfile.c:719
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\"-k \"end=\" behar du"
 
-#: src/rcfile.c:839
+#: src/rcfile.c:768
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
 msgstr "Atzekaldeko \"%s\" koloreak ezin du bizia izan"
 
-#: src/rcfile.c:867
-#, fuzzy
-msgid "Cannot add a header regex without a syntax command"
-msgstr "Ezin izan da kolorea komando bat gehitu sintaxi komando bat gabe"
-
-#: src/rcfile.c:922
-#, fuzzy
-msgid "Cannot add a magic string regex without a syntax command"
-msgstr "Ezin izan da kolorea komando bat gehitu sintaxi komando bat gabe"
-
-#: src/rcfile.c:927
-#, fuzzy
-msgid "Missing magic string name"
-msgstr "Regex katea falta da"
-
-#: src/rcfile.c:985
-#, fuzzy
-msgid "Cannot add a linter without a syntax command"
-msgstr "Ezin izan da kolorea komando bat gehitu sintaxi komando bat gabe"
-
-#: src/rcfile.c:990
-#, fuzzy
-msgid "Missing linter command"
-msgstr "Kolorearen izena falta da"
-
-#: src/rcfile.c:1011
-#, fuzzy
-msgid "Cannot add formatter without a syntax command"
-msgstr "Ezin izan da kolorea komando bat gehitu sintaxi komando bat gabe"
+#: src/rcfile.c:802
+#, fuzzy, c-format
+msgid "The \"default\" syntax does not accept '%s' regexes"
+msgstr "\"default\" sintaxiak ez du extentsiorik hartu behar"
 
-#: src/rcfile.c:1016
-msgid "Missing formatter command"
+#: src/rcfile.c:863
+#, c-format
+msgid "Missing command after '%s'"
 msgstr ""
 
-#: src/rcfile.c:1046
+#: src/rcfile.c:879
+#, fuzzy, c-format
+msgid "Argument of '%s' lacks closing \""
+msgstr "'%s' argumentuak amaitu gabeko \" bat dauka"
+
+#: src/rcfile.c:910
 #, c-format
 msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr ""
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:912
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
 
-#: src/rcfile.c:1109
+#: src/rcfile.c:971
 #, fuzzy, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "Ezin izan zen %s ireki %s idazteko"
 
-#: src/rcfile.c:1125 src/rcfile.c:1134 src/rcfile.c:1144
-#, c-format
-msgid "Command \"%s\" not allowed in included file"
-msgstr "\"%s\" komandoa ez dago baimendua fitxategia barne moduan"
-
-#: src/rcfile.c:1150 src/rcfile.c:1359
+#: src/rcfile.c:993 src/rcfile.c:1202
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "\"%s\" sintaxiak ez dauka kolore komandorik"
 
-#: src/rcfile.c:1180
+#: src/rcfile.c:1024
+#, c-format
+msgid "Command \"%s\" not allowed in included file"
+msgstr "\"%s\" komandoa ez dago baimendua fitxategia barne moduan"
+
+#: src/rcfile.c:1039
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Ez da \"%s\" komandoa ulertu"
 
-#: src/rcfile.c:1195
+#: src/rcfile.c:1051
 #, fuzzy
 msgid "Missing option"
 msgstr "Kolorearen izena falta da"
 
-#: src/rcfile.c:1217
+#: src/rcfile.c:1065
+#, fuzzy, c-format
+msgid "Unknown option \"%s\""
+msgstr "\"%s\" bandera ezezaguna"
+
+#: src/rcfile.c:1077
+#, fuzzy, c-format
+msgid "Cannot unset option \"%s\""
+msgstr "Ezin da \"%s\" bandera kendu"
+
+#: src/rcfile.c:1089
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "\"%s\" aukerak argumentu bat behar du"
 
-#: src/rcfile.c:1235
+#: src/rcfile.c:1105
 msgid "Option is not a valid multibyte string"
 msgstr "Aukera ez da baliodun multibyte katea"
 
-#: src/rcfile.c:1272 src/rcfile.c:1300 src/rcfile.c:1309
+#: src/rcfile.c:1139 src/rcfile.c:1160 src/rcfile.c:1167
 msgid "Non-blank characters required"
 msgstr "Ez-hutsune karaktereak behar dira"
 
-#: src/rcfile.c:1282
+#: src/rcfile.c:1146
 msgid "Two single-column characters required"
 msgstr "Bi zutabe-bakar karaktere behar dira"
 
-#: src/rcfile.c:1348
-#, fuzzy, c-format
-msgid "Cannot unset option \"%s\""
-msgstr "Ezin da \"%s\" bandera kendu"
-
-#: src/rcfile.c:1354
-#, fuzzy, c-format
-msgid "Unknown option \"%s\""
-msgstr "\"%s\" bandera ezezaguna"
-
-#: src/rcfile.c:1413
+#: src/rcfile.c:1258
 msgid "I can't find my home directory!  Wah!"
 msgstr "Ezin dut nire etxe direktorioa aurkitu!  Outx!"
 
-#: src/rcfile.c:1451
+#: src/rcfile.c:1295
 #, c-format
 msgid ""
 "\n"
@@ -2113,44 +2133,49 @@ msgstr ""
 "\n"
 "Nano abiarazten jarraitzeko return sakatu.\n"
 
-#: src/search.c:96
+#: src/search.c:95
 #, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "\"%.*s%s\" ez da aurkitu"
 
 #. TRANSLATORS: The next three strings are modifiers of the search prompt.
-#: src/search.c:176
+#: src/search.c:169
 msgid " [Case Sensitive]"
 msgstr "[May/Min]"
 
-#: src/search.c:180
+#: src/search.c:173
 msgid " [Regexp]"
 msgstr "[Regexp]"
 
-#: src/search.c:184
+#: src/search.c:177
 msgid " [Backwards]"
 msgstr "[Atzeruntza]"
 
 #. TRANSLATORS: The next two strings are modifiers of the search prompt.
-#: src/search.c:189
+#: src/search.c:182
 msgid " (to replace) in selection"
 msgstr " (aldatzeko) aukeraketan"
 
-#: src/search.c:191
+#: src/search.c:184
 msgid " (to replace)"
 msgstr "(aldatzeko)"
 
+#: src/search.c:305
+#, fuzzy
+msgid "Searching..."
+msgstr "Bilatu"
+
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:718
+#: src/search.c:693
 msgid "Replace this instance?"
 msgstr "Instantsia hau aldatu?"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:883
+#: src/search.c:840
 msgid "Replace with"
 msgstr "Aldatu honekin"
 
-#: src/search.c:924
+#: src/search.c:875
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
@@ -2158,298 +2183,326 @@ msgstr[0] "%lu kointzidentzia aldatuta"
 msgstr[1] "%lu kointzidentzia aldatuta"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:964
+#: src/search.c:914
 msgid "Enter line number, column number"
 msgstr "Lerroaren zenbakia, zutabe zenbakia sartu"
 
-#: src/search.c:991
+#: src/search.c:939
 #, fuzzy
 msgid "Invalid line or column number"
 msgstr "Lerroaren zenbakia, zutabe zenbakia sartu"
 
-#: src/search.c:1124
+#: src/search.c:1080
 msgid "Not a bracket"
 msgstr "Ez da hori giltza"
 
-#: src/search.c:1191
+#: src/search.c:1146
 msgid "No matching bracket"
 msgstr "Ez dago giltz egokirik"
 
-#: src/text.c:54
+#: src/text.c:53
 msgid "Mark Set"
 msgstr "Marka aukeratua"
 
-#: src/text.c:58
+#: src/text.c:57
 msgid "Mark Unset"
 msgstr "Markatu ez hautatua"
 
-#: src/text.c:70
+#: src/text.c:69
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Errorea \"%s\"-(e)ri deitzen"
 
-#: src/text.c:475
-msgid "Nothing in undo buffer!"
+#: src/text.c:468
+msgid "Commenting is not supported for this file type"
 msgstr ""
 
-#: src/text.c:481 src/text.c:634
-#, c-format
-msgid "Internal error: can't match line %d.  Please save your work."
+#: src/text.c:484
+msgid "Cannot comment past end of file"
+msgstr ""
+
+#: src/text.c:677
+msgid "Nothing in undo buffer!"
 msgstr ""
 
 #. TRANSLATORS: Eight of the next nine strings describe actions
 #. * that are undone or redone.  It are all nouns, not verbs.
-#: src/text.c:495 src/text.c:524 src/text.c:645 src/text.c:686
+#: src/text.c:695 src/text.c:724 src/text.c:857 src/text.c:898
 msgid "text add"
 msgstr ""
 
-#: src/text.c:505 src/text.c:656
+#: src/text.c:705 src/text.c:868
 #, fuzzy
 msgid "text delete"
 msgstr "Hurrengo fitxategia"
 
-#: src/text.c:528 src/text.c:694
+#: src/text.c:728 src/text.c:907
 msgid "line join"
 msgstr ""
 
-#: src/text.c:547 src/text.c:710
+#: src/text.c:747 src/text.c:923
 msgid "text cut"
 msgstr ""
 
-#: src/text.c:552 src/text.c:714
+#: src/text.c:752 src/text.c:927
 msgid "text uncut"
 msgstr ""
 
-#: src/text.c:558 src/text.c:691
+#: src/text.c:758 src/text.c:903
 msgid "Internal error: line is missing.  Please save your work."
 msgstr ""
 
-#: src/text.c:561 src/text.c:665
+#: src/text.c:762 src/text.c:877
 msgid "line break"
 msgstr ""
 
-#: src/text.c:569 src/text.c:725
+#: src/text.c:772 src/text.c:947
+msgid "comment"
+msgstr ""
+
+#: src/text.c:776 src/text.c:951
+msgid "uncomment"
+msgstr ""
+
+#: src/text.c:780 src/text.c:938
 #, fuzzy
 msgid "text insert"
 msgstr "Hurrengo lerroa"
 
-#: src/text.c:589 src/text.c:718
+#: src/text.c:800 src/text.c:931
 #, fuzzy
 msgid "text replace"
 msgstr "(aldatzeko)"
 
-#: src/text.c:596 src/text.c:732 src/text.c:1030 src/text.c:1174
+#: src/text.c:807 src/text.c:955 src/text.c:1267 src/text.c:1437
 msgid "Internal error: unknown type.  Please save your work."
 msgstr ""
 
-#: src/text.c:601
+#: src/text.c:813
 #, c-format
 msgid "Undid action (%s)"
 msgstr ""
 
-#: src/text.c:619
+#: src/text.c:832
 msgid "Nothing to re-do!"
 msgstr ""
 
-#: src/text.c:628
+#: src/text.c:841
 msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
 
-#: src/text.c:737
+#: src/text.c:961
 #, c-format
 msgid "Redid action (%s)"
 msgstr ""
 
-#: src/text.c:827 src/text.c:2508 src/text.c:2944
+#: src/text.c:1051 src/text.c:2765 src/text.c:3198
 msgid "Could not create pipe"
 msgstr "Ezin izan da hodia sortu"
 
-#: src/text.c:853 src/text.c:2595 src/text.c:2750 src/text.c:2992
-#: src/text.c:3286
+#: src/text.c:1077 src/text.c:2852 src/text.c:3005 src/text.c:3246
+#: src/text.c:3540
 msgid "Could not fork"
 msgstr "Ezin izan da bikoiztu"
 
-#: src/text.c:1853
+#: src/text.c:2117
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "%s aipamen kate okerra: %s"
 
-#: src/text.c:2241
+#: src/text.c:2499
 msgid "Can now UnJustify!"
 msgstr "Orain ez-justifikatu dezakezu!"
 
-#: src/text.c:2435
+#: src/text.c:2697
 msgid "Edit a replacement"
 msgstr "Ordezkoa editatu"
 
-#: src/text.c:2510
+#. TRANSLATORS: Shown after fixing misspellings in one word.
+#: src/text.c:2713
+#, fuzzy
+msgid "Next word..."
+msgstr "Hurrengo hitza"
+
+#: src/text.c:2767
 msgid "Creating misspelled word list, please wait..."
 msgstr "Gaizki idatzitako hiz zerrenda sortzen, itxaron mesedez..."
 
-#: src/text.c:2601 src/text.c:2999
+#: src/text.c:2858 src/text.c:3253
 msgid "Could not get size of pipe buffer"
 msgstr "Ezin izan da hodi buffer-aren tamainua lortu"
 
-#: src/text.c:2652
+#: src/text.c:2907
 msgid "Error invoking \"spell\""
 msgstr "Errorea \"spell\"-i deitzen"
 
-#: src/text.c:2655
+#: src/text.c:2910
 msgid "Error invoking \"sort -f\""
 msgstr "Errorea \"sort -f\"-i deitzen"
 
-#: src/text.c:2658
+#: src/text.c:2913
 msgid "Error invoking \"uniq\""
 msgstr "Errorea \"uniq\"-i deitzen"
 
-#: src/text.c:2881
+#: src/text.c:3135
 #, fuzzy
 msgid "Invoking spell checker, please wait"
 msgstr "Deitu zuzentzaileari, eskuragarri badago"
 
-#: src/text.c:2897
+#: src/text.c:3151
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Zuzenketa ortografikoan huts egin du: %s"
 
-#: src/text.c:2899
+#: src/text.c:3153
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Zuzenketa ortografikoan huts egin du: %s: %s"
 
-#: src/text.c:2902
+#: src/text.c:3156
 msgid "Finished checking spelling"
 msgstr "Zuzenketa ortografikoa bukatu da"
 
-#: src/text.c:2927
+#: src/text.c:3181
 #, fuzzy
 msgid "No linter defined for this type of file!"
 msgstr "Ez gehitu lerro berria fitxategiaren amaieran"
 
-#: src/text.c:2932
+#: src/text.c:3186
 msgid "Save modified buffer before linting?"
 msgstr ""
 
-#: src/text.c:2949
+#: src/text.c:3203
 msgid "Invoking linter, please wait"
 msgstr ""
 
-#: src/text.c:3105
+#: src/text.c:3358
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr ""
 
-#: src/text.c:3134
+#: src/text.c:3388
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
 
-#: src/text.c:3153
+#: src/text.c:3407
 msgid "No more errors in unopened files, cancelling"
 msgstr ""
 
-#: src/text.c:3192
+#: src/text.c:3446
 #, fuzzy
 msgid "At last message"
 msgstr "Mezu hau erakutsi"
 
-#: src/text.c:3197
+#: src/text.c:3451
 #, fuzzy
 msgid "At first message"
 msgstr "Mezu hau erakutsi"
 
-#: src/text.c:3237
+#: src/text.c:3491
 msgid "Finished"
 msgstr ""
 
-#: src/text.c:3259
+#: src/text.c:3513
 msgid "Invoking formatter, please wait"
 msgstr ""
 
-#: src/text.c:3314
+#: src/text.c:3568
 msgid "Finished formatting"
 msgstr ""
 
-#: src/text.c:3396
+#: src/text.c:3650
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sHitzak: %lu  Lerroak: %ld  Karaktereak: %lu"
 
-#: src/text.c:3397
+#: src/text.c:3651
 msgid "In Selection:  "
 msgstr "Aukeraketan:  "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3411
+#: src/text.c:3665
 msgid "Verbatim Input"
 msgstr "Sarrera literala"
 
-#: src/utils.c:391 src/utils.c:403
+#: src/utils.c:392 src/utils.c:404
 msgid "nano is out of memory!"
 msgstr "nano: memoriatik kanpo!"
 
+#: src/utils.c:625
+#, c-format
+msgid "Internal error: can't match line %d.  Please save your work."
+msgstr ""
+
+#. TRANSLATORS: This refers to a sequence of escape codes
+#. * (from the keyboard) that nano does not know about.
+#: src/winio.c:1121
+msgid "Unknown sequence"
+msgstr ""
+
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
 #: src/winio.c:1427
 msgid "Unicode Input"
 msgstr "Unicode sarrera"
 
-#: src/winio.c:1991 src/winio.c:1995
-msgid "Modified"
-msgstr "Aldatua"
-
-#: src/winio.c:1992
-msgid "View"
-msgstr "Ikusi"
-
-#: src/winio.c:2006
+#: src/winio.c:1960
 msgid "DIR:"
 msgstr "DIR:"
 
-#: src/winio.c:2013
+#: src/winio.c:1968
 msgid "File:"
 msgstr "Fitxategia:"
 
-#: src/winio.c:3141
+#: src/winio.c:1972 src/winio.c:1976
+msgid "Modified"
+msgstr "Aldatua"
+
+#: src/winio.c:1974
+msgid "View"
+msgstr "Ikusi"
+
+#: src/winio.c:3105
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr ""
 "%ld/%ld (%d%%) lerroa, %lu/%lu (%d%%) zutabea, %lu/%lu\t (%d%%) karakterea"
 
-#: src/winio.c:3271
+#: src/winio.c:3235
 msgid "The nano text editor"
 msgstr "Nano textu editorea"
 
-#: src/winio.c:3272
+#: src/winio.c:3236
 msgid "version"
 msgstr "bertsioa"
 
-#: src/winio.c:3273
+#: src/winio.c:3237
 msgid "Brought to you by:"
 msgstr "Zuretzako hauek egina:"
 
-#: src/winio.c:3274
+#: src/winio.c:3238
 msgid "Special thanks to:"
 msgstr "Esker bereziak:"
 
-#: src/winio.c:3275
+#: src/winio.c:3239
 msgid "The Free Software Foundation"
 msgstr "The Free Software Foundation"
 
-#: src/winio.c:3276
+#: src/winio.c:3240
 msgid "the many translators and the TP"
 msgstr ""
 
-#: src/winio.c:3277
+#: src/winio.c:3241
 msgid "For ncurses:"
 msgstr "ncurses-entzat:"
 
-#: src/winio.c:3278
+#: src/winio.c:3242
 msgid "and anyone else we forgot..."
 msgstr "eta ahaztu dugun baten bat..."
 
-#: src/winio.c:3279
+#: src/winio.c:3243
 msgid "Thank you for using nano!"
 msgstr "Mila esker nano erabiltzeagatik!"
 
@@ -2485,9 +2538,23 @@ msgstr "Mila esker nano erabiltzeagatik!"
 #~ msgid "(ignored, for Pico compatibility)"
 #~ msgstr "(ignoratua, Pico-rekin konpatibilitatea mantentzeko)"
 
+#~ msgid " GNU nano version %s (compiled %s, %s)\n"
+#~ msgstr "GNU nano %s bertsioa (%s %s konpilatua)\n"
+
 #~ msgid "Sorry, support for this function has been disabled"
 #~ msgstr "Barkatu, funtzio horrentzat euskarria gaitu gabe dago"
 
+#~ msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
+#~ msgstr ""
+#~ "Buffer aldatua gorde? (\"Ez\" ERANTZUTEKOTAN ALDAKETAK DEUZESTUEGINGO "
+#~ "DIRA) ?"
+
+#~ msgid "Unknown Command"
+#~ msgstr "Komando ezezaguna"
+
+#~ msgid "Cannot add a color command without a syntax command"
+#~ msgstr "Ezin izan da kolorea komando bat gehitu sintaxi komando bat gabe"
+
 #~ msgid "Missing flag"
 #~ msgstr "Bandera falta da"
 
@@ -2543,9 +2610,6 @@ msgstr "Mila esker nano erabiltzeagatik!"
 #~ msgid "Set fill cols to (wrap lines at) #cols"
 #~ msgstr "Ezarri bete zutabeak (itzulbira lerroak) #cols-i"
 
-#~ msgid "Duplicate syntax name %s"
-#~ msgstr "Bikoiztutako %s sintaxi izena"
-
 #~ msgid "Refusing zero-length regex match"
 #~ msgstr "0 regex parekotasun luzeera ukatzen"
 
diff --git a/po/fi.po b/po/fi.po
index 7f15405b..9a9a7583 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,1186 +8,1193 @@
 # Jorma Karvonen <karvonen.jorma@gmail.com>, 2009-2011, 2013-2015.
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 2.4.2\n"
+"Project-Id-Version: nano 2.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-25 16:41-0500\n"
-"PO-Revision-Date: 2015-09-19 14:43+0300\n"
-"Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
+"POT-Creation-Date: 2016-06-17 15:41+0200\n"
+"PO-Revision-Date: 2016-05-26 20:55+0300\n"
+"Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Poedit 1.8.7\n"
+
+#: src/browser.c:144 src/browser.c:284 src/browser.c:334 src/files.c:996
+#: src/files.c:1003 src/files.c:1794 src/files.c:1919 src/files.c:1963
+#: src/files.c:1983 src/files.c:2099 src/files.c:3019 src/files.c:3242
+#: src/rcfile.c:540 src/rcfile.c:1280
+#, c-format
+msgid "Error reading %s: %s"
+msgstr "Virhe luettaessa tiedostoa %s: %s"
 
 #. TRANSLATORS: This is a prompt.
-#: src/browser.c:220
+#: src/browser.c:247
 msgid "Go To Directory"
 msgstr "Siirry hakemistoon"
 
-#: src/browser.c:227 src/browser.c:738 src/files.c:1174 src/files.c:2340
-#: src/nano.c:1120 src/search.c:202 src/search.c:290 src/search.c:895
-#: src/search.c:970 src/text.c:2935 src/text.c:3142
+#: src/browser.c:254 src/browser.c:723 src/files.c:1126 src/files.c:2292
+#: src/nano.c:1128 src/search.c:195 src/search.c:297 src/search.c:851
+#: src/search.c:918 src/text.c:3189 src/text.c:3396
 msgid "Cancelled"
 msgstr "Peruttu"
 
-#: src/browser.c:253 src/browser.c:300
-#, c-format
-msgid "Can't go outside of %s in restricted mode"
-msgstr "Hakemistosta %s pois siirtyminen rajoitetussa tilassa epäonnistui"
-
-#: src/browser.c:264 src/browser.c:310 src/browser.c:326 src/files.c:1044
-#: src/files.c:1052 src/files.c:1844 src/files.c:1971 src/files.c:2016
-#: src/files.c:2037 src/files.c:2156 src/files.c:3062 src/files.c:3285
-#: src/rcfile.c:596 src/rcfile.c:1435
-#, c-format
-msgid "Error reading %s: %s"
-msgstr "Virhe luettaessa kohdetta %s: %s"
+#. TRANSLATORS: This refers to the option --operatingdir,
+#. * not to --restricted.
+#: src/browser.c:274 src/browser.c:326
+#, fuzzy, c-format
+msgid "Can't go outside of %s in confined mode"
+msgstr "Hakemistosta %s ei voi siirtyä pois rajoitetussa tilassa"
 
-#: src/browser.c:290
+#: src/browser.c:317
 msgid "Can't move up a directory"
 msgstr "Ylähakemistoon siirtyminen epäonnistui"
 
 #. TRANSLATORS: Try to keep this at most 7 characters.
-#: src/browser.c:615 src/browser.c:623
+#: src/browser.c:590 src/browser.c:598
 msgid "(dir)"
-msgstr "(hakem.)"
+msgstr "(hakem)"
 
 #. TRANSLATORS: Try to keep this at most 12 characters.
-#: src/browser.c:620
+#: src/browser.c:595
 msgid "(parent dir)"
-msgstr "(ylähakem.)"
+msgstr "(ylähakem)"
 
 #. TRANSLATORS: Try to keep this at most 7 characters.
 #. * If necessary, you can leave out the parentheses.
-#: src/browser.c:650
+#: src/browser.c:625
 msgid "(huge)"
 msgstr "(suuri)"
 
 #. TRANSLATORS: This is the main search prompt.
-#: src/browser.c:727 src/search.c:173
+#: src/browser.c:712 src/search.c:166
 msgid "Search"
-msgstr "Etsi"
+msgstr "Hae"
+
+#: src/browser.c:754 src/search.c:368
+msgid "Search Wrapped"
+msgstr "Haku jatkuu alusta"
 
-#: src/browser.c:777 src/search.c:466 src/search.c:536
+#: src/browser.c:764 src/search.c:509
 msgid "This is the only occurrence"
 msgstr "Tämä on ainoa esiintymä"
 
-#: src/browser.c:793 src/search.c:364
-msgid "Search Wrapped"
-msgstr "Etsintä jatkuu"
-
-#: src/browser.c:843 src/search.c:517
+#: src/browser.c:812 src/search.c:473
 msgid "No current search pattern"
-msgstr "Ei nykyistä etsintämallia"
+msgstr "Ei nykyistä hakumallia"
 
-#: src/files.c:50
+#: src/color.c:186
 #, fuzzy, c-format
+msgid "Unknown syntax name: %s"
+msgstr "Puuttuva syntaksin nimi"
+
+#: src/color.c:247
+#, c-format
+msgid "magic_load() failed: %s"
+msgstr ""
+
+#: src/color.c:251
+#, c-format
+msgid "magic_file(%s) failed: %s"
+msgstr ""
+
+#: src/files.c:47
+#, c-format
 msgid "Directory '%s' does not exist"
-msgstr "Virhe kirjoitettaessa lukitustiedostoa: Hakemistoa ’%s’ ei ole"
+msgstr "Hakemistoa ”%s” ei ole olemassa"
 
-#: src/files.c:52
+#: src/files.c:49
 #, c-format
 msgid "Path '%s': %s"
-msgstr ""
+msgstr "Polku ”%s”: %s"
 
-#: src/files.c:54
-#, fuzzy, c-format
+#: src/files.c:51
+#, c-format
 msgid "Path '%s' is not a directory"
-msgstr "”%s” on hakemisto"
+msgstr "”%s” ei ole hakemisto"
 
-#: src/files.c:57
+#: src/files.c:53
 #, c-format
 msgid "Path '%s' is not accessible"
-msgstr ""
+msgstr "Polku ”%s” ei ole käytettävissä"
 
-#. TRANSLATORS: Try to keep this at most 76 characters.
-#: src/files.c:158
+#. TRANSLATORS: Keep the next ten messages at most 76 characters.
+#: src/files.c:148
 msgid ""
 "Warning: Modifying a file which is not locked, check directory permission?"
 msgstr ""
-"Varoitus: Muokataan tiedostoa, joka ei ole lukittu, tarkista hakemiston "
+"Varoitus: Muokataan lukitsematonta tiedostoa; tarkista hakemiston "
 "käyttöoikeudet?"
 
-#: src/files.c:197
+#: src/files.c:187
 msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
 msgstr ""
-"Identiteettini määritteleminen lukitustiedostolle (getpwuid()-funktiolla) "
-"epäonnistui"
+"Oman identiteetin määrittäminen lukkotiedostolle epäonnistui (getpwuid() "
+"epäonnistui)"
 
-#: src/files.c:206
+#: src/files.c:196
 #, c-format
 msgid "Couldn't determine hostname for lock file: %s"
-msgstr "Tietokonenimen määritteleminen lukitustiedostolle epäonnistui: %s"
+msgstr "Konenimen määrittäminen lukkotiedostolle epäonnistui: %s"
 
-#: src/files.c:227 src/files.c:238 src/files.c:275 src/files.c:285
+#: src/files.c:216 src/files.c:225 src/files.c:262 src/files.c:272
 #, c-format
 msgid "Error writing lock file %s: %s"
-msgstr "Virhe kirjoitettaessa lukitustiedostoa %s: %s"
+msgstr "Virhe kirjoitettaessa lukkotiedostoa %s: %s"
 
-#: src/files.c:305
+#: src/files.c:291
 #, c-format
 msgid "Error deleting lock file %s: %s"
-msgstr "Virhe poistettaessa lukitustiedostoa %s: %s"
+msgstr "Virhe poistettaessa lukkotiedostoa %s: %s"
 
-#: src/files.c:341
+#: src/files.c:325
 #, c-format
 msgid "Error opening lock file %s: %s"
-msgstr "Virhe avattaessa lukitustiedostoa %s: %s"
+msgstr "Virhe avattaessa lukkotiedostoa %s: %s"
 
-#: src/files.c:353
+#: src/files.c:337
 #, c-format
 msgid "Error reading lock file %s: Not enough data read"
-msgstr "Virhe luettaessa lukitustiedostoa %s: Dataa ei luettu riittävästi"
+msgstr "Virhe luettaessa lukkotiedostoa %s: Dataa ei luettu riittävästi"
 
 #. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
-#: src/files.c:371
+#: src/files.c:354
 #, c-format
 msgid "File %s is being edited (by %s with %s, PID %d); continue?"
 msgstr ""
-"Tiedostoa %s on muokattu (muokkaaja %s kohteella %s, PID-tunniste %d), "
-"jatketaanko?"
+"Tiedostoa %s muokataan parhaillaan (%s editorilla %s, PID %d); jatketaanko?"
 
-#: src/files.c:426
+#: src/files.c:430
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Tiedoston lisääminen hakemiston %s ulkopuolelta epäonnistui"
 
-#: src/files.c:439 src/files.c:1038 src/rcfile.c:589 src/rcfile.c:1385
-#: src/rcfile.c:1426
+#: src/files.c:445 src/files.c:991 src/rcfile.c:533 src/rcfile.c:1230
+#: src/rcfile.c:1271
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "”%s” on hakemisto"
 
-#: src/files.c:441
-#, fuzzy, c-format
+#: src/files.c:447
+#, c-format
 msgid "\"%s\" is not a normal file"
-msgstr "”%s” on laitetiedosto"
+msgstr "”%s” ei ole tavallinen tiedosto"
 
-#: src/files.c:566
+#: src/files.c:571
 msgid "No more open file buffers"
-msgstr "Ei enää avoimia tiedostopuskureita"
+msgstr "Ei enempää avoimia tiedostopuskureita"
 
-#: src/files.c:582
+#: src/files.c:586
 #, c-format
 msgid "Switched to %s"
-msgstr "Vaihdoin tiedostoon %s"
+msgstr "Vaihto tiedostoon %s"
 
-#: src/files.c:584 src/global.c:988 src/winio.c:2010
+#: src/files.c:588 src/global.c:1005 src/winio.c:1965
 msgid "New Buffer"
-msgstr "Uusi teksti"
+msgstr "Uusi puskuri"
 
-#: src/files.c:943
+#. TRANSLATORS: Keep the next four messages at most 76 characters.
+#: src/files.c:913
 #, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
 msgstr[0] "Luettu %lu rivi (Muunnettu DOS- ja Mac-muodosta)"
 msgstr[1] "Luettu %lu riviä (Muunnettu DOS- ja Mac-muodosta)"
 
-#: src/files.c:948
-#, c-format
-msgid ""
-"Read %lu line (Converted from DOS and Mac format - Warning: No write "
-"permission)"
-msgid_plural ""
-"Read %lu lines (Converted from DOS and Mac format - Warning: No write "
-"permission)"
-msgstr[0] ""
-"Luettu %lu rivi (Muunnettu Mac-muodosta - Varoitus: Ei kirjoitusoikeutta)"
-msgstr[1] ""
-"Luettu %lu riviä (Muunnettu Mac-muodosta - Varoitus: Ei kirjoitusoikeutta)"
-
-#: src/files.c:954
+#: src/files.c:919
 #, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
 msgstr[0] "Luettu %lu rivi (Muunnettu Mac-muodosta)"
 msgstr[1] "Luettu %lu riviä (Muunnettu Mac-muodosta)"
 
-#: src/files.c:958
-#, c-format
-msgid ""
-"Read %lu line (Converted from Mac format - Warning: No write permission)"
-msgid_plural ""
-"Read %lu lines (Converted from Mac format - Warning: No write permission)"
-msgstr[0] ""
-"Luettu %lu rivi (Muunnettu Mac-muodosta - Varoitus: Ei kirjoitusoikeutta)"
-msgstr[1] ""
-"Luettu %lu riviä (Muunnettu Mac-muodosta - Varoitus: Ei kirjoitusoikeutta)"
-
-#: src/files.c:964
+#: src/files.c:925
 #, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
 msgstr[0] "Luettu %lu rivi (Muunnettu DOS-muodosta)"
 msgstr[1] "Luettu %lu riviä (Muunnettu DOS-muodosta)"
 
-#: src/files.c:968
-#, c-format
-msgid ""
-"Read %lu line (Converted from DOS format - Warning: No write permission)"
-msgid_plural ""
-"Read %lu lines (Converted from DOS format - Warning: No write permission)"
-msgstr[0] ""
-"Luettu %lu rivi Muunnettu DOS-muodosta - Varoitus: Ei kirjoitusoikeutta)"
-msgstr[1] ""
-"Luettu %lu riviä (Muunnettu DOS-muodosta - Varoitus: Ei kirjoitusoikeutta)"
-
-#: src/files.c:974
+#: src/files.c:930
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "Luettu %lu rivi"
 msgstr[1] "Luettu %lu riviä"
 
-#: src/files.c:977
-#, fuzzy, c-format
-msgid "Read %lu line (Warning: No write permission)"
-msgid_plural "Read %lu lines (Warning: No write permission)"
-msgstr[0] "Luettu %lu rivi (Varoitus: Ei kirjoitusoikeutta)"
-msgstr[1] "Luettu %lu riviä (Varoitus: Ei kirjoitusoikeutta)"
-
-#: src/files.c:1019 src/files.c:1056
+#: src/files.c:974 src/files.c:1006
 msgid "Reading File"
-msgstr "Lukee tiedostoa"
+msgstr "Luetaan tiedostoa"
 
-#: src/files.c:1025
+#: src/files.c:980
 msgid "New File"
 msgstr "Uusi tiedosto"
 
-#: src/files.c:1028
-#, c-format
-msgid "\"%s\" not found"
-msgstr "Ei löytynyt: ”%s”"
+#: src/files.c:983
+#, fuzzy, c-format
+msgid "File \"%s\" not found"
+msgstr "Tiedostoa ”%s” ei löytynyt"
 
-#: src/files.c:1039 src/rcfile.c:590 src/rcfile.c:1386 src/rcfile.c:1427
+#: src/files.c:992 src/rcfile.c:534 src/rcfile.c:1231 src/rcfile.c:1272
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "”%s” on laitetiedosto"
 
-#: src/files.c:1133
+#: src/files.c:1083
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
-msgstr "Uudessa puskurissa suoritettava komento [kohteesta %s] "
+msgstr "Uudessa puskurissa suoritettava komento [hakemistosta %s] "
 
-#: src/files.c:1135
+#: src/files.c:1085
 #, c-format
 msgid "Command to execute [from %s] "
-msgstr "Suoritettava komento [kohteesta %s] "
+msgstr "Suoritettava komento [hakemistosta %s] "
 
 #  Toisaalla on "Tiedoston lisääminen hakemiston %s ulkopuolelta epäonnistui",
 #  joten täälläkin on "hakemistosta" eikä "hakemistossa".
-#: src/files.c:1142
+#: src/files.c:1092
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Uuteen puskuriin lisättävä tiedosto [hakemistosta %s] "
 
-#: src/files.c:1144
+#: src/files.c:1094
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Lisättävä tiedosto [hakemistosta %s] "
 
 #  "Virheellinen näppäin yksipuskuritilassa"?
 #  "Komento toimii vain monen puskurin tilassa"?
-#: src/files.c:1389
+#: src/files.c:1338
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Virheellinen näppäin yhden puskurin tilassa"
 
-#: src/files.c:1684
-msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+#: src/files.c:1632
+#, fuzzy
+msgid "Failed to write backup file; continue saving? (Say N if unsure.) "
 msgstr ""
-"Varmuuskopiotiedoston kirjoittaminen epäonnistui, jatketaanko tallentamista? "
-"(Sanoi N jos olet epävarma) "
+"Varmuuskopio epäonnistui, jatketaanko tallentamista? (Vastaa E jos olet "
+"epävarma) "
 
-#: src/files.c:1800
+#: src/files.c:1750
 #, c-format
 msgid "Can't write outside of %s"
-msgstr "Hakemiston %s ulkopuolelle kirjoittaminen epäonnistui"
+msgstr "Hakemiston %s ulkopuolelle ei voi kirjoittaa"
 
-#: src/files.c:1885 src/files.c:1910 src/files.c:1928 src/files.c:1941
-#: src/files.c:1952 src/files.c:1981
+#: src/files.c:1833 src/files.c:1858 src/files.c:1876 src/files.c:1889
+#: src/files.c:1900 src/files.c:1928
 #, c-format
 msgid "Error writing backup file %s: %s"
-msgstr "Virhe kirjoitettaessa varmuuskopiotiedostoon %s: %s"
+msgstr "Virhe kirjoitettaessa varmuuskopiotiedostoa %s: %s"
 
-#: src/files.c:1886 src/nano.c:690
+#: src/files.c:1834 src/nano.c:692
 msgid "Too many backup files?"
 msgstr "Liian monta varmuuskopiotiedostoa?"
 
-#: src/files.c:2026 src/text.c:2863 src/text.c:2875 src/text.c:3244
-#: src/text.c:3253
+#: src/files.c:1972 src/text.c:3117 src/text.c:3129 src/text.c:3498
+#: src/text.c:3507
 #, c-format
 msgid "Error writing temp file: %s"
-msgstr "Virhe kirjoitettaessa tilapäiseen tiedostoon: %s"
+msgstr "Virhe kirjoitettaessa tilapäistiedostoa: %s"
 
-#: src/files.c:2049 src/files.c:2068 src/files.c:2080 src/files.c:2104
-#: src/files.c:2121 src/files.c:2131 src/files.c:2164 src/files.c:2171
+#: src/files.c:1994 src/files.c:2013 src/files.c:2023 src/files.c:2047
+#: src/files.c:2064 src/files.c:2074 src/files.c:2106 src/files.c:2113
 #, c-format
 msgid "Error writing %s: %s"
-msgstr "Virhe kirjoitettaessa %s: %s"
+msgstr "Virhe kirjoitettaessa tiedostoa %s: %s"
 
-#: src/files.c:2200
+#: src/files.c:2154
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
-msgstr[0] "Kirjoitettu %lu rivi"
-msgstr[1] "Kirjoitettu %lu riviä"
+msgstr[0] "Kirjoitettiin %lu rivi"
+msgstr[1] "Kirjoitettiin %lu riviä"
 
-#: src/files.c:2299
+#: src/files.c:2249
 msgid " [DOS Format]"
 msgstr " [DOS-muoto]"
 
-#: src/files.c:2300
+#: src/files.c:2250
 msgid " [Mac Format]"
 msgstr " [Mac-muoto]"
 
-#: src/files.c:2302
+#: src/files.c:2252
 msgid " [Backup]"
 msgstr " [Varmuuskopio]"
 
-#  "Prepend" is not an English word, use "prefix"
-#: src/files.c:2309
+#: src/files.c:2259
 msgid "Prepend Selection to File"
 msgstr "Lisää valinta tiedoston alkuun"
 
-#: src/files.c:2310
+#: src/files.c:2260
 msgid "Append Selection to File"
 msgstr "Lisää valinta tiedoston loppuun"
 
-#: src/files.c:2311
+#: src/files.c:2261
 msgid "Write Selection to File"
 msgstr "Kirjoita valinta tiedostoon"
 
-#  "Alkuun lisättävä tiedosto" olisi väärinpäin.
-#: src/files.c:2314
+#: src/files.c:2264
 msgid "File Name to Prepend to"
-msgstr "Minkä tiedoston alkuun"
+msgstr "Tiedosto, jonka alkuun kirjoitetaan"
 
-#: src/files.c:2315
+#: src/files.c:2265
 msgid "File Name to Append to"
-msgstr "Minkä tiedoston loppuun"
+msgstr "Tiedosto, jonka loppuun kirjoitetaan"
 
-#: src/files.c:2316
+#: src/files.c:2266
 msgid "File Name to Write"
 msgstr "Kirjoitettava tiedosto"
 
-#: src/files.c:2349
+#: src/files.c:2301
 #, fuzzy
-msgid "Save modified buffer anyway ? "
-msgstr "Tallennetaanko muokattu puskuri ennen esikatselua?"
+msgid "Save modified buffer anyway? "
+msgstr "Tallennetaanko muokattu puskuri silti? "
 
-#: src/files.c:2457
-msgid "File exists, OVERWRITE ? "
-msgstr "Tiedosto olemassa, korvataanko ? "
+#: src/files.c:2412
+#, fuzzy
+msgid "Save file under DIFFERENT NAME? "
+msgstr "Tallennetaanko tiedosto ERI NIMELLÄ? "
 
-#: src/files.c:2466
-msgid "Save file under DIFFERENT NAME ? "
-msgstr "Tallennetaanko tiedosto eri nimellä ? "
+#: src/files.c:2420
+#, fuzzy, c-format
+msgid "File \"%s\" exists; OVERWRITE? "
+msgstr "Tiedosto olemassa, KORVATAANKO? "
 
-#: src/files.c:2480
-msgid "File was modified since you opened it, continue saving ? "
-msgstr ""
-"Tiedostoa on muokattu sen jälkeen kun avasit sen, jatketaanko "
-"tallentamista ? "
+#: src/files.c:2441
+#, fuzzy
+msgid "File was modified since you opened it; continue saving? "
+msgstr "Tiedostoa on muokattu avaamisen jälkeen, jatketaanko tallentamista? "
 
-#: src/files.c:2917
+#: src/files.c:2874
 msgid "(more)"
 msgstr "(jatkuu)"
 
-#: src/files.c:3004
+#: src/files.c:2959
 #, c-format
 msgid ""
 "\n"
 "Press Enter to continue\n"
 msgstr ""
 "\n"
-"Paina return-painiketta jatkaaksesi nanon käynnistämistä\n"
+"Paina Enter jatkaaksesi\n"
 
-#: src/files.c:3020
+#: src/files.c:2975
 #, c-format
 msgid ""
 "Unable to create directory %s: %s\n"
 "It is required for saving/loading search history or cursor positions.\n"
 msgstr ""
 "Hakemiston %s luominen epäonnistui: %s\n"
-"Sitä vaaditaan kohdistinkoordinaatin tai etsintähistorian tallentamiseksi/"
+"Sitä vaaditaan hakuhistoria ja kohdistimen sijaintien tallentamiseksi/"
 "lataamiseksi.\n"
 
-#: src/files.c:3026
+#: src/files.c:2982
 #, c-format
 msgid ""
 "Path %s is not a directory and needs to be.\n"
 "Nano will be unable to load or save search history or cursor positions.\n"
 msgstr ""
-"Polku %s ei ole hakemisto ja sen pitää olla.\n"
-"Nano ei kykene lataamaan tai tallentamaan etsintää tai "
-"kohdistinkoordinaatteja.\n"
+"Polku %s ei ole hakemisto vaikka sen on oltava.\n"
+"Nano ei kykene lataamaan tai tallentamaan hakuhistoriaa eikä kohdistimen "
+"sijainteja.\n"
 
-#: src/files.c:3045
+#: src/files.c:3002
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I tried to move\n"
 "to the preferred location (%s) but encountered an error: %s"
 msgstr ""
-"Havaittu perinteinen nano-historiatiedosto (%s), jota yritettiin siirtää\n"
-"parempana pidettyyn sijaintipaikkaan (%s), mutta kohdattiin virhe: %s"
+"Havaittiin vanhanaikainen nano-historiatiedosto (%s), joka yritettiin\n"
+"siirtää suositeltavaan sijaintiin (%s), mutta tapahtui virhe: %s"
 
-#: src/files.c:3049
+#: src/files.c:3006
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I moved\n"
 "to the preferred location (%s)\n"
 "(see the nano FAQ about this change)"
 msgstr ""
-"Havaittu perinteinen nano-historiatiedosto (%s), joka siirrettiin\n"
-"parempana pidettyyn sijaintipaikkaan (%s)\n"
-"(katso nano FAQ tästä muutoksesta)"
+"Havaittiin vanhanaikainen nano-historiatiedosto (%s), joka yritettiin\n"
+"siirtää suositeltavaan sijaintiin (%s)\n"
+"(lisätietoja tästä muutoksesta nanon FAQ:ssa)"
 
-#: src/files.c:3132 src/files.c:3140 src/files.c:3164 src/files.c:3176
-#, fuzzy, c-format
+#: src/files.c:3089 src/files.c:3097 src/files.c:3121 src/files.c:3133
+#, c-format
 msgid "Error writing %s: %s\n"
-msgstr "Virhe kirjoitettaessa %s: %s"
+msgstr "Virhe kirjoitettaessa tiedostoa %s: %s\n"
 
 #. TRANSLATORS: Try to keep the next fifteen strings at most 10 characters.
-#: src/global.c:480
+#: src/global.c:483
 msgid "Exit"
 msgstr "Lopeta"
 
-#: src/global.c:481
+#: src/global.c:484
 msgid "Close"
 msgstr "Sulje"
 
-#: src/global.c:482
+#: src/global.c:485
 msgid "Uncut Text"
-msgstr "Liitä"
+msgstr "Epäleikkaa"
 
 #  80 sarakkeen näytöllä mahtuu 10 merkkiä, mieluummin 9.
-#: src/global.c:484
+#: src/global.c:487
 msgid "Unjustify"
 msgstr "Epätasaa"
 
-#: src/global.c:490
+#: src/global.c:493
 msgid "Read File"
 msgstr "Lue tied."
 
-#: src/global.c:491
+#: src/global.c:494
 msgid "Where Is"
-msgstr "Etsi"
+msgstr "Hae"
 
-#: src/global.c:492
+#: src/global.c:495
 msgid "Replace"
 msgstr "Korvaa"
 
 #  Tämä on "Etsi"-valikossa.
 #  80 sarakkeen näytöllä mahtuu 13 merkkiä, mieluummin 12.
 #  Huomaa myös "Go To Line Help Text".
-#: src/global.c:493
+#: src/global.c:496
 msgid "Go To Line"
 msgstr "Rivinumero"
 
-#: src/global.c:494
+#: src/global.c:497
 msgid "Prev Line"
 msgstr "Ed. rivi"
 
-#: src/global.c:495
+#: src/global.c:498
 msgid "Next Line"
-msgstr "Seuraava rivi"
+msgstr "Seur. rivi"
 
-#: src/global.c:496
+#: src/global.c:499
 msgid "Prev Page"
 msgstr "Ed. sivu"
 
-#: src/global.c:497
+#: src/global.c:500
 msgid "Next Page"
 msgstr "Seur. sivu"
 
-#: src/global.c:499
+#: src/global.c:502
 msgid "Justify"
 msgstr "Tasaa"
 
-#: src/global.c:500
+#: src/global.c:503
 msgid "FullJstify"
-msgstr "KokoTasaus"
+msgstr "KokoTas."
 
 #  "Päivitä"?
-#: src/global.c:502
+#: src/global.c:505
 msgid "Refresh"
-msgstr "Piirrä uudelleen"
+msgstr "Virkistä"
 
 #. TRANSLATORS: Try to keep this string at most 12 characters.
-#: src/global.c:505
+#: src/global.c:508
 msgid "WhereIs Next"
-msgstr "EtsiSeuraava"
+msgstr "Hae Seur."
 
 #. TRANSLATORS: The next long series of strings are shortcut descriptions;
 #. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:512
+#: src/global.c:515
 msgid "Justify the current paragraph"
 msgstr "Tasaa nykyinen kappale"
 
-#: src/global.c:514
+#: src/global.c:517
 msgid "Cancel the current function"
 msgstr "Peru nykyinen toiminto"
 
-#: src/global.c:515
+#: src/global.c:518
 msgid "Display this help text"
 msgstr "Näytä tämä ohjeteksti"
 
-#: src/global.c:518
+#: src/global.c:521
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Sulje nykyinen tiedostopuskuri / Poistu nanosta"
 
-#: src/global.c:520
+#: src/global.c:523
 msgid "Exit from nano"
 msgstr "Poistu nanosta"
 
-#: src/global.c:524
+#: src/global.c:527
 msgid "Write the current file to disk"
 msgstr "Kirjoita nykyinen tiedosto levylle"
 
-#: src/global.c:526
+#: src/global.c:529
 msgid "Insert another file into the current one"
 msgstr "Lisää toinen tiedosto nykyiseen tiedostoon"
 
-#: src/global.c:528
+#: src/global.c:531
 msgid "Search for a string or a regular expression"
 msgstr "Etsi merkkijonoa tai säännöllistä lauseketta"
 
-#: src/global.c:531
+#: src/global.c:533
 msgid "Search for a string"
 msgstr "Etsi merkkijonoa"
 
-#: src/global.c:533
+#: src/global.c:534
+msgid "Refresh the file list"
+msgstr ""
+
+#: src/global.c:535
+#, fuzzy
+msgid "Go to lefthand column"
+msgstr "Siirry annetulle riville ja sarakkeeseen"
+
+#: src/global.c:536
+#, fuzzy
+msgid "Go to righthand column"
+msgstr "Siirry annetulle riville ja sarakkeeseen"
+
+#: src/global.c:538
 msgid "Go one screenful up"
 msgstr "Siirry ruutu ylöspäin"
 
-#: src/global.c:534
+#: src/global.c:539
 msgid "Go one screenful down"
 msgstr "Siirry ruutu alaspäin"
 
-#: src/global.c:536
+#: src/global.c:541
 msgid "Cut the current line and store it in the cutbuffer"
-msgstr "Leikkaa nykyinen rivi leiketilaan"
+msgstr "Leikkaa nykyinen rivi ja varastoi se leikepuskuriin"
 
-#: src/global.c:538
+#: src/global.c:543
 msgid "Uncut from the cutbuffer into the current line"
-msgstr "Liitä rivi leiketilasta nykyiselle riville"
+msgstr "Liitä leikepuskurista nykyiselle riville"
 
-#: src/global.c:539
+#: src/global.c:544
 msgid "Display the position of the cursor"
 msgstr "Näytä kohdistimen sijainti"
 
-#: src/global.c:541
+#: src/global.c:546
 msgid "Invoke the spell checker, if available"
 msgstr "Käynnistä oikoluin (jos saatavilla)"
 
-#: src/global.c:543
+#: src/global.c:548
 msgid "Replace a string or a regular expression"
 msgstr "Korvaa merkkijono tai säännöllinen lauseke"
 
-#: src/global.c:544
+#: src/global.c:549
 msgid "Go to line and column number"
-msgstr "Siirry riville ja sarakkeelle numero"
+msgstr "Siirry annetulle riville ja sarakkeeseen"
 
-#: src/global.c:546
+#: src/global.c:551
 msgid "Mark text starting from the cursor position"
-msgstr "Merkitse teksti alkaen kohdistimen kohdalta"
+msgstr "Merkitse tekstiä kohdistimesta alkaen"
 
-#: src/global.c:547
+#: src/global.c:552
 msgid "Repeat the last search"
-msgstr "Toista viimeisin etsintä"
+msgstr "Toista viimeisin haku"
 
-#: src/global.c:549
+#: src/global.c:554
 msgid "Copy the current line and store it in the cutbuffer"
-msgstr "Leikkaa nykyinen rivi leiketilaan"
+msgstr "Kopioi nykyinen rivi ja varastoi se leikepuskuriin"
 
-#: src/global.c:550
+#: src/global.c:555
 msgid "Indent the current line"
 msgstr "Sisennä nykyinen rivi"
 
-#: src/global.c:551
+#: src/global.c:556
 msgid "Unindent the current line"
-msgstr "Poista nykyisen rivin sisennys"
+msgstr "Epäsisennä nykyinen rivi"
 
-#: src/global.c:552
+#: src/global.c:558
+msgid "Comment/uncomment the current line or marked lines"
+msgstr ""
+
+#: src/global.c:560
 msgid "Undo the last operation"
-msgstr "Peru viimeisin toiminto"
+msgstr "Peru viimeisin toimenpide"
 
-#: src/global.c:553
+#: src/global.c:561
 msgid "Redo the last undone operation"
-msgstr "Tee uudelleen viimeisen toiminnon peruminen"
+msgstr "Tee uudelleen viimeksi peruttu toimenpide"
 
-#: src/global.c:555
+#: src/global.c:563
 msgid "Go back one character"
 msgstr "Siirry yksi merkki taaksepäin"
 
-#: src/global.c:556
+#: src/global.c:564
 msgid "Go forward one character"
 msgstr "Siirry yksi merkki eteenpäin"
 
-#: src/global.c:558
+#: src/global.c:566
 msgid "Go back one word"
 msgstr "Siirry yksi sana taaksepäin"
 
-#: src/global.c:559
+#: src/global.c:567
 msgid "Go forward one word"
 msgstr "Siirry yksi sana eteenpäin"
 
-#: src/global.c:561
+#: src/global.c:569
 msgid "Go to previous line"
 msgstr "Siirry edelliselle riville"
 
-#: src/global.c:562
+#: src/global.c:570
 msgid "Go to next line"
 msgstr "Siirry seuraavalle riville"
 
-#: src/global.c:563
+#: src/global.c:571
 msgid "Go to beginning of current line"
 msgstr "Siirry nykyisen rivin alkuun"
 
-#: src/global.c:564
+#: src/global.c:572
 msgid "Go to end of current line"
 msgstr "Siirry nykyisen rivin loppuun"
 
-#: src/global.c:567
+#: src/global.c:575
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "Siirry kappaleen alkuun; sitten seuraavan kappaleen"
 
-#: src/global.c:569
+#: src/global.c:577
 msgid "Go just beyond end of paragraph; then of next paragraph"
-msgstr "Siirry vain kappaleen loppuun; sitten seuraavan kappaleen"
+msgstr "Siirry aivan kappaleen lopun perään; sitten seuraavan kappaleen"
 
-#: src/global.c:571
+#: src/global.c:579
 msgid "Go to the first line of the file"
 msgstr "Siirry tiedoston ensimmäiselle riville"
 
-#: src/global.c:572
+#: src/global.c:580
 msgid "Go to the last line of the file"
 msgstr "Siirry tiedoston viimeiselle riville"
 
-#: src/global.c:574
+#: src/global.c:582
 msgid "Go to the matching bracket"
 msgstr "Siirry vastaavalle sulkeelle"
 
-#: src/global.c:576
+#: src/global.c:584
 msgid "Scroll up one line without scrolling the cursor"
-msgstr "Siirry rivi ylöspäin liikuttamatta kohdistinta"
+msgstr "Vieritä rivi ylöspäin siirtämättä kohdistinta"
 
-#: src/global.c:578
+#: src/global.c:586
 msgid "Scroll down one line without scrolling the cursor"
-msgstr "Siirry rivi alaspäin liikuttamatta kohdistinta"
+msgstr "Vieritä rivi alaspäin siirtämättä kohdistinta"
 
-#: src/global.c:581
+#: src/global.c:589
 msgid "Switch to the previous file buffer"
 msgstr "Vaihda edelliseen tiedostopuskuriin"
 
-#: src/global.c:582
+#: src/global.c:590
 msgid "Switch to the next file buffer"
 msgstr "Vaihda seuraavaan tiedostopuskuriin"
 
-#: src/global.c:584
+#: src/global.c:592
 msgid "Insert the next keystroke verbatim"
-msgstr "Lisää seuraava näppäily kirjaimellisesti"
+msgstr "Lisää seuraava näppäily sellaisenaan"
 
-#: src/global.c:585
+#: src/global.c:593
 msgid "Insert a tab at the cursor position"
 msgstr "Lisää sarkain kohdistimen kohdalle"
 
-#: src/global.c:586
+#: src/global.c:594
 msgid "Insert a newline at the cursor position"
 msgstr "Lisää rivinvaihto kohdistimen kohdalle"
 
-#: src/global.c:587
+#: src/global.c:595
 msgid "Delete the character under the cursor"
 msgstr "Poista kohdistimen kohdalla oleva merkki"
 
-#  "Poista merkki kohdistimen vasemmalta puolelta"?
-#: src/global.c:589
+#: src/global.c:597
 msgid "Delete the character to the left of the cursor"
-msgstr "Poista kohdistimesta vasemmalle oleva merkki"
+msgstr "Poista merkki kohdistimen vasemmalta puolelta"
 
-#: src/global.c:592
-#, fuzzy
+#: src/global.c:600
 msgid "Cut backward from cursor to word start"
-msgstr "Leikkaa rivin loppuun saakka"
+msgstr "Leikkaa taaksepäin kohdistimesta sanan alkuun"
 
-#: src/global.c:594
-#, fuzzy
+#: src/global.c:602
 msgid "Cut forward from cursor to next word start"
-msgstr "Leikkaa rivin loppuun saakka"
+msgstr "Leikkaa eteenpäin kohdistimesta seuraavan sanan alkuun"
 
-#: src/global.c:596
+#: src/global.c:604
 msgid "Cut from the cursor position to the end of the file"
-msgstr "Liitä teksti kohdistimesta tiedoston loppuun"
+msgstr "Leikkaa kohdistimesta tiedoston loppuun"
 
-#: src/global.c:599
+#: src/global.c:607
 msgid "Justify the entire file"
-msgstr "Tasaa nykyinen tiedosto"
+msgstr "Tasaa koko tiedosto"
 
-#: src/global.c:603
+#: src/global.c:611
 msgid "Count the number of words, lines, and characters"
 msgstr "Laske sanojen, rivien ja merkkien määrä"
 
-#: src/global.c:606
+#: src/global.c:614
 msgid "Refresh (redraw) the current screen"
-msgstr "Piirrä ruutu uudestaan"
+msgstr "Virkistä (piirrä uudelleen) nykyinen ruutu"
 
-#: src/global.c:608
-#, fuzzy
+#: src/global.c:616
 msgid "Suspend the editor (if suspension is enabled)"
-msgstr "Keskeytä editori (jos keskeytys on aktivoitu)"
+msgstr "Hyllytä editori (jos hyllytys on käytössä)"
 
-#: src/global.c:610
+#: src/global.c:618
 msgid "Save file without prompting"
-msgstr ""
+msgstr "Tallenna tiedosto kysymättä"
 
-#: src/global.c:611
+#: src/global.c:619
 msgid "Search next occurrence backward"
-msgstr ""
+msgstr "Hae seuraava esiintymä taaksepäin"
 
-#: src/global.c:612
+#: src/global.c:620
 msgid "Search next occurrence forward"
-msgstr ""
+msgstr "Hae seuraava esiintymä eteenpäin"
 
-#: src/global.c:614
+#: src/global.c:622
 msgid "Toggle the case sensitivity of the search"
-msgstr "Vaihda merkkikoko etsinnässä"
+msgstr "Vaihda haun merkkikoon huomiointi käyttöön tai pois"
 
-#: src/global.c:616
+#: src/global.c:624
 msgid "Reverse the direction of the search"
-msgstr "Vaihda etsinnän suunta"
+msgstr "Vaihda haun suunta"
 
-#: src/global.c:620
+#: src/global.c:628
 msgid "Toggle the use of regular expressions"
-msgstr "Vaihda säännöllisten lausekkeiden käyttö"
+msgstr "Vaihda säännölliset lausekkeet käyttöön tai pois"
 
-#: src/global.c:624
+#: src/global.c:632
+#, fuzzy
 msgid "Recall the previous search/replace string"
 msgstr "Kutsu takaisin edellinen haettu/korvattu merkkijono"
 
-#: src/global.c:626
+#: src/global.c:634
+#, fuzzy
 msgid "Recall the next search/replace string"
 msgstr "Kutsu takaisin seuraava haettu/korvattu merkkijono"
 
-#: src/global.c:629
+#: src/global.c:637
 msgid "Go to file browser"
 msgstr "Siirry tiedostoselaimeen"
 
-#: src/global.c:632
+#: src/global.c:640
 msgid "Toggle the use of DOS format"
-msgstr "Vaihda DOS-muodon käyttö"
+msgstr "Vaihda DOS-muoto käyttöön tai pois"
 
-#: src/global.c:633
+#: src/global.c:641
 msgid "Toggle the use of Mac format"
-msgstr "Vaihda Mac-muodon käyttö"
+msgstr "Vaihda Mac-muoto käyttöön tai pois"
 
-#: src/global.c:634
+#: src/global.c:642
 msgid "Toggle appending"
-msgstr "Vaihda liittäminen loppuun"
+msgstr "Vaihda liittäminen loppuun käyttöön tai pois"
 
-#  "Prepend" is not an English word, use "prefix"
-#: src/global.c:635
+#: src/global.c:643
 msgid "Toggle prepending"
-msgstr "Vaihda liittäminen alkuun"
+msgstr "Vaihda liittäminen alkuun käyttöön tai pois"
 
-#: src/global.c:636
+#: src/global.c:644
 msgid "Toggle backing up of the original file"
-msgstr "Vaihda alkuperäisen tiedoston varmuuskopiointi"
+msgstr "Vaihda alkuperäisen tiedoston varmuuskopiointi käyttöön tai pois"
 
-#: src/global.c:637
+#: src/global.c:645
 msgid "Execute external command"
 msgstr "Suorita ulkoinen komento"
 
-#: src/global.c:639
+#: src/global.c:647
 msgid "Close buffer without saving it"
-msgstr ""
+msgstr "Sulje puskuri tallentamatta sitä"
 
-#: src/global.c:641
+#: src/global.c:649
 msgid "Toggle the use of a new buffer"
-msgstr "Vaihda uuden puskurin käyttö"
+msgstr "Vaihda uuden puskurin käyttö päälle tai pois"
 
-#: src/global.c:644
+#: src/global.c:652
 msgid "Exit from the file browser"
 msgstr "Poistu tiedostoselaimesta"
 
-#: src/global.c:645
+#: src/global.c:653
 msgid "Go to the first file in the list"
 msgstr "Siirry luettelon ensimmäiseen tiedostoon"
 
-#: src/global.c:646
+#: src/global.c:654
 msgid "Go to the last file in the list"
 msgstr "Siirry luettelon viimeiseen tiedostoon"
 
-#: src/global.c:647
+#: src/global.c:655
 msgid "Go to the previous file in the list"
 msgstr "Siirry luettelon edelliseen tiedostoon"
 
-#: src/global.c:648
+#: src/global.c:656
 msgid "Go to the next file in the list"
 msgstr "Siirry luettelon seuraavaan tiedostoon"
 
-#: src/global.c:649
+#: src/global.c:657
 msgid "Go to directory"
 msgstr "Siirry hakemistoon"
 
-#: src/global.c:652
+#: src/global.c:660
+#, fuzzy
 msgid "Invoke the linter, if available"
 msgstr "Käynnistä esikatselu (jos saatavilla)"
 
-#: src/global.c:653
+#: src/global.c:661
+#, fuzzy
 msgid "Go to previous linter msg"
 msgstr "Siirry edelliseen esikatseluun"
 
-#: src/global.c:654
+#: src/global.c:662
+#, fuzzy
 msgid "Go to next linter msg"
 msgstr "Siirry seuraavaan esikatseluun"
 
-#: src/global.c:656
+#: src/global.c:664
 msgid "Invoke formatter, if available"
-msgstr "Käynnistä muotoilija (jos saatavilla)"
+msgstr "Käynnistä muotoilin (jos saatavilla)"
 
 #. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:671
+#: src/global.c:679
 msgid "Get Help"
-msgstr "Ohjeita"
+msgstr "Ohjeet"
 
-#: src/global.c:674 src/prompt.c:858
+#: src/global.c:682 src/prompt.c:855
 msgid "Cancel"
 msgstr "Peru"
 
-#: src/global.c:687
+#: src/global.c:695
 msgid "Write Out"
 msgstr "Kirjoita"
 
-#: src/global.c:723
+#: src/global.c:731
 msgid "Go To Dir"
-msgstr "Siirry hakemistoon"
+msgstr "Siirry hak."
 
-#: src/global.c:738
+#: src/global.c:746
 msgid "Cut Text"
 msgstr "Leikkaa"
 
-#: src/global.c:753
+#: src/global.c:761
 msgid "To Spell"
-msgstr "Oikolue"
+msgstr "Oikoluku"
 
 #  Tämä on "Etsi"-valikossa.
 #  80 sarakkeen näytöllä mahtuu 13 merkkiä, mieluummin 12.
 #  Huomaa myös "Go To Line Help Text".
-#: src/global.c:757
+#: src/global.c:765
+#, fuzzy
 msgid "To Linter"
 msgstr "Esikatseluun"
 
-#: src/global.c:760
+#: src/global.c:768
 msgid "Formatter"
-msgstr "Muotoilija"
+msgstr "Muotoilin"
 
-#: src/global.c:767
+#: src/global.c:775
 msgid "Case Sens"
-msgstr "Kirj. koko"
+msgstr "Kirj.koko"
 
 #  "Äiti, mikä on säännöke?" "Kai se joku pikku sääntö on."
-#: src/global.c:772
+#: src/global.c:780
 msgid "Regexp"
 msgstr "Säännöke"
 
-#: src/global.c:777
+#: src/global.c:785
 msgid "Backwards"
 msgstr "Taaksepäin"
 
-#: src/global.c:784
+#: src/global.c:792
 msgid "No Replace"
 msgstr "Älä korvaa"
 
-#: src/global.c:792
+#: src/global.c:800
 msgid "Cur Pos"
 msgstr "Sijainti"
 
-#: src/global.c:807
+#: src/global.c:815
 msgid "First Line"
-msgstr "Ensim. rivi"
+msgstr "Ens. rivi"
 
-#: src/global.c:809
+#: src/global.c:817
 msgid "Last Line"
 msgstr "Viim. rivi"
 
 #  versiossa 1.1.99pre2 hakee merkkejä "([{<>}])"
-#: src/global.c:816
+#: src/global.c:824
 msgid "To Bracket"
 msgstr "Sulkeeseen"
 
-#: src/global.c:819
+#: src/global.c:827
 msgid "Mark Text"
-msgstr "Merkitse tekstiä"
+msgstr "Merkitse"
 
-#: src/global.c:822
+#: src/global.c:830
 msgid "Copy Text"
 msgstr "Kopioi"
 
-#: src/global.c:825
+#: src/global.c:833
 msgid "Indent Text"
 msgstr "Sisennä"
 
-#: src/global.c:827
+#: src/global.c:835
 msgid "Unindent Text"
-msgstr "Poista sisennys"
+msgstr "Epäsisennä"
 
-#: src/global.c:830
+#: src/global.c:838
 msgid "Undo"
 msgstr "Peru"
 
-#: src/global.c:832
+#: src/global.c:840
 msgid "Redo"
 msgstr "Tee uudelleen"
 
-#: src/global.c:836 src/global.c:842
+#: src/global.c:844 src/global.c:850
 msgid "Back"
 msgstr "Takaisin"
 
-#: src/global.c:838 src/global.c:844
+#: src/global.c:846 src/global.c:852
 msgid "Forward"
 msgstr "Eteenpäin"
 
-#: src/global.c:849
+#: src/global.c:857
 msgid "Prev Word"
-msgstr "Edellinen sana"
+msgstr "Ed. sana"
 
-#: src/global.c:851
+#: src/global.c:859
 msgid "Next Word"
-msgstr "Seuraava sana"
+msgstr "Seur. sana"
 
-#: src/global.c:855
+#: src/global.c:863
 msgid "Home"
-msgstr "Koti"
+msgstr "Home"
 
-#: src/global.c:857
+#: src/global.c:865
 msgid "End"
-msgstr "Loppu"
+msgstr "End"
 
-#  "Par" on "paragraph" ?
-#: src/global.c:866
+# "Par" on "paragraph"
+#: src/global.c:874
 msgid "Beg of Par"
-msgstr "Kappalealku"
+msgstr "Kapp. alku"
 
-#: src/global.c:868
+#: src/global.c:876
 msgid "End of Par"
-msgstr "Kappaleloppu"
+msgstr "Kapp. loppu"
 
-#: src/global.c:873
+#: src/global.c:881
 msgid "Scroll Up"
 msgstr "Vieritä ylös"
 
-#: src/global.c:875
+#: src/global.c:883
 msgid "Scroll Down"
 msgstr "Vieritä alas"
 
-#: src/global.c:880
+#: src/global.c:888
 msgid "Prev File"
-msgstr "Edellinen tiedosto"
+msgstr "Ed. tied."
 
-#: src/global.c:882
+#: src/global.c:890
 msgid "Next File"
-msgstr "Seuraava tiedosto"
+msgstr "Seur. tied."
 
-#: src/global.c:891
+#: src/global.c:899
 msgid "Verbatim"
 msgstr "Merkintarkka"
 
-#: src/global.c:894
+#: src/global.c:902
 msgid "Tab"
 msgstr "Sarkain"
 
-#: src/global.c:896
+#: src/global.c:904
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:899
+# Oletetaan että tämä on näppäimen nimi tässä yhteydessä.
+#: src/global.c:907
 msgid "Delete"
-msgstr "Poista"
+msgstr "Delete"
 
-#: src/global.c:901
+#: src/global.c:909
 msgid "Backspace"
 msgstr "Askelpalautin"
 
 #. TRANSLATORS: The next two strings refer to cutting words.
-#: src/global.c:912
-#, fuzzy
+#: src/global.c:920
 msgid "Cut Left"
-msgstr "Leikkaa"
+msgstr "Leikk. vas."
 
-#: src/global.c:914
+#: src/global.c:922
 msgid "Cut Right"
-msgstr ""
+msgstr "Leikk. oik."
 
-#: src/global.c:916
+#: src/global.c:924
 msgid "CutTillEnd"
-msgstr "LeikLoppuun"
+msgstr "LeikkLoppuun"
 
-#: src/global.c:926
+#: src/global.c:934
 msgid "Word Count"
-msgstr "Sanaluku"
+msgstr "Sanamäärä"
 
-#  Perään tulee "käytössä" tai "ei käytössä".
-#: src/global.c:933
+#: src/global.c:941
 msgid "Suspend"
-msgstr "Keskeytysnäppäin"
+msgstr "Hyllytä"
+
+#: src/global.c:945
+#, fuzzy
+msgid "Comment Lines"
+msgstr "Seur. rivi"
 
-#: src/global.c:937
+#: src/global.c:949
 msgid "Save"
-msgstr ""
+msgstr "Tallenna"
 
-#: src/global.c:940
+#: src/global.c:952
 msgid "Previous"
-msgstr ""
+msgstr "Edellinen"
 
-#: src/global.c:942
-#, fuzzy
+#: src/global.c:954
 msgid "Next"
-msgstr "Seuraava rivi"
+msgstr "Seuraava"
 
 #  Tämä on Etsi-valikossa.
 #  80 sarakkeen näytöllä mahtuu 11 merkkiä.
-#: src/global.c:948
+#: src/global.c:960
 msgid "PrevHstory"
-msgstr "EdHistoria"
+msgstr "EdHistor."
 
 #  Tämä on Etsi-valikossa.
 #  80 sarakkeen näytöllä mahtuu 11 merkkiä.
-#: src/global.c:951
+#: src/global.c:963
 msgid "NextHstory"
 msgstr "SeurHistor."
 
 #  Tämä on "Etsi"-valikossa.
 #  80 sarakkeen näytöllä mahtuu 13 merkkiä, mieluummin 12.
 #  Huomaa myös "Go To Line Help Text".
-#: src/global.c:955
+#: src/global.c:972
 msgid "Go To Text"
 msgstr "Tekstiin"
 
-#: src/global.c:959
+#: src/global.c:976
 msgid "DOS Format"
 msgstr "DOS-muoto"
 
-#: src/global.c:961
+#: src/global.c:978
 msgid "Mac Format"
 msgstr "Mac-muoto"
 
-#: src/global.c:969
+#: src/global.c:986
 msgid "Append"
 msgstr "Lisää loppuun"
 
-#  "Prepend" is not an English word, use "prefix"
-#: src/global.c:971
+#: src/global.c:988
 msgid "Prepend"
 msgstr "Lisää alkuun"
 
-#: src/global.c:974
+#: src/global.c:991
 msgid "Backup File"
 msgstr "Varmuuskopio"
 
-#: src/global.c:981
+#: src/global.c:998
 msgid "Execute Command"
 msgstr "Suorita komento"
 
 #  Tämä on Kirjoita tiedosto- ja Lisää tiedosto -valikoissa.
 #  80 sarakkeen näytöllä mahtuu 17 merkkiä, mieluummin 16.
-#: src/global.c:996
+#: src/global.c:1013
 msgid "To Files"
 msgstr "Tiedostoselain"
 
-#: src/global.c:1004
+#: src/global.c:1021
 msgid "First File"
-msgstr "Ensim. tiedosto"
+msgstr "Ensimm. tied."
 
-#: src/global.c:1006
+#: src/global.c:1023
 msgid "Last File"
-msgstr "Viim. tiedosto"
+msgstr "Viim. tied."
 
-#: src/global.c:1010
+#: src/global.c:1027
 msgid "Discard buffer"
+msgstr "Hylkää puskuri"
+
+#: src/global.c:1038
+msgid "Left Column"
+msgstr ""
+
+#: src/global.c:1040
+msgid "Right Column"
 msgstr ""
 
 #. TRANSLATORS: Try to keep the next two strings at most 20 characters.
-#: src/global.c:1020
+#: src/global.c:1047
+#, fuzzy
 msgid "Prev Lint Msg"
 msgstr "Ed. esikatselu"
 
-#: src/global.c:1022
+#: src/global.c:1049
+#, fuzzy
 msgid "Next Lint Msg"
 msgstr "Seur. esikats."
 
 #. TRANSLATORS: The next seventeen strings are toggle descriptions;
 #. * they are best kept shorter than 40 characters, but may be longer.
-#: src/global.c:1285
+#: src/global.c:1316
 msgid "Help mode"
 msgstr "Ohjetila"
 
-#: src/global.c:1287
+#: src/global.c:1318
 msgid "Constant cursor position display"
-msgstr "Näytä kohdistimen sijainti aina"
+msgstr "Jatkuva kohdistimen sijainnin näyttö"
 
-#: src/global.c:1289
+#: src/global.c:1320
 msgid "Use of one more line for editing"
-msgstr "Käytä lisäriviä muokkaukseen"
+msgstr "Lisärivin käyttö muokkaukseen"
 
-#: src/global.c:1291
+#: src/global.c:1322
 msgid "Smooth scrolling"
 msgstr "Pehmeä vieritys"
 
-#: src/global.c:1293
+#: src/global.c:1324
 msgid "Soft wrapping of overlong lines"
-msgstr "Pitkien rivien pehmeä rivitys"
+msgstr "Ylipitkien rivien pehmeä rivitys"
 
-#: src/global.c:1295
+#: src/global.c:1326
 msgid "Whitespace display"
 msgstr "Tyhjemerkkien näyttö"
 
-#: src/global.c:1297
+#: src/global.c:1328
 msgid "Color syntax highlighting"
-msgstr "Värillinen rakenteen merkintä"
+msgstr "Värillinen syntaksin korostus"
 
-#: src/global.c:1299
+#: src/global.c:1330
 msgid "Smart home key"
-msgstr "Älykäs kotiavain"
+msgstr "Älykäs Home-näppäin"
 
-#: src/global.c:1301
+#: src/global.c:1332
 msgid "Auto indent"
 msgstr "Automaattinen sisennys"
 
-#: src/global.c:1303
+#: src/global.c:1334
 msgid "Cut to end"
 msgstr "Leikkaa loppuun saakka"
 
-#: src/global.c:1305
+#: src/global.c:1336
 msgid "Hard wrapping of overlong lines"
-msgstr "Pitkien rivien kova rivitys"
+msgstr "Ylipitkien rivien kova rivitys"
 
-#: src/global.c:1307
+#: src/global.c:1338
 msgid "Conversion of typed tabs to spaces"
-msgstr "Kirjoitettujen sarkainmerkkien muunnos välilyönneiksi"
+msgstr "Näppäiltyjen sarkainten muunnos välilyönneiksi"
 
-#: src/global.c:1309
+#: src/global.c:1340
 msgid "Backup files"
 msgstr "Varmuuskopiotiedostot"
 
-#: src/global.c:1311
+#: src/global.c:1342
 msgid "Reading file into separate buffer"
 msgstr "Luetaan tiedosto erilliseen puskuriin"
 
-#: src/global.c:1313
+#: src/global.c:1344
 msgid "Mouse support"
 msgstr "Hiirituki"
 
-#: src/global.c:1315
+#: src/global.c:1346
 msgid "No conversion from DOS/Mac format"
 msgstr "Ei muunnosta DOS/Mac-muodosta"
 
 # Perään tulee "käytössä" tai "ei käytössä".
-#: src/global.c:1317
+#: src/global.c:1348
 msgid "Suspension"
-msgstr "Keskeytysnäppäin"
+msgstr "Hyllytys"
 
-#: src/help.c:209
+#: src/help.c:211
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1199,16 +1206,15 @@ msgid ""
 "prompt.  Hitting Enter without entering any text will perform the previous "
 "search.  "
 msgstr ""
-"Etsi-komennon käyttöohje\n"
+"Hakukomennon käyttöohje\n"
 "\n"
-" Kirjoita sanat tai merkit, joita haluat etsiä, ja paina enter. Jos antamasi "
-"teksti löytyy, näyttö siirtyy lähimpään paikkaan, josta teksti löytyi.\n"
+" Kirjoita sanat tai merkit, joita haluat hakea, ja paina Enter. Jos annettu "
+"teksti löytyy, ruutu siirtyy lähimmän löydöksen kohdalle.\n"
 "\n"
-" Edellinen hakuteksti näkyy hakasuluissa Etsi:-kehotteen jälkeen. Jos painat "
-"vain enteriä antamatta mitään uutta tekstiä, nano hakee edellistä "
-"hakutekstiä uudestaan.  "
+" Edellinen hakuehto näkyy hakasulkeissa hakukehotteen jälkeen. Enterin "
+"painaminen uutta tekstiä syöttämättä toistaa edellisen haun.  "
 
-#: src/help.c:218
+#: src/help.c:220
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1216,13 +1222,13 @@ msgid ""
 " The following function keys are available in Search mode:\n"
 "\n"
 msgstr ""
-"Jos olet valinnut tekstin merkitsemällä ja sitten etsit sitä korvattavaksi, "
-"vain vastaava teksti korvataan.\n"
+"Jos käytät korvaustoimintoa valittuasi tekstiä merkitsemällä, vain valitusta "
+"tekstistä löytyneet kohdat koravataan.\n"
 "\n"
-" Seuraavat toimintonäppäimet ovat käytettävissä Etsintä-tilassa:\n"
+" Seuraavat toimintonäppäimet ovat käytettävissä hakutilassa:\n"
 "\n"
 
-#: src/help.c:224
+#: src/help.c:226
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1233,15 +1239,16 @@ msgid ""
 " The following function keys are available in Go To Line mode:\n"
 "\n"
 msgstr ""
-"Etsi rivinumero -komennon käyttöohje\n"
+"Rivinumero-komennon käyttöohje\n"
 "\n"
-" Kirjoita haluamasi rivin numero ja paina enter. Jos tiedostossa on "
-"antamaasi lukua pienempi määrä rivejä, näyttö siirtyy viimeiselle riville.\n"
+" Syötä halutun rivin numero ja paina Enter. Jos tiedostossa on annettua "
+"lukua vähemmän rivejä, ruutu siirtyy tiedoston viimeiselle riville.\n"
 "\n"
-" Seuraavat funktionäppäimet ovat käytössä Etsi rivinumero -tilassa:\n"
+" Seuraavat toimintonäppäimet ovat käytössä Rivinumero-tilassa:\n"
 "\n"
 
-#: src/help.c:233
+#: src/help.c:235
+#, fuzzy
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1265,7 +1272,7 @@ msgstr ""
 "puskuriin. (Tiedostopuskureita voit vaihtaa näppäinkomennoilla Meta-< ja "
 "Meta->).  "
 
-#: src/help.c:242
+#: src/help.c:244
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1273,14 +1280,13 @@ msgid ""
 " The following function keys are available in Insert File mode:\n"
 "\n"
 msgstr ""
-"Jos tarvitset toisen tyhjän puskurin, älä valitse mitään tiedostonimeä tai "
-"kirjoita ei-olemassaolevaa tiedostonimeä komentokehotteella ja paina Enter-"
-"näppäintä.\n"
+"Jos tarvitset toisen tyhjän puskurin, jätä tiedostonimi syöttämättä tai "
+"syötä kehotteeseen olemattoman tiedoston nimi ja paina Enter-näppäintä.\n"
 "\n"
 " Seuraavat toimintonäppäimet ovat käytössä Lisää tiedosto -tilassa:\n"
 "\n"
 
-#: src/help.c:248
+#: src/help.c:250
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1295,20 +1301,20 @@ msgid ""
 " The following function keys are available in Write File mode:\n"
 "\n"
 msgstr ""
-"Kirjoita tiedosto -komennon käyttöohje\n"
+"Tiedoston kirjoituksen käyttöohje\n"
 "\n"
-" Kirjoita, minkä nimiseksi haluat tallentaa nykyisen tiedoston, ja paina "
-"sitten Enter.\n"
+" Kirjoita nimi nykyiselle tiedostolle ja paina sitten Enter tiedoston "
+"tallentamiseksi.\n"
 "\n"
-" Jos olet valinnut tekstiä merkitsemällä, niin nano kysyykin, mihin "
-"tiedostoon haluat tallentaa valitsemasi osan. Jotta et vahingossa "
-"tallentaisi pelkkää valittua tekstiä koko alkuperäisen tiedoston tilalle, "
-"nano ei tässä tapauksessa ehdota tiedoston nimeä valmiiksi.\n"
+" Jos olet valinnut tekstiä merkitsemällä, kysytään vain valitun osan "
+"tallentamisesta erilliseen tiedostoon. Jottei nykyistä tiedostoa "
+"tahattomasti ylikirjoitettaisi sen osalla, tiedoston nimeksi ei ehdoteta "
+"nykyisen nimeä.\n"
 "\n"
-" Seuraavat funktionäppäimet ovat käytössä Kirjoita tiedosto -tilassa:\n"
+" Seuraavat funktionäppäimet ovat käytössä tiedostonkirjoitustilassa:\n"
 "\n"
 
-#: src/help.c:262
+#: src/help.c:264
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1323,18 +1329,18 @@ msgid ""
 msgstr ""
 "Tiedostoselaimen käyttöohje\n"
 "\n"
-" Tiedostoselaimella voit visuaalisesti selata hakemistorakennetta ja valita "
-"siitä tiedoston luettavaksi tai kirjoitettavaksi. Voit selata tiedostoja "
-"nuolinäppäimillä tai Page Up- ja Page Down -näppäimillä. Kun olet löytänyt "
-"oikean tiedoston, valitse se painamalla S tai Enter; samoilla näppäimillä "
-"voit myös siirtyä alihakemistoon. Pääset hakemistorakenteessa ylöspäin yhden "
-"tason, kun valitset tiedostolistan yläpäästä hakemiston, jonka nimi on "
-"”..”.\n"
+" Tiedostoselaimella voi visuaalisesti selata hakemistorakennetta ja valita "
+"siitä tiedoston luettavaksi tai kirjoitettavaksi. Tiedostojen selaamiseen "
+"voi käyttää nuolinäppäimiä sekä Page Up/Down -näppäimiä. Painamalla S tai "
+"Enter valitaan tiedosto tai siirrytään alihakemistoon. Hakemistorakenteessa "
+"liikutaan taso ylöspäin valitsemalla hakemisto nimeltä ”..” tiedostolistan "
+"alusta.\n"
 "\n"
-" Seuraavat funktionäppäimet ovat käytössä tiedostoselaimessa:\n"
+" Seuraavat toimintonäppäimet ovat käytössä tiedostoselaimessa:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:277
+#, fuzzy
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1357,15 +1363,16 @@ msgstr ""
 "hakutekstiä uudestaan.\n"
 "\n"
 
-#: src/help.c:284
+#: src/help.c:286
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
 msgstr ""
-" Seuraavat funktionäppäimet ovat käytössä selaimen Etsi-tilassa:\n"
+" Seuraavat funktionäppäimet ovat käytössä selaimen hakutilassa:\n"
 "\n"
 
-#: src/help.c:288
+#: src/help.c:290
+#, fuzzy
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1389,7 +1396,8 @@ msgstr ""
 "tilassa:\n"
 "\n"
 
-#: src/help.c:301
+#: src/help.c:303
+#, fuzzy
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1413,7 +1421,8 @@ msgstr ""
 " Seuraavat funktionäppäimet ovat käytössä Oikolue-tilassa:\n"
 "\n"
 
-#: src/help.c:316
+#: src/help.c:318
+#, fuzzy
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1433,7 +1442,7 @@ msgstr ""
 " Seuraavat funktionäppäimet ovat käytössä Suorita komento -tilassa:\n"
 "\n"
 
-#: src/help.c:329
+#: src/help.c:331
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1444,32 +1453,32 @@ msgid ""
 "showing the file being edited.  The status line is the third line from the "
 "bottom and shows important messages.  "
 msgstr ""
-" Nanon pääohje\n"
+"Nanon pääohje\n"
 "\n"
 " Nano-editori on suunniteltu vastaamaan toiminnallisuudeltaan ja "
-"helppokäyttöisyydeltään UW Pico -editoria. Nanon näyttö koostuu neljästä "
-"osasta: ylin rivi näyttää ohjelman versionumeron, nykyisen tiedoston nimen "
-"sekä sen, onko tiedostoa muutettu. Seuraavana on pääikkuna, jossa näkyy "
-"muokattava tiedosto. Tilarivi on kolmas rivi alhaalta lukien ja näyttää "
-"tärkeät viestit."
+"helppokäyttöisyydeltään UW Pico -tekstieditoria. Nanossa koostuu neljästä "
+"osasta. Ylin rivi näyttää ohjelman versionumeron, muokattavana olevan "
+"tiedoston nimen sekä sen, onko tiedostoa muutettu. Seuraavana on pääikkuna, "
+"jossa näkyy muokattava tiedosto. Kolmantena alhaalta lukien oleva tilarivi "
+"näyttää tärkeät viestit.  "
 
-#: src/help.c:339
+#: src/help.c:341
+#, fuzzy
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
-" The notation for shortcuts is as follows: Control-key sequences are notated "
-"with a caret (^) symbol and can be entered either by using the Control "
-"(Ctrl) key or pressing the Escape (Esc) key twice.  Escape-key sequences are "
-"notated with the Meta (M-) symbol and can be entered using either the Esc, "
-"Alt, or Meta key depending on your keyboard setup.  "
+" Shortcuts are written as follows: Control-key sequences are notated with a "
+"'^' and can be entered either by using the Ctrl key or pressing the Esc key "
+"twice.  Meta-key sequences are notated with 'M-' and can be entered using "
+"either the Alt, Cmd, or Esc key, depending on your keyboard setup.  "
 msgstr ""
-"Kaksi alinta riviä näyttää useimmin käytetyt pikavalitsimet editorissa.\n"
+"Kaksi alinta riviä näyttää useimmin käytetyt oikotiet editorissa.\n"
 "\n"
-" Pikavalitsiminen merkintä on seuraava: Control-näppäinsekvenssit merkitään "
-"(^)-symbolilla ja voidaan kirjoittaa käyttämällä Control (Ctrl) -näppäintä "
-"tai painamalla Escape (Esc) -näppäintä kahdesti.  Escape-näppäinsekvenssit "
-"merkitään Meta (M-) -symbolillla ja voidaan kirjoittaa joko Esc, Alt, tai "
-"Meta -näppäimellä riippuen näppäimistösi asetuksista.  "
+" Oikoteiden merkintätapa on seuraava: Control-näppäinyhdistelmät merkitään ^-"
+"symbolilla ja ne syötetään joko käyttämällä Control (Ctrl) -näppäintä tai "
+"painamalla Escape (Esc) -näppäintä kahdesti.  Escape-näppäinyhdistelmät "
+"merkitään Meta (M-) -symbolillla ja syötetään käyttämällä joko Esc-, Alt-, "
+"tai Meta-näppäintä riippuen näppäimistöstä.  "
 
 #: src/help.c:348
 msgid ""
@@ -1479,40 +1488,38 @@ msgid ""
 "keys are shown in parentheses:\n"
 "\n"
 msgstr ""
-"Vastaavan arvon voi kirjoittaa myös painamalla Esc-näppäintä kahdesti ja "
-"kirjoittamalla kolmelukuisen desimaalinumeron välillä 000 ... 255 saa "
-"vastaavan kirjaimen. Seuraavan näppäilyt ovat käytettävissä editorin "
-"pääikkunassa. Vaihtoehtoiset näppäimet näytetään sulkeissa:\n"
+"Lisäksi painamalla Esc-näppäintä kahdesti ja syöttämällä kolmenumeroinen "
+"desimaalinen luku väliltä 000..255 saadaan syötettyä lukua vastaava merkki. "
+"Seuraavat näppäilyt ovat käytettävissä editorin pääikkunassa. Vaihtoehtoiset "
+"näppäimet näytetään sulkeissa:\n"
 "\n"
 
 #: src/help.c:380 src/help.c:457
 msgid "enable/disable"
-msgstr "päälle/pois"
+msgstr "käytössä/pois"
 
-#: src/nano.c:559
-#, fuzzy
+#: src/nano.c:560
 msgid "Key is invalid in view mode"
-msgstr "Virheellinen näppäin katselutilassa"
+msgstr "Näppäin on virheellinen katselutilassa"
 
-#: src/nano.c:565
-#, fuzzy
+#: src/nano.c:566
 msgid "This function is disabled in restricted mode"
-msgstr "Hakemistosta %s pois siirtyminen rajoitetussa tilassa epäonnistui"
+msgstr "Tämä toiminto on poissa käytöstä rajoitetussa tilassa"
 
-#: src/nano.c:573
+#: src/nano.c:574
 msgid "Help is not available"
-msgstr ""
+msgstr "Ohjetta ei ole saatavilla"
 
-#: src/nano.c:684
+#: src/nano.c:686
 #, c-format
 msgid ""
 "\n"
 "Buffer written to %s\n"
 msgstr ""
 "\n"
-"Puskuri kirjoitettu tiedostoon ”%s”\n"
+"Puskuri kirjoitettu tiedostoon %s\n"
 
-#: src/nano.c:686
+#: src/nano.c:688
 #, c-format
 msgid ""
 "\n"
@@ -1521,14 +1528,14 @@ msgstr ""
 "\n"
 "Puskuria ei kirjoitettu tiedostoon %s: %s\n"
 
-#: src/nano.c:689
+#: src/nano.c:691
 #, c-format
 msgid ""
 "\n"
 "Buffer not written: %s\n"
 msgstr ""
 "\n"
-"Puskuria ei kirjoitettu tiedostoon: %s\n"
+"Puskuria ei kirjoitettu: %s\n"
 
 #: src/nano.c:714
 msgid "Window size is too small for nano...\n"
@@ -1546,7 +1553,7 @@ msgstr ""
 #: src/nano.c:810
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
-msgstr "Valitsin\t\tPitkä valitsin\t\tMerkitys\n"
+msgstr "Valitsin\tPitkä GNU-valitsin\tMerkitys\n"
 
 #: src/nano.c:812
 #, c-format
@@ -1561,16 +1568,16 @@ msgstr "+RIVI,SARAKE"
 #. * for the --help output.  Try to keep them at most 40 characters.
 #: src/nano.c:818
 msgid "Start at line LINE, column COLUMN"
-msgstr "Aloita rivillä RIVI, sarakkeessa SARAKE"
+msgstr "Aloita riviltä RIVI, sarakkeesta SARAKE"
 
 #: src/nano.c:820
 msgid "Enable smart home key"
-msgstr "Ota käyttöön älykäs kotinäppäin"
+msgstr "Ota käyttöön älykäs Home-näppäin"
 
 #  "tallennettaessa"?
 #: src/nano.c:822
 msgid "Save backups of existing files"
-msgstr "Tallenna olemassaolevien tiedostojen varmuuskopiot"
+msgstr "Tallenna varmuuskopiot olemassa olevista tiedostoista"
 
 #: src/nano.c:823
 msgid "-C <dir>"
@@ -1582,25 +1589,26 @@ msgstr "--backupdir=<hak>"
 
 #: src/nano.c:824
 msgid "Directory for saving unique backup files"
-msgstr "Hakemisto uniikkien varmuuskopitiedostojen tallentamiseen"
+msgstr "Hakemisto uniikkien varmuuskopiotiedostojen tallentamiseen"
 
 #: src/nano.c:827
 msgid "Use bold instead of reverse video text"
-msgstr "Käytä lihavoitua tekstiä käänteisen videotekstin sijasta"
+msgstr "Käytä tekstin lihavointia käänteisten värien sijaan"
 
 #: src/nano.c:829
 msgid "Convert typed tabs to spaces"
-msgstr "Muunna näppäillyt sarkainlyönnit välilyönneiksi"
+msgstr "Muunna näppäillyt sarkaimet välilyönneiksi"
 
 #: src/nano.c:834
 msgid "Read a file into a new buffer by default"
-msgstr "Lue oletuksena tiedosto uuteen puskuriin"
+msgstr "Lue tiedosto uuteen puskuriin oletusarvoisesti"
 
 #: src/nano.c:837
 msgid "Use (vim-style) lock files"
-msgstr "Käytä (vim-tyylisiä) lukitustiedostoja"
+msgstr "Käytä (vim-tyylisiä) lukkotiedostoja"
 
 #: src/nano.c:842
+#, fuzzy
 msgid "Log & read search/replace string history"
 msgstr "Muista viimeksi etsityt/korvatut merkkijonot"
 
@@ -1610,11 +1618,11 @@ msgstr "Älä käytä nanorc-tiedostoja"
 
 #: src/nano.c:849
 msgid "Fix numeric keypad key confusion problem"
-msgstr "Korjaa numeerisen näppäistön näppäinten sekaantumispulma"
+msgstr "Korjaa numeronäppäimistön sekaantumisongelma"
 
 #: src/nano.c:851
 msgid "Don't add newlines to the ends of files"
-msgstr "Älä lisää rivinvaihtoa tiedostojen loppuun"
+msgstr "Älä lisää rivinvaihtoja tiedostojen loppuun"
 
 #: src/nano.c:854
 msgid "Don't convert files from DOS/Mac format"
@@ -1625,20 +1633,21 @@ msgid "Use one more line for editing"
 msgstr "Käytä yhtä lisäriviä muokkaukseen"
 
 #: src/nano.c:860
+#, fuzzy
 msgid "Log & read location of cursor position"
 msgstr "Kirjaa lokiin ja lue kohdistinkoordinaatin sijainti"
 
 #: src/nano.c:863
 msgid "-Q <str>"
-msgstr "-Q <jono>"
+msgstr "-Q <mjono>"
 
 #: src/nano.c:863
 msgid "--quotestr=<str>"
-msgstr "--quotestr=<jono>"
+msgstr "--quotestr=<mjono>"
 
 #: src/nano.c:863
 msgid "Quoting string"
-msgstr "Lainauksen merkintä"
+msgstr "Lainausmerkkijono"
 
 #: src/nano.c:866
 msgid "Restricted mode"
@@ -1646,7 +1655,7 @@ msgstr "Rajoitettu tila"
 
 #: src/nano.c:868
 msgid "Scroll by line instead of half-screen"
-msgstr "Vieritä rivi kerrallaan puoliruudun sijasta"
+msgstr "Vieritä rivi kerrallaan puoliruudun sijaan"
 
 #: src/nano.c:870
 msgid "-T <#cols>"
@@ -1658,7 +1667,7 @@ msgstr "--tabsize=<#saraketta>"
 
 #: src/nano.c:871
 msgid "Set width of a tab to #cols columns"
-msgstr "Aseta sarkaimen leveys #cols -sarakkeeksi"
+msgstr "Aseta sarkaimen leveydeksi #cols saraketta"
 
 #: src/nano.c:873
 msgid "Do quick statusbar blanking"
@@ -1666,7 +1675,7 @@ msgstr "Tyhjennä tilarivi pikaisesti"
 
 #: src/nano.c:875
 msgid "Print version information and exit"
-msgstr "Tulosta versiotiedot ja lopeta"
+msgstr "Näytä versiotiedot ja lopeta"
 
 #: src/nano.c:878
 msgid "Detect word boundaries more accurately"
@@ -1674,11 +1683,11 @@ msgstr "Havaitse sanarajat tarkemmin"
 
 #: src/nano.c:882
 msgid "-Y <str>"
-msgstr "-Y <jono>"
+msgstr "-Y <mjono>"
 
 #: src/nano.c:882
 msgid "--syntax=<str>"
-msgstr "--syntax=<jono>"
+msgstr "--syntax=<mjono>"
 
 #: src/nano.c:883
 msgid "Syntax definition to use for coloring"
@@ -1690,12 +1699,11 @@ msgstr "Näytä kohdistimen sijainti jatkuvasti"
 
 #: src/nano.c:887
 msgid "Fix Backspace/Delete confusion problem"
-msgstr "Korjaa Backspace/Delete -näppäinten sekaantumispulma"
+msgstr "Korjaa Backspace/Delete-näppäinten sekaantumisongelma"
 
 #: src/nano.c:888
-#, fuzzy
 msgid "Show this help text and exit"
-msgstr "Näytä tämä ohjeteksti"
+msgstr "Näytä tämä ohjeteksti ja poistu"
 
 #: src/nano.c:890
 msgid "Automatically indent new lines"
@@ -1703,15 +1711,15 @@ msgstr "Sisennä uudet rivit automaattisesti"
 
 #: src/nano.c:891
 msgid "Cut from cursor to end of line"
-msgstr "Leikkaa rivin loppuun saakka"
+msgstr "Leikkaa kohdistimesta rivin loppuun"
 
 #: src/nano.c:894
 msgid "Enable the use of the mouse"
-msgstr "Käytä hiirtä"
+msgstr "Ota hiiri käyttöön"
 
 #: src/nano.c:896
 msgid "Do not read the file (only write it)"
-msgstr "Älä lue tiedostoa (vain kirjoita se)"
+msgstr "Älä lue tiedostoa (kirjoita pelkästään)"
 
 #: src/nano.c:898
 msgid "-o <dir>"
@@ -1731,7 +1739,7 @@ msgstr "Salli XON (^Q)- ja XOFF (^S) -näppäimet"
 
 #: src/nano.c:905
 msgid "Silently ignore startup issues like rc file errors"
-msgstr "Älä ilmoita käynnistyspulmista kuten rc-tiedoston virheistä"
+msgstr "Ohita hiljaisesti käynnistysongelmat kuten rc-tiedoston virheet"
 
 #: src/nano.c:908
 msgid "-r <#cols>"
@@ -1743,7 +1751,7 @@ msgstr "--fill=<#sarakkeet>"
 
 #: src/nano.c:909
 msgid "Set hard-wrapping point at column #cols"
-msgstr "Aseta kova rivitys sarakkeeseen #cols"
+msgstr "Aseta kova rivityskohta sarakkeeseen #cols"
 
 #: src/nano.c:913
 msgid "-s <prog>"
@@ -1755,7 +1763,7 @@ msgstr "--speller=<ohjelma>"
 
 #: src/nano.c:914
 msgid "Enable alternate speller"
-msgstr "Käytö vaihtoehtoista oikolukuohjelmaa"
+msgstr "Käytä vaihtoehtoista oikolukuohjelmaa"
 
 #: src/nano.c:916
 msgid "Auto save on exit, don't prompt"
@@ -1763,7 +1771,7 @@ msgstr "Tallenna tiedosto kysymättä poistuttaessa"
 
 #: src/nano.c:918
 msgid "Save a file by default in Unix format"
-msgstr ""
+msgstr "Tallenna tiedosto oletusarvoisesti Unix-muodossa"
 
 #: src/nano.c:920
 msgid "View mode (read-only)"
@@ -1775,216 +1783,240 @@ msgstr "Älä kovarivitä pitkiä rivejä"
 
 #: src/nano.c:924
 msgid "Don't show the two help lines"
-msgstr "Älä näytä kahta avusteriviä"
+msgstr "Älä näytä kahta ohjeriviä"
 
 #: src/nano.c:926
 msgid "Enable suspension"
-msgstr "Ota käyttöön keskeyttäminen"
+msgstr "Ota hyllytys käyttöön"
 
 #: src/nano.c:928
 msgid "Enable soft line wrapping"
 msgstr "Ota käyttöön pehmeä rivitys"
 
-#: src/nano.c:937
-#, c-format
-msgid " GNU nano, version %s\n"
+#: src/nano.c:940
+#, fuzzy, c-format
+msgid " nano, version %s\n"
 msgstr " GNU nano, versio %s\n"
 
-#: src/nano.c:940
+#: src/nano.c:943
+#, c-format
+msgid " (C) 2014..%s the contributors to nano\n"
+msgstr ""
+
+#: src/nano.c:945
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr " Sähköposti: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 
-#: src/nano.c:941
+#: src/nano.c:946
 #, c-format
 msgid ""
 "\n"
 " Compiled options:"
 msgstr ""
 "\n"
-" Mukaan käännetyt valitsimet:"
+" Käännetty valitsimilla:"
 
-#: src/nano.c:1073
+#: src/nano.c:1081
 msgid "No file name"
 msgstr "Ei tiedostonimeä"
 
-#: src/nano.c:1108
-msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
-msgstr "Tallenna muutettu teksti (Muutokset häviävät, jos vastaat ”ei”) ? "
+#: src/nano.c:1115
+msgid "Save modified buffer?  (Answering \"No\" will DISCARD changes.) "
+msgstr ""
 
-#: src/nano.c:1168
+#: src/nano.c:1178
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
-msgstr "Vakiosyötteen avaaminen uudelleen näppäimistöstä epäonnistui\n"
+msgstr ""
+"Valitettavasti näppäimistön avaaminen uudelleen vakiosyötteeksi epäonnistui\n"
 
-#: src/nano.c:1192
+#: src/nano.c:1202
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
-msgstr "Luetaan vakiosyötteestä, ^C lopettaa toiminnon\n"
+msgstr "Luetaan vakiosyötteestä, ^C keskeyttää\n"
 
-#: src/nano.c:1256
+#: src/nano.c:1266
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Vastaanotettiin SIGHUP tai SIGTERM\n"
 
-#: src/nano.c:1272
+#: src/nano.c:1282
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Palaa nanoon komennolla ”fg”.\n"
 
-#: src/nano.c:1294
+#: src/nano.c:1304
 msgid "Suspension is not enabled"
-msgstr ""
+msgstr "Hyllytys ei ole käytössä"
 
-#: src/nano.c:1448
+#: src/nano.c:1459
 msgid "enabled"
 msgstr "käytössä"
 
-#: src/nano.c:1448
+#: src/nano.c:1459
 msgid "disabled"
 msgstr "ei käytössä"
 
-#: src/nano.c:1607 src/winio.c:1125
-msgid "Unknown Command"
-msgstr "Tuntematon komento"
+#: src/nano.c:1573
+msgid "Unbound key"
+msgstr ""
+
+#: src/nano.c:1577
+#, c-format
+msgid "Unbound key: M-%c"
+msgstr ""
+
+#: src/nano.c:1579
+#, c-format
+msgid "Unbound key: ^%c"
+msgstr ""
+
+#: src/nano.c:1581
+#, c-format
+msgid "Unbound key: %c"
+msgstr ""
 
-#: src/nano.c:1720
+#: src/nano.c:1745
 msgid "XON ignored, mumble mumble"
-msgstr "XON:ia ei käytetä, mutinaa"
+msgstr "XON ohitetaan, mutinaa"
 
-#: src/nano.c:1725
+#: src/nano.c:1750
 msgid "XOFF ignored, mumble mumble"
-msgstr "XOFF:ia ei käytetä, mutinaa"
+msgstr "XOFF ohitetaan, mutinaa"
 
 #  puuttuu tai liian iso tai liian pieni
-#: src/nano.c:2139 src/rcfile.c:1334
+#: src/nano.c:2166 src/rcfile.c:1187
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
-msgstr "Haluttu sarkaimen koko ”%s” ei kelpaa"
+msgstr "Pyydetty sarkaimen koko ”%s” ei kelpaa"
 
 #  puuttuu tai liian iso tai liian pieni
-#: src/nano.c:2200 src/rcfile.c:1259
+#: src/nano.c:2227 src/rcfile.c:1128
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
-msgstr "Haluttu täydennyspituus ”%s” ei kelpaa"
+msgstr "Pyydetty täyttöpituus ”%s” ei kelpaa"
 
-#: src/nano.c:2247
+#: src/nano.c:2276
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
-msgstr "Hae käytettävissä olevat valitsimet kirjoittamalla ’%s -h’.\n"
+msgstr "Komento ”%s -h” näyttää käytettävissä olevat valitsimet.\n"
 
 #. TRANSLATORS: For the next three strings, if possible, specify
 #. * the single-byte shortcuts for both your language and English.
 #. * For example, in French: "OoYy" for "Oui".
-#: src/prompt.c:821
+#: src/prompt.c:818
 msgid "Yy"
 msgstr "KkYy"
 
-#: src/prompt.c:822
+#: src/prompt.c:819
 msgid "Nn"
 msgstr "EeNn"
 
-#: src/prompt.c:823
+#: src/prompt.c:820
 msgid "Aa"
 msgstr "aA"
 
-#: src/prompt.c:845
+#: src/prompt.c:842
 msgid "Yes"
 msgstr "Kyllä"
 
-#: src/prompt.c:850
+#: src/prompt.c:847
 msgid "All"
 msgstr "Kaikki"
 
-#: src/prompt.c:855
+#: src/prompt.c:852
 msgid "No"
 msgstr "Ei"
 
-#: src/rcfile.c:142
+#: src/rcfile.c:144
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Virhe tiedostossa %s rivillä %lu: "
 
-#: src/rcfile.c:201
+#: src/rcfile.c:203
 #, c-format
 msgid "Argument '%s' has an unterminated \""
-msgstr "parametri ’%s’ sisältää parittoman ”-merkin"
+msgstr "Argumentti ”%s” sisältää parittoman \"-merkin"
 
-#: src/rcfile.c:228 src/rcfile.c:280 src/rcfile.c:732 src/rcfile.c:793
-#: src/rcfile.c:882 src/rcfile.c:933
+#: src/rcfile.c:231 src/rcfile.c:674 src/rcfile.c:725 src/rcfile.c:824
 msgid "Regex strings must begin and end with a \" character"
-msgstr "Säännöllisten lausekkeiden on alettava ja loputtava ”-merkillä"
+msgstr "Säännöllisten lausekkeiden on alettava ja loputtava \"-merkillä"
 
-#: src/rcfile.c:254 src/search.c:62
+#: src/rcfile.c:257 src/search.c:61
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Säännöllinen lauseke ”%s” ei kelpaa: %s"
 
-#: src/rcfile.c:274
+#: src/rcfile.c:279
 msgid "Missing syntax name"
 msgstr "Puuttuva syntaksin nimi"
 
-#: src/rcfile.c:345
+#: src/rcfile.c:288
+msgid "A syntax name must be quoted"
+msgstr ""
+
+#: src/rcfile.c:297
 msgid "The \"none\" syntax is reserved"
-msgstr "Syntaksi ”none” on varattu"
+msgstr "”none”-syntaksi on varattu"
 
-#: src/rcfile.c:352
-msgid "The \"default\" syntax must take no extensions"
-msgstr "Syntaksi ”default” ei saa ottaa laajennuksia"
+#: src/rcfile.c:327
+#, fuzzy
+msgid "The \"default\" syntax does not accept extensions"
+msgstr "”default”-syntaksi ei saa ottaa laajennoksia"
 
-#: src/rcfile.c:424
+#: src/rcfile.c:369
 msgid "Missing key name"
-msgstr "Puuttuva näppäinnimi"
+msgstr "Puuttuva näppäimen nimi"
 
-#: src/rcfile.c:433 src/rcfile.c:444
+#: src/rcfile.c:378 src/rcfile.c:389
 msgid "Key name is too short"
-msgstr "Näppäinnimi on liian lyhyt"
+msgstr "Näppäimen nimi on liian lyhyt"
 
-#: src/rcfile.c:454
+#: src/rcfile.c:399
 msgid "Key name must begin with \"^\", \"M\", or \"F\""
-msgstr "Näppäinnimien on alettava merkeillä ”^”, ”M”, tai ”F”"
+msgstr "Näppäinten nimien on alettava merkillä ”^”, ”M” tai ”F”"
 
 #  puuttuu tai liian iso tai liian pieni
-#: src/rcfile.c:457
-#, fuzzy, c-format
+#: src/rcfile.c:402
+#, c-format
 msgid "Key name %s is invalid"
-msgstr "Haluttu sarkaimen koko ”%s” ei kelpaa"
+msgstr "Näppäimen nimi %s ei kelpaa"
 
-#: src/rcfile.c:466
+#: src/rcfile.c:411
 msgid "Must specify a function to bind the key to"
-msgstr "On määriteltävä funktionäppäin, johon näppäin sidotaan"
+msgstr "On määriteltävä toiminto, johon näppäin sidotaan"
 
 #. TRANSLATORS: Do not translate the word "all".
-#: src/rcfile.c:476
+#: src/rcfile.c:421
 msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
-"On määriteltävä valikko (tai ”all”), johon näppäin sidotaan/josta näppäin "
-"irrotetaan"
+"On määriteltävä valikko (tai ”all”), johon/josta näppäin sidotaan/irrotetaan"
 
-#: src/rcfile.c:483
+#: src/rcfile.c:428
 #, c-format
 msgid "Cannot map name \"%s\" to a function"
-msgstr "Nimen ”%s” kartoittaminen funktioon epäonnistui"
+msgstr "Nimen ”%s” kytkeminen toimintoon ei onnistu"
 
-#: src/rcfile.c:490
+#: src/rcfile.c:435
 #, c-format
 msgid "Cannot map name \"%s\" to a menu"
-msgstr "Nimen ”%s” kartoittaminen valikkoon epäonnistui"
+msgstr "Nimen ”%s” kytkeminen valikkoon ei onnistu"
 
-#: src/rcfile.c:522
+#: src/rcfile.c:467
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
-msgstr "Funktiota ’%s’ ei ole valikossa ’%s’"
+msgstr "Valikossa ”%2$s” ei ole toimintoa”%1$s”"
 
-#: src/rcfile.c:534
+#: src/rcfile.c:479
 #, c-format
 msgid "Sorry, keystroke \"%s\" may not be rebound"
-msgstr "Valitettavasti näppäinmerkkijonossa ”%s” on väärä sidonta"
+msgstr "Valitettavasti näppäilyä ”%s” ei voi uudelleensitoa"
 
-#: src/rcfile.c:631
+#: src/rcfile.c:576
 #, c-format
 msgid "Error expanding %s: %s"
-msgstr "Virhe laajennettaessa kohdetta %s: %s"
+msgstr "Virhe lavennettaessa valitsinta %s: %s"
 
-#: src/rcfile.c:674
+#: src/rcfile.c:616
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1994,476 +2026,573 @@ msgid ""
 "for foreground colors."
 msgstr ""
 "Tuntematon väri ”%s”.\n"
-"Nano tuntee värit ”green”, ”red”, ”blue”,\n"
+"Kelvolliset värit ovat ”green”, ”red”, ”blue”,\n"
 "”white”, ”yellow”, ”cyan”, ”magenta” ja\n"
-"”black”, ja alussa voi olla ”bright”\n"
-"edustaväreinä."
+"”black”, joiden alussa voi edustaväreille\n"
+"olla määre ”bright”."
 
-#: src/rcfile.c:696
-msgid "Cannot add a color command without a syntax command"
-msgstr "En voi lisätä värikomentoa ilman syntaksikomentoa"
+#: src/rcfile.c:637 src/rcfile.c:795 src/rcfile.c:858
+#, c-format
+msgid "A '%s' command requires a preceding 'syntax' command"
+msgstr ""
 
-#: src/rcfile.c:701
+#: src/rcfile.c:643
 msgid "Missing color name"
 msgstr "Puuttuva värin nimi"
 
-#: src/rcfile.c:711 src/rcfile.c:872
-msgid "Missing regex string"
-msgstr "Puuttuva säännöllinen lausekemerkkijono"
+#: src/rcfile.c:653 src/rcfile.c:807
+#, fuzzy, c-format
+msgid "Missing regex string after '%s' command"
+msgstr "Puuttuva esikatselukomento"
 
-#: src/rcfile.c:787
+#: src/rcfile.c:719
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "”start=” vaatii vastaavan ”end=”:n"
 
-#: src/rcfile.c:839
+#: src/rcfile.c:768
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
-msgstr "Taustaväri ”%s” ei voi olla ”bright”"
-
-#: src/rcfile.c:867
-msgid "Cannot add a header regex without a syntax command"
-msgstr "En voi lisätä säännöllistä otsakelauseketta ilman syntaksikomentoa"
+msgstr "Taustaväri ”%s” ei voi olla kirkas"
 
-#: src/rcfile.c:922
-msgid "Cannot add a magic string regex without a syntax command"
-msgstr ""
-"En voi lisätä maagista säännöllistä otsakelauseketta ilman syntaksikomentoa"
-
-#: src/rcfile.c:927
-msgid "Missing magic string name"
-msgstr "Puuttuva maaginen säännöllinen lausekemerkkijono"
-
-#: src/rcfile.c:985
-msgid "Cannot add a linter without a syntax command"
-msgstr "En voi lisätä esikatselua ilman syntaksikomentoa"
+#: src/rcfile.c:802
+#, fuzzy, c-format
+msgid "The \"default\" syntax does not accept '%s' regexes"
+msgstr "”default”-syntaksi ei saa ottaa laajennoksia"
 
-#: src/rcfile.c:990
-msgid "Missing linter command"
+#: src/rcfile.c:863
+#, fuzzy, c-format
+msgid "Missing command after '%s'"
 msgstr "Puuttuva esikatselukomento"
 
-#: src/rcfile.c:1011
-msgid "Cannot add formatter without a syntax command"
-msgstr "En voi lisätä muotoilijaa ilman syntaksikomentoa"
-
-#: src/rcfile.c:1016
-msgid "Missing formatter command"
-msgstr "Puuttuva muotoilijakomento"
+#: src/rcfile.c:879
+#, fuzzy, c-format
+msgid "Argument of '%s' lacks closing \""
+msgstr "Argumentti ”%s” sisältää parittoman \"-merkin"
 
-#: src/rcfile.c:1046
+#: src/rcfile.c:910
 #, c-format
 msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
-msgstr ""
-"Vakava virhe: funktioon ”%s” ei ole kartoitettu näppäimiä. Poistutaan.\n"
+msgstr "Vakava virhe: toimintoon ”%s” ei ole kytketty näppäimiä. Poistutaan.\n"
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:912
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
-"Tarvittaessa käytä nano-ohjelmaa ”-I”-valitsimella, jos nanorc-asetuksia "
-"täytyy säätää.\n"
+"Käytä tarvittaessa nanoa valitsimella -I nanorc:n asetusten säätämiseksi.\n"
 
-#: src/rcfile.c:1109
-#, c-format
+#: src/rcfile.c:971
+#, fuzzy, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "Laajennettavan syntaksin ”%s” löytäminen epäonnistui"
 
-#: src/rcfile.c:1125 src/rcfile.c:1134 src/rcfile.c:1144
-#, c-format
-msgid "Command \"%s\" not allowed in included file"
-msgstr "Komentoa ”%s” ei sallita sisällytetyssä tiedostossa"
-
-#: src/rcfile.c:1150 src/rcfile.c:1359
+#: src/rcfile.c:993 src/rcfile.c:1202
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Syntaksissa ”%s” ei ole värikomentoja"
 
-#: src/rcfile.c:1180
+#: src/rcfile.c:1024
+#, c-format
+msgid "Command \"%s\" not allowed in included file"
+msgstr "Komentoa ”%s” ei sallita sisällytetyssä tiedostossa"
+
+#: src/rcfile.c:1039
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Komentoa ”%s” ei ymmärretty"
 
-#: src/rcfile.c:1195
+#: src/rcfile.c:1051
 msgid "Missing option"
 msgstr "Puuttuva valitsin"
 
-#: src/rcfile.c:1217
+#: src/rcfile.c:1065
+#, c-format
+msgid "Unknown option \"%s\""
+msgstr "Tuntematon valitsin ”%s”"
+
+#: src/rcfile.c:1077
+#, c-format
+msgid "Cannot unset option \"%s\""
+msgstr "Valitsinta ”%s” ei voi kumota"
+
+#: src/rcfile.c:1089
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Valitsin ”%s” vaatii argumentin"
 
-#: src/rcfile.c:1235
+#: src/rcfile.c:1105
 msgid "Option is not a valid multibyte string"
-msgstr "Valitsin ei ole monitavuinen merkkijono"
+msgstr "Valitsin ei ole kelvollinen monitavumerkkijono"
 
-#: src/rcfile.c:1272 src/rcfile.c:1300 src/rcfile.c:1309
+#: src/rcfile.c:1139 src/rcfile.c:1160 src/rcfile.c:1167
+#, fuzzy
 msgid "Non-blank characters required"
 msgstr "Ei-tyhjemerkkejä vaadittu"
 
-#: src/rcfile.c:1282
+#: src/rcfile.c:1146
 msgid "Two single-column characters required"
-msgstr "Kaksi yksisarakkeista merkkiä vaadittu"
-
-#: src/rcfile.c:1348
-#, c-format
-msgid "Cannot unset option \"%s\""
-msgstr "En voi poistaa valitsinta ”%s”"
+msgstr "Kaksi yksisarakkeista merkkiä vaaditaan"
 
-#: src/rcfile.c:1354
-#, c-format
-msgid "Unknown option \"%s\""
-msgstr "Tuntematon valitsin ”%s”"
-
-#: src/rcfile.c:1413
+#: src/rcfile.c:1258
 msgid "I can't find my home directory!  Wah!"
-msgstr "Kotihakemistoa ei löydy! Vää!"
+msgstr "Kotihakemisto on hukassa! Vää!"
 
-#: src/rcfile.c:1451
+#: src/rcfile.c:1295
 #, c-format
 msgid ""
 "\n"
 "Press Enter to continue starting nano.\n"
 msgstr ""
 "\n"
-"Paina enteriä jatkaaksesi nanon käynnistämistä.\n"
+"Paina Enteriä jatkaaksesi nanon käynnistämistä.\n"
 
-#: src/search.c:96
+#: src/search.c:95
 #, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "”%.*s%s” ei löytynyt"
 
 #. TRANSLATORS: The next three strings are modifiers of the search prompt.
-#: src/search.c:176
+#: src/search.c:169
 msgid " [Case Sensitive]"
-msgstr " [Kirj. koko]"
+msgstr " [Kirj.koko]"
 
-#: src/search.c:180
+#: src/search.c:173
 msgid " [Regexp]"
 msgstr " [Säännöke]"
 
-#: src/search.c:184
+#: src/search.c:177
 msgid " [Backwards]"
 msgstr " [Taaksepäin]"
 
+# "Hae"+tämä
 #. TRANSLATORS: The next two strings are modifiers of the search prompt.
-#: src/search.c:189
+#: src/search.c:182
 msgid " (to replace) in selection"
-msgstr " (korvattava) valinnassa"
+msgstr "ttava valinnassa"
 
-#: src/search.c:191
+# "Hae"+tämä
+#: src/search.c:184
 msgid " (to replace)"
-msgstr " (korvattava)"
+msgstr "ttava"
+
+#: src/search.c:305
+#, fuzzy
+msgid "Searching..."
+msgstr "Hae"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:718
+#: src/search.c:693
 msgid "Replace this instance?"
-msgstr "Korvataanko tämä kohta?"
+msgstr "Korvataanko tämä esiintymä?"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:883
+#: src/search.c:840
 msgid "Replace with"
-msgstr "Korvaa merkkijonolla"
+msgstr "Korvaava"
 
 # Pitäisiköhän olla passiivi?
-#: src/search.c:924
+#: src/search.c:875
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
-msgstr[0] "Korvattu %lu kohta"
-msgstr[1] "Korvattu %lu kohtaa"
+msgstr[0] "Korvattiin %lu kohta"
+msgstr[1] "Korvattiin %lu kohtaa"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:964
+#: src/search.c:914
 msgid "Enter line number, column number"
-msgstr "Kirjoita rivin numero, sarakkeen numero"
+msgstr "Anna rivin numero, sarakkeen numero"
 
-#: src/search.c:991
+#: src/search.c:939
 msgid "Invalid line or column number"
 msgstr "Virheellinen rivi- tai sarakenumero"
 
 #  versiossa 1.1.99pre2 hakee merkkejä "([{<>}])"
-#: src/search.c:1124
+#: src/search.c:1080
 msgid "Not a bracket"
-msgstr "Ei ole suljemerkki"
+msgstr "Ei ole sulje"
 
-#: src/search.c:1191
+#: src/search.c:1146
 msgid "No matching bracket"
 msgstr "Ei vastaavaa suljetta"
 
-#: src/text.c:54
+#: src/text.c:53
+#, fuzzy
 msgid "Mark Set"
 msgstr "Merkintä alkoi"
 
-#: src/text.c:58
+#: src/text.c:57
+#, fuzzy
 msgid "Mark Unset"
 msgstr "Merkintä loppui"
 
-#: src/text.c:70
-#, c-format
+#: src/text.c:69
+#, fuzzy, c-format
 msgid "Error invoking \"%s\""
 msgstr "Virhe kutsuttaessa kohdetta ”%s”"
 
-#: src/text.c:475
-msgid "Nothing in undo buffer!"
-msgstr "Peruutuspuskurissa ei ole mitään!"
+#: src/text.c:468
+msgid "Commenting is not supported for this file type"
+msgstr ""
 
-#: src/text.c:481 src/text.c:634
-#, c-format
-msgid "Internal error: can't match line %d.  Please save your work."
-msgstr "Sisäinen virhe: vastaavaa riviä %d ei löydy. Tallenna työsi."
+#: src/text.c:484
+msgid "Cannot comment past end of file"
+msgstr ""
+
+#: src/text.c:677
+msgid "Nothing in undo buffer!"
+msgstr "Kumouspuskurissa ei ole mitään!"
 
 #. TRANSLATORS: Eight of the next nine strings describe actions
 #. * that are undone or redone.  It are all nouns, not verbs.
-#: src/text.c:495 src/text.c:524 src/text.c:645 src/text.c:686
+#: src/text.c:695 src/text.c:724 src/text.c:857 src/text.c:898
 msgid "text add"
-msgstr "teksti lisää"
+msgstr "tekstin lisäys"
 
-#: src/text.c:505 src/text.c:656
+#: src/text.c:705 src/text.c:868
 msgid "text delete"
-msgstr "teksti poista"
+msgstr "tekstin poisto"
 
-#: src/text.c:528 src/text.c:694
+#: src/text.c:728 src/text.c:907
 msgid "line join"
-msgstr "rivin liittäminen"
+msgstr "rivin liitos"
 
-#: src/text.c:547 src/text.c:710
+#: src/text.c:747 src/text.c:923
 msgid "text cut"
-msgstr "tekstileikkaus"
+msgstr "tekstin leikkaus"
 
-#: src/text.c:552 src/text.c:714
+#: src/text.c:752 src/text.c:927
 msgid "text uncut"
-msgstr "testin leikkauksen peruutus"
+msgstr "tekstin epäleikkaus"
 
-#: src/text.c:558 src/text.c:691
-#, fuzzy
+#: src/text.c:758 src/text.c:903
 msgid "Internal error: line is missing.  Please save your work."
-msgstr "Sisäinen virhe: Uudelleenteon asetukset epäonnistuivat. Tallenna työsi"
+msgstr "Sisäinen virhe: rivi puuttuu.  Tallenna työsi."
 
-#: src/text.c:561 src/text.c:665
+#: src/text.c:762 src/text.c:877
 msgid "line break"
-msgstr "rivin katkaiseminen"
+msgstr "rivin katkaisu"
 
-#: src/text.c:569 src/text.c:725
+#: src/text.c:772 src/text.c:947
+msgid "comment"
+msgstr ""
+
+#: src/text.c:776 src/text.c:951
+msgid "uncomment"
+msgstr ""
+
+#: src/text.c:780 src/text.c:938
 msgid "text insert"
-msgstr "teksti lisää"
+msgstr "tekstin sijoitus"
 
-#: src/text.c:589 src/text.c:718
+#: src/text.c:800 src/text.c:931
 msgid "text replace"
-msgstr "teksti korvaa"
+msgstr "tekstin korvaus"
 
-#: src/text.c:596 src/text.c:732 src/text.c:1030 src/text.c:1174
+#: src/text.c:807 src/text.c:955 src/text.c:1267 src/text.c:1437
 msgid "Internal error: unknown type.  Please save your work."
 msgstr "Sisäinen virhe: tuntematon tyyppi. Tallenna työsi."
 
-#: src/text.c:601
+#: src/text.c:813
 #, c-format
 msgid "Undid action (%s)"
-msgstr "Peruttu toiminto (%s)"
+msgstr "Kumottiin toiminto (%s)"
 
-#: src/text.c:619
+#: src/text.c:832
 msgid "Nothing to re-do!"
-msgstr "Ei mitään tehtävää!"
+msgstr "Ei mitään tehtäväksi uudelleen!"
 
-#: src/text.c:628
+#: src/text.c:841
 msgid "Internal error: cannot set up redo.  Please save your work."
-msgstr "Sisäinen virhe: komennon redo asettaminen epäonnistui. Tallenna työsi."
+msgstr ""
+"Sisäinen virhe: redo-toiminnon käyttöönotto epäonnistui. Tallenna työsi."
 
-#: src/text.c:737
+#: src/text.c:961
 #, c-format
 msgid "Redid action (%s)"
-msgstr "Toiminto tehtiin uudelleen (%s)"
+msgstr "Tehtiin toiminto uudelleen (%s)"
 
-#: src/text.c:827 src/text.c:2508 src/text.c:2944
+#: src/text.c:1051 src/text.c:2765 src/text.c:3198
 msgid "Could not create pipe"
 msgstr "Putken luominen epäonnistui"
 
-#: src/text.c:853 src/text.c:2595 src/text.c:2750 src/text.c:2992
-#: src/text.c:3286
+#: src/text.c:1077 src/text.c:2852 src/text.c:3005 src/text.c:3246
+#: src/text.c:3540
 msgid "Could not fork"
-msgstr "Lapsiprosessi epäonnistui"
+msgstr "Haarauttaminen epäonnistui"
 
-#: src/text.c:1853
-#, c-format
+#: src/text.c:2117
+#, fuzzy, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Lainausmerkintä %s ei kelpaa: %s"
 
-#: src/text.c:2241
+#: src/text.c:2499
 msgid "Can now UnJustify!"
-msgstr "Tasaamisen voi perua nyt."
+msgstr "Epätasaaminen onnistuu nyt!"
 
-#: src/text.c:2435
+#: src/text.c:2697
 msgid "Edit a replacement"
 msgstr "Muokkaa korvausta"
 
-#: src/text.c:2510
+#. TRANSLATORS: Shown after fixing misspellings in one word.
+#: src/text.c:2713
+#, fuzzy
+msgid "Next word..."
+msgstr "Seur. sana"
+
+#: src/text.c:2767
 msgid "Creating misspelled word list, please wait..."
-msgstr "Luodaan väärin kirjoitettujen sanojen lista, ole hyvä ja odota..."
+msgstr "Luodaan väärin kirjoitettujen sanojen lista, odota..."
 
-#: src/text.c:2601 src/text.c:2999
+#: src/text.c:2858 src/text.c:3253
 msgid "Could not get size of pipe buffer"
 msgstr "Putken puskurin kokoa ei saatu selville"
 
-#: src/text.c:2652
+#: src/text.c:2907
 msgid "Error invoking \"spell\""
-msgstr "Virhe komennon ”spell” aikana"
+msgstr "Virhe ”spell”-komennon käynnistyksessä"
 
-#: src/text.c:2655
+#: src/text.c:2910
 msgid "Error invoking \"sort -f\""
-msgstr "Virhe komennon ”sort -f” aikana"
+msgstr "Virhe ”sort -f” -komennon käynnistyksessä"
 
-#: src/text.c:2658
+#: src/text.c:2913
 msgid "Error invoking \"uniq\""
-msgstr "Virhe komennon ”uniq” aikana"
+msgstr "Virhe ”uniq”-komennon käynnistyksessä"
 
-#: src/text.c:2881
+#: src/text.c:3135
 msgid "Invoking spell checker, please wait"
-msgstr "Käynnistä oikoluin, odota hetki"
+msgstr "Käynnistetään oikoluin, odota"
 
-#: src/text.c:2897
+#: src/text.c:3151
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Oikoluku epäonnistui: %s"
 
-#: src/text.c:2899
+#: src/text.c:3153
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Oikoluku epäonnistui: %s: %s"
 
-#: src/text.c:2902
+#: src/text.c:3156
 msgid "Finished checking spelling"
 msgstr "Oikoluku on valmis"
 
-#: src/text.c:2927
+#: src/text.c:3181
+#, fuzzy
 msgid "No linter defined for this type of file!"
 msgstr "Esikatselua ei ole määritelty tämäntyyppiselle tiedostolle"
 
-#: src/text.c:2932
+#: src/text.c:3186
+#, fuzzy
 msgid "Save modified buffer before linting?"
 msgstr "Tallennetaanko muokattu puskuri ennen esikatselua?"
 
-#: src/text.c:2949
+#: src/text.c:3203
+#, fuzzy
 msgid "Invoking linter, please wait"
 msgstr "Kutsutaan esikastelua, odota vähän"
 
-#: src/text.c:3105
+#: src/text.c:3358
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
-msgstr "Saatiin 0 jäsenneltäviltä riveiltä komennosta: %s"
+msgstr "Saatiin 0 jäsennettävissä olevaa riviä komennolta: %s"
 
-#: src/text.c:3134
+#: src/text.c:3388
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
 "Tämä viesti on avamaattomalle tiedostolle %s, avataanko se uudessa "
 "puskurissa?"
 
-#: src/text.c:3153
+#: src/text.c:3407
 msgid "No more errors in unopened files, cancelling"
-msgstr ""
+msgstr "Ei enempää virheitä avaamattomissa tiedostoissa, perutaan"
 
-#: src/text.c:3192
+#: src/text.c:3446
 msgid "At last message"
 msgstr "Viimeisessä viestissä"
 
-#: src/text.c:3197
+#: src/text.c:3451
 msgid "At first message"
 msgstr "Ensimmäisessä viestissä"
 
-#: src/text.c:3237
+#: src/text.c:3491
 msgid "Finished"
 msgstr "Valmis"
 
-#: src/text.c:3259
+#: src/text.c:3513
 msgid "Invoking formatter, please wait"
-msgstr "Kutsutaan muotoilijaa, odota vähän"
+msgstr "Kutsutaan muotoilinta, odota"
 
-#: src/text.c:3314
+#: src/text.c:3568
 msgid "Finished formatting"
-msgstr "Lopetettiin muotoilu"
+msgstr "Päätettiin muotoilu"
 
-#: src/text.c:3396
+#: src/text.c:3650
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
-msgstr "%sSanoja: %lu  riviä: %ld  merkkiä: %lu"
+msgstr "%sSanat: %lu  Rivit: %ld  Merkit: %lu"
 
-#: src/text.c:3397
+#: src/text.c:3651
 msgid "In Selection:  "
 msgstr "Valinnassa:    "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3411
+#: src/text.c:3665
 msgid "Verbatim Input"
 msgstr "Merkintarkka syöte"
 
-#: src/utils.c:391 src/utils.c:403
+#: src/utils.c:392 src/utils.c:404
 msgid "nano is out of memory!"
-msgstr "Nanolta loppui muisti!"
+msgstr "nanolta loppui muisti!"
+
+#: src/utils.c:625
+#, fuzzy, c-format
+msgid "Internal error: can't match line %d.  Please save your work."
+msgstr "Sisäinen virhe: vastaavaa riviä %d ei löydy. Tallenna työsi."
+
+#. TRANSLATORS: This refers to a sequence of escape codes
+#. * (from the keyboard) that nano does not know about.
+#: src/winio.c:1121
+msgid "Unknown sequence"
+msgstr ""
 
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
 #: src/winio.c:1427
 msgid "Unicode Input"
-msgstr "Unikoodisyöte"
-
-#: src/winio.c:1991 src/winio.c:1995
-msgid "Modified"
-msgstr "Muokattu"
-
-#: src/winio.c:1992
-msgid "View"
-msgstr "Näkymä"
+msgstr "Unicode-syöte"
 
-#: src/winio.c:2006
+#: src/winio.c:1960
 msgid "DIR:"
 msgstr "HAKEMISTO:"
 
-#: src/winio.c:2013
+#: src/winio.c:1968
 msgid "File:"
 msgstr "Tiedosto:"
 
-#: src/winio.c:3141
+#: src/winio.c:1972 src/winio.c:1976
+msgid "Modified"
+msgstr "Muokattu"
+
+#: src/winio.c:1974
+msgid "View"
+msgstr "Näkymä"
+
+#: src/winio.c:3105
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
-msgstr "rivi %ld/%ld (%d%%), sarake %lu/%lu (%d%%), merkki %lu/%lu (%d%%)"
+msgstr "rivi %ld/%ld (%d %%), sarake %lu/%lu (%d %%), merkki %lu/%lu (%d %%)"
 
-#: src/winio.c:3271
+#: src/winio.c:3235
 msgid "The nano text editor"
-msgstr "Nano-editori"
+msgstr "Nano-tekstieditori"
 
-#: src/winio.c:3272
+#: src/winio.c:3236
 msgid "version"
 msgstr "versio"
 
-#: src/winio.c:3273
+#: src/winio.c:3237
 msgid "Brought to you by:"
 msgstr "Tehneet:"
 
-#: src/winio.c:3274
+#: src/winio.c:3238
 msgid "Special thanks to:"
-msgstr "Erikoiskiitokset:"
+msgstr "Erityiset kiitokset:"
 
-#: src/winio.c:3275
+#: src/winio.c:3239
 msgid "The Free Software Foundation"
-msgstr "Free Software Foundation"
+msgstr "Free Software Foundationille"
 
-#: src/winio.c:3276
+#: src/winio.c:3240
 msgid "the many translators and the TP"
-msgstr "monta kielenkääntäjää ja Translationproject"
+msgstr "monille kielenkääntäjille ja Translation Projectille"
 
 #  Special thanks to: (nimiä) For ncurses: (nimiä)
-#: src/winio.c:3277
+#: src/winio.c:3241
 msgid "For ncurses:"
 msgstr "Ncursesista:"
 
-#: src/winio.c:3278
+#: src/winio.c:3242
 msgid "and anyone else we forgot..."
 msgstr "ja kaikille muille, jotka unohdimme..."
 
-#: src/winio.c:3279
+#: src/winio.c:3243
 msgid "Thank you for using nano!"
 msgstr "Kiitos nanon käyttämisestä!"
 
+#~ msgid ""
+#~ "Read %lu line (Converted from DOS and Mac format - Warning: No write "
+#~ "permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from DOS and Mac format - Warning: No write "
+#~ "permission)"
+#~ msgstr[0] ""
+#~ "Luettu %lu rivi (Muunnettu Mac-muodosta - Varoitus: Ei kirjoitusoikeutta)"
+#~ msgstr[1] ""
+#~ "Luettu %lu riviä (Muunnettu Mac-muodosta - Varoitus: Ei kirjoitusoikeutta)"
+
+#~ msgid ""
+#~ "Read %lu line (Converted from Mac format - Warning: No write permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from Mac format - Warning: No write permission)"
+#~ msgstr[0] ""
+#~ "Luettu %lu rivi (Muunnettu Mac-muodosta - Varoitus: Ei kirjoitusoikeutta)"
+#~ msgstr[1] ""
+#~ "Luettu %lu riviä (Muunnettu Mac-muodosta - Varoitus: Ei kirjoitusoikeutta)"
+
+#~ msgid ""
+#~ "Read %lu line (Converted from DOS format - Warning: No write permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from DOS format - Warning: No write permission)"
+#~ msgstr[0] ""
+#~ "Luettu %lu rivi Muunnettu DOS-muodosta - Varoitus: Ei kirjoitusoikeutta)"
+#~ msgstr[1] ""
+#~ "Luettu %lu riviä (Muunnettu DOS-muodosta - Varoitus: Ei kirjoitusoikeutta)"
+
+#~ msgid "Read %lu line (Warning: No write permission)"
+#~ msgid_plural "Read %lu lines (Warning: No write permission)"
+#~ msgstr[0] "Luettu %lu rivi (Varoitus: Ei kirjoitusoikeutta)"
+#~ msgstr[1] "Luettu %lu riviä (Varoitus: Ei kirjoitusoikeutta)"
+
+#~ msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
+#~ msgstr "Tallennetaanko muutettu puskuri (VASTAUS ”Ei” HÄVITTÄÄ MUUTOKSET)? "
+
+#~ msgid "Unknown Command"
+#~ msgstr "Tuntematon komento"
+
+#~ msgid "Cannot add a color command without a syntax command"
+#~ msgstr "Värikomentoa ei voi lisätä ilman syntaksikomentoa"
+
+#~ msgid "Missing regex string"
+#~ msgstr "Puuttuva säännöllinen lauseke"
+
+#, fuzzy
+#~ msgid "Cannot add a header regex without a syntax command"
+#~ msgstr "En voi lisätä säännöllistä otsakelauseketta ilman syntaksikomentoa"
+
+#, fuzzy
+#~ msgid "Cannot add a magic string regex without a syntax command"
+#~ msgstr ""
+#~ "En voi lisätä maagista säännöllistä otsakelauseketta ilman "
+#~ "syntaksikomentoa"
+
+#, fuzzy
+#~ msgid "Missing magic string name"
+#~ msgstr "Puuttuva maaginen säännöllinen lausekemerkkijono"
+
+#, fuzzy
+#~ msgid "Cannot add a linter without a syntax command"
+#~ msgstr "En voi lisätä esikatselua ilman syntaksikomentoa"
+
+#~ msgid "Cannot add formatter without a syntax command"
+#~ msgstr "En voi lisätä muotoilinta ilman syntaksikomentoa"
+
+#~ msgid "Missing formatter command"
+#~ msgstr "Puuttuva muotoilinkomento"
+
 #  "Prepend" ei ole englanti, oikea sana on "prefix"
 #  "Prepend" is not an English word, use "prefix"
 #~ msgid "Cannot prepend or append to a symlink with --nofollow set"
diff --git a/po/fr.po b/po/fr.po
index 947bf9af..2446f879 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 2.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-25 16:41-0500\n"
+"POT-Creation-Date: 2016-06-17 15:41+0200\n"
 "PO-Revision-Date: 2016-02-13 00:26+0100\n"
 "Last-Translator: Jean-Philippe Guérard <jean-philippe.guerard@corbeaunoir."
 "org>\n"
@@ -24,11 +24,48 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Gtranslator 2.91.6\n"
 
+#
+# File: src/browser.c, line: 257
+# File: src/browser.c, line: 309
+# File: src/browser.c, line: 325
+# File: src/files.c, line: 610
+# File: src/files.c, line: 618
+# File: src/files.c, line: 1332
+# File: src/files.c, line: 1420
+# File: src/files.c, line: 1466
+# File: src/files.c, line: 1487
+# File: src/files.c, line: 1609
+# File: src/files.c, line: 2376
+# File: src/rcfile.c, line: 366
+# File: src/rcfile.c, line: 383
+# File: src/rcfile.c, line: 913
+# File: src/browser.c, line: 257
+# File: src/browser.c, line: 309
+# File: src/browser.c, line: 325
+# File: src/files.c, line: 610
+# File: src/files.c, line: 618
+# File: src/files.c, line: 1332
+# File: src/files.c, line: 1420
+# File: src/files.c, line: 1466
+# File: src/files.c, line: 1487
+# File: src/files.c, line: 1609
+# File: src/files.c, line: 2376
+# File: src/rcfile.c, line: 366
+# File: src/rcfile.c, line: 383
+# File: src/rcfile.c, line: 913
+#: src/browser.c:144 src/browser.c:284 src/browser.c:334 src/files.c:996
+#: src/files.c:1003 src/files.c:1794 src/files.c:1919 src/files.c:1963
+#: src/files.c:1983 src/files.c:2099 src/files.c:3019 src/files.c:3242
+#: src/rcfile.c:540 src/rcfile.c:1280
+#, c-format
+msgid "Error reading %s: %s"
+msgstr "Erreur lors de la lecture de %s : %s"
+
 #
 # File: src/browser.c, line: 207
 # File: src/browser.c, line: 207
 #. TRANSLATORS: This is a prompt.
-#: src/browser.c:220
+#: src/browser.c:247
 msgid "Go To Directory"
 msgstr "Changer de répertoire"
 
@@ -49,9 +86,9 @@ msgstr "Changer de répertoire"
 # File: src/search.c, line: 212
 # File: src/search.c, line: 934
 # File: src/search.c, line: 995
-#: src/browser.c:227 src/browser.c:738 src/files.c:1174 src/files.c:2340
-#: src/nano.c:1120 src/search.c:202 src/search.c:290 src/search.c:895
-#: src/search.c:970 src/text.c:2935 src/text.c:3142
+#: src/browser.c:254 src/browser.c:723 src/files.c:1126 src/files.c:2292
+#: src/nano.c:1128 src/search.c:195 src/search.c:297 src/search.c:851
+#: src/search.c:918 src/text.c:3189 src/text.c:3396
 msgid "Cancelled"
 msgstr "Annulé"
 
@@ -60,52 +97,17 @@ msgstr "Annulé"
 # File: src/browser.c, line: 299
 # File: src/browser.c, line: 246
 # File: src/browser.c, line: 299
-#: src/browser.c:253 src/browser.c:300
-#, c-format
-msgid "Can't go outside of %s in restricted mode"
+#. TRANSLATORS: This refers to the option --operatingdir,
+#. * not to --restricted.
+#: src/browser.c:274 src/browser.c:326
+#, fuzzy, c-format
+msgid "Can't go outside of %s in confined mode"
 msgstr "En mode restreint, sortir de %s est impossible"
 
-#
-# File: src/browser.c, line: 257
-# File: src/browser.c, line: 309
-# File: src/browser.c, line: 325
-# File: src/files.c, line: 610
-# File: src/files.c, line: 618
-# File: src/files.c, line: 1332
-# File: src/files.c, line: 1420
-# File: src/files.c, line: 1466
-# File: src/files.c, line: 1487
-# File: src/files.c, line: 1609
-# File: src/files.c, line: 2376
-# File: src/rcfile.c, line: 366
-# File: src/rcfile.c, line: 383
-# File: src/rcfile.c, line: 913
-# File: src/browser.c, line: 257
-# File: src/browser.c, line: 309
-# File: src/browser.c, line: 325
-# File: src/files.c, line: 610
-# File: src/files.c, line: 618
-# File: src/files.c, line: 1332
-# File: src/files.c, line: 1420
-# File: src/files.c, line: 1466
-# File: src/files.c, line: 1487
-# File: src/files.c, line: 1609
-# File: src/files.c, line: 2376
-# File: src/rcfile.c, line: 366
-# File: src/rcfile.c, line: 383
-# File: src/rcfile.c, line: 913
-#: src/browser.c:264 src/browser.c:310 src/browser.c:326 src/files.c:1044
-#: src/files.c:1052 src/files.c:1844 src/files.c:1971 src/files.c:2016
-#: src/files.c:2037 src/files.c:2156 src/files.c:3062 src/files.c:3285
-#: src/rcfile.c:596 src/rcfile.c:1435
-#, c-format
-msgid "Error reading %s: %s"
-msgstr "Erreur lors de la lecture de %s : %s"
-
 #
 # File: src/browser.c, line: 288
 # File: src/browser.c, line: 288
-#: src/browser.c:290
+#: src/browser.c:317
 msgid "Can't move up a directory"
 msgstr "Impossible de passer au répertoire supérieur"
 
@@ -115,18 +117,18 @@ msgstr "Impossible de passer au répertoire supérieur"
 # File: src/browser.c, line: 564
 # File: src/browser.c, line: 569
 #. TRANSLATORS: Try to keep this at most 7 characters.
-#: src/browser.c:615 src/browser.c:623
+#: src/browser.c:590 src/browser.c:598
 msgid "(dir)"
 msgstr "(rép.)"
 
 #. TRANSLATORS: Try to keep this at most 12 characters.
-#: src/browser.c:620
+#: src/browser.c:595
 msgid "(parent dir)"
 msgstr "(remonter)"
 
 #. TRANSLATORS: Try to keep this at most 7 characters.
 #. * If necessary, you can leave out the parentheses.
-#: src/browser.c:650
+#: src/browser.c:625
 msgid "(huge)"
 msgstr "énorme"
 
@@ -136,10 +138,21 @@ msgstr "énorme"
 # File: src/browser.c, line: 651
 # File: src/search.c, line: 179
 #. TRANSLATORS: This is the main search prompt.
-#: src/browser.c:727 src/search.c:173
+#: src/browser.c:712 src/search.c:166
 msgid "Search"
 msgstr "Recherche"
 
+#
+# File: src/browser.c, line: 760
+# File: src/browser.c, line: 768
+# File: src/search.c, line: 369
+# File: src/browser.c, line: 760
+# File: src/browser.c, line: 768
+# File: src/search.c, line: 369
+#: src/browser.c:754 src/search.c:368
+msgid "Search Wrapped"
+msgstr "La recherche a fait le tour"
+
 #
 # File: src/browser.c, line: 855
 # File: src/browser.c, line: 888
@@ -153,30 +166,37 @@ msgstr "Recherche"
 # File: src/search.c, line: 489
 # File: src/search.c, line: 546
 # File: src/search.c, line: 549
-#: src/browser.c:777 src/search.c:466 src/search.c:536
+#: src/browser.c:764 src/search.c:509
 msgid "This is the only occurrence"
 msgstr "C'est la seule occurrence"
 
-#
-# File: src/browser.c, line: 760
-# File: src/browser.c, line: 768
-# File: src/search.c, line: 369
-# File: src/browser.c, line: 760
-# File: src/browser.c, line: 768
-# File: src/search.c, line: 369
-#: src/browser.c:793 src/search.c:364
-msgid "Search Wrapped"
-msgstr "La recherche a fait le tour"
-
 #
 # File: src/browser.c, line: 891
 # File: src/search.c, line: 555
 # File: src/browser.c, line: 891
 # File: src/search.c, line: 555
-#: src/browser.c:843 src/search.c:517
+#: src/browser.c:812 src/search.c:473
 msgid "No current search pattern"
 msgstr "Aucun motif de recherche défini"
 
+#
+# File: src/rcfile.c, line: 247
+# File: src/rcfile.c, line: 247
+#: src/color.c:186
+#, fuzzy, c-format
+msgid "Unknown syntax name: %s"
+msgstr "nom de syntaxe manquant"
+
+#: src/color.c:247
+#, c-format
+msgid "magic_load() failed: %s"
+msgstr ""
+
+#: src/color.c:251
+#, c-format
+msgid "magic_file(%s) failed: %s"
+msgstr ""
+
 #
 # File: src/files.c, line: 1476
 # File: src/text.c, line: 2315
@@ -184,12 +204,12 @@ msgstr "Aucun motif de recherche défini"
 # File: src/files.c, line: 1476
 # File: src/text.c, line: 2315
 # File: src/text.c, line: 2327
-#: src/files.c:50
+#: src/files.c:47
 #, c-format
 msgid "Directory '%s' does not exist"
 msgstr "Le répertoire « %s » n'existe pas"
 
-#: src/files.c:52
+#: src/files.c:49
 #, c-format
 msgid "Path '%s': %s"
 msgstr "Chemin « %s » : %s"
@@ -203,29 +223,29 @@ msgstr "Chemin « %s » : %s"
 # File: src/rcfile.c, line: 375
 # File: src/rcfile.c, line: 870
 # File: src/rcfile.c, line: 904
-#: src/files.c:54
+#: src/files.c:51
 #, c-format
 msgid "Path '%s' is not a directory"
 msgstr "Le chemin « %s » n'est pas un répertoire"
 
-#: src/files.c:57
+#: src/files.c:53
 #, c-format
 msgid "Path '%s' is not accessible"
 msgstr "Le chemin « %s » n'est pas accessible"
 
-#. TRANSLATORS: Try to keep this at most 76 characters.
-#: src/files.c:158
+#. TRANSLATORS: Keep the next ten messages at most 76 characters.
+#: src/files.c:148
 msgid ""
 "Warning: Modifying a file which is not locked, check directory permission?"
 msgstr ""
 "Attention : modification d'un fichier non verrouillé. Vérifiez les droits du "
 "répertoire."
 
-#: src/files.c:197
+#: src/files.c:187
 msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
 msgstr "Fichier verrou : compte actuel inconnu (échec de getpwuid())"
 
-#: src/files.c:206
+#: src/files.c:196
 #, c-format
 msgid "Couldn't determine hostname for lock file: %s"
 msgstr "Impossible d'identifier l'hôte courant pour créer le verrou : %s"
@@ -237,7 +257,7 @@ msgstr "Impossible d'identifier l'hôte courant pour créer le verrou : %s"
 # File: src/files.c, line: 1476
 # File: src/text.c, line: 2315
 # File: src/text.c, line: 2327
-#: src/files.c:227 src/files.c:238 src/files.c:275 src/files.c:285
+#: src/files.c:216 src/files.c:225 src/files.c:262 src/files.c:272
 #, c-format
 msgid "Error writing lock file %s: %s"
 msgstr "Erreur d'écriture du fichier verrou %s : %s"
@@ -249,7 +269,7 @@ msgstr "Erreur d'écriture du fichier verrou %s : %s"
 # File: src/files.c, line: 1476
 # File: src/text.c, line: 2315
 # File: src/text.c, line: 2327
-#: src/files.c:305
+#: src/files.c:291
 #, c-format
 msgid "Error deleting lock file %s: %s"
 msgstr "Erreur de suppression du fichier verrou %s : %s"
@@ -261,18 +281,18 @@ msgstr "Erreur de suppression du fichier verrou %s : %s"
 # File: src/files.c, line: 1476
 # File: src/text.c, line: 2315
 # File: src/text.c, line: 2327
-#: src/files.c:341
+#: src/files.c:325
 #, c-format
 msgid "Error opening lock file %s: %s"
 msgstr "Erreur d'ouverture du fichier verrou %s : %s"
 
-#: src/files.c:353
+#: src/files.c:337
 #, c-format
 msgid "Error reading lock file %s: Not enough data read"
 msgstr "Erreur de lecture du fichier verrou %s : pas assez de données lues"
 
 #. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
-#: src/files.c:371
+#: src/files.c:354
 #, c-format
 msgid "File %s is being edited (by %s with %s, PID %d); continue?"
 msgstr "Le fichier %s est ouvert (par %s avec %s, PID %d) ; continuer ?"
@@ -280,7 +300,7 @@ msgstr "Le fichier %s est ouvert (par %s avec %s, PID %d) ; continuer ?"
 #
 # File: src/files.c, line: 119
 # File: src/files.c, line: 119
-#: src/files.c:426
+#: src/files.c:430
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Impossible d'insérer le fichier depuis l'extérieur de %s"
@@ -294,8 +314,8 @@ msgstr "Impossible d'insérer le fichier depuis l'extérieur de %s"
 # File: src/rcfile.c, line: 375
 # File: src/rcfile.c, line: 870
 # File: src/rcfile.c, line: 904
-#: src/files.c:439 src/files.c:1038 src/rcfile.c:589 src/rcfile.c:1385
-#: src/rcfile.c:1426
+#: src/files.c:445 src/files.c:991 src/rcfile.c:533 src/rcfile.c:1230
+#: src/rcfile.c:1271
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "« %s » est un répertoire"
@@ -309,7 +329,7 @@ msgstr "« %s » est un répertoire"
 # File: src/rcfile.c, line: 376
 # File: src/rcfile.c, line: 871
 # File: src/rcfile.c, line: 905
-#: src/files.c:441
+#: src/files.c:447
 #, c-format
 msgid "\"%s\" is not a normal file"
 msgstr "« %s » n'est pas un fichier ordinaire"
@@ -317,14 +337,14 @@ msgstr "« %s » n'est pas un fichier ordinaire"
 #
 # File: src/files.c, line: 228
 # File: src/files.c, line: 228
-#: src/files.c:566
+#: src/files.c:571
 msgid "No more open file buffers"
 msgstr "Plus aucun fichier ouvert"
 
 #
 # File: src/files.c, line: 244
 # File: src/files.c, line: 244
-#: src/files.c:582
+#: src/files.c:586
 #, c-format
 msgid "Switched to %s"
 msgstr "Basculement vers %s"
@@ -336,120 +356,71 @@ msgstr "Basculement vers %s"
 # File: src/files.c, line: 245
 # File: src/global.c, line: 302
 # File: src/winio.c, line: 2022
-#: src/files.c:584 src/global.c:988 src/winio.c:2010
+#: src/files.c:588 src/global.c:1005 src/winio.c:1965
 msgid "New Buffer"
 msgstr "Nouvel espace"
 
 #
 # File: src/files.c, line: 559
 # File: src/files.c, line: 559
-#: src/files.c:943
+#. TRANSLATORS: Keep the next four messages at most 76 characters.
+#: src/files.c:913
 #, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
 msgstr[0] "Lecture de %lu ligne (convertie des formats DOS et Mac)"
 msgstr[1] "Lecture de %lu lignes (converties des formats DOS et Mac)"
 
-#
-# File: src/files.c, line: 559
-# File: src/files.c, line: 559
-#: src/files.c:948
-#, c-format
-msgid ""
-"Read %lu line (Converted from DOS and Mac format - Warning: No write "
-"permission)"
-msgid_plural ""
-"Read %lu lines (Converted from DOS and Mac format - Warning: No write "
-"permission)"
-msgstr[0] ""
-"Lecture de %lu ligne (convertie des formats DOS et Mac - En lecture seule !)"
-msgstr[1] ""
-"Lecture de %lu lignes (converties des formats DOS et Mac - En lecture "
-"seule !)"
-
 #
 # File: src/files.c, line: 564
 # File: src/files.c, line: 564
-#: src/files.c:954
+#: src/files.c:919
 #, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
 msgstr[0] "Lecture de %lu ligne (convertie du format Mac)"
 msgstr[1] "Lecture de %lu lignes (converties du format Mac)"
 
-#
-# File: src/files.c, line: 564
-# File: src/files.c, line: 564
-#: src/files.c:958
-#, c-format
-msgid ""
-"Read %lu line (Converted from Mac format - Warning: No write permission)"
-msgid_plural ""
-"Read %lu lines (Converted from Mac format - Warning: No write permission)"
-msgstr[0] "Lecture de %lu ligne (convertie du format Mac - En lecture seule !)"
-msgstr[1] ""
-"Lecture de %lu lignes (converties du format Mac - En lecture seule !)"
-
 #
 # File: src/files.c, line: 569
 # File: src/files.c, line: 569
-#: src/files.c:964
+#: src/files.c:925
 #, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
 msgstr[0] "Lecture de %lu ligne (convertie du format DOS)"
 msgstr[1] "Lecture de %lu lignes (converties du format DOS)"
 
-#
-# File: src/files.c, line: 569
-# File: src/files.c, line: 569
-#: src/files.c:968
-#, c-format
-msgid ""
-"Read %lu line (Converted from DOS format - Warning: No write permission)"
-msgid_plural ""
-"Read %lu lines (Converted from DOS format - Warning: No write permission)"
-msgstr[0] "Lecture de %lu ligne (convertie du format DOS - En lecture seule !)"
-msgstr[1] ""
-"Lecture de %lu lignes (converties du format DOS - En lecture seule !)"
-
 #
 # File: src/files.c, line: 574
 # File: src/files.c, line: 574
-#: src/files.c:974
+#: src/files.c:930
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "Lecture de %lu ligne"
 msgstr[1] "Lecture de %lu lignes"
 
-#: src/files.c:977
-#, c-format
-msgid "Read %lu line (Warning: No write permission)"
-msgid_plural "Read %lu lines (Warning: No write permission)"
-msgstr[0] "Lecture de %lu ligne (Attention : en lecture seule !)"
-msgstr[1] "Lecture de %lu lignes (Attention : en lecture seule !)"
-
 #
 # File: src/files.c, line: 623
 # File: src/files.c, line: 623
-#: src/files.c:1019 src/files.c:1056
+#: src/files.c:974 src/files.c:1006
 msgid "Reading File"
 msgstr "Lecture du fichier"
 
 #
 # File: src/files.c, line: 594
 # File: src/files.c, line: 594
-#: src/files.c:1025
+#: src/files.c:980
 msgid "New File"
 msgstr "Nouveau fichier"
 
 #
 # File: src/files.c, line: 597
 # File: src/files.c, line: 597
-#: src/files.c:1028
-#, c-format
-msgid "\"%s\" not found"
+#: src/files.c:983
+#, fuzzy, c-format
+msgid "File \"%s\" not found"
 msgstr "« %s » non trouvé"
 
 #
@@ -461,7 +432,7 @@ msgstr "« %s » non trouvé"
 # File: src/rcfile.c, line: 376
 # File: src/rcfile.c, line: 871
 # File: src/rcfile.c, line: 905
-#: src/files.c:1039 src/rcfile.c:590 src/rcfile.c:1386 src/rcfile.c:1427
+#: src/files.c:992 src/rcfile.c:534 src/rcfile.c:1231 src/rcfile.c:1272
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "« %s » est un périphérique"
@@ -469,7 +440,7 @@ msgstr "« %s » est un périphérique"
 #
 # File: src/files.c, line: 696
 # File: src/files.c, line: 696
-#: src/files.c:1133
+#: src/files.c:1083
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Commande à exécuter dans un nouvel espace [à partir de %s] "
@@ -477,7 +448,7 @@ msgstr "Commande à exécuter dans un nouvel espace [à partir de %s] "
 #
 # File: src/files.c, line: 698
 # File: src/files.c, line: 698
-#: src/files.c:1135
+#: src/files.c:1085
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Commande à exécuter [à partir de %s] "
@@ -485,7 +456,7 @@ msgstr "Commande à exécuter [à partir de %s] "
 #
 # File: src/files.c, line: 704
 # File: src/files.c, line: 704
-#: src/files.c:1142
+#: src/files.c:1092
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Fichier à insérer dans un nouvel espace [à partir de %s] "
@@ -493,7 +464,7 @@ msgstr "Fichier à insérer dans un nouvel espace [à partir de %s] "
 #
 # File: src/files.c, line: 706
 # File: src/files.c, line: 706
-#: src/files.c:1144
+#: src/files.c:1094
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Fichier à insérer [à partir de %s] "
@@ -501,12 +472,13 @@ msgstr "Fichier à insérer [à partir de %s] "
 #
 # File: src/files.c, line: 885
 # File: src/files.c, line: 885
-#: src/files.c:1389
+#: src/files.c:1338
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Touche illégale hors du mode multi-espace"
 
-#: src/files.c:1684
-msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+#: src/files.c:1632
+#, fuzzy
+msgid "Failed to write backup file; continue saving? (Say N if unsure.) "
 msgstr ""
 "Impossible d'écrire la copie de sécurité, sauver quand même ? (Dites N en "
 "cas de doute) "
@@ -514,7 +486,7 @@ msgstr ""
 #
 # File: src/files.c, line: 1286
 # File: src/files.c, line: 1286
-#: src/files.c:1800
+#: src/files.c:1750
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Impossible d'écrire à l'extérieur de %s"
@@ -526,8 +498,8 @@ msgstr "Impossible d'écrire à l'extérieur de %s"
 # File: src/files.c, line: 1476
 # File: src/text.c, line: 2315
 # File: src/text.c, line: 2327
-#: src/files.c:1885 src/files.c:1910 src/files.c:1928 src/files.c:1941
-#: src/files.c:1952 src/files.c:1981
+#: src/files.c:1833 src/files.c:1858 src/files.c:1876 src/files.c:1889
+#: src/files.c:1900 src/files.c:1928
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Erreur d'écriture de la copie de sécurité %s : %s"
@@ -537,7 +509,7 @@ msgstr "Erreur d'écriture de la copie de sécurité %s : %s"
 # File: src/nano.c, line: 624
 # File: src/files.c, line: 1374
 # File: src/nano.c, line: 624
-#: src/files.c:1886 src/nano.c:690
+#: src/files.c:1834 src/nano.c:692
 msgid "Too many backup files?"
 msgstr "Trop de copies de sécurité ?"
 
@@ -548,8 +520,8 @@ msgstr "Trop de copies de sécurité ?"
 # File: src/files.c, line: 1476
 # File: src/text.c, line: 2315
 # File: src/text.c, line: 2327
-#: src/files.c:2026 src/text.c:2863 src/text.c:2875 src/text.c:3244
-#: src/text.c:3253
+#: src/files.c:1972 src/text.c:3117 src/text.c:3129 src/text.c:3498
+#: src/text.c:3507
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Erreur d'écriture du fichier temporaire : %s"
@@ -581,8 +553,8 @@ msgstr "Erreur d'écriture du fichier temporaire : %s"
 # File: src/files.c, line: 1617
 # File: src/files.c, line: 2449
 # File: src/files.c, line: 2458
-#: src/files.c:2049 src/files.c:2068 src/files.c:2080 src/files.c:2104
-#: src/files.c:2121 src/files.c:2131 src/files.c:2164 src/files.c:2171
+#: src/files.c:1994 src/files.c:2013 src/files.c:2023 src/files.c:2047
+#: src/files.c:2064 src/files.c:2074 src/files.c:2106 src/files.c:2113
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Erreur lors de l'écriture de %s : %s"
@@ -590,7 +562,7 @@ msgstr "Erreur lors de l'écriture de %s : %s"
 #
 # File: src/files.c, line: 1651
 # File: src/files.c, line: 1651
-#: src/files.c:2200
+#: src/files.c:2154
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
@@ -600,92 +572,96 @@ msgstr[1] "%lu lignes écrites"
 #
 # File: src/files.c, line: 1751
 # File: src/files.c, line: 1751
-#: src/files.c:2299
+#: src/files.c:2249
 msgid " [DOS Format]"
 msgstr " [Format DOS]"
 
 #
 # File: src/files.c, line: 1752
 # File: src/files.c, line: 1752
-#: src/files.c:2300
+#: src/files.c:2250
 msgid " [Mac Format]"
 msgstr " [Format Mac]"
 
 #
 # File: src/files.c, line: 1754
 # File: src/files.c, line: 1754
-#: src/files.c:2302
+#: src/files.c:2252
 msgid " [Backup]"
 msgstr " [Copie de sécurité]"
 
 #
 # File: src/files.c, line: 1758
 # File: src/files.c, line: 1758
-#: src/files.c:2309
+#: src/files.c:2259
 msgid "Prepend Selection to File"
 msgstr "Ajouter la sélection au début d'un fichier"
 
 #
 # File: src/files.c, line: 1759
 # File: src/files.c, line: 1759
-#: src/files.c:2310
+#: src/files.c:2260
 msgid "Append Selection to File"
 msgstr "Ajouter la sélection à la fin d'un fichier"
 
 #
 # File: src/files.c, line: 1760
 # File: src/files.c, line: 1760
-#: src/files.c:2311
+#: src/files.c:2261
 msgid "Write Selection to File"
 msgstr "Écrire la sélection dans un fichier"
 
 #
 # File: src/files.c, line: 1763
 # File: src/files.c, line: 1763
-#: src/files.c:2314
+#: src/files.c:2264
 msgid "File Name to Prepend to"
 msgstr "Nom du fichier au tête duquel ajouter"
 
 #
 # File: src/files.c, line: 1764
 # File: src/files.c, line: 1764
-#: src/files.c:2315
+#: src/files.c:2265
 msgid "File Name to Append to"
 msgstr "Nom du fichier à la fin duquel ajouter"
 
 #
 # File: src/files.c, line: 1765
 # File: src/files.c, line: 1765
-#: src/files.c:2316
+#: src/files.c:2266
 msgid "File Name to Write"
 msgstr "Nom du fichier à écrire"
 
-#: src/files.c:2349
-msgid "Save modified buffer anyway ? "
+#: src/files.c:2301
+#, fuzzy
+msgid "Save modified buffer anyway? "
 msgstr "Sauver l'espace modifié de toutes façons ?"
 
-#
-# File: src/files.c, line: 1856
-# File: src/files.c, line: 1856
-#: src/files.c:2457
-msgid "File exists, OVERWRITE ? "
-msgstr "Le fichier existe, VOULEZ-VOUS L'ÉCRASER ? "
-
 #
 # File: src/files.c, line: 1871
 # File: src/files.c, line: 1871
-#: src/files.c:2466
-msgid "Save file under DIFFERENT NAME ? "
+#: src/files.c:2412
+#, fuzzy
+msgid "Save file under DIFFERENT NAME? "
 msgstr "Écrire le fichier sous un NOM MODIFIÉ ? "
 
-#: src/files.c:2480
-msgid "File was modified since you opened it, continue saving ? "
+#
+# File: src/files.c, line: 1856
+# File: src/files.c, line: 1856
+#: src/files.c:2420
+#, fuzzy, c-format
+msgid "File \"%s\" exists; OVERWRITE? "
+msgstr "Le fichier existe, VOULEZ-VOUS L'ÉCRASER ? "
+
+#: src/files.c:2441
+#, fuzzy
+msgid "File was modified since you opened it; continue saving? "
 msgstr "Le fichier a été modifié depuis son ouverture. Continuer à sauver ?"
 
 #
 # File: src/files.c, line: 2298
 # File: src/files.c, line: 2298
-#: src/files.c:2917
+#: src/files.c:2874
 msgid "(more)"
 msgstr "(suite)"
 
@@ -694,7 +670,7 @@ msgstr "(suite)"
 # File: src/rcfile.c, line: 848
 # File: src/files.c, line: 2379
 # File: src/rcfile.c, line: 848
-#: src/files.c:3004
+#: src/files.c:2959
 #, c-format
 msgid ""
 "\n"
@@ -703,7 +679,7 @@ msgstr ""
 "\n"
 "Appuyez sur « Entrée » pour continuer\n"
 
-#: src/files.c:3020
+#: src/files.c:2975
 #, c-format
 msgid ""
 "Unable to create directory %s: %s\n"
@@ -713,7 +689,7 @@ msgstr ""
 "Il permet de conserver l'historique des recherches\n"
 "et les positions du curseur\n"
 
-#: src/files.c:3026
+#: src/files.c:2982
 #, c-format
 msgid ""
 "Path %s is not a directory and needs to be.\n"
@@ -723,7 +699,7 @@ msgstr ""
 "Nano ne pourra pas conserver l'historique des recherches\n"
 "et les positions du curseur\n"
 
-#: src/files.c:3045
+#: src/files.c:3002
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I tried to move\n"
@@ -733,7 +709,7 @@ msgstr ""
 "tentative de déplacement vers le nouvel emplacement (%s)\n"
 "a rencontré une erreur : %s"
 
-#: src/files.c:3049
+#: src/files.c:3006
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I moved\n"
@@ -771,7 +747,7 @@ msgstr ""
 # File: src/files.c, line: 1617
 # File: src/files.c, line: 2449
 # File: src/files.c, line: 2458
-#: src/files.c:3132 src/files.c:3140 src/files.c:3164 src/files.c:3176
+#: src/files.c:3089 src/files.c:3097 src/files.c:3121 src/files.c:3133
 #, c-format
 msgid "Error writing %s: %s\n"
 msgstr "Erreur lors de l'écriture de %s : %s\n"
@@ -780,56 +756,56 @@ msgstr "Erreur lors de l'écriture de %s : %s\n"
 # File: src/global.c, line: 266
 # File: src/global.c, line: 266
 #. TRANSLATORS: Try to keep the next fifteen strings at most 10 characters.
-#: src/global.c:480
+#: src/global.c:483
 msgid "Exit"
 msgstr "Quitter"
 
 #
 # File: src/global.c, line: 477
 # File: src/global.c, line: 477
-#: src/global.c:481
+#: src/global.c:484
 msgid "Close"
 msgstr "Fermer"
 
 #
 # File: src/global.c, line: 539
 # File: src/global.c, line: 539
-#: src/global.c:482
+#: src/global.c:485
 msgid "Uncut Text"
 msgstr "Coller"
 
 #
 # File: src/global.c, line: 534
 # File: src/global.c, line: 534
-#: src/global.c:484
+#: src/global.c:487
 msgid "Unjustify"
 msgstr "Dé-justif."
 
 #
 # File: src/global.c, line: 505
 # File: src/global.c, line: 505
-#: src/global.c:490
+#: src/global.c:493
 msgid "Read File"
 msgstr "Lire fich."
 
 #
 # File: src/global.c, line: 267
 # File: src/global.c, line: 267
-#: src/global.c:491
+#: src/global.c:494
 msgid "Where Is"
 msgstr "Chercher"
 
 #
 # File: src/global.c, line: 272
 # File: src/global.c, line: 272
-#: src/global.c:492
+#: src/global.c:495
 msgid "Replace"
 msgstr "Remplacer"
 
 #
 # File: src/global.c, line: 270
 # File: src/global.c, line: 270
-#: src/global.c:493
+#: src/global.c:496
 msgid "Go To Line"
 msgstr "Aller lig."
 
@@ -838,7 +814,7 @@ msgstr "Aller lig."
 # File: src/global.c, line: 1083
 # File: src/global.c, line: 614
 # File: src/global.c, line: 1083
-#: src/global.c:494
+#: src/global.c:497
 msgid "Prev Line"
 msgstr "Ligne préc."
 
@@ -847,42 +823,42 @@ msgstr "Ligne préc."
 # File: src/global.c, line: 1087
 # File: src/global.c, line: 618
 # File: src/global.c, line: 1087
-#: src/global.c:495
+#: src/global.c:498
 msgid "Next Line"
 msgstr "Ligne suiv."
 
 #
 # File: src/global.c, line: 268
 # File: src/global.c, line: 268
-#: src/global.c:496
+#: src/global.c:499
 msgid "Prev Page"
 msgstr "Page préc."
 
 #
 # File: src/global.c, line: 269
 # File: src/global.c, line: 269
-#: src/global.c:497
+#: src/global.c:500
 msgid "Next Page"
 msgstr "Page suiv."
 
 #
 # File: src/global.c, line: 488
 # File: src/global.c, line: 488
-#: src/global.c:499
+#: src/global.c:502
 msgid "Justify"
 msgstr "Justifier"
 
 #
 # File: src/global.c, line: 286
 # File: src/global.c, line: 286
-#: src/global.c:500
+#: src/global.c:503
 msgid "FullJstify"
 msgstr "Justifier"
 
 #
 # File: src/global.c, line: 288
 # File: src/global.c, line: 288
-#: src/global.c:502
+#: src/global.c:505
 msgid "Refresh"
 msgstr "Rafraîchir"
 
@@ -890,7 +866,7 @@ msgstr "Rafraîchir"
 # File: src/global.c, line: 275
 # File: src/global.c, line: 275
 #. TRANSLATORS: Try to keep this string at most 12 characters.
-#: src/global.c:505
+#: src/global.c:508
 msgid "WhereIs Next"
 msgstr "Cherch.suiv."
 
@@ -899,539 +875,563 @@ msgstr "Cherch.suiv."
 # File: src/global.c, line: 325
 #. TRANSLATORS: The next long series of strings are shortcut descriptions;
 #. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:512
+#: src/global.c:515
 msgid "Justify the current paragraph"
 msgstr "Justifier le paragraphe courant"
 
 #
 # File: src/global.c, line: 314
 # File: src/global.c, line: 314
-#: src/global.c:514
+#: src/global.c:517
 msgid "Cancel the current function"
 msgstr "Annuler la fonction courante"
 
 #
 # File: src/global.c, line: 315
 # File: src/global.c, line: 315
-#: src/global.c:515
+#: src/global.c:518
 msgid "Display this help text"
 msgstr "Afficher ce message"
 
 #
 # File: src/global.c, line: 318
 # File: src/global.c, line: 318
-#: src/global.c:518
+#: src/global.c:521
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Fermer l'espace en cours / Quitter nano"
 
 #
 # File: src/global.c, line: 320
 # File: src/global.c, line: 320
-#: src/global.c:520
+#: src/global.c:523
 msgid "Exit from nano"
 msgstr "Quitter nano"
 
 #
 # File: src/global.c, line: 324
 # File: src/global.c, line: 324
-#: src/global.c:524
+#: src/global.c:527
 msgid "Write the current file to disk"
 msgstr "Écrire le fichier en cours sur le disque"
 
 #
 # File: src/global.c, line: 327
 # File: src/global.c, line: 327
-#: src/global.c:526
+#: src/global.c:529
 msgid "Insert another file into the current one"
 msgstr "Insérer un autre fichier dans l'espace en cours"
 
 #
 # File: src/global.c, line: 329
 # File: src/global.c, line: 329
-#: src/global.c:528
+#: src/global.c:531
 msgid "Search for a string or a regular expression"
 msgstr "Rechercher une chaîne ou une expression rationnelle"
 
 #
 # File: src/global.c, line: 329
 # File: src/global.c, line: 329
-#: src/global.c:531
+#: src/global.c:533
 msgid "Search for a string"
 msgstr "Recherche d'une chaîne"
 
+#: src/global.c:534
+msgid "Refresh the file list"
+msgstr ""
+
+#
+# File: src/global.c, line: 340
+# File: src/global.c, line: 340
+#: src/global.c:535
+#, fuzzy
+msgid "Go to lefthand column"
+msgstr "Aller à la ligne et à la colonne indiquées"
+
+#
+# File: src/global.c, line: 340
+# File: src/global.c, line: 340
+#: src/global.c:536
+#, fuzzy
+msgid "Go to righthand column"
+msgstr "Aller à la ligne et à la colonne indiquées"
+
 #
 # File: src/global.c, line: 331
 # File: src/global.c, line: 331
-#: src/global.c:533
+#: src/global.c:538
 msgid "Go one screenful up"
 msgstr "Monter d'un écran"
 
 #
 # File: src/global.c, line: 331
 # File: src/global.c, line: 331
-#: src/global.c:534
+#: src/global.c:539
 msgid "Go one screenful down"
 msgstr "Descendre d'un écran"
 
 #
 # File: src/global.c, line: 333
 # File: src/global.c, line: 333
-#: src/global.c:536
+#: src/global.c:541
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Couper la ligne courante vers le presse-papiers"
 
 #
 # File: src/global.c, line: 335
 # File: src/global.c, line: 335
-#: src/global.c:538
+#: src/global.c:543
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Coller le presse-papiers à partir de la ligne courante"
 
 #
 # File: src/global.c, line: 337
 # File: src/global.c, line: 337
-#: src/global.c:539
+#: src/global.c:544
 msgid "Display the position of the cursor"
 msgstr "Indiquer la position du curseur"
 
 #
 # File: src/global.c, line: 339
 # File: src/global.c, line: 339
-#: src/global.c:541
+#: src/global.c:546
 msgid "Invoke the spell checker, if available"
 msgstr "Appeler le correcteur orthographique (si dispo.)"
 
 #
 # File: src/global.c, line: 342
 # File: src/global.c, line: 342
-#: src/global.c:543
+#: src/global.c:548
 msgid "Replace a string or a regular expression"
 msgstr "Remplacer une chaîne ou une expression rationnelle"
 
 #
 # File: src/global.c, line: 340
 # File: src/global.c, line: 340
-#: src/global.c:544
+#: src/global.c:549
 msgid "Go to line and column number"
 msgstr "Aller à la ligne et à la colonne indiquées"
 
 #
 # File: src/global.c, line: 344
 # File: src/global.c, line: 344
-#: src/global.c:546
+#: src/global.c:551
 msgid "Mark text starting from the cursor position"
 msgstr "Marquer le texte depuis la position du curseur"
 
 #
 # File: src/global.c, line: 345
 # File: src/global.c, line: 345
-#: src/global.c:547
+#: src/global.c:552
 msgid "Repeat the last search"
 msgstr "Recommencer la dernière recherche"
 
 #
 # File: src/global.c, line: 347
 # File: src/global.c, line: 347
-#: src/global.c:549
+#: src/global.c:554
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "Copier la ligne courante dans le presse-papiers"
 
 #
 # File: src/global.c, line: 314
 # File: src/global.c, line: 314
-#: src/global.c:550
+#: src/global.c:555
 msgid "Indent the current line"
 msgstr "Augmenter la marge de la ligne courante"
 
 #
 # File: src/global.c, line: 314
 # File: src/global.c, line: 314
-#: src/global.c:551
+#: src/global.c:556
 msgid "Unindent the current line"
 msgstr "Diminuer la marge de la ligne courante"
 
-#: src/global.c:552
+#: src/global.c:558
+msgid "Comment/uncomment the current line or marked lines"
+msgstr ""
+
+#: src/global.c:560
 msgid "Undo the last operation"
 msgstr "Annuler la dernière opération"
 
-#: src/global.c:553
+#: src/global.c:561
 msgid "Redo the last undone operation"
 msgstr "Refaire la dernière opération annulée"
 
 #
 # File: src/global.c, line: 352
 # File: src/global.c, line: 352
-#: src/global.c:555
+#: src/global.c:563
 msgid "Go back one character"
 msgstr "Reculer d'un caractère"
 
 #
 # File: src/global.c, line: 351
 # File: src/global.c, line: 351
-#: src/global.c:556
+#: src/global.c:564
 msgid "Go forward one character"
 msgstr "Avancer d'un caractère"
 
 #
 # File: src/global.c, line: 355
 # File: src/global.c, line: 355
-#: src/global.c:558
+#: src/global.c:566
 msgid "Go back one word"
 msgstr "Reculer d'un mot"
 
 #
 # File: src/global.c, line: 354
 # File: src/global.c, line: 354
-#: src/global.c:559
+#: src/global.c:567
 msgid "Go forward one word"
 msgstr "Avancer d'un mot"
 
 #
 # File: src/global.c, line: 357
 # File: src/global.c, line: 357
-#: src/global.c:561
+#: src/global.c:569
 msgid "Go to previous line"
 msgstr "Aller à la ligne précédente"
 
 #
 # File: src/global.c, line: 358
 # File: src/global.c, line: 358
-#: src/global.c:562
+#: src/global.c:570
 msgid "Go to next line"
 msgstr "Aller à la ligne suivante"
 
 #
 # File: src/global.c, line: 360
 # File: src/global.c, line: 360
-#: src/global.c:563
+#: src/global.c:571
 msgid "Go to beginning of current line"
 msgstr "Aller au début de la ligne courante"
 
 #
 # File: src/global.c, line: 362
 # File: src/global.c, line: 362
-#: src/global.c:564
+#: src/global.c:572
 msgid "Go to end of current line"
 msgstr "Aller à la fin de la ligne courante"
 
 #
 # File: src/global.c, line: 365
 # File: src/global.c, line: 365
-#: src/global.c:567
+#: src/global.c:575
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "Aller au début du paragraphe, puis à celui du précédent"
 
 #
 # File: src/global.c, line: 367
 # File: src/global.c, line: 367
-#: src/global.c:569
+#: src/global.c:577
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr "Aller à la fin du paragraphe, puis à celle du suivant"
 
 #
 # File: src/global.c, line: 370
 # File: src/global.c, line: 370
-#: src/global.c:571
+#: src/global.c:579
 msgid "Go to the first line of the file"
 msgstr "Aller à la première ligne du fichier"
 
 #
 # File: src/global.c, line: 372
 # File: src/global.c, line: 372
-#: src/global.c:572
+#: src/global.c:580
 msgid "Go to the last line of the file"
 msgstr "Aller à la dernière ligne du fichier"
 
 #
 # File: src/global.c, line: 374
 # File: src/global.c, line: 374
-#: src/global.c:574
+#: src/global.c:582
 msgid "Go to the matching bracket"
 msgstr "Aller au crochet correspondant"
 
 #
 # File: src/global.c, line: 376
 # File: src/global.c, line: 376
-#: src/global.c:576
+#: src/global.c:584
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "Remonter d'une ligne sans déplacer le curseur"
 
 #
 # File: src/global.c, line: 378
 # File: src/global.c, line: 378
-#: src/global.c:578
+#: src/global.c:586
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "Descendre d'une ligne sans déplacer le curseur"
 
 #
 # File: src/global.c, line: 382
 # File: src/global.c, line: 382
-#: src/global.c:581
+#: src/global.c:589
 msgid "Switch to the previous file buffer"
 msgstr "Basculer vers l'espace précédent"
 
 #
 # File: src/global.c, line: 384
 # File: src/global.c, line: 384
-#: src/global.c:582
+#: src/global.c:590
 msgid "Switch to the next file buffer"
 msgstr "Basculer vers l'espace suivant"
 
 #
 # File: src/global.c, line: 387
 # File: src/global.c, line: 387
-#: src/global.c:584
+#: src/global.c:592
 msgid "Insert the next keystroke verbatim"
 msgstr "Insérer le prochain caractère tel quel"
 
 #
 # File: src/global.c, line: 389
 # File: src/global.c, line: 389
-#: src/global.c:585
+#: src/global.c:593
 msgid "Insert a tab at the cursor position"
 msgstr "Insérer une tabulation à la position du curseur"
 
 #
 # File: src/global.c, line: 391
 # File: src/global.c, line: 391
-#: src/global.c:586
+#: src/global.c:594
 msgid "Insert a newline at the cursor position"
 msgstr "Insérer un passage à la ligne à la position du curseur"
 
 #
 # File: src/global.c, line: 393
 # File: src/global.c, line: 393
-#: src/global.c:587
+#: src/global.c:595
 msgid "Delete the character under the cursor"
 msgstr "Supprimer le caractère sous le curseur"
 
 #
 # File: src/global.c, line: 395
 # File: src/global.c, line: 395
-#: src/global.c:589
+#: src/global.c:597
 msgid "Delete the character to the left of the cursor"
 msgstr "Supprimer le caractère à la gauche du curseur"
 
 #
 # File: src/nano.c, line: 799
 # File: src/nano.c, line: 799
-#: src/global.c:592
+#: src/global.c:600
 msgid "Cut backward from cursor to word start"
 msgstr "Coupe en arrière du curseur au début du mot"
 
 #
 # File: src/nano.c, line: 799
 # File: src/nano.c, line: 799
-#: src/global.c:594
+#: src/global.c:602
 msgid "Cut forward from cursor to next word start"
 msgstr "Coupe en avant du curseur à la fin du mot"
 
 #
 # File: src/global.c, line: 398
 # File: src/global.c, line: 398
-#: src/global.c:596
+#: src/global.c:604
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Couper du curseur à la fin du fichier"
 
 #
 # File: src/global.c, line: 401
 # File: src/global.c, line: 401
-#: src/global.c:599
+#: src/global.c:607
 msgid "Justify the entire file"
 msgstr "Justifier le fichier entier"
 
 #
 # File: src/global.c, line: 405
 # File: src/global.c, line: 405
-#: src/global.c:603
+#: src/global.c:611
 msgid "Count the number of words, lines, and characters"
 msgstr "Compter le nombre de mots, de lignes et de caractères"
 
 #
 # File: src/global.c, line: 408
 # File: src/global.c, line: 408
-#: src/global.c:606
+#: src/global.c:614
 msgid "Refresh (redraw) the current screen"
 msgstr "Rafraîchir (redessiner) l'écran courant"
 
-#: src/global.c:608
+#: src/global.c:616
 msgid "Suspend the editor (if suspension is enabled)"
 msgstr "Suspendre l'éditeur (si suspendre est activé)"
 
-#: src/global.c:610
+#: src/global.c:618
 msgid "Save file without prompting"
 msgstr "Écrire sans poser de question"
 
-#: src/global.c:611
+#: src/global.c:619
 msgid "Search next occurrence backward"
 msgstr "Rechercher la prochaine occurernce en avant"
 
-#: src/global.c:612
+#: src/global.c:620
 msgid "Search next occurrence forward"
 msgstr "Rechercher la prochaine occurernce en arrière"
 
 #
 # File: src/global.c, line: 411
 # File: src/global.c, line: 411
-#: src/global.c:614
+#: src/global.c:622
 msgid "Toggle the case sensitivity of the search"
 msgstr "Chercher en tenant compte de la casse (commutateur)"
 
 #
 # File: src/global.c, line: 413
 # File: src/global.c, line: 413
-#: src/global.c:616
+#: src/global.c:624
 msgid "Reverse the direction of the search"
 msgstr "Inverser le sens de la recherche"
 
 #
 # File: src/global.c, line: 417
 # File: src/global.c, line: 417
-#: src/global.c:620
+#: src/global.c:628
 msgid "Toggle the use of regular expressions"
 msgstr "Utiliser des expressions rationnelles (commutateur)"
 
 #
 # File: src/global.c, line: 421
 # File: src/global.c, line: 421
-#: src/global.c:624
+#: src/global.c:632
 msgid "Recall the previous search/replace string"
 msgstr "Rappeler la précédente chaîne de recherche"
 
 #
 # File: src/global.c, line: 423
 # File: src/global.c, line: 423
-#: src/global.c:626
+#: src/global.c:634
 msgid "Recall the next search/replace string"
 msgstr "Rappeler la chaîne de recherche suivante"
 
 #
 # File: src/global.c, line: 426
 # File: src/global.c, line: 426
-#: src/global.c:629
+#: src/global.c:637
 msgid "Go to file browser"
 msgstr "Ouvrir le navigateur de fichiers"
 
 #
 # File: src/global.c, line: 429
 # File: src/global.c, line: 429
-#: src/global.c:632
+#: src/global.c:640
 msgid "Toggle the use of DOS format"
 msgstr "Utiliser le format DOS (commutateur)"
 
 #
 # File: src/global.c, line: 430
 # File: src/global.c, line: 430
-#: src/global.c:633
+#: src/global.c:641
 msgid "Toggle the use of Mac format"
 msgstr "Utiliser le format Mac (commutateur)"
 
 #
 # File: src/global.c, line: 432
 # File: src/global.c, line: 432
-#: src/global.c:634
+#: src/global.c:642
 msgid "Toggle appending"
 msgstr "Ajouter à la fin du fichier (commutateur)"
 
 #
 # File: src/global.c, line: 433
 # File: src/global.c, line: 433
-#: src/global.c:635
+#: src/global.c:643
 msgid "Toggle prepending"
 msgstr "Ajouter au début du fichier (commutateur)"
 
 #
 # File: src/global.c, line: 436
 # File: src/global.c, line: 436
-#: src/global.c:636
+#: src/global.c:644
 msgid "Toggle backing up of the original file"
 msgstr "Créer une copie de sécurité de l'original (commutateur)"
 
 #
 # File: src/global.c, line: 437
 # File: src/global.c, line: 437
-#: src/global.c:637
+#: src/global.c:645
 msgid "Execute external command"
 msgstr "Exécuter une commande externe"
 
-#: src/global.c:639
+#: src/global.c:647
 msgid "Close buffer without saving it"
 msgstr "Fermer l'espace sans l'écrire"
 
 #
 # File: src/global.c, line: 441
 # File: src/global.c, line: 441
-#: src/global.c:641
+#: src/global.c:649
 msgid "Toggle the use of a new buffer"
 msgstr "Utiliser un nouvel espace (commutateur)"
 
 #
 # File: src/global.c, line: 444
 # File: src/global.c, line: 444
-#: src/global.c:644
+#: src/global.c:652
 msgid "Exit from the file browser"
 msgstr "Sortir du navigateur de fichiers"
 
 #
 # File: src/global.c, line: 446
 # File: src/global.c, line: 446
-#: src/global.c:645
+#: src/global.c:653
 msgid "Go to the first file in the list"
 msgstr "Aller au premier fichier de la liste"
 
 #
 # File: src/global.c, line: 448
 # File: src/global.c, line: 448
-#: src/global.c:646
+#: src/global.c:654
 msgid "Go to the last file in the list"
 msgstr "Aller au dernier fichier de la liste"
 
 #
 # File: src/global.c, line: 446
 # File: src/global.c, line: 446
-#: src/global.c:647
+#: src/global.c:655
 msgid "Go to the previous file in the list"
 msgstr "Aller au précédent fichier de la liste"
 
 #
 # File: src/global.c, line: 448
 # File: src/global.c, line: 448
-#: src/global.c:648
+#: src/global.c:656
 msgid "Go to the next file in the list"
 msgstr "Aller au prochain fichier de la liste"
 
 #
 # File: src/global.c, line: 449
 # File: src/global.c, line: 449
-#: src/global.c:649
+#: src/global.c:657
 msgid "Go to directory"
 msgstr "Changer de répertoire"
 
 #
 # File: src/global.c, line: 339
 # File: src/global.c, line: 339
-#: src/global.c:652
+#: src/global.c:660
 msgid "Invoke the linter, if available"
 msgstr "Appeler l'analyseur statique (si dispo.)"
 
 #
 # File: src/global.c, line: 357
 # File: src/global.c, line: 357
-#: src/global.c:653
+#: src/global.c:661
 msgid "Go to previous linter msg"
 msgstr "Aller au message précédent de l'analyse statique"
 
 #
 # File: src/global.c, line: 358
 # File: src/global.c, line: 358
-#: src/global.c:654
+#: src/global.c:662
 msgid "Go to next linter msg"
 msgstr "Aller au message suivant de l'analyse statique"
 
 #
 # File: src/global.c, line: 339
 # File: src/global.c, line: 339
-#: src/global.c:656
+#: src/global.c:664
 msgid "Invoke formatter, if available"
 msgstr "Appeler l'outil de mise en forme (si dispo.)"
 
@@ -1441,7 +1441,7 @@ msgstr "Appeler l'outil de mise en forme (si dispo.)"
 # File: src/global.c, line: 265
 # File: src/global.c, line: 265
 #. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:671
+#: src/global.c:679
 msgid "Get Help"
 msgstr "Aide"
 
@@ -1450,225 +1450,225 @@ msgstr "Aide"
 # File: src/prompt.c, line: 1281
 # File: src/global.c, line: 264
 # File: src/prompt.c, line: 1281
-#: src/global.c:674 src/prompt.c:858
+#: src/global.c:682 src/prompt.c:855
 msgid "Cancel"
 msgstr "Annuler"
 
 #
 # File: src/global.c, line: 483
 # File: src/global.c, line: 483
-#: src/global.c:687
+#: src/global.c:695
 msgid "Write Out"
 msgstr "Écrire"
 
 #
 # File: src/global.c, line: 1154
 # File: src/global.c, line: 1154
-#: src/global.c:723
+#: src/global.c:731
 msgid "Go To Dir"
 msgstr "Aller -> rép."
 
 #
 # File: src/global.c, line: 528
 # File: src/global.c, line: 528
-#: src/global.c:738
+#: src/global.c:746
 msgid "Cut Text"
 msgstr "Couper"
 
 #
 # File: src/global.c, line: 552
 # File: src/global.c, line: 552
-#: src/global.c:753
+#: src/global.c:761
 msgid "To Spell"
 msgstr "Orthograp."
 
 #
 # File: src/global.c, line: 270
 # File: src/global.c, line: 270
-#: src/global.c:757
+#: src/global.c:765
 msgid "To Linter"
 msgstr "Analyse statique"
 
 #
 # File: src/global.c, line: 958
 # File: src/global.c, line: 958
-#: src/global.c:760
+#: src/global.c:768
 msgid "Formatter"
 msgstr "Formateur"
 
 #
 # File: src/global.c, line: 290
 # File: src/global.c, line: 290
-#: src/global.c:767
+#: src/global.c:775
 msgid "Case Sens"
 msgstr "Resp.casse"
 
 #
 # File: src/global.c, line: 294
 # File: src/global.c, line: 294
-#: src/global.c:772
+#: src/global.c:780
 msgid "Regexp"
 msgstr "Exp. ratio."
 
 #
 # File: src/global.c, line: 291
 # File: src/global.c, line: 291
-#: src/global.c:777
+#: src/global.c:785
 msgid "Backwards"
 msgstr "->Arrière"
 
 #
 # File: src/global.c, line: 828
 # File: src/global.c, line: 828
-#: src/global.c:784
+#: src/global.c:792
 msgid "No Replace"
 msgstr "Rechercher"
 
 #
 # File: src/global.c, line: 544
 # File: src/global.c, line: 544
-#: src/global.c:792
+#: src/global.c:800
 msgid "Cur Pos"
 msgstr "Pos. cur."
 
 #
 # File: src/global.c, line: 278
 # File: src/global.c, line: 278
-#: src/global.c:807
+#: src/global.c:815
 msgid "First Line"
 msgstr "Première ligne"
 
 #
 # File: src/global.c, line: 279
 # File: src/global.c, line: 279
-#: src/global.c:809
+#: src/global.c:817
 msgid "Last Line"
 msgstr "Dernière ligne"
 
 #
 # File: src/search.c, line: 1167
 # File: src/search.c, line: 1167
-#: src/global.c:816
+#: src/global.c:824
 msgid "To Bracket"
 msgstr "Parenthèse corresp."
 
 #
 # File: src/global.c, line: 575
 # File: src/global.c, line: 575
-#: src/global.c:819
+#: src/global.c:827
 msgid "Mark Text"
 msgstr "Marquer"
 
 #
 # File: src/global.c, line: 583
 # File: src/global.c, line: 583
-#: src/global.c:822
+#: src/global.c:830
 msgid "Copy Text"
 msgstr "Copier"
 
 #
 # File: src/global.c, line: 587
 # File: src/global.c, line: 587
-#: src/global.c:825
+#: src/global.c:833
 msgid "Indent Text"
 msgstr "Indenter"
 
 #
 # File: src/global.c, line: 591
 # File: src/global.c, line: 591
-#: src/global.c:827
+#: src/global.c:835
 msgid "Unindent Text"
 msgstr "Supprimer l'indentation"
 
-#: src/global.c:830
+#: src/global.c:838
 msgid "Undo"
 msgstr "Annuler"
 
-#: src/global.c:832
+#: src/global.c:840
 msgid "Redo"
 msgstr "Refaire"
 
 #
 # File: src/global.c, line: 600
 # File: src/global.c, line: 600
-#: src/global.c:836 src/global.c:842
+#: src/global.c:844 src/global.c:850
 msgid "Back"
 msgstr "En arrière"
 
 #
 # File: src/global.c, line: 596
 # File: src/global.c, line: 596
-#: src/global.c:838 src/global.c:844
+#: src/global.c:846 src/global.c:852
 msgid "Forward"
 msgstr "En avant"
 
 #
 # File: src/global.c, line: 609
 # File: src/global.c, line: 609
-#: src/global.c:849
+#: src/global.c:857
 msgid "Prev Word"
 msgstr "Mot précédent"
 
 #
 # File: src/global.c, line: 605
 # File: src/global.c, line: 605
-#: src/global.c:851
+#: src/global.c:859
 msgid "Next Word"
 msgstr "Mot suivant"
 
 #
 # File: src/global.c, line: 622
 # File: src/global.c, line: 622
-#: src/global.c:855
+#: src/global.c:863
 msgid "Home"
 msgstr "Début doc."
 
 #
 # File: src/global.c, line: 626
 # File: src/global.c, line: 626
-#: src/global.c:857
+#: src/global.c:865
 msgid "End"
 msgstr "Fin"
 
 #
 # File: src/global.c, line: 284
 # File: src/global.c, line: 284
-#: src/global.c:866
+#: src/global.c:874
 msgid "Beg of Par"
 msgstr "Début para."
 
 #
 # File: src/global.c, line: 285
 # File: src/global.c, line: 285
-#: src/global.c:868
+#: src/global.c:876
 msgid "End of Par"
 msgstr "Fin para."
 
 #
 # File: src/global.c, line: 653
 # File: src/global.c, line: 653
-#: src/global.c:873
+#: src/global.c:881
 msgid "Scroll Up"
 msgstr "Remonter"
 
 #
 # File: src/global.c, line: 657
 # File: src/global.c, line: 657
-#: src/global.c:875
+#: src/global.c:883
 msgid "Scroll Down"
 msgstr "Descendre"
 
 #
 # File: src/global.c, line: 663
 # File: src/global.c, line: 663
-#: src/global.c:880
+#: src/global.c:888
 msgid "Prev File"
 msgstr "Fichier précédent"
 
 #
 # File: src/global.c, line: 668
 # File: src/global.c, line: 668
-#: src/global.c:882
+#: src/global.c:890
 msgid "Next File"
 msgstr "Fichier suivant"
 
@@ -1677,35 +1677,35 @@ msgstr "Fichier suivant"
 # File: src/text.c, line: 2431
 # File: src/global.c, line: 673
 # File: src/text.c, line: 2431
-#: src/global.c:891
+#: src/global.c:899
 msgid "Verbatim"
 msgstr "Entrée telle quelle"
 
 #
 # File: src/global.c, line: 677
 # File: src/global.c, line: 677
-#: src/global.c:894
+#: src/global.c:902
 msgid "Tab"
 msgstr "Tabulation"
 
 #
 # File: src/global.c, line: 681
 # File: src/global.c, line: 681
-#: src/global.c:896
+#: src/global.c:904
 msgid "Enter"
 msgstr "Entrée"
 
 #
 # File: src/global.c, line: 685
 # File: src/global.c, line: 685
-#: src/global.c:899
+#: src/global.c:907
 msgid "Delete"
 msgstr "Supprimer"
 
 #
 # File: src/global.c, line: 689
 # File: src/global.c, line: 689
-#: src/global.c:901
+#: src/global.c:909
 msgid "Backspace"
 msgstr "RetourArr."
 
@@ -1713,40 +1713,50 @@ msgstr "RetourArr."
 # File: src/global.c, line: 528
 # File: src/global.c, line: 528
 #. TRANSLATORS: The next two strings refer to cutting words.
-#: src/global.c:912
+#: src/global.c:920
 msgid "Cut Left"
 msgstr "Couper à gauche"
 
-#: src/global.c:914
+#: src/global.c:922
 msgid "Cut Right"
 msgstr "Couper à droite"
 
 #
 # File: src/global.c, line: 281
 # File: src/global.c, line: 281
-#: src/global.c:916
+#: src/global.c:924
 msgid "CutTillEnd"
 msgstr "Coup.->Fin"
 
 #
 # File: src/global.c, line: 710
 # File: src/global.c, line: 710
-#: src/global.c:926
+#: src/global.c:934
 msgid "Word Count"
 msgstr "Nombre de mots "
 
 #
 # File: src/global.c, line: 1360
 # File: src/global.c, line: 1360
-#: src/global.c:933
+#: src/global.c:941
 msgid "Suspend"
 msgstr "Suspendre"
 
-#: src/global.c:937
+#
+# File: src/global.c, line: 618
+# File: src/global.c, line: 1087
+# File: src/global.c, line: 618
+# File: src/global.c, line: 1087
+#: src/global.c:945
+#, fuzzy
+msgid "Comment Lines"
+msgstr "Ligne suiv."
+
+#: src/global.c:949
 msgid "Save"
 msgstr "Écrire"
 
-#: src/global.c:940
+#: src/global.c:952
 msgid "Previous"
 msgstr "Précédent"
 
@@ -1755,105 +1765,113 @@ msgstr "Précédent"
 # File: src/global.c, line: 1087
 # File: src/global.c, line: 618
 # File: src/global.c, line: 1087
-#: src/global.c:942
+#: src/global.c:954
 msgid "Next"
 msgstr "Suivant"
 
 #
 # File: src/global.c, line: 297
 # File: src/global.c, line: 297
-#: src/global.c:948
+#: src/global.c:960
 msgid "PrevHstory"
 msgstr "Précédente"
 
 #
 # File: src/global.c, line: 299
 # File: src/global.c, line: 299
-#: src/global.c:951
+#: src/global.c:963
 msgid "NextHstory"
 msgstr "Suivante"
 
 #
 # File: src/global.c, line: 919
 # File: src/global.c, line: 919
-#: src/global.c:955
+#: src/global.c:972
 msgid "Go To Text"
 msgstr "Rechercher"
 
 #
 # File: src/global.c, line: 958
 # File: src/global.c, line: 958
-#: src/global.c:959
+#: src/global.c:976
 msgid "DOS Format"
 msgstr "Format DOS"
 
 #
 # File: src/global.c, line: 964
 # File: src/global.c, line: 964
-#: src/global.c:961
+#: src/global.c:978
 msgid "Mac Format"
 msgstr "Format Mac"
 
 #
 # File: src/global.c, line: 971
 # File: src/global.c, line: 971
-#: src/global.c:969
+#: src/global.c:986
 msgid "Append"
 msgstr "Ajout (à la fin)"
 
 #
 # File: src/global.c, line: 977
 # File: src/global.c, line: 977
-#: src/global.c:971
+#: src/global.c:988
 msgid "Prepend"
 msgstr "Ajout (au début)"
 
 #
 # File: src/global.c, line: 984
 # File: src/global.c, line: 984
-#: src/global.c:974
+#: src/global.c:991
 msgid "Backup File"
 msgstr "Copie de sécu."
 
 #
 # File: src/global.c, line: 1021
 # File: src/global.c, line: 1021
-#: src/global.c:981
+#: src/global.c:998
 msgid "Execute Command"
 msgstr "Exécuter une commande"
 
 #
 # File: src/global.c, line: 307
 # File: src/global.c, line: 307
-#: src/global.c:996
+#: src/global.c:1013
 msgid "To Files"
 msgstr "Parcourir"
 
 #
 # File: src/global.c, line: 309
 # File: src/global.c, line: 309
-#: src/global.c:1004
+#: src/global.c:1021
 msgid "First File"
 msgstr "Prem. fich."
 
 #
 # File: src/global.c, line: 311
 # File: src/global.c, line: 311
-#: src/global.c:1006
+#: src/global.c:1023
 msgid "Last File"
 msgstr "Dern. fich."
 
-#: src/global.c:1010
+#: src/global.c:1027
 msgid "Discard buffer"
 msgstr "Abandonner l'espace"
 
+#: src/global.c:1038
+msgid "Left Column"
+msgstr ""
+
+#: src/global.c:1040
+msgid "Right Column"
+msgstr ""
+
 #
 # File: src/global.c, line: 614
 # File: src/global.c, line: 1083
 # File: src/global.c, line: 614
 # File: src/global.c, line: 1083
 #. TRANSLATORS: Try to keep the next two strings at most 20 characters.
-#: src/global.c:1020
+#: src/global.c:1047
 msgid "Prev Lint Msg"
 msgstr "Analyse préc."
 
@@ -1862,7 +1880,7 @@ msgstr "Analyse préc."
 # File: src/global.c, line: 1087
 # File: src/global.c, line: 618
 # File: src/global.c, line: 1087
-#: src/global.c:1022
+#: src/global.c:1049
 msgid "Next Lint Msg"
 msgstr "Analyse suiv."
 
@@ -1871,21 +1889,21 @@ msgstr "Analyse suiv."
 # File: src/global.c, line: 1277
 #. TRANSLATORS: The next seventeen strings are toggle descriptions;
 #. * they are best kept shorter than 40 characters, but may be longer.
-#: src/global.c:1285
+#: src/global.c:1316
 msgid "Help mode"
 msgstr "Mode aide"
 
 #
 # File: src/global.c, line: 1280
 # File: src/global.c, line: 1280
-#: src/global.c:1287
+#: src/global.c:1318
 msgid "Constant cursor position display"
 msgstr "Afficher la position du curseur"
 
 #
 # File: src/global.c, line: 1283
 # File: src/global.c, line: 1283
-#: src/global.c:1289
+#: src/global.c:1320
 msgid "Use of one more line for editing"
 msgstr "Utiliser 1 ligne de plus pour l'édition"
 
@@ -1894,102 +1912,102 @@ msgstr "Utiliser 1 ligne de plus pour l'édition"
 # File: src/nano.c, line: 776
 # File: src/global.c, line: 1285
 # File: src/nano.c, line: 776
-#: src/global.c:1291
+#: src/global.c:1322
 msgid "Smooth scrolling"
 msgstr "Défilement progressif"
 
 #
 # File: src/nano.c, line: 824
 # File: src/nano.c, line: 824
-#: src/global.c:1293
+#: src/global.c:1324
 msgid "Soft wrapping of overlong lines"
 msgstr "Affichage automatique sur plusieurs lignes"
 
 #
 # File: src/global.c, line: 1294
 # File: src/global.c, line: 1294
-#: src/global.c:1295
+#: src/global.c:1326
 msgid "Whitespace display"
 msgstr "Afficher les blancs"
 
 #
 # File: src/global.c, line: 1304
 # File: src/global.c, line: 1304
-#: src/global.c:1297
+#: src/global.c:1328
 msgid "Color syntax highlighting"
 msgstr "Coloration syntaxique"
 
 #
 # File: src/global.c, line: 1308
 # File: src/global.c, line: 1308
-#: src/global.c:1299
+#: src/global.c:1330
 msgid "Smart home key"
 msgstr "Touche « Début » intelligente"
 
 #
 # File: src/global.c, line: 1311
 # File: src/global.c, line: 1311
-#: src/global.c:1301
+#: src/global.c:1332
 msgid "Auto indent"
 msgstr "Indenter automatiquement"
 
 #
 # File: src/global.c, line: 1314
 # File: src/global.c, line: 1314
-#: src/global.c:1303
+#: src/global.c:1334
 msgid "Cut to end"
 msgstr "Couper jusqu'en fin de ligne"
 
 #
 # File: src/nano.c, line: 824
 # File: src/nano.c, line: 824
-#: src/global.c:1305
+#: src/global.c:1336
 msgid "Hard wrapping of overlong lines"
 msgstr "Passer à la ligne automatiquement"
 
 #
 # File: src/global.c, line: 1323
 # File: src/global.c, line: 1323
-#: src/global.c:1307
+#: src/global.c:1338
 msgid "Conversion of typed tabs to spaces"
 msgstr "La touche tabulation ajoute des espaces"
 
 #
 # File: src/global.c, line: 1334
 # File: src/global.c, line: 1334
-#: src/global.c:1309
+#: src/global.c:1340
 msgid "Backup files"
 msgstr "Conserver des copies de sécurité"
 
-#: src/global.c:1311
+#: src/global.c:1342
 msgid "Reading file into separate buffer"
 msgstr "Lecture du fichier dans un autre espace"
 
 #
 # File: src/global.c, line: 1346
 # File: src/global.c, line: 1346
-#: src/global.c:1313
+#: src/global.c:1344
 msgid "Mouse support"
 msgstr "Utiliser la souris"
 
 #
 # File: src/global.c, line: 1354
 # File: src/global.c, line: 1354
-#: src/global.c:1315
+#: src/global.c:1346
 msgid "No conversion from DOS/Mac format"
 msgstr "Pas de conversion des formats DOS et Mac"
 
 #
 # File: src/global.c, line: 1360
 # File: src/global.c, line: 1360
-#: src/global.c:1317
+#: src/global.c:1348
 msgid "Suspension"
 msgstr "Autoriser à suspendre"
 
 #
 # File: src/help.c, line: 228
 # File: src/help.c, line: 228
-#: src/help.c:209
+#: src/help.c:211
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -2014,7 +2032,7 @@ msgstr ""
 #
 # File: src/help.c, line: 237
 # File: src/help.c, line: 237
-#: src/help.c:218
+#: src/help.c:220
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -2032,7 +2050,7 @@ msgstr ""
 #
 # File: src/help.c, line: 243
 # File: src/help.c, line: 243
-#: src/help.c:224
+#: src/help.c:226
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -2056,7 +2074,7 @@ msgstr ""
 #
 # File: src/help.c, line: 252
 # File: src/help.c, line: 252
-#: src/help.c:233
+#: src/help.c:235
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -2083,7 +2101,7 @@ msgstr ""
 #
 # File: src/help.c, line: 261
 # File: src/help.c, line: 261
-#: src/help.c:242
+#: src/help.c:244
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -2102,7 +2120,7 @@ msgstr ""
 #
 # File: src/help.c, line: 267
 # File: src/help.c, line: 267
-#: src/help.c:248
+#: src/help.c:250
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -2135,7 +2153,7 @@ msgstr ""
 #
 # File: src/help.c, line: 281
 # File: src/help.c, line: 281
-#: src/help.c:262
+#: src/help.c:264
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -2165,7 +2183,7 @@ msgstr ""
 #
 # File: src/help.c, line: 294
 # File: src/help.c, line: 294
-#: src/help.c:275
+#: src/help.c:277
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -2192,7 +2210,7 @@ msgstr ""
 #
 # File: src/help.c, line: 303
 # File: src/help.c, line: 303
-#: src/help.c:284
+#: src/help.c:286
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -2204,7 +2222,7 @@ msgstr ""
 #
 # File: src/help.c, line: 307
 # File: src/help.c, line: 307
-#: src/help.c:288
+#: src/help.c:290
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -2231,7 +2249,7 @@ msgstr ""
 #
 # File: src/help.c, line: 320
 # File: src/help.c, line: 320
-#: src/help.c:301
+#: src/help.c:303
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -2259,7 +2277,7 @@ msgstr ""
 #
 # File: src/help.c, line: 335
 # File: src/help.c, line: 335
-#: src/help.c:316
+#: src/help.c:318
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -2284,7 +2302,7 @@ msgstr ""
 #
 # File: src/help.c, line: 348
 # File: src/help.c, line: 348
-#: src/help.c:329
+#: src/help.c:331
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -2308,15 +2326,15 @@ msgstr ""
 #
 # File: src/help.c, line: 359
 # File: src/help.c, line: 359
-#: src/help.c:339
+#: src/help.c:341
+#, fuzzy
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
-" The notation for shortcuts is as follows: Control-key sequences are notated "
-"with a caret (^) symbol and can be entered either by using the Control "
-"(Ctrl) key or pressing the Escape (Esc) key twice.  Escape-key sequences are "
-"notated with the Meta (M-) symbol and can be entered using either the Esc, "
-"Alt, or Meta key depending on your keyboard setup.  "
+" Shortcuts are written as follows: Control-key sequences are notated with a "
+"'^' and can be entered either by using the Ctrl key or pressing the Esc key "
+"twice.  Meta-key sequences are notated with 'M-' and can be entered using "
+"either the Alt, Cmd, or Esc key, depending on your keyboard setup.  "
 msgstr ""
 "Les deux dernières lignes affichent les raccourcis les plus couramment "
 "utilisés.\n"
@@ -2358,7 +2376,7 @@ msgstr "(commutateur)"
 #
 # File: src/nano.c, line: 522
 # File: src/nano.c, line: 522
-#: src/nano.c:559
+#: src/nano.c:560
 msgid "Key is invalid in view mode"
 msgstr "Touche illégale en mode visualisation"
 
@@ -2367,11 +2385,11 @@ msgstr "Touche illégale en mode visualisation"
 # File: src/browser.c, line: 299
 # File: src/browser.c, line: 246
 # File: src/browser.c, line: 299
-#: src/nano.c:565
+#: src/nano.c:566
 msgid "This function is disabled in restricted mode"
 msgstr "Cette fonction est désactivée en mode restreint"
 
-#: src/nano.c:573
+#: src/nano.c:574
 msgid "Help is not available"
 msgstr "L'aide n'est pas disponible"
 
@@ -2379,7 +2397,7 @@ msgstr "L'aide n'est pas disponible"
 # Fin des entrées de menu sur 10 caractères
 # File: src/nano.c, line: 618
 # File: src/nano.c, line: 618
-#: src/nano.c:684
+#: src/nano.c:686
 #, c-format
 msgid ""
 "\n"
@@ -2392,7 +2410,7 @@ msgstr ""
 # Fin des entrées de menu sur 10 caractères
 # File: src/nano.c, line: 620
 # File: src/nano.c, line: 620
-#: src/nano.c:686
+#: src/nano.c:688
 #, c-format
 msgid ""
 "\n"
@@ -2405,7 +2423,7 @@ msgstr ""
 # Fin des entrées de menu sur 10 caractères
 # File: src/nano.c, line: 623
 # File: src/nano.c, line: 623
-#: src/nano.c:689
+#: src/nano.c:691
 #, c-format
 msgid ""
 "\n"
@@ -2835,15 +2853,20 @@ msgstr "Affichage multiligne automatique"
 #
 # File: src/nano.c, line: 841
 # File: src/nano.c, line: 841
-#: src/nano.c:937
-#, c-format
-msgid " GNU nano, version %s\n"
+#: src/nano.c:940
+#, fuzzy, c-format
+msgid " nano, version %s\n"
 msgstr " nano GNU version %s\n"
 
+#: src/nano.c:943
+#, c-format
+msgid " (C) 2014..%s the contributors to nano\n"
+msgstr ""
+
 #
 # File: src/nano.c, line: 844
 # File: src/nano.c, line: 844
-#: src/nano.c:940
+#: src/nano.c:945
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr " Adr. él. : nano@nano-editor.org\tSite : http://www.nano-editor.org/"
@@ -2851,7 +2874,7 @@ msgstr " Adr. él. : nano@nano-editor.org\tSite : http://www.nano-editor.org/"
 #
 # File: src/nano.c, line: 845
 # File: src/nano.c, line: 845
-#: src/nano.c:941
+#: src/nano.c:946
 #, c-format
 msgid ""
 "\n"
@@ -2860,22 +2883,19 @@ msgstr ""
 "\n"
 " Compilé avec les options :"
 
-#: src/nano.c:1073
+#: src/nano.c:1081
 msgid "No file name"
 msgstr "Pas de nom de fichier"
 
-#
-# File: src/nano.c, line: 940
-# File: src/nano.c, line: 940
-#: src/nano.c:1108
-msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
-msgstr "Sauver l'espace modifié (RÉPONDRE « Non » EFFACERA LES CHANGEMENTS) ? "
+#: src/nano.c:1115
+msgid "Save modified buffer?  (Answering \"No\" will DISCARD changes.) "
+msgstr ""
 
-#: src/nano.c:1168
+#: src/nano.c:1178
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "Impossible de rouvrir l'entrée standard depuis le clavier, désolé\n"
 
-#: src/nano.c:1192
+#: src/nano.c:1202
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "Lecture depuis l'entrée standard, ^C pour abandonner\n"
@@ -2883,56 +2903,66 @@ msgstr "Lecture depuis l'entrée standard, ^C pour abandonner\n"
 #
 # File: src/nano.c, line: 1003
 # File: src/nano.c, line: 1003
-#: src/nano.c:1256
+#: src/nano.c:1266
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Réception de SIGHUP ou SIGTERM\n"
 
 #
 # File: src/nano.c, line: 1020
 # File: src/nano.c, line: 1020
-#: src/nano.c:1272
+#: src/nano.c:1282
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Utilisez « fg » pour revenir à nano.\n"
 
-#: src/nano.c:1294
+#: src/nano.c:1304
 msgid "Suspension is not enabled"
 msgstr "Suspendre est désactivé"
 
 #
 # File: src/nano.c, line: 1186
 # File: src/nano.c, line: 1186
-#: src/nano.c:1448
+#: src/nano.c:1459
 msgid "enabled"
 msgstr "- marche"
 
 #
 # File: src/nano.c, line: 1187
 # File: src/nano.c, line: 1187
-#: src/nano.c:1448
+#: src/nano.c:1459
 msgid "disabled"
 msgstr "- arrêt"
 
-#
-# File: src/nano.c, line: 1361
-# File: src/winio.c, line: 530
-# File: src/nano.c, line: 1361
-# File: src/winio.c, line: 530
-#: src/nano.c:1607 src/winio.c:1125
-msgid "Unknown Command"
-msgstr "Commande inconnue"
+#: src/nano.c:1573
+msgid "Unbound key"
+msgstr ""
+
+#: src/nano.c:1577
+#, c-format
+msgid "Unbound key: M-%c"
+msgstr ""
+
+#: src/nano.c:1579
+#, c-format
+msgid "Unbound key: ^%c"
+msgstr ""
+
+#: src/nano.c:1581
+#, c-format
+msgid "Unbound key: %c"
+msgstr ""
 
 #
 # File: src/nano.c, line: 1425
 # File: src/nano.c, line: 1425
-#: src/nano.c:1720
+#: src/nano.c:1745
 msgid "XON ignored, mumble mumble"
 msgstr "XON ignoré, humm humm"
 
 #
 # File: src/nano.c, line: 1428
 # File: src/nano.c, line: 1428
-#: src/nano.c:1725
+#: src/nano.c:1750
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF ignoré, humm humm"
 
@@ -2941,7 +2971,7 @@ msgstr "XOFF ignoré, humm humm"
 # File: src/rcfile.c, line: 814
 # File: src/nano.c, line: 1827
 # File: src/rcfile.c, line: 814
-#: src/nano.c:2139 src/rcfile.c:1334
+#: src/nano.c:2166 src/rcfile.c:1187
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "taille de tabulation « %s » demandée non valide"
@@ -2951,12 +2981,12 @@ msgstr "taille de tabulation « %s » demandée non valide"
 # File: src/rcfile.c, line: 739
 # File: src/nano.c, line: 1883
 # File: src/rcfile.c, line: 739
-#: src/nano.c:2200 src/rcfile.c:1259
+#: src/nano.c:2227 src/rcfile.c:1128
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "la colonne maximale « %s » n'est pas valide"
 
-#: src/nano.c:2247
+#: src/nano.c:2276
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr "Entrez « %s -h » pour une liste des options disponibles.\n"
@@ -2967,49 +2997,49 @@ msgstr "Entrez « %s -h » pour une liste des options disponibles.\n"
 #. TRANSLATORS: For the next three strings, if possible, specify
 #. * the single-byte shortcuts for both your language and English.
 #. * For example, in French: "OoYy" for "Oui".
-#: src/prompt.c:821
+#: src/prompt.c:818
 msgid "Yy"
 msgstr "Oo"
 
 #
 # File: src/prompt.c, line: 1253
 # File: src/prompt.c, line: 1253
-#: src/prompt.c:822
+#: src/prompt.c:819
 msgid "Nn"
 msgstr "Nn"
 
 #
 # File: src/prompt.c, line: 1254
 # File: src/prompt.c, line: 1254
-#: src/prompt.c:823
+#: src/prompt.c:820
 msgid "Aa"
 msgstr "Tt"
 
 #
 # File: src/prompt.c, line: 1268
 # File: src/prompt.c, line: 1268
-#: src/prompt.c:845
+#: src/prompt.c:842
 msgid "Yes"
 msgstr "Oui"
 
 #
 # File: src/prompt.c, line: 1273
 # File: src/prompt.c, line: 1273
-#: src/prompt.c:850
+#: src/prompt.c:847
 msgid "All"
 msgstr "Tous"
 
 #
 # File: src/prompt.c, line: 1278
 # File: src/prompt.c, line: 1278
-#: src/prompt.c:855
+#: src/prompt.c:852
 msgid "No"
 msgstr "Non"
 
 #
 # File: src/rcfile.c, line: 120
 # File: src/rcfile.c, line: 120
-#: src/rcfile.c:142
+#: src/rcfile.c:144
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Erreur dans %s (ligne %lu) : "
@@ -3017,7 +3047,7 @@ msgstr "Erreur dans %s (ligne %lu) : "
 #
 # File: src/rcfile.c, line: 174
 # File: src/rcfile.c, line: 174
-#: src/rcfile.c:201
+#: src/rcfile.c:203
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "l'argument %s contient un \" non fermé"
@@ -3031,8 +3061,7 @@ msgstr "l'argument %s contient un \" non fermé"
 # File: src/rcfile.c, line: 253
 # File: src/rcfile.c, line: 524
 # File: src/rcfile.c, line: 581
-#: src/rcfile.c:228 src/rcfile.c:280 src/rcfile.c:732 src/rcfile.c:793
-#: src/rcfile.c:882 src/rcfile.c:933
+#: src/rcfile.c:231 src/rcfile.c:674 src/rcfile.c:725 src/rcfile.c:824
 msgid "Regex strings must begin and end with a \" character"
 msgstr "les expr. rationnelles doivent être encadrées par des « \" »"
 
@@ -3041,7 +3070,7 @@ msgstr "les expr. rationnelles doivent être encadrées par des « \" »"
 # File: src/search.c, line: 62
 # File: src/rcfile.c, line: 226
 # File: src/search.c, line: 62
-#: src/rcfile.c:254 src/search.c:62
+#: src/rcfile.c:257 src/search.c:61
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "mauvaise expr. rationnelle « %s » : %s"
@@ -3049,36 +3078,41 @@ msgstr "mauvaise expr. rationnelle « %s » : %s"
 #
 # File: src/rcfile.c, line: 247
 # File: src/rcfile.c, line: 247
-#: src/rcfile.c:274
+#: src/rcfile.c:279
 msgid "Missing syntax name"
 msgstr "nom de syntaxe manquant"
 
+#: src/rcfile.c:288
+msgid "A syntax name must be quoted"
+msgstr ""
+
 #
 # File: src/rcfile.c, line: 302
 # File: src/rcfile.c, line: 302
-#: src/rcfile.c:345
+#: src/rcfile.c:297
 msgid "The \"none\" syntax is reserved"
 msgstr "le nom « none » est un nom de syntaxe réservé"
 
 #
 # File: src/rcfile.c, line: 309
 # File: src/rcfile.c, line: 309
-#: src/rcfile.c:352
-msgid "The \"default\" syntax must take no extensions"
+#: src/rcfile.c:327
+#, fuzzy
+msgid "The \"default\" syntax does not accept extensions"
 msgstr "la syntaxe « default » ne doit être associée à aucune extension"
 
 #
 # File: src/rcfile.c, line: 247
 # File: src/rcfile.c, line: 247
-#: src/rcfile.c:424
+#: src/rcfile.c:369
 msgid "Missing key name"
 msgstr "Raccourci manquant"
 
-#: src/rcfile.c:433 src/rcfile.c:444
+#: src/rcfile.c:378 src/rcfile.c:389
 msgid "Key name is too short"
 msgstr "Raccourci trop court"
 
-#: src/rcfile.c:454
+#: src/rcfile.c:399
 msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr "Les raccourcis doivent commencer par « ^ », « M » ou « F »"
 
@@ -3087,38 +3121,38 @@ msgstr "Les raccourcis doivent commencer par « ^ », « M » ou « F »"
 # File: src/rcfile.c, line: 814
 # File: src/nano.c, line: 1827
 # File: src/rcfile.c, line: 814
-#: src/rcfile.c:457
+#: src/rcfile.c:402
 #, c-format
 msgid "Key name %s is invalid"
 msgstr "La touche %s n'existe pas"
 
-#: src/rcfile.c:466
+#: src/rcfile.c:411
 msgid "Must specify a function to bind the key to"
 msgstr "Vous devez indiquer la fonction à laquelle ce raccourci est associée"
 
 #. TRANSLATORS: Do not translate the word "all".
-#: src/rcfile.c:476
+#: src/rcfile.c:421
 msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
 "Vous devez indiquer le menu (ou « all » pour tous) auquel ce raccourci est "
 "rattaché"
 
-#: src/rcfile.c:483
+#: src/rcfile.c:428
 #, c-format
 msgid "Cannot map name \"%s\" to a function"
 msgstr "impossible de trouver la fonction « %s »"
 
-#: src/rcfile.c:490
+#: src/rcfile.c:435
 #, c-format
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "impossible de trouver le menu « %s »"
 
-#: src/rcfile.c:522
+#: src/rcfile.c:467
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr "La fonction « %s » n'existe pas dans le menu « %s »"
 
-#: src/rcfile.c:534
+#: src/rcfile.c:479
 #, c-format
 msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "désolé, le raccourci « %s » ne peut être réattribué"
@@ -3152,7 +3186,7 @@ msgstr "désolé, le raccourci « %s » ne peut être réattribué"
 # File: src/rcfile.c, line: 366
 # File: src/rcfile.c, line: 383
 # File: src/rcfile.c, line: 913
-#: src/rcfile.c:631
+#: src/rcfile.c:576
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr "Erreur lors de l'expansion de %s : %s"
@@ -3160,7 +3194,7 @@ msgstr "Erreur lors de l'expansion de %s : %s"
 #
 # File: src/rcfile.c, line: 438
 # File: src/rcfile.c, line: 438
-#: src/rcfile.c:674
+#: src/rcfile.c:616
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -3177,103 +3211,73 @@ msgstr ""
 "avec comme préfixe optionnel « bright » (lumineux)\n"
 "pour les couleurs de texte."
 
-#
-# File: src/rcfile.c, line: 460
-# File: src/rcfile.c, line: 460
-#: src/rcfile.c:696
-msgid "Cannot add a color command without a syntax command"
+#: src/rcfile.c:637 src/rcfile.c:795 src/rcfile.c:858
+#, c-format
+msgid "A '%s' command requires a preceding 'syntax' command"
 msgstr ""
-"un directive de coloration (color) doit être précédée d'une commande "
-"« syntax »"
 
 #
 # File: src/rcfile.c, line: 465
 # File: src/rcfile.c, line: 465
-#: src/rcfile.c:701
+#: src/rcfile.c:643
 msgid "Missing color name"
 msgstr "nom de couleur manquant"
 
 #
-# File: src/rcfile.c, line: 503
-# File: src/rcfile.c, line: 503
-#: src/rcfile.c:711 src/rcfile.c:872
-msgid "Missing regex string"
-msgstr "chaîne d'expr. rationnelle manquante"
+# File: src/rcfile.c, line: 465
+# File: src/rcfile.c, line: 465
+#: src/rcfile.c:653 src/rcfile.c:807
+#, fuzzy, c-format
+msgid "Missing regex string after '%s' command"
+msgstr "Commande d'analyse statique manquante"
 
 #
 # File: src/rcfile.c, line: 575
 # File: src/rcfile.c, line: 575
-#: src/rcfile.c:787
+#: src/rcfile.c:719
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "« start » nécessite un « end » correspondant"
 
 #
 # File: src/rcfile.c, line: 485
 # File: src/rcfile.c, line: 485
-#: src/rcfile.c:839
+#: src/rcfile.c:768
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
 msgstr "une couleur de fond « %s » ne peut pas être lumineuse (bright)"
 
 #
-# File: src/rcfile.c, line: 460
-# File: src/rcfile.c, line: 460
-#: src/rcfile.c:867
-msgid "Cannot add a header regex without a syntax command"
-msgstr ""
-"impossible d'ajouter un motif d'en-tête non précédé d'une commande « syntax »"
-
-#
-# File: src/rcfile.c, line: 460
-# File: src/rcfile.c, line: 460
-#: src/rcfile.c:922
-msgid "Cannot add a magic string regex without a syntax command"
-msgstr "impossible d'ajouter un motif Magic sans commande « syntax »"
-
-#
-# File: src/rcfile.c, line: 503
-# File: src/rcfile.c, line: 503
-#: src/rcfile.c:927
-msgid "Missing magic string name"
-msgstr "chaîne de motif Magic manquante"
-
-#
-# File: src/rcfile.c, line: 460
-# File: src/rcfile.c, line: 460
-#: src/rcfile.c:985
-msgid "Cannot add a linter without a syntax command"
-msgstr "impossible d'ajouter un analyseur statique sans commande « syntax »"
+# File: src/rcfile.c, line: 309
+# File: src/rcfile.c, line: 309
+#: src/rcfile.c:802
+#, fuzzy, c-format
+msgid "The \"default\" syntax does not accept '%s' regexes"
+msgstr "la syntaxe « default » ne doit être associée à aucune extension"
 
 #
 # File: src/rcfile.c, line: 465
 # File: src/rcfile.c, line: 465
-#: src/rcfile.c:990
-msgid "Missing linter command"
+#: src/rcfile.c:863
+#, fuzzy, c-format
+msgid "Missing command after '%s'"
 msgstr "Commande d'analyse statique manquante"
 
 #
-# File: src/rcfile.c, line: 460
-# File: src/rcfile.c, line: 460
-#: src/rcfile.c:1011
-msgid "Cannot add formatter without a syntax command"
-msgstr ""
-"Impossible d'ajouter un outil de mise en forme sans commande « syntax »"
-
-#
-# File: src/rcfile.c, line: 465
-# File: src/rcfile.c, line: 465
-#: src/rcfile.c:1016
-msgid "Missing formatter command"
-msgstr "Commande de l'outil de mise en forme manquante"
+# File: src/rcfile.c, line: 174
+# File: src/rcfile.c, line: 174
+#: src/rcfile.c:879
+#, fuzzy, c-format
+msgid "Argument of '%s' lacks closing \""
+msgstr "l'argument %s contient un \" non fermé"
 
-#: src/rcfile.c:1046
+#: src/rcfile.c:910
 #, c-format
 msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr ""
 "Erreur bloquante : aucun raccourci n'est associé à la fonction « %s ». "
 "Arrêt.\n"
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:912
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
@@ -3281,11 +3285,21 @@ msgstr ""
 "Si besoin, lancez nano avec l'option -I pour modifier les paramètres de "
 "votre fichier nanorc\n"
 
-#: src/rcfile.c:1109
+#: src/rcfile.c:971
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "impossible de trouver la syntaxe « %s » à étendre"
 
+#
+# File: src/rcfile.c, line: 671
+# File: src/rcfile.c, line: 838
+# File: src/rcfile.c, line: 671
+# File: src/rcfile.c, line: 838
+#: src/rcfile.c:993 src/rcfile.c:1202
+#, c-format
+msgid "Syntax \"%s\" has no color commands"
+msgstr "la syntaxe « %s » ne contient aucune commande de coloration (color)"
+
 #
 # File: src/rcfile.c, line: 646
 # File: src/rcfile.c, line: 655
@@ -3293,25 +3307,15 @@ msgstr "impossible de trouver la syntaxe « %s » à étendre"
 # File: src/rcfile.c, line: 646
 # File: src/rcfile.c, line: 655
 # File: src/rcfile.c, line: 665
-#: src/rcfile.c:1125 src/rcfile.c:1134 src/rcfile.c:1144
+#: src/rcfile.c:1024
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "la commande « %s » est interdite dans un fichier inclus"
 
-#
-# File: src/rcfile.c, line: 671
-# File: src/rcfile.c, line: 838
-# File: src/rcfile.c, line: 671
-# File: src/rcfile.c, line: 838
-#: src/rcfile.c:1150 src/rcfile.c:1359
-#, c-format
-msgid "Syntax \"%s\" has no color commands"
-msgstr "la syntaxe « %s » ne contient aucune commande de coloration (color)"
-
 #
 # File: src/rcfile.c, line: 680
 # File: src/rcfile.c, line: 680
-#: src/rcfile.c:1180
+#: src/rcfile.c:1039
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "impossible de comprendre la commande « %s »"
@@ -3319,14 +3323,30 @@ msgstr "impossible de comprendre la commande « %s »"
 #
 # File: src/rcfile.c, line: 465
 # File: src/rcfile.c, line: 465
-#: src/rcfile.c:1195
+#: src/rcfile.c:1051
 msgid "Missing option"
 msgstr "Option manquante"
 
+#
+# File: src/rcfile.c, line: 834
+# File: src/rcfile.c, line: 834
+#: src/rcfile.c:1065
+#, c-format
+msgid "Unknown option \"%s\""
+msgstr "Option « %s » inconnue"
+
+#
+# File: src/rcfile.c, line: 828
+# File: src/rcfile.c, line: 828
+#: src/rcfile.c:1077
+#, c-format
+msgid "Cannot unset option \"%s\""
+msgstr "impossible de désactiver l'option « %s »"
+
 #
 # File: src/rcfile.c, line: 708
 # File: src/rcfile.c, line: 708
-#: src/rcfile.c:1217
+#: src/rcfile.c:1089
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "l'option « %s » nécessite un argument"
@@ -3334,7 +3354,7 @@ msgstr "l'option « %s » nécessite un argument"
 #
 # File: src/rcfile.c, line: 726
 # File: src/rcfile.c, line: 726
-#: src/rcfile.c:1235
+#: src/rcfile.c:1105
 msgid "Option is not a valid multibyte string"
 msgstr "l'option n'est pas une chaîne multioctet valide"
 
@@ -3345,37 +3365,21 @@ msgstr "l'option n'est pas une chaîne multioctet valide"
 # File: src/rcfile.c, line: 752
 # File: src/rcfile.c, line: 780
 # File: src/rcfile.c, line: 789
-#: src/rcfile.c:1272 src/rcfile.c:1300 src/rcfile.c:1309
+#: src/rcfile.c:1139 src/rcfile.c:1160 src/rcfile.c:1167
 msgid "Non-blank characters required"
 msgstr "les blancs sont interdits"
 
 #
 # File: src/rcfile.c, line: 762
 # File: src/rcfile.c, line: 762
-#: src/rcfile.c:1282
+#: src/rcfile.c:1146
 msgid "Two single-column characters required"
 msgstr "indiquez 2 caractères (mono-colonne)"
 
-#
-# File: src/rcfile.c, line: 828
-# File: src/rcfile.c, line: 828
-#: src/rcfile.c:1348
-#, c-format
-msgid "Cannot unset option \"%s\""
-msgstr "impossible de désactiver l'option « %s »"
-
-#
-# File: src/rcfile.c, line: 834
-# File: src/rcfile.c, line: 834
-#: src/rcfile.c:1354
-#, c-format
-msgid "Unknown option \"%s\""
-msgstr "Option « %s » inconnue"
-
 #
 # File: src/rcfile.c, line: 894
 # File: src/rcfile.c, line: 894
-#: src/rcfile.c:1413
+#: src/rcfile.c:1258
 msgid "I can't find my home directory!  Wah!"
 msgstr "impossible de trouver mon répertoire personnel ! Ouah !"
 
@@ -3384,7 +3388,7 @@ msgstr "impossible de trouver mon répertoire personnel ! Ouah !"
 # File: src/rcfile.c, line: 848
 # File: src/files.c, line: 2379
 # File: src/rcfile.c, line: 848
-#: src/rcfile.c:1451
+#: src/rcfile.c:1295
 #, c-format
 msgid ""
 "\n"
@@ -3396,7 +3400,7 @@ msgstr ""
 #
 # File: src/search.c, line: 94
 # File: src/search.c, line: 94
-#: src/search.c:96
+#: src/search.c:95
 #, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "« %.*s%s » non trouvé"
@@ -3407,7 +3411,7 @@ msgstr "« %.*s%s » non trouvé"
 # File: src/browser.c, line: 655
 # File: src/search.c, line: 183
 #. TRANSLATORS: The next three strings are modifiers of the search prompt.
-#: src/search.c:176
+#: src/search.c:169
 msgid " [Case Sensitive]"
 msgstr " [Resp. casse]"
 
@@ -3416,7 +3420,7 @@ msgstr " [Resp. casse]"
 # File: src/search.c, line: 189
 # File: src/browser.c, line: 661
 # File: src/search.c, line: 189
-#: src/search.c:180
+#: src/search.c:173
 msgid " [Regexp]"
 msgstr " [Exp. ration.]"
 
@@ -3425,7 +3429,7 @@ msgstr " [Exp. ration.]"
 # File: src/search.c, line: 195
 # File: src/browser.c, line: 667
 # File: src/search.c, line: 195
-#: src/search.c:184
+#: src/search.c:177
 msgid " [Backwards]"
 msgstr " [Arrière]"
 
@@ -3433,22 +3437,32 @@ msgstr " [Arrière]"
 # File: src/search.c, line: 199
 # File: src/search.c, line: 199
 #. TRANSLATORS: The next two strings are modifiers of the search prompt.
-#: src/search.c:189
+#: src/search.c:182
 msgid " (to replace) in selection"
 msgstr " (à remplacer) dans la sélection"
 
 #
 # File: src/search.c, line: 201
 # File: src/search.c, line: 201
-#: src/search.c:191
+#: src/search.c:184
 msgid " (to replace)"
 msgstr " (à remplacer)"
 
+#
+# File: src/browser.c, line: 651
+# File: src/search.c, line: 179
+# File: src/browser.c, line: 651
+# File: src/search.c, line: 179
+#: src/search.c:305
+#, fuzzy
+msgid "Searching..."
+msgstr "Recherche"
+
 #
 # File: src/search.c, line: 753
 # File: src/search.c, line: 753
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:718
+#: src/search.c:693
 msgid "Replace this instance?"
 msgstr "Remplacer cette occurrence ?"
 
@@ -3456,14 +3470,14 @@ msgstr "Remplacer cette occurrence ?"
 # File: src/search.c, line: 921
 # File: src/search.c, line: 921
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:883
+#: src/search.c:840
 msgid "Replace with"
 msgstr "Remplacer par"
 
 #
 # File: src/search.c, line: 963
 # File: src/search.c, line: 963
-#: src/search.c:924
+#: src/search.c:875
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
@@ -3474,133 +3488,142 @@ msgstr[1] "%lu remplacements effectués"
 # File: src/search.c, line: 989
 # File: src/search.c, line: 989
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:964
+#: src/search.c:914
 msgid "Enter line number, column number"
 msgstr "Entrez : numéro de ligne, numéro de colonne "
 
 #
 # File: src/search.c, line: 989
 # File: src/search.c, line: 989
-#: src/search.c:991
+#: src/search.c:939
 msgid "Invalid line or column number"
 msgstr "numéro de ligne ou de colonne incorrect"
 
 #
 # File: src/search.c, line: 1167
 # File: src/search.c, line: 1167
-#: src/search.c:1124
+#: src/search.c:1080
 msgid "Not a bracket"
 msgstr "N'est pas un crochet"
 
 #
 # File: src/search.c, line: 1234
 # File: src/search.c, line: 1234
-#: src/search.c:1191
+#: src/search.c:1146
 msgid "No matching bracket"
 msgstr "Aucun crochet correspondant"
 
 #
 # File: src/text.c, line: 54
 # File: src/text.c, line: 54
-#: src/text.c:54
+#: src/text.c:53
 msgid "Mark Set"
 msgstr "Marque posée"
 
 #
 # File: src/text.c, line: 58
 # File: src/text.c, line: 58
-#: src/text.c:58
+#: src/text.c:57
 msgid "Mark Unset"
 msgstr "Marque enlevée"
 
 #
 # File: src/text.c, line: 2206
 # File: src/text.c, line: 2206
-#: src/text.c:70
+#: src/text.c:69
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "erreur d'appel de « %s »"
 
-#: src/text.c:475
-msgid "Nothing in undo buffer!"
-msgstr "Aucune opération à annuler !"
+#: src/text.c:468
+msgid "Commenting is not supported for this file type"
+msgstr ""
 
-#: src/text.c:481 src/text.c:634
-#, c-format
-msgid "Internal error: can't match line %d.  Please save your work."
+#: src/text.c:484
+msgid "Cannot comment past end of file"
 msgstr ""
-"Erreur interne : impossible de trouver une correspondance pour la ligne %d. "
-"Sauvez votre travail."
+
+#: src/text.c:677
+msgid "Nothing in undo buffer!"
+msgstr "Aucune opération à annuler !"
 
 #. TRANSLATORS: Eight of the next nine strings describe actions
 #. * that are undone or redone.  It are all nouns, not verbs.
-#: src/text.c:495 src/text.c:524 src/text.c:645 src/text.c:686
+#: src/text.c:695 src/text.c:724 src/text.c:857 src/text.c:898
 msgid "text add"
 msgstr "ajout de texte"
 
 #
 # File: src/global.c, line: 668
 # File: src/global.c, line: 668
-#: src/text.c:505 src/text.c:656
+#: src/text.c:705 src/text.c:868
 msgid "text delete"
 msgstr "effacement de texte"
 
-#: src/text.c:528 src/text.c:694
+#: src/text.c:728 src/text.c:907
 msgid "line join"
 msgstr "fusion de lignes"
 
-#: src/text.c:547 src/text.c:710
+#: src/text.c:747 src/text.c:923
 msgid "text cut"
 msgstr "texte coupé"
 
-#: src/text.c:552 src/text.c:714
+#: src/text.c:752 src/text.c:927
 msgid "text uncut"
 msgstr "texte restauré"
 
-#: src/text.c:558 src/text.c:691
+#: src/text.c:758 src/text.c:903
 msgid "Internal error: line is missing.  Please save your work."
 msgstr "Erreur interne : la ligne a disparu. Sauvez votre travail."
 
-#: src/text.c:561 src/text.c:665
+#: src/text.c:762 src/text.c:877
 msgid "line break"
 msgstr "nouvelle ligne"
 
+#: src/text.c:772 src/text.c:947
+msgid "comment"
+msgstr ""
+
+#: src/text.c:776 src/text.c:951
+msgid "uncomment"
+msgstr ""
+
 #
 # File: src/global.c, line: 618
 # File: src/global.c, line: 1087
 # File: src/global.c, line: 618
 # File: src/global.c, line: 1087
-#: src/text.c:569 src/text.c:725
+#: src/text.c:780 src/text.c:938
 msgid "text insert"
 msgstr "insertion de texte"
 
 #
 # File: src/search.c, line: 201
 # File: src/search.c, line: 201
-#: src/text.c:589 src/text.c:718
+#: src/text.c:800 src/text.c:931
 msgid "text replace"
 msgstr "remplacement de texte"
 
-#: src/text.c:596 src/text.c:732 src/text.c:1030 src/text.c:1174
+#: src/text.c:807 src/text.c:955 src/text.c:1267 src/text.c:1437
 msgid "Internal error: unknown type.  Please save your work."
 msgstr "Erreur interne : type inconnu. Sauvez votre travail"
 
-#: src/text.c:601
+#: src/text.c:813
 #, c-format
 msgid "Undid action (%s)"
 msgstr "Action annulée (%s)"
 
-#: src/text.c:619
+#: src/text.c:832
 msgid "Nothing to re-do!"
 msgstr "Rien à refaire !"
 
-#: src/text.c:628
+#: src/text.c:841
 msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
 "Erreur interne : impossible de préparer le retour en avant. Sauvez votre "
 "travail."
 
-#: src/text.c:737
+#: src/text.c:961
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Action refaite (%s)"
@@ -3608,7 +3631,7 @@ msgstr "Action refaite (%s)"
 #
 # File: src/text.c, line: 1944
 # File: src/text.c, line: 1944
-#: src/text.c:827 src/text.c:2508 src/text.c:2944
+#: src/text.c:1051 src/text.c:2765 src/text.c:3198
 msgid "Could not create pipe"
 msgstr "Impossible de créer un tube"
 
@@ -3619,15 +3642,15 @@ msgstr "Impossible de créer un tube"
 # File: src/text.c, line: 468
 # File: src/text.c, line: 2032
 # File: src/text.c, line: 2179
-#: src/text.c:853 src/text.c:2595 src/text.c:2750 src/text.c:2992
-#: src/text.c:3286
+#: src/text.c:1077 src/text.c:2852 src/text.c:3005 src/text.c:3246
+#: src/text.c:3540
 msgid "Could not fork"
 msgstr "Impossible de créer un nouveau processus"
 
 #
 # File: src/text.c, line: 1270
 # File: src/text.c, line: 1270
-#: src/text.c:1853
+#: src/text.c:2117
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Mauvaise chaîne de citation %s : %s"
@@ -3635,63 +3658,72 @@ msgstr "Mauvaise chaîne de citation %s : %s"
 #
 # File: src/text.c, line: 1666
 # File: src/text.c, line: 1666
-#: src/text.c:2241
+#: src/text.c:2499
 msgid "Can now UnJustify!"
 msgstr "Il est maintenant possible de dé-justifier !"
 
 #
 # File: src/text.c, line: 1858
 # File: src/text.c, line: 1858
-#: src/text.c:2435
+#: src/text.c:2697
 msgid "Edit a replacement"
 msgstr "Entrez une correction"
 
+#
+# File: src/global.c, line: 605
+# File: src/global.c, line: 605
+#. TRANSLATORS: Shown after fixing misspellings in one word.
+#: src/text.c:2713
+#, fuzzy
+msgid "Next word..."
+msgstr "Mot suivant"
+
 #
 # File: src/text.c, line: 1946
 # File: src/text.c, line: 1946
-#: src/text.c:2510
+#: src/text.c:2767
 msgid "Creating misspelled word list, please wait..."
 msgstr "Création de la liste des fautes, veuillez patienter..."
 
 #
 # File: src/text.c, line: 2038
 # File: src/text.c, line: 2038
-#: src/text.c:2601 src/text.c:2999
+#: src/text.c:2858 src/text.c:3253
 msgid "Could not get size of pipe buffer"
 msgstr "Impossible d'obtenir la taille de tampon du tube"
 
 #
 # File: src/text.c, line: 2089
 # File: src/text.c, line: 2089
-#: src/text.c:2652
+#: src/text.c:2907
 msgid "Error invoking \"spell\""
 msgstr "erreur d'appel de « spell »"
 
 #
 # File: src/text.c, line: 2092
 # File: src/text.c, line: 2092
-#: src/text.c:2655
+#: src/text.c:2910
 msgid "Error invoking \"sort -f\""
 msgstr "erreur à l'appel de « sort -f »"
 
 #
 # File: src/text.c, line: 2095
 # File: src/text.c, line: 2095
-#: src/text.c:2658
+#: src/text.c:2913
 msgid "Error invoking \"uniq\""
 msgstr "erreur à l'appel de « uniq »"
 
 #
 # File: src/global.c, line: 339
 # File: src/global.c, line: 339
-#: src/text.c:2881
+#: src/text.c:3135
 msgid "Invoking spell checker, please wait"
 msgstr "Appel du correcteur orthographique, veuillez patienter"
 
 #
 # File: src/text.c, line: 2346
 # File: src/text.c, line: 2346
-#: src/text.c:2897
+#: src/text.c:3151
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Échec de la correction : %s"
@@ -3699,7 +3731,7 @@ msgstr "Échec de la correction : %s"
 #
 # File: src/text.c, line: 2348
 # File: src/text.c, line: 2348
-#: src/text.c:2899
+#: src/text.c:3153
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Échec de la correction : %s : %s"
@@ -3707,71 +3739,71 @@ msgstr "Échec de la correction : %s : %s"
 #
 # File: src/text.c, line: 2351
 # File: src/text.c, line: 2351
-#: src/text.c:2902
+#: src/text.c:3156
 msgid "Finished checking spelling"
 msgstr "Vérification orthographique terminée"
 
 #
 # File: src/nano.c, line: 764
 # File: src/nano.c, line: 764
-#: src/text.c:2927
+#: src/text.c:3181
 msgid "No linter defined for this type of file!"
 msgstr "Aucun analyseur statique défini pour ce type de fichiers !"
 
-#: src/text.c:2932
+#: src/text.c:3186
 msgid "Save modified buffer before linting?"
 msgstr "Sauver l'espace modifié avant l'analyse statique ?"
 
-#: src/text.c:2949
+#: src/text.c:3203
 msgid "Invoking linter, please wait"
 msgstr "Lancement de l'analyse statique, veuillez patienter"
 
-#: src/text.c:3105
+#: src/text.c:3358
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr "La commande « %s » n'a produit aucune ligne analysable"
 
-#: src/text.c:3134
+#: src/text.c:3388
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
 "Ce message concerne le fichier non ouvert %s. L'ouvrir dans un nouvel "
 "espace ?"
 
-#: src/text.c:3153
+#: src/text.c:3407
 msgid "No more errors in unopened files, cancelling"
 msgstr "Plus d'erreur dans les fichiers non ouverts, abandon."
 
 #
 # File: src/nano.c, line: 735
 # File: src/nano.c, line: 735
-#: src/text.c:3192
+#: src/text.c:3446
 msgid "At last message"
 msgstr "Dernier message"
 
 #
 # File: src/nano.c, line: 735
 # File: src/nano.c, line: 735
-#: src/text.c:3197
+#: src/text.c:3451
 msgid "At first message"
 msgstr "Premier message"
 
-#: src/text.c:3237
+#: src/text.c:3491
 msgid "Finished"
 msgstr "Terminé"
 
-#: src/text.c:3259
+#: src/text.c:3513
 msgid "Invoking formatter, please wait"
 msgstr "Lancement de la mise en forme, veuillez patienter"
 
-#: src/text.c:3314
+#: src/text.c:3568
 msgid "Finished formatting"
 msgstr "Mise en forme terminée"
 
 #
 # File: src/text.c, line: 2416
 # File: src/text.c, line: 2416
-#: src/text.c:3396
+#: src/text.c:3650
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%s %lu mots,  %ld lignes, %lu caractères"
@@ -3779,7 +3811,7 @@ msgstr "%s %lu mots,  %ld lignes, %lu caractères"
 #
 # File: src/text.c, line: 2417
 # File: src/text.c, line: 2417
-#: src/text.c:3397
+#: src/text.c:3651
 msgid "In Selection:  "
 msgstr "Contenu de la sélection : "
 
@@ -3790,7 +3822,7 @@ msgstr "Contenu de la sélection : "
 # File: src/text.c, line: 2431
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3411
+#: src/text.c:3665
 msgid "Verbatim Input"
 msgstr "Entrée telle quelle"
 
@@ -3799,10 +3831,23 @@ msgstr "Entrée telle quelle"
 # File: src/utils.c, line: 377
 # File: src/utils.c, line: 365
 # File: src/utils.c, line: 377
-#: src/utils.c:391 src/utils.c:403
+#: src/utils.c:392 src/utils.c:404
 msgid "nano is out of memory!"
 msgstr "nano n'a plus de mémoire !"
 
+#: src/utils.c:625
+#, c-format
+msgid "Internal error: can't match line %d.  Please save your work."
+msgstr ""
+"Erreur interne : impossible de trouver une correspondance pour la ligne %d. "
+"Sauvez votre travail."
+
+#. TRANSLATORS: This refers to a sequence of escape codes
+#. * (from the keyboard) that nano does not know about.
+#: src/winio.c:1121
+msgid "Unknown sequence"
+msgstr ""
+
 #
 # File: src/winio.c, line: 1467
 # File: src/winio.c, line: 1467
@@ -3812,12 +3857,26 @@ msgstr "nano n'a plus de mémoire !"
 msgid "Unicode Input"
 msgstr "Entrée Unicode"
 
+#
+# File: src/winio.c, line: 2018
+# File: src/winio.c, line: 2018
+#: src/winio.c:1960
+msgid "DIR:"
+msgstr "RÉP. :"
+
+#
+# File: src/winio.c, line: 2025
+# File: src/winio.c, line: 2025
+#: src/winio.c:1968
+msgid "File:"
+msgstr "Fichier :"
+
 #
 # File: src/winio.c, line: 2004
 # File: src/winio.c, line: 2007
 # File: src/winio.c, line: 2004
 # File: src/winio.c, line: 2007
-#: src/winio.c:1991 src/winio.c:1995
+#: src/winio.c:1972 src/winio.c:1976
 msgid "Modified"
 msgstr "Modifié"
 
@@ -3827,28 +3886,14 @@ msgstr "Modifié"
 # déborder sur le bord haut de l'écran.
 # File: src/winio.c, line: 2005
 # File: src/winio.c, line: 2005
-#: src/winio.c:1992
+#: src/winio.c:1974
 msgid "View"
 msgstr "Voir"
 
-#
-# File: src/winio.c, line: 2018
-# File: src/winio.c, line: 2018
-#: src/winio.c:2006
-msgid "DIR:"
-msgstr "RÉP. :"
-
-#
-# File: src/winio.c, line: 2025
-# File: src/winio.c, line: 2025
-#: src/winio.c:2013
-msgid "File:"
-msgstr "Fichier :"
-
 #
 # File: src/winio.c, line: 3046
 # File: src/winio.c, line: 3046
-#: src/winio.c:3141
+#: src/winio.c:3105
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "ligne %ld/%ld (%d%%), col. %lu/%lu (%d%%), car. %lu/%lu (%d%%)"
@@ -3856,63 +3901,176 @@ msgstr "ligne %ld/%ld (%d%%), col. %lu/%lu (%d%%), car. %lu/%lu (%d%%)"
 #
 # File: src/winio.c, line: 3166
 # File: src/winio.c, line: 3166
-#: src/winio.c:3271
+#: src/winio.c:3235
 msgid "The nano text editor"
 msgstr "L'éditeur de texte nano"
 
 #
 # File: src/winio.c, line: 3167
 # File: src/winio.c, line: 3167
-#: src/winio.c:3272
+#: src/winio.c:3236
 msgid "version"
 msgstr "version"
 
 #
 # File: src/winio.c, line: 3168
 # File: src/winio.c, line: 3168
-#: src/winio.c:3273
+#: src/winio.c:3237
 msgid "Brought to you by:"
 msgstr "Proposé par :"
 
 #
 # File: src/winio.c, line: 3169
 # File: src/winio.c, line: 3169
-#: src/winio.c:3274
+#: src/winio.c:3238
 msgid "Special thanks to:"
 msgstr "Remerciements particuliers à :"
 
 #
 # File: src/winio.c, line: 3170
 # File: src/winio.c, line: 3170
-#: src/winio.c:3275
+#: src/winio.c:3239
 msgid "The Free Software Foundation"
 msgstr "La Free Software Foundation"
 
-#: src/winio.c:3276
+#: src/winio.c:3240
 msgid "the many translators and the TP"
 msgstr "les nombreux traducteurs et le TP"
 
 #
 # File: src/winio.c, line: 3171
 # File: src/winio.c, line: 3171
-#: src/winio.c:3277
+#: src/winio.c:3241
 msgid "For ncurses:"
 msgstr "Pour ncurses :"
 
 #
 # File: src/winio.c, line: 3172
 # File: src/winio.c, line: 3172
-#: src/winio.c:3278
+#: src/winio.c:3242
 msgid "and anyone else we forgot..."
 msgstr "et toute autre personne que nous aurions oubliée..."
 
 #
 # File: src/winio.c, line: 3173
 # File: src/winio.c, line: 3173
-#: src/winio.c:3279
+#: src/winio.c:3243
 msgid "Thank you for using nano!"
 msgstr "Merci d'utiliser nano !"
 
+#
+# File: src/files.c, line: 559
+# File: src/files.c, line: 559
+#~ msgid ""
+#~ "Read %lu line (Converted from DOS and Mac format - Warning: No write "
+#~ "permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from DOS and Mac format - Warning: No write "
+#~ "permission)"
+#~ msgstr[0] ""
+#~ "Lecture de %lu ligne (convertie des formats DOS et Mac - En lecture "
+#~ "seule !)"
+#~ msgstr[1] ""
+#~ "Lecture de %lu lignes (converties des formats DOS et Mac - En lecture "
+#~ "seule !)"
+
+#
+# File: src/files.c, line: 564
+# File: src/files.c, line: 564
+#~ msgid ""
+#~ "Read %lu line (Converted from Mac format - Warning: No write permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from Mac format - Warning: No write permission)"
+#~ msgstr[0] ""
+#~ "Lecture de %lu ligne (convertie du format Mac - En lecture seule !)"
+#~ msgstr[1] ""
+#~ "Lecture de %lu lignes (converties du format Mac - En lecture seule !)"
+
+#
+# File: src/files.c, line: 569
+# File: src/files.c, line: 569
+#~ msgid ""
+#~ "Read %lu line (Converted from DOS format - Warning: No write permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from DOS format - Warning: No write permission)"
+#~ msgstr[0] ""
+#~ "Lecture de %lu ligne (convertie du format DOS - En lecture seule !)"
+#~ msgstr[1] ""
+#~ "Lecture de %lu lignes (converties du format DOS - En lecture seule !)"
+
+#~ msgid "Read %lu line (Warning: No write permission)"
+#~ msgid_plural "Read %lu lines (Warning: No write permission)"
+#~ msgstr[0] "Lecture de %lu ligne (Attention : en lecture seule !)"
+#~ msgstr[1] "Lecture de %lu lignes (Attention : en lecture seule !)"
+
+#
+# File: src/nano.c, line: 940
+# File: src/nano.c, line: 940
+#~ msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
+#~ msgstr ""
+#~ "Sauver l'espace modifié (RÉPONDRE « Non » EFFACERA LES CHANGEMENTS) ? "
+
+#
+# File: src/nano.c, line: 1361
+# File: src/winio.c, line: 530
+# File: src/nano.c, line: 1361
+# File: src/winio.c, line: 530
+#~ msgid "Unknown Command"
+#~ msgstr "Commande inconnue"
+
+#
+# File: src/rcfile.c, line: 460
+# File: src/rcfile.c, line: 460
+#~ msgid "Cannot add a color command without a syntax command"
+#~ msgstr ""
+#~ "un directive de coloration (color) doit être précédée d'une commande "
+#~ "« syntax »"
+
+#
+# File: src/rcfile.c, line: 503
+# File: src/rcfile.c, line: 503
+#~ msgid "Missing regex string"
+#~ msgstr "chaîne d'expr. rationnelle manquante"
+
+#
+# File: src/rcfile.c, line: 460
+# File: src/rcfile.c, line: 460
+#~ msgid "Cannot add a header regex without a syntax command"
+#~ msgstr ""
+#~ "impossible d'ajouter un motif d'en-tête non précédé d'une commande "
+#~ "« syntax »"
+
+#
+# File: src/rcfile.c, line: 460
+# File: src/rcfile.c, line: 460
+#~ msgid "Cannot add a magic string regex without a syntax command"
+#~ msgstr "impossible d'ajouter un motif Magic sans commande « syntax »"
+
+#
+# File: src/rcfile.c, line: 503
+# File: src/rcfile.c, line: 503
+#~ msgid "Missing magic string name"
+#~ msgstr "chaîne de motif Magic manquante"
+
+#
+# File: src/rcfile.c, line: 460
+# File: src/rcfile.c, line: 460
+#~ msgid "Cannot add a linter without a syntax command"
+#~ msgstr "impossible d'ajouter un analyseur statique sans commande « syntax »"
+
+#
+# File: src/rcfile.c, line: 460
+# File: src/rcfile.c, line: 460
+#~ msgid "Cannot add formatter without a syntax command"
+#~ msgstr ""
+#~ "Impossible d'ajouter un outil de mise en forme sans commande « syntax »"
+
+#
+# File: src/rcfile.c, line: 465
+# File: src/rcfile.c, line: 465
+#~ msgid "Missing formatter command"
+#~ msgstr "Commande de l'outil de mise en forme manquante"
+
 #
 # File: src/files.c, line: 1301
 # File: src/files.c, line: 1301
diff --git a/po/ga.po b/po/ga.po
index 1b68c7f1..ec377d71 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 2.1.7pre1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-25 16:41-0500\n"
+"POT-Creation-Date: 2016-06-17 15:41+0200\n"
 "PO-Revision-Date: 2008-10-23 15:14-0500\n"
 "Last-Translator: Kevin Scannell <kscanne@gmail.com>\n"
 "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
@@ -18,159 +18,177 @@ msgstr ""
 "Plural-Forms: nplurals=5; plural=n==1 ? 0 : n==2 ? 1 : (n>2 && n<7) ? 2 :"
 "(n>6 && n<11) ? 3 : 4;\n"
 
+#: src/browser.c:144 src/browser.c:284 src/browser.c:334 src/files.c:996
+#: src/files.c:1003 src/files.c:1794 src/files.c:1919 src/files.c:1963
+#: src/files.c:1983 src/files.c:2099 src/files.c:3019 src/files.c:3242
+#: src/rcfile.c:540 src/rcfile.c:1280
+#, c-format
+msgid "Error reading %s: %s"
+msgstr "Earráid agus %s á léamh: %s"
+
 #. TRANSLATORS: This is a prompt.
-#: src/browser.c:220
+#: src/browser.c:247
 msgid "Go To Directory"
 msgstr "Téigh go Comhadlann"
 
-#: src/browser.c:227 src/browser.c:738 src/files.c:1174 src/files.c:2340
-#: src/nano.c:1120 src/search.c:202 src/search.c:290 src/search.c:895
-#: src/search.c:970 src/text.c:2935 src/text.c:3142
+#: src/browser.c:254 src/browser.c:723 src/files.c:1126 src/files.c:2292
+#: src/nano.c:1128 src/search.c:195 src/search.c:297 src/search.c:851
+#: src/search.c:918 src/text.c:3189 src/text.c:3396
 msgid "Cancelled"
 msgstr "Cealaithe"
 
-#: src/browser.c:253 src/browser.c:300
-#, c-format
-msgid "Can't go outside of %s in restricted mode"
+#. TRANSLATORS: This refers to the option --operatingdir,
+#. * not to --restricted.
+#: src/browser.c:274 src/browser.c:326
+#, fuzzy, c-format
+msgid "Can't go outside of %s in confined mode"
 msgstr "Ní féidir %s a fhágáil sa mhód teoranta"
 
-#: src/browser.c:264 src/browser.c:310 src/browser.c:326 src/files.c:1044
-#: src/files.c:1052 src/files.c:1844 src/files.c:1971 src/files.c:2016
-#: src/files.c:2037 src/files.c:2156 src/files.c:3062 src/files.c:3285
-#: src/rcfile.c:596 src/rcfile.c:1435
-#, c-format
-msgid "Error reading %s: %s"
-msgstr "Earráid agus %s á léamh: %s"
-
-#: src/browser.c:290
+#: src/browser.c:317
 msgid "Can't move up a directory"
 msgstr "Ní féidir dul go dtí an chomhadlann thuas"
 
 # max 7 with parens on 80 col screen --kps
 #. TRANSLATORS: Try to keep this at most 7 characters.
-#: src/browser.c:615 src/browser.c:623
+#: src/browser.c:590 src/browser.c:598
 msgid "(dir)"
 msgstr "cmhdlnn"
 
 #. TRANSLATORS: Try to keep this at most 12 characters.
-#: src/browser.c:620
+#: src/browser.c:595
 msgid "(parent dir)"
 msgstr "téigh suas"
 
 #. TRANSLATORS: Try to keep this at most 7 characters.
 #. * If necessary, you can leave out the parentheses.
-#: src/browser.c:650
+#: src/browser.c:625
 msgid "(huge)"
 msgstr ""
 
 #. TRANSLATORS: This is the main search prompt.
-#: src/browser.c:727 src/search.c:173
+#: src/browser.c:712 src/search.c:166
 msgid "Search"
 msgstr "Cuardaigh"
 
-#: src/browser.c:777 src/search.c:466 src/search.c:536
-msgid "This is the only occurrence"
-msgstr "Níor aimsíodh an patrún in aon áit eile"
-
-#: src/browser.c:793 src/search.c:364
+#: src/browser.c:754 src/search.c:368
 msgid "Search Wrapped"
 msgstr "Thimfhill an Cuardach"
 
-#: src/browser.c:843 src/search.c:517
+#: src/browser.c:764 src/search.c:509
+msgid "This is the only occurrence"
+msgstr "Níor aimsíodh an patrún in aon áit eile"
+
+#: src/browser.c:812 src/search.c:473
 msgid "No current search pattern"
 msgstr "Níl patrún cuardaigh ann faoi láthair"
 
-#: src/files.c:50
+#: src/color.c:186
+#, fuzzy, c-format
+msgid "Unknown syntax name: %s"
+msgstr "Ainm dúblach comhréire %s"
+
+#: src/color.c:247
+#, c-format
+msgid "magic_load() failed: %s"
+msgstr ""
+
+#: src/color.c:251
+#, c-format
+msgid "magic_file(%s) failed: %s"
+msgstr ""
+
+#: src/files.c:47
 #, c-format
 msgid "Directory '%s' does not exist"
 msgstr ""
 
-#: src/files.c:52
+#: src/files.c:49
 #, c-format
 msgid "Path '%s': %s"
 msgstr ""
 
-#: src/files.c:54
+#: src/files.c:51
 #, fuzzy, c-format
 msgid "Path '%s' is not a directory"
 msgstr "Is comhadlann é \"%s\""
 
-#: src/files.c:57
+#: src/files.c:53
 #, c-format
 msgid "Path '%s' is not accessible"
 msgstr ""
 
-#. TRANSLATORS: Try to keep this at most 76 characters.
-#: src/files.c:158
+#. TRANSLATORS: Keep the next ten messages at most 76 characters.
+#: src/files.c:148
 msgid ""
 "Warning: Modifying a file which is not locked, check directory permission?"
 msgstr ""
 
-#: src/files.c:197
+#: src/files.c:187
 msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
 msgstr ""
 
-#: src/files.c:206
+#: src/files.c:196
 #, fuzzy, c-format
 msgid "Couldn't determine hostname for lock file: %s"
 msgstr "Níorbh fhéidir comhad sealadach a chruthú: %s"
 
-#: src/files.c:227 src/files.c:238 src/files.c:275 src/files.c:285
+#: src/files.c:216 src/files.c:225 src/files.c:262 src/files.c:272
 #, fuzzy, c-format
 msgid "Error writing lock file %s: %s"
 msgstr "Earráid agus comhad cúltaca %s á scríobh: %s"
 
-#: src/files.c:305
+#: src/files.c:291
 #, fuzzy, c-format
 msgid "Error deleting lock file %s: %s"
 msgstr "Earráid agus comhad cúltaca %s á scríobh: %s"
 
-#: src/files.c:341
+#: src/files.c:325
 #, fuzzy, c-format
 msgid "Error opening lock file %s: %s"
 msgstr "Earráid agus comhad cúltaca %s á scríobh: %s"
 
-#: src/files.c:353
+#: src/files.c:337
 #, c-format
 msgid "Error reading lock file %s: Not enough data read"
 msgstr ""
 
 #. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
-#: src/files.c:371
+#: src/files.c:354
 #, c-format
 msgid "File %s is being edited (by %s with %s, PID %d); continue?"
 msgstr ""
 
-#: src/files.c:426
+#: src/files.c:430
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Ní féidir comhad a ionsá ón taobh amuigh de %s"
 
-#: src/files.c:439 src/files.c:1038 src/rcfile.c:589 src/rcfile.c:1385
-#: src/rcfile.c:1426
+#: src/files.c:445 src/files.c:991 src/rcfile.c:533 src/rcfile.c:1230
+#: src/rcfile.c:1271
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "Is comhadlann é \"%s\""
 
-#: src/files.c:441
+#: src/files.c:447
 #, fuzzy, c-format
 msgid "\"%s\" is not a normal file"
 msgstr "Is comhad gléis é \"%s\""
 
-#: src/files.c:566
+#: src/files.c:571
 msgid "No more open file buffers"
 msgstr "Níl aon mhaoláin oscailte fágtha"
 
-#: src/files.c:582
+#: src/files.c:586
 #, c-format
 msgid "Switched to %s"
 msgstr "Athraithe go %s"
 
-#: src/files.c:584 src/global.c:988 src/winio.c:2010
+#: src/files.c:588 src/global.c:1005 src/winio.c:1965
 msgid "New Buffer"
 msgstr "Maolán Nua"
 
-#: src/files.c:943
+#. TRANSLATORS: Keep the next four messages at most 76 characters.
+#: src/files.c:913
 #, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
@@ -180,21 +198,7 @@ msgstr[2] "Léadh %lu líne (tiontaithe ó fhormáid DOS/Mac)"
 msgstr[3] "Léadh %lu líne (tiontaithe ó fhormáid DOS/Mac)"
 msgstr[4] "Léadh %lu líne (tiontaithe ó fhormáid DOS/Mac)"
 
-#: src/files.c:948
-#, fuzzy, c-format
-msgid ""
-"Read %lu line (Converted from DOS and Mac format - Warning: No write "
-"permission)"
-msgid_plural ""
-"Read %lu lines (Converted from DOS and Mac format - Warning: No write "
-"permission)"
-msgstr[0] "Léadh %lu líne (tiontaithe ó fhormáid DOS/Mac)"
-msgstr[1] "Léadh %lu líne (tiontaithe ó fhormáid DOS/Mac)"
-msgstr[2] "Léadh %lu líne (tiontaithe ó fhormáid DOS/Mac)"
-msgstr[3] "Léadh %lu líne (tiontaithe ó fhormáid DOS/Mac)"
-msgstr[4] "Léadh %lu líne (tiontaithe ó fhormáid DOS/Mac)"
-
-#: src/files.c:954
+#: src/files.c:919
 #, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
@@ -204,19 +208,7 @@ msgstr[2] "Léadh %lu líne (tiontaithe ó fhormáid Mac)"
 msgstr[3] "Léadh %lu líne (tiontaithe ó fhormáid Mac)"
 msgstr[4] "Léadh %lu líne (tiontaithe ó fhormáid Mac)"
 
-#: src/files.c:958
-#, fuzzy, c-format
-msgid ""
-"Read %lu line (Converted from Mac format - Warning: No write permission)"
-msgid_plural ""
-"Read %lu lines (Converted from Mac format - Warning: No write permission)"
-msgstr[0] "Léadh %lu líne (tiontaithe ó fhormáid Mac)"
-msgstr[1] "Léadh %lu líne (tiontaithe ó fhormáid Mac)"
-msgstr[2] "Léadh %lu líne (tiontaithe ó fhormáid Mac)"
-msgstr[3] "Léadh %lu líne (tiontaithe ó fhormáid Mac)"
-msgstr[4] "Léadh %lu líne (tiontaithe ó fhormáid Mac)"
-
-#: src/files.c:964
+#: src/files.c:925
 #, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
@@ -226,19 +218,7 @@ msgstr[2] "Léadh %lu líne (tiontaithe ó fhormáid DOS)"
 msgstr[3] "Léadh %lu líne (tiontaithe ó fhormáid DOS)"
 msgstr[4] "Léadh %lu líne (tiontaithe ó fhormáid DOS)"
 
-#: src/files.c:968
-#, fuzzy, c-format
-msgid ""
-"Read %lu line (Converted from DOS format - Warning: No write permission)"
-msgid_plural ""
-"Read %lu lines (Converted from DOS format - Warning: No write permission)"
-msgstr[0] "Léadh %lu líne (tiontaithe ó fhormáid DOS)"
-msgstr[1] "Léadh %lu líne (tiontaithe ó fhormáid DOS)"
-msgstr[2] "Léadh %lu líne (tiontaithe ó fhormáid DOS)"
-msgstr[3] "Léadh %lu líne (tiontaithe ó fhormáid DOS)"
-msgstr[4] "Léadh %lu líne (tiontaithe ó fhormáid DOS)"
-
-#: src/files.c:974
+#: src/files.c:930
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
@@ -248,90 +228,80 @@ msgstr[2] "Léadh %lu líne"
 msgstr[3] "Léadh %lu líne"
 msgstr[4] "Léadh %lu líne"
 
-#: src/files.c:977
-#, c-format
-msgid "Read %lu line (Warning: No write permission)"
-msgid_plural "Read %lu lines (Warning: No write permission)"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-
-#: src/files.c:1019 src/files.c:1056
+#: src/files.c:974 src/files.c:1006
 msgid "Reading File"
 msgstr "Comhad á Léamh"
 
-#: src/files.c:1025
+#: src/files.c:980
 msgid "New File"
 msgstr "Comhad Nua"
 
-#: src/files.c:1028
-#, c-format
-msgid "\"%s\" not found"
+#: src/files.c:983
+#, fuzzy, c-format
+msgid "File \"%s\" not found"
 msgstr "\"%s\" gan aimsiú"
 
-#: src/files.c:1039 src/rcfile.c:590 src/rcfile.c:1386 src/rcfile.c:1427
+#: src/files.c:992 src/rcfile.c:534 src/rcfile.c:1231 src/rcfile.c:1272
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "Is comhad gléis é \"%s\""
 
-#: src/files.c:1133
+#: src/files.c:1083
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Ordú le rith i maolán nua [ó %s] "
 
-#: src/files.c:1135
+#: src/files.c:1085
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Ordú le rith [ó %s]"
 
-#: src/files.c:1142
+#: src/files.c:1092
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Comhad le hionsá i maolán nua [ó %s] "
 
-#: src/files.c:1144
+#: src/files.c:1094
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Comhad le hionsá [ó %s]"
 
-#: src/files.c:1389
+#: src/files.c:1338
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Eochair neamhcheadaithe mura bhfuiltear i mód ilmhaoláin"
 
-#: src/files.c:1684
-msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+#: src/files.c:1632
+msgid "Failed to write backup file; continue saving? (Say N if unsure.) "
 msgstr ""
 
-#: src/files.c:1800
+#: src/files.c:1750
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Ní féidir scríobh lasmuigh de %s"
 
-#: src/files.c:1885 src/files.c:1910 src/files.c:1928 src/files.c:1941
-#: src/files.c:1952 src/files.c:1981
+#: src/files.c:1833 src/files.c:1858 src/files.c:1876 src/files.c:1889
+#: src/files.c:1900 src/files.c:1928
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Earráid agus comhad cúltaca %s á scríobh: %s"
 
-#: src/files.c:1886 src/nano.c:690
+#: src/files.c:1834 src/nano.c:692
 msgid "Too many backup files?"
 msgstr "An iomarca comhad cúltaca?"
 
-#: src/files.c:2026 src/text.c:2863 src/text.c:2875 src/text.c:3244
-#: src/text.c:3253
+#: src/files.c:1972 src/text.c:3117 src/text.c:3129 src/text.c:3498
+#: src/text.c:3507
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Earráid agus comhad sealadach á scríobh: %s"
 
-#: src/files.c:2049 src/files.c:2068 src/files.c:2080 src/files.c:2104
-#: src/files.c:2121 src/files.c:2131 src/files.c:2164 src/files.c:2171
+#: src/files.c:1994 src/files.c:2013 src/files.c:2023 src/files.c:2047
+#: src/files.c:2064 src/files.c:2074 src/files.c:2106 src/files.c:2113
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Earráid agus %s á scríobh: %s"
 
-#: src/files.c:2200
+#: src/files.c:2154
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
@@ -341,63 +311,66 @@ msgstr[2] "Scríobhadh %lu líne"
 msgstr[3] "Scríobhadh %lu líne"
 msgstr[4] "Scríobhadh %lu líne"
 
-#: src/files.c:2299
+#: src/files.c:2249
 msgid " [DOS Format]"
 msgstr " [Formáid DOS]"
 
-#: src/files.c:2300
+#: src/files.c:2250
 msgid " [Mac Format]"
 msgstr " [Formáid Mac]"
 
-#: src/files.c:2302
+#: src/files.c:2252
 msgid " [Backup]"
 msgstr " [Cúltaca]"
 
-#: src/files.c:2309
+#: src/files.c:2259
 msgid "Prepend Selection to File"
 msgstr "Réamhcheangail an Roghnúchán le Comhad"
 
-#: src/files.c:2310
+#: src/files.c:2260
 msgid "Append Selection to File"
 msgstr "Iarcheangail an Roghnúchán le Comhad"
 
-#: src/files.c:2311
+#: src/files.c:2261
 msgid "Write Selection to File"
 msgstr "Scríobh an Roghnúchán i gComhad"
 
-#: src/files.c:2314
+#: src/files.c:2264
 msgid "File Name to Prepend to"
 msgstr "Comhad is mian leat Réamhcheangal leis"
 
-#: src/files.c:2315
+#: src/files.c:2265
 msgid "File Name to Append to"
 msgstr "Comhad is mian leat Iarcheangal leis"
 
-#: src/files.c:2316
+#: src/files.c:2266
 msgid "File Name to Write"
 msgstr "Ainm Comhaid le Scríobh"
 
-#: src/files.c:2349
-msgid "Save modified buffer anyway ? "
+#: src/files.c:2301
+msgid "Save modified buffer anyway? "
 msgstr ""
 
-#: src/files.c:2457
-msgid "File exists, OVERWRITE ? "
-msgstr "Tá an comhad ann; FORSCRÍOBH ? "
-
-#: src/files.c:2466
-msgid "Save file under DIFFERENT NAME ? "
+#: src/files.c:2412
+#, fuzzy
+msgid "Save file under DIFFERENT NAME? "
 msgstr "Sábháil an comhad le hAINM DIFRIÚIL ? "
 
-#: src/files.c:2480
-msgid "File was modified since you opened it, continue saving ? "
+#: src/files.c:2420
+#, fuzzy, c-format
+msgid "File \"%s\" exists; OVERWRITE? "
+msgstr "Tá an comhad ann; FORSCRÍOBH ? "
+
+#: src/files.c:2441
+#, fuzzy
+msgid "File was modified since you opened it; continue saving? "
 msgstr "Athraíodh an comhad ón am a d'oscail tú é; sábháil é mar sin féin?"
 
-#: src/files.c:2917
+#: src/files.c:2874
 msgid "(more)"
 msgstr "(tuilleadh)"
 
-#: src/files.c:3004
+#: src/files.c:2959
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -406,28 +379,28 @@ msgstr ""
 "\n"
 "Brúigh \"Enter\" chun dul ar aghaidh le tosú nano.\n"
 
-#: src/files.c:3020
+#: src/files.c:2975
 #, c-format
 msgid ""
 "Unable to create directory %s: %s\n"
 "It is required for saving/loading search history or cursor positions.\n"
 msgstr ""
 
-#: src/files.c:3026
+#: src/files.c:2982
 #, c-format
 msgid ""
 "Path %s is not a directory and needs to be.\n"
 "Nano will be unable to load or save search history or cursor positions.\n"
 msgstr ""
 
-#: src/files.c:3045
+#: src/files.c:3002
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I tried to move\n"
 "to the preferred location (%s) but encountered an error: %s"
 msgstr ""
 
-#: src/files.c:3049
+#: src/files.c:3006
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I moved\n"
@@ -435,756 +408,787 @@ msgid ""
 "(see the nano FAQ about this change)"
 msgstr ""
 
-#: src/files.c:3132 src/files.c:3140 src/files.c:3164 src/files.c:3176
+#: src/files.c:3089 src/files.c:3097 src/files.c:3121 src/files.c:3133
 #, fuzzy, c-format
 msgid "Error writing %s: %s\n"
 msgstr "Earráid agus %s á scríobh: %s"
 
 #. TRANSLATORS: Try to keep the next fifteen strings at most 10 characters.
-#: src/global.c:480
+#: src/global.c:483
 msgid "Exit"
 msgstr "Scoir"
 
 # next batch are main menu - should be 9 characters at most
 # 10 characters fit, but with no space before next option
 # I'm assuming an 80 column terminal here
-#: src/global.c:481
+#: src/global.c:484
 msgid "Close"
 msgstr "Dún"
 
-#: src/global.c:482
+#: src/global.c:485
 #, fuzzy
 msgid "Uncut Text"
 msgstr "DíGhearr Téacs"
 
-#: src/global.c:484
+#: src/global.c:487
 #, fuzzy
 msgid "Unjustify"
 msgstr "DíComhfhdú"
 
-#: src/global.c:490
+#: src/global.c:493
 msgid "Read File"
 msgstr "Léigh"
 
-#: src/global.c:491
+#: src/global.c:494
 msgid "Where Is"
 msgstr "Cuardach"
 
-#: src/global.c:492
+#: src/global.c:495
 msgid "Replace"
 msgstr "Ionadaigh"
 
-#: src/global.c:493
+#: src/global.c:496
 msgid "Go To Line"
 msgstr "Téigh Go Líne"
 
-#: src/global.c:494
+#: src/global.c:497
 msgid "Prev Line"
 msgstr "An Líne Roimhe Seo"
 
-#: src/global.c:495
+#: src/global.c:498
 msgid "Next Line"
 msgstr "An Chéad Líne Eile"
 
 # main menu - keep short?
-#: src/global.c:496
+#: src/global.c:499
 msgid "Prev Page"
 msgstr "Ar Ais"
 
 # main menu - keep short?
-#: src/global.c:497
+#: src/global.c:500
 msgid "Next Page"
 msgstr "Ar Aghaidh"
 
-#: src/global.c:499
+#: src/global.c:502
 msgid "Justify"
 msgstr "Comhfhadú"
 
-#: src/global.c:500
+#: src/global.c:503
 msgid "FullJstify"
 msgstr "LánComhfhadú"
 
-#: src/global.c:502
+#: src/global.c:505
 msgid "Refresh"
 msgstr "Athnuaigh"
 
 #. TRANSLATORS: Try to keep this string at most 12 characters.
-#: src/global.c:505
+#: src/global.c:508
 msgid "WhereIs Next"
 msgstr "Cuardaigh Arís"
 
 #. TRANSLATORS: The next long series of strings are shortcut descriptions;
 #. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:512
+#: src/global.c:515
 msgid "Justify the current paragraph"
 msgstr "Comhfhadaigh an t-alt reatha"
 
-#: src/global.c:514
+#: src/global.c:517
 msgid "Cancel the current function"
 msgstr "Cealaigh an fheidhm reatha"
 
-#: src/global.c:515
+#: src/global.c:518
 msgid "Display this help text"
 msgstr "Taispeáin an chabhair seo"
 
-#: src/global.c:518
+#: src/global.c:521
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Dún an maolán reatha / Scoir nano"
 
-#: src/global.c:520
+#: src/global.c:523
 msgid "Exit from nano"
 msgstr "Scoir nano"
 
-#: src/global.c:524
+#: src/global.c:527
 msgid "Write the current file to disk"
 msgstr "Scríobh an comhad reatha ar an diosca"
 
-#: src/global.c:526
+#: src/global.c:529
 msgid "Insert another file into the current one"
 msgstr "Ionsáigh comhad eile isteach sa cheann reatha"
 
-#: src/global.c:528
+#: src/global.c:531
 msgid "Search for a string or a regular expression"
 msgstr "Cuardach ar theaghrán nó slonn ionadaíochta"
 
-#: src/global.c:531
+#: src/global.c:533
 #, fuzzy
 msgid "Search for a string"
 msgstr "Cuardach ar theaghrán nó slonn ionadaíochta"
 
-#: src/global.c:533
+#: src/global.c:534
+msgid "Refresh the file list"
+msgstr ""
+
+#: src/global.c:535
+#, fuzzy
+msgid "Go to lefthand column"
+msgstr "Téigh go dtí an líne agus an colún sonraithe"
+
+#: src/global.c:536
+#, fuzzy
+msgid "Go to righthand column"
+msgstr "Téigh go dtí an líne agus an colún sonraithe"
+
+#: src/global.c:538
 #, fuzzy
 msgid "Go one screenful up"
 msgstr "Téigh chuig an chéad scáileán eile"
 
-#: src/global.c:534
+#: src/global.c:539
 #, fuzzy
 msgid "Go one screenful down"
 msgstr "Téigh chuig an chéad scáileán eile"
 
-#: src/global.c:536
+#: src/global.c:541
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Gearr an líne reatha agus cuir é sa mhaolán ghearrtha"
 
-#: src/global.c:538
+#: src/global.c:543
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Greamaigh ón mhaolán gearrtha isteach sa líne reatha"
 
-#: src/global.c:539
+#: src/global.c:544
 msgid "Display the position of the cursor"
 msgstr "Taispeáin ionad an chúrsóra"
 
-#: src/global.c:541
+#: src/global.c:546
 msgid "Invoke the spell checker, if available"
 msgstr "Rith an litreoir, má tá sé ar fáil"
 
-#: src/global.c:543
+#: src/global.c:548
 msgid "Replace a string or a regular expression"
 msgstr "Ionadaigh teaghrán nó slonn ionadaíochta"
 
-#: src/global.c:544
+#: src/global.c:549
 msgid "Go to line and column number"
 msgstr "Téigh go dtí an líne agus an colún sonraithe"
 
-#: src/global.c:546
+#: src/global.c:551
 #, fuzzy
 msgid "Mark text starting from the cursor position"
 msgstr "Marcáil téacs ag ionad an chúrsóra"
 
-#: src/global.c:547
+#: src/global.c:552
 #, fuzzy
 msgid "Repeat the last search"
 msgstr "An cuardach céanna arís"
 
-#: src/global.c:549
+#: src/global.c:554
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "Cóipeáil an líne reatha agus cuir é sa mhaolán ghearrtha"
 
-#: src/global.c:550
+#: src/global.c:555
 msgid "Indent the current line"
 msgstr "Eangaigh an líne reatha"
 
-#: src/global.c:551
+#: src/global.c:556
 msgid "Unindent the current line"
 msgstr "Dí-eangaigh an líne reatha"
 
-#: src/global.c:552
+#: src/global.c:558
+msgid "Comment/uncomment the current line or marked lines"
+msgstr ""
+
+#: src/global.c:560
 msgid "Undo the last operation"
 msgstr "Cealaigh an oibríocht is déanaí"
 
-#: src/global.c:553
+#: src/global.c:561
 msgid "Redo the last undone operation"
 msgstr "Athdhéan an oibríocht is déanaí a cealaíodh"
 
-#: src/global.c:555
+#: src/global.c:563
 msgid "Go back one character"
 msgstr "Carachtar amháin siar"
 
-#: src/global.c:556
+#: src/global.c:564
 msgid "Go forward one character"
 msgstr "Ar aghaidh carachtar amháin"
 
-#: src/global.c:558
+#: src/global.c:566
 msgid "Go back one word"
 msgstr "Téigh siar focal amháin"
 
-#: src/global.c:559
+#: src/global.c:567
 msgid "Go forward one word"
 msgstr "Téigh ar aghaidh focal amháin"
 
-#: src/global.c:561
+#: src/global.c:569
 msgid "Go to previous line"
 msgstr "Téigh go dtí an líne roimhe seo"
 
-#: src/global.c:562
+#: src/global.c:570
 msgid "Go to next line"
 msgstr "Téigh go dtí an chéad líne eile"
 
-#: src/global.c:563
+#: src/global.c:571
 msgid "Go to beginning of current line"
 msgstr "Téigh go tosach na líne reatha"
 
-#: src/global.c:564
+#: src/global.c:572
 msgid "Go to end of current line"
 msgstr "Téigh go deireadh na líne reatha"
 
-#: src/global.c:567
+#: src/global.c:575
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "Téigh go tús an ailt reatha; ansin an ceann roimhe sin"
 
-#: src/global.c:569
+#: src/global.c:577
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr "Téigh thar deireadh an ailt reatha; ansin an t-alt tar éis sin"
 
-#: src/global.c:571
+#: src/global.c:579
 msgid "Go to the first line of the file"
 msgstr "Téigh go dtí an chéad líne sa chomhad"
 
-#: src/global.c:572
+#: src/global.c:580
 msgid "Go to the last line of the file"
 msgstr "Téigh go dtí an líne dheiridh sa chomhad"
 
-#: src/global.c:574
+#: src/global.c:582
 msgid "Go to the matching bracket"
 msgstr "Téigh go dtí an lúibín comhoiriúnach"
 
-#: src/global.c:576
+#: src/global.c:584
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "Scrollaigh suas líne amháin, ach ná scrollaigh an cúrsóir"
 
-#: src/global.c:578
+#: src/global.c:586
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "Scrollaigh síos líne amháin, ach ná scrollaigh an cúrsóir"
 
-#: src/global.c:581
+#: src/global.c:589
 msgid "Switch to the previous file buffer"
 msgstr "Athraigh go dtí an maolán roimhe seo"
 
-#: src/global.c:582
+#: src/global.c:590
 msgid "Switch to the next file buffer"
 msgstr "Athraigh go dtí an chéad mhaolán eile"
 
-#: src/global.c:584
+#: src/global.c:592
 msgid "Insert the next keystroke verbatim"
 msgstr "Ionsáigh an chéad charachtar eile go litriúil"
 
-#: src/global.c:585
+#: src/global.c:593
 msgid "Insert a tab at the cursor position"
 msgstr "Ionsáigh táb ag an gcúrsóir"
 
-#: src/global.c:586
+#: src/global.c:594
 msgid "Insert a newline at the cursor position"
 msgstr "Ionsáigh líne nua ag an gcúrsóir"
 
-#: src/global.c:587
+#: src/global.c:595
 msgid "Delete the character under the cursor"
 msgstr "Scrios an carachtar faoin chúrsóir"
 
-#: src/global.c:589
+#: src/global.c:597
 msgid "Delete the character to the left of the cursor"
 msgstr "Scrios an carachtar ar an taobh clé den chúrsóir"
 
-#: src/global.c:592
+#: src/global.c:600
 #, fuzzy
 msgid "Cut backward from cursor to word start"
 msgstr "Gearr ón chúrsóir go deireadh na líne"
 
-#: src/global.c:594
+#: src/global.c:602
 #, fuzzy
 msgid "Cut forward from cursor to next word start"
 msgstr "Gearr ón chúrsóir go deireadh na líne"
 
-#: src/global.c:596
+#: src/global.c:604
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Gearr ón chúrsóir go deireadh an chomhaid"
 
-#: src/global.c:599
+#: src/global.c:607
 msgid "Justify the entire file"
 msgstr "Comhfhadaigh an comhad iomlán"
 
-#: src/global.c:603
+#: src/global.c:611
 msgid "Count the number of words, lines, and characters"
 msgstr "Áirigh líon na bhfocal, líon na línte, agus líon na gcarachtar"
 
-#: src/global.c:606
+#: src/global.c:614
 msgid "Refresh (redraw) the current screen"
 msgstr "Athnuaigh (ataispeáin) an scáileán reatha"
 
-#: src/global.c:608
+#: src/global.c:616
 #, fuzzy
 msgid "Suspend the editor (if suspension is enabled)"
 msgstr "Cuir an t-eagarthóir ar fionraí (más féidir)"
 
-#: src/global.c:610
+#: src/global.c:618
 msgid "Save file without prompting"
 msgstr ""
 
-#: src/global.c:611
+#: src/global.c:619
 msgid "Search next occurrence backward"
 msgstr ""
 
-#: src/global.c:612
+#: src/global.c:620
 msgid "Search next occurrence forward"
 msgstr ""
 
-#: src/global.c:614
+#: src/global.c:622
 msgid "Toggle the case sensitivity of the search"
 msgstr "Scoránaigh cásíogaireacht"
 
-#: src/global.c:616
+#: src/global.c:624
 msgid "Reverse the direction of the search"
 msgstr "Scoránaigh treo an chuardaigh"
 
-#: src/global.c:620
+#: src/global.c:628
 msgid "Toggle the use of regular expressions"
 msgstr "Scoránaigh úsáid de shloinn ionadaíochta"
 
-#: src/global.c:624
+#: src/global.c:632
 msgid "Recall the previous search/replace string"
 msgstr "Athghair an teaghrán cuardaigh roimhe seo"
 
-#: src/global.c:626
+#: src/global.c:634
 msgid "Recall the next search/replace string"
 msgstr "Athghair an chéad teaghrán cuardaigh eile"
 
-#: src/global.c:629
+#: src/global.c:637
 msgid "Go to file browser"
 msgstr "Téigh go brabhsálaí na gcomhad"
 
-#: src/global.c:632
+#: src/global.c:640
 msgid "Toggle the use of DOS format"
 msgstr "Scoránaigh úsáid d'fhormáid DOS"
 
-#: src/global.c:633
+#: src/global.c:641
 msgid "Toggle the use of Mac format"
 msgstr "Scoránaigh úsáid d'fhormáid Mac"
 
-#: src/global.c:634
+#: src/global.c:642
 msgid "Toggle appending"
 msgstr "Scoránaigh iarcheangal"
 
-#: src/global.c:635
+#: src/global.c:643
 msgid "Toggle prepending"
 msgstr "Scoránaigh réamhcheangal"
 
-#: src/global.c:636
+#: src/global.c:644
 msgid "Toggle backing up of the original file"
 msgstr "Scoránaigh cúltacaí"
 
-#: src/global.c:637
+#: src/global.c:645
 msgid "Execute external command"
 msgstr "Rith ordú seachtrach"
 
-#: src/global.c:639
+#: src/global.c:647
 msgid "Close buffer without saving it"
 msgstr ""
 
-#: src/global.c:641
+#: src/global.c:649
 msgid "Toggle the use of a new buffer"
 msgstr "Scoránaigh úsáid de mhaolán nua"
 
-#: src/global.c:644
+#: src/global.c:652
 msgid "Exit from the file browser"
 msgstr "Scoir brabhsálaí na gcomhad"
 
-#: src/global.c:645
+#: src/global.c:653
 msgid "Go to the first file in the list"
 msgstr "Téigh go dtí an chéad chomhad sa liosta"
 
-#: src/global.c:646
+#: src/global.c:654
 msgid "Go to the last file in the list"
 msgstr "Téigh go dtí an comhad deiridh sa liosta"
 
-#: src/global.c:647
+#: src/global.c:655
 #, fuzzy
 msgid "Go to the previous file in the list"
 msgstr "Téigh go dtí an chéad chomhad sa liosta"
 
-#: src/global.c:648
+#: src/global.c:656
 #, fuzzy
 msgid "Go to the next file in the list"
 msgstr "Téigh go dtí an comhad deiridh sa liosta"
 
-#: src/global.c:649
+#: src/global.c:657
 msgid "Go to directory"
 msgstr "Téigh go comhadlann"
 
-#: src/global.c:652
+#: src/global.c:660
 #, fuzzy
 msgid "Invoke the linter, if available"
 msgstr "Rith an litreoir, má tá sé ar fáil"
 
-#: src/global.c:653
+#: src/global.c:661
 #, fuzzy
 msgid "Go to previous linter msg"
 msgstr "Téigh go dtí an líne roimhe seo"
 
-#: src/global.c:654
+#: src/global.c:662
 #, fuzzy
 msgid "Go to next linter msg"
 msgstr "Téigh go dtí an chéad líne eile"
 
-#: src/global.c:656
+#: src/global.c:664
 #, fuzzy
 msgid "Invoke formatter, if available"
 msgstr "Rith an litreoir, má tá sé ar fáil"
 
 #. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:671
+#: src/global.c:679
 msgid "Get Help"
 msgstr "Cabhair"
 
-#: src/global.c:674 src/prompt.c:858
+#: src/global.c:682 src/prompt.c:855
 msgid "Cancel"
 msgstr "Cealaigh"
 
-#: src/global.c:687
+#: src/global.c:695
 #, fuzzy
 msgid "Write Out"
 msgstr "Scríobh"
 
-#: src/global.c:723
+#: src/global.c:731
 msgid "Go To Dir"
 msgstr "Téigh i gComhadlann"
 
-#: src/global.c:738
+#: src/global.c:746
 msgid "Cut Text"
 msgstr "Gearr"
 
-#: src/global.c:753
+#: src/global.c:761
 msgid "To Spell"
 msgstr "Litreoir"
 
-#: src/global.c:757
+#: src/global.c:765
 #, fuzzy
 msgid "To Linter"
 msgstr "Téigh Go Líne"
 
-#: src/global.c:760
+#: src/global.c:768
 #, fuzzy
 msgid "Formatter"
 msgstr "Formáid DOS"
 
-#: src/global.c:767
+#: src/global.c:775
 msgid "Case Sens"
 msgstr "Cásíogair"
 
-#: src/global.c:772
+#: src/global.c:780
 msgid "Regexp"
 msgstr "Slonn"
 
-#: src/global.c:777
+#: src/global.c:785
 msgid "Backwards"
 msgstr "Siar"
 
-#: src/global.c:784
+#: src/global.c:792
 msgid "No Replace"
 msgstr "Gan Ionadú"
 
-#: src/global.c:792
+#: src/global.c:800
 msgid "Cur Pos"
 msgstr "Cúrsóir"
 
-#: src/global.c:807
+#: src/global.c:815
 msgid "First Line"
 msgstr "An Chéad Líne"
 
-#: src/global.c:809
+#: src/global.c:817
 msgid "Last Line"
 msgstr "Líne Dheiridh"
 
-#: src/global.c:816
+#: src/global.c:824
 #, fuzzy
 msgid "To Bracket"
 msgstr "Ní lúibín é"
 
-#: src/global.c:819
+#: src/global.c:827
 msgid "Mark Text"
 msgstr "Marcáil Téacs"
 
-#: src/global.c:822
+#: src/global.c:830
 msgid "Copy Text"
 msgstr "Cóipeáil Téacs"
 
-#: src/global.c:825
+#: src/global.c:833
 msgid "Indent Text"
 msgstr "Eangaigh Téacs"
 
-#: src/global.c:827
+#: src/global.c:835
 msgid "Unindent Text"
 msgstr "Dí-eangaigh Téacs"
 
-#: src/global.c:830
+#: src/global.c:838
 msgid "Undo"
 msgstr "Cealaigh"
 
-#: src/global.c:832
+#: src/global.c:840
 msgid "Redo"
 msgstr "Athdhéan"
 
-#: src/global.c:836 src/global.c:842
+#: src/global.c:844 src/global.c:850
 msgid "Back"
 msgstr "Siar"
 
-#: src/global.c:838 src/global.c:844
+#: src/global.c:846 src/global.c:852
 msgid "Forward"
 msgstr "Ar Aghaidh"
 
-#: src/global.c:849
+#: src/global.c:857
 msgid "Prev Word"
 msgstr "An Focal Roimhe Seo"
 
-#: src/global.c:851
+#: src/global.c:859
 msgid "Next Word"
 msgstr "An Chéad Fhocal Eile"
 
-#: src/global.c:855
+#: src/global.c:863
 msgid "Home"
 msgstr "Baile"
 
-#: src/global.c:857
+#: src/global.c:865
 msgid "End"
 msgstr "Deireadh"
 
-#: src/global.c:866
+#: src/global.c:874
 msgid "Beg of Par"
 msgstr "Barr an Ailt"
 
-#: src/global.c:868
+#: src/global.c:876
 msgid "End of Par"
 msgstr "Bun an Ailt"
 
-#: src/global.c:873
+#: src/global.c:881
 msgid "Scroll Up"
 msgstr "Scrollaigh Suas"
 
-#: src/global.c:875
+#: src/global.c:883
 msgid "Scroll Down"
 msgstr "Scrollaigh Síos"
 
-#: src/global.c:880
+#: src/global.c:888
 #, fuzzy
 msgid "Prev File"
 msgstr "An Comhad Roimhe Seo"
 
-#: src/global.c:882
+#: src/global.c:890
 msgid "Next File"
 msgstr "An Chéad Chomhad Eile"
 
-#: src/global.c:891
+#: src/global.c:899
 #, fuzzy
 msgid "Verbatim"
 msgstr "Ionchur Litriúil"
 
-#: src/global.c:894
+#: src/global.c:902
 msgid "Tab"
 msgstr "Táb"
 
-#: src/global.c:896
+#: src/global.c:904
 msgid "Enter"
 msgstr "Iontráil"
 
-#: src/global.c:899
+#: src/global.c:907
 msgid "Delete"
 msgstr "Scrios"
 
-#: src/global.c:901
+#: src/global.c:909
 msgid "Backspace"
 msgstr "Cúlspás"
 
 #. TRANSLATORS: The next two strings refer to cutting words.
-#: src/global.c:912
+#: src/global.c:920
 #, fuzzy
 msgid "Cut Left"
 msgstr "Gearr"
 
-#: src/global.c:914
+#: src/global.c:922
 msgid "Cut Right"
 msgstr ""
 
-#: src/global.c:916
+#: src/global.c:924
 msgid "CutTillEnd"
 msgstr "GearrGoBun"
 
-#: src/global.c:926
+#: src/global.c:934
 msgid "Word Count"
 msgstr "Líon na bhFocal"
 
-#: src/global.c:933
+#: src/global.c:941
 msgid "Suspend"
 msgstr "Cuir ar Fionraí"
 
-#: src/global.c:937
+#: src/global.c:945
+#, fuzzy
+msgid "Comment Lines"
+msgstr "An Chéad Líne Eile"
+
+#: src/global.c:949
 msgid "Save"
 msgstr ""
 
-#: src/global.c:940
+#: src/global.c:952
 #, fuzzy
 msgid "Previous"
 msgstr "An Comhad Roimhe Seo"
 
 # main menu - keep short?
-#: src/global.c:942
+#: src/global.c:954
 #, fuzzy
 msgid "Next"
 msgstr "Ar Aghaidh"
 
-#: src/global.c:948
+#: src/global.c:960
 msgid "PrevHstory"
 msgstr "StairArAis"
 
-#: src/global.c:951
+#: src/global.c:963
 msgid "NextHstory"
 msgstr "StairArAghaidh"
 
-#: src/global.c:955
+#: src/global.c:972
 msgid "Go To Text"
 msgstr "Téigh Go Téacs"
 
-#: src/global.c:959
+#: src/global.c:976
 msgid "DOS Format"
 msgstr "Formáid DOS"
 
-#: src/global.c:961
+#: src/global.c:978
 msgid "Mac Format"
 msgstr "Formáid Mac"
 
-#: src/global.c:969
+#: src/global.c:986
 msgid "Append"
 msgstr "Iarcheangail"
 
-#: src/global.c:971
+#: src/global.c:988
 msgid "Prepend"
 msgstr "Réamhcheangail"
 
-#: src/global.c:974
+#: src/global.c:991
 msgid "Backup File"
 msgstr "Comhad Cúltaca"
 
-#: src/global.c:981
+#: src/global.c:998
 msgid "Execute Command"
 msgstr "Rith Ordú"
 
-#: src/global.c:996
+#: src/global.c:1013
 msgid "To Files"
 msgstr "Go Comhaid"
 
-#: src/global.c:1004
+#: src/global.c:1021
 msgid "First File"
 msgstr "An Chéad Chomhad"
 
-#: src/global.c:1006
+#: src/global.c:1023
 msgid "Last File"
 msgstr "Comhad Deiridh"
 
-#: src/global.c:1010
+#: src/global.c:1027
 msgid "Discard buffer"
 msgstr ""
 
+#: src/global.c:1038
+msgid "Left Column"
+msgstr ""
+
+#: src/global.c:1040
+msgid "Right Column"
+msgstr ""
+
 #. TRANSLATORS: Try to keep the next two strings at most 20 characters.
-#: src/global.c:1020
+#: src/global.c:1047
 #, fuzzy
 msgid "Prev Lint Msg"
 msgstr "An Líne Roimhe Seo"
 
-#: src/global.c:1022
+#: src/global.c:1049
 #, fuzzy
 msgid "Next Lint Msg"
 msgstr "An Chéad Líne Eile"
 
 #. TRANSLATORS: The next seventeen strings are toggle descriptions;
 #. * they are best kept shorter than 40 characters, but may be longer.
-#: src/global.c:1285
+#: src/global.c:1316
 msgid "Help mode"
 msgstr "Mód cabhrach"
 
-#: src/global.c:1287
+#: src/global.c:1318
 msgid "Constant cursor position display"
 msgstr "Taispeáin ionad an chúrsóra i gcónaí"
 
-#: src/global.c:1289
+#: src/global.c:1320
 msgid "Use of one more line for editing"
 msgstr "Úsáid líne amháin eile le haghaidh eagarthóireachta"
 
-#: src/global.c:1291
+#: src/global.c:1322
 msgid "Smooth scrolling"
 msgstr "Mínscrollú"
 
-#: src/global.c:1293
+#: src/global.c:1324
 #, fuzzy
 msgid "Soft wrapping of overlong lines"
 msgstr "Ná timfhill línte fada"
 
-#: src/global.c:1295
+#: src/global.c:1326
 msgid "Whitespace display"
 msgstr "Taispeáint spáis bháin"
 
-#: src/global.c:1297
+#: src/global.c:1328
 msgid "Color syntax highlighting"
 msgstr "Aibhsiú comhréire le dathanna"
 
-#: src/global.c:1299
+#: src/global.c:1330
 msgid "Smart home key"
 msgstr "Eochair bhaile chliste"
 
-#: src/global.c:1301
+#: src/global.c:1332
 msgid "Auto indent"
 msgstr "Uath-eangú"
 
-#: src/global.c:1303
+#: src/global.c:1334
 msgid "Cut to end"
 msgstr "Gearr go dtí an deireadh"
 
-#: src/global.c:1305
+#: src/global.c:1336
 #, fuzzy
 msgid "Hard wrapping of overlong lines"
 msgstr "Ná timfhill línte fada"
 
-#: src/global.c:1307
+#: src/global.c:1338
 msgid "Conversion of typed tabs to spaces"
 msgstr "Tiontaigh táib chlóscríofa go spásanna"
 
-#: src/global.c:1309
+#: src/global.c:1340
 msgid "Backup files"
 msgstr "Comhaid chúltaca"
 
-#: src/global.c:1311
+#: src/global.c:1342
 msgid "Reading file into separate buffer"
 msgstr ""
 
-#: src/global.c:1313
+#: src/global.c:1344
 msgid "Mouse support"
 msgstr "Tacaíocht luiche"
 
-#: src/global.c:1315
+#: src/global.c:1346
 msgid "No conversion from DOS/Mac format"
 msgstr "Ná tiontaigh ó fhormáid DOS/Mac"
 
-#: src/global.c:1317
+#: src/global.c:1348
 msgid "Suspension"
 msgstr "Cur ar Fionraí"
 
-#: src/help.c:209
+#: src/help.c:211
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1206,7 +1210,7 @@ msgstr ""
 "na leide chuardaigh.  Má bhrúnn tú \"Enter\" gan aon téacs, déanfar an "
 "cuardach céanna arís.  "
 
-#: src/help.c:218
+#: src/help.c:220
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1220,7 +1224,7 @@ msgstr ""
 "Tá na heochracha feidhme seo a leanas ar fáil sa mhód Cuardaigh:\n"
 "\n"
 
-#: src/help.c:224
+#: src/help.c:226
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1240,7 +1244,7 @@ msgstr ""
 "Tá na heochracha feidhme seo a leanas ar fáil sa mhód \"Téigh Go Líne\":\n"
 "\n"
 
-#: src/help.c:233
+#: src/help.c:235
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1263,7 +1267,7 @@ msgstr ""
 "comhad ionsáite  i maolán ar leith (úsáid Meta-< agus > chun bogadh idir "
 "maoláin oscailte).  "
 
-#: src/help.c:242
+#: src/help.c:244
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1274,7 +1278,7 @@ msgstr ""
 "Má theastaíonn tú maolán folamh nua, ná hiontráil ainm comhaid, is é sin nó "
 "iontráil ainm de chomhad nach ann agus brúigh \"Enter\".\n"
 
-#: src/help.c:248
+#: src/help.c:250
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1302,7 +1306,7 @@ msgstr ""
 "Tá na heochracha feidhme seo a leanas ar fáil sa mhód \"Scríobh Comhad\":\n"
 "\n"
 
-#: src/help.c:262
+#: src/help.c:264
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1324,7 +1328,7 @@ msgstr ""
 "chomhadlann aibhsithe.  Roghnaigh an chomhadlann darb ainm \"..\" ag barr "
 "liosta na gcomhad chun dul suas leibhéal amháin.\n"
 
-#: src/help.c:275
+#: src/help.c:277
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1348,7 +1352,7 @@ msgstr ""
 "cuardach céanna arís.\n"
 "\n"
 
-#: src/help.c:284
+#: src/help.c:286
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1357,7 +1361,7 @@ msgstr ""
 "\":\n"
 "\n"
 
-#: src/help.c:288
+#: src/help.c:290
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1381,7 +1385,7 @@ msgstr ""
 "\":\n"
 "\n"
 
-#: src/help.c:301
+#: src/help.c:303
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1405,7 +1409,7 @@ msgstr ""
 " Tá na heochracha feidhme seo a leanas ar fáil i mód an Litreora:\n"
 "\n"
 
-#: src/help.c:316
+#: src/help.c:318
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1425,7 +1429,7 @@ msgstr ""
 " Tá na heochracha feidhme seo a leanas ar fáil sa mhód \"Rith Ordú\":\n"
 "\n"
 
-#: src/help.c:329
+#: src/help.c:331
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1446,15 +1450,15 @@ msgstr ""
 "an comhad atá in eagar.  Taispeántar teachtaireachtaí tábhachtacha ar an "
 "líne stádais, an tríú líne ó bhun an scáileáin.  "
 
-#: src/help.c:339
+#: src/help.c:341
+#, fuzzy
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
-" The notation for shortcuts is as follows: Control-key sequences are notated "
-"with a caret (^) symbol and can be entered either by using the Control "
-"(Ctrl) key or pressing the Escape (Esc) key twice.  Escape-key sequences are "
-"notated with the Meta (M-) symbol and can be entered using either the Esc, "
-"Alt, or Meta key depending on your keyboard setup.  "
+" Shortcuts are written as follows: Control-key sequences are notated with a "
+"'^' and can be entered either by using the Ctrl key or pressing the Esc key "
+"twice.  Meta-key sequences are notated with 'M-' and can be entered using "
+"either the Alt, Cmd, or Esc key, depending on your keyboard setup.  "
 msgstr ""
 "Taispeántar na haicearraí is coitianta ar an dá líne dheiridh.\n"
 "\n"
@@ -1482,21 +1486,21 @@ msgstr ""
 msgid "enable/disable"
 msgstr "(cumasú/díchumasú)"
 
-#: src/nano.c:559
+#: src/nano.c:560
 #, fuzzy
 msgid "Key is invalid in view mode"
 msgstr "Eochair neamhcheadaithe sa mhód amhairc"
 
-#: src/nano.c:565
+#: src/nano.c:566
 #, fuzzy
 msgid "This function is disabled in restricted mode"
 msgstr "Ní féidir %s a fhágáil sa mhód teoranta"
 
-#: src/nano.c:573
+#: src/nano.c:574
 msgid "Help is not available"
 msgstr ""
 
-#: src/nano.c:684
+#: src/nano.c:686
 #, c-format
 msgid ""
 "\n"
@@ -1505,7 +1509,7 @@ msgstr ""
 "\n"
 "Scríobhadh an maolán i %s\n"
 
-#: src/nano.c:686
+#: src/nano.c:688
 #, c-format
 msgid ""
 "\n"
@@ -1514,7 +1518,7 @@ msgstr ""
 "\n"
 "Níor scríobhadh an maolán i %s: %s\n"
 
-#: src/nano.c:689
+#: src/nano.c:691
 #, c-format
 msgid ""
 "\n"
@@ -1781,17 +1785,22 @@ msgstr "Cumasaigh cur ar fionraí"
 msgid "Enable soft line wrapping"
 msgstr "Timfhilleadh líne"
 
-#: src/nano.c:937
-#, fuzzy, c-format
-msgid " GNU nano, version %s\n"
-msgstr " GNU nano, leagan %s (tiomsaithe %s, %s)\n"
-
 #: src/nano.c:940
 #, c-format
+msgid " nano, version %s\n"
+msgstr ""
+
+#: src/nano.c:943
+#, c-format
+msgid " (C) 2014..%s the contributors to nano\n"
+msgstr ""
+
+#: src/nano.c:945
+#, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr " R-phost: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 
-#: src/nano.c:941
+#: src/nano.c:946
 #, c-format
 msgid ""
 "\n"
@@ -1800,67 +1809,82 @@ msgstr ""
 "\n"
 " Roghanna tiomsaithe:"
 
-#: src/nano.c:1073
+#: src/nano.c:1081
 msgid "No file name"
 msgstr ""
 
-#: src/nano.c:1108
-msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
-msgstr "Sábháil an maolán athraithe (NÓ SCRIOSFAR DO CHUID ATHRUITHE) ? "
+#: src/nano.c:1115
+msgid "Save modified buffer?  (Answering \"No\" will DISCARD changes.) "
+msgstr ""
 
-#: src/nano.c:1168
+#: src/nano.c:1178
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr ""
 
-#: src/nano.c:1192
+#: src/nano.c:1202
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr ""
 
-#: src/nano.c:1256
+#: src/nano.c:1266
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Fuarthas SIGHUP nó SIGTERM\n"
 
-#: src/nano.c:1272
+#: src/nano.c:1282
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Úsáid \"fg\" chun dul ar ais go nano.\n"
 
-#: src/nano.c:1294
+#: src/nano.c:1304
 msgid "Suspension is not enabled"
 msgstr ""
 
-#: src/nano.c:1448
+#: src/nano.c:1459
 msgid "enabled"
 msgstr "cumasaithe"
 
-#: src/nano.c:1448
+#: src/nano.c:1459
 msgid "disabled"
 msgstr "díchumasaithe"
 
-#: src/nano.c:1607 src/winio.c:1125
-msgid "Unknown Command"
-msgstr "Ordú Anaithnid"
+#: src/nano.c:1573
+msgid "Unbound key"
+msgstr ""
+
+#: src/nano.c:1577
+#, c-format
+msgid "Unbound key: M-%c"
+msgstr ""
+
+#: src/nano.c:1579
+#, c-format
+msgid "Unbound key: ^%c"
+msgstr ""
+
+#: src/nano.c:1581
+#, c-format
+msgid "Unbound key: %c"
+msgstr ""
 
-#: src/nano.c:1720
+#: src/nano.c:1745
 msgid "XON ignored, mumble mumble"
 msgstr "Rinneadh neamhshuim ar XON :-("
 
-#: src/nano.c:1725
+#: src/nano.c:1750
 msgid "XOFF ignored, mumble mumble"
 msgstr "Rinneadh neamhshuim ar XOFF :-("
 
-#: src/nano.c:2139 src/rcfile.c:1334
+#: src/nano.c:2166 src/rcfile.c:1187
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Is neamhbhailí í méid táib iarrtha \"%s\""
 
-#: src/nano.c:2200 src/rcfile.c:1259
+#: src/nano.c:2227 src/rcfile.c:1128
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Is neamhbhailí í méid líonta iarrtha \"%s\""
 
-#: src/nano.c:2247
+#: src/nano.c:2276
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr ""
@@ -1868,117 +1892,121 @@ msgstr ""
 #. TRANSLATORS: For the next three strings, if possible, specify
 #. * the single-byte shortcuts for both your language and English.
 #. * For example, in French: "OoYy" for "Oui".
-#: src/prompt.c:821
+#: src/prompt.c:818
 msgid "Yy"
 msgstr "Ss"
 
-#: src/prompt.c:822
+#: src/prompt.c:819
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:823
+#: src/prompt.c:820
 msgid "Aa"
 msgstr "Uu"
 
-#: src/prompt.c:845
+#: src/prompt.c:842
 msgid "Yes"
 msgstr "Sábháil"
 
-#: src/prompt.c:850
+#: src/prompt.c:847
 msgid "All"
 msgstr "Uile"
 
-#: src/prompt.c:855
+#: src/prompt.c:852
 msgid "No"
 msgstr "Ná Sábháil"
 
-#: src/rcfile.c:142
+#: src/rcfile.c:144
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Earráid i %s ar líne %lu: "
 
-#: src/rcfile.c:201
+#: src/rcfile.c:203
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "Tá \" gan chríoch in argóint '%s'"
 
-#: src/rcfile.c:228 src/rcfile.c:280 src/rcfile.c:732 src/rcfile.c:793
-#: src/rcfile.c:882 src/rcfile.c:933
+#: src/rcfile.c:231 src/rcfile.c:674 src/rcfile.c:725 src/rcfile.c:824
 msgid "Regex strings must begin and end with a \" character"
 msgstr ""
 "Ní mór carachtar \" a bheith ag tosach agus ag deireadh sloinn ionadaíochta"
 
-#: src/rcfile.c:254 src/search.c:62
+#: src/rcfile.c:257 src/search.c:61
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Slonn ionadaíochta neamhbhailí \"%s\": %s"
 
-#: src/rcfile.c:274
+#: src/rcfile.c:279
 msgid "Missing syntax name"
 msgstr "Ainm comhréire ar iarraidh"
 
-#: src/rcfile.c:345
+#: src/rcfile.c:288
+msgid "A syntax name must be quoted"
+msgstr ""
+
+#: src/rcfile.c:297
 msgid "The \"none\" syntax is reserved"
 msgstr "Comhréir \"none\" in áirithe"
 
-#: src/rcfile.c:352
-msgid "The \"default\" syntax must take no extensions"
+#: src/rcfile.c:327
+#, fuzzy
+msgid "The \"default\" syntax does not accept extensions"
 msgstr "Ní cheadaítear eisínteachtaí leis an gcomhréir \"default\""
 
-#: src/rcfile.c:424
+#: src/rcfile.c:369
 msgid "Missing key name"
 msgstr "Ainm eochrach ar iarraidh"
 
-#: src/rcfile.c:433 src/rcfile.c:444
+#: src/rcfile.c:378 src/rcfile.c:389
 msgid "Key name is too short"
 msgstr ""
 
-#: src/rcfile.c:454
+#: src/rcfile.c:399
 #, fuzzy
 msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr "ní mór \"^\", \"M\", nó \"F\" a bheith ag tús ceangail eochrach\n"
 
-#: src/rcfile.c:457
+#: src/rcfile.c:402
 #, fuzzy, c-format
 msgid "Key name %s is invalid"
 msgstr "Is neamhbhailí í méid táib iarrtha \"%s\""
 
-#: src/rcfile.c:466
+#: src/rcfile.c:411
 #, fuzzy
 msgid "Must specify a function to bind the key to"
 msgstr "Ní mór duit feidhm a gceanglófar an eochair léi a thabhairt\n"
 
 #. TRANSLATORS: Do not translate the word "all".
-#: src/rcfile.c:476
+#: src/rcfile.c:421
 msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
 
-#: src/rcfile.c:483
+#: src/rcfile.c:428
 #, fuzzy, c-format
 msgid "Cannot map name \"%s\" to a function"
 msgstr "Níorbh fhéidir ainm \"%s\" a mhapáil go feidhm\n"
 
-#: src/rcfile.c:490
+#: src/rcfile.c:435
 #, fuzzy, c-format
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "Níorbh fhéidir ainm \"%s\" a mhapáil go roghchlár\n"
 
-#: src/rcfile.c:522
+#: src/rcfile.c:467
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr ""
 
-#: src/rcfile.c:534
+#: src/rcfile.c:479
 #, fuzzy, c-format
 msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "Tá brón orm, ceangal neamhcheadaithe é keystr \"%s\"\n"
 
-#: src/rcfile.c:631
+#: src/rcfile.c:576
 #, fuzzy, c-format
 msgid "Error expanding %s: %s"
 msgstr "Earráid agus %s á léamh: %s"
 
-#: src/rcfile.c:674
+#: src/rcfile.c:616
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1993,69 +2021,50 @@ msgstr ""
 "\"black\", leis an réimír roghnach \"bright\"\n"
 "le haghaidh dathanna tulra."
 
-#: src/rcfile.c:696
-msgid "Cannot add a color command without a syntax command"
-msgstr "Ní féidir ordú dhatha a chur leis gan ordú comhréire"
+#: src/rcfile.c:637 src/rcfile.c:795 src/rcfile.c:858
+#, c-format
+msgid "A '%s' command requires a preceding 'syntax' command"
+msgstr ""
 
-#: src/rcfile.c:701
+#: src/rcfile.c:643
 msgid "Missing color name"
 msgstr "Ainm datha ar iarraidh"
 
-#: src/rcfile.c:711 src/rcfile.c:872
-msgid "Missing regex string"
+#: src/rcfile.c:653 src/rcfile.c:807
+#, fuzzy, c-format
+msgid "Missing regex string after '%s' command"
 msgstr "Slonn ionadaíochta ar iarraidh"
 
-#: src/rcfile.c:787
+#: src/rcfile.c:719
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "Tá gá le \"end=\" in éineacht le gach \"start=\""
 
-#: src/rcfile.c:839
+#: src/rcfile.c:768
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
 msgstr "Ní cheadaítear do dhath cúlra \"%s\" a bheith geal"
 
-#: src/rcfile.c:867
-msgid "Cannot add a header regex without a syntax command"
-msgstr ""
-"Ní féidir slonn ionadaíochta don cheanntásc a chur leis gan ordú comhréire"
-
-#: src/rcfile.c:922
-#, fuzzy
-msgid "Cannot add a magic string regex without a syntax command"
-msgstr ""
-"Ní féidir slonn ionadaíochta don cheanntásc a chur leis gan ordú comhréire"
-
-#: src/rcfile.c:927
-#, fuzzy
-msgid "Missing magic string name"
-msgstr "Slonn ionadaíochta ar iarraidh"
+#: src/rcfile.c:802
+#, fuzzy, c-format
+msgid "The \"default\" syntax does not accept '%s' regexes"
+msgstr "Ní cheadaítear eisínteachtaí leis an gcomhréir \"default\""
 
-#: src/rcfile.c:985
-#, fuzzy
-msgid "Cannot add a linter without a syntax command"
+#: src/rcfile.c:863
+#, c-format
+msgid "Missing command after '%s'"
 msgstr ""
-"Ní féidir slonn ionadaíochta don cheanntásc a chur leis gan ordú comhréire"
 
-#: src/rcfile.c:990
-#, fuzzy
-msgid "Missing linter command"
-msgstr "Ainm datha ar iarraidh"
-
-#: src/rcfile.c:1011
-#, fuzzy
-msgid "Cannot add formatter without a syntax command"
-msgstr "Ní féidir ordú dhatha a chur leis gan ordú comhréire"
-
-#: src/rcfile.c:1016
-msgid "Missing formatter command"
-msgstr ""
+#: src/rcfile.c:879
+#, fuzzy, c-format
+msgid "Argument of '%s' lacks closing \""
+msgstr "Tá \" gan chríoch in argóint '%s'"
 
-#: src/rcfile.c:1046
+#: src/rcfile.c:910
 #, fuzzy, c-format
 msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr "Earráid mharfach: níl aon eochracha mapáilte le haghaidh feidhm \"%s\""
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:912
 #, fuzzy, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
@@ -2063,63 +2072,63 @@ msgstr ""
 "Á scor.  Úsáid nano leis an rogha -I más gá do chuid socruithe nanorc a "
 "athrú\n"
 
-#: src/rcfile.c:1109
+#: src/rcfile.c:971
 #, fuzzy, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "Níorbh fhéidir ainm \"%s\" a mhapáil go roghchlár\n"
 
-#: src/rcfile.c:1125 src/rcfile.c:1134 src/rcfile.c:1144
-#, c-format
-msgid "Command \"%s\" not allowed in included file"
-msgstr "Ní cheadaítear ordú \"%s\" i gcomhad iniata"
-
-#: src/rcfile.c:1150 src/rcfile.c:1359
+#: src/rcfile.c:993 src/rcfile.c:1202
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Níl orduithe datha ag an gcomhréir \"%s\""
 
-#: src/rcfile.c:1180
+#: src/rcfile.c:1024
+#, c-format
+msgid "Command \"%s\" not allowed in included file"
+msgstr "Ní cheadaítear ordú \"%s\" i gcomhad iniata"
+
+#: src/rcfile.c:1039
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Níor tuigeadh ordú \"%s\""
 
-#: src/rcfile.c:1195
+#: src/rcfile.c:1051
 #, fuzzy
 msgid "Missing option"
 msgstr "Ainm datha ar iarraidh"
 
-#: src/rcfile.c:1217
+#: src/rcfile.c:1065
+#, fuzzy, c-format
+msgid "Unknown option \"%s\""
+msgstr "Bratach anaithnid \"%s\""
+
+#: src/rcfile.c:1077
+#, fuzzy, c-format
+msgid "Cannot unset option \"%s\""
+msgstr "Ní féidir bratach \"%s\" a dhíchumasú"
+
+#: src/rcfile.c:1089
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Caithfidh tú argóint a thabhairt le rogha \"%s\""
 
-#: src/rcfile.c:1235
+#: src/rcfile.c:1105
 msgid "Option is not a valid multibyte string"
 msgstr "Níl an rogha ina teaghrán bailí il-bhirt"
 
-#: src/rcfile.c:1272 src/rcfile.c:1300 src/rcfile.c:1309
+#: src/rcfile.c:1139 src/rcfile.c:1160 src/rcfile.c:1167
 msgid "Non-blank characters required"
 msgstr "Carachtair neamhbhána de dhíth"
 
-#: src/rcfile.c:1282
+#: src/rcfile.c:1146
 msgid "Two single-column characters required"
 msgstr "Dhá charachtar aoncholúin de dhíth"
 
-#: src/rcfile.c:1348
-#, fuzzy, c-format
-msgid "Cannot unset option \"%s\""
-msgstr "Ní féidir bratach \"%s\" a dhíchumasú"
-
-#: src/rcfile.c:1354
-#, fuzzy, c-format
-msgid "Unknown option \"%s\""
-msgstr "Bratach anaithnid \"%s\""
-
-#: src/rcfile.c:1413
+#: src/rcfile.c:1258
 msgid "I can't find my home directory!  Wah!"
 msgstr "Ní féidir mo chomhadlann bhaile a aimsiú!  Ochón!"
 
-#: src/rcfile.c:1451
+#: src/rcfile.c:1295
 #, c-format
 msgid ""
 "\n"
@@ -2128,44 +2137,49 @@ msgstr ""
 "\n"
 "Brúigh \"Enter\" chun dul ar aghaidh le tosú nano.\n"
 
-#: src/search.c:96
+#: src/search.c:95
 #, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "\"%.*s%s\" gan aimsiú"
 
 #. TRANSLATORS: The next three strings are modifiers of the search prompt.
-#: src/search.c:176
+#: src/search.c:169
 msgid " [Case Sensitive]"
 msgstr " [Cásíogair]"
 
-#: src/search.c:180
+#: src/search.c:173
 msgid " [Regexp]"
 msgstr " [Slonn]"
 
-#: src/search.c:184
+#: src/search.c:177
 msgid " [Backwards]"
 msgstr " [Siar]"
 
 #. TRANSLATORS: The next two strings are modifiers of the search prompt.
-#: src/search.c:189
+#: src/search.c:182
 msgid " (to replace) in selection"
 msgstr " (le cur in ionad) i roghnúchán"
 
-#: src/search.c:191
+#: src/search.c:184
 msgid " (to replace)"
 msgstr " (le cur in ionad)"
 
+#: src/search.c:305
+#, fuzzy
+msgid "Searching..."
+msgstr "Cuardaigh"
+
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:718
+#: src/search.c:693
 msgid "Replace this instance?"
 msgstr "Ionadaigh an ceann seo?"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:883
+#: src/search.c:840
 msgid "Replace with"
 msgstr "Ionadaigh le"
 
-#: src/search.c:924
+#: src/search.c:875
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
@@ -2176,298 +2190,326 @@ msgstr[3] "Cuireadh teaghrán nua in ionad %lu n-uaire"
 msgstr[4] "Cuireadh teaghrán nua in ionad %lu uair"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:964
+#: src/search.c:914
 msgid "Enter line number, column number"
 msgstr "Iontráil uimhir na líne agus uimhir an cholúin"
 
-#: src/search.c:991
+#: src/search.c:939
 msgid "Invalid line or column number"
 msgstr "Uimhir líne nó uimhir cholúin neamhbhailí"
 
-#: src/search.c:1124
+#: src/search.c:1080
 msgid "Not a bracket"
 msgstr "Ní lúibín é"
 
-#: src/search.c:1191
+#: src/search.c:1146
 msgid "No matching bracket"
 msgstr "Níl lúibín comhoiriúnach ann"
 
-#: src/text.c:54
+#: src/text.c:53
 msgid "Mark Set"
 msgstr "Socraíodh Marc"
 
-#: src/text.c:58
+#: src/text.c:57
 msgid "Mark Unset"
 msgstr "Díshocraíodh Marc"
 
-#: src/text.c:70
+#: src/text.c:69
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Earráid agus \"%s\" á thosú"
 
-#: src/text.c:475
-msgid "Nothing in undo buffer!"
-msgstr "Níl faic le cealú!"
+#: src/text.c:468
+msgid "Commenting is not supported for this file type"
+msgstr ""
 
-#: src/text.c:481 src/text.c:634
-#, fuzzy, c-format
-msgid "Internal error: can't match line %d.  Please save your work."
+#: src/text.c:484
+msgid "Cannot comment past end of file"
 msgstr ""
-"Earráid inmheánach: ní féidir líne %d a mheaitseáil.  Sábháil do chuid oibre"
+
+#: src/text.c:677
+msgid "Nothing in undo buffer!"
+msgstr "Níl faic le cealú!"
 
 #. TRANSLATORS: Eight of the next nine strings describe actions
 #. * that are undone or redone.  It are all nouns, not verbs.
-#: src/text.c:495 src/text.c:524 src/text.c:645 src/text.c:686
+#: src/text.c:695 src/text.c:724 src/text.c:857 src/text.c:898
 msgid "text add"
 msgstr "téacs a chur leis"
 
-#: src/text.c:505 src/text.c:656
+#: src/text.c:705 src/text.c:868
 msgid "text delete"
 msgstr "téacs a scriosadh"
 
-#: src/text.c:528 src/text.c:694
+#: src/text.c:728 src/text.c:907
 msgid "line join"
 msgstr "líne a cheangal"
 
-#: src/text.c:547 src/text.c:710
+#: src/text.c:747 src/text.c:923
 msgid "text cut"
 msgstr "téacs a ghearradh"
 
-#: src/text.c:552 src/text.c:714
+#: src/text.c:752 src/text.c:927
 msgid "text uncut"
 msgstr "téacs a dhíghearradh"
 
-#: src/text.c:558 src/text.c:691
+#: src/text.c:758 src/text.c:903
 #, fuzzy
 msgid "Internal error: line is missing.  Please save your work."
 msgstr ""
 "Earráid inmheánach: ní féidir díghearradh a shocrú.  Sábháil do chuid oibre."
 
-#: src/text.c:561 src/text.c:665
+#: src/text.c:762 src/text.c:877
 msgid "line break"
 msgstr ""
 
-#: src/text.c:569 src/text.c:725
+#: src/text.c:772 src/text.c:947
+msgid "comment"
+msgstr ""
+
+#: src/text.c:776 src/text.c:951
+msgid "uncomment"
+msgstr ""
+
+#: src/text.c:780 src/text.c:938
 msgid "text insert"
 msgstr "téacs a ionsá"
 
-#: src/text.c:589 src/text.c:718
+#: src/text.c:800 src/text.c:931
 msgid "text replace"
 msgstr "téacs a ionadú"
 
-#: src/text.c:596 src/text.c:732 src/text.c:1030 src/text.c:1174
+#: src/text.c:807 src/text.c:955 src/text.c:1267 src/text.c:1437
 msgid "Internal error: unknown type.  Please save your work."
 msgstr "Earráid inmheánach: cineál anaithnid.  Sábháil do chuid oibre."
 
-#: src/text.c:601
+#: src/text.c:813
 #, c-format
 msgid "Undid action (%s)"
 msgstr "Cealaíodh gníomh (%s)"
 
-#: src/text.c:619
+#: src/text.c:832
 msgid "Nothing to re-do!"
 msgstr "Níl faic le hathdhéanamh!"
 
-#: src/text.c:628
+#: src/text.c:841
 #, fuzzy
 msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
 "Earráid inmheánach: ní féidir díghearradh a shocrú.  Sábháil do chuid oibre."
 
-#: src/text.c:737
+#: src/text.c:961
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Athrinneadh gníomh (%s)"
 
-#: src/text.c:827 src/text.c:2508 src/text.c:2944
+#: src/text.c:1051 src/text.c:2765 src/text.c:3198
 msgid "Could not create pipe"
 msgstr "Níorbh fhéidir píopa a chruthú"
 
-#: src/text.c:853 src/text.c:2595 src/text.c:2750 src/text.c:2992
-#: src/text.c:3286
+#: src/text.c:1077 src/text.c:2852 src/text.c:3005 src/text.c:3246
+#: src/text.c:3540
 msgid "Could not fork"
 msgstr "Níorbh fhéidir forc a dhéanamh"
 
-#: src/text.c:1853
+#: src/text.c:2117
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Drochtheaghrán athfhriotail %s: %s"
 
-#: src/text.c:2241
+#: src/text.c:2499
 msgid "Can now UnJustify!"
 msgstr "Is féidir DíChomhfhadú anois!"
 
-#: src/text.c:2435
+#: src/text.c:2697
 msgid "Edit a replacement"
 msgstr "Cuir ionadaí in eagar"
 
-#: src/text.c:2510
+#. TRANSLATORS: Shown after fixing misspellings in one word.
+#: src/text.c:2713
+#, fuzzy
+msgid "Next word..."
+msgstr "An Chéad Fhocal Eile"
+
+#: src/text.c:2767
 msgid "Creating misspelled word list, please wait..."
 msgstr "Liosta d'fhocail mílitrithe á chruthú; fan go fóill, le do thoil..."
 
-#: src/text.c:2601 src/text.c:2999
+#: src/text.c:2858 src/text.c:3253
 msgid "Could not get size of pipe buffer"
 msgstr "Níl aon fháil ar mhéid an mhaoláin píopa"
 
-#: src/text.c:2652
+#: src/text.c:2907
 msgid "Error invoking \"spell\""
 msgstr "Earráid agus \"spell\" á thosú"
 
-#: src/text.c:2655
+#: src/text.c:2910
 msgid "Error invoking \"sort -f\""
 msgstr "Earráid agus \"sort -f\" á thosú"
 
-#: src/text.c:2658
+#: src/text.c:2913
 msgid "Error invoking \"uniq\""
 msgstr "Earráid agus \"uniq\" á thosú"
 
-#: src/text.c:2881
+#: src/text.c:3135
 #, fuzzy
 msgid "Invoking spell checker, please wait"
 msgstr "Rith an litreoir, má tá sé ar fáil"
 
-#: src/text.c:2897
+#: src/text.c:3151
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Theip ar an litreoir: %s"
 
-#: src/text.c:2899
+#: src/text.c:3153
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Theip ar an litreoir: %s: %s"
 
-#: src/text.c:2902
+#: src/text.c:3156
 msgid "Finished checking spelling"
 msgstr "Chríochnaigh an litreoir"
 
-#: src/text.c:2927
+#: src/text.c:3181
 #, fuzzy
 msgid "No linter defined for this type of file!"
 msgstr "Ná cuir carachtair líne nua ag deireadh comhad"
 
-#: src/text.c:2932
+#: src/text.c:3186
 msgid "Save modified buffer before linting?"
 msgstr ""
 
-#: src/text.c:2949
+#: src/text.c:3203
 msgid "Invoking linter, please wait"
 msgstr ""
 
-#: src/text.c:3105
+#: src/text.c:3358
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr ""
 
-#: src/text.c:3134
+#: src/text.c:3388
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
 
-#: src/text.c:3153
+#: src/text.c:3407
 msgid "No more errors in unopened files, cancelling"
 msgstr ""
 
-#: src/text.c:3192
+#: src/text.c:3446
 #, fuzzy
 msgid "At last message"
 msgstr "Taispeáin an teachtaireacht seo"
 
-#: src/text.c:3197
+#: src/text.c:3451
 #, fuzzy
 msgid "At first message"
 msgstr "Taispeáin an teachtaireacht seo"
 
-#: src/text.c:3237
+#: src/text.c:3491
 msgid "Finished"
 msgstr ""
 
-#: src/text.c:3259
+#: src/text.c:3513
 msgid "Invoking formatter, please wait"
 msgstr ""
 
-#: src/text.c:3314
+#: src/text.c:3568
 msgid "Finished formatting"
 msgstr ""
 
-#: src/text.c:3396
+#: src/text.c:3650
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sFocail: %lu  Línte: %ld  Carachtair: %lu"
 
-#: src/text.c:3397
+#: src/text.c:3651
 msgid "In Selection:  "
 msgstr "Sa Roghnúchán:  "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3411
+#: src/text.c:3665
 msgid "Verbatim Input"
 msgstr "Ionchur Litriúil"
 
-#: src/utils.c:391 src/utils.c:403
+#: src/utils.c:392 src/utils.c:404
 msgid "nano is out of memory!"
 msgstr "cuimhne nano ídithe!"
 
+#: src/utils.c:625
+#, fuzzy, c-format
+msgid "Internal error: can't match line %d.  Please save your work."
+msgstr ""
+"Earráid inmheánach: ní féidir líne %d a mheaitseáil.  Sábháil do chuid oibre"
+
+#. TRANSLATORS: This refers to a sequence of escape codes
+#. * (from the keyboard) that nano does not know about.
+#: src/winio.c:1121
+msgid "Unknown sequence"
+msgstr ""
+
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
 #: src/winio.c:1427
 msgid "Unicode Input"
 msgstr "Ionchur Unicode"
 
-#: src/winio.c:1991 src/winio.c:1995
-msgid "Modified"
-msgstr "Athraithe"
-
-#: src/winio.c:1992
-msgid "View"
-msgstr "Amharc"
-
-#: src/winio.c:2006
+#: src/winio.c:1960
 msgid "DIR:"
 msgstr "COMHADLANN:"
 
-#: src/winio.c:2013
+#: src/winio.c:1968
 msgid "File:"
 msgstr "Comhad:"
 
-#: src/winio.c:3141
+#: src/winio.c:1972 src/winio.c:1976
+msgid "Modified"
+msgstr "Athraithe"
+
+#: src/winio.c:1974
+msgid "View"
+msgstr "Amharc"
+
+#: src/winio.c:3105
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "líne %ld/%ld (%d%%), colún %lu/%lu (%d%%), carachtar %lu/%lu (%d%%)"
 
-#: src/winio.c:3271
+#: src/winio.c:3235
 msgid "The nano text editor"
 msgstr "Eagarthóir téacs nano"
 
-#: src/winio.c:3272
+#: src/winio.c:3236
 msgid "version"
 msgstr "leagan"
 
-#: src/winio.c:3273
+#: src/winio.c:3237
 msgid "Brought to you by:"
 msgstr "Scríofa ag:"
 
-#: src/winio.c:3274
+#: src/winio.c:3238
 msgid "Special thanks to:"
 msgstr "Táimid fíorbhuíoch de:"
 
-#: src/winio.c:3275
+#: src/winio.c:3239
 msgid "The Free Software Foundation"
 msgstr "The Free Software Foundation"
 
-#: src/winio.c:3276
+#: src/winio.c:3240
 msgid "the many translators and the TP"
 msgstr ""
 
-#: src/winio.c:3277
+#: src/winio.c:3241
 msgid "For ncurses:"
 msgstr "As ncurses:"
 
-#: src/winio.c:3278
+#: src/winio.c:3242
 msgid "and anyone else we forgot..."
 msgstr "agus de gach duine eile a ndearnamar dearmad orthu..."
 
-#: src/winio.c:3279
+#: src/winio.c:3243
 msgid "Thank you for using nano!"
 msgstr "Go raibh maith agat as úsáid nano!"
 
@@ -2498,14 +2540,30 @@ msgstr "Go raibh maith agat as úsáid nano!"
 #~ msgid "(ignored, for Pico compatibility)"
 #~ msgstr "(rinneadh neamhshuim orthu seo - comhoiriúnacht le Pico)"
 
+#~ msgid " GNU nano version %s (compiled %s, %s)\n"
+#~ msgstr " GNU nano, leagan %s (tiomsaithe %s, %s)\n"
+
 #~ msgid "Sorry, support for this function has been disabled"
 #~ msgstr "Tá brón orm, díchumasaíodh an fheidhm seo"
 
+#~ msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
+#~ msgstr "Sábháil an maolán athraithe (NÓ SCRIOSFAR DO CHUID ATHRUITHE) ? "
+
+#~ msgid "Unknown Command"
+#~ msgstr "Ordú Anaithnid"
+
 #~ msgid "Must specify menu bind key to (or \"all\")\n"
 #~ msgstr ""
 #~ "Ní mór duit an roghchlár a gceanglófar an eochair leis a thabhairt (nó "
 #~ "\"all\")\n"
 
+#~ msgid "Cannot add a color command without a syntax command"
+#~ msgstr "Ní féidir ordú dhatha a chur leis gan ordú comhréire"
+
+#~ msgid "Cannot add a header regex without a syntax command"
+#~ msgstr ""
+#~ "Ní féidir slonn ionadaíochta don cheanntásc a chur leis gan ordú comhréire"
+
 #~ msgid "Missing flag"
 #~ msgstr "Bratach ar iarraidh"
 
@@ -2606,6 +2664,3 @@ msgstr "Go raibh maith agat as úsáid nano!"
 #~ msgstr ""
 #~ "Úsáid: nano [+LÍNE,COLÚN] [rogha fhada GNU] [rogha] [comhad]\n"
 #~ "\n"
-
-#~ msgid "Duplicate syntax name %s"
-#~ msgstr "Ainm dúblach comhréire %s"
diff --git a/po/gl.po b/po/gl.po
index 69f144e1..69dc4ac7 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 2.5.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-25 16:41-0500\n"
+"POT-Creation-Date: 2016-06-17 15:41+0200\n"
 "PO-Revision-Date: 2016-01-14 20:35+0100\n"
 "Last-Translator: Francisco Javier Tsao Santín <tsao@members.fsf.org>\n"
 "Language-Team: Galician <proxecto@trasno.net>\n"
@@ -18,376 +18,351 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n!=1;\n"
 
+#: src/browser.c:144 src/browser.c:284 src/browser.c:334 src/files.c:996
+#: src/files.c:1003 src/files.c:1794 src/files.c:1919 src/files.c:1963
+#: src/files.c:1983 src/files.c:2099 src/files.c:3019 src/files.c:3242
+#: src/rcfile.c:540 src/rcfile.c:1280
+#, c-format
+msgid "Error reading %s: %s"
+msgstr "Erro lendo %s: %s"
+
 #. TRANSLATORS: This is a prompt.
-#: src/browser.c:220
+#: src/browser.c:247
 msgid "Go To Directory"
 msgstr "Ir ó Directorio"
 
-#: src/browser.c:227 src/browser.c:738 src/files.c:1174 src/files.c:2340
-#: src/nano.c:1120 src/search.c:202 src/search.c:290 src/search.c:895
-#: src/search.c:970 src/text.c:2935 src/text.c:3142
+#: src/browser.c:254 src/browser.c:723 src/files.c:1126 src/files.c:2292
+#: src/nano.c:1128 src/search.c:195 src/search.c:297 src/search.c:851
+#: src/search.c:918 src/text.c:3189 src/text.c:3396
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: src/browser.c:253 src/browser.c:300
-#, c-format
-msgid "Can't go outside of %s in restricted mode"
+#. TRANSLATORS: This refers to the option --operatingdir,
+#. * not to --restricted.
+#: src/browser.c:274 src/browser.c:326
+#, fuzzy, c-format
+msgid "Can't go outside of %s in confined mode"
 msgstr "Non se pode saír de %s en modo restrinxido"
 
-#: src/browser.c:264 src/browser.c:310 src/browser.c:326 src/files.c:1044
-#: src/files.c:1052 src/files.c:1844 src/files.c:1971 src/files.c:2016
-#: src/files.c:2037 src/files.c:2156 src/files.c:3062 src/files.c:3285
-#: src/rcfile.c:596 src/rcfile.c:1435
-#, c-format
-msgid "Error reading %s: %s"
-msgstr "Erro lendo %s: %s"
-
-#: src/browser.c:290
+#: src/browser.c:317
 msgid "Can't move up a directory"
 msgstr "Non se pode ascender por un directorio"
 
 #. TRANSLATORS: Try to keep this at most 7 characters.
-#: src/browser.c:615 src/browser.c:623
+#: src/browser.c:590 src/browser.c:598
 msgid "(dir)"
 msgstr "(dir)"
 
 #. TRANSLATORS: Try to keep this at most 12 characters.
-#: src/browser.c:620
+#: src/browser.c:595
 msgid "(parent dir)"
 msgstr "(dir pai)"
 
 #. TRANSLATORS: Try to keep this at most 7 characters.
 #. * If necessary, you can leave out the parentheses.
-#: src/browser.c:650
+#: src/browser.c:625
 msgid "(huge)"
 msgstr "enorme"
 
 #. TRANSLATORS: This is the main search prompt.
-#: src/browser.c:727 src/search.c:173
+#: src/browser.c:712 src/search.c:166
 msgid "Search"
 msgstr "Busca"
 
-#: src/browser.c:777 src/search.c:466 src/search.c:536
-msgid "This is the only occurrence"
-msgstr "Esta é a única aparición"
-
-#: src/browser.c:793 src/search.c:364
+#: src/browser.c:754 src/search.c:368
 msgid "Search Wrapped"
 msgstr "Buscando dende o Principio"
 
-#: src/browser.c:843 src/search.c:517
+#: src/browser.c:764 src/search.c:509
+msgid "This is the only occurrence"
+msgstr "Esta é a única aparición"
+
+#: src/browser.c:812 src/search.c:473
 msgid "No current search pattern"
 msgstr "Non hai patrón de busca"
 
-#: src/files.c:50
+#: src/color.c:186
+#, fuzzy, c-format
+msgid "Unknown syntax name: %s"
+msgstr "Falla o nome da sintaxe"
+
+#: src/color.c:247
+#, c-format
+msgid "magic_load() failed: %s"
+msgstr ""
+
+#: src/color.c:251
+#, c-format
+msgid "magic_file(%s) failed: %s"
+msgstr ""
+
+#: src/files.c:47
 #, fuzzy, c-format
 msgid "Directory '%s' does not exist"
 msgstr "Erro escribindo ficheiro de bloqueo: Non existe o directorio '%s'"
 
-#: src/files.c:52
+#: src/files.c:49
 #, c-format
 msgid "Path '%s': %s"
 msgstr ""
 
-#: src/files.c:54
+#: src/files.c:51
 #, fuzzy, c-format
 msgid "Path '%s' is not a directory"
 msgstr "\"%s\" é un directorio"
 
-#: src/files.c:57
+#: src/files.c:53
 #, c-format
 msgid "Path '%s' is not accessible"
 msgstr ""
 
-#. TRANSLATORS: Try to keep this at most 76 characters.
-#: src/files.c:158
+#. TRANSLATORS: Keep the next ten messages at most 76 characters.
+#: src/files.c:148
 msgid ""
 "Warning: Modifying a file which is not locked, check directory permission?"
 msgstr ""
 "Aviso: Modificando un ficheiro que non está bloqueado, ¿revisar os permisos "
 "do directorio?"
 
-#: src/files.c:197
+#: src/files.c:187
 msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
 msgstr ""
 "Non se puido determina-la miña identidade para bloquea-lo ficheiro (fallou "
 "getpwuid())"
 
-#: src/files.c:206
+#: src/files.c:196
 #, c-format
 msgid "Couldn't determine hostname for lock file: %s"
 msgstr "Non se puido determina-lo nome do host para bloquea-lo ficheiro: %s"
 
-#: src/files.c:227 src/files.c:238 src/files.c:275 src/files.c:285
+#: src/files.c:216 src/files.c:225 src/files.c:262 src/files.c:272
 #, c-format
 msgid "Error writing lock file %s: %s"
 msgstr "Erro escribindo ficheiro de bloqueo %s: %s"
 
-#: src/files.c:305
+#: src/files.c:291
 #, c-format
 msgid "Error deleting lock file %s: %s"
 msgstr "Erro borrando ficheiro de bloqueo %s: %s"
 
-#: src/files.c:341
+#: src/files.c:325
 #, c-format
 msgid "Error opening lock file %s: %s"
 msgstr "Erro abrindo ficheiro de bloqueo %s: %s"
 
-#: src/files.c:353
+#: src/files.c:337
 #, c-format
 msgid "Error reading lock file %s: Not enough data read"
 msgstr "Erro lendo ficheiro de bloqueo %s: Non abondan datos para ler"
 
 #. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
-#: src/files.c:371
+#: src/files.c:354
 #, c-format
 msgid "File %s is being edited (by %s with %s, PID %d); continue?"
 msgstr "O ficheiro %s está sendo editado (por %s con %s, PID %d); ¿continuar?"
 
-#: src/files.c:426
+#: src/files.c:430
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Non se pode inserir un ficheiro de fóra de %s"
 
-#: src/files.c:439 src/files.c:1038 src/rcfile.c:589 src/rcfile.c:1385
-#: src/rcfile.c:1426
+#: src/files.c:445 src/files.c:991 src/rcfile.c:533 src/rcfile.c:1230
+#: src/rcfile.c:1271
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" é un directorio"
 
-#: src/files.c:441
+#: src/files.c:447
 #, c-format
 msgid "\"%s\" is not a normal file"
 msgstr "\"%s\" non é un ficheiro normal"
 
-#: src/files.c:566
+#: src/files.c:571
 msgid "No more open file buffers"
 msgstr "Non hai máis ficheiros abertos"
 
-#: src/files.c:582
+#: src/files.c:586
 #, c-format
 msgid "Switched to %s"
 msgstr "Cambiouse a %s"
 
-#: src/files.c:584 src/global.c:988 src/winio.c:2010
+#: src/files.c:588 src/global.c:1005 src/winio.c:1965
 msgid "New Buffer"
 msgstr "Novo buffer"
 
-#: src/files.c:943
+#. TRANSLATORS: Keep the next four messages at most 76 characters.
+#: src/files.c:913
 #, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
 msgstr[0] "Leuse %lu liña (Convertida dos formatos DOS e Mac)"
 msgstr[1] "Léronse %lu liñas (Convertidas dos formatos DOS e Mac)"
 
-#: src/files.c:948
-#, c-format
-msgid ""
-"Read %lu line (Converted from DOS and Mac format - Warning: No write "
-"permission)"
-msgid_plural ""
-"Read %lu lines (Converted from DOS and Mac format - Warning: No write "
-"permission)"
-msgstr[0] ""
-"Leuse %lu liña (Convertida dos formatos DOS e Mac - Advertencia: Non hai "
-"permiso de escritura)"
-msgstr[1] ""
-"Léronse %lu liñas (Convertidas dos formatos DOS e Mac - Advertencia: Non hai "
-"permiso de escritura)"
-
-#: src/files.c:954
+#: src/files.c:919
 #, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
 msgstr[0] "Leuse %lu liña (Convertida de formato Mac)"
 msgstr[1] "Léronse %lu liñas (Convertidas de formato Mac)"
 
-#: src/files.c:958
-#, c-format
-msgid ""
-"Read %lu line (Converted from Mac format - Warning: No write permission)"
-msgid_plural ""
-"Read %lu lines (Converted from Mac format - Warning: No write permission)"
-msgstr[0] ""
-"Leuse %lu liña (Convertida de formato Mac - Advertencia: Non hai permiso de "
-"escritura)"
-msgstr[1] ""
-"Léronse %lu liñas (Convertidas de formato Mac - Advertencia: Non hai permiso "
-"de escritura)"
-
-#: src/files.c:964
+#: src/files.c:925
 #, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
 msgstr[0] "Leuse %lu liña (Convertida do formato DOS)"
 msgstr[1] "Léronse %lu liñas (Convertidas do formato DOS)"
 
-#: src/files.c:968
-#, c-format
-msgid ""
-"Read %lu line (Converted from DOS format - Warning: No write permission)"
-msgid_plural ""
-"Read %lu lines (Converted from DOS format - Warning: No write permission)"
-msgstr[0] ""
-"Leuse %lu liña (Convertida do formato DOS - Advertencia: Non hai permiso de "
-"escritura)"
-msgstr[1] ""
-"Léronse %lu liñas (Convertidas do formato DOS - Advertencia: Non hai permiso "
-"de escritura)"
-
-#: src/files.c:974
+#: src/files.c:930
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "Leuse %lu liña"
 msgstr[1] "Léronse %lu liñas"
 
-#: src/files.c:977
-#, c-format
-msgid "Read %lu line (Warning: No write permission)"
-msgid_plural "Read %lu lines (Warning: No write permission)"
-msgstr[0] "Le-la liña %lu (Advertencia: Non hai permiso de escritura)"
-msgstr[1] "Le-las liñas %lu (Advertencia: Non hai permiso de escritura)"
-
-#: src/files.c:1019 src/files.c:1056
+#: src/files.c:974 src/files.c:1006
 msgid "Reading File"
 msgstr "Lendo o Ficheiro"
 
-#: src/files.c:1025
+#: src/files.c:980
 msgid "New File"
 msgstr "Ficheiro Novo"
 
-#: src/files.c:1028
-#, c-format
-msgid "\"%s\" not found"
+#: src/files.c:983
+#, fuzzy, c-format
+msgid "File \"%s\" not found"
 msgstr "Non se atopou \"%s\""
 
-#: src/files.c:1039 src/rcfile.c:590 src/rcfile.c:1386 src/rcfile.c:1427
+#: src/files.c:992 src/rcfile.c:534 src/rcfile.c:1231 src/rcfile.c:1272
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" é un ficheiro de dispositivo"
 
-#: src/files.c:1133
+#: src/files.c:1083
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Comando a executar nun novo buffer [dende %s] "
 
-#: src/files.c:1135
+#: src/files.c:1085
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Comando a executar [dende %s] "
 
-#: src/files.c:1142
+#: src/files.c:1092
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Ficheiro a inserir nun novo buffer [dende %s] "
 
-#: src/files.c:1144
+#: src/files.c:1094
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Ficheiro a inserir [dende %s] "
 
-#: src/files.c:1389
+#: src/files.c:1338
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Tecla non válida no modo sen multibuffer"
 
-#: src/files.c:1684
-msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+#: src/files.c:1632
+#, fuzzy
+msgid "Failed to write backup file; continue saving? (Say N if unsure.) "
 msgstr ""
 "Faio ó escribir ficheiro de respaldo, ¿continuar gravando? (Prema N se non "
 "está seguro)"
 
-#: src/files.c:1800
+#: src/files.c:1750
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Non se pode escribir fóra de %s"
 
-#: src/files.c:1885 src/files.c:1910 src/files.c:1928 src/files.c:1941
-#: src/files.c:1952 src/files.c:1981
+#: src/files.c:1833 src/files.c:1858 src/files.c:1876 src/files.c:1889
+#: src/files.c:1900 src/files.c:1928
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Erro escribindo ficheiro de copia de seguridade %s: %s"
 
-#: src/files.c:1886 src/nano.c:690
+#: src/files.c:1834 src/nano.c:692
 msgid "Too many backup files?"
 msgstr "¿Demasiados ficheiros de copia de seguridade?"
 
-#: src/files.c:2026 src/text.c:2863 src/text.c:2875 src/text.c:3244
-#: src/text.c:3253
+#: src/files.c:1972 src/text.c:3117 src/text.c:3129 src/text.c:3498
+#: src/text.c:3507
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Erro escribindo ficheiro temporal: %s"
 
-#: src/files.c:2049 src/files.c:2068 src/files.c:2080 src/files.c:2104
-#: src/files.c:2121 src/files.c:2131 src/files.c:2164 src/files.c:2171
+#: src/files.c:1994 src/files.c:2013 src/files.c:2023 src/files.c:2047
+#: src/files.c:2064 src/files.c:2074 src/files.c:2106 src/files.c:2113
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Erro writing %s: %s"
 
-#: src/files.c:2200
+#: src/files.c:2154
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "Escribiuse %lu liña"
 msgstr[1] "Escribíronse %lu liñas"
 
-#: src/files.c:2299
+#: src/files.c:2249
 msgid " [DOS Format]"
 msgstr " [Formato DOS]"
 
-#: src/files.c:2300
+#: src/files.c:2250
 msgid " [Mac Format]"
 msgstr " [Formato Mac]"
 
-#: src/files.c:2302
+#: src/files.c:2252
 msgid " [Backup]"
 msgstr " [CopiaSeg]"
 
-#: src/files.c:2309
+#: src/files.c:2259
 msgid "Prepend Selection to File"
 msgstr "Engadir a Selección ó Ficheiro polo Principio"
 
-#: src/files.c:2310
+#: src/files.c:2260
 msgid "Append Selection to File"
 msgstr "Engadir a Selección ó Ficheiro polo Final"
 
-#: src/files.c:2311
+#: src/files.c:2261
 msgid "Write Selection to File"
 msgstr "Gravar a Selección no Ficheiro"
 
-#: src/files.c:2314
+#: src/files.c:2264
 msgid "File Name to Prepend to"
 msgstr "Ficheiro ó que Engadir polo Principio"
 
-#: src/files.c:2315
+#: src/files.c:2265
 msgid "File Name to Append to"
 msgstr "Ficheiro ó que Engadir polo final"
 
-#: src/files.c:2316
+#: src/files.c:2266
 msgid "File Name to Write"
 msgstr "Ficheiro a Gravar"
 
-#: src/files.c:2349
-msgid "Save modified buffer anyway ? "
+#: src/files.c:2301
+#, fuzzy
+msgid "Save modified buffer anyway? "
 msgstr "Grava-lo buffer modificado igualmente?"
 
-#: src/files.c:2457
-msgid "File exists, OVERWRITE ? "
-msgstr "O ficheiro xa existe, ¿SOBREESCRIBIR? "
-
-#: src/files.c:2466
-msgid "Save file under DIFFERENT NAME ? "
+#: src/files.c:2412
+#, fuzzy
+msgid "Save file under DIFFERENT NAME? "
 msgstr "¿Gravar ficheiro baixo NOME DIFERENTE? "
 
-#: src/files.c:2480
-msgid "File was modified since you opened it, continue saving ? "
+#: src/files.c:2420
+#, fuzzy, c-format
+msgid "File \"%s\" exists; OVERWRITE? "
+msgstr "O ficheiro xa existe, ¿SOBREESCRIBIR? "
+
+#: src/files.c:2441
+#, fuzzy
+msgid "File was modified since you opened it; continue saving? "
 msgstr "O ficheiro foi modificado dende que o abriu, ¿continua gravando?"
 
-#: src/files.c:2917
+#: src/files.c:2874
 msgid "(more)"
 msgstr "(máis)"
 
-#: src/files.c:3004
+#: src/files.c:2959
 #, c-format
 msgid ""
 "\n"
@@ -396,7 +371,7 @@ msgstr ""
 "\n"
 "Prema Enter para continuar.\n"
 
-#: src/files.c:3020
+#: src/files.c:2975
 #, c-format
 msgid ""
 "Unable to create directory %s: %s\n"
@@ -405,7 +380,7 @@ msgstr ""
 "Incapaz de crear directorio %s: %s\n"
 "Requírese para gravar/cargar o historial de busca ou posición do cursor\n"
 
-#: src/files.c:3026
+#: src/files.c:2982
 #, c-format
 msgid ""
 "Path %s is not a directory and needs to be.\n"
@@ -415,7 +390,7 @@ msgstr ""
 "Nano será incapaz de cargar ou gravar o historial de busca ou posición do "
 "cursor\n"
 
-#: src/files.c:3045
+#: src/files.c:3002
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I tried to move\n"
@@ -424,7 +399,7 @@ msgstr ""
 "Detectouse un ficheiro de historial anticuado (%s) que tentei mover\n"
 "á localización preferente (%s) pero topei cun erro: %s"
 
-#: src/files.c:3049
+#: src/files.c:3006
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I moved\n"
@@ -435,721 +410,752 @@ msgstr ""
 "á localización preferente (%s)\n"
 "(lea no FAQ de nano sobre este cambio)"
 
-#: src/files.c:3132 src/files.c:3140 src/files.c:3164 src/files.c:3176
+#: src/files.c:3089 src/files.c:3097 src/files.c:3121 src/files.c:3133
 #, c-format
 msgid "Error writing %s: %s\n"
 msgstr "Erro writing %s: %s\n"
 
 #. TRANSLATORS: Try to keep the next fifteen strings at most 10 characters.
-#: src/global.c:480
+#: src/global.c:483
 msgid "Exit"
 msgstr "Saír"
 
-#: src/global.c:481
+#: src/global.c:484
 msgid "Close"
 msgstr "Pechar"
 
-#: src/global.c:482
+#: src/global.c:485
 msgid "Uncut Text"
 msgstr "RepórTexto"
 
-#: src/global.c:484
+#: src/global.c:487
 msgid "Unjustify"
 msgstr "DeXustif"
 
-#: src/global.c:490
+#: src/global.c:493
 msgid "Read File"
 msgstr "Ler Fich"
 
-#: src/global.c:491
+#: src/global.c:494
 msgid "Where Is"
 msgstr "¿U-lo?"
 
-#: src/global.c:492
+#: src/global.c:495
 msgid "Replace"
 msgstr "Substituir"
 
-#: src/global.c:493
+#: src/global.c:496
 msgid "Go To Line"
 msgstr "Ir á liña"
 
-#: src/global.c:494
+#: src/global.c:497
 msgid "Prev Line"
 msgstr "Liña Ant"
 
-#: src/global.c:495
+#: src/global.c:498
 msgid "Next Line"
 msgstr "Seg Liña"
 
-#: src/global.c:496
+#: src/global.c:499
 msgid "Prev Page"
 msgstr "Páxina ant"
 
-#: src/global.c:497
+#: src/global.c:500
 msgid "Next Page"
 msgstr "Páxina seg"
 
-#: src/global.c:499
+#: src/global.c:502
 msgid "Justify"
 msgstr "Xustificar"
 
-#: src/global.c:500
+#: src/global.c:503
 msgid "FullJstify"
 msgstr "XustComplt"
 
-#: src/global.c:502
+#: src/global.c:505
 msgid "Refresh"
 msgstr "Recargar"
 
 #. TRANSLATORS: Try to keep this string at most 12 characters.
-#: src/global.c:505
+#: src/global.c:508
 msgid "WhereIs Next"
 msgstr "U-lo Seguint"
 
 #. TRANSLATORS: The next long series of strings are shortcut descriptions;
 #. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:512
+#: src/global.c:515
 msgid "Justify the current paragraph"
 msgstr "Xustifica-lo parágrafo actual"
 
-#: src/global.c:514
+#: src/global.c:517
 msgid "Cancel the current function"
 msgstr "Cancela-la función actual"
 
-#: src/global.c:515
+#: src/global.c:518
 msgid "Display this help text"
 msgstr "Amosar este texto de axuda"
 
-#: src/global.c:518
+#: src/global.c:521
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Pechar o ficheiro cargado actualmente / Saír de nano"
 
-#: src/global.c:520
+#: src/global.c:523
 msgid "Exit from nano"
 msgstr "Saír de nano"
 
-#: src/global.c:524
+#: src/global.c:527
 msgid "Write the current file to disk"
 msgstr "Grava-lo ficheiro actual no disco"
 
-#: src/global.c:526
+#: src/global.c:529
 msgid "Insert another file into the current one"
 msgstr "Inserir outro ficheiro no actual"
 
-#: src/global.c:528
+#: src/global.c:531
 msgid "Search for a string or a regular expression"
 msgstr "Buscar cadea ou experesión regular"
 
-#: src/global.c:531
+#: src/global.c:533
 msgid "Search for a string"
 msgstr "Buscar cadea"
 
-#: src/global.c:533
+#: src/global.c:534
+msgid "Refresh the file list"
+msgstr ""
+
+#: src/global.c:535
+#, fuzzy
+msgid "Go to lefthand column"
+msgstr "Ir á liña e columna número"
+
+#: src/global.c:536
+#, fuzzy
+msgid "Go to righthand column"
+msgstr "Ir á liña e columna número"
+
+#: src/global.c:538
 msgid "Go one screenful up"
 msgstr "Subir unha pantalla"
 
-#: src/global.c:534
+#: src/global.c:539
 msgid "Go one screenful down"
 msgstr "Baixar unha pantalla"
 
-#: src/global.c:536
+#: src/global.c:541
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Corta-la liña actual e gardala no buffer de cortado"
 
-#: src/global.c:538
+#: src/global.c:543
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Desfacer corte do buffer de cortado na liña actual"
 
-#: src/global.c:539
+#: src/global.c:544
 msgid "Display the position of the cursor"
 msgstr "Amosa-la posición do cursor"
 
-#: src/global.c:541
+#: src/global.c:546
 msgid "Invoke the spell checker, if available"
 msgstr "Chamar ó corrector ortográfico, se hai un"
 
-#: src/global.c:543
+#: src/global.c:548
 msgid "Replace a string or a regular expression"
 msgstr "Substituir unha cadea ou expresión regular"
 
-#: src/global.c:544
+#: src/global.c:549
 msgid "Go to line and column number"
 msgstr "Ir á liña e columna número"
 
-#: src/global.c:546
+#: src/global.c:551
 msgid "Mark text starting from the cursor position"
 msgstr "Marcar texto comenzando na posición do cursor"
 
-#: src/global.c:547
+#: src/global.c:552
 msgid "Repeat the last search"
 msgstr "Repeti-la última busca"
 
-#: src/global.c:549
+#: src/global.c:554
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "Copia-la liña actual e almacenala no buffer de cortado"
 
-#: src/global.c:550
+#: src/global.c:555
 msgid "Indent the current line"
 msgstr "Sangra-la liña actual"
 
-#: src/global.c:551
+#: src/global.c:556
 msgid "Unindent the current line"
 msgstr "Elimina-la sangría da liña actual"
 
-#: src/global.c:552
+#: src/global.c:558
+msgid "Comment/uncomment the current line or marked lines"
+msgstr ""
+
+#: src/global.c:560
 msgid "Undo the last operation"
 msgstr "Desface-la última operación"
 
-#: src/global.c:553
+#: src/global.c:561
 msgid "Redo the last undone operation"
 msgstr "Reface-la última operación desfeita"
 
-#: src/global.c:555
+#: src/global.c:563
 msgid "Go back one character"
 msgstr "Recuar un carácter"
 
-#: src/global.c:556
+#: src/global.c:564
 msgid "Go forward one character"
 msgstr "Avanzar un carácter"
 
-#: src/global.c:558
+#: src/global.c:566
 msgid "Go back one word"
 msgstr "Recuar unha verba"
 
-#: src/global.c:559
+#: src/global.c:567
 msgid "Go forward one word"
 msgstr "Avanzar unha verba"
 
-#: src/global.c:561
+#: src/global.c:569
 msgid "Go to previous line"
 msgstr "Pasar á liña previa"
 
-#: src/global.c:562
+#: src/global.c:570
 msgid "Go to next line"
 msgstr "Pasar á seguinte liña"
 
-#: src/global.c:563
+#: src/global.c:571
 msgid "Go to beginning of current line"
 msgstr "Pasar ó principio da liña actual"
 
-#: src/global.c:564
+#: src/global.c:572
 msgid "Go to end of current line"
 msgstr "Pasar ó final da liña actual"
 
-#: src/global.c:567
+#: src/global.c:575
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "Pasar ó principio do parágrafo, entón ó parágrafo previo"
 
-#: src/global.c:569
+#: src/global.c:577
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr "Pasar xusto alén do parágrafo, entón ó seguinte parágrafo"
 
-#: src/global.c:571
+#: src/global.c:579
 msgid "Go to the first line of the file"
 msgstr "Pasar á primeira liña do ficheiro"
 
-#: src/global.c:572
+#: src/global.c:580
 msgid "Go to the last line of the file"
 msgstr "Pasar á derradeira liña do ficheiro"
 
-#: src/global.c:574
+#: src/global.c:582
 msgid "Go to the matching bracket"
 msgstr "Pasar ó paréntese correspondente"
 
-#: src/global.c:576
+#: src/global.c:584
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "Desprazar arriba unha liña sen despraza-lo cursor"
 
-#: src/global.c:578
+#: src/global.c:586
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "Desprazar unha liña abaixo sen despraza-lo cursor"
 
-#: src/global.c:581
+#: src/global.c:589
 msgid "Switch to the previous file buffer"
 msgstr "Cambiar ó anterior ficheiro"
 
-#: src/global.c:582
+#: src/global.c:590
 msgid "Switch to the next file buffer"
 msgstr "Cambiar ó seguinte ficheiro"
 
-#: src/global.c:584
+#: src/global.c:592
 msgid "Insert the next keystroke verbatim"
 msgstr "Inseri-la seguinte pulsación literal"
 
-#: src/global.c:585
+#: src/global.c:593
 msgid "Insert a tab at the cursor position"
 msgstr "Inserir unha lingüeta na posición do cursor"
 
-#: src/global.c:586
+#: src/global.c:594
 msgid "Insert a newline at the cursor position"
 msgstr "Inserir unha nova liña na posición do cursor"
 
-#: src/global.c:587
+#: src/global.c:595
 msgid "Delete the character under the cursor"
 msgstr "Borra-lo carácter baixo do cursor"
 
-#: src/global.c:589
+#: src/global.c:597
 msgid "Delete the character to the left of the cursor"
 msgstr "Borra-lo caracter á esquerda do cursor"
 
-#: src/global.c:592
+#: src/global.c:600
 msgid "Cut backward from cursor to word start"
 msgstr "Cortar cara atrás dende o cursor ata o comenzo da seguinte palabra"
 
-#: src/global.c:594
+#: src/global.c:602
 msgid "Cut forward from cursor to next word start"
 msgstr "Cortar cara adiante dende o cursor ata o comenzo da seguinte palabra"
 
-#: src/global.c:596
+#: src/global.c:604
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Cortar da posición do cursor ó final da liña"
 
-#: src/global.c:599
+#: src/global.c:607
 msgid "Justify the entire file"
 msgstr "Xustificar todo o ficheiro"
 
-#: src/global.c:603
+#: src/global.c:611
 msgid "Count the number of words, lines, and characters"
 msgstr "Conta-lo número de verbas, liñas e caracteres"
 
-#: src/global.c:606
+#: src/global.c:614
 msgid "Refresh (redraw) the current screen"
 msgstr "Actualiza-la pantalla actual"
 
-#: src/global.c:608
+#: src/global.c:616
 msgid "Suspend the editor (if suspension is enabled)"
 msgstr "Suspende-lo editor (se a suspensión está activada)"
 
-#: src/global.c:610
+#: src/global.c:618
 msgid "Save file without prompting"
 msgstr "Gravar ficheiro sen confirmación"
 
-#: src/global.c:611
+#: src/global.c:619
 msgid "Search next occurrence backward"
 msgstr "Procura a seguinte ocurrencia cara atrás"
 
-#: src/global.c:612
+#: src/global.c:620
 msgid "Search next occurrence forward"
 msgstr "Procura a seguinte ocurrencia cara adiante"
 
-#: src/global.c:614
+#: src/global.c:622
 msgid "Toggle the case sensitivity of the search"
 msgstr "Selector de sensibilidade a maiúsculas/minúsculas na busca"
 
-#: src/global.c:616
+#: src/global.c:624
 msgid "Reverse the direction of the search"
 msgstr "Reverti-la dirección da busca"
 
-#: src/global.c:620
+#: src/global.c:628
 msgid "Toggle the use of regular expressions"
 msgstr "Selector de uso de expresións regulares"
 
-#: src/global.c:624
+#: src/global.c:632
 msgid "Recall the previous search/replace string"
 msgstr "Recupera-la anterior cadea de busca/sustitución"
 
-#: src/global.c:626
+#: src/global.c:634
 msgid "Recall the next search/replace string"
 msgstr "Recupera-la seguinte cadea de busca/sustitución"
 
-#: src/global.c:629
+#: src/global.c:637
 msgid "Go to file browser"
 msgstr "Ir ó navegador de ficheiros"
 
-#: src/global.c:632
+#: src/global.c:640
 msgid "Toggle the use of DOS format"
 msgstr "Selector de uso do formato DOS"
 
-#: src/global.c:633
+#: src/global.c:641
 msgid "Toggle the use of Mac format"
 msgstr "Selector de uso do formato Mac"
 
-#: src/global.c:634
+#: src/global.c:642
 msgid "Toggle appending"
 msgstr "Selector de engadir ó final"
 
-#: src/global.c:635
+#: src/global.c:643
 msgid "Toggle prepending"
 msgstr "Selector de engadir previo"
 
-#: src/global.c:636
+#: src/global.c:644
 msgid "Toggle backing up of the original file"
 msgstr "Selector de copiado de seguridade do ficheiro orixinal"
 
-#: src/global.c:637
+#: src/global.c:645
 msgid "Execute external command"
 msgstr "Executar comando externo"
 
-#: src/global.c:639
+#: src/global.c:647
 msgid "Close buffer without saving it"
 msgstr "Pechar buffer sen gravar"
 
-#: src/global.c:641
+#: src/global.c:649
 msgid "Toggle the use of a new buffer"
 msgstr "Selector de uso dun novo buffer"
 
-#: src/global.c:644
+#: src/global.c:652
 msgid "Exit from the file browser"
 msgstr "Saír do navegador de ficheiros"
 
-#: src/global.c:645
+#: src/global.c:653
 msgid "Go to the first file in the list"
 msgstr "Pasar ó primeiro ficheiro da lista"
 
-#: src/global.c:646
+#: src/global.c:654
 msgid "Go to the last file in the list"
 msgstr "Pasar ó derradeiro ficheiro da lista"
 
-#: src/global.c:647
+#: src/global.c:655
 msgid "Go to the previous file in the list"
 msgstr "Pasar ó anterior ficheiro da lista"
 
-#: src/global.c:648
+#: src/global.c:656
 msgid "Go to the next file in the list"
 msgstr "Pasar ó seguinte ficheiro da lista"
 
-#: src/global.c:649
+#: src/global.c:657
 msgid "Go to directory"
 msgstr "Pasar ó directorio"
 
-#: src/global.c:652
+#: src/global.c:660
 msgid "Invoke the linter, if available"
 msgstr "Chamar ó analizador de sintaxe, se hai un"
 
-#: src/global.c:653
+#: src/global.c:661
 msgid "Go to previous linter msg"
 msgstr "Pasar á anterior mensaxe do analizador"
 
-#: src/global.c:654
+#: src/global.c:662
 msgid "Go to next linter msg"
 msgstr "Pasar á anterior mensaxe do analizador"
 
-#: src/global.c:656
+#: src/global.c:664
 msgid "Invoke formatter, if available"
 msgstr "Chamar ó corrector ortográfico, se hai un"
 
 #. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:671
+#: src/global.c:679
 msgid "Get Help"
 msgstr "Obter Axud"
 
-#: src/global.c:674 src/prompt.c:858
+#: src/global.c:682 src/prompt.c:855
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/global.c:687
+#: src/global.c:695
 msgid "Write Out"
 msgstr "Gravar"
 
-#: src/global.c:723
+#: src/global.c:731
 msgid "Go To Dir"
 msgstr "Ir ó Directorio"
 
-#: src/global.c:738
+#: src/global.c:746
 msgid "Cut Text"
 msgstr "CortarText"
 
-#: src/global.c:753
+#: src/global.c:761
 msgid "To Spell"
 msgstr "Ortografía"
 
-#: src/global.c:757
+#: src/global.c:765
 msgid "To Linter"
 msgstr "Analizador"
 
-#: src/global.c:760
+#: src/global.c:768
 msgid "Formatter"
 msgstr "Formateador"
 
-#: src/global.c:767
+#: src/global.c:775
 msgid "Case Sens"
 msgstr "SensMa/min"
 
-#: src/global.c:772
+#: src/global.c:780
 msgid "Regexp"
 msgstr "ExpReg"
 
-#: src/global.c:777
+#: src/global.c:785
 msgid "Backwards"
 msgstr "Cara atrás"
 
-#: src/global.c:784
+#: src/global.c:792
 msgid "No Replace"
 msgstr "Non Subst"
 
-#: src/global.c:792
+#: src/global.c:800
 msgid "Cur Pos"
 msgstr "PosicAct"
 
-#: src/global.c:807
+#: src/global.c:815
 msgid "First Line"
 msgstr "Prim liña"
 
-#: src/global.c:809
+#: src/global.c:817
 msgid "Last Line"
 msgstr "Ult liña"
 
-#: src/global.c:816
+#: src/global.c:824
 msgid "To Bracket"
 msgstr "Ó delimitador"
 
-#: src/global.c:819
+#: src/global.c:827
 msgid "Mark Text"
 msgstr "Marcar"
 
-#: src/global.c:822
+#: src/global.c:830
 msgid "Copy Text"
 msgstr "Copiar Texto"
 
-#: src/global.c:825
+#: src/global.c:833
 msgid "Indent Text"
 msgstr "Sangrar"
 
-#: src/global.c:827
+#: src/global.c:835
 msgid "Unindent Text"
 msgstr "De-Sangrar"
 
-#: src/global.c:830
+#: src/global.c:838
 msgid "Undo"
 msgstr "Desfacer"
 
-#: src/global.c:832
+#: src/global.c:840
 msgid "Redo"
 msgstr "Refacer"
 
-#: src/global.c:836 src/global.c:842
+#: src/global.c:844 src/global.c:850
 msgid "Back"
 msgstr "Atrás"
 
-#: src/global.c:838 src/global.c:844
+#: src/global.c:846 src/global.c:852
 msgid "Forward"
 msgstr "Adiante"
 
-#: src/global.c:849
+#: src/global.c:857
 msgid "Prev Word"
 msgstr "Verba Ant"
 
-#: src/global.c:851
+#: src/global.c:859
 msgid "Next Word"
 msgstr "Verba Seg"
 
-#: src/global.c:855
+#: src/global.c:863
 msgid "Home"
 msgstr "Inicio"
 
-#: src/global.c:857
+#: src/global.c:865
 msgid "End"
 msgstr "Fin"
 
-#: src/global.c:866
+#: src/global.c:874
 msgid "Beg of Par"
 msgstr "Prin Parág"
 
-#: src/global.c:868
+#: src/global.c:876
 msgid "End of Par"
 msgstr "Fin Parágr"
 
-#: src/global.c:873
+#: src/global.c:881
 msgid "Scroll Up"
 msgstr "Desprazar Arriba"
 
-#: src/global.c:875
+#: src/global.c:883
 msgid "Scroll Down"
 msgstr "Desprazar Abaixo"
 
-#: src/global.c:880
+#: src/global.c:888
 msgid "Prev File"
 msgstr "Ficheiro Anterior"
 
-#: src/global.c:882
+#: src/global.c:890
 msgid "Next File"
 msgstr "Ficheiro Seguinte"
 
-#: src/global.c:891
+#: src/global.c:899
 msgid "Verbatim"
 msgstr "Entrada Literal"
 
-#: src/global.c:894
+#: src/global.c:902
 msgid "Tab"
 msgstr "Lingüeta"
 
-#: src/global.c:896
+#: src/global.c:904
 msgid "Enter"
 msgstr "Entrar"
 
-#: src/global.c:899
+#: src/global.c:907
 msgid "Delete"
 msgstr "Borrar"
 
-#: src/global.c:901
+#: src/global.c:909
 msgid "Backspace"
 msgstr "Retroceso"
 
 #. TRANSLATORS: The next two strings refer to cutting words.
-#: src/global.c:912
+#: src/global.c:920
 msgid "Cut Left"
 msgstr "CortarEsqr"
 
-#: src/global.c:914
+#: src/global.c:922
 msgid "Cut Right"
 msgstr "CortarDert"
 
-#: src/global.c:916
+#: src/global.c:924
 msgid "CutTillEnd"
 msgstr "CortarAtaFin"
 
-#: src/global.c:926
+#: src/global.c:934
 msgid "Word Count"
 msgstr "Conta Verbas"
 
-#: src/global.c:933
+#: src/global.c:941
 msgid "Suspend"
 msgstr "Suspender"
 
-#: src/global.c:937
+#: src/global.c:945
+#, fuzzy
+msgid "Comment Lines"
+msgstr "Seg Liña"
+
+#: src/global.c:949
 msgid "Save"
 msgstr "Gravar"
 
-#: src/global.c:940
+#: src/global.c:952
 msgid "Previous"
 msgstr "Anterior"
 
-#: src/global.c:942
+#: src/global.c:954
 msgid "Next"
 msgstr "Seguinte"
 
-#: src/global.c:948
+#: src/global.c:960
 msgid "PrevHstory"
 msgstr "HistPrevia"
 
-#: src/global.c:951
+#: src/global.c:963
 msgid "NextHstory"
 msgstr "HistSeguin"
 
-#: src/global.c:955
+#: src/global.c:972
 msgid "Go To Text"
 msgstr "Ir a Text"
 
-#: src/global.c:959
+#: src/global.c:976
 msgid "DOS Format"
 msgstr "Formato DOS"
 
-#: src/global.c:961
+#: src/global.c:978
 msgid "Mac Format"
 msgstr "Formato Mac"
 
-#: src/global.c:969
+#: src/global.c:986
 msgid "Append"
 msgstr "Engadir ó Final"
 
-#: src/global.c:971
+#: src/global.c:988
 msgid "Prepend"
 msgstr "Engadir ó Inicio"
 
-#: src/global.c:974
+#: src/global.c:991
 msgid "Backup File"
 msgstr "Copia Seguridade"
 
-#: src/global.c:981
+#: src/global.c:998
 msgid "Execute Command"
 msgstr "Executar Comando"
 
-#: src/global.c:996
+#: src/global.c:1013
 msgid "To Files"
 msgstr "A Ficheiros"
 
-#: src/global.c:1004
+#: src/global.c:1021
 msgid "First File"
 msgstr "Pri Ficheiro"
 
-#: src/global.c:1006
+#: src/global.c:1023
 msgid "Last File"
 msgstr "Derrad Fich"
 
-#: src/global.c:1010
+#: src/global.c:1027
 msgid "Discard buffer"
 msgstr "Descartar buffer"
 
+#: src/global.c:1038
+msgid "Left Column"
+msgstr ""
+
+#: src/global.c:1040
+msgid "Right Column"
+msgstr ""
+
 #. TRANSLATORS: Try to keep the next two strings at most 20 characters.
-#: src/global.c:1020
+#: src/global.c:1047
 msgid "Prev Lint Msg"
 msgstr "Msg ant anlzr"
 
-#: src/global.c:1022
+#: src/global.c:1049
 msgid "Next Lint Msg"
 msgstr "Msg seg anlzr"
 
 #. TRANSLATORS: The next seventeen strings are toggle descriptions;
 #. * they are best kept shorter than 40 characters, but may be longer.
-#: src/global.c:1285
+#: src/global.c:1316
 msgid "Help mode"
 msgstr "Modo de axuda"
 
-#: src/global.c:1287
+#: src/global.c:1318
 msgid "Constant cursor position display"
 msgstr "Posición do cursor constante"
 
-#: src/global.c:1289
+#: src/global.c:1320
 msgid "Use of one more line for editing"
 msgstr "Uso dunha liña máis para editar"
 
-#: src/global.c:1291
+#: src/global.c:1322
 msgid "Smooth scrolling"
 msgstr "Desprazar mainamente"
 
-#: src/global.c:1293
+#: src/global.c:1324
 msgid "Soft wrapping of overlong lines"
 msgstr "Acortado maino de liñas longas"
 
-#: src/global.c:1295
+#: src/global.c:1326
 msgid "Whitespace display"
 msgstr "Amosar espacios en branco"
 
-#: src/global.c:1297
+#: src/global.c:1328
 msgid "Color syntax highlighting"
 msgstr "Salientar sintaxe con cor"
 
-#: src/global.c:1299
+#: src/global.c:1330
 msgid "Smart home key"
 msgstr "Tecla de 'smart home'"
 
-#: src/global.c:1301
+#: src/global.c:1332
 msgid "Auto indent"
 msgstr "Autosangría"
 
-#: src/global.c:1303
+#: src/global.c:1334
 msgid "Cut to end"
 msgstr "Cortar ata o final"
 
-#: src/global.c:1305
+#: src/global.c:1336
 msgid "Hard wrapping of overlong lines"
 msgstr "Acortado forte de liñas longas"
 
-#: src/global.c:1307
+#: src/global.c:1338
 msgid "Conversion of typed tabs to spaces"
 msgstr "Conversión de lingüetas escritas a espacios"
 
-#: src/global.c:1309
+#: src/global.c:1340
 msgid "Backup files"
 msgstr "Facer copia de seguridade de ficheiros"
 
-#: src/global.c:1311
+#: src/global.c:1342
 msgid "Reading file into separate buffer"
 msgstr "Lendo arquivo en buffer separado"
 
-#: src/global.c:1313
+#: src/global.c:1344
 msgid "Mouse support"
 msgstr "permitir rato"
 
-#: src/global.c:1315
+#: src/global.c:1346
 msgid "No conversion from DOS/Mac format"
 msgstr "Non facer conversión de formato DOS/Mac"
 
-#: src/global.c:1317
+#: src/global.c:1348
 msgid "Suspension"
 msgstr "Suspensión"
 
-#: src/help.c:209
+#: src/help.c:211
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1171,7 +1177,7 @@ msgstr ""
 "Busca:. Premendo Intro sen introducir ningún texto executará a busca "
 "previa.  "
 
-#: src/help.c:218
+#: src/help.c:220
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1185,7 +1191,7 @@ msgstr ""
 " As seguintes teclas de función están dispoñibles en modo Busca:\n"
 "\n"
 
-#: src/help.c:224
+#: src/help.c:226
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1205,7 +1211,7 @@ msgstr ""
 " As seguintes teclas de función están dispoñibles no modo Ir Á Liña:\n"
 "\n"
 
-#: src/help.c:233
+#: src/help.c:235
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1228,7 +1234,7 @@ msgstr ""
 "se cargue nun buffer separado (empregue Meta-< e > para cambiar entre "
 "buffers de ficheiro).  "
 
-#: src/help.c:242
+#: src/help.c:244
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1244,7 +1250,7 @@ msgstr ""
 "Ficheiro:\n"
 "\n"
 
-#: src/help.c:248
+#: src/help.c:250
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1273,7 +1279,7 @@ msgstr ""
 "Ficheiro:\n"
 "\n"
 
-#: src/help.c:262
+#: src/help.c:264
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1299,7 +1305,7 @@ msgstr ""
 "ficheiros:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:277
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1322,7 +1328,7 @@ msgstr ""
 "Busca:. Ó premer Intro sen introducir ningún texto farase a busca anterior.\n"
 "\n"
 
-#: src/help.c:284
+#: src/help.c:286
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1331,7 +1337,7 @@ msgstr ""
 "Navegador:\n"
 "\n"
 
-#: src/help.c:288
+#: src/help.c:290
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1354,7 +1360,7 @@ msgstr ""
 "Navegador:\n"
 "\n"
 
-#: src/help.c:301
+#: src/help.c:303
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1378,7 +1384,7 @@ msgstr ""
 " Existen as seguintes funcións no modo Corrector Ortográfico:\n"
 "\n"
 
-#: src/help.c:316
+#: src/help.c:318
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1399,7 +1405,7 @@ msgstr ""
 "Externos:\n"
 "\n"
 
-#: src/help.c:329
+#: src/help.c:331
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1419,15 +1425,15 @@ msgstr ""
 "principal do editor, que amosa o ficheiro que se edita. A liña de estado é a "
 "terceira liña dende o fondo e amosa mensaxes importantes.  "
 
-#: src/help.c:339
+#: src/help.c:341
+#, fuzzy
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
-" The notation for shortcuts is as follows: Control-key sequences are notated "
-"with a caret (^) symbol and can be entered either by using the Control "
-"(Ctrl) key or pressing the Escape (Esc) key twice.  Escape-key sequences are "
-"notated with the Meta (M-) symbol and can be entered using either the Esc, "
-"Alt, or Meta key depending on your keyboard setup.  "
+" Shortcuts are written as follows: Control-key sequences are notated with a "
+"'^' and can be entered either by using the Ctrl key or pressing the Esc key "
+"twice.  Meta-key sequences are notated with 'M-' and can be entered using "
+"either the Alt, Cmd, or Esc key, depending on your keyboard setup.  "
 msgstr ""
 "As derradeiras días liñas amosan os atallos de teclado máis usados no "
 "editor.\n"
@@ -1457,19 +1463,19 @@ msgstr ""
 msgid "enable/disable"
 msgstr "activar/desactivar"
 
-#: src/nano.c:559
+#: src/nano.c:560
 msgid "Key is invalid in view mode"
 msgstr "A tecla non é válida en modo vista"
 
-#: src/nano.c:565
+#: src/nano.c:566
 msgid "This function is disabled in restricted mode"
 msgstr "Esta función está deshabilitada en modo restrinxido"
 
-#: src/nano.c:573
+#: src/nano.c:574
 msgid "Help is not available"
 msgstr "Axuda non dispoñible"
 
-#: src/nano.c:684
+#: src/nano.c:686
 #, c-format
 msgid ""
 "\n"
@@ -1478,7 +1484,7 @@ msgstr ""
 "\n"
 "Gravouse o buffer en %s\n"
 
-#: src/nano.c:686
+#: src/nano.c:688
 #, c-format
 msgid ""
 "\n"
@@ -1487,7 +1493,7 @@ msgstr ""
 "\n"
 "Non se gravou o buffer en %s: %s\n"
 
-#: src/nano.c:689
+#: src/nano.c:691
 #, c-format
 msgid ""
 "\n"
@@ -1749,17 +1755,22 @@ msgstr "Permitir suspensión"
 msgid "Enable soft line wrapping"
 msgstr "Activar axuste suave de liñas"
 
-#: src/nano.c:937
-#, c-format
-msgid " GNU nano, version %s\n"
+#: src/nano.c:940
+#, fuzzy, c-format
+msgid " nano, version %s\n"
 msgstr " GNU nano versión %s\n"
 
-#: src/nano.c:940
+#: src/nano.c:943
+#, c-format
+msgid " (C) 2014..%s the contributors to nano\n"
+msgstr ""
+
+#: src/nano.c:945
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr " Correo-e: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 
-#: src/nano.c:941
+#: src/nano.c:946
 #, c-format
 msgid ""
 "\n"
@@ -1768,68 +1779,82 @@ msgstr ""
 "\n"
 "Opcións de compilación"
 
-#: src/nano.c:1073
+#: src/nano.c:1081
 msgid "No file name"
 msgstr "Non hai nome de ficheiro"
 
-#: src/nano.c:1108
-msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
+#: src/nano.c:1115
+msgid "Save modified buffer?  (Answering \"No\" will DISCARD changes.) "
 msgstr ""
-"¿Grava-lo buffer modificado (SE RESPOSTA \"Non\" PERDERANSE OS CAMBIOS)?  "
 
-#: src/nano.c:1168
+#: src/nano.c:1178
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "Non se puido reabri-la stdin dende o teclado, síntoo\n"
 
-#: src/nano.c:1192
+#: src/nano.c:1202
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "Lendo dende a stdin, ^C para abortar\n"
 
-#: src/nano.c:1256
+#: src/nano.c:1266
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Recibiuse SIGHUP ou SIGTERM\n"
 
-#: src/nano.c:1272
+#: src/nano.c:1282
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Empregue \"fg\" para voltar a nano.\n"
 
-#: src/nano.c:1294
+#: src/nano.c:1304
 msgid "Suspension is not enabled"
 msgstr "Suspensión non activa"
 
-#: src/nano.c:1448
+#: src/nano.c:1459
 msgid "enabled"
 msgstr "activado"
 
-#: src/nano.c:1448
+#: src/nano.c:1459
 msgid "disabled"
 msgstr "desactivado"
 
-#: src/nano.c:1607 src/winio.c:1125
-msgid "Unknown Command"
-msgstr "Comando Descoñecido"
+#: src/nano.c:1573
+msgid "Unbound key"
+msgstr ""
 
-#: src/nano.c:1720
+#: src/nano.c:1577
+#, c-format
+msgid "Unbound key: M-%c"
+msgstr ""
+
+#: src/nano.c:1579
+#, c-format
+msgid "Unbound key: ^%c"
+msgstr ""
+
+#: src/nano.c:1581
+#, c-format
+msgid "Unbound key: %c"
+msgstr ""
+
+#: src/nano.c:1745
 msgid "XON ignored, mumble mumble"
 msgstr "Iñórase XON, hmmmm..."
 
-#: src/nano.c:1725
+#: src/nano.c:1750
 msgid "XOFF ignored, mumble mumble"
 msgstr "Iñórase XOFF, hmmmm..."
 
-#: src/nano.c:2139 src/rcfile.c:1334
+#: src/nano.c:2166 src/rcfile.c:1187
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "O tamaño de lingüeta solicitado \"%s\" non é válido"
 
-#: src/nano.c:2200 src/rcfile.c:1259
+#: src/nano.c:2227 src/rcfile.c:1128
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "O tamaño de recheo solicitado \"%s\" non é válido"
 
-#: src/nano.c:2247
+#: src/nano.c:2276
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr "Escriba '%s -h' para a lista de opcións dispoñibles.\n"
@@ -1837,115 +1862,119 @@ msgstr "Escriba '%s -h' para a lista de opcións dispoñibles.\n"
 #. TRANSLATORS: For the next three strings, if possible, specify
 #. * the single-byte shortcuts for both your language and English.
 #. * For example, in French: "OoYy" for "Oui".
-#: src/prompt.c:821
+#: src/prompt.c:818
 msgid "Yy"
 msgstr "SsYy"
 
-#: src/prompt.c:822
+#: src/prompt.c:819
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:823
+#: src/prompt.c:820
 msgid "Aa"
 msgstr "TtAa"
 
-#: src/prompt.c:845
+#: src/prompt.c:842
 msgid "Yes"
 msgstr "Si"
 
-#: src/prompt.c:850
+#: src/prompt.c:847
 msgid "All"
 msgstr "Todo"
 
-#: src/prompt.c:855
+#: src/prompt.c:852
 msgid "No"
 msgstr "Non"
 
-#: src/rcfile.c:142
+#: src/rcfile.c:144
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Erro en %s na liña %lu: "
 
-#: src/rcfile.c:201
+#: src/rcfile.c:203
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "O argumento '%s' ten un \" sen rematar"
 
-#: src/rcfile.c:228 src/rcfile.c:280 src/rcfile.c:732 src/rcfile.c:793
-#: src/rcfile.c:882 src/rcfile.c:933
+#: src/rcfile.c:231 src/rcfile.c:674 src/rcfile.c:725 src/rcfile.c:824
 msgid "Regex strings must begin and end with a \" character"
 msgstr ""
 "As cadeas de expresión regular deben comezar e rematar cun carácter \" "
 
-#: src/rcfile.c:254 src/search.c:62
+#: src/rcfile.c:257 src/search.c:61
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Expresión regular \"%s\" incorrecta: %s"
 
-#: src/rcfile.c:274
+#: src/rcfile.c:279
 msgid "Missing syntax name"
 msgstr "Falla o nome da sintaxe"
 
-#: src/rcfile.c:345
+#: src/rcfile.c:288
+msgid "A syntax name must be quoted"
+msgstr ""
+
+#: src/rcfile.c:297
 msgid "The \"none\" syntax is reserved"
 msgstr "A sintaxe \"none\" está reservada"
 
-#: src/rcfile.c:352
-msgid "The \"default\" syntax must take no extensions"
+#: src/rcfile.c:327
+#, fuzzy
+msgid "The \"default\" syntax does not accept extensions"
 msgstr "A sintaxe \"default\" non debe tomar extensións"
 
-#: src/rcfile.c:424
+#: src/rcfile.c:369
 msgid "Missing key name"
 msgstr "Falla o nome de tecla"
 
-#: src/rcfile.c:433 src/rcfile.c:444
+#: src/rcfile.c:378 src/rcfile.c:389
 msgid "Key name is too short"
 msgstr "O nome da tecla é demasiado curto"
 
-#: src/rcfile.c:454
+#: src/rcfile.c:399
 msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr "O nome de tecla debe comenzar con \"^\",\"M\", ou \"F\""
 
-#: src/rcfile.c:457
+#: src/rcfile.c:402
 #, fuzzy, c-format
 msgid "Key name %s is invalid"
 msgstr "O tamaño de lingüeta solicitado \"%s\" non é válido"
 
-#: src/rcfile.c:466
+#: src/rcfile.c:411
 msgid "Must specify a function to bind the key to"
 msgstr "Debe especifica-la función para asociar á tecla"
 
 #. TRANSLATORS: Do not translate the word "all".
-#: src/rcfile.c:476
+#: src/rcfile.c:421
 msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr "Debe especificar un menú (ou \"all\") no que asociar/liberar a tecla"
 
-#: src/rcfile.c:483
+#: src/rcfile.c:428
 #, c-format
 msgid "Cannot map name \"%s\" to a function"
 msgstr "Non se puido sinalar o nome \"%s\" para unha función"
 
-#: src/rcfile.c:490
+#: src/rcfile.c:435
 #, c-format
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "Non se puido sinalar o nome \"%s\" para un menu"
 
-#: src/rcfile.c:522
+#: src/rcfile.c:467
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr "A función '%s' non existe no menú '%s'"
 
-#: src/rcfile.c:534
+#: src/rcfile.c:479
 #, c-format
 msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "Síntoo, a combinación \"%s\" non se pode restablecer"
 
-#: src/rcfile.c:631
+#: src/rcfile.c:576
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr "Erro expandindo %s: %s"
 
-#: src/rcfile.c:674
+#: src/rcfile.c:616
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1960,66 +1989,50 @@ msgstr ""
 "\"black\", co prefixo opcional \"bright\".\n"
 "\"para cores de fronte."
 
-#: src/rcfile.c:696
-msgid "Cannot add a color command without a syntax command"
+#: src/rcfile.c:637 src/rcfile.c:795 src/rcfile.c:858
+#, c-format
+msgid "A '%s' command requires a preceding 'syntax' command"
 msgstr ""
-"Non se pode engadir unha directiva de cor sen unha directiva de sintaxe "
 
-#: src/rcfile.c:701
+#: src/rcfile.c:643
 msgid "Missing color name"
 msgstr "Falla o nome da cor"
 
-#: src/rcfile.c:711 src/rcfile.c:872
-msgid "Missing regex string"
-msgstr "Perdeuse a cadea de expreg"
+#: src/rcfile.c:653 src/rcfile.c:807
+#, fuzzy, c-format
+msgid "Missing regex string after '%s' command"
+msgstr "Falla a directiva de analizador"
 
-#: src/rcfile.c:787
+#: src/rcfile.c:719
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\" precisa dun \"end=\" correspondente"
 
-#: src/rcfile.c:839
+#: src/rcfile.c:768
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
 msgstr "A cor de fondo \"%s\" non pode ser relucinte"
 
-#: src/rcfile.c:867
-msgid "Cannot add a header regex without a syntax command"
-msgstr ""
-"Non se pode engadir unha cabeceira de expresión regular sen unha directiva "
-"de sintaxe"
-
-#: src/rcfile.c:922
-msgid "Cannot add a magic string regex without a syntax command"
-msgstr ""
-"Non se pode engadir unha cadea máxica de expresión regular sen unha "
-"directiva de sintaxe"
-
-#: src/rcfile.c:927
-msgid "Missing magic string name"
-msgstr "Perdeuse o nome de cadea máxica"
-
-#: src/rcfile.c:985
-msgid "Cannot add a linter without a syntax command"
-msgstr "Non se pode engadir un analizador sen unha directiva de sintaxe"
+#: src/rcfile.c:802
+#, fuzzy, c-format
+msgid "The \"default\" syntax does not accept '%s' regexes"
+msgstr "A sintaxe \"default\" non debe tomar extensións"
 
-#: src/rcfile.c:990
-msgid "Missing linter command"
+#: src/rcfile.c:863
+#, fuzzy, c-format
+msgid "Missing command after '%s'"
 msgstr "Falla a directiva de analizador"
 
-#: src/rcfile.c:1011
-msgid "Cannot add formatter without a syntax command"
-msgstr "Non se pode engadir un formateador sen unha directiva de sintaxe "
-
-#: src/rcfile.c:1016
-msgid "Missing formatter command"
-msgstr "Directiva de formato non atopado"
+#: src/rcfile.c:879
+#, fuzzy, c-format
+msgid "Argument of '%s' lacks closing \""
+msgstr "O argumento '%s' ten un \" sen rematar"
 
-#: src/rcfile.c:1046
+#: src/rcfile.c:910
 #, c-format
 msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr "Erro fatal: non hai teclas sinaladas para a función \"%s\". Saíndo.\n"
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:912
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
@@ -2027,62 +2040,62 @@ msgstr ""
 "Se o precisa, use nano coa opción -I se precisa axeita-la súa configuración "
 "no nanorc\n"
 
-#: src/rcfile.c:1109
+#: src/rcfile.c:971
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "Non se puido atopar sintaxe \"%s\" para extender"
 
-#: src/rcfile.c:1125 src/rcfile.c:1134 src/rcfile.c:1144
-#, c-format
-msgid "Command \"%s\" not allowed in included file"
-msgstr "A directiva \"%s\" non se permite no ficheiro incluído"
-
-#: src/rcfile.c:1150 src/rcfile.c:1359
+#: src/rcfile.c:993 src/rcfile.c:1202
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "A sintaxe \"%s\" non ten directiva de cor"
 
-#: src/rcfile.c:1180
+#: src/rcfile.c:1024
+#, c-format
+msgid "Command \"%s\" not allowed in included file"
+msgstr "A directiva \"%s\" non se permite no ficheiro incluído"
+
+#: src/rcfile.c:1039
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Non se entende a directiva \"%s\""
 
-#: src/rcfile.c:1195
+#: src/rcfile.c:1051
 msgid "Missing option"
 msgstr "Opción non atopada"
 
-#: src/rcfile.c:1217
+#: src/rcfile.c:1065
+#, c-format
+msgid "Unknown option \"%s\""
+msgstr "Opción descoñecida \"%s\""
+
+#: src/rcfile.c:1077
+#, c-format
+msgid "Cannot unset option \"%s\""
+msgstr "Non se pode desactivar opción \"%s\""
+
+#: src/rcfile.c:1089
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "A opción \"%s\" precisa dun argumento"
 
-#: src/rcfile.c:1235
+#: src/rcfile.c:1105
 msgid "Option is not a valid multibyte string"
 msgstr "A opción non é unha cadea multibyte válida"
 
-#: src/rcfile.c:1272 src/rcfile.c:1300 src/rcfile.c:1309
+#: src/rcfile.c:1139 src/rcfile.c:1160 src/rcfile.c:1167
 msgid "Non-blank characters required"
 msgstr "Se requiren caracteres non baleiros"
 
-#: src/rcfile.c:1282
+#: src/rcfile.c:1146
 msgid "Two single-column characters required"
 msgstr "Se requiren dous caracteres de columna simple"
 
-#: src/rcfile.c:1348
-#, c-format
-msgid "Cannot unset option \"%s\""
-msgstr "Non se pode desactivar opción \"%s\""
-
-#: src/rcfile.c:1354
-#, c-format
-msgid "Unknown option \"%s\""
-msgstr "Opción descoñecida \"%s\""
-
-#: src/rcfile.c:1413
+#: src/rcfile.c:1258
 msgid "I can't find my home directory!  Wah!"
 msgstr "¡Non podo atopa-lo meu directorio de inicio! ¡Aaagh!"
 
-#: src/rcfile.c:1451
+#: src/rcfile.c:1295
 #, c-format
 msgid ""
 "\n"
@@ -2091,44 +2104,49 @@ msgstr ""
 "\n"
 "Prema Enter para seguir iniciando nano.\n"
 
-#: src/search.c:96
+#: src/search.c:95
 #, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "non se atopou \"%.*s%s\""
 
 #. TRANSLATORS: The next three strings are modifiers of the search prompt.
-#: src/search.c:176
+#: src/search.c:169
 msgid " [Case Sensitive]"
 msgstr " [Sensible ás Maiúsculas/Minúsculas]"
 
-#: src/search.c:180
+#: src/search.c:173
 msgid " [Regexp]"
 msgstr " [Expreg]"
 
-#: src/search.c:184
+#: src/search.c:177
 msgid " [Backwards]"
 msgstr " [Cara Atrás]"
 
 #. TRANSLATORS: The next two strings are modifiers of the search prompt.
-#: src/search.c:189
+#: src/search.c:182
 msgid " (to replace) in selection"
 msgstr "(para substituír) na selección"
 
-#: src/search.c:191
+#: src/search.c:184
 msgid " (to replace)"
 msgstr "(para substituír)"
 
+#: src/search.c:305
+#, fuzzy
+msgid "Searching..."
+msgstr "Busca"
+
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:718
+#: src/search.c:693
 msgid "Replace this instance?"
 msgstr "¿Substituír?"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:883
+#: src/search.c:840
 msgid "Replace with"
 msgstr "Substituír por"
 
-#: src/search.c:924
+#: src/search.c:875
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
@@ -2136,295 +2154,363 @@ msgstr[0] "Fíxose %lu substitución"
 msgstr[1] "Fixéronse %lu substitucións"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:964
+#: src/search.c:914
 msgid "Enter line number, column number"
 msgstr "Introduza liña número, columna número"
 
-#: src/search.c:991
+#: src/search.c:939
 msgid "Invalid line or column number"
 msgstr "Número de liña ou columna non válida"
 
-#: src/search.c:1124
+#: src/search.c:1080
 msgid "Not a bracket"
 msgstr "Non hai delimitador"
 
-#: src/search.c:1191
+#: src/search.c:1146
 msgid "No matching bracket"
 msgstr "Non hai parella do delimitador"
 
-#: src/text.c:54
+#: src/text.c:53
 msgid "Mark Set"
 msgstr "Marca activada"
 
-#: src/text.c:58
+#: src/text.c:57
 msgid "Mark Unset"
 msgstr "Marca desactivada"
 
-#: src/text.c:70
+#: src/text.c:69
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Erro ó chamar \"%s\""
 
-#: src/text.c:475
-msgid "Nothing in undo buffer!"
-msgstr "Buffer para desfacer baleiro"
+#: src/text.c:468
+msgid "Commenting is not supported for this file type"
+msgstr ""
 
-#: src/text.c:481 src/text.c:634
-#, c-format
-msgid "Internal error: can't match line %d.  Please save your work."
+#: src/text.c:484
+msgid "Cannot comment past end of file"
 msgstr ""
-"Erro interno: non podo atopar a liña %d. Por favor, grave o seu traballo "
+
+#: src/text.c:677
+msgid "Nothing in undo buffer!"
+msgstr "Buffer para desfacer baleiro"
 
 #. TRANSLATORS: Eight of the next nine strings describe actions
 #. * that are undone or redone.  It are all nouns, not verbs.
-#: src/text.c:495 src/text.c:524 src/text.c:645 src/text.c:686
+#: src/text.c:695 src/text.c:724 src/text.c:857 src/text.c:898
 msgid "text add"
 msgstr "engadir texto"
 
-#: src/text.c:505 src/text.c:656
+#: src/text.c:705 src/text.c:868
 msgid "text delete"
 msgstr "borrar texto"
 
-#: src/text.c:528 src/text.c:694
+#: src/text.c:728 src/text.c:907
 msgid "line join"
 msgstr "unir liña"
 
-#: src/text.c:547 src/text.c:710
+#: src/text.c:747 src/text.c:923
 msgid "text cut"
 msgstr "cortar texto"
 
-#: src/text.c:552 src/text.c:714
+#: src/text.c:752 src/text.c:927
 msgid "text uncut"
 msgstr "repór texto"
 
-#: src/text.c:558 src/text.c:691
+#: src/text.c:758 src/text.c:903
 msgid "Internal error: line is missing.  Please save your work."
 msgstr "Erro interno: non podo atopar a liña. Por favor, grave o seu traballo "
 
-#: src/text.c:561 src/text.c:665
+#: src/text.c:762 src/text.c:877
 msgid "line break"
 msgstr "ruptura de liña"
 
-#: src/text.c:569 src/text.c:725
+#: src/text.c:772 src/text.c:947
+msgid "comment"
+msgstr ""
+
+#: src/text.c:776 src/text.c:951
+msgid "uncomment"
+msgstr ""
+
+#: src/text.c:780 src/text.c:938
 msgid "text insert"
 msgstr "inserir texto"
 
-#: src/text.c:589 src/text.c:718
+#: src/text.c:800 src/text.c:931
 msgid "text replace"
 msgstr "substituir texto"
 
-#: src/text.c:596 src/text.c:732 src/text.c:1030 src/text.c:1174
+#: src/text.c:807 src/text.c:955 src/text.c:1267 src/text.c:1437
 msgid "Internal error: unknown type.  Please save your work."
 msgstr "Erro interno: tipo descoñecido. Por favor, grave o seu traballo"
 
-#: src/text.c:601
+#: src/text.c:813
 #, c-format
 msgid "Undid action (%s)"
 msgstr "Desfíxose a acción (%s)"
 
-#: src/text.c:619
+#: src/text.c:832
 msgid "Nothing to re-do!"
 msgstr "Nada para refacer"
 
-#: src/text.c:628
+#: src/text.c:841
 msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
 "Erro interno: non podo arranxa-la reposición de texto. Por favor, grave o "
 "seu traballo."
 
-#: src/text.c:737
+#: src/text.c:961
 #, c-format
 msgid "Redid action (%s)"
 msgstr "A Acción (%s) refíxose"
 
-#: src/text.c:827 src/text.c:2508 src/text.c:2944
+#: src/text.c:1051 src/text.c:2765 src/text.c:3198
 msgid "Could not create pipe"
 msgstr "Non se puido crear unha canle"
 
-#: src/text.c:853 src/text.c:2595 src/text.c:2750 src/text.c:2992
-#: src/text.c:3286
+#: src/text.c:1077 src/text.c:2852 src/text.c:3005 src/text.c:3246
+#: src/text.c:3540
 msgid "Could not fork"
 msgstr "Non se puido iniciar outro proceso"
 
-#: src/text.c:1853
+#: src/text.c:2117
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Cadea de cita %s incorrecta: %s"
 
-#: src/text.c:2241
+#: src/text.c:2499
 msgid "Can now UnJustify!"
 msgstr "¡Agora pode De-Xustificar!"
 
-#: src/text.c:2435
+#: src/text.c:2697
 msgid "Edit a replacement"
 msgstr "Editar unha substitución"
 
-#: src/text.c:2510
+#. TRANSLATORS: Shown after fixing misspellings in one word.
+#: src/text.c:2713
+#, fuzzy
+msgid "Next word..."
+msgstr "Verba Seg"
+
+#: src/text.c:2767
 msgid "Creating misspelled word list, please wait..."
 msgstr "Creando a lista de palabras mal escritas, por favor, espere..."
 
-#: src/text.c:2601 src/text.c:2999
+#: src/text.c:2858 src/text.c:3253
 msgid "Could not get size of pipe buffer"
 msgstr "Non se puido obte-lo tamaño do buffer da canle"
 
-#: src/text.c:2652
+#: src/text.c:2907
 msgid "Error invoking \"spell\""
 msgstr "Erro ó chamar \"spell\""
 
-#: src/text.c:2655
+#: src/text.c:2910
 msgid "Error invoking \"sort -f\""
 msgstr "Erro ó chamar \"sort -f\""
 
-#: src/text.c:2658
+#: src/text.c:2913
 msgid "Error invoking \"uniq\""
 msgstr "Erro ó chamar \"uniq\""
 
-#: src/text.c:2881
+#: src/text.c:3135
 msgid "Invoking spell checker, please wait"
 msgstr "Chamar ó corrector ortográfico, agarde, por favor"
 
-#: src/text.c:2897
+#: src/text.c:3151
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Fallou a revisión ortográfica: %s"
 
-#: src/text.c:2899
+#: src/text.c:3153
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Fallou a corrección ortográfica: %s: %s"
 
-#: src/text.c:2902
+#: src/text.c:3156
 msgid "Finished checking spelling"
 msgstr "Rematou a corrección ortográfica"
 
-#: src/text.c:2927
+#: src/text.c:3181
 msgid "No linter defined for this type of file!"
 msgstr "Non hai definido analizador para este tipo de ficheiros"
 
-#: src/text.c:2932
+#: src/text.c:3186
 msgid "Save modified buffer before linting?"
 msgstr "Gravar o buffer modificado antes da análise"
 
-#: src/text.c:2949
+#: src/text.c:3203
 msgid "Invoking linter, please wait"
 msgstr "Invocando analizador de sintaxe, por favor, espere"
 
-#: src/text.c:3105
+#: src/text.c:3358
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr "Atopáronse 0 liñas analizables pola directiva: %s"
 
-#: src/text.c:3134
+#: src/text.c:3388
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr "Esta mensaxe é polo ficheiro pechado %s, ¿abrir nun novo buffer?"
 
-#: src/text.c:3153
+#: src/text.c:3407
 msgid "No more errors in unopened files, cancelling"
 msgstr "Non hai máis erros en ficheiros pechados, cancelando"
 
-#: src/text.c:3192
+#: src/text.c:3446
 msgid "At last message"
 msgstr "No final da mensaxe"
 
-#: src/text.c:3197
+#: src/text.c:3451
 msgid "At first message"
 msgstr "No comenzo da mensaxe"
 
-#: src/text.c:3237
+#: src/text.c:3491
 msgid "Finished"
 msgstr "Finalizado"
 
-#: src/text.c:3259
+#: src/text.c:3513
 msgid "Invoking formatter, please wait"
 msgstr "Chamando ó formateador, por favor, agarde"
 
-#: src/text.c:3314
+#: src/text.c:3568
 msgid "Finished formatting"
 msgstr "Finalizou o formateado"
 
-#: src/text.c:3396
+#: src/text.c:3650
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sVerbas: %lu  Liñas: %ld  Caracteres: %lu"
 
-#: src/text.c:3397
+#: src/text.c:3651
 msgid "In Selection:  "
 msgstr "In Selección:  "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3411
+#: src/text.c:3665
 msgid "Verbatim Input"
 msgstr "Entrada Literal"
 
-#: src/utils.c:391 src/utils.c:403
+#: src/utils.c:392 src/utils.c:404
 msgid "nano is out of memory!"
 msgstr "¡A nano esgotóuselle a memoria!"
 
+#: src/utils.c:625
+#, c-format
+msgid "Internal error: can't match line %d.  Please save your work."
+msgstr ""
+"Erro interno: non podo atopar a liña %d. Por favor, grave o seu traballo "
+
+#. TRANSLATORS: This refers to a sequence of escape codes
+#. * (from the keyboard) that nano does not know about.
+#: src/winio.c:1121
+msgid "Unknown sequence"
+msgstr ""
+
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
 #: src/winio.c:1427
 msgid "Unicode Input"
 msgstr "Entrada Unicode"
 
-#: src/winio.c:1991 src/winio.c:1995
-msgid "Modified"
-msgstr "Modificado"
-
-#: src/winio.c:1992
-msgid "View"
-msgstr "Ver"
-
-#: src/winio.c:2006
+#: src/winio.c:1960
 msgid "DIR:"
 msgstr "DIR:"
 
-#: src/winio.c:2013
+#: src/winio.c:1968
 msgid "File:"
 msgstr "Ficheiro:"
 
-#: src/winio.c:3141
+#: src/winio.c:1972 src/winio.c:1976
+msgid "Modified"
+msgstr "Modificado"
+
+#: src/winio.c:1974
+msgid "View"
+msgstr "Ver"
+
+#: src/winio.c:3105
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "liña %ld/%ld (%d%%), col %lu/%lu (%d%%), car %lu/%lu (%d%%)"
 
-#: src/winio.c:3271
+#: src/winio.c:3235
 msgid "The nano text editor"
 msgstr "O editor de texto nano"
 
-#: src/winio.c:3272
+#: src/winio.c:3236
 msgid "version"
 msgstr "versión"
 
-#: src/winio.c:3273
+#: src/winio.c:3237
 msgid "Brought to you by:"
 msgstr "Por cortesía de:"
 
-#: src/winio.c:3274
+#: src/winio.c:3238
 msgid "Special thanks to:"
 msgstr "Gracias en especial a:"
 
-#: src/winio.c:3275
+#: src/winio.c:3239
 msgid "The Free Software Foundation"
 msgstr "A Free Software Foundation"
 
-#: src/winio.c:3276
+#: src/winio.c:3240
 msgid "the many translators and the TP"
 msgstr "os moitos tradutores e o TP"
 
-#: src/winio.c:3277
+#: src/winio.c:3241
 msgid "For ncurses:"
 msgstr "Por ncurses:"
 
-#: src/winio.c:3278
+#: src/winio.c:3242
 msgid "and anyone else we forgot..."
 msgstr "e a todos os que esquencemos..."
 
-#: src/winio.c:3279
+#: src/winio.c:3243
 msgid "Thank you for using nano!"
 msgstr "¡Gracias por usar nano!"
 
+#~ msgid ""
+#~ "Read %lu line (Converted from DOS and Mac format - Warning: No write "
+#~ "permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from DOS and Mac format - Warning: No write "
+#~ "permission)"
+#~ msgstr[0] ""
+#~ "Leuse %lu liña (Convertida dos formatos DOS e Mac - Advertencia: Non hai "
+#~ "permiso de escritura)"
+#~ msgstr[1] ""
+#~ "Léronse %lu liñas (Convertidas dos formatos DOS e Mac - Advertencia: Non "
+#~ "hai permiso de escritura)"
+
+#~ msgid ""
+#~ "Read %lu line (Converted from Mac format - Warning: No write permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from Mac format - Warning: No write permission)"
+#~ msgstr[0] ""
+#~ "Leuse %lu liña (Convertida de formato Mac - Advertencia: Non hai permiso "
+#~ "de escritura)"
+#~ msgstr[1] ""
+#~ "Léronse %lu liñas (Convertidas de formato Mac - Advertencia: Non hai "
+#~ "permiso de escritura)"
+
+#~ msgid ""
+#~ "Read %lu line (Converted from DOS format - Warning: No write permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from DOS format - Warning: No write permission)"
+#~ msgstr[0] ""
+#~ "Leuse %lu liña (Convertida do formato DOS - Advertencia: Non hai permiso "
+#~ "de escritura)"
+#~ msgstr[1] ""
+#~ "Léronse %lu liñas (Convertidas do formato DOS - Advertencia: Non hai "
+#~ "permiso de escritura)"
+
+#~ msgid "Read %lu line (Warning: No write permission)"
+#~ msgid_plural "Read %lu lines (Warning: No write permission)"
+#~ msgstr[0] "Le-la liña %lu (Advertencia: Non hai permiso de escritura)"
+#~ msgstr[1] "Le-las liñas %lu (Advertencia: Non hai permiso de escritura)"
+
 #~ msgid "Cannot prepend or append to a symlink with --nofollow set"
 #~ msgstr ""
 #~ "Non se pode engadir ó principio ou ó final a unha ligazón simbólica "
@@ -2432,3 +2518,39 @@ msgstr "¡Gracias por usar nano!"
 
 #~ msgid "Don't follow symbolic links, overwrite"
 #~ msgstr "Non segui-las ligazóns simbólicas, sobreescribir"
+
+#~ msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
+#~ msgstr ""
+#~ "¿Grava-lo buffer modificado (SE RESPOSTA \"Non\" PERDERANSE OS CAMBIOS)?  "
+
+#~ msgid "Unknown Command"
+#~ msgstr "Comando Descoñecido"
+
+#~ msgid "Cannot add a color command without a syntax command"
+#~ msgstr ""
+#~ "Non se pode engadir unha directiva de cor sen unha directiva de sintaxe "
+
+#~ msgid "Missing regex string"
+#~ msgstr "Perdeuse a cadea de expreg"
+
+#~ msgid "Cannot add a header regex without a syntax command"
+#~ msgstr ""
+#~ "Non se pode engadir unha cabeceira de expresión regular sen unha "
+#~ "directiva de sintaxe"
+
+#~ msgid "Cannot add a magic string regex without a syntax command"
+#~ msgstr ""
+#~ "Non se pode engadir unha cadea máxica de expresión regular sen unha "
+#~ "directiva de sintaxe"
+
+#~ msgid "Missing magic string name"
+#~ msgstr "Perdeuse o nome de cadea máxica"
+
+#~ msgid "Cannot add a linter without a syntax command"
+#~ msgstr "Non se pode engadir un analizador sen unha directiva de sintaxe"
+
+#~ msgid "Cannot add formatter without a syntax command"
+#~ msgstr "Non se pode engadir un formateador sen unha directiva de sintaxe "
+
+#~ msgid "Missing formatter command"
+#~ msgstr "Directiva de formato non atopado"
diff --git a/po/hr.po b/po/hr.po
index 85412fb4..ae324825 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -1,15 +1,15 @@
 # Croatian translation of nano.
 # Copyright (C) 2016 Free Software Foundation, Inc.
 # This file is distributed under the same license as the nano package.
-# Božidar Putanec <bozidarp@yahoo.com> 2016.
 #
 # Božidar Putanec <bozidarp@yahoo.com>, 2016.
+# Lektura djelova nanoa i jezično savjetovanje www.editor.hr, 2016.
 msgid ""
 msgstr ""
 "Project-Id-Version: nano-2.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-25 16:41-0500\n"
-"PO-Revision-Date: 2016-02-24 12:33-0800\n"
+"POT-Creation-Date: 2016-06-17 15:41+0200\n"
+"PO-Revision-Date: 2016-03-13 17:13-0700\n"
 "Last-Translator: Božidar Putanec <bozidarp@yahoo.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
 "Language: hr\n"
@@ -18,172 +18,189 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Poedit 1.8.7\n"
+"X-Generator: Poedit 1.8.7.1\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 "X-Poedit-Basepath: ../../Downloads/nano-2.5.2/src\n"
-"X-Poedit-Bookmarks: 445,-1,-1,-1,-1,-1,-1,-1,-1,-1\n"
 "X-Poedit-KeywordsList: syntax;color;all\n"
 "X-Poedit-SearchPath-0: .\n"
 
+#: src/browser.c:144 src/browser.c:284 src/browser.c:334 src/files.c:996
+#: src/files.c:1003 src/files.c:1794 src/files.c:1919 src/files.c:1963
+#: src/files.c:1983 src/files.c:2099 src/files.c:3019 src/files.c:3242
+#: src/rcfile.c:540 src/rcfile.c:1280
+#, c-format
+msgid "Error reading %s: %s"
+msgstr "Greška pri čitanju %s: %s"
+
 # Korisnik upiše ili s tabom kompletira naziv direktorija koji želi otvoriti
 #. TRANSLATORS: This is a prompt.
-#: src/browser.c:220
+#: src/browser.c:247
 msgid "Go To Directory"
 msgstr "Otvori direktorij"
 
-#: src/browser.c:227 src/browser.c:738 src/files.c:1174 src/files.c:2340
-#: src/nano.c:1120 src/search.c:202 src/search.c:290 src/search.c:895
-#: src/search.c:970 src/text.c:2935 src/text.c:3142
+#: src/browser.c:254 src/browser.c:723 src/files.c:1126 src/files.c:2292
+#: src/nano.c:1128 src/search.c:195 src/search.c:297 src/search.c:851
+#: src/search.c:918 src/text.c:3189 src/text.c:3396
 msgid "Cancelled"
 msgstr "Otkazano"
 
-#: src/browser.c:253 src/browser.c:300
-#, c-format
-msgid "Can't go outside of %s in restricted mode"
-msgstr "U ograničenom načinu rada ne mogu ići izvan %s"
-
-#: src/browser.c:264 src/browser.c:310 src/browser.c:326 src/files.c:1044
-#: src/files.c:1052 src/files.c:1844 src/files.c:1971 src/files.c:2016
-#: src/files.c:2037 src/files.c:2156 src/files.c:3062 src/files.c:3285
-#: src/rcfile.c:596 src/rcfile.c:1435
-#, c-format
-msgid "Error reading %s: %s"
-msgstr "Greška čitanja %s: %s"
+#. TRANSLATORS: This refers to the option --operatingdir,
+#. * not to --restricted.
+#: src/browser.c:274 src/browser.c:326
+#, fuzzy, c-format
+msgid "Can't go outside of %s in confined mode"
+msgstr "U ograničenom načinu ne mogu ići izvan %s"
 
 # To je 'top' direktorij, više se ne može
-#: src/browser.c:290
+#: src/browser.c:317
 msgid "Can't move up a directory"
 msgstr "Ne mogu ići iznad ovog direktorija"
 
 #. TRANSLATORS: Try to keep this at most 7 characters.
-#: src/browser.c:615 src/browser.c:623
+#: src/browser.c:590 src/browser.c:598
 msgid "(dir)"
 msgstr "(dir)"
 
 #. TRANSLATORS: Try to keep this at most 12 characters.
-#: src/browser.c:620
+#: src/browser.c:595
 msgid "(parent dir)"
 msgstr "(viši dir)"
 
 #. TRANSLATORS: Try to keep this at most 7 characters.
 #. * If necessary, you can leave out the parentheses.
-#: src/browser.c:650
+#: src/browser.c:625
 msgid "(huge)"
 msgstr "(golem)"
 
 # Pretraži, sinonim za traži
 #. TRANSLATORS: This is the main search prompt.
-#: src/browser.c:727 src/search.c:173
+#: src/browser.c:712 src/search.c:166
 msgid "Search"
 msgstr "Pretraži"
 
-# ‘nalaz’ je što pretraga nađe, a nađe ‘uzorak’;
-#: src/browser.c:777 src/search.c:466 src/search.c:536
-msgid "This is the only occurrence"
-msgstr "To je jedini nalaz uzorka"
-
 # ‘uokrug’ može značiti bilo koji smjer traženja
-#: src/browser.c:793 src/search.c:364
+#: src/browser.c:754 src/search.c:368
 msgid "Search Wrapped"
 msgstr "Pretraga se nastavlja uokrug"
 
-#: src/browser.c:843 src/search.c:517
+# ‘nalaz’ je što pretraga nađe, a nađe ‘uzorak’;
+#: src/browser.c:764 src/search.c:509
+msgid "This is the only occurrence"
+msgstr "To je jedini nalaz uzorka"
+
+#: src/browser.c:812 src/search.c:473
 msgid "No current search pattern"
 msgstr "Nema uzorka za pretragu"
 
-#: src/files.c:50
+#: src/color.c:186
+#, fuzzy, c-format
+msgid "Unknown syntax name: %s"
+msgstr "Nedostaje naziv sintakse"
+
+#: src/color.c:247
+#, c-format
+msgid "magic_load() failed: %s"
+msgstr ""
+
+#: src/color.c:251
+#, c-format
+msgid "magic_file(%s) failed: %s"
+msgstr ""
+
+#: src/files.c:47
 #, c-format
 msgid "Directory '%s' does not exist"
-msgstr "Direktorij ‘%s’ ne postoji"
+msgstr "Direktorij „%s“ ne postoji"
 
 # putanja, put, možda je najbolje ‘staza’
-#: src/files.c:52
+#: src/files.c:49
 #, c-format
 msgid "Path '%s': %s"
-msgstr "Putanja ‘%s’: %s"
+msgstr "Putanja „%s“: %s"
 
-#: src/files.c:54
+#: src/files.c:51
 #, c-format
 msgid "Path '%s' is not a directory"
-msgstr "Putanja ‘%s’ nije direktorij"
+msgstr "Putanja „%s“ nije direktorij"
 
-#: src/files.c:57
+#: src/files.c:53
 #, c-format
 msgid "Path '%s' is not accessible"
-msgstr "Putanja ‘%s’ nije dostupna"
+msgstr "Putanja „%s“ nije dostupna"
 
-#. TRANSLATORS: Try to keep this at most 76 characters.
-#: src/files.c:158
+#. TRANSLATORS: Keep the next ten messages at most 76 characters.
+#: src/files.c:148
 msgid ""
 "Warning: Modifying a file which is not locked, check directory permission?"
 msgstr ""
-"Oprez: Mijenjate nezaključanu datoteku; da provjerite prava na direktorij?"
+"Oprez: Mijenjate nezaključanu datoteku — provjerite prava na direktorij?"
 
-#: src/files.c:197
+#: src/files.c:187
 msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
-msgstr "Vlastiti identitet za zaključanu datoteku nije određen"
+msgstr "Vlastiti identitet nije potvrđen za zaključanu datoteku"
 
-#: src/files.c:206
+#: src/files.c:196
 #, c-format
 msgid "Couldn't determine hostname for lock file: %s"
-msgstr "Ime računala za zaključanu datoteku nije određeno: %s"
+msgstr "Ime računala nije potvrđeno za zaključanu datoteku: %s"
 
-#: src/files.c:227 src/files.c:238 src/files.c:275 src/files.c:285
+#: src/files.c:216 src/files.c:225 src/files.c:262 src/files.c:272
 #, c-format
 msgid "Error writing lock file %s: %s"
-msgstr "Greška zapisivanja zaključane datoteke %s: %s"
+msgstr "Greška pri zapisivanju zaključane datoteke %s: %s"
 
-#: src/files.c:305
+#: src/files.c:291
 #, c-format
 msgid "Error deleting lock file %s: %s"
-msgstr "Greška brisanja zaključane datoteke %s: %s"
+msgstr "Greška pri brisanju zaključane datoteke %s: %s"
 
-#: src/files.c:341
+#: src/files.c:325
 #, c-format
 msgid "Error opening lock file %s: %s"
-msgstr "Greška otvaranja zaključane datoteke %s: %s"
+msgstr "Greška pri otvaranju zaključane datoteke %s: %s"
 
-#: src/files.c:353
+#: src/files.c:337
 #, c-format
 msgid "Error reading lock file %s: Not enough data read"
-msgstr "Greška čitanja zaključane datoteke %s: Nedovoljno učitanih podataka"
+msgstr "Greška pri čitanju zaključane datoteke %s: Premalo učitanih podataka"
 
 #. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
-#: src/files.c:371
+#: src/files.c:354
 #, c-format
 msgid "File %s is being edited (by %s with %s, PID %d); continue?"
-msgstr "Datoteka %s se trenutno uređuje (%s sa %s, PID %d); da nastavim?"
+msgstr "%s se trenutačno uređuje (%s sa %s, PID %d); nastaviti?"
 
-#: src/files.c:426
+#: src/files.c:430
 #, c-format
 msgid "Can't insert file from outside of %s"
-msgstr "Datoteka izvan %s se ne može umetnuti"
+msgstr "Datoteka izvan %s ne može se umetnuti"
 
-#: src/files.c:439 src/files.c:1038 src/rcfile.c:589 src/rcfile.c:1385
-#: src/rcfile.c:1426
+#: src/files.c:445 src/files.c:991 src/rcfile.c:533 src/rcfile.c:1230
+#: src/rcfile.c:1271
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "„%s“ je direktorij"
 
-#: src/files.c:441
+#: src/files.c:447
 #, c-format
 msgid "\"%s\" is not a normal file"
 msgstr "„%s“ nije obična datoteka"
 
-#: src/files.c:566
+#: src/files.c:571
 msgid "No more open file buffers"
 msgstr "Nema više otvorenih međumemorija"
 
-#: src/files.c:582
+#: src/files.c:586
 #, c-format
 msgid "Switched to %s"
 msgstr "Prebacivanje na: %s"
 
-#: src/files.c:584 src/global.c:988 src/winio.c:2010
+#: src/files.c:588 src/global.c:1005 src/winio.c:1965
 msgid "New Buffer"
 msgstr "Nova međumemorija"
 
-#: src/files.c:943
+#. TRANSLATORS: Keep the next four messages at most 76 characters.
+#: src/files.c:913
 #, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
@@ -191,22 +208,7 @@ msgstr[0] "Učitano: %lu redak (DOS i Mac zapis je adaptiran)"
 msgstr[1] "Učitano: %lu retka (DOS i Mac zapis je adaptiran)"
 msgstr[2] "Učitano: %lu redaka (DOS i Mac zapis je adaptiran)"
 
-#: src/files.c:948
-#, c-format
-msgid ""
-"Read %lu line (Converted from DOS and Mac format - Warning: No write "
-"permission)"
-msgid_plural ""
-"Read %lu lines (Converted from DOS and Mac format - Warning: No write "
-"permission)"
-msgstr[0] ""
-"Učitano: %lu redak (DOS i Mac zapis je adaptiran - pisanje nije dopušteno)"
-msgstr[1] ""
-"Učitano: %lu retka (DOS i Mac zapis je adaptiran - pisanje nije dopušteno)"
-msgstr[2] ""
-"Učitano: %lu redaka (DOS i Mac zapis je adaptiran - pisanje nije dopušteno)"
-
-#: src/files.c:954
+#: src/files.c:919
 #, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
@@ -214,20 +216,7 @@ msgstr[0] "Učitano: %lu redak (Mac zapis je adaptiran)"
 msgstr[1] "Učitano: %lu retka (Mac zapis je adaptiran)"
 msgstr[2] "Učitano: %lu redaka (Mac zapis je adaptiran)"
 
-#: src/files.c:958
-#, c-format
-msgid ""
-"Read %lu line (Converted from Mac format - Warning: No write permission)"
-msgid_plural ""
-"Read %lu lines (Converted from Mac format - Warning: No write permission)"
-msgstr[0] ""
-"Učitano: %lu redak (Mac zapis je adaptiran - pisanje nije dopušteno)"
-msgstr[1] ""
-"Učitano: %lu retka (Mac zapis je adaptiran - pisanje nije dopušteno)"
-msgstr[2] ""
-"Učitano: %lu redaka (Mac zapis je adaptiran - pisanje nije dopušteno)"
-
-#: src/files.c:964
+#: src/files.c:925
 #, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
@@ -235,20 +224,7 @@ msgstr[0] "Učitano: %lu redak (DOS zapis je adaptiran)"
 msgstr[1] "Učitano: %lu retka (DOS zapis je adaptiran)"
 msgstr[2] "Učitano: %lu redaka (DOS zapis je adaptiran)"
 
-#: src/files.c:968
-#, c-format
-msgid ""
-"Read %lu line (Converted from DOS format - Warning: No write permission)"
-msgid_plural ""
-"Read %lu lines (Converted from DOS format - Warning: No write permission)"
-msgstr[0] ""
-"Učitano: %lu redak (DOS zapis je adaptiran - pisanje nije dopušteno)"
-msgstr[1] ""
-"Učitano: %lu retka (DOS zapis je adaptiran - pisanje nije dopušteno)"
-msgstr[2] ""
-"Učitano: %lu redaka (DOS zapis je adaptiran - pisanje nije dopušteno)"
-
-#: src/files.c:974
+#: src/files.c:930
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
@@ -256,90 +232,83 @@ msgstr[0] "Učitano: %lu redak"
 msgstr[1] "Učitano: %lu retka"
 msgstr[2] "Učitano: %lu redaka"
 
-#: src/files.c:977
-#, c-format
-msgid "Read %lu line (Warning: No write permission)"
-msgid_plural "Read %lu lines (Warning: No write permission)"
-msgstr[0] "Učitano: %lu redak (pisanje nije dopušteno)"
-msgstr[1] "Učitano: %lu retka (pisanje nije dopušteno)"
-msgstr[2] "Učitano: %lu redaka (pisanje nije dopušteno)"
-
-#: src/files.c:1019 src/files.c:1056
+#: src/files.c:974 src/files.c:1006
 msgid "Reading File"
 msgstr "Učitavanje datoteke"
 
-#: src/files.c:1025
+#: src/files.c:980
 msgid "New File"
 msgstr "Nova datoteka"
 
-#: src/files.c:1028
-#, c-format
-msgid "\"%s\" not found"
+#: src/files.c:983
+#, fuzzy, c-format
+msgid "File \"%s\" not found"
 msgstr "„%s“ nije pronađena"
 
-#: src/files.c:1039 src/rcfile.c:590 src/rcfile.c:1386 src/rcfile.c:1427
+#: src/files.c:992 src/rcfile.c:534 src/rcfile.c:1231 src/rcfile.c:1272
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "„%s“ je datoteka uređaja"
 
-#: src/files.c:1133
+#: src/files.c:1083
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
-msgstr "U novoj međumemoriji izvrši naredbu [u %s] "
+msgstr "Naredba za izvršenje u novoj međumemoriji [u %s] "
 
-#: src/files.c:1135
+#: src/files.c:1085
 #, c-format
 msgid "Command to execute [from %s] "
-msgstr "Naredba za izvršiti [u %s] "
+msgstr "Naredba za izvršenje [u %s] "
 
-#: src/files.c:1142
+#: src/files.c:1092
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Datoteka za umetanje u novu međumemoriju [iz %s] "
 
-#: src/files.c:1144
+#: src/files.c:1094
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Datoteka za umetanje [iz %s] "
 
-#: src/files.c:1389
+#: src/files.c:1338
 msgid "Key invalid in non-multibuffer mode"
-msgstr "Tipka ne važi u ‘bez-višestrukih-međumemorija’ načinu rada"
+msgstr "Nevažeća tipka u načinu bez višestrukih međumemorija"
 
 # backup file = kopija datoteke, ukratko kopija
-#: src/files.c:1684
-msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+#: src/files.c:1632
+#, fuzzy
+msgid "Failed to write backup file; continue saving? (Say N if unsure.) "
 msgstr ""
-"Zapis kopije nije uspio, da nastavim sa spremanjem? (N ako niste sigurni) "
+"Zapis kopije nije uspio – nastaviti sa spremanjem? (N ako niste sigurni) "
 
-#: src/files.c:1800
+#: src/files.c:1750
 #, c-format
 msgid "Can't write outside of %s"
-msgstr "Izvan %s se ne može pisati"
+msgstr "Izvan %s ne može se pisati"
 
-#: src/files.c:1885 src/files.c:1910 src/files.c:1928 src/files.c:1941
-#: src/files.c:1952 src/files.c:1981
+#: src/files.c:1833 src/files.c:1858 src/files.c:1876 src/files.c:1889
+#: src/files.c:1900 src/files.c:1928
 #, c-format
 msgid "Error writing backup file %s: %s"
-msgstr "Greška zapisivanja sigurnosne datoteke %s: %s"
+msgstr "Greška pri zapisivanju sigurnosne datoteke %s: %s"
 
-#: src/files.c:1886 src/nano.c:690
+#: src/files.c:1834 src/nano.c:692
 msgid "Too many backup files?"
 msgstr "Ima li previše sigurnosnih datoteka?"
 
-#: src/files.c:2026 src/text.c:2863 src/text.c:2875 src/text.c:3244
-#: src/text.c:3253
+#: src/files.c:1972 src/text.c:3117 src/text.c:3129 src/text.c:3498
+#: src/text.c:3507
 #, c-format
 msgid "Error writing temp file: %s"
-msgstr "Greška zapisivanja privremene datoteke: %s"
+msgstr "Greška pri zapisivanju privremene datoteke: %s"
 
-#: src/files.c:2049 src/files.c:2068 src/files.c:2080 src/files.c:2104
-#: src/files.c:2121 src/files.c:2131 src/files.c:2164 src/files.c:2171
+#: src/files.c:1994 src/files.c:2013 src/files.c:2023 src/files.c:2047
+#: src/files.c:2064 src/files.c:2074 src/files.c:2106 src/files.c:2113
 #, c-format
 msgid "Error writing %s: %s"
-msgstr "Greška zapisivanja %s: %s"
+msgstr "Greška pri zapisivanju %s: %s"
 
-#: src/files.c:2200
+#: src/files.c:2154
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
@@ -347,843 +316,886 @@ msgstr[0] "Zapisano: %lu redak"
 msgstr[1] "Zapisano: %lu retka"
 msgstr[2] "Zapisano: %lu redaka"
 
-#: src/files.c:2299
+#: src/files.c:2249
 msgid " [DOS Format]"
 msgstr " [DOS zapis]"
 
-#: src/files.c:2300
+#: src/files.c:2250
 msgid " [Mac Format]"
 msgstr " [Mac zapis]"
 
-#: src/files.c:2302
+#: src/files.c:2252
 msgid " [Backup]"
 msgstr " [Sigurnosna kopija]"
 
-#: src/files.c:2309
+#: src/files.c:2259
 msgid "Prepend Selection to File"
-msgstr "Odabrani tekst umetni na početak datoteke"
+msgstr "Odabrani tekst umetni na vrh datoteke"
 
-#: src/files.c:2310
+#: src/files.c:2260
 msgid "Append Selection to File"
-msgstr "Odabrani tekst dodaj na kraj datoteke"
+msgstr "Odabrani tekst dodaj na dno datoteke"
 
-#: src/files.c:2311
+#: src/files.c:2261
 msgid "Write Selection to File"
 msgstr "Odabrani tekst zapiši u datoteku"
 
-#: src/files.c:2314
+#: src/files.c:2264
 msgid "File Name to Prepend to"
-msgstr "Naziv datoteke u koju se umeće na početak"
+msgstr "Naziv datoteke kojoj se tekst umeće na vrh"
 
-#: src/files.c:2315
+#: src/files.c:2265
 msgid "File Name to Append to"
-msgstr "Naziv datoteke u koju se dodaje na kraj"
+msgstr "Naziv datoteke kojoj se tekst dodaje na dno"
 
-#: src/files.c:2316
+#: src/files.c:2266
 msgid "File Name to Write"
-msgstr "Naziv datoteke za spremanje"
+msgstr "Spremi datoteku pod nazivom"
+
+#: src/files.c:2301
+#, fuzzy
+msgid "Save modified buffer anyway? "
+msgstr "Da ipak spremim izmijenjenu međumemoriju? "
 
-#: src/files.c:2349
-msgid "Save modified buffer anyway ? "
-msgstr "Da ipak spremim izmijenjenu međumemoriju?"
+#: src/files.c:2412
+#, fuzzy
+msgid "Save file under DIFFERENT NAME? "
+msgstr "Da spremim datoteku pod DRUKÄŒIJIM NAZIVOM? "
 
 # overwrite: prepisati preko, prebrisati
-#: src/files.c:2457
-msgid "File exists, OVERWRITE ? "
+#: src/files.c:2420
+#, fuzzy, c-format
+msgid "File \"%s\" exists; OVERWRITE? "
 msgstr "Datoteka postoji, da ju PREPIÅ EM? "
 
-#: src/files.c:2466
-msgid "Save file under DIFFERENT NAME ? "
-msgstr "Da spremim datoteku pod DRUKÄŒIJIM NAZIVOM? "
-
-# Nešto izvan nano-a je promijenilo datoteku na disku. nano pita da li da piše preko promijenjenje datoteke
-#: src/files.c:2480
-msgid "File was modified since you opened it, continue saving ? "
+# Nešto izvan nana je promijenilo datoteku na disku. nano pita da li da piše preko promijenjenje datoteke
+#: src/files.c:2441
+#, fuzzy
+msgid "File was modified since you opened it; continue saving? "
 msgstr ""
 "Nakon Å¡to ste ju otvorili, datoteka se promijenila. Da ju ipak spremim? "
 
-#: src/files.c:2917
+#: src/files.c:2874
 msgid "(more)"
 msgstr "(više)"
 
-#: src/files.c:3004
+#: src/files.c:2959
 #, c-format
 msgid ""
 "\n"
 "Press Enter to continue\n"
 msgstr ""
 "\n"
-"Da nastavite pritisnite ‘Enter’\n"
+"Da nastavite pritisnite Enter\n"
 
-#: src/files.c:3020
+#: src/files.c:2975
 #, c-format
 msgid ""
 "Unable to create directory %s: %s\n"
 "It is required for saving/loading search history or cursor positions.\n"
 msgstr ""
 "Ne mogu napraviti direktorij %s: %s\n"
-"Direktorij treba za čuvanje/čitanje povijesti pretraga/pozicije kursora.\n"
+"Potreban je za čuvanje/čitanje povijesti pretraga / pozicije kursora.\n"
 
-#: src/files.c:3026
+#: src/files.c:2982
 #, c-format
 msgid ""
 "Path %s is not a directory and needs to be.\n"
 "Nano will be unable to load or save search history or cursor positions.\n"
 msgstr ""
 "Put %s nije direktorij a trebao bi biti.\n"
-"Nano neće moći čitati, niti čuvati povijest pretraga ili poziciju kursora.\n"
+"Nano neće ni čitati ni čuvati povijest pretraga ili poziciju kursora.\n"
 
-#: src/files.c:3045
+#: src/files.c:3002
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I tried to move\n"
 "to the preferred location (%s) but encountered an error: %s"
 msgstr ""
-"Otkrivena je stara ‘nano’ povijest-datoteka (%s). Pri pokušaju \n"
-"premještanja na poželjnu lokaciju (%s) došlo je do greške: %s"
+"Otkrivena je stara nanova povijesna datoteka (%s). Pri pokušaju\n"
+"premještaja na željenu lokaciju (%s) došlo je do pogreške: %s"
 
-#: src/files.c:3049
+#: src/files.c:3006
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I moved\n"
 "to the preferred location (%s)\n"
 "(see the nano FAQ about this change)"
 msgstr ""
-"Otkrivena je stara ‘nano’ povijest-datoteka (%s).\n"
-"Premještena je na poželjnu lokaciju (%s)\n"
-"(vidi ‘nano’ FAQ za obrazloženje)"
+"Otkrivena je stara nanova povijesna datoteka (%s)\n"
+"Premještena je na željenu lokaciju (%s)\n"
+"(vidi nano FAQ za obrazloženje)"
 
-#: src/files.c:3132 src/files.c:3140 src/files.c:3164 src/files.c:3176
+#: src/files.c:3089 src/files.c:3097 src/files.c:3121 src/files.c:3133
 #, c-format
 msgid "Error writing %s: %s\n"
-msgstr "Greška zapisivanja %s: %s\n"
+msgstr "Greška pri zapisivanju %s: %s\n"
 
 #. TRANSLATORS: Try to keep the next fifteen strings at most 10 characters.
-#: src/global.c:480
+#: src/global.c:483
 msgid "Exit"
 msgstr "Izlaz"
 
-#: src/global.c:481
+#: src/global.c:484
 msgid "Close"
 msgstr "Zatvori"
 
-#: src/global.c:482
+#: src/global.c:485
 msgid "Uncut Text"
 msgstr "Zalijepi"
 
-#: src/global.c:484
+#: src/global.c:487
 msgid "Unjustify"
 msgstr "Odravnaj"
 
-#: src/global.c:490
+#: src/global.c:493
 msgid "Read File"
 msgstr "Učitaj"
 
-#: src/global.c:491
+#: src/global.c:494
 msgid "Where Is"
 msgstr "Pretraži"
 
-#: src/global.c:492
+#: src/global.c:495
 msgid "Replace"
 msgstr "Zamijeni"
 
 # 'Go to' se najčešće izbjegava; koristi se imenička konstrukcija jasna iz konteksta
-#: src/global.c:493
+#: src/global.c:496
 msgid "Go To Line"
 msgstr "U redak"
 
-#: src/global.c:494
+#: src/global.c:497
 msgid "Prev Line"
 msgstr "Redak ↑"
 
-#: src/global.c:495
+#: src/global.c:498
 msgid "Next Line"
 msgstr "Redak ↓"
 
-#: src/global.c:496
+#: src/global.c:499
 msgid "Prev Page"
 msgstr "Zaslon ↑"
 
-#: src/global.c:497
+#: src/global.c:500
 msgid "Next Page"
 msgstr "Zaslon ↓"
 
-#: src/global.c:499
+#: src/global.c:502
 msgid "Justify"
 msgstr "Poravnaj"
 
-#: src/global.c:500
+# Poravnanje=operacija ravnanja teksta tako da svi reci imaju istu udaljenost u odnosu na rubove
+#: src/global.c:503
 msgid "FullJstify"
-msgstr "Sve poravnaj"
+msgstr "Poravnanje"
 
-#: src/global.c:502
+#: src/global.c:505
 msgid "Refresh"
 msgstr "Osvježi"
 
 #. TRANSLATORS: Try to keep this string at most 12 characters.
-#: src/global.c:505
+#: src/global.c:508
 msgid "WhereIs Next"
 msgstr "Traži dalje"
 
 #. TRANSLATORS: The next long series of strings are shortcut descriptions;
 #. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:512
+#: src/global.c:515
 msgid "Justify the current paragraph"
 msgstr "Poravnaj aktualni odlomak"
 
-#: src/global.c:514
+#: src/global.c:517
 msgid "Cancel the current function"
 msgstr "Prekini aktualnu funkciju/radnju"
 
-#: src/global.c:515
+#: src/global.c:518
 msgid "Display this help text"
 msgstr "Pokaži ovaj pomoćni tekst"
 
-#: src/global.c:518
+#: src/global.c:521
 msgid "Close the current file buffer / Exit from nano"
-msgstr "Zatvori aktualnu međumemoriju / napusti ‘nano’"
+msgstr "Zatvori aktualnu međumemoriju / napusti nano"
 
-#: src/global.c:520
+#: src/global.c:523
 msgid "Exit from nano"
-msgstr "Iziđi iz ‘nano’"
+msgstr "Iziđi iz nanoa"
 
-#: src/global.c:524
+#: src/global.c:527
 msgid "Write the current file to disk"
 msgstr "Spremi aktualnu datoteku na disk"
 
-#: src/global.c:526
+#: src/global.c:529
 msgid "Insert another file into the current one"
-msgstr "Umetni neku drugu datoteku u aktualnu datoteku"
+msgstr "Neku drugu datoteku umetni u aktualnu datoteku"
 
-#: src/global.c:528
+# regularni izraz u dalnjem textu regizr ako je ograničen broj znakova
+#: src/global.c:531
 msgid "Search for a string or a regular expression"
-msgstr "Traži znakovni niz ili regularni izraz"
+msgstr "Traži znakovni niz ili regularni izraz (reg izraz)"
 
-#: src/global.c:531
+#: src/global.c:533
 msgid "Search for a string"
 msgstr "Traži znakovni niz"
 
-#: src/global.c:533
+#: src/global.c:534
+msgid "Refresh the file list"
+msgstr ""
+
+# redak, stupac su brojevi
+#: src/global.c:535
+#, fuzzy
+msgid "Go to lefthand column"
+msgstr "Pomakni kursor u zadan redak i stupac"
+
+# redak, stupac su brojevi
+#: src/global.c:536
+#, fuzzy
+msgid "Go to righthand column"
+msgstr "Pomakni kursor u zadan redak i stupac"
+
+#: src/global.c:538
 msgid "Go one screenful up"
 msgstr "Za jedan zaslon gore (Page Up)"
 
-#: src/global.c:534
+#: src/global.c:539
 msgid "Go one screenful down"
 msgstr "Za jedan zaslon dolje (Page Down)"
 
-#: src/global.c:536
+#: src/global.c:541
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Izreži aktualni redak i spremi ga u međuspremnik"
 
-#: src/global.c:538
+#: src/global.c:543
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Zalijepi sadržaj međuspremnika u aktualni redak"
 
-# r red s stupac
-#: src/global.c:539
+#: src/global.c:544
 msgid "Display the position of the cursor"
-msgstr "Pokaži trenutnu poziciju kursora"
+msgstr "Pokaži trenutačnu poziciju kursora"
 
-#: src/global.c:541
+#: src/global.c:546
 msgid "Invoke the spell checker, if available"
 msgstr "Pozovi provjeru pravopisa ako je dostupna"
 
-#: src/global.c:543
+#: src/global.c:548
 msgid "Replace a string or a regular expression"
 msgstr "Zamijeni znakovni niz ili regularni izraz"
 
-#: src/global.c:544
+# redak, stupac su brojevi
+#: src/global.c:549
 msgid "Go to line and column number"
-msgstr "Pomakni kursor u zadani redak i stupac"
+msgstr "Pomakni kursor u zadan redak i stupac"
 
-#: src/global.c:546
+#: src/global.c:551
 msgid "Mark text starting from the cursor position"
-msgstr "Odaberi tekst počevši od kursora"
+msgstr "Označi tekst počevši od kursora"
 
-#: src/global.c:547
+#: src/global.c:552
 msgid "Repeat the last search"
-msgstr "Ponovi zadnju pretragu"
+msgstr "Ponovi prethodnu pretragu"
 
-#: src/global.c:549
+#: src/global.c:554
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "Kopiraj aktualni redak i spremi ga u međuspremnik"
 
-#: src/global.c:550
+#: src/global.c:555
 msgid "Indent the current line"
-msgstr "Uvući aktualni redak"
+msgstr "Uvuci aktualni redak"
 
-#: src/global.c:551
+#: src/global.c:556
 msgid "Unindent the current line"
-msgstr "Izvući aktualni redak"
+msgstr "Izvuci aktualni redak"
 
-#: src/global.c:552
+#: src/global.c:558
+msgid "Comment/uncomment the current line or marked lines"
+msgstr ""
+
+#: src/global.c:560
 msgid "Undo the last operation"
-msgstr "Poništi zadnju radnju"
+msgstr "Poništi prethodnu radnju"
 
-#: src/global.c:553
+#: src/global.c:561
 msgid "Redo the last undone operation"
-msgstr "Obnovi zadnju poništenu radnju"
+msgstr "Obnovi prethodnu poništenu radnju"
 
-#: src/global.c:555
+#: src/global.c:563
 msgid "Go back one character"
 msgstr "Natrag za jedan znak"
 
-#: src/global.c:556
+#: src/global.c:564
 msgid "Go forward one character"
 msgstr "Naprijed za jedan znak"
 
-#: src/global.c:558
+#: src/global.c:566
 msgid "Go back one word"
 msgstr "Natrag za jednu riječ"
 
-#: src/global.c:559
+#: src/global.c:567
 msgid "Go forward one word"
 msgstr "Naprijed za jednu riječ"
 
-#: src/global.c:561
+#: src/global.c:569
 msgid "Go to previous line"
 msgstr "Prethodni redak"
 
-#: src/global.c:562
+#: src/global.c:570
 msgid "Go to next line"
 msgstr "Sljedeći redak"
 
-#: src/global.c:563
+#: src/global.c:571
 msgid "Go to beginning of current line"
 msgstr "Početak aktualnog retka"
 
-#: src/global.c:564
+#: src/global.c:572
 msgid "Go to end of current line"
 msgstr "Kraj aktualnog retka"
 
-#: src/global.c:567
+#: src/global.c:575
 msgid "Go to beginning of paragraph; then of previous paragraph"
-msgstr "Kursor na početak odlomka; zatim na početak prethodnog"
+msgstr "Kursor na vrh odlomka; zatim na vrh prethodnog"
 
-#: src/global.c:569
+#: src/global.c:577
 msgid "Go just beyond end of paragraph; then of next paragraph"
-msgstr "Kursor tik izvan kraja odlomka; zatim na kraj sljedećeg"
+msgstr "Kursor tik izvan dna odlomka; zatim na dno sljedećeg"
 
-#: src/global.c:571
+#: src/global.c:579
 msgid "Go to the first line of the file"
 msgstr "Prvi redak datoteke (vrh)"
 
-#: src/global.c:572
+#: src/global.c:580
 msgid "Go to the last line of the file"
-msgstr "Zadnji redak datoteke (dno)"
+msgstr "Posljednji redak datoteke (dno)"
 
-#: src/global.c:574
+#: src/global.c:582
 msgid "Go to the matching bracket"
-msgstr "Skoči na sparenu zagradu"
+msgstr "Kursor na sparenu zagradu"
 
-#: src/global.c:576
+#: src/global.c:584
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "Klizni gore za jedan redak bez pomaka kursora"
 
-#: src/global.c:578
+#: src/global.c:586
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "Klizni dolje za jedan redak bez pomaka kursora"
 
-#: src/global.c:581
+#: src/global.c:589
 msgid "Switch to the previous file buffer"
 msgstr "Prethodna međumemorija/datoteka"
 
-#: src/global.c:582
+#: src/global.c:590
 msgid "Switch to the next file buffer"
 msgstr "Sljedeća međumemorija/datoteka"
 
-#: src/global.c:584
+#: src/global.c:592
 msgid "Insert the next keystroke verbatim"
 msgstr "Sljedeću tipku unesi doslovno"
 
-#: src/global.c:585
+#: src/global.c:593
 msgid "Insert a tab at the cursor position"
-msgstr "Unesi tabulator ‘Tab’ na poziciji kursora"
+msgstr "Unesi (tab)ulator na poziciji kursora"
 
-#: src/global.c:586
+#: src/global.c:594
 msgid "Insert a newline at the cursor position"
 msgstr "Unesi novi redak na poziciji kursora"
 
-#: src/global.c:587
+#: src/global.c:595
 msgid "Delete the character under the cursor"
 msgstr "Izbriši znak ispod kursora"
 
-#: src/global.c:589
+#: src/global.c:597
 msgid "Delete the character to the left of the cursor"
 msgstr "Izbriši znak ulijevo od kursora"
 
-#: src/global.c:592
+#: src/global.c:600
 msgid "Cut backward from cursor to word start"
 msgstr "Izreži unatrag od kursora do početka riječi"
 
-#: src/global.c:594
+#: src/global.c:602
 msgid "Cut forward from cursor to next word start"
 msgstr "Izreži od kursora do početka sljedeće riječi"
 
-#: src/global.c:596
+#: src/global.c:604
 msgid "Cut from the cursor position to the end of the file"
-msgstr "Izreži od kursora do kraja datoteke"
+msgstr "Izreži od kursora do dna datoteke"
 
-#: src/global.c:599
+# poravnanje djeluje na ukupnu datoteku
+#: src/global.c:607
 msgid "Justify the entire file"
-msgstr "Poravnaj cijelu datoteku/međumemoriju"
+msgstr "Poravnanje cjelokupne datoteke/međumemorije"
 
-#: src/global.c:603
+#: src/global.c:611
 msgid "Count the number of words, lines, and characters"
 msgstr "Izbroji broj riječi, redova i znakova"
 
-#: src/global.c:606
+#: src/global.c:614
 msgid "Refresh (redraw) the current screen"
 msgstr "Osvježi zaslon"
 
-#: src/global.c:608
+#: src/global.c:616
 msgid "Suspend the editor (if suspension is enabled)"
 msgstr "Obustavi uređivanje teksta (ako je obustava omogućena)"
 
-#: src/global.c:610
+#: src/global.c:618
 msgid "Save file without prompting"
 msgstr "Spremi datoteku bez pitanja"
 
-#: src/global.c:611
+#: src/global.c:619
 msgid "Search next occurrence backward"
 msgstr "Traži unatrag sljedeći nalaz uzorka"
 
-#: src/global.c:612
+#: src/global.c:620
 msgid "Search next occurrence forward"
 msgstr "Traži unaprijed sljedeći nalaz uzorka"
 
 # toggle: smisao rečenice govori da je to 'šalter'; slično za večinu 'toggle' naredbi
-#: src/global.c:614
+#: src/global.c:622
 msgid "Toggle the case sensitivity of the search"
 msgstr "Pretraživanje razlikuje mala i VELIKA slova (da ili ne)"
 
-#: src/global.c:616
+#: src/global.c:624
 msgid "Reverse the direction of the search"
 msgstr "Obrni smjer traženja"
 
-#: src/global.c:620
+#: src/global.c:628
 msgid "Toggle the use of regular expressions"
 msgstr "Regularni izraz u pretraživanju (da ili ne)"
 
-#: src/global.c:624
+#: src/global.c:632
 msgid "Recall the previous search/replace string"
 msgstr "Pozovi prethodni znakovni niz za pretragu/zamjenu"
 
-#: src/global.c:626
+#: src/global.c:634
 msgid "Recall the next search/replace string"
 msgstr "Pozovi sljedeći znakovni niz za pretragu/zamjenu"
 
-#: src/global.c:629
+#: src/global.c:637
 msgid "Go to file browser"
 msgstr "Otvori preglednik datoteka"
 
-#: src/global.c:632
+#: src/global.c:640
 msgid "Toggle the use of DOS format"
 msgstr "DOS zapis (da ili ne)"
 
-#: src/global.c:633
+#: src/global.c:641
 msgid "Toggle the use of Mac format"
 msgstr "Mac zapis (da ili ne)"
 
-#: src/global.c:634
+#: src/global.c:642
 msgid "Toggle appending"
-msgstr "Dodavanje (teksta) na kraj (da ili ne)"
+msgstr "Dodavanje (teksta) na dno (da ili ne)"
 
-#: src/global.c:635
+#: src/global.c:643
 msgid "Toggle prepending"
-msgstr "Umetanje (teksta) na početak (da ili ne)"
+msgstr "Umetanje (teksta) na vrh (da ili ne)"
 
-#: src/global.c:636
+#: src/global.c:644
 msgid "Toggle backing up of the original file"
 msgstr "Sigurnosna kopija originalne datoteke (da ili ne)"
 
-#: src/global.c:637
+#: src/global.c:645
 msgid "Execute external command"
 msgstr "Izvrši vanjsku naredbu"
 
-#: src/global.c:639
+#: src/global.c:647
 msgid "Close buffer without saving it"
 msgstr "Zatvori međumemoriju bez spremanja"
 
-#: src/global.c:641
+#: src/global.c:649
 msgid "Toggle the use of a new buffer"
 msgstr "Nova međumemorija (da ili ne)"
 
-#: src/global.c:644
+#: src/global.c:652
 msgid "Exit from the file browser"
-msgstr "Izađi iz preglednika datoteka"
+msgstr "Iziđi iz preglednika datoteka"
 
-#: src/global.c:645
+#: src/global.c:653
 msgid "Go to the first file in the list"
 msgstr "Prva datoteka na listi"
 
-#: src/global.c:646
+#: src/global.c:654
 msgid "Go to the last file in the list"
 msgstr "Zadnja datoteka na listi"
 
-#: src/global.c:647
+#: src/global.c:655
 msgid "Go to the previous file in the list"
 msgstr "Prethodna datoteka na listi"
 
-#: src/global.c:648
+#: src/global.c:656
 msgid "Go to the next file in the list"
 msgstr "Sljedeća datoteka na listi"
 
 # Prompt za odabir direktorija
-#: src/global.c:649
+#: src/global.c:657
 msgid "Go to directory"
 msgstr "Otvori direktorij"
 
-#: src/global.c:652
+#: src/global.c:660
 msgid "Invoke the linter, if available"
-msgstr "Pozovi ‘linter’ (alat) ako je dostupan"
+msgstr "Pozovi linter (alat) ako je dostupan"
 
-#: src/global.c:653
+#: src/global.c:661
 msgid "Go to previous linter msg"
-msgstr "Prethodna poruka ‘linter’-a"
+msgstr "Prethodna poruka lintera"
 
-#: src/global.c:654
+#: src/global.c:662
 msgid "Go to next linter msg"
-msgstr "Sljedeća poruka ‘linter’-a"
+msgstr "Sljedeća poruka lintera"
 
-#: src/global.c:656
+#: src/global.c:664
 msgid "Invoke formatter, if available"
-msgstr "Pozovi ‘formatter’ (alat) ako je dostupan"
+msgstr "Pozovi formatter (alat) ako je dostupan"
 
 #. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:671
+#: src/global.c:679
 msgid "Get Help"
 msgstr "Pomoć"
 
-#: src/global.c:674 src/prompt.c:858
+#: src/global.c:682 src/prompt.c:855
 msgid "Cancel"
 msgstr "Odustani"
 
-#: src/global.c:687
+#: src/global.c:695
 msgid "Write Out"
 msgstr "Spremi"
 
 # Direktorij je dosta, jer je jasno iz konteksta a ima i pomoćni tekst
-#: src/global.c:723
+#: src/global.c:731
 msgid "Go To Dir"
 msgstr "Direktorij"
 
-#: src/global.c:738
+#: src/global.c:746
 msgid "Cut Text"
 msgstr "Izreži"
 
-#: src/global.c:753
+#: src/global.c:761
 msgid "To Spell"
 msgstr "Pravopis"
 
 # lintanje, čišćenje koda
-#: src/global.c:757
+#: src/global.c:765
 msgid "To Linter"
 msgstr "Linter"
 
 # popravljanje formata, oblikovanje teksta
-#: src/global.c:760
+#: src/global.c:768
 msgid "Formatter"
 msgstr "Formatter"
 
 # razlikovanje malih od velikih slova
-#: src/global.c:767
+#: src/global.c:775
 msgid "Case Sens"
 msgstr "Slova m/V"
 
-# regexp: regularni izraz > regiz ?
-#: src/global.c:772
+# regexp: regularni izraz > regizr ?
+#: src/global.c:780
 msgid "Regexp"
 msgstr "Reg izraz"
 
-#: src/global.c:777
+#: src/global.c:785
 msgid "Backwards"
 msgstr "Unatrag"
 
-#: src/global.c:784
+# Ne zamijeni? bolje Ne mijenjaj?
+#: src/global.c:792
 msgid "No Replace"
 msgstr "Ne zamijeni"
 
-#: src/global.c:792
+#: src/global.c:800
 msgid "Cur Pos"
 msgstr "Pozicija"
 
-#: src/global.c:807
+#: src/global.c:815
 msgid "First Line"
 msgstr "Na vrh"
 
-#: src/global.c:809
+#: src/global.c:817
 msgid "Last Line"
 msgstr "Na dno"
 
-#: src/global.c:816
+#: src/global.c:824
 msgid "To Bracket"
-msgstr "Na zagradu"
+msgstr "K zagradi"
 
-#: src/global.c:819
+#: src/global.c:827
 msgid "Mark Text"
 msgstr "Označi tekst"
 
-#: src/global.c:822
+#: src/global.c:830
 msgid "Copy Text"
 msgstr "Kopiraj"
 
-#: src/global.c:825
+#: src/global.c:833
 msgid "Indent Text"
-msgstr "Uvući tekst"
+msgstr "Uvuci tekst"
 
-#: src/global.c:827
+#: src/global.c:835
 msgid "Unindent Text"
-msgstr "Izvući tekst"
+msgstr "Izvuci tekst"
 
-#: src/global.c:830
+#: src/global.c:838
 msgid "Undo"
 msgstr "Poništi"
 
-#: src/global.c:832
+#: src/global.c:840
 msgid "Redo"
 msgstr "Ponovi"
 
-#: src/global.c:836 src/global.c:842
+#: src/global.c:844 src/global.c:850
 msgid "Back"
 msgstr "Natrag"
 
-#: src/global.c:838 src/global.c:844
+#: src/global.c:846 src/global.c:852
 msgid "Forward"
 msgstr "Naprijed"
 
-#: src/global.c:849
+#: src/global.c:857
 msgid "Prev Word"
 msgstr "Riječ ←"
 
-#: src/global.c:851
+#: src/global.c:859
 msgid "Next Word"
 msgstr "Riječ →"
 
-#: src/global.c:855
+# Pozicija 1, 1. stupac, Home
+#: src/global.c:863
 msgid "Home"
 msgstr "Početak retka"
 
-#: src/global.c:857
+#: src/global.c:865
 msgid "End"
 msgstr "Kraj retka"
 
-#: src/global.c:866
+#: src/global.c:874
 msgid "Beg of Par"
 msgstr "Vrh odlomka"
 
-#: src/global.c:868
+#: src/global.c:876
 msgid "End of Par"
 msgstr "Dno odlomka"
 
-#: src/global.c:873
+#: src/global.c:881
 msgid "Scroll Up"
 msgstr "Klizni gore"
 
-#: src/global.c:875
+#: src/global.c:883
 msgid "Scroll Down"
 msgstr "Klizni dolje"
 
-#: src/global.c:880
+#: src/global.c:888
 msgid "Prev File"
 msgstr "Datoteka ←"
 
-#: src/global.c:882
+#: src/global.c:890
 msgid "Next File"
 msgstr "Datoteka →"
 
 # verbatim: doslovce, bukvalno,
-#: src/global.c:891
+#: src/global.c:899
 msgid "Verbatim"
 msgstr "Doslovce"
 
-#: src/global.c:894
+#: src/global.c:902
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:896
+#: src/global.c:904
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:899
+#: src/global.c:907
 msgid "Delete"
 msgstr "Delete"
 
-#: src/global.c:901
+#: src/global.c:909
 msgid "Backspace"
 msgstr "Backspace"
 
 # izrezivanje riječi, ali gdje je shortcut?
 #. TRANSLATORS: The next two strings refer to cutting words.
-#: src/global.c:912
+#: src/global.c:920
 msgid "Cut Left"
-msgstr "Reži lijevo"
+msgstr "Reži ulijevo"
 
-#: src/global.c:914
+#: src/global.c:922
 msgid "Cut Right"
-msgstr "Reži desno"
+msgstr "Reži udesno"
 
 # izrezivanje riječi, ali gdje je shortcut?
-#: src/global.c:916
+#: src/global.c:924
 msgid "CutTillEnd"
 msgstr "Reži do kraja"
 
-#: src/global.c:926
+#: src/global.c:934
 msgid "Word Count"
 msgstr "Broj riječi"
 
-#: src/global.c:933
+#: src/global.c:941
 msgid "Suspend"
 msgstr "Obustavi"
 
-#: src/global.c:937
+#: src/global.c:945
+#, fuzzy
+msgid "Comment Lines"
+msgstr "Redak ↓"
+
+#: src/global.c:949
 msgid "Save"
 msgstr "Spremi"
 
-#: src/global.c:940
+#: src/global.c:952
 msgid "Previous"
 msgstr "Prethodni"
 
-#: src/global.c:942
+#: src/global.c:954
 msgid "Next"
 msgstr "Sljedeći"
 
-#: src/global.c:948
+#: src/global.c:960
 msgid "PrevHstory"
 msgstr "Ranije"
 
-#: src/global.c:951
+#: src/global.c:963
 msgid "NextHstory"
 msgstr "Kasnije"
 
-#: src/global.c:955
+#: src/global.c:972
 msgid "Go To Text"
 msgstr "Nađi tekst"
 
-#: src/global.c:959
+#: src/global.c:976
 msgid "DOS Format"
 msgstr "DOS zapis"
 
-#: src/global.c:961
+#: src/global.c:978
 msgid "Mac Format"
 msgstr "Mac zapis"
 
-#: src/global.c:969
+#: src/global.c:986
 msgid "Append"
-msgstr "Dodaj iza"
+msgstr "Metni iza"
 
-#: src/global.c:971
+# dodaj, metni
+#: src/global.c:988
 msgid "Prepend"
-msgstr "Dodaj ispred"
+msgstr "Metni ispred"
 
-#: src/global.c:974
+#: src/global.c:991
 msgid "Backup File"
 msgstr "Sigurnosna datoteka"
 
-#: src/global.c:981
+#: src/global.c:998
 msgid "Execute Command"
 msgstr "Izvrši naredbu"
 
-#: src/global.c:996
+#: src/global.c:1013
 msgid "To Files"
 msgstr "Lista datoteka"
 
-#: src/global.c:1004
+#: src/global.c:1021
 msgid "First File"
 msgstr "Prva datoteka"
 
-#: src/global.c:1006
+#: src/global.c:1023
 msgid "Last File"
 msgstr "Zadnja datoteka"
 
-#: src/global.c:1010
+#: src/global.c:1027
 msgid "Discard buffer"
-msgstr "Uništi međumemoriju"
+msgstr "Poništi međumemoriju"
+
+#: src/global.c:1038
+msgid "Left Column"
+msgstr ""
+
+#: src/global.c:1040
+msgid "Right Column"
+msgstr ""
 
 #. TRANSLATORS: Try to keep the next two strings at most 20 characters.
-#: src/global.c:1020
+#: src/global.c:1047
 msgid "Prev Lint Msg"
 msgstr "Linter poruka ↑"
 
 # linter alat za provjeru sintakse za neke programe
-#: src/global.c:1022
+#: src/global.c:1049
 msgid "Next Lint Msg"
 msgstr "Linter poruka ↓"
 
 #. TRANSLATORS: The next seventeen strings are toggle descriptions;
 #. * they are best kept shorter than 40 characters, but may be longer.
-#: src/global.c:1285
+#: src/global.c:1316
 msgid "Help mode"
-msgstr "Pomoć - zadnja dva retka prozora"
+msgstr "Pomoć — posljednja dva retka prozora"
 
-#: src/global.c:1287
+#: src/global.c:1318
 msgid "Constant cursor position display"
 msgstr "Stalni prikaz pozicije kursora"
 
-#: src/global.c:1289
+#: src/global.c:1320
 msgid "Use of one more line for editing"
-msgstr "Uporaba još jednog retka za uređivanje"
+msgstr "Uporaba dodatnog retka za uređivanje"
 
-#: src/global.c:1291
+#: src/global.c:1322
 msgid "Smooth scrolling"
 msgstr "Glatko klizanje"
 
-#: src/global.c:1293
+#: src/global.c:1324
 msgid "Soft wrapping of overlong lines"
 msgstr "Meko prelamanje predugih redova"
 
-#: src/global.c:1295
+#: src/global.c:1326
 msgid "Whitespace display"
 msgstr "Bjelina stalno vidljiva"
 
-#: src/global.c:1297
+#: src/global.c:1328
 msgid "Color syntax highlighting"
 msgstr "Sintaksa istaknuta bojama"
 
 # pometna Home tipka: prvi skok na prvi znak, zatim na poziciju 1
-#: src/global.c:1299
+#: src/global.c:1330
 msgid "Smart home key"
 msgstr "Pametna Home tipka"
 
-#: src/global.c:1301
+#: src/global.c:1332
 msgid "Auto indent"
 msgstr "Automatsko uvlačenje"
 
-#: src/global.c:1303
+#: src/global.c:1334
 msgid "Cut to end"
 msgstr "Izrezivanje do kraja retka"
 
-#: src/global.c:1305
+#: src/global.c:1336
 msgid "Hard wrapping of overlong lines"
 msgstr "Tvrdo prelamanje predugih redova"
 
 # Tab znak pretvara u razmake
-#: src/global.c:1307
+#: src/global.c:1338
 msgid "Conversion of typed tabs to spaces"
 msgstr "Pretvorba unesenih tabulatora u razmake"
 
-#: src/global.c:1309
+#: src/global.c:1340
 msgid "Backup files"
 msgstr "Sigurnosne datoteke (kopije)"
 
-#: src/global.c:1311
+#: src/global.c:1342
 msgid "Reading file into separate buffer"
 msgstr "Učitavanje datoteke u zasebnu međumemoriju"
 
-#: src/global.c:1313
+#: src/global.c:1344
 msgid "Mouse support"
 msgstr "Podrška za miša"
 
-#: src/global.c:1315
+#: src/global.c:1346
 msgid "No conversion from DOS/Mac format"
-msgstr "Nepretvaranje DOS/Mac oblika zapisa"
+msgstr "Ne pretvaranje DOS/Mac formata"
 
-#: src/global.c:1317
+#: src/global.c:1348
 msgid "Suspension"
 msgstr "Privremena obustava"
 
 # uzorak = pattern, niz, znakovni niz, regiz (regexp)
-#: src/help.c:209
+#: src/help.c:211
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1195,17 +1207,17 @@ msgid ""
 "prompt.  Hitting Enter without entering any text will perform the previous "
 "search.  "
 msgstr ""
-"Pomoć za „Pretraži“\n"
+"Pomoć za „Pretraži/Zamijeni“\n"
 "\n"
-" Upišite riječ(i) ili znak(ove), to jest ‘uzorak’ koji želite naći, zatim "
-"pritisnite ‘Enter’.  Ako se uzorak pronađe, zaslon će se osvježiti da pokaže "
+" Upišite riječ/riječi ili znak/znakove, tj. uzorak koji želite naći, zatim "
+"pritisnite Enter.  Ako se uzorak pronađe, zaslon će se osvježiti da pokaže "
 "prvi nalaz uzorka.\n"
 "\n"
-" Prethodni uzorak za pretragu ostati će prikazan u uglatim zagradama iza "
-"‘Pretraži’.  Ako pritisnete ‘Enter’, a niste upisali novi uzorak za "
-"pretragu, ponoviti će se prethodna pretraga.  "
+" Prethodni uzorak za pretragu ostat će prikazan u uglatim zagradama iza "
+"naredbe „Pretraži“.  Pritisnete li Enter, a da niste upisali novi uzorak za "
+"pretragu, ponovit će se pretraga s prethodnim uzorkom.  "
 
-#: src/help.c:218
+#: src/help.c:220
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1213,13 +1225,13 @@ msgid ""
 " The following function keys are available in Search mode:\n"
 "\n"
 msgstr ""
-"Ako ste odabrali tekst (s oznakom) i nakon toga započnete pretragu za "
-"zamjenu, samo nalazi uzorka u odabranom tekstu će biti zamijenjeni.\n"
+"Ako ste odabrali tekst s oznakom i nakon toga započnete pretragu za zamjenu, "
+"samo će nalazi uzorka u odabranom tekstu biti zamijenjeni.\n"
 "\n"
-" U radu s „Pretraži“ mogu se koristiti ove funkcijske tipke:\n"
+" U radu s „Pretraži/Zamijeni“ mogu se koristiti ove funkcijske tipke:\n"
 "\n"
 
-#: src/help.c:224
+#: src/help.c:226
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1232,7 +1244,7 @@ msgid ""
 msgstr ""
 "Pomoć za „U redak“\n"
 "\n"
-" Upišite broj retka u koji želite otići, i pritisnite ‘Enter’.  Ako je broj "
+" Upišite broj retka u koji želite otići te pritisnite Enter. Ako je broj "
 "redaka u tekstu manji od zatraženog broja, otići ćete u zadnji redak teksta "
 "(dno teksta).\n"
 "\n"
@@ -1240,7 +1252,7 @@ msgstr ""
 "\n"
 
 # upisati > to je samo pisati; unesti > to je upisati + Eneter
-#: src/help.c:233
+#: src/help.c:235
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1252,18 +1264,18 @@ msgid ""
 "Meta-F toggle, or a nanorc file, inserting a file will cause it to be loaded "
 "into a separate buffer (use Meta-< and > to switch between file buffers).  "
 msgstr ""
-"Pomoć za „Umetni/Čitaj datoteku“\n"
+"Pomoć za „Učitaj / Umetni datoteku“\n"
 "\n"
 " Unesite naziv datoteke koju treba umetnuti u aktualnu međumemoriju na "
-"trenutnoj poziciji kursora.\n"
+"trenutačnoj poziciji kursora.\n"
 "\n"
-" Ako ste kompilirali (compiled) ‘nano’ s podrškom za višestruke "
-"međumemorije, i omogućili ‘višestruke-međumemorije’ s opcijom -F ili --"
-"multibuffer, ili aktivirali s Meta-F, ili u ‘nanorc’, datoteka će biti "
-"umetnuta u zasebnu međumemoriju (koristite Meta-< ili Meta-> za prebacivanje "
+" Ako ste sastavili (eng. compiled) nano s podrškom za višestruke "
+"međumemorije i omogućili višestruke međumemorije s opcijom -F ili --"
+"multibuffer, ili pak aktivirali s Meta-F, ili u nanorc, datoteka će biti "
+"umetnuta u zasebnu međumemoriju (rabite Meta-< ili Meta-> za prebacivanje "
 "između međumemorija).  "
 
-#: src/help.c:242
+#: src/help.c:244
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1271,13 +1283,13 @@ msgid ""
 " The following function keys are available in Insert File mode:\n"
 "\n"
 msgstr ""
-"Ako vam treba nova, prazna međumemorija, udarite samo ‘Enter’, i ne upisujte "
-"naziv bilo koje postojeće ili nepostojeće datoteke.\n"
+"Ako vam treba nova, prazna međumemorija, pritisnite samo Enter i ne upisujte "
+"naziv nijedne postojeće ili nepostojeće datoteke.\n"
 "\n"
-" U radu s „Umetni/Čitaj datoteku“ možete koristiti ove funkcijske tipke:\n"
+" U radu s „Umetni datoteku“ možete koristiti ove funkcijske tipke:\n"
 "\n"
 
-#: src/help.c:248
+#: src/help.c:250
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1294,19 +1306,18 @@ msgid ""
 msgstr ""
 "Pomoć za „Spremi“\n"
 "\n"
-" Utipkajte naziv pod kojim želite spremiti aktualnu datoteku, i pritisnite "
-"‘Enter’ da ju spremite.\n"
+" Utipkajte naziv pod kojim želite spremiti aktualnu datoteku te pritisnite "
+"Enter da je spremite.\n"
 "\n"
-" Ako ste odabrali tekst s oznakom (M-A), ‘nano’ će vam predložiti da "
-"spremite odabrani tekst kao zasebnu datoteku.  Da se smanji opasnost od "
-"slučajnog prepisivanja preko aktualne datoteke, a tek s nekim njezinim "
-"djelom (tekstom koji ste odabrali), naziv aktualne datoteke neće biti "
-"predložen.\n"
+" Ako ste odabrali tekst s oznakom, nano će vam predložiti da spremite "
+"odabrani tekst kao zasebnu datoteku.  Da se smanji opasnost od slučajnog "
+"prepisivanja preko aktualne datoteke, a tek s nekim njezinim djelom (tekstom "
+"koji ste odabrali), naziv aktualne datoteke neće biti predložen.\n"
 "\n"
 " U radu sa „Spremi“ možete koristiti ove funkcijske tipke:\n"
 "\n"
 
-#: src/help.c:262
+#: src/help.c:264
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1321,17 +1332,17 @@ msgid ""
 msgstr ""
 "Pomoć za „Preglednik datoteka“\n"
 "\n"
-" Preglednik datoteka koristi se za vizualno pregledavanje strukture "
-"direktorija, a da bi se odabrala datoteka za učitavanje ili zapisivanje.  "
-"Pritom možete koristiti tipke sa strelicama ili Page Up/Down tipke. S "
-"‘Enter’ ili sa ‘S‘ tipkom možete odabrati datoteku ili otvoriti izabrani "
-"direktorij.  Za pregledavanje višeg direktorija, odaberite direktorij s "
-"nazivom ‘..’ (dvije točke) na vrhu liste i udarite ‘Enter’.\n"
+" Preglednik datoteka rabi se za vizualno pregledavanje strukture direktorija "
+"kako bi se odabrala datoteka za učitavanje ili zapisivanje.  Pritom možete "
+"rabiti tipke sa strelicama ili tipke Page Up/Down.  Tipkom Enter ili tipkom "
+"S možete odabrati datoteku ili otvoriti odabrani direktorij.  Za "
+"pregledavanje višeg direktorija, odaberite direktorij s nazivom „..“ (dvije "
+"točke) na vrhu liste i pritisnite Enter.\n"
 "\n"
 " U radu sa „Preglednik datoteka“ možete koristiti ove funkcijske tipke:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:277
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1347,25 +1358,24 @@ msgstr ""
 "Pomoć za „Pretraži u pregledniku datoteka“\n"
 "\n"
 " Upišite riječi ili znakove (uzorak) koje želite tražiti, zatim pritisnite "
-"‘Enter’.  Ako se uzorak pronađe, zaslon će se osvježiti tako da pokaže prvi "
+"Enter.  Ako se uzorak pronađe, zaslon će se osvježiti tako da pokaže prvi "
 "nalaz uzorka.\n"
 "\n"
 " Prethodni uzorak za pretragu će ostati prikazan u uglatim zagradama iza "
-"naredbe ‘Pretraži’.  Ako pritisnete ‘Enter’, a da niste upisali novi uzorak "
-"za pretragu, ponoviti će se pretraga s prijašnjim uzorkom (u uglatim "
-"zagradama).\n"
+"naredbe „Pretraži“.  Ako pritisnete Enter, a da niste upisali novi uzorak za "
+"pretragu, ponoviti će se pretraga s prijašnjim uzorkom.\n"
 "\n"
 
-#: src/help.c:284
+#: src/help.c:286
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
 msgstr ""
-" U radu s „Pretraži u Pregledniku datoteka“ možete koristiti ove funkcijske "
+" U radu s „Pretraži u pregledniku datoteka“ možete koristiti ove funkcijske "
 "tipke:\n"
 "\n"
 
-#: src/help.c:288
+#: src/help.c:290
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1381,13 +1391,13 @@ msgstr ""
 "\n"
 " Unesite naziv direktorija koji želite pregledati.\n"
 "\n"
-"Tipku ‘Tab’ možete (pokušati) iskoristiti da automatski kompletirate naziv "
+"Tipku Tab možete (pokušati) iskoristiti da automatski kompletirate naziv "
 "direktorija ako je dopuna tabulatorom omogućena.\n"
 "\n"
 " U radu s „Direktorij“ možete koristiti ove funkcijske tipke:\n"
 "\n"
 
-#: src/help.c:301
+#: src/help.c:303
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1403,15 +1413,15 @@ msgstr ""
 "Pomoć za „Provjera pravopisa“\n"
 "\n"
 " Provjera pravopisa provjerava sav tekst u aktualnoj datoteci.  Kad provjera "
-"naiđe na nepoznatu riječ, ta riječ se istakne i može se zamijeniti odnosno "
-"urediti.  Provjera će nakon toga predložiti da zamijeni svaku pojavu te "
-"krivo napisane riječi u aktualnoj datoteci; ali ako ste odabrali dio "
-"datoteke, onda će provjera djelovati samo u odabranom tekstu.\n"
+"naiđe na nepoznatu riječ, ta riječ se istakne i može se zamijeniti, odnosno "
+"urediti.  Provjera će nakon toga predložiti da zamijeni tu krivo napisanu "
+"riječ svaki put kad se ona pojavi u aktualnoj datoteci.  Ali ako ste "
+"odabrali dio datoteke, onda će provjera djelovati samo u odabranom tekstu.\n"
 "\n"
 " U radu s „Provjera pravopisa“ možete koristiti ove funkcijske tipke:\n"
 "\n"
 
-#: src/help.c:316
+#: src/help.c:318
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1424,15 +1434,15 @@ msgid ""
 msgstr ""
 "Pomoć za „Izvrši naredbu“\n"
 "\n"
-" Ovdje možete umetnuti ispis naredbe (vašeg operativnog sustava) u aktualnu "
+" Ovdje možete umetnuti ispis naredbe svojeg operativnoga sustava u aktualnu "
 "međumemoriju (ili u novu međumemoriju ako je omogućen rad s višestrukim "
 "međumemorijama.  Ako trebate novu praznu međumemoriju, onda nemojte unijeti "
-"bilo koju naredbu.\n"
+"nijednu naredbu.\n"
 "\n"
 " U radu s „Izvrši naredbu“ možete koristiti ove funkcijske tipke:\n"
 "\n"
 
-#: src/help.c:329
+#: src/help.c:331
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1445,34 +1455,34 @@ msgid ""
 msgstr ""
 "Nano: Opća pomoć\n"
 "\n"
-" ‘Nano’ je zamišljen da imitira funkcionalnost i lakoću upotrebe UW Pico "
-"uređivača teksta.  ‘Nano’ ima četiri glavne sekcije.  Traka na vrhu pokazuje "
-"inačicu programa, naziv i stanje datoteke/međumemorije koja se trenutno "
-"uređuje.  Ispod toga je glavni prozor u kojem je prikazan tekst te datoteke/"
-"međumemorije.  U trećem retku iznad dna je traka ‘Stanje’ (status traka) u "
-"kojoj vam ‘nano’ javlja važne poruke.  "
+" Nano je zamišljen tako da imitira funkcionalnost i lakoću upotrebe "
+"uređivača teksta UW Pico.  Nano ima četiri glavne sekcije.  Traka na vrhu "
+"pokazuje inačicu programa, naziv i stanje datoteke/međumemorije koja se "
+"trenutačno uređuje.  Ispod toga je glavni prozor u kojem je prikazan tekst "
+"te datoteke/međumemorije.  U trećem retku iznad dna je traka "
+"„Stanje“ (statusna traka) u kojoj vam nano javlja važne poruke.  "
 
-#: src/help.c:339
+#: src/help.c:341
+#, fuzzy
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
-" The notation for shortcuts is as follows: Control-key sequences are notated "
-"with a caret (^) symbol and can be entered either by using the Control "
-"(Ctrl) key or pressing the Escape (Esc) key twice.  Escape-key sequences are "
-"notated with the Meta (M-) symbol and can be entered using either the Esc, "
-"Alt, or Meta key depending on your keyboard setup.  "
+" Shortcuts are written as follows: Control-key sequences are notated with a "
+"'^' and can be entered either by using the Ctrl key or pressing the Esc key "
+"twice.  Meta-key sequences are notated with 'M-' and can be entered using "
+"either the Alt, Cmd, or Esc key, depending on your keyboard setup.  "
 msgstr ""
-"U zadnja dva retka prikazane su najčešće korištene sekvence tipaka u "
-"uređivaču.\n"
+"U posljednjim dvama redcima prikazane su najčešće upotrebljavane sekvencije "
+"tipaka u uređivaču.\n"
 "\n"
-" Notacija sekvenci tipaka je: Control-tipka sekvence započinju s ‘caret’ (^) "
-"simbolom koji se unosi pritiskom (i držanjem) ‘Control’ (Ctrl) tipke, ili s "
-"dva uzastopna pritiska ‘Escape’ (Esc) tipke.  ‘Meta’-tipka sekvence "
-"započinju s (M-) simbolom koji se unosi pritiskom (i držanjem) tipke ‘Alt’ "
-"odnosno tipke ‘Meta’ ovisno o vašoj tipkovnici, ili s jednim pritiskom ‘Esc’ "
-"tipke.  "
+" Notacija sekvencija tipaka (naredbi) jest: Sekvencije s tipkom Control "
+"(Ctrl) započinju sa simbolom „caret“ (^) koji se unosi pritiskom (i "
+"držanjem) tipke Control (Ctrl) ili dvama uzastopnim pritiscima tipke Escape "
+"(Esc).  Sekvencije s tipkom Meta započinju s (M-) simbolom koji se unosi "
+"pritiskom (i držanjem) tipke Alt, odnosno tipke Meta, ovisno o vašoj "
+"tipkovnici ili pak jednim pritiskom tipke Esc.  "
 
-# sekvenca=sljed
+# sekvencije tipaka = naredbe
 #: src/help.c:348
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
@@ -1481,13 +1491,11 @@ msgid ""
 "keys are shown in parentheses:\n"
 "\n"
 msgstr ""
-"Dva uzastopna pritiska na ‘Esc’ i nakon toga unos troznamenkastog decimalnog "
-"broja od 000 do 255 će unijeti znak koji odgovara tom broju (korisno za unos "
-"znakova kojih nema na tipkovnici).\n"
-"\n"
-" U nastavku su prikazane sekvence tipaka koje su vam na raspolaganju u "
-"glavnom prozoru uređivača.  U zagradama su prikazane alternativne tipke/"
-"sekvence tipaka:\n"
+"Dva uzastopna pritiska tipke Esc i nakon toga unos troznamenkastoga "
+"decimalnog broja od 000 do 255 unijet će znak koji odgovara tom broju "
+"(korisno za unos znakova kojih nema na tipkovnici).  Sljedeće sekvencije "
+"tipaka su vam na raspolaganju u glavnom prozoru uređivača.  Alternativne "
+"sekvencije/tipke su navedene u zagradama:\n"
 "\n"
 
 #: src/help.c:380 src/help.c:457
@@ -1495,19 +1503,19 @@ msgid "enable/disable"
 msgstr "(da ili ne)"
 
 # ÄŒitanje umjesto Pregledavanje
-#: src/nano.c:559
+#: src/nano.c:560
 msgid "Key is invalid in view mode"
-msgstr "Tipka ne važi u „Čitanje“ načinu rada"
+msgstr "Tipka ne važi u načinu „Čitanje“"
 
-#: src/nano.c:565
+#: src/nano.c:566
 msgid "This function is disabled in restricted mode"
-msgstr "Ova funkcija je onemogućena u ograničenom načinu rada"
+msgstr "Ova funkcija je onemogućena u ograničenom načinu"
 
-#: src/nano.c:573
+#: src/nano.c:574
 msgid "Help is not available"
 msgstr "Pomoć nije dostupna"
 
-#: src/nano.c:684
+#: src/nano.c:686
 #, c-format
 msgid ""
 "\n"
@@ -1516,7 +1524,7 @@ msgstr ""
 "\n"
 "Međumemorija je zapisana u %s\n"
 
-#: src/nano.c:686
+#: src/nano.c:688
 #, c-format
 msgid ""
 "\n"
@@ -1525,7 +1533,7 @@ msgstr ""
 "\n"
 "Međumemorija nije zapisana u %s: %s\n"
 
-#: src/nano.c:689
+#: src/nano.c:691
 #, c-format
 msgid ""
 "\n"
@@ -1536,7 +1544,7 @@ msgstr ""
 
 #: src/nano.c:714
 msgid "Window size is too small for nano...\n"
-msgstr "Prozor je premali za ‘nano’ ...\n"
+msgstr "Prozor je premali za nano...\n"
 
 #: src/nano.c:807
 #, c-format
@@ -1544,7 +1552,7 @@ msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
 "\n"
 msgstr ""
-"Upotreba: nano [OPCIJE] [[+REDAK,STUPAC] DATOTEKA]...\n"
+"Uporaba: nano [OPCIJE] [[+REDAK,STUPAC] DATOTEKA]...\n"
 "\n"
 
 #: src/nano.c:810
@@ -1603,7 +1611,7 @@ msgstr "Učitavanje uvijek u novu međumemoriju"
 
 #: src/nano.c:837
 msgid "Use (vim-style) lock files"
-msgstr "Koristi zaključane datoteke"
+msgstr "Rabi (vim-stil) zaključane datoteke"
 
 #: src/nano.c:842
 msgid "Log & read search/replace string history"
@@ -1611,7 +1619,7 @@ msgstr "Bilježi/čitaj povijest pretraži/zamjeni"
 
 #: src/nano.c:846
 msgid "Don't look at nanorc files"
-msgstr "Zanemari ‘nanorc’ datoteke"
+msgstr "Zanemari nanorc datoteke"
 
 #: src/nano.c:849
 msgid "Fix numeric keypad key confusion problem"
@@ -1619,15 +1627,15 @@ msgstr "Popravi problem s numeričkom tipkovnicom"
 
 #: src/nano.c:851
 msgid "Don't add newlines to the ends of files"
-msgstr "Ne dodavaj novi redak kraju datoteka"
+msgstr "Ne dodavati novi redak na kraj datoteke"
 
 #: src/nano.c:854
 msgid "Don't convert files from DOS/Mac format"
-msgstr "Ne pretvaraj DOS/Mac zapis "
+msgstr "Ne pretvaraj DOS/Mac format"
 
 #: src/nano.c:856
 msgid "Use one more line for editing"
-msgstr "Upotrebi još jedan redak za uređivanje"
+msgstr "Rabi dodatni redak za uređivanje"
 
 #: src/nano.c:860
 msgid "Log & read location of cursor position"
@@ -1648,7 +1656,7 @@ msgstr "Citiraj znakovni niz"
 
 #: src/nano.c:866
 msgid "Restricted mode"
-msgstr "Ograničeni način rada"
+msgstr "Ograničeni način"
 
 #: src/nano.c:868
 msgid "Scroll by line instead of half-screen"
@@ -1669,7 +1677,7 @@ msgstr "Postavi Å¡irinu tabulatora na #stupaca"
 
 #: src/nano.c:873
 msgid "Do quick statusbar blanking"
-msgstr "Isprazni odmah traku ‘Stanje’"
+msgstr "Isprazni odmah traku „Stanje“"
 
 #: src/nano.c:875
 msgid "Print version information and exit"
@@ -1697,7 +1705,7 @@ msgstr "Pozicija kursora stalno prikazana"
 
 #: src/nano.c:887
 msgid "Fix Backspace/Delete confusion problem"
-msgstr "Popravi ‘Backspace’/‘Delete’ konfuziju"
+msgstr "Popravi Backspace/Delete konfuziju"
 
 #: src/nano.c:888
 msgid "Show this help text and exit"
@@ -1709,7 +1717,7 @@ msgstr "Automatski uvlači nove retke"
 
 #: src/nano.c:891
 msgid "Cut from cursor to end of line"
-msgstr "Izrezuj od kursora do kraja retka"
+msgstr "Reži od kursora do kraja retka"
 
 #: src/nano.c:894
 msgid "Enable the use of the mouse"
@@ -1735,9 +1743,10 @@ msgstr "Postavi radni direktorij"
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Sačuvaj značenje XON (^Q) and XOFF (^S)"
 
+# pogreške u rc datotekama zanemarene
 #: src/nano.c:905
 msgid "Silently ignore startup issues like rc file errors"
-msgstr "Zanemari greške zbog mána u rc datoteci"
+msgstr "Tiho zanemari rc pogreške na startu"
 
 #: src/nano.c:908
 msgid "-r <#cols>"
@@ -1792,17 +1801,22 @@ msgstr "Omogući obustavu"
 msgid "Enable soft line wrapping"
 msgstr "Omogući mekano prelamanje redova"
 
-#: src/nano.c:937
-#, c-format
-msgid " GNU nano, version %s\n"
+#: src/nano.c:940
+#, fuzzy, c-format
+msgid " nano, version %s\n"
 msgstr " GNU nano, inačica %s\n"
 
-#: src/nano.c:940
+#: src/nano.c:943
+#, c-format
+msgid " (C) 2014..%s the contributors to nano\n"
+msgstr ""
+
+#: src/nano.c:945
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr " e-pošta: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 
-#: src/nano.c:941
+#: src/nano.c:946
 #, c-format
 msgid ""
 "\n"
@@ -1811,183 +1825,201 @@ msgstr ""
 "\n"
 " Ugrađene opcije:"
 
-#: src/nano.c:1073
+#: src/nano.c:1081
 msgid "No file name"
 msgstr "Nema naziva datoteke"
 
-#: src/nano.c:1108
-msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
+#: src/nano.c:1115
+msgid "Save modified buffer?  (Answering \"No\" will DISCARD changes.) "
 msgstr ""
-"Da spremim izmijenjenu međumemoriju (ODGOVOR „Ne“ ĆE UNIŠTITI PROMJENE)?"
 
-#: src/nano.c:1168
+#: src/nano.c:1178
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "Ne mogu ponovno otvoriti standardni unos s tipkovnicom\n"
 
-#: src/nano.c:1192
+#: src/nano.c:1202
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "ÄŒitanje iz standardnog ulaza, ^C za prekid\n"
 
-#: src/nano.c:1256
+#: src/nano.c:1266
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Primljen SIGHUP or SIGTERM\n"
 
-#: src/nano.c:1272
+#: src/nano.c:1282
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
-msgstr "Upotrebite „fg“ za povratak u ‘nano’.\n"
+msgstr "Upotrebite „fg“ za povratak u nano.\n"
 
-#: src/nano.c:1294
+#: src/nano.c:1304
 msgid "Suspension is not enabled"
 msgstr "Obustava nije omogućena"
 
-#: src/nano.c:1448
+#: src/nano.c:1459
 msgid "enabled"
-msgstr "- » Da «"
+msgstr "— » Da «"
 
-#: src/nano.c:1448
+#: src/nano.c:1459
 msgid "disabled"
-msgstr "- » Ne «"
+msgstr "— » Ne «"
+
+#: src/nano.c:1573
+msgid "Unbound key"
+msgstr ""
+
+#: src/nano.c:1577
+#, c-format
+msgid "Unbound key: M-%c"
+msgstr ""
+
+#: src/nano.c:1579
+#, c-format
+msgid "Unbound key: ^%c"
+msgstr ""
 
-#: src/nano.c:1607 src/winio.c:1125
-msgid "Unknown Command"
-msgstr "Nepoznata naredba"
+#: src/nano.c:1581
+#, c-format
+msgid "Unbound key: %c"
+msgstr ""
 
-#: src/nano.c:1720
+#: src/nano.c:1745
 msgid "XON ignored, mumble mumble"
-msgstr "Ignoriram XON, hmm,hmm"
+msgstr "Ignoriram XON, kmm, hmm"
 
-#: src/nano.c:1725
+#: src/nano.c:1750
 msgid "XOFF ignored, mumble mumble"
-msgstr "Ignoriram XOFF, hmm, hmm"
+msgstr "Ignoriram XOFF, kmm, hmm"
 
-#: src/nano.c:2139 src/rcfile.c:1334
+#: src/nano.c:2166 src/rcfile.c:1187
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
-msgstr "Nevaljana veličina tabulatora „%s“ "
+msgstr "Nevaljana veličina tabulatora „%s“"
 
-#: src/nano.c:2200 src/rcfile.c:1259
+#: src/nano.c:2227 src/rcfile.c:1128
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Nevaljana veličina ispune „%s“"
 
-#: src/nano.c:2247
+#: src/nano.c:2276
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
-msgstr "Unesite ‘%s -h’ za listu svih dostupnih opcija.\n"
+msgstr "Unesite „%s -h“ za ispis svih dostupnih opcija.\n"
 
 #. TRANSLATORS: For the next three strings, if possible, specify
 #. * the single-byte shortcuts for both your language and English.
 #. * For example, in French: "OoYy" for "Oui".
-#: src/prompt.c:821
+#: src/prompt.c:818
 msgid "Yy"
 msgstr "DdYy"
 
-#: src/prompt.c:822
+#: src/prompt.c:819
 msgid "Nn"
 msgstr "NnNn"
 
-#: src/prompt.c:823
+#: src/prompt.c:820
 msgid "Aa"
 msgstr "SsAa"
 
-#: src/prompt.c:845
+#: src/prompt.c:842
 msgid "Yes"
 msgstr "Da"
 
-#: src/prompt.c:850
+#: src/prompt.c:847
 msgid "All"
 msgstr "Sve"
 
-#: src/prompt.c:855
+#: src/prompt.c:852
 msgid "No"
 msgstr "Ne"
 
-#: src/rcfile.c:142
+#: src/rcfile.c:144
 #, c-format
 msgid "Error in %s on line %lu: "
-msgstr "Greška u %s u retku %lu: "
+msgstr "Pogreška u %s u retku %lu: "
 
-#: src/rcfile.c:201
+#: src/rcfile.c:203
 #, c-format
 msgid "Argument '%s' has an unterminated \""
-msgstr "Argument ‘%s’ ne završava s \""
+msgstr "Argument „%s“ ne završava s \""
 
-#: src/rcfile.c:228 src/rcfile.c:280 src/rcfile.c:732 src/rcfile.c:793
-#: src/rcfile.c:882 src/rcfile.c:933
+#: src/rcfile.c:231 src/rcfile.c:674 src/rcfile.c:725 src/rcfile.c:824
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Regularni izraz mora početi i završiti s \" znakom"
 
-#: src/rcfile.c:254 src/search.c:62
+#: src/rcfile.c:257 src/search.c:61
 #, c-format
 msgid "Bad regex \"%s\": %s"
-msgstr "Nevaljali regularni izraz „%s“: %s"
+msgstr "Nevaljani regularni izraz „%s“: %s"
 
-#: src/rcfile.c:274
+#: src/rcfile.c:279
 msgid "Missing syntax name"
 msgstr "Nedostaje naziv sintakse"
 
-#: src/rcfile.c:345
+#: src/rcfile.c:288
+msgid "A syntax name must be quoted"
+msgstr ""
+
+#: src/rcfile.c:297
 msgid "The \"none\" syntax is reserved"
 msgstr "Sintaksa „none“ je rezervirana"
 
-#: src/rcfile.c:352
-msgid "The \"default\" syntax must take no extensions"
+#: src/rcfile.c:327
+#, fuzzy
+msgid "The \"default\" syntax does not accept extensions"
 msgstr "Sintaksu „default“ ne smije se proširivati"
 
-#: src/rcfile.c:424
+#: src/rcfile.c:369
 msgid "Missing key name"
 msgstr "Nedostaje ime tipke"
 
-#: src/rcfile.c:433 src/rcfile.c:444
+#: src/rcfile.c:378 src/rcfile.c:389
 msgid "Key name is too short"
 msgstr "Ime tipke je prekratko"
 
-#: src/rcfile.c:454
+#: src/rcfile.c:399
 msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr "Ime tipke mora započeti s „^“, „M“, ili „F“"
 
-#: src/rcfile.c:457
+#: src/rcfile.c:402
 #, c-format
 msgid "Key name %s is invalid"
 msgstr "Ime tipke %s je nevaljano"
 
-#: src/rcfile.c:466
+#: src/rcfile.c:411
 msgid "Must specify a function to bind the key to"
-msgstr "Morate navesti funkciju povezanu s tom tipkom"
+msgstr "Mora se navesti funkcija koja se veže na tipku"
 
 #. TRANSLATORS: Do not translate the word "all".
-#: src/rcfile.c:476
+#: src/rcfile.c:421
 msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
-msgstr "Morate navesti izbornik (ili „all“) u kojem se tipka povezuje/oslobađa"
+msgstr "Mora se navesti meni (ili „all“) u kojem se tipku veže/oslobađa"
 
-#: src/rcfile.c:483
+#: src/rcfile.c:428
 #, c-format
 msgid "Cannot map name \"%s\" to a function"
-msgstr "„%s“ ne može se povezati na funkciju"
+msgstr "„%s“ se ne može povezati na funkciju"
 
-#: src/rcfile.c:490
+#: src/rcfile.c:435
 #, c-format
 msgid "Cannot map name \"%s\" to a menu"
-msgstr "„%s“ ne može se povezati na izbornik"
+msgstr "„%s“ se ne može povezati na meni"
 
-#: src/rcfile.c:522
+#: src/rcfile.c:467
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
-msgstr "Funkcija ‘%s’ ne postoji u izborniku ‘%s’"
+msgstr "Funkcija „%s“ ne postoji u meniju „%s“"
 
-#: src/rcfile.c:534
+#: src/rcfile.c:479
 #, c-format
 msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "Tipke „%s“ ne mogu se iznova povezati"
 
-#: src/rcfile.c:631
+#: src/rcfile.c:576
 #, c-format
 msgid "Error expanding %s: %s"
-msgstr "Greška proširivanja %s: %s"
+msgstr "Greška u proširivanju %s: %s"
 
-#: src/rcfile.c:674
+#: src/rcfile.c:616
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -2002,173 +2034,165 @@ msgstr ""
 "i „black“ (crna) s neobveznatim prefiksom „bright“ (sjajna) za boje\n"
 "u prednjem planu."
 
-#: src/rcfile.c:696
-msgid "Cannot add a color command without a syntax command"
-msgstr "‘color’ naredba nije moguća bez (prethodne) ‘syntax’ naredbe"
+#: src/rcfile.c:637 src/rcfile.c:795 src/rcfile.c:858
+#, c-format
+msgid "A '%s' command requires a preceding 'syntax' command"
+msgstr ""
 
-#: src/rcfile.c:701
+#: src/rcfile.c:643
 msgid "Missing color name"
 msgstr "Nedostaje ime boje"
 
-#: src/rcfile.c:711 src/rcfile.c:872
-msgid "Missing regex string"
-msgstr "Nedostaje regularni izraz"
+#: src/rcfile.c:653 src/rcfile.c:807
+#, fuzzy, c-format
+msgid "Missing regex string after '%s' command"
+msgstr "Nedostaje naredba za linter"
 
-#: src/rcfile.c:787
+#: src/rcfile.c:719
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "„start=“ zahtijeva odgovarajući „end=“"
 
-#: src/rcfile.c:839
+#: src/rcfile.c:768
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
 msgstr "Boja pozadine „%s“ ne može biti sjajna (bright)"
 
-#: src/rcfile.c:867
-msgid "Cannot add a header regex without a syntax command"
-msgstr ""
-"Regularni izraz za zaglavlje nije moguć bez (prethodne) ‘syntax ’naredbe"
-
-#: src/rcfile.c:922
-msgid "Cannot add a magic string regex without a syntax command"
-msgstr "Magični regularni izraz nije moguć bez (prethodne) ‘syntax’ naredbe"
-
-#: src/rcfile.c:927
-msgid "Missing magic string name"
-msgstr "Nedostaje ime magičnog uzorka (niza)"
-
-#: src/rcfile.c:985
-msgid "Cannot add a linter without a syntax command"
-msgstr "‘linter‘ nije moguć bez (prethodne) ‘syntax’ naredbe"
-
-#: src/rcfile.c:990
-msgid "Missing linter command"
-msgstr "Nedostaje ‘linter’ naredba"
+#: src/rcfile.c:802
+#, fuzzy, c-format
+msgid "The \"default\" syntax does not accept '%s' regexes"
+msgstr "Sintaksu „default“ ne smije se proširivati"
 
-#: src/rcfile.c:1011
-msgid "Cannot add formatter without a syntax command"
-msgstr "‘formatter‘ nije moguć bez (prethodne) ‘syntax’ naredbe"
+#: src/rcfile.c:863
+#, fuzzy, c-format
+msgid "Missing command after '%s'"
+msgstr "Nedostaje naredba za linter"
 
-#: src/rcfile.c:1016
-msgid "Missing formatter command"
-msgstr "Nedostaje ‘formatter’ naredba"
+#: src/rcfile.c:879
+#, fuzzy, c-format
+msgid "Argument of '%s' lacks closing \""
+msgstr "Argument „%s“ ne završava s \""
 
-#: src/rcfile.c:1046
+#: src/rcfile.c:910
 #, c-format
 msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
-msgstr ""
-"Kobna greška: niti jedna tipka nije povezana s funkcijom „%s“.  Izlazim.\n"
+msgstr "Kobna greška: nijedna tipka nije vezana s funkcijom „%s“.  Izlazim.\n"
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:912
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
-"Ako zatreba, pokrenite ‘nano’ s opcijom -I da ugodite svoje ‘nanorc’ "
-"postavke.\n"
+"Ako zatreba, pokrenite nano s opcijom -I da podesite svoje nanorc postavke.\n"
 
-#: src/rcfile.c:1109
+#: src/rcfile.c:971
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
-msgstr "Ne nogu pronaći sintaksu „%s“ da ju proširim"
+msgstr "Nije nađena sintaksa „%s“ da ju proširi"
 
-#: src/rcfile.c:1125 src/rcfile.c:1134 src/rcfile.c:1144
+#: src/rcfile.c:993 src/rcfile.c:1202
 #, c-format
-msgid "Command \"%s\" not allowed in included file"
-msgstr "Naredba „%s“ nije dopuštena u ‘include’ datoteci"
+msgid "Syntax \"%s\" has no color commands"
+msgstr "Sintaksa „%s“ nema „color“ naredbu"
 
-#: src/rcfile.c:1150 src/rcfile.c:1359
+#: src/rcfile.c:1024
 #, c-format
-msgid "Syntax \"%s\" has no color commands"
-msgstr "Sintaksa „%s“ nema ‘color’ naredbu"
+msgid "Command \"%s\" not allowed in included file"
+msgstr "Naredba „%s“ nije dopuštena u uključenoj datoteci"
 
-#: src/rcfile.c:1180
+#: src/rcfile.c:1039
 #, c-format
 msgid "Command \"%s\" not understood"
-msgstr "Naredbu „%s“ ne razumijem"
+msgstr "Naredba „%s“ nije shvaćena"
 
-#: src/rcfile.c:1195
+#: src/rcfile.c:1051
 msgid "Missing option"
 msgstr "Nedostaje opcija"
 
-#: src/rcfile.c:1217
+#: src/rcfile.c:1065
+#, c-format
+msgid "Unknown option \"%s\""
+msgstr "Nepoznata opcija „%s“"
+
+#: src/rcfile.c:1077
+#, c-format
+msgid "Cannot unset option \"%s\""
+msgstr "No mogu poništiti opciju „%s“"
+
+#: src/rcfile.c:1089
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Opcija „%s“ zahtijeva argument"
 
-#: src/rcfile.c:1235
+#: src/rcfile.c:1105
 msgid "Option is not a valid multibyte string"
 msgstr "Opcija nije valjani višebajtni znakovni niz"
 
-#: src/rcfile.c:1272 src/rcfile.c:1300 src/rcfile.c:1309
+#: src/rcfile.c:1139 src/rcfile.c:1160 src/rcfile.c:1167
 msgid "Non-blank characters required"
-msgstr "Zahtijevaju se ne-prazni znakovi"
+msgstr "Znak/Znakovi ne smije biti „bjelina“"
 
-#: src/rcfile.c:1282
+#: src/rcfile.c:1146
 msgid "Two single-column characters required"
-msgstr "Zahtijevaju se dva jedno-stupčana znaka"
-
-#: src/rcfile.c:1348
-#, c-format
-msgid "Cannot unset option \"%s\""
-msgstr "No mogu poništiti opciju „%s“"
-
-#: src/rcfile.c:1354
-#, c-format
-msgid "Unknown option \"%s\""
-msgstr "Nepoznata opcija „%s“"
+msgstr "Zahtijevaju se dva jednostupčana znaka"
 
-#: src/rcfile.c:1413
+#: src/rcfile.c:1258
 msgid "I can't find my home directory!  Wah!"
-msgstr "Ne mogu naći svoj vlastiti direktorij!  Joj!"
+msgstr "Ne mogu naći svoj vlastiti direktorij!  Uh!"
 
-#: src/rcfile.c:1451
+#: src/rcfile.c:1295
 #, c-format
 msgid ""
 "\n"
 "Press Enter to continue starting nano.\n"
 msgstr ""
 "\n"
-"Pritisnite ‘Enter’ da nastavite pokretati ‘nano’.\n"
+"Pritisnite Enter da nastavite pokretati nano.\n"
 
-#: src/search.c:96
+#: src/search.c:95
 #, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "„%.*s%s“ nije pronađen"
 
 #. TRANSLATORS: The next three strings are modifiers of the search prompt.
-#: src/search.c:176
+#: src/search.c:169
 msgid " [Case Sensitive]"
 msgstr " [mala/VELIKA slova]"
 
 # da zamijenimo ‘regularni izraz’ s ‘regiz po ugledu na regexp?
-#: src/search.c:180
+#: src/search.c:173
 msgid " [Regexp]"
 msgstr " [reg izraz]"
 
-#: src/search.c:184
+#: src/search.c:177
 msgid " [Backwards]"
 msgstr " [unatrag]"
 
 #. TRANSLATORS: The next two strings are modifiers of the search prompt.
-#: src/search.c:189
+#: src/search.c:182
 msgid " (to replace) in selection"
 msgstr " (zamijeni) u odabranom tekstu"
 
-#: src/search.c:191
+#: src/search.c:184
 msgid " (to replace)"
 msgstr " (zamijeni)"
 
+# Pretraži, sinonim za traži
+#: src/search.c:305
+#, fuzzy
+msgid "Searching..."
+msgstr "Pretraži"
+
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:718
+#: src/search.c:693
 msgid "Replace this instance?"
 msgstr "Da zamijenim ovaj nalaz uzorka?"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:883
+#: src/search.c:840
 msgid "Replace with"
 msgstr "Zamijeni sa"
 
-#: src/search.c:924
+#: src/search.c:875
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
@@ -2177,298 +2201,398 @@ msgstr[1] "Zamijenjeno %lu nalaza"
 msgstr[2] "Zamijenjeno %lu nalaza"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:964
+#: src/search.c:914
 msgid "Enter line number, column number"
 msgstr "Unesi broj retka, broj stupca"
 
-#: src/search.c:991
+#: src/search.c:939
 msgid "Invalid line or column number"
 msgstr "Nevaljali broj retka ili stupca"
 
-#: src/search.c:1124
+#: src/search.c:1080
 msgid "Not a bracket"
-msgstr "Nije zagrada"
+msgstr "To nije zagrada"
 
-#: src/search.c:1191
+#: src/search.c:1146
 msgid "No matching bracket"
-msgstr "Nema sparene zagrade"
+msgstr "Toj zagradi nema para"
 
-#: src/text.c:54
+#: src/text.c:53
 msgid "Mark Set"
-msgstr "Oznaka postavljena"
+msgstr "Oznaka je stavljena"
 
-#: src/text.c:58
+#: src/text.c:57
 msgid "Mark Unset"
-msgstr "Oznaka poništena"
+msgstr "Oznaka je uklonjena"
 
-#: src/text.c:70
+#: src/text.c:69
 #, c-format
 msgid "Error invoking \"%s\""
-msgstr "Greška pozivanja: „%s“"
+msgstr "Pogreška pri pozivu: „%s“"
+
+#: src/text.c:468
+msgid "Commenting is not supported for this file type"
+msgstr ""
+
+#: src/text.c:484
+msgid "Cannot comment past end of file"
+msgstr ""
 
-#: src/text.c:475
+#: src/text.c:677
 msgid "Nothing in undo buffer!"
 msgstr "Međumemorija opoziva je prazna!"
 
-#: src/text.c:481 src/text.c:634
-#, c-format
-msgid "Internal error: can't match line %d.  Please save your work."
-msgstr "Interna greška: ne mogu naći redak %d.  Molim da spremite vaš rad."
-
 #. TRANSLATORS: Eight of the next nine strings describe actions
 #. * that are undone or redone.  It are all nouns, not verbs.
-#: src/text.c:495 src/text.c:524 src/text.c:645 src/text.c:686
+#: src/text.c:695 src/text.c:724 src/text.c:857 src/text.c:898
 msgid "text add"
 msgstr "dodavanje teksta"
 
-#: src/text.c:505 src/text.c:656
+#: src/text.c:705 src/text.c:868
 msgid "text delete"
 msgstr "brisanje teksta"
 
-#: src/text.c:528 src/text.c:694
+#: src/text.c:728 src/text.c:907
 msgid "line join"
 msgstr "spajanje retka"
 
-#: src/text.c:547 src/text.c:710
+#: src/text.c:747 src/text.c:923
 msgid "text cut"
 msgstr "izrezivanje teksta"
 
-#: src/text.c:552 src/text.c:714
+#: src/text.c:752 src/text.c:927
 msgid "text uncut"
 msgstr "umetanje teksta"
 
-#: src/text.c:558 src/text.c:691
+#: src/text.c:758 src/text.c:903
 msgid "Internal error: line is missing.  Please save your work."
-msgstr "Interna greška: nedostaje redak.  Molim da spremite vaš rad."
+msgstr "Interna greška: nema retka.  Spremite vaš rad."
 
-#: src/text.c:561 src/text.c:665
+#: src/text.c:762 src/text.c:877
 msgid "line break"
 msgstr "prelamanje retka"
 
-#: src/text.c:569 src/text.c:725
+#: src/text.c:772 src/text.c:947
+msgid "comment"
+msgstr ""
+
+#: src/text.c:776 src/text.c:951
+msgid "uncomment"
+msgstr ""
+
+#: src/text.c:780 src/text.c:938
 msgid "text insert"
 msgstr "umetanje teksta"
 
-#: src/text.c:589 src/text.c:718
+#: src/text.c:800 src/text.c:931
 msgid "text replace"
 msgstr "zamjena teksta"
 
-#: src/text.c:596 src/text.c:732 src/text.c:1030 src/text.c:1174
+#: src/text.c:807 src/text.c:955 src/text.c:1267 src/text.c:1437
 msgid "Internal error: unknown type.  Please save your work."
-msgstr "Interna greška: nepoznate vrste.  Molim da spremite vaš rad."
+msgstr "Interna greška: nepoznate vrste.  Spremite vaš rad."
 
-#: src/text.c:601
+#: src/text.c:813
 #, c-format
 msgid "Undid action (%s)"
 msgstr "Poništena radnja (%s)"
 
-#: src/text.c:619
+#: src/text.c:832
 msgid "Nothing to re-do!"
 msgstr "Nema ništa za ponoviti"
 
-#: src/text.c:628
+#: src/text.c:841
 msgid "Internal error: cannot set up redo.  Please save your work."
-msgstr ""
-"Interna greška: ne mogu omogućiti ‘obnovi’.  Molim da spremite vaš rad."
+msgstr "Interna greška: ne mogu omogućiti „obnovi“.  Spremite vaš rad."
 
-#: src/text.c:737
+#: src/text.c:961
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Ponovljena radnja (%s)"
 
-#: src/text.c:827 src/text.c:2508 src/text.c:2944
+#: src/text.c:1051 src/text.c:2765 src/text.c:3198
 msgid "Could not create pipe"
 msgstr "Ne mogu napraviti kanal (pipe)"
 
-#: src/text.c:853 src/text.c:2595 src/text.c:2750 src/text.c:2992
-#: src/text.c:3286
+#: src/text.c:1077 src/text.c:2852 src/text.c:3005 src/text.c:3246
+#: src/text.c:3540
 msgid "Could not fork"
 msgstr "Ne mogu započeti novi proces"
 
-#: src/text.c:1853
+#: src/text.c:2117
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Netočan citat znakovnog niza %s: %s"
 
 # suprotno od Poravnaj: Odravnaj
-#: src/text.c:2241
+#: src/text.c:2499
 msgid "Can now UnJustify!"
-msgstr "OdRavnanje je sad moguće!"
+msgstr "Odravnanje je moguće!"
 
-#: src/text.c:2435
+#: src/text.c:2697
 msgid "Edit a replacement"
 msgstr "Uredite zamjenu"
 
-#: src/text.c:2510
+#. TRANSLATORS: Shown after fixing misspellings in one word.
+#: src/text.c:2713
+#, fuzzy
+msgid "Next word..."
+msgstr "Riječ →"
+
+#: src/text.c:2767
 msgid "Creating misspelled word list, please wait..."
-msgstr "Radim popis krivo napisanih riječi, molim pričekajte..."
+msgstr "Radim popis krivo napisanih riječi, pričekajte..."
 
-#: src/text.c:2601 src/text.c:2999
+#: src/text.c:2858 src/text.c:3253
 msgid "Could not get size of pipe buffer"
 msgstr "Veličina međuspremnika kanala (pipe) nije poznata"
 
-#: src/text.c:2652
+#: src/text.c:2907
 msgid "Error invoking \"spell\""
-msgstr "Greška pozivanja „spell“"
+msgstr "Pogreška pri pozivu „spell“"
 
-#: src/text.c:2655
+#: src/text.c:2910
 msgid "Error invoking \"sort -f\""
-msgstr "Greška pozivanja „sort -f“"
+msgstr "Pogreška pri pozivu „sort -f“"
 
-#: src/text.c:2658
+#: src/text.c:2913
 msgid "Error invoking \"uniq\""
-msgstr "Greška pozivanja „uniq“"
+msgstr "Pogreška pri pozivu „uniq“"
 
-#: src/text.c:2881
+#: src/text.c:3135
 msgid "Invoking spell checker, please wait"
-msgstr "Prizivam provjeru pravopisa, molim pričekajte"
+msgstr "Pozivam provjeru pravopisa, pričekajte..."
 
-#: src/text.c:2897
+#: src/text.c:3151
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Provjera pravopisa neuspješna: %s"
 
-#: src/text.c:2899
+#: src/text.c:3153
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Provjera pravopisa neuspješna: %s: %s"
 
-#: src/text.c:2902
+#: src/text.c:3156
 msgid "Finished checking spelling"
 msgstr "Završena provjera pravopisa"
 
-#: src/text.c:2927
+#: src/text.c:3181
 msgid "No linter defined for this type of file!"
-msgstr "‘linter’ nije definiran za ovu vrstu datoteke!"
+msgstr "linter nije definiran za ovu vrstu datoteke!"
 
-#: src/text.c:2932
+# lintera lintaje
+#: src/text.c:3186
 msgid "Save modified buffer before linting?"
-msgstr "Spremiti izmijenjenu međumemoriju prije primjene ‘linter-a’?"
+msgstr "Izmijenjenu međumemoriju spremiti bez primjene lintera?"
 
-#: src/text.c:2949
+#: src/text.c:3203
 msgid "Invoking linter, please wait"
-msgstr "Prizivam ‘linter’, molim pričekajte"
+msgstr "Pozivam linter, pričekajte..."
 
-#: src/text.c:3105
+#: src/text.c:3358
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
-msgstr "Niti jedan obradivi redak nije dobiven od naredbe: %s"
+msgstr "Nijedan obradivi redak nije dobiven od naredbe: %s"
 
-#: src/text.c:3134
+#: src/text.c:3388
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
-msgstr ""
-"Poruka je za ‘ne-otvorenu‘ datoteku %s, da ju učitam u novu međumemoriju?"
+msgstr "Poruka je za neotvorenu datoteku %s, učitati je u novu međumemoriju?"
 
-#: src/text.c:3153
+#: src/text.c:3407
 msgid "No more errors in unopened files, cancelling"
-msgstr "Nema više grešaka u ne-otvorenim datotekama, prekidam"
+msgstr "Nema više pogrešaka u neotvorenim datotekama, prekidam"
 
-#: src/text.c:3192
+#: src/text.c:3446
 msgid "At last message"
-msgstr "Na zadnjoj poruci"
+msgstr "Zadnja poruka"
 
-#: src/text.c:3197
+#: src/text.c:3451
 msgid "At first message"
-msgstr "Pri prvoj poruci"
+msgstr "Prva poruka"
 
-#: src/text.c:3237
+#: src/text.c:3491
 msgid "Finished"
 msgstr "Završeno"
 
-#: src/text.c:3259
+#: src/text.c:3513
 msgid "Invoking formatter, please wait"
-msgstr "Prizivam ‘formatter’, molim pričekajte"
+msgstr "Pozivam formatter, pričekajte..."
 
-#: src/text.c:3314
+#: src/text.c:3568
 msgid "Finished formatting"
-msgstr "Oblikovanje teksta je završeno"
+msgstr "Formatiranje teksta je završeno"
 
-#: src/text.c:3396
+#: src/text.c:3650
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sRiječi: %lu  Redova: %ld  Znakova: %lu"
 
-#: src/text.c:3397
+#: src/text.c:3651
 msgid "In Selection:  "
 msgstr "U odabranom tekstu:  "
 
+# verbatim doslovce bukvalno
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3411
+#: src/text.c:3665
 msgid "Verbatim Input"
 msgstr "Doslovni unos"
 
-#: src/utils.c:391 src/utils.c:403
+#: src/utils.c:392 src/utils.c:404
 msgid "nano is out of memory!"
-msgstr "‘nano’ nema dovoljno memorije!"
+msgstr "nano nema dovoljno memorije!"
+
+#: src/utils.c:625
+#, c-format
+msgid "Internal error: can't match line %d.  Please save your work."
+msgstr "Interna greška: redak %d nije nađen.  Spremite vaš rad."
+
+#. TRANSLATORS: This refers to a sequence of escape codes
+#. * (from the keyboard) that nano does not know about.
+#: src/winio.c:1121
+msgid "Unknown sequence"
+msgstr ""
 
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
 #: src/winio.c:1427
 msgid "Unicode Input"
-msgstr "Unicode unos"
-
-#: src/winio.c:1991 src/winio.c:1995
-msgid "Modified"
-msgstr "Izmijenjena"
+msgstr "Unos Unicode znaka"
 
-#: src/winio.c:1992
-msgid "View"
-msgstr "ÄŒitanje"
-
-#: src/winio.c:2006
+#: src/winio.c:1960
 msgid "DIR:"
 msgstr "DIR:"
 
-#: src/winio.c:2013
+#: src/winio.c:1968
 msgid "File:"
 msgstr "Datoteka:"
 
-#: src/winio.c:3141
+#: src/winio.c:1972 src/winio.c:1976
+msgid "Modified"
+msgstr "Izmijenjena"
+
+#: src/winio.c:1974
+msgid "View"
+msgstr "ÄŒitanje"
+
+#: src/winio.c:3105
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "redak %ld/%ld (%d%%), stupac %lu/%lu (%d%%), znakova %lu/%lu (%d%%)"
 
-#: src/winio.c:3271
+#: src/winio.c:3235
 msgid "The nano text editor"
 msgstr "Uređivač teksta nano"
 
-#: src/winio.c:3272
+#: src/winio.c:3236
 msgid "version"
 msgstr "inačica"
 
-#: src/winio.c:3273
+#: src/winio.c:3237
 msgid "Brought to you by:"
 msgstr "Poklon za vas od:"
 
-#: src/winio.c:3274
+#: src/winio.c:3238
 msgid "Special thanks to:"
 msgstr "Posebne zahvale:"
 
-#: src/winio.c:3275
+#: src/winio.c:3239
 msgid "The Free Software Foundation"
 msgstr "The Free Software Foundation"
 
-#: src/winio.c:3276
+#: src/winio.c:3240
 msgid "the many translators and the TP"
 msgstr "mnogim prevoditeljima i TP"
 
-#: src/winio.c:3277
+#: src/winio.c:3241
 msgid "For ncurses:"
 msgstr "Za ncurses:"
 
-#: src/winio.c:3278
+#: src/winio.c:3242
 msgid "and anyone else we forgot..."
 msgstr "i svima ostalima koje smo zaboravili..."
 
-#: src/winio.c:3279
+#: src/winio.c:3243
 msgid "Thank you for using nano!"
 msgstr "Hvala vam Å¡to koristite nano!"
 
-#~ msgid "Cannot prepend or append to a symlink with --nofollow set"
+#~ msgid ""
+#~ "Read %lu line (Converted from DOS and Mac format - Warning: No write "
+#~ "permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from DOS and Mac format - Warning: No write "
+#~ "permission)"
+#~ msgstr[0] ""
+#~ "Učitano: %lu redak (DOS i Mac zapis je adaptiran — pisanje nije dopušteno)"
+#~ msgstr[1] ""
+#~ "Učitano: %lu retka (DOS i Mac zapis je adaptiran — pisanje nije dopušteno)"
+#~ msgstr[2] ""
+#~ "Učitano: %lu redaka (DOS i Mac zapis je adaptiran — pisanje nije "
+#~ "dopušteno)"
+
+#~ msgid ""
+#~ "Read %lu line (Converted from Mac format - Warning: No write permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from Mac format - Warning: No write permission)"
+#~ msgstr[0] ""
+#~ "Učitano: %lu redak (Mac zapis je adaptiran — pisanje nije dopušteno)"
+#~ msgstr[1] ""
+#~ "Učitano: %lu retka (Mac zapis je adaptiran — pisanje nije dopušteno)"
+#~ msgstr[2] ""
+#~ "Učitano: %lu redaka (Mac zapis je adaptiran — pisanje nije dopušteno)"
+
+#~ msgid ""
+#~ "Read %lu line (Converted from DOS format - Warning: No write permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from DOS format - Warning: No write permission)"
+#~ msgstr[0] ""
+#~ "Učitano: %lu redak (DOS zapis je adaptiran – pisanje nije dopušteno)"
+#~ msgstr[1] ""
+#~ "Učitano: %lu retka (DOS zapis je adaptiran – pisanje nije dopušteno)"
+#~ msgstr[2] ""
+#~ "Učitano: %lu redaka (DOS zapis je adaptiran – pisanje nije dopušteno)"
+
+#~ msgid "Read %lu line (Warning: No write permission)"
+#~ msgid_plural "Read %lu lines (Warning: No write permission)"
+#~ msgstr[0] "Učitano: %lu redak (pisanje nije dopušteno)"
+#~ msgstr[1] "Učitano: %lu retka (pisanje nije dopušteno)"
+#~ msgstr[2] "Učitano: %lu redaka (pisanje nije dopušteno)"
+
+#~ msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 #~ msgstr ""
-#~ "Simboličkoj poveznici ne mogu umetnuti ako je aktivna opcija '--nofollow'"
+#~ "Da spremim izmijenjenu međumemoriju (ODGOVOR „Ne“ ĆE UNIŠTITI IZMJENE)? "
+
+#~ msgid "Unknown Command"
+#~ msgstr "Nepoznata naredba"
+
+#~ msgid "Cannot add a color command without a syntax command"
+#~ msgstr "„color“ naredba zahtijeva prethodnu „syntax“ naredbu"
+
+#~ msgid "Missing regex string"
+#~ msgstr "Nedostaje regularni izraz"
+
+#~ msgid "Cannot add a header regex without a syntax command"
+#~ msgstr "Reg izraz za zaglavlje zahtijeva prethodnu „syntax“ naredbu"
+
+#~ msgid "Cannot add a magic string regex without a syntax command"
+#~ msgstr "Magični regularni izraz zahtijeva prethodnu „syntax“ naredbu"
+
+#~ msgid "Missing magic string name"
+#~ msgstr "Nedostaje ime magičnog uzorka (niza)"
+
+#~ msgid "Cannot add a linter without a syntax command"
+#~ msgstr "linter zahtijeva prethodnu „syntax“ naredbu"
+
+#~ msgid "Cannot add formatter without a syntax command"
+#~ msgstr "formatter zahtijeva prethodnu „syntax“ naredbu"
+
+#~ msgid "Missing formatter command"
+#~ msgstr "Nedostaje naredba za formatiranje"
+
+#~ msgid "Cannot prepend or append to a symlink with --nofollow set"
+#~ msgstr "Simboličkoj poveznici ne mogu umetnuti uz aktivnu opciju --nofollow"
 
 # poveznica je bolje, ali previše slova.
 #~ msgid "Don't follow symbolic links, overwrite"
diff --git a/po/hu.po b/po/hu.po
index b2af959c..88e0cf10 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,10 +8,10 @@
 # Gabor Kelemen <kelemeng@gnome.hu>, 2006, 2008, 2009, 2010, 2015, 2016.
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 2.5.1\n"
+"Project-Id-Version: nano 2.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-25 16:41-0500\n"
-"PO-Revision-Date: 2016-01-12 11:17+0100\n"
+"POT-Creation-Date: 2016-06-17 15:41+0200\n"
+"PO-Revision-Date: 2016-03-14 12:42+0100\n"
 "Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
 "Language: hu\n"
@@ -21,377 +21,352 @@ msgstr ""
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 "X-Generator: Lokalize 1.5\n"
 
+#: src/browser.c:144 src/browser.c:284 src/browser.c:334 src/files.c:996
+#: src/files.c:1003 src/files.c:1794 src/files.c:1919 src/files.c:1963
+#: src/files.c:1983 src/files.c:2099 src/files.c:3019 src/files.c:3242
+#: src/rcfile.c:540 src/rcfile.c:1280
+#, c-format
+msgid "Error reading %s: %s"
+msgstr "Hiba %s olvasásakor: %s"
+
 #. TRANSLATORS: This is a prompt.
-#: src/browser.c:220
+#: src/browser.c:247
 msgid "Go To Directory"
 msgstr "Könyvtárváltás"
 
-#: src/browser.c:227 src/browser.c:738 src/files.c:1174 src/files.c:2340
-#: src/nano.c:1120 src/search.c:202 src/search.c:290 src/search.c:895
-#: src/search.c:970 src/text.c:2935 src/text.c:3142
+#: src/browser.c:254 src/browser.c:723 src/files.c:1126 src/files.c:2292
+#: src/nano.c:1128 src/search.c:195 src/search.c:297 src/search.c:851
+#: src/search.c:918 src/text.c:3189 src/text.c:3396
 msgid "Cancelled"
 msgstr "Megszakítva"
 
-#: src/browser.c:253 src/browser.c:300
-#, c-format
-msgid "Can't go outside of %s in restricted mode"
+#. TRANSLATORS: This refers to the option --operatingdir,
+#. * not to --restricted.
+#: src/browser.c:274 src/browser.c:326
+#, fuzzy, c-format
+msgid "Can't go outside of %s in confined mode"
 msgstr "Korlátozott módban nem léphet ki a következőből: %s"
 
-#: src/browser.c:264 src/browser.c:310 src/browser.c:326 src/files.c:1044
-#: src/files.c:1052 src/files.c:1844 src/files.c:1971 src/files.c:2016
-#: src/files.c:2037 src/files.c:2156 src/files.c:3062 src/files.c:3285
-#: src/rcfile.c:596 src/rcfile.c:1435
-#, c-format
-msgid "Error reading %s: %s"
-msgstr "Hiba %s olvasásakor: %s"
-
-#: src/browser.c:290
+#: src/browser.c:317
 msgid "Can't move up a directory"
 msgstr "Nem lehet egy könyvtárral feljebb lépni"
 
 #. TRANSLATORS: Try to keep this at most 7 characters.
-#: src/browser.c:615 src/browser.c:623
+#: src/browser.c:590 src/browser.c:598
 msgid "(dir)"
 msgstr "(könyvtár)"
 
 #. TRANSLATORS: Try to keep this at most 12 characters.
-#: src/browser.c:620
+#: src/browser.c:595
 msgid "(parent dir)"
 msgstr "(szülőkvt)"
 
 #. TRANSLATORS: Try to keep this at most 7 characters.
 #. * If necessary, you can leave out the parentheses.
-#: src/browser.c:650
+#: src/browser.c:625
 msgid "(huge)"
 msgstr "(óriás)"
 
 #. TRANSLATORS: This is the main search prompt.
-#: src/browser.c:727 src/search.c:173
+#: src/browser.c:712 src/search.c:166
 msgid "Search"
 msgstr "Keresés"
 
-#: src/browser.c:777 src/search.c:466 src/search.c:536
-msgid "This is the only occurrence"
-msgstr "Ez az egyetlen előfordulás"
-
-#: src/browser.c:793 src/search.c:364
+#: src/browser.c:754 src/search.c:368
 msgid "Search Wrapped"
 msgstr "A keresés körbeért"
 
-#: src/browser.c:843 src/search.c:517
+#: src/browser.c:764 src/search.c:509
+msgid "This is the only occurrence"
+msgstr "Ez az egyetlen előfordulás"
+
+#: src/browser.c:812 src/search.c:473
 msgid "No current search pattern"
 msgstr "Nincs keresési minta"
 
-#: src/files.c:50
+#: src/color.c:186
 #, fuzzy, c-format
+msgid "Unknown syntax name: %s"
+msgstr "Hiányzó szintaxisnév"
+
+#: src/color.c:247
+#, c-format
+msgid "magic_load() failed: %s"
+msgstr ""
+
+#: src/color.c:251
+#, c-format
+msgid "magic_file(%s) failed: %s"
+msgstr ""
+
+#: src/files.c:47
+#, c-format
 msgid "Directory '%s' does not exist"
-msgstr "Hiba a zárolási fájl írásakor: A könyvtár („%s”) nem létezik"
+msgstr "A(z) „%s” könyvtár nem létezik"
 
-#: src/files.c:52
+#: src/files.c:49
 #, c-format
 msgid "Path '%s': %s"
-msgstr ""
+msgstr "„%s” útvonal: %s"
 
-#: src/files.c:54
-#, fuzzy, c-format
+#: src/files.c:51
+#, c-format
 msgid "Path '%s' is not a directory"
-msgstr "„%s” egy könyvtár"
+msgstr "„%s” útvonal nem könyvtár"
 
-#: src/files.c:57
+#: src/files.c:53
 #, c-format
 msgid "Path '%s' is not accessible"
-msgstr ""
+msgstr "„%s” útvonal nem érhető el"
 
-#. TRANSLATORS: Try to keep this at most 76 characters.
-#: src/files.c:158
+#. TRANSLATORS: Keep the next ten messages at most 76 characters.
+#: src/files.c:148
 msgid ""
 "Warning: Modifying a file which is not locked, check directory permission?"
 msgstr ""
 "Figyelmeztetés: nem zárolt fájl módosítása, ellenőrzi a "
 "könyvtárjogosultságokat?"
 
-#: src/files.c:197
+#: src/files.c:187
 msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
 msgstr ""
 "Nem sikerült a személyazonosság meghatározása a zároló fájlhoz (getpwuid() "
 "sikertelen)"
 
-#: src/files.c:206
+#: src/files.c:196
 #, c-format
 msgid "Couldn't determine hostname for lock file: %s"
 msgstr "Nem határozható meg a gépnév a zároló fájlhoz: %s"
 
-#: src/files.c:227 src/files.c:238 src/files.c:275 src/files.c:285
+#: src/files.c:216 src/files.c:225 src/files.c:262 src/files.c:272
 #, c-format
 msgid "Error writing lock file %s: %s"
 msgstr "Hiba a zárolási fájl (%s) írásakor: %s"
 
-#: src/files.c:305
+#: src/files.c:291
 #, c-format
 msgid "Error deleting lock file %s: %s"
 msgstr "Hiba a zárolási fájl (%s) törlésekor: %s"
 
-#: src/files.c:341
+#: src/files.c:325
 #, c-format
 msgid "Error opening lock file %s: %s"
 msgstr "Hiba a zárolási fájl (%s) megnyitásakor: %s"
 
-#: src/files.c:353
+#: src/files.c:337
 #, c-format
 msgid "Error reading lock file %s: Not enough data read"
 msgstr "Hiba a zárolási fájl (%s) olvasásakor: nincs elég beolvasott adat"
 
 #. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
-#: src/files.c:371
+#: src/files.c:354
 #, c-format
 msgid "File %s is being edited (by %s with %s, PID %d); continue?"
 msgstr ""
 "A fájl (%s) szerkesztés alatt (%s által ezzel: %s, PID: %d). Folytatja?"
 
-#: src/files.c:426
+#: src/files.c:430
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Nem szúrható be fájl a következőn kívülről: %s"
 
-#: src/files.c:439 src/files.c:1038 src/rcfile.c:589 src/rcfile.c:1385
-#: src/rcfile.c:1426
+#: src/files.c:445 src/files.c:991 src/rcfile.c:533 src/rcfile.c:1230
+#: src/rcfile.c:1271
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "„%s” egy könyvtár"
 
-#: src/files.c:441
+#: src/files.c:447
 #, c-format
 msgid "\"%s\" is not a normal file"
 msgstr "A(z) „%s” nem normál fájl"
 
-#: src/files.c:566
+#: src/files.c:571
 msgid "No more open file buffers"
 msgstr "Nincs több nyitott fájlpuffer"
 
-#: src/files.c:582
+#: src/files.c:586
 #, c-format
 msgid "Switched to %s"
 msgstr "Átváltva erre: %s"
 
-#: src/files.c:584 src/global.c:988 src/winio.c:2010
+#: src/files.c:588 src/global.c:1005 src/winio.c:1965
 msgid "New Buffer"
 msgstr "Új puffer"
 
-#: src/files.c:943
+#. TRANSLATORS: Keep the next four messages at most 76 characters.
+#: src/files.c:913
 #, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
 msgstr[0] "%lu sor beolvasva (DOS és Mac formátumról átalakítva)"
 msgstr[1] "%lu sor beolvasva (DOS és Mac formátumról átalakítva)"
 
-#: src/files.c:948
-#, c-format
-msgid ""
-"Read %lu line (Converted from DOS and Mac format - Warning: No write "
-"permission)"
-msgid_plural ""
-"Read %lu lines (Converted from DOS and Mac format - Warning: No write "
-"permission)"
-msgstr[0] ""
-"%lu sor beolvasva (DOS és Mac formátumról átalakítva - Figyelmeztetés: nincs "
-"írásjog)"
-msgstr[1] ""
-"%lu sor beolvasva (DOS és Mac formátumról átalakítva - Figyelmeztetés: nincs "
-"írásjog)"
-
-#: src/files.c:954
+#: src/files.c:919
 #, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
 msgstr[0] "%lu sor beolvasva (Mac formátumról átalakítva)"
 msgstr[1] "%lu sor beolvasva (Mac formátumról átalakítva)"
 
-#: src/files.c:958
-#, c-format
-msgid ""
-"Read %lu line (Converted from Mac format - Warning: No write permission)"
-msgid_plural ""
-"Read %lu lines (Converted from Mac format - Warning: No write permission)"
-msgstr[0] ""
-"%lu sor beolvasva (Mac formátumról átalakítva - Figyelmeztetés: nincs "
-"írásjog)"
-msgstr[1] ""
-"%lu sor beolvasva (Mac formátumról átalakítva - Figyelmeztetés: nincs "
-"írásjog)"
-
-#: src/files.c:964
+#: src/files.c:925
 #, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
 msgstr[0] "%lu sor beolvasva (DOS formátumról átalakítva)"
 msgstr[1] "%lu sor beolvasva (DOS formátumról átalakítva)"
 
-#: src/files.c:968
-#, c-format
-msgid ""
-"Read %lu line (Converted from DOS format - Warning: No write permission)"
-msgid_plural ""
-"Read %lu lines (Converted from DOS format - Warning: No write permission)"
-msgstr[0] ""
-"%lu sor beolvasva (DOS formátumról átalakítva - Figyelmeztetés: nincs "
-"írásjog)"
-msgstr[1] ""
-"%lu sor beolvasva (DOS formátumról átalakítva - Figyelmeztetés: nincs "
-"írásjog)"
-
-#: src/files.c:974
+#: src/files.c:930
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "%lu sor beolvasva"
 msgstr[1] "%lu sor beolvasva"
 
-#: src/files.c:977
-#, c-format
-msgid "Read %lu line (Warning: No write permission)"
-msgid_plural "Read %lu lines (Warning: No write permission)"
-msgstr[0] "%lu sor beolvasva (Figyelmeztetés: nincs írásjog)"
-msgstr[1] "%lu sor beolvasva (Figyelmeztetés: nincs írásjog)"
-
-#: src/files.c:1019 src/files.c:1056
+#: src/files.c:974 src/files.c:1006
 msgid "Reading File"
 msgstr "Fájl beolvasása"
 
-#: src/files.c:1025
+#: src/files.c:980
 msgid "New File"
 msgstr "Új fájl"
 
-#: src/files.c:1028
-#, c-format
-msgid "\"%s\" not found"
+#: src/files.c:983
+#, fuzzy, c-format
+msgid "File \"%s\" not found"
 msgstr "„%s” nem található"
 
-#: src/files.c:1039 src/rcfile.c:590 src/rcfile.c:1386 src/rcfile.c:1427
+#: src/files.c:992 src/rcfile.c:534 src/rcfile.c:1231 src/rcfile.c:1272
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "A(z) „%s” egy eszközfájl"
 
-#: src/files.c:1133
+#: src/files.c:1083
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Az új pufferben futtatandó parancs [ebből: %s] "
 
-#: src/files.c:1135
+#: src/files.c:1085
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Futtatandó parancs [ebből: %s] "
 
-#: src/files.c:1142
+#: src/files.c:1092
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Az új pufferbe szúrandó fájl [ebből: %s] "
 
-#: src/files.c:1144
+#: src/files.c:1094
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Beszúrandó fájl [ebből: %s] "
 
-#: src/files.c:1389
+#: src/files.c:1338
 msgid "Key invalid in non-multibuffer mode"
 msgstr "A billentyű illegális nem többpufferes módban"
 
-#: src/files.c:1684
-msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+#: src/files.c:1632
+#, fuzzy
+msgid "Failed to write backup file; continue saving? (Say N if unsure.) "
 msgstr ""
 "A biztonsági mentés fájl írása sikertelen, folytatja a mentést? (N, ha "
 "bizonytalan)"
 
-#: src/files.c:1800
+#: src/files.c:1750
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Nem lehet a következőn kívülre írni: %s"
 
-#: src/files.c:1885 src/files.c:1910 src/files.c:1928 src/files.c:1941
-#: src/files.c:1952 src/files.c:1981
+#: src/files.c:1833 src/files.c:1858 src/files.c:1876 src/files.c:1889
+#: src/files.c:1900 src/files.c:1928
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Hiba a biztonságimentés-fájl (%s) írásakor: %s"
 
-#: src/files.c:1886 src/nano.c:690
+#: src/files.c:1834 src/nano.c:692
 msgid "Too many backup files?"
 msgstr "Túl sok biztonsági mentés van?"
 
-#: src/files.c:2026 src/text.c:2863 src/text.c:2875 src/text.c:3244
-#: src/text.c:3253
+#: src/files.c:1972 src/text.c:3117 src/text.c:3129 src/text.c:3498
+#: src/text.c:3507
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Hiba az ideiglenes fájl írásakor: %s"
 
-#: src/files.c:2049 src/files.c:2068 src/files.c:2080 src/files.c:2104
-#: src/files.c:2121 src/files.c:2131 src/files.c:2164 src/files.c:2171
+#: src/files.c:1994 src/files.c:2013 src/files.c:2023 src/files.c:2047
+#: src/files.c:2064 src/files.c:2074 src/files.c:2106 src/files.c:2113
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Hiba „%s” írása közben: %s"
 
-#: src/files.c:2200
+#: src/files.c:2154
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "%lu sor kiírva"
 msgstr[1] "%lu sor kiírva"
 
-#: src/files.c:2299
+#: src/files.c:2249
 msgid " [DOS Format]"
 msgstr " [DOS formátum]"
 
-#: src/files.c:2300
+#: src/files.c:2250
 msgid " [Mac Format]"
 msgstr " [Mac formátum]"
 
-#: src/files.c:2302
+#: src/files.c:2252
 msgid " [Backup]"
 msgstr " [Biztonsági mentés]"
 
-#: src/files.c:2309
+#: src/files.c:2259
 msgid "Prepend Selection to File"
 msgstr "A kiválasztott rész beszúrása a szöveg elé"
 
-#: src/files.c:2310
+#: src/files.c:2260
 msgid "Append Selection to File"
 msgstr "A kiválasztott rész hozzáfűzése a fájlhoz"
 
-#: src/files.c:2311
+#: src/files.c:2261
 msgid "Write Selection to File"
 msgstr "A kiválasztott rész mentése fájlba"
 
-#: src/files.c:2314
+#: src/files.c:2264
 msgid "File Name to Prepend to"
 msgstr "Beszúrás ezen fájl elé"
 
-#: src/files.c:2315
+#: src/files.c:2265
 msgid "File Name to Append to"
 msgstr "Hozzáfűzés ehhez a fájlhoz"
 
-#: src/files.c:2316
+#: src/files.c:2266
 msgid "File Name to Write"
 msgstr "Mentés ebbe a fájlba"
 
-#: src/files.c:2349
-msgid "Save modified buffer anyway ? "
+#: src/files.c:2301
+#, fuzzy
+msgid "Save modified buffer anyway? "
 msgstr "Mindenképp menti a módosított puffert?"
 
-#: src/files.c:2457
-msgid "File exists, OVERWRITE ? "
-msgstr "A fájl már létezik, FELÜLÍRJA? "
-
-#: src/files.c:2466
-msgid "Save file under DIFFERENT NAME ? "
+#: src/files.c:2412
+#, fuzzy
+msgid "Save file under DIFFERENT NAME? "
 msgstr "Menti a fájlt MÁS NÉVEN? "
 
-#: src/files.c:2480
-msgid "File was modified since you opened it, continue saving ? "
+#: src/files.c:2420
+#, fuzzy, c-format
+msgid "File \"%s\" exists; OVERWRITE? "
+msgstr "A fájl már létezik, FELÜLÍRJA? "
+
+#: src/files.c:2441
+#, fuzzy
+msgid "File was modified since you opened it; continue saving? "
 msgstr "A fájl módosult, mióta megnyitotta, folytatja a mentést?"
 
-#: src/files.c:2917
+#: src/files.c:2874
 msgid "(more)"
 msgstr "(tovább)"
 
-#: src/files.c:3004
+#: src/files.c:2959
 #, c-format
 msgid ""
 "\n"
@@ -400,7 +375,7 @@ msgstr ""
 "\n"
 "A folytatáshoz nyomja le az Enter billentyűt\n"
 
-#: src/files.c:3020
+#: src/files.c:2975
 #, c-format
 msgid ""
 "Unable to create directory %s: %s\n"
@@ -410,7 +385,7 @@ msgstr ""
 "Ez a keresési előzmények vagy a kurzorpozíciók mentéséhez/betöltéséhez "
 "kell.\n"
 
-#: src/files.c:3026
+#: src/files.c:2982
 #, c-format
 msgid ""
 "Path %s is not a directory and needs to be.\n"
@@ -420,7 +395,7 @@ msgstr ""
 "A Nano nem tud menteni/betölteni keresési előzményeket vagy "
 "kurzorpozíciókat.\n"
 
-#: src/files.c:3045
+#: src/files.c:3002
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I tried to move\n"
@@ -429,7 +404,7 @@ msgstr ""
 "Örökölt nano előzményfájlt találtam (%s), amit megpróbáltam\n"
 "áthelyezni az előnyben részesített helyre (%s), de hiba történt: %s"
 
-#: src/files.c:3049
+#: src/files.c:3006
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I moved\n"
@@ -440,721 +415,752 @@ msgstr ""
 "az előnyben részesített helyre (%s).\n"
 "(a változásról lásd a Nano FAQ-ot)"
 
-#: src/files.c:3132 src/files.c:3140 src/files.c:3164 src/files.c:3176
+#: src/files.c:3089 src/files.c:3097 src/files.c:3121 src/files.c:3133
 #, c-format
 msgid "Error writing %s: %s\n"
 msgstr "Hiba „%s” írása közben: %s\n"
 
 #. TRANSLATORS: Try to keep the next fifteen strings at most 10 characters.
-#: src/global.c:480
+#: src/global.c:483
 msgid "Exit"
 msgstr "Kilépés"
 
-#: src/global.c:481
+#: src/global.c:484
 msgid "Close"
 msgstr "Bezárás"
 
-#: src/global.c:482
+#: src/global.c:485
 msgid "Uncut Text"
 msgstr "Beillesztés"
 
-#: src/global.c:484
+#: src/global.c:487
 msgid "Unjustify"
 msgstr "Nem sork."
 
-#: src/global.c:490
+#: src/global.c:493
 msgid "Read File"
 msgstr "Beolvasás"
 
-#: src/global.c:491
+#: src/global.c:494
 msgid "Where Is"
 msgstr "Keresés"
 
-#: src/global.c:492
+#: src/global.c:495
 msgid "Replace"
 msgstr "Csere"
 
-#: src/global.c:493
+#: src/global.c:496
 msgid "Go To Line"
 msgstr "Ugrás sorra"
 
-#: src/global.c:494
+#: src/global.c:497
 msgid "Prev Line"
 msgstr "Előző sor"
 
-#: src/global.c:495
+#: src/global.c:498
 msgid "Next Line"
 msgstr "Köv. sor"
 
-#: src/global.c:496
+#: src/global.c:499
 msgid "Prev Page"
 msgstr "Előző old."
 
-#: src/global.c:497
+#: src/global.c:500
 msgid "Next Page"
 msgstr "Köv. old."
 
-#: src/global.c:499
+#: src/global.c:502
 msgid "Justify"
 msgstr "Sorkizárás"
 
-#: src/global.c:500
+#: src/global.c:503
 msgid "FullJstify"
 msgstr "Sorkizár"
 
-#: src/global.c:502
+#: src/global.c:505
 msgid "Refresh"
 msgstr "Frissít"
 
 #. TRANSLATORS: Try to keep this string at most 12 characters.
-#: src/global.c:505
+#: src/global.c:508
 msgid "WhereIs Next"
 msgstr "Következőre"
 
 #. TRANSLATORS: The next long series of strings are shortcut descriptions;
 #. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:512
+#: src/global.c:515
 msgid "Justify the current paragraph"
 msgstr "Aktuális bekezdés sorkizárttá rendezése"
 
-#: src/global.c:514
+#: src/global.c:517
 msgid "Cancel the current function"
 msgstr "Aktuális művelet megszakítása"
 
-#: src/global.c:515
+#: src/global.c:518
 msgid "Display this help text"
 msgstr "Ezen súgószöveg megjelenítése"
 
-#: src/global.c:518
+#: src/global.c:521
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Aktuális fájlpuffer bezárása/Kilépés a nanoból"
 
-#: src/global.c:520
+#: src/global.c:523
 msgid "Exit from nano"
 msgstr "Kilépés a nanoból"
 
-#: src/global.c:524
+#: src/global.c:527
 msgid "Write the current file to disk"
 msgstr "Az aktuális fájl lemezre mentése"
 
-#: src/global.c:526
+#: src/global.c:529
 msgid "Insert another file into the current one"
 msgstr "Másik fájl beszúrása"
 
-#: src/global.c:528
+#: src/global.c:531
 msgid "Search for a string or a regular expression"
 msgstr "Karakterlánc vagy reguláris kifejezés keresése"
 
-#: src/global.c:531
+#: src/global.c:533
 msgid "Search for a string"
 msgstr "Karakterlánc keresése"
 
-#: src/global.c:533
+#: src/global.c:534
+msgid "Refresh the file list"
+msgstr ""
+
+#: src/global.c:535
+#, fuzzy
+msgid "Go to lefthand column"
+msgstr "Ugrás megadott pozícióra"
+
+#: src/global.c:536
+#, fuzzy
+msgid "Go to righthand column"
+msgstr "Ugrás megadott pozícióra"
+
+#: src/global.c:538
 msgid "Go one screenful up"
 msgstr "Ugrás egy képernyővel fel"
 
-#: src/global.c:534
+#: src/global.c:539
 msgid "Go one screenful down"
 msgstr "Ugrás egy képernyővel le"
 
-#: src/global.c:536
+#: src/global.c:541
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Aktuális sor kivágása és tárolása a kivágási pufferben"
 
-#: src/global.c:538
+#: src/global.c:543
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "A kivágási pufferben lévő sor beillesztése az aktuális sorba"
 
-#: src/global.c:539
+#: src/global.c:544
 msgid "Display the position of the cursor"
 msgstr "A kurzor helyének megjelenítése"
 
-#: src/global.c:541
+#: src/global.c:546
 msgid "Invoke the spell checker, if available"
 msgstr "A helyesírás-ellenőrző indítása, ha elérhető"
 
-#: src/global.c:543
+#: src/global.c:548
 msgid "Replace a string or a regular expression"
 msgstr "Karakterlánc vagy reguláris kifejezés cseréje"
 
-#: src/global.c:544
+#: src/global.c:549
 msgid "Go to line and column number"
 msgstr "Ugrás megadott pozícióra"
 
-#: src/global.c:546
+#: src/global.c:551
 msgid "Mark text starting from the cursor position"
 msgstr "Szöveg kijelölése a kurzortól kezdve"
 
-#: src/global.c:547
+#: src/global.c:552
 msgid "Repeat the last search"
 msgstr "Az utolsó keresés megismétlése"
 
-#: src/global.c:549
+#: src/global.c:554
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "Aktuális sor másolása és tárolása a kivágási pufferben"
 
-#: src/global.c:550
+#: src/global.c:555
 msgid "Indent the current line"
 msgstr "Aktuális sor behúzása"
 
-#: src/global.c:551
+#: src/global.c:556
 msgid "Unindent the current line"
 msgstr "Aktuális sor behúzásának megszüntetése"
 
-#: src/global.c:552
+#: src/global.c:558
+msgid "Comment/uncomment the current line or marked lines"
+msgstr ""
+
+#: src/global.c:560
 msgid "Undo the last operation"
 msgstr "Utolsó művelet visszavonása"
 
-#: src/global.c:553
+#: src/global.c:561
 msgid "Redo the last undone operation"
 msgstr "Az utoljára visszavont művelet ismétlése"
 
-#: src/global.c:555
+#: src/global.c:563
 msgid "Go back one character"
 msgstr "Egy karakterrel vissza"
 
-#: src/global.c:556
+#: src/global.c:564
 msgid "Go forward one character"
 msgstr "Egy karakterrel előre"
 
-#: src/global.c:558
+#: src/global.c:566
 msgid "Go back one word"
 msgstr "Egy szóval vissza"
 
-#: src/global.c:559
+#: src/global.c:567
 msgid "Go forward one word"
 msgstr "Egy szóval előre"
 
-#: src/global.c:561
+#: src/global.c:569
 msgid "Go to previous line"
 msgstr "Az előző sorra"
 
-#: src/global.c:562
+#: src/global.c:570
 msgid "Go to next line"
 msgstr "A következő sorra"
 
-#: src/global.c:563
+#: src/global.c:571
 msgid "Go to beginning of current line"
 msgstr "A sor elejére"
 
-#: src/global.c:564
+#: src/global.c:572
 msgid "Go to end of current line"
 msgstr "A sor végére"
 
-#: src/global.c:567
+#: src/global.c:575
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "A bekezdés elejére; majd az előző bekezdésére"
 
-#: src/global.c:569
+#: src/global.c:577
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr "A bekezdés végére; majd a következő bekezdésére"
 
-#: src/global.c:571
+#: src/global.c:579
 msgid "Go to the first line of the file"
 msgstr "A fájl első sorára"
 
-#: src/global.c:572
+#: src/global.c:580
 msgid "Go to the last line of the file"
 msgstr "A fájl utolsó sorára"
 
-#: src/global.c:574
+#: src/global.c:582
 msgid "Go to the matching bracket"
 msgstr "Az illeszkedő zárójelre"
 
-#: src/global.c:576
+#: src/global.c:584
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "Görgetés egy sorral fel a kurzor görgetése nélkül"
 
-#: src/global.c:578
+#: src/global.c:586
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "Görgetés egy sorral le a kurzor görgetése nélkül"
 
-#: src/global.c:581
+#: src/global.c:589
 msgid "Switch to the previous file buffer"
 msgstr "Váltás az előző fájlpufferre"
 
-#: src/global.c:582
+#: src/global.c:590
 msgid "Switch to the next file buffer"
 msgstr "Váltás a következő fájlpufferre"
 
-#: src/global.c:584
+#: src/global.c:592
 msgid "Insert the next keystroke verbatim"
 msgstr "A következő billentyűleütés szó szerinti beszúrása"
 
-#: src/global.c:585
+#: src/global.c:593
 msgid "Insert a tab at the cursor position"
 msgstr "Tabulátor beszúrása a kurzor helyére"
 
-#: src/global.c:586
+#: src/global.c:594
 msgid "Insert a newline at the cursor position"
 msgstr "Új sor beszúrása a kurzor helyére"
 
-#: src/global.c:587
+#: src/global.c:595
 msgid "Delete the character under the cursor"
 msgstr "A kurzor helyén lévő karakter törlése"
 
-#: src/global.c:589
+#: src/global.c:597
 msgid "Delete the character to the left of the cursor"
 msgstr "A kurzor előtt álló karakter törlése"
 
-#: src/global.c:592
+#: src/global.c:600
 msgid "Cut backward from cursor to word start"
 msgstr "Kivágás a kurzor helyétől a szó elejéig"
 
-#: src/global.c:594
+#: src/global.c:602
 msgid "Cut forward from cursor to next word start"
 msgstr "Kivágás a kurzor helyétől a következő szó elejéig"
 
-#: src/global.c:596
+#: src/global.c:604
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Kivágás a kurzortól a fájl végéig"
 
-#: src/global.c:599
+#: src/global.c:607
 msgid "Justify the entire file"
 msgstr "Az egész fájl sorkizárttá rendezése"
 
-#: src/global.c:603
+#: src/global.c:611
 msgid "Count the number of words, lines, and characters"
 msgstr "A szavak, sorok és karakterek megszámolása"
 
-#: src/global.c:606
+#: src/global.c:614
 msgid "Refresh (redraw) the current screen"
 msgstr "A képernyő frissítése"
 
-#: src/global.c:608
+#: src/global.c:616
 msgid "Suspend the editor (if suspension is enabled)"
 msgstr "A szerkesztő felfüggesztése (ha engedélyezett)"
 
-#: src/global.c:610
+#: src/global.c:618
 msgid "Save file without prompting"
 msgstr "Fájl mentése kérdés nélkül"
 
-#: src/global.c:611
+#: src/global.c:619
 msgid "Search next occurrence backward"
 msgstr "Következő keresése visszafelé"
 
-#: src/global.c:612
+#: src/global.c:620
 msgid "Search next occurrence forward"
 msgstr "Következő keresése előre"
 
-#: src/global.c:614
+#: src/global.c:622
 msgid "Toggle the case sensitivity of the search"
 msgstr "A keresés kis- és nagybetűérzékenységének átváltása"
 
-#: src/global.c:616
+#: src/global.c:624
 msgid "Reverse the direction of the search"
 msgstr "A keresés irányának megfordítása"
 
-#: src/global.c:620
+#: src/global.c:628
 msgid "Toggle the use of regular expressions"
 msgstr "Reguláris kifejezések használatának átváltása"
 
-#: src/global.c:624
+#: src/global.c:632
 msgid "Recall the previous search/replace string"
 msgstr "Az előző kereső- vagy cserekifejezés előhozása"
 
-#: src/global.c:626
+#: src/global.c:634
 msgid "Recall the next search/replace string"
 msgstr "A következő kereső- vagy cserekifejezés előhozása"
 
-#: src/global.c:629
+#: src/global.c:637
 msgid "Go to file browser"
 msgstr "Tallózás"
 
-#: src/global.c:632
+#: src/global.c:640
 msgid "Toggle the use of DOS format"
 msgstr "DOS formátum használatának átváltása"
 
-#: src/global.c:633
+#: src/global.c:641
 msgid "Toggle the use of Mac format"
 msgstr "Mac formátum használatának átváltása"
 
-#: src/global.c:634
+#: src/global.c:642
 msgid "Toggle appending"
 msgstr "Hozzáfűzés átváltása"
 
-#: src/global.c:635
+#: src/global.c:643
 msgid "Toggle prepending"
 msgstr "Elejére beszúrás átváltása"
 
-#: src/global.c:636
+#: src/global.c:644
 msgid "Toggle backing up of the original file"
 msgstr "Eredeti fájlról biztonsági másolat készítésének átváltása"
 
-#: src/global.c:637
+#: src/global.c:645
 msgid "Execute external command"
 msgstr "Külső parancs végrehajtása"
 
-#: src/global.c:639
+#: src/global.c:647
 msgid "Close buffer without saving it"
 msgstr "Puffer bezárása mentés nélkül"
 
-#: src/global.c:641
+#: src/global.c:649
 msgid "Toggle the use of a new buffer"
 msgstr "Új puffer használatának átváltása"
 
-#: src/global.c:644
+#: src/global.c:652
 msgid "Exit from the file browser"
 msgstr "Kilépés a fájlböngészőből"
 
-#: src/global.c:645
+#: src/global.c:653
 msgid "Go to the first file in the list"
 msgstr "Ugrás a lista első fájljára"
 
-#: src/global.c:646
+#: src/global.c:654
 msgid "Go to the last file in the list"
 msgstr "Ugrás a lista utolsó fájljára"
 
-#: src/global.c:647
+#: src/global.c:655
 msgid "Go to the previous file in the list"
 msgstr "Ugrás a lista előző fájljára"
 
-#: src/global.c:648
+#: src/global.c:656
 msgid "Go to the next file in the list"
 msgstr "Ugrás a lista következő fájljára"
 
-#: src/global.c:649
+#: src/global.c:657
 msgid "Go to directory"
 msgstr "Könyvtárváltás"
 
-#: src/global.c:652
+#: src/global.c:660
 msgid "Invoke the linter, if available"
 msgstr "A linter indítása, ha elérhető"
 
-#: src/global.c:653
+#: src/global.c:661
 msgid "Go to previous linter msg"
 msgstr "Az előző linter üzenetre"
 
-#: src/global.c:654
+#: src/global.c:662
 msgid "Go to next linter msg"
 msgstr "A következő linter üzenetre"
 
-#: src/global.c:656
+#: src/global.c:664
 msgid "Invoke formatter, if available"
 msgstr "A formázó indítása, ha elérhető"
 
 #. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:671
+#: src/global.c:679
 msgid "Get Help"
 msgstr "Súgó"
 
-#: src/global.c:674 src/prompt.c:858
+#: src/global.c:682 src/prompt.c:855
 msgid "Cancel"
 msgstr "Mégsem"
 
-#: src/global.c:687
+#: src/global.c:695
 msgid "Write Out"
 msgstr "Kiírás"
 
-#: src/global.c:723
+#: src/global.c:731
 msgid "Go To Dir"
 msgstr "Könyvtárba"
 
-#: src/global.c:738
+#: src/global.c:746
 msgid "Cut Text"
 msgstr "Kivágás"
 
-#: src/global.c:753
+#: src/global.c:761
 msgid "To Spell"
 msgstr "Helyes-e?"
 
-#: src/global.c:757
+#: src/global.c:765
 msgid "To Linter"
 msgstr "Linterre"
 
-#: src/global.c:760
+#: src/global.c:768
 msgid "Formatter"
 msgstr "Formázó"
 
-#: src/global.c:767
+#: src/global.c:775
 msgid "Case Sens"
 msgstr "Kis/Nagy"
 
-#: src/global.c:772
+#: src/global.c:780
 msgid "Regexp"
 msgstr "Regkif"
 
-#: src/global.c:777
+#: src/global.c:785
 msgid "Backwards"
 msgstr "Vissza"
 
-#: src/global.c:784
+#: src/global.c:792
 msgid "No Replace"
 msgstr "Nincs csere"
 
-#: src/global.c:792
+#: src/global.c:800
 msgid "Cur Pos"
 msgstr "Pozíció"
 
-#: src/global.c:807
+#: src/global.c:815
 msgid "First Line"
 msgstr "Első sor"
 
-#: src/global.c:809
+#: src/global.c:817
 msgid "Last Line"
 msgstr "Utolsó sor"
 
-#: src/global.c:816
+#: src/global.c:824
 msgid "To Bracket"
 msgstr "Zárójelre"
 
-#: src/global.c:819
+#: src/global.c:827
 msgid "Mark Text"
 msgstr "Kijelöl"
 
-#: src/global.c:822
+#: src/global.c:830
 msgid "Copy Text"
 msgstr "Szöveg másolása"
 
-#: src/global.c:825
+#: src/global.c:833
 msgid "Indent Text"
 msgstr "Szövegbehúzás"
 
-#: src/global.c:827
+#: src/global.c:835
 msgid "Unindent Text"
 msgstr "Szövegbehúzás megsz."
 
-#: src/global.c:830
+#: src/global.c:838
 msgid "Undo"
 msgstr "Vissza"
 
-#: src/global.c:832
+#: src/global.c:840
 msgid "Redo"
 msgstr "Újra"
 
-#: src/global.c:836 src/global.c:842
+#: src/global.c:844 src/global.c:850
 msgid "Back"
 msgstr "Vissza"
 
-#: src/global.c:838 src/global.c:844
+#: src/global.c:846 src/global.c:852
 msgid "Forward"
 msgstr "Előre"
 
-#: src/global.c:849
+#: src/global.c:857
 msgid "Prev Word"
 msgstr "Előző szó"
 
-#: src/global.c:851
+#: src/global.c:859
 msgid "Next Word"
 msgstr "Köv. szó"
 
-#: src/global.c:855
+#: src/global.c:863
 msgid "Home"
 msgstr "Eleje"
 
-#: src/global.c:857
+#: src/global.c:865
 msgid "End"
 msgstr "Vége"
 
-#: src/global.c:866
+#: src/global.c:874
 msgid "Beg of Par"
 msgstr "Bek. kezdete"
 
-#: src/global.c:868
+#: src/global.c:876
 msgid "End of Par"
 msgstr "Bek. vége"
 
-#: src/global.c:873
+#: src/global.c:881
 msgid "Scroll Up"
 msgstr "Görgetés fel"
 
-#: src/global.c:875
+#: src/global.c:883
 msgid "Scroll Down"
 msgstr "Görgetés le"
 
-#: src/global.c:880
+#: src/global.c:888
 msgid "Prev File"
 msgstr "Előző fájl"
 
-#: src/global.c:882
+#: src/global.c:890
 msgid "Next File"
 msgstr "Következő fájl"
 
-#: src/global.c:891
+#: src/global.c:899
 msgid "Verbatim"
 msgstr "Változatlan"
 
-#: src/global.c:894
+#: src/global.c:902
 msgid "Tab"
 msgstr "Tabulátor"
 
-#: src/global.c:896
+#: src/global.c:904
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:899
+#: src/global.c:907
 msgid "Delete"
 msgstr "Törlés"
 
-#: src/global.c:901
+#: src/global.c:909
 msgid "Backspace"
 msgstr "Visszalép"
 
 #. TRANSLATORS: The next two strings refer to cutting words.
-#: src/global.c:912
+#: src/global.c:920
 msgid "Cut Left"
 msgstr "Kivágás balra"
 
-#: src/global.c:914
+#: src/global.c:922
 msgid "Cut Right"
 msgstr "Kivágás jobbra"
 
-#: src/global.c:916
+#: src/global.c:924
 msgid "CutTillEnd"
 msgstr "KivágAVégéig"
 
-#: src/global.c:926
+#: src/global.c:934
 msgid "Word Count"
 msgstr "Szavak száma"
 
-#: src/global.c:933
+#: src/global.c:941
 msgid "Suspend"
 msgstr "Felfüggesztés"
 
-#: src/global.c:937
+#: src/global.c:945
+#, fuzzy
+msgid "Comment Lines"
+msgstr "Köv. sor"
+
+#: src/global.c:949
 msgid "Save"
 msgstr "Mentés"
 
-#: src/global.c:940
+#: src/global.c:952
 msgid "Previous"
 msgstr "Előző"
 
-#: src/global.c:942
+#: src/global.c:954
 msgid "Next"
 msgstr "Következő"
 
-#: src/global.c:948
+#: src/global.c:960
 msgid "PrevHstory"
 msgstr "ElőzőElőzm"
 
-#: src/global.c:951
+#: src/global.c:963
 msgid "NextHstory"
 msgstr "KövElőzm"
 
-#: src/global.c:955
+#: src/global.c:972
 msgid "Go To Text"
 msgstr "Ugrás szövegre"
 
-#: src/global.c:959
+#: src/global.c:976
 msgid "DOS Format"
 msgstr "DOS formátum"
 
-#: src/global.c:961
+#: src/global.c:978
 msgid "Mac Format"
 msgstr "Mac formátum"
 
-#: src/global.c:969
+#: src/global.c:986
 msgid "Append"
 msgstr "Hozzáfűz"
 
-#: src/global.c:971
+#: src/global.c:988
 msgid "Prepend"
 msgstr "Elejére beszúrás"
 
-#: src/global.c:974
+#: src/global.c:991
 msgid "Backup File"
 msgstr "Bizt. fájlmentés"
 
-#: src/global.c:981
+#: src/global.c:998
 msgid "Execute Command"
 msgstr "Parancs végrehajtása"
 
-#: src/global.c:996
+#: src/global.c:1013
 msgid "To Files"
 msgstr "Tallózás"
 
-#: src/global.c:1004
+#: src/global.c:1021
 msgid "First File"
 msgstr "Első fájl"
 
-#: src/global.c:1006
+#: src/global.c:1023
 msgid "Last File"
 msgstr "Utolsó fájl"
 
-#: src/global.c:1010
+#: src/global.c:1027
 msgid "Discard buffer"
 msgstr "Puffer eldobása"
 
+#: src/global.c:1038
+msgid "Left Column"
+msgstr ""
+
+#: src/global.c:1040
+msgid "Right Column"
+msgstr ""
+
 #. TRANSLATORS: Try to keep the next two strings at most 20 characters.
-#: src/global.c:1020
+#: src/global.c:1047
 msgid "Prev Lint Msg"
 msgstr "Előző lint üz."
 
-#: src/global.c:1022
+#: src/global.c:1049
 msgid "Next Lint Msg"
 msgstr "Köv. lint üz."
 
 #. TRANSLATORS: The next seventeen strings are toggle descriptions;
 #. * they are best kept shorter than 40 characters, but may be longer.
-#: src/global.c:1285
+#: src/global.c:1316
 msgid "Help mode"
 msgstr "Súgó mód"
 
-#: src/global.c:1287
+#: src/global.c:1318
 msgid "Constant cursor position display"
 msgstr "Kurzor pozíciójának állandó mutatása"
 
-#: src/global.c:1289
+#: src/global.c:1320
 msgid "Use of one more line for editing"
 msgstr "Eggyel több sor használata a szerkesztéshez"
 
-#: src/global.c:1291
+#: src/global.c:1322
 msgid "Smooth scrolling"
 msgstr "Egyenletes görgetés"
 
-#: src/global.c:1293
+#: src/global.c:1324
 msgid "Soft wrapping of overlong lines"
 msgstr "Hosszú sorok lágy tördelése"
 
-#: src/global.c:1295
+#: src/global.c:1326
 msgid "Whitespace display"
 msgstr "Üreshely karakterek megjelenítése"
 
-#: src/global.c:1297
+#: src/global.c:1328
 msgid "Color syntax highlighting"
 msgstr "Színes szintaxiskiemelés"
 
-#: src/global.c:1299
+#: src/global.c:1330
 msgid "Smart home key"
 msgstr "Intelligens home billentyű"
 
-#: src/global.c:1301
+#: src/global.c:1332
 msgid "Auto indent"
 msgstr "Automatikus igazítás"
 
-#: src/global.c:1303
+#: src/global.c:1334
 msgid "Cut to end"
 msgstr "Kivágás a végéig"
 
-#: src/global.c:1305
+#: src/global.c:1336
 msgid "Hard wrapping of overlong lines"
 msgstr "Hosszú sorok kemény tördelése"
 
-#: src/global.c:1307
+#: src/global.c:1338
 msgid "Conversion of typed tabs to spaces"
 msgstr "Bevitt tabulátorok szóközzé alakítása"
 
-#: src/global.c:1309
+#: src/global.c:1340
 msgid "Backup files"
 msgstr "Fájlok biztonsági mentése"
 
-#: src/global.c:1311
+#: src/global.c:1342
 msgid "Reading file into separate buffer"
 msgstr "Fájl beolvasása külön pufferbe"
 
-#: src/global.c:1313
+#: src/global.c:1344
 msgid "Mouse support"
 msgstr "Egér támogatása"
 
-#: src/global.c:1315
+#: src/global.c:1346
 msgid "No conversion from DOS/Mac format"
 msgstr "Ne legyen átalakítás DOS/Mac formátumból"
 
-#: src/global.c:1317
+#: src/global.c:1348
 msgid "Suspension"
 msgstr "Felfüggesztés"
 
-#: src/help.c:209
+#: src/help.c:211
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1175,7 +1181,7 @@ msgstr ""
 " Az előző keresési kifejezés a keresés után zárójelben meg lesz jelenítve. "
 "Új szöveg beírása nélkül Entert ütve az előző keresés lesz megismételve.  "
 
-#: src/help.c:218
+#: src/help.c:220
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1189,7 +1195,7 @@ msgstr ""
 " Kereső módban a következő funkcióbillentyűk állnak rendelkezésre:\n"
 "\n"
 
-#: src/help.c:224
+#: src/help.c:226
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1209,7 +1215,7 @@ msgstr ""
 " Sorra ugrás módban a következő funkcióbillentyűk állnak rendelkezésre:\n"
 "\n"
 
-#: src/help.c:233
+#: src/help.c:235
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1232,7 +1238,7 @@ msgstr ""
 "külön pufferbe fog betöltődni (melyek között a Meta-< és > gombokkal lehet "
 "navigálni).  "
 
-#: src/help.c:242
+#: src/help.c:244
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1246,7 +1252,7 @@ msgstr ""
 " Fájlbeszúrás módban a következő funkcióbillentyűk állnak rendelkezésre:\n"
 "\n"
 
-#: src/help.c:248
+#: src/help.c:250
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1275,7 +1281,7 @@ msgstr ""
 " Fájlmentés módban a következő funkcióbillentyűk állnak rendelkezésre:\n"
 "\n"
 
-#: src/help.c:262
+#: src/help.c:264
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1300,7 +1306,7 @@ msgstr ""
 " A fájlböngészőben a következő funkcióbillentyűk állnak rendelkezésre:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:277
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1324,7 +1330,7 @@ msgstr ""
 "kerül megismétlésre.\n"
 "\n"
 
-#: src/help.c:284
+#: src/help.c:286
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1332,7 +1338,7 @@ msgstr ""
 " A következő funkcióbillentyűk állnak rendelkezésre keresés módban:\n"
 "\n"
 
-#: src/help.c:288
+#: src/help.c:290
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1355,7 +1361,7 @@ msgstr ""
 "rendelkezésre:\n"
 "\n"
 
-#: src/help.c:301
+#: src/help.c:303
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1380,7 +1386,7 @@ msgstr ""
 "rendelkezésre:\n"
 "\n"
 
-#: src/help.c:316
+#: src/help.c:318
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1401,7 +1407,7 @@ msgstr ""
 " Parancs-végrehajtási módban a következő billentyűk állnak rendelkezésre:\n"
 "\n"
 
-#: src/help.c:329
+#: src/help.c:331
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1421,15 +1427,15 @@ msgstr ""
 "amely az épp szerkesztett fájlt mutatja. Az állapotsor alulról a harmadik "
 "sor, és fontos üzeneteket jelenít meg.  "
 
-#: src/help.c:339
+#: src/help.c:341
+#, fuzzy
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
-" The notation for shortcuts is as follows: Control-key sequences are notated "
-"with a caret (^) symbol and can be entered either by using the Control "
-"(Ctrl) key or pressing the Escape (Esc) key twice.  Escape-key sequences are "
-"notated with the Meta (M-) symbol and can be entered using either the Esc, "
-"Alt, or Meta key depending on your keyboard setup.  "
+" Shortcuts are written as follows: Control-key sequences are notated with a "
+"'^' and can be entered either by using the Ctrl key or pressing the Esc key "
+"twice.  Meta-key sequences are notated with 'M-' and can be entered using "
+"either the Alt, Cmd, or Esc key, depending on your keyboard setup.  "
 msgstr ""
 "Az alsó két sor a szerkesztőben leggyakrabban használt gyorsbillentyűket "
 "tartalmazza.\n"
@@ -1458,19 +1464,19 @@ msgstr ""
 msgid "enable/disable"
 msgstr "be/kikapcsolása"
 
-#: src/nano.c:559
+#: src/nano.c:560
 msgid "Key is invalid in view mode"
 msgstr "A billentyű illegális megjelenítés módban"
 
-#: src/nano.c:565
+#: src/nano.c:566
 msgid "This function is disabled in restricted mode"
 msgstr "Ez a funkció ki van kapcsolva korlátozott módban"
 
-#: src/nano.c:573
+#: src/nano.c:574
 msgid "Help is not available"
 msgstr "A súgó nem érhető el"
 
-#: src/nano.c:684
+#: src/nano.c:686
 #, c-format
 msgid ""
 "\n"
@@ -1479,7 +1485,7 @@ msgstr ""
 "\n"
 "A puffer a(z) %s fájlba írva\n"
 
-#: src/nano.c:686
+#: src/nano.c:688
 #, c-format
 msgid ""
 "\n"
@@ -1488,7 +1494,7 @@ msgstr ""
 "\n"
 "A puffer nem lett a(z) %s fájlba írva: %s\n"
 
-#: src/nano.c:689
+#: src/nano.c:691
 #, c-format
 msgid ""
 "\n"
@@ -1778,17 +1784,22 @@ msgstr "Felfüggesztés engedélyezése"
 msgid "Enable soft line wrapping"
 msgstr "Laza sortördelés engedélyezése"
 
-#: src/nano.c:937
-#, c-format
-msgid " GNU nano, version %s\n"
+#: src/nano.c:940
+#, fuzzy, c-format
+msgid " nano, version %s\n"
 msgstr " GNU nano %s verzió\n"
 
-#: src/nano.c:940
+#: src/nano.c:943
+#, c-format
+msgid " (C) 2014..%s the contributors to nano\n"
+msgstr ""
+
+#: src/nano.c:945
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr " E-mail: nano@nano-editor.org\tWeb: http://www.nano-editor.org"
 
-#: src/nano.c:941
+#: src/nano.c:946
 #, c-format
 msgid ""
 "\n"
@@ -1797,68 +1808,82 @@ msgstr ""
 "\n"
 " Fordítási kapcsolók:"
 
-#: src/nano.c:1073
+#: src/nano.c:1081
 msgid "No file name"
 msgstr "Nincs fájlnév"
 
-#: src/nano.c:1108
-msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
+#: src/nano.c:1115
+msgid "Save modified buffer?  (Answering \"No\" will DISCARD changes.) "
 msgstr ""
-"Menti a változtatásokat („NEM” VÁLASZ ESETÉN MINDEN MÓDOSÍTÁS ELVÉSZ)? "
 
-#: src/nano.c:1168
+#: src/nano.c:1178
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "Az stdin nem nyitható újra a billentyűzetről.\n"
 
-#: src/nano.c:1192
+#: src/nano.c:1202
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "Olvasás stdinről, ^C megszakítja\n"
 
-#: src/nano.c:1256
+#: src/nano.c:1266
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "SIGHUP vagy SIGTERM érkezett\n"
 
-#: src/nano.c:1272
+#: src/nano.c:1282
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Az „fg” kiadásával visszatérhet a nanohoz.\n"
 
-#: src/nano.c:1294
+#: src/nano.c:1304
 msgid "Suspension is not enabled"
 msgstr "A felfüggesztés nem engedélyezett"
 
-#: src/nano.c:1448
+#: src/nano.c:1459
 msgid "enabled"
 msgstr "engedélyezve"
 
-#: src/nano.c:1448
+#: src/nano.c:1459
 msgid "disabled"
 msgstr "kikapcsolva"
 
-#: src/nano.c:1607 src/winio.c:1125
-msgid "Unknown Command"
-msgstr "Ismeretlen parancs"
+#: src/nano.c:1573
+msgid "Unbound key"
+msgstr ""
+
+#: src/nano.c:1577
+#, c-format
+msgid "Unbound key: M-%c"
+msgstr ""
+
+#: src/nano.c:1579
+#, c-format
+msgid "Unbound key: ^%c"
+msgstr ""
+
+#: src/nano.c:1581
+#, c-format
+msgid "Unbound key: %c"
+msgstr ""
 
-#: src/nano.c:1720
+#: src/nano.c:1745
 msgid "XON ignored, mumble mumble"
 msgstr "XON kihagyva, ej-ej"
 
-#: src/nano.c:1725
+#: src/nano.c:1750
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF kihagyva, ej-ej"
 
-#: src/nano.c:2139 src/rcfile.c:1334
+#: src/nano.c:2166 src/rcfile.c:1187
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "A kért „%s” tabméret érvénytelen"
 
-#: src/nano.c:2200 src/rcfile.c:1259
+#: src/nano.c:2227 src/rcfile.c:1128
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "A kért „%s” kitöltésméret érvénytelen"
 
-#: src/nano.c:2247
+#: src/nano.c:2276
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr "Az elérhető kapcsolók megjelenítéséhez adja ki a „%s -h” parancsot.\n"
@@ -1866,116 +1891,120 @@ msgstr "Az elérhető kapcsolók megjelenítéséhez adja ki a „%s -h” paran
 #. TRANSLATORS: For the next three strings, if possible, specify
 #. * the single-byte shortcuts for both your language and English.
 #. * For example, in French: "OoYy" for "Oui".
-#: src/prompt.c:821
+#: src/prompt.c:818
 msgid "Yy"
 msgstr "IiYy"
 
-#: src/prompt.c:822
+#: src/prompt.c:819
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:823
+#: src/prompt.c:820
 msgid "Aa"
 msgstr "MmAa"
 
-#: src/prompt.c:845
+#: src/prompt.c:842
 msgid "Yes"
 msgstr "Igen"
 
-#: src/prompt.c:850
+#: src/prompt.c:847
 msgid "All"
 msgstr "Mindet"
 
-#: src/prompt.c:855
+#: src/prompt.c:852
 msgid "No"
 msgstr "Nem"
 
-#: src/rcfile.c:142
+#: src/rcfile.c:144
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Hiba a(z) %s %lu. sorában: "
 
-#: src/rcfile.c:201
+#: src/rcfile.c:203
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "A(z) „%s” argumentum lezáratlan \" jellel rendelkezik"
 
-#: src/rcfile.c:228 src/rcfile.c:280 src/rcfile.c:732 src/rcfile.c:793
-#: src/rcfile.c:882 src/rcfile.c:933
+#: src/rcfile.c:231 src/rcfile.c:674 src/rcfile.c:725 src/rcfile.c:824
 msgid "Regex strings must begin and end with a \" character"
 msgstr "A reguláris kifejezéseknek \" karakterekkel kezdődniük és végződniük"
 
-#: src/rcfile.c:254 src/search.c:62
+#: src/rcfile.c:257 src/search.c:61
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Hibás regex: „%s”: %s"
 
-#: src/rcfile.c:274
+#: src/rcfile.c:279
 msgid "Missing syntax name"
 msgstr "Hiányzó szintaxisnév"
 
-#: src/rcfile.c:345
+#: src/rcfile.c:288
+msgid "A syntax name must be quoted"
+msgstr ""
+
+#: src/rcfile.c:297
 msgid "The \"none\" syntax is reserved"
 msgstr "A „nincs” szintaxis fenn van tartva"
 
-#: src/rcfile.c:352
-msgid "The \"default\" syntax must take no extensions"
+#: src/rcfile.c:327
+#, fuzzy
+msgid "The \"default\" syntax does not accept extensions"
 msgstr "Az „alapértelmezett” szintaxis nem vehet fel kiterjesztéseket"
 
-#: src/rcfile.c:424
+#: src/rcfile.c:369
 msgid "Missing key name"
 msgstr "Hiányzó billentyűnév"
 
-#: src/rcfile.c:433 src/rcfile.c:444
+#: src/rcfile.c:378 src/rcfile.c:389
 msgid "Key name is too short"
 msgstr "A billentyűnév túl rövid"
 
-#: src/rcfile.c:454
+#: src/rcfile.c:399
 msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr "A billentyűnévnek a „^”, „M”, vagy „F” egyikével kell kezdődnie"
 
-#: src/rcfile.c:457
-#, fuzzy, c-format
+#: src/rcfile.c:402
+#, c-format
 msgid "Key name %s is invalid"
-msgstr "A kért „%s” tabméret érvénytelen"
+msgstr "%s kulcsnév érvénytelen"
 
-#: src/rcfile.c:466
+#: src/rcfile.c:411
 msgid "Must specify a function to bind the key to"
 msgstr "Meg kell adnia egy funkciót, amelyhez billentyűt kíván társítani"
 
 #. TRANSLATORS: Do not translate the word "all".
-#: src/rcfile.c:476
+#: src/rcfile.c:421
 msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
 "Meg kell adni egy menüt (vagy „all”-t) a billentyű társításához / a társítás "
 "megszüntetéséhez"
 
-#: src/rcfile.c:483
+#: src/rcfile.c:428
 #, c-format
 msgid "Cannot map name \"%s\" to a function"
 msgstr "A név („%s”) nem képezhető le funkcióra"
 
-#: src/rcfile.c:490
+#: src/rcfile.c:435
 #, c-format
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "A név („%s”) nem képezhető le menüre"
 
-#: src/rcfile.c:522
+#: src/rcfile.c:467
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr "„%s” funkció nem létezik ebben a menüben: „%s”"
 
-#: src/rcfile.c:534
+#: src/rcfile.c:479
 #, c-format
 msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "A billentyűleütés („%s”) nem társítható újra"
 
-#: src/rcfile.c:631
+#: src/rcfile.c:576
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr "Hiba %s kibontásakor: %s"
 
-#: src/rcfile.c:674
+#: src/rcfile.c:616
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1989,63 +2018,52 @@ msgstr ""
 "„white”, „yellow”, „cyan”, „magenta” és \n"
 "„black”, opcionális „bright” előtaggal az előtérszínekhez."
 
-#: src/rcfile.c:696
-msgid "Cannot add a color command without a syntax command"
-msgstr "Nem adható meg színparancs szintaxissor nélkül"
+#: src/rcfile.c:637 src/rcfile.c:795 src/rcfile.c:858
+#, c-format
+msgid "A '%s' command requires a preceding 'syntax' command"
+msgstr ""
 
-#: src/rcfile.c:701
+#: src/rcfile.c:643
 msgid "Missing color name"
 msgstr "Hiányzik a szín neve"
 
-#: src/rcfile.c:711 src/rcfile.c:872
-msgid "Missing regex string"
-msgstr "Hiányzó regex karaktersorozat"
+#: src/rcfile.c:653 src/rcfile.c:807
+#, fuzzy, c-format
+msgid "Missing regex string after '%s' command"
+msgstr "Hiányzó linter parancs"
 
-#: src/rcfile.c:787
+#: src/rcfile.c:719
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "„start=” -hoz kell egy megfelelő „end=”"
 
-#: src/rcfile.c:839
+#: src/rcfile.c:768
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
 msgstr "A(z) „%s” háttérszín nem lehet világos"
 
-#: src/rcfile.c:867
-msgid "Cannot add a header regex without a syntax command"
-msgstr "Nem adható meg fejléc regex szintaxisparancs nélkül"
-
-#: src/rcfile.c:922
-msgid "Cannot add a magic string regex without a syntax command"
-msgstr "Nem adható meg bűvös karakterlánc regex szintaxisparancs nélkül"
-
-#: src/rcfile.c:927
-msgid "Missing magic string name"
-msgstr "Hiányzó bűvös karakterlánc név"
-
-#: src/rcfile.c:985
-msgid "Cannot add a linter without a syntax command"
-msgstr "Nem adható meg linter szintaxisparancs nélkül"
+#: src/rcfile.c:802
+#, fuzzy, c-format
+msgid "The \"default\" syntax does not accept '%s' regexes"
+msgstr "Az „alapértelmezett” szintaxis nem vehet fel kiterjesztéseket"
 
-#: src/rcfile.c:990
-msgid "Missing linter command"
+#: src/rcfile.c:863
+#, fuzzy, c-format
+msgid "Missing command after '%s'"
 msgstr "Hiányzó linter parancs"
 
-#: src/rcfile.c:1011
-msgid "Cannot add formatter without a syntax command"
-msgstr "Nem adható meg formázó szintaxisparancs nélkül"
-
-#: src/rcfile.c:1016
-msgid "Missing formatter command"
-msgstr "Hiányzó formázó parancs"
+#: src/rcfile.c:879
+#, fuzzy, c-format
+msgid "Argument of '%s' lacks closing \""
+msgstr "A(z) „%s” argumentum lezáratlan \" jellel rendelkezik"
 
-#: src/rcfile.c:1046
+#: src/rcfile.c:910
 #, c-format
 msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr ""
 "Végzetes hiba: nincsenek billentyűk leképezve a függvényhez („%s”). "
 "Kilépés.\n"
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:912
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
@@ -2053,62 +2071,62 @@ msgstr ""
 "Használja a nanot a -I kapcsolóval, ha módosítani kívánja a nanorc "
 "beállításait.\n"
 
-#: src/rcfile.c:1109
+#: src/rcfile.c:971
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "A kiterjesztendő szintaxis („%s”) nem található"
 
-#: src/rcfile.c:1125 src/rcfile.c:1134 src/rcfile.c:1144
-#, c-format
-msgid "Command \"%s\" not allowed in included file"
-msgstr "A(z) „%s” parancs nem engedélyezett a tartalmazott fájlban"
-
-#: src/rcfile.c:1150 src/rcfile.c:1359
+#: src/rcfile.c:993 src/rcfile.c:1202
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "A(z) „%s” szintaxis nem rendelkezik színparancsokkal"
 
-#: src/rcfile.c:1180
+#: src/rcfile.c:1024
+#, c-format
+msgid "Command \"%s\" not allowed in included file"
+msgstr "A(z) „%s” parancs nem engedélyezett a tartalmazott fájlban"
+
+#: src/rcfile.c:1039
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "A(z) „%s” parancs nem értelmezhető"
 
-#: src/rcfile.c:1195
+#: src/rcfile.c:1051
 msgid "Missing option"
 msgstr "Hiányzó kapcsoló"
 
-#: src/rcfile.c:1217
+#: src/rcfile.c:1065
+#, c-format
+msgid "Unknown option \"%s\""
+msgstr "Ismeretlen „%s” opció"
+
+#: src/rcfile.c:1077
+#, c-format
+msgid "Cannot unset option \"%s\""
+msgstr "A(z) „%s” beállítás nem törölhető"
+
+#: src/rcfile.c:1089
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "A(z) „%s” kapcsoló egy paramétert igényel"
 
-#: src/rcfile.c:1235
+#: src/rcfile.c:1105
 msgid "Option is not a valid multibyte string"
 msgstr "A kapcsoló nem érvényes több bájtos karaktersorozat"
 
-#: src/rcfile.c:1272 src/rcfile.c:1300 src/rcfile.c:1309
+#: src/rcfile.c:1139 src/rcfile.c:1160 src/rcfile.c:1167
 msgid "Non-blank characters required"
 msgstr "Nem üres karakterek szükségesek"
 
-#: src/rcfile.c:1282
+#: src/rcfile.c:1146
 msgid "Two single-column characters required"
 msgstr "Két egyoszlopos karakter szükséges"
 
-#: src/rcfile.c:1348
-#, c-format
-msgid "Cannot unset option \"%s\""
-msgstr "A(z) „%s” beállítás nem törölhető"
-
-#: src/rcfile.c:1354
-#, c-format
-msgid "Unknown option \"%s\""
-msgstr "Ismeretlen „%s” opció"
-
-#: src/rcfile.c:1413
+#: src/rcfile.c:1258
 msgid "I can't find my home directory!  Wah!"
 msgstr "Nincs meg a saját könyvtár! Hopp!"
 
-#: src/rcfile.c:1451
+#: src/rcfile.c:1295
 #, c-format
 msgid ""
 "\n"
@@ -2117,44 +2135,49 @@ msgstr ""
 "\n"
 "A nano indításának folytatásához nyomja le az Enter billentyűt.\n"
 
-#: src/search.c:96
+#: src/search.c:95
 #, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "A(z) „%.*s%s” nem található"
 
 #. TRANSLATORS: The next three strings are modifiers of the search prompt.
-#: src/search.c:176
+#: src/search.c:169
 msgid " [Case Sensitive]"
 msgstr " [kis/Nagy]"
 
-#: src/search.c:180
+#: src/search.c:173
 msgid " [Regexp]"
 msgstr " [Regexp]"
 
-#: src/search.c:184
+#: src/search.c:177
 msgid " [Backwards]"
 msgstr " [Vissza]"
 
 #. TRANSLATORS: The next two strings are modifiers of the search prompt.
-#: src/search.c:189
+#: src/search.c:182
 msgid " (to replace) in selection"
 msgstr " (cseréhez) a kijelölésben"
 
-#: src/search.c:191
+#: src/search.c:184
 msgid " (to replace)"
 msgstr " (cseréhez)"
 
+#: src/search.c:305
+#, fuzzy
+msgid "Searching..."
+msgstr "Keresés"
+
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:718
+#: src/search.c:693
 msgid "Replace this instance?"
 msgstr "Lecseréli ezt a találatot?"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:883
+#: src/search.c:840
 msgid "Replace with"
 msgstr "Csere ezzel"
 
-#: src/search.c:924
+#: src/search.c:875
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
@@ -2162,294 +2185,393 @@ msgstr[0] "%lu előfordulás cserélve"
 msgstr[1] "%lu előfordulás cserélve"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:964
+#: src/search.c:914
 msgid "Enter line number, column number"
 msgstr "Kérem a sor, oszlop számát"
 
-#: src/search.c:991
+#: src/search.c:939
 msgid "Invalid line or column number"
 msgstr "Érvénytelen sor- vagy oszlopszám"
 
-#: src/search.c:1124
+#: src/search.c:1080
 msgid "Not a bracket"
 msgstr "Nem zárójel"
 
-#: src/search.c:1191
+#: src/search.c:1146
 msgid "No matching bracket"
 msgstr "Nincs illeszkedő zárójel"
 
-#: src/text.c:54
+#: src/text.c:53
 msgid "Mark Set"
 msgstr "Kijelölés kezdete"
 
-#: src/text.c:58
+#: src/text.c:57
 msgid "Mark Unset"
 msgstr "Kijelölés vége"
 
-#: src/text.c:70
+#: src/text.c:69
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Hiba a(z) „%s” meghívásakor"
 
-#: src/text.c:475
+#: src/text.c:468
+msgid "Commenting is not supported for this file type"
+msgstr ""
+
+#: src/text.c:484
+msgid "Cannot comment past end of file"
+msgstr ""
+
+#: src/text.c:677
 msgid "Nothing in undo buffer!"
 msgstr "A visszavonási puffer üres!"
 
-#: src/text.c:481 src/text.c:634
-#, c-format
-msgid "Internal error: can't match line %d.  Please save your work."
-msgstr "Belső hiba: a(z) %d. sor nem illeszthető. Mentse a munkáját."
-
 #. TRANSLATORS: Eight of the next nine strings describe actions
 #. * that are undone or redone.  It are all nouns, not verbs.
-#: src/text.c:495 src/text.c:524 src/text.c:645 src/text.c:686
+#: src/text.c:695 src/text.c:724 src/text.c:857 src/text.c:898
 msgid "text add"
 msgstr "szöveg hozzáadása"
 
-#: src/text.c:505 src/text.c:656
+#: src/text.c:705 src/text.c:868
 msgid "text delete"
 msgstr "szöveg törlése"
 
-#: src/text.c:528 src/text.c:694
+#: src/text.c:728 src/text.c:907
 msgid "line join"
 msgstr "sorok egyesítése"
 
-#: src/text.c:547 src/text.c:710
+#: src/text.c:747 src/text.c:923
 msgid "text cut"
 msgstr "szöveg kivágása"
 
-#: src/text.c:552 src/text.c:714
+#: src/text.c:752 src/text.c:927
 msgid "text uncut"
 msgstr "kivágás visszavonása"
 
-#: src/text.c:558 src/text.c:691
+#: src/text.c:758 src/text.c:903
 msgid "Internal error: line is missing.  Please save your work."
 msgstr "Belső hiba: a sor hiányzik. Mentse a munkáját."
 
-#: src/text.c:561 src/text.c:665
+#: src/text.c:762 src/text.c:877
 msgid "line break"
 msgstr "sortörés"
 
-#: src/text.c:569 src/text.c:725
+#: src/text.c:772 src/text.c:947
+msgid "comment"
+msgstr ""
+
+#: src/text.c:776 src/text.c:951
+msgid "uncomment"
+msgstr ""
+
+#: src/text.c:780 src/text.c:938
 msgid "text insert"
 msgstr "szöveg beszúrása"
 
-#: src/text.c:589 src/text.c:718
+#: src/text.c:800 src/text.c:931
 msgid "text replace"
 msgstr "szöveg cseréje"
 
-#: src/text.c:596 src/text.c:732 src/text.c:1030 src/text.c:1174
+#: src/text.c:807 src/text.c:955 src/text.c:1267 src/text.c:1437
 msgid "Internal error: unknown type.  Please save your work."
 msgstr "Belső hiba: ismeretlen típus. Mentse a munkáját."
 
-#: src/text.c:601
+#: src/text.c:813
 #, c-format
 msgid "Undid action (%s)"
 msgstr "Művelet visszavonva (%s)"
 
-#: src/text.c:619
+#: src/text.c:832
 msgid "Nothing to re-do!"
 msgstr "Nincs mit ismételni."
 
-#: src/text.c:628
+#: src/text.c:841
 msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
 "Belső hiba: az ismételt végrehajtás nem állítható be. Mentse a munkáját."
 
-#: src/text.c:737
+#: src/text.c:961
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Művelet megismételve (%s)"
 
-#: src/text.c:827 src/text.c:2508 src/text.c:2944
+#: src/text.c:1051 src/text.c:2765 src/text.c:3198
 msgid "Could not create pipe"
 msgstr "Nem hozható létre a cső"
 
-#: src/text.c:853 src/text.c:2595 src/text.c:2750 src/text.c:2992
-#: src/text.c:3286
+#: src/text.c:1077 src/text.c:2852 src/text.c:3005 src/text.c:3246
+#: src/text.c:3540
 msgid "Could not fork"
 msgstr "Nem forkolható"
 
-#: src/text.c:1853
+#: src/text.c:2117
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Hibás idézetszöveg: %s: %s"
 
-#: src/text.c:2241
+#: src/text.c:2499
 msgid "Can now UnJustify!"
 msgstr "Most már lehet nem sorkizárttá tenni!"
 
-#: src/text.c:2435
+#: src/text.c:2697
 msgid "Edit a replacement"
 msgstr "A helyettesítő érték módosítása"
 
-#: src/text.c:2510
+#. TRANSLATORS: Shown after fixing misspellings in one word.
+#: src/text.c:2713
+#, fuzzy
+msgid "Next word..."
+msgstr "Köv. szó"
+
+#: src/text.c:2767
 msgid "Creating misspelled word list, please wait..."
 msgstr "Elgépelt szavak listájának létrehozása, kis türelmet..."
 
-#: src/text.c:2601 src/text.c:2999
+#: src/text.c:2858 src/text.c:3253
 msgid "Could not get size of pipe buffer"
 msgstr "Nem kérhető le a csőpuffer mérete"
 
-#: src/text.c:2652
+#: src/text.c:2907
 msgid "Error invoking \"spell\""
 msgstr "Hiba a „spell” meghívásakor"
 
-#: src/text.c:2655
+#: src/text.c:2910
 msgid "Error invoking \"sort -f\""
 msgstr "Hiba a „sort -f” meghívásakor"
 
-#: src/text.c:2658
+#: src/text.c:2913
 msgid "Error invoking \"uniq\""
 msgstr "Hiba a „uniq” meghívásakor"
 
-#: src/text.c:2881
+#: src/text.c:3135
 msgid "Invoking spell checker, please wait"
 msgstr "A helyesírás-ellenőrző indítása, kis türelmet"
 
-#: src/text.c:2897
+#: src/text.c:3151
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "A helyesírás-ellenőrzés meghiúsult: %s"
 
-#: src/text.c:2899
+#: src/text.c:3153
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "A helyesírás-ellenőrzés meghiúsult: %s: %s"
 
-#: src/text.c:2902
+#: src/text.c:3156
 msgid "Finished checking spelling"
 msgstr "A helyesírás-ellenőrzés befejeződött"
 
-#: src/text.c:2927
+#: src/text.c:3181
 msgid "No linter defined for this type of file!"
 msgstr "Nincs megadva linter ehhez a fájltípushoz!"
 
-#: src/text.c:2932
+#: src/text.c:3186
 msgid "Save modified buffer before linting?"
 msgstr "Menti a módosított puffert a linter használata előtt?"
 
-#: src/text.c:2949
+#: src/text.c:3203
 msgid "Invoking linter, please wait"
 msgstr "A linter indítása, kis türelmet"
 
-#: src/text.c:3105
+#: src/text.c:3358
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr "0 feldolgozható sor érkezett a parancstól: %s"
 
-#: src/text.c:3134
+#: src/text.c:3388
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
 "Ez az üzenet a meg nem nyitott %s fájlhoz tartozik, megnyitja új pufferben?"
 
-#: src/text.c:3153
+#: src/text.c:3407
 msgid "No more errors in unopened files, cancelling"
 msgstr "Nincs több hiba a meg nem nyitott fájlokban, megszakítás"
 
-#: src/text.c:3192
+#: src/text.c:3446
 msgid "At last message"
 msgstr "Utolsó üzenetnél"
 
-#: src/text.c:3197
+#: src/text.c:3451
 msgid "At first message"
 msgstr "Első üzenetnél"
 
-#: src/text.c:3237
+#: src/text.c:3491
 msgid "Finished"
 msgstr "Befejeződött"
 
-#: src/text.c:3259
+#: src/text.c:3513
 msgid "Invoking formatter, please wait"
 msgstr "Formázó meghívása, kis türelmet"
 
-#: src/text.c:3314
+#: src/text.c:3568
 msgid "Finished formatting"
 msgstr "Formázás befejezve"
 
-#: src/text.c:3396
+#: src/text.c:3650
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sSzavak: %lu  Sorok: %ld  Karakterek: %lu"
 
-#: src/text.c:3397
+#: src/text.c:3651
 msgid "In Selection:  "
 msgstr "A kiválasztásban:  "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3411
+#: src/text.c:3665
 msgid "Verbatim Input"
 msgstr "Szó szerinti bevitel"
 
-#: src/utils.c:391 src/utils.c:403
+#: src/utils.c:392 src/utils.c:404
 msgid "nano is out of memory!"
 msgstr "nano: elfogyott a memória!"
 
+#: src/utils.c:625
+#, c-format
+msgid "Internal error: can't match line %d.  Please save your work."
+msgstr "Belső hiba: a(z) %d. sor nem illeszthető. Mentse a munkáját."
+
+#. TRANSLATORS: This refers to a sequence of escape codes
+#. * (from the keyboard) that nano does not know about.
+#: src/winio.c:1121
+msgid "Unknown sequence"
+msgstr ""
+
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
 #: src/winio.c:1427
 msgid "Unicode Input"
 msgstr "Unicode bevitel"
 
-#: src/winio.c:1991 src/winio.c:1995
-msgid "Modified"
-msgstr "Módosítva"
-
-#: src/winio.c:1992
-msgid "View"
-msgstr "Nézet"
-
-#: src/winio.c:2006
+#: src/winio.c:1960
 msgid "DIR:"
 msgstr "Könyvtár:"
 
-#: src/winio.c:2013
+#: src/winio.c:1968
 msgid "File:"
 msgstr "Fájl:"
 
-#: src/winio.c:3141
+#: src/winio.c:1972 src/winio.c:1976
+msgid "Modified"
+msgstr "Módosítva"
+
+#: src/winio.c:1974
+msgid "View"
+msgstr "Nézet"
+
+#: src/winio.c:3105
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "sor %ld/%ld (%d%%), oszlop %lu/%lu (%d%%), karakter %lu/%lu (%d%%)"
 
-#: src/winio.c:3271
+#: src/winio.c:3235
 msgid "The nano text editor"
 msgstr "A nano szövegszerkesztő"
 
-#: src/winio.c:3272
+#: src/winio.c:3236
 msgid "version"
 msgstr "verzió"
 
-#: src/winio.c:3273
+#: src/winio.c:3237
 msgid "Brought to you by:"
 msgstr "Fejlesztők:"
 
-#: src/winio.c:3274
+#: src/winio.c:3238
 msgid "Special thanks to:"
 msgstr "Külön köszönet:"
 
-#: src/winio.c:3275
+#: src/winio.c:3239
 msgid "The Free Software Foundation"
 msgstr "A Free Software Foundation"
 
-#: src/winio.c:3276
+#: src/winio.c:3240
 msgid "the many translators and the TP"
 msgstr "számos fordító és a TP"
 
-#: src/winio.c:3277
+#: src/winio.c:3241
 msgid "For ncurses:"
 msgstr "Az ncurses számára:"
 
-#: src/winio.c:3278
+#: src/winio.c:3242
 msgid "and anyone else we forgot..."
 msgstr "és mindenkinek, akit kifelejtettünk volna..."
 
-#: src/winio.c:3279
+#: src/winio.c:3243
 msgid "Thank you for using nano!"
 msgstr "Köszönjük, hogy a nano-t választotta!"
 
+#~ msgid ""
+#~ "Read %lu line (Converted from DOS and Mac format - Warning: No write "
+#~ "permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from DOS and Mac format - Warning: No write "
+#~ "permission)"
+#~ msgstr[0] ""
+#~ "%lu sor beolvasva (DOS és Mac formátumról átalakítva - Figyelmeztetés: "
+#~ "nincs írásjog)"
+#~ msgstr[1] ""
+#~ "%lu sor beolvasva (DOS és Mac formátumról átalakítva - Figyelmeztetés: "
+#~ "nincs írásjog)"
+
+#~ msgid ""
+#~ "Read %lu line (Converted from Mac format - Warning: No write permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from Mac format - Warning: No write permission)"
+#~ msgstr[0] ""
+#~ "%lu sor beolvasva (Mac formátumról átalakítva - Figyelmeztetés: nincs "
+#~ "írásjog)"
+#~ msgstr[1] ""
+#~ "%lu sor beolvasva (Mac formátumról átalakítva - Figyelmeztetés: nincs "
+#~ "írásjog)"
+
+#~ msgid ""
+#~ "Read %lu line (Converted from DOS format - Warning: No write permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from DOS format - Warning: No write permission)"
+#~ msgstr[0] ""
+#~ "%lu sor beolvasva (DOS formátumról átalakítva - Figyelmeztetés: nincs "
+#~ "írásjog)"
+#~ msgstr[1] ""
+#~ "%lu sor beolvasva (DOS formátumról átalakítva - Figyelmeztetés: nincs "
+#~ "írásjog)"
+
+#~ msgid "Read %lu line (Warning: No write permission)"
+#~ msgid_plural "Read %lu lines (Warning: No write permission)"
+#~ msgstr[0] "%lu sor beolvasva (Figyelmeztetés: nincs írásjog)"
+#~ msgstr[1] "%lu sor beolvasva (Figyelmeztetés: nincs írásjog)"
+
+#~ msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
+#~ msgstr ""
+#~ "Menti a változtatásokat („NEM” VÁLASZ ESETÉN MINDEN MÓDOSÍTÁS ELVÉSZ)? "
+
+#~ msgid "Unknown Command"
+#~ msgstr "Ismeretlen parancs"
+
+#~ msgid "Cannot add a color command without a syntax command"
+#~ msgstr "Nem adható meg színparancs szintaxissor nélkül"
+
+#~ msgid "Missing regex string"
+#~ msgstr "Hiányzó regex karaktersorozat"
+
+#~ msgid "Cannot add a header regex without a syntax command"
+#~ msgstr "Nem adható meg fejléc regex szintaxisparancs nélkül"
+
+#~ msgid "Cannot add a magic string regex without a syntax command"
+#~ msgstr "Nem adható meg bűvös karakterlánc regex szintaxisparancs nélkül"
+
+#~ msgid "Missing magic string name"
+#~ msgstr "Hiányzó bűvös karakterlánc név"
+
+#~ msgid "Cannot add a linter without a syntax command"
+#~ msgstr "Nem adható meg linter szintaxisparancs nélkül"
+
+#~ msgid "Cannot add formatter without a syntax command"
+#~ msgstr "Nem adható meg formázó szintaxisparancs nélkül"
+
+#~ msgid "Missing formatter command"
+#~ msgstr "Hiányzó formázó parancs"
+
 #~ msgid "Cannot prepend or append to a symlink with --nofollow set"
 #~ msgstr ""
 #~ "Nem lehet szimbolikus link elé vagy mögé szúrni, ha a --nofollow be van "
diff --git a/po/id.po b/po/id.po
index 652f69b9..bf4ecc61 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 1.2.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-25 16:41-0500\n"
+"POT-Creation-Date: 2016-06-17 15:41+0200\n"
 "PO-Revision-Date: 2003-04-23 09:41+0000\n"
 "Last-Translator: Tedi Heriyanto <tedi_h@gmx.net>\n"
 "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
@@ -17,384 +17,370 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: KBabel 0.9.6\n"
 
+#: src/browser.c:144 src/browser.c:284 src/browser.c:334 src/files.c:996
+#: src/files.c:1003 src/files.c:1794 src/files.c:1919 src/files.c:1963
+#: src/files.c:1983 src/files.c:2099 src/files.c:3019 src/files.c:3242
+#: src/rcfile.c:540 src/rcfile.c:1280
+#, fuzzy, c-format
+msgid "Error reading %s: %s"
+msgstr "Quote string buruk %s: %s"
+
 #. TRANSLATORS: This is a prompt.
-#: src/browser.c:220
+#: src/browser.c:247
 #, fuzzy
 msgid "Go To Directory"
 msgstr "Ke Direktori"
 
-#: src/browser.c:227 src/browser.c:738 src/files.c:1174 src/files.c:2340
-#: src/nano.c:1120 src/search.c:202 src/search.c:290 src/search.c:895
-#: src/search.c:970 src/text.c:2935 src/text.c:3142
+#: src/browser.c:254 src/browser.c:723 src/files.c:1126 src/files.c:2292
+#: src/nano.c:1128 src/search.c:195 src/search.c:297 src/search.c:851
+#: src/search.c:918 src/text.c:3189 src/text.c:3396
 msgid "Cancelled"
 msgstr "Dibatalkan"
 
-#: src/browser.c:253 src/browser.c:300
-#, c-format
-msgid "Can't go outside of %s in restricted mode"
-msgstr "Tidak dapat keluar %s dalam mode terbatas"
-
-#: src/browser.c:264 src/browser.c:310 src/browser.c:326 src/files.c:1044
-#: src/files.c:1052 src/files.c:1844 src/files.c:1971 src/files.c:2016
-#: src/files.c:2037 src/files.c:2156 src/files.c:3062 src/files.c:3285
-#: src/rcfile.c:596 src/rcfile.c:1435
+#. TRANSLATORS: This refers to the option --operatingdir,
+#. * not to --restricted.
+#: src/browser.c:274 src/browser.c:326
 #, fuzzy, c-format
-msgid "Error reading %s: %s"
-msgstr "Quote string buruk %s: %s"
+msgid "Can't go outside of %s in confined mode"
+msgstr "Tidak dapat keluar %s dalam mode terbatas"
 
-#: src/browser.c:290
+#: src/browser.c:317
 msgid "Can't move up a directory"
 msgstr "Tidak dapat memindahkan direktori"
 
 #. TRANSLATORS: Try to keep this at most 7 characters.
-#: src/browser.c:615 src/browser.c:623
+#: src/browser.c:590 src/browser.c:598
 msgid "(dir)"
 msgstr ""
 
 #. TRANSLATORS: Try to keep this at most 12 characters.
-#: src/browser.c:620
+#: src/browser.c:595
 msgid "(parent dir)"
 msgstr ""
 
 #. TRANSLATORS: Try to keep this at most 7 characters.
 #. * If necessary, you can leave out the parentheses.
-#: src/browser.c:650
+#: src/browser.c:625
 msgid "(huge)"
 msgstr ""
 
 #. TRANSLATORS: This is the main search prompt.
-#: src/browser.c:727 src/search.c:173
+#: src/browser.c:712 src/search.c:166
 msgid "Search"
 msgstr "Cari"
 
-#: src/browser.c:777 src/search.c:466 src/search.c:536
-msgid "This is the only occurrence"
-msgstr "Hanya ini adanya"
-
-#: src/browser.c:793 src/search.c:364
+#: src/browser.c:754 src/search.c:368
 msgid "Search Wrapped"
 msgstr "Pancarian Di-wrapped"
 
-#: src/browser.c:843 src/search.c:517
+#: src/browser.c:764 src/search.c:509
+msgid "This is the only occurrence"
+msgstr "Hanya ini adanya"
+
+#: src/browser.c:812 src/search.c:473
 msgid "No current search pattern"
 msgstr ""
 
-#: src/files.c:50
+#: src/color.c:186
+#, fuzzy, c-format
+msgid "Unknown syntax name: %s"
+msgstr "Nama sintaks tidak ada"
+
+#: src/color.c:247
+#, c-format
+msgid "magic_load() failed: %s"
+msgstr ""
+
+#: src/color.c:251
+#, c-format
+msgid "magic_file(%s) failed: %s"
+msgstr ""
+
+#: src/files.c:47
 #, c-format
 msgid "Directory '%s' does not exist"
 msgstr ""
 
-#: src/files.c:52
+#: src/files.c:49
 #, c-format
 msgid "Path '%s': %s"
 msgstr ""
 
-#: src/files.c:54
+#: src/files.c:51
 #, fuzzy, c-format
 msgid "Path '%s' is not a directory"
 msgstr "\"%s\" adalah sebuah direktori"
 
-#: src/files.c:57
+#: src/files.c:53
 #, c-format
 msgid "Path '%s' is not accessible"
 msgstr ""
 
-#. TRANSLATORS: Try to keep this at most 76 characters.
-#: src/files.c:158
+#. TRANSLATORS: Keep the next ten messages at most 76 characters.
+#: src/files.c:148
 msgid ""
 "Warning: Modifying a file which is not locked, check directory permission?"
 msgstr ""
 
-#: src/files.c:197
+#: src/files.c:187
 msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
 msgstr ""
 
-#: src/files.c:206
+#: src/files.c:196
 #, fuzzy, c-format
 msgid "Couldn't determine hostname for lock file: %s"
 msgstr "Tidak dapat menset permisi %o pada %s: %s"
 
-#: src/files.c:227 src/files.c:238 src/files.c:275 src/files.c:285
+#: src/files.c:216 src/files.c:225 src/files.c:262 src/files.c:272
 #, fuzzy, c-format
 msgid "Error writing lock file %s: %s"
 msgstr "Kesalahan dalam %s pada baris %d: "
 
-#: src/files.c:305
+#: src/files.c:291
 #, fuzzy, c-format
 msgid "Error deleting lock file %s: %s"
 msgstr "Kesalahan dalam %s pada baris %d: "
 
-#: src/files.c:341
+#: src/files.c:325
 #, fuzzy, c-format
 msgid "Error opening lock file %s: %s"
 msgstr "Kesalahan dalam %s pada baris %d: "
 
-#: src/files.c:353
+#: src/files.c:337
 #, c-format
 msgid "Error reading lock file %s: Not enough data read"
 msgstr ""
 
 #. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
-#: src/files.c:371
+#: src/files.c:354
 #, c-format
 msgid "File %s is being edited (by %s with %s, PID %d); continue?"
 msgstr ""
 
-#: src/files.c:426
+#: src/files.c:430
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Tidak dapat menyisipkan file dari luar %s"
 
-#: src/files.c:439 src/files.c:1038 src/rcfile.c:589 src/rcfile.c:1385
-#: src/rcfile.c:1426
+#: src/files.c:445 src/files.c:991 src/rcfile.c:533 src/rcfile.c:1230
+#: src/rcfile.c:1271
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" adalah sebuah direktori"
 
-#: src/files.c:441
+#: src/files.c:447
 #, c-format
 msgid "\"%s\" is not a normal file"
 msgstr ""
 
-#: src/files.c:566
+#: src/files.c:571
 #, fuzzy
 msgid "No more open file buffers"
 msgstr "Tidak ada file yang terbuka lagi"
 
-#: src/files.c:582
+#: src/files.c:586
 #, c-format
 msgid "Switched to %s"
 msgstr "Beralih ke %s"
 
-#: src/files.c:584 src/global.c:988 src/winio.c:2010
+#: src/files.c:588 src/global.c:1005 src/winio.c:1965
 msgid "New Buffer"
 msgstr "Buffer baru"
 
-#: src/files.c:943
+#. TRANSLATORS: Keep the next four messages at most 76 characters.
+#: src/files.c:913
 #, fuzzy, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
 msgstr[0] "Baca %d baris (Dikonversi dari format Mac)"
 
-#: src/files.c:948
-#, fuzzy, c-format
-msgid ""
-"Read %lu line (Converted from DOS and Mac format - Warning: No write "
-"permission)"
-msgid_plural ""
-"Read %lu lines (Converted from DOS and Mac format - Warning: No write "
-"permission)"
-msgstr[0] "Baca %d baris (Dikonversi dari format Mac)"
-
-#: src/files.c:954
+#: src/files.c:919
 #, fuzzy, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
 msgstr[0] "Baca %d baris (Dikonversi dari format Mac)"
 
-#: src/files.c:958
-#, fuzzy, c-format
-msgid ""
-"Read %lu line (Converted from Mac format - Warning: No write permission)"
-msgid_plural ""
-"Read %lu lines (Converted from Mac format - Warning: No write permission)"
-msgstr[0] "Baca %d baris (Dikonversi dari format Mac)"
-
-#: src/files.c:964
+#: src/files.c:925
 #, fuzzy, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
 msgstr[0] "Membaca %d baris (Konversi dari format DOS)"
 
-#: src/files.c:968
-#, fuzzy, c-format
-msgid ""
-"Read %lu line (Converted from DOS format - Warning: No write permission)"
-msgid_plural ""
-"Read %lu lines (Converted from DOS format - Warning: No write permission)"
-msgstr[0] "Membaca %d baris (Konversi dari format DOS)"
-
-#: src/files.c:974
+#: src/files.c:930
 #, fuzzy, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "Membaca %d baris"
 
-#: src/files.c:977
-#, c-format
-msgid "Read %lu line (Warning: No write permission)"
-msgid_plural "Read %lu lines (Warning: No write permission)"
-msgstr[0] ""
-
-#: src/files.c:1019 src/files.c:1056
+#: src/files.c:974 src/files.c:1006
 msgid "Reading File"
 msgstr "Membaca File"
 
-#: src/files.c:1025
+#: src/files.c:980
 msgid "New File"
 msgstr "File Baru"
 
-#: src/files.c:1028
-#, c-format
-msgid "\"%s\" not found"
+#: src/files.c:983
+#, fuzzy, c-format
+msgid "File \"%s\" not found"
 msgstr "\"%s\" tidak ditemukan"
 
-#: src/files.c:1039 src/rcfile.c:590 src/rcfile.c:1386 src/rcfile.c:1427
+#: src/files.c:992 src/rcfile.c:534 src/rcfile.c:1231 src/rcfile.c:1272
 #, fuzzy, c-format
 msgid "\"%s\" is a device file"
 msgstr "File \"%s\" adalah sebuah file device"
 
-#: src/files.c:1133
+#: src/files.c:1083
 #, fuzzy, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "File yang akan disisipkan ke buffer baru [dari %s] "
 
-#: src/files.c:1135
+#: src/files.c:1085
 #, fuzzy, c-format
 msgid "Command to execute [from %s] "
 msgstr "Perintah untuk dieksekusi "
 
-#: src/files.c:1142
+#: src/files.c:1092
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "File yang akan disisipkan ke buffer baru [dari %s] "
 
-#: src/files.c:1144
+#: src/files.c:1094
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "File yang akan disisipkan [dari %s] "
 
-#: src/files.c:1389
+#: src/files.c:1338
 #, fuzzy
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Kunci ilegal dalam mode non-multibuffer"
 
-#: src/files.c:1684
-msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+#: src/files.c:1632
+msgid "Failed to write backup file; continue saving? (Say N if unsure.) "
 msgstr ""
 
-#: src/files.c:1800
+#: src/files.c:1750
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Tidak dapat menulis di luar %s"
 
-#: src/files.c:1885 src/files.c:1910 src/files.c:1928 src/files.c:1941
-#: src/files.c:1952 src/files.c:1981
+#: src/files.c:1833 src/files.c:1858 src/files.c:1876 src/files.c:1889
+#: src/files.c:1900 src/files.c:1928
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr ""
 
-#: src/files.c:1886 src/nano.c:690
+#: src/files.c:1834 src/nano.c:692
 #, fuzzy
 msgid "Too many backup files?"
 msgstr ""
 "\n"
 "No %s ditulis (terlalu banyak file backup?)\n"
 
-#: src/files.c:2026 src/text.c:2863 src/text.c:2875 src/text.c:3244
-#: src/text.c:3253
+#: src/files.c:1972 src/text.c:3117 src/text.c:3129 src/text.c:3498
+#: src/text.c:3507
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr ""
 
-#: src/files.c:2049 src/files.c:2068 src/files.c:2080 src/files.c:2104
-#: src/files.c:2121 src/files.c:2131 src/files.c:2164 src/files.c:2171
+#: src/files.c:1994 src/files.c:2013 src/files.c:2023 src/files.c:2047
+#: src/files.c:2064 src/files.c:2074 src/files.c:2106 src/files.c:2113
 #, fuzzy, c-format
 msgid "Error writing %s: %s"
 msgstr "Quote string buruk %s: %s"
 
-#: src/files.c:2200
+#: src/files.c:2154
 #, fuzzy, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "Menulis %d baris"
 
-#: src/files.c:2299
+#: src/files.c:2249
 msgid " [DOS Format]"
 msgstr " [DOS Format]"
 
-#: src/files.c:2300
+#: src/files.c:2250
 msgid " [Mac Format]"
 msgstr " [Mac Format]"
 
-#: src/files.c:2302
+#: src/files.c:2252
 msgid " [Backup]"
 msgstr " [Backup]"
 
-#: src/files.c:2309
+#: src/files.c:2259
 msgid "Prepend Selection to File"
 msgstr "Menambahkan Pilihan ke File"
 
-#: src/files.c:2310
+#: src/files.c:2260
 msgid "Append Selection to File"
 msgstr "Menambahkan Pilihan ke File"
 
-#: src/files.c:2311
+#: src/files.c:2261
 msgid "Write Selection to File"
 msgstr "Menulis Pilihan ke File"
 
-#: src/files.c:2314
+#: src/files.c:2264
 msgid "File Name to Prepend to"
 msgstr "Nama file yang akan ditambah ke"
 
-#: src/files.c:2315
+#: src/files.c:2265
 msgid "File Name to Append to"
 msgstr "Nama file yang akan ditambah ke"
 
-#: src/files.c:2316
+#: src/files.c:2266
 msgid "File Name to Write"
 msgstr "Nama File untuk di-Tulis"
 
-#: src/files.c:2349
-msgid "Save modified buffer anyway ? "
+#: src/files.c:2301
+msgid "Save modified buffer anyway? "
 msgstr ""
 
-#: src/files.c:2457
-#, fuzzy
-msgid "File exists, OVERWRITE ? "
-msgstr "File ada, DITIMPA ?"
-
-#: src/files.c:2466
-msgid "Save file under DIFFERENT NAME ? "
+#: src/files.c:2412
+msgid "Save file under DIFFERENT NAME? "
 msgstr ""
 
-#: src/files.c:2480
-msgid "File was modified since you opened it, continue saving ? "
+#: src/files.c:2420
+#, fuzzy, c-format
+msgid "File \"%s\" exists; OVERWRITE? "
+msgstr "File ada, DITIMPA ?"
+
+#: src/files.c:2441
+msgid "File was modified since you opened it; continue saving? "
 msgstr ""
 
-#: src/files.c:2917
+#: src/files.c:2874
 msgid "(more)"
 msgstr "(lagi)"
 
-#: src/files.c:3004
+#: src/files.c:2959
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Press Enter to continue\n"
 msgstr "Tekan return untuk lanjut\n"
 
-#: src/files.c:3020
+#: src/files.c:2975
 #, c-format
 msgid ""
 "Unable to create directory %s: %s\n"
 "It is required for saving/loading search history or cursor positions.\n"
 msgstr ""
 
-#: src/files.c:3026
+#: src/files.c:2982
 #, c-format
 msgid ""
 "Path %s is not a directory and needs to be.\n"
 "Nano will be unable to load or save search history or cursor positions.\n"
 msgstr ""
 
-#: src/files.c:3045
+#: src/files.c:3002
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I tried to move\n"
 "to the preferred location (%s) but encountered an error: %s"
 msgstr ""
 
-#: src/files.c:3049
+#: src/files.c:3006
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I moved\n"
@@ -402,787 +388,815 @@ msgid ""
 "(see the nano FAQ about this change)"
 msgstr ""
 
-#: src/files.c:3132 src/files.c:3140 src/files.c:3164 src/files.c:3176
+#: src/files.c:3089 src/files.c:3097 src/files.c:3121 src/files.c:3133
 #, c-format
 msgid "Error writing %s: %s\n"
 msgstr ""
 
 #. TRANSLATORS: Try to keep the next fifteen strings at most 10 characters.
-#: src/global.c:480
+#: src/global.c:483
 msgid "Exit"
 msgstr "Keluar"
 
-#: src/global.c:481
+#: src/global.c:484
 msgid "Close"
 msgstr "Tutup"
 
-#: src/global.c:482
+#: src/global.c:485
 #, fuzzy
 msgid "Uncut Text"
 msgstr "UnCut Teks"
 
-#: src/global.c:484
+#: src/global.c:487
 #, fuzzy
 msgid "Unjustify"
 msgstr "UnJustifikasi"
 
-#: src/global.c:490
+#: src/global.c:493
 msgid "Read File"
 msgstr "Baca File"
 
-#: src/global.c:491
+#: src/global.c:494
 msgid "Where Is"
 msgstr "Di mana"
 
-#: src/global.c:492
+#: src/global.c:495
 msgid "Replace"
 msgstr "Ganti"
 
-#: src/global.c:493
+#: src/global.c:496
 msgid "Go To Line"
 msgstr "Ke baris"
 
-#: src/global.c:494
+#: src/global.c:497
 #, fuzzy
 msgid "Prev Line"
 msgstr "Hlm sebelumnya"
 
-#: src/global.c:495
+#: src/global.c:498
 #, fuzzy
 msgid "Next Line"
 msgstr "File Sesudahnya"
 
-#: src/global.c:496
+#: src/global.c:499
 msgid "Prev Page"
 msgstr "Hlm sebelumnya"
 
-#: src/global.c:497
+#: src/global.c:500
 msgid "Next Page"
 msgstr "Hlm berikutnya"
 
-#: src/global.c:499
+#: src/global.c:502
 msgid "Justify"
 msgstr "Justifikasi"
 
-#: src/global.c:500
+#: src/global.c:503
 #, fuzzy
 msgid "FullJstify"
 msgstr "Justifikasi"
 
-#: src/global.c:502
+#: src/global.c:505
 msgid "Refresh"
 msgstr "Refresh"
 
 #. TRANSLATORS: Try to keep this string at most 12 characters.
-#: src/global.c:505
+#: src/global.c:508
 #, fuzzy
 msgid "WhereIs Next"
 msgstr "Di mana"
 
 #. TRANSLATORS: The next long series of strings are shortcut descriptions;
 #. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:512
+#: src/global.c:515
 msgid "Justify the current paragraph"
 msgstr "Justifikasi paragraf saat ini"
 
-#: src/global.c:514
+#: src/global.c:517
 msgid "Cancel the current function"
 msgstr "Batalkan fungsi ini"
 
-#: src/global.c:515
+#: src/global.c:518
 msgid "Display this help text"
 msgstr ""
 
-#: src/global.c:518
+#: src/global.c:521
 #, fuzzy
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Tutup file yang sedang dimuat/Keluar dari nano"
 
-#: src/global.c:520
+#: src/global.c:523
 msgid "Exit from nano"
 msgstr "Keluar dari nano"
 
-#: src/global.c:524
+#: src/global.c:527
 msgid "Write the current file to disk"
 msgstr "Tulis file sekarang ke disk"
 
-#: src/global.c:526
+#: src/global.c:529
 msgid "Insert another file into the current one"
 msgstr "Sertakan file lain ke file saat ini"
 
-#: src/global.c:528
+#: src/global.c:531
 #, fuzzy
 msgid "Search for a string or a regular expression"
 msgstr "Gunakan Regular expression"
 
-#: src/global.c:531
+#: src/global.c:533
 msgid "Search for a string"
 msgstr ""
 
-#: src/global.c:533
+#: src/global.c:534
+msgid "Refresh the file list"
+msgstr ""
+
+#: src/global.c:535
+msgid "Go to lefthand column"
+msgstr ""
+
+#: src/global.c:536
+msgid "Go to righthand column"
+msgstr ""
+
+#: src/global.c:538
 msgid "Go one screenful up"
 msgstr ""
 
-#: src/global.c:534
+#: src/global.c:539
 msgid "Go one screenful down"
 msgstr ""
 
-#: src/global.c:536
+#: src/global.c:541
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Hapus baris saat ini dan taruh dalam cutbuffer"
 
-#: src/global.c:538
+#: src/global.c:543
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Kembalikan dari cutbuffer ke baris saat ini"
 
-#: src/global.c:539
+#: src/global.c:544
 #, fuzzy
 msgid "Display the position of the cursor"
 msgstr "Tampilkan posisi kursor"
 
-#: src/global.c:541
+#: src/global.c:546
 msgid "Invoke the spell checker, if available"
 msgstr "Panggil spell checker (jika ada)"
 
-#: src/global.c:543
+#: src/global.c:548
 #, fuzzy
 msgid "Replace a string or a regular expression"
 msgstr "Gunakan Regular expression"
 
-#: src/global.c:544
+#: src/global.c:549
 #, fuzzy
 msgid "Go to line and column number"
 msgstr "Ke nomor baris tertentu"
 
-#: src/global.c:546
+#: src/global.c:551
 #, fuzzy
 msgid "Mark text starting from the cursor position"
 msgstr "Tandai teks pada lokasi kursor saat ini"
 
-#: src/global.c:547
+#: src/global.c:552
 msgid "Repeat the last search"
 msgstr ""
 
-#: src/global.c:549
+#: src/global.c:554
 #, fuzzy
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "Hapus baris saat ini dan taruh dalam cutbuffer"
 
-#: src/global.c:550
+#: src/global.c:555
 #, fuzzy
 msgid "Indent the current line"
 msgstr "Tambahkan ke file saat ini"
 
-#: src/global.c:551
+#: src/global.c:556
 #, fuzzy
 msgid "Unindent the current line"
 msgstr "Tambahkan ke file saat ini"
 
-#: src/global.c:552
+#: src/global.c:558
+msgid "Comment/uncomment the current line or marked lines"
+msgstr ""
+
+#: src/global.c:560
 msgid "Undo the last operation"
 msgstr ""
 
-#: src/global.c:553
+#: src/global.c:561
 msgid "Redo the last undone operation"
 msgstr ""
 
-#: src/global.c:555
+#: src/global.c:563
 #, fuzzy
 msgid "Go back one character"
 msgstr "Pindah satu karakter ke belakang"
 
-#: src/global.c:556
+#: src/global.c:564
 #, fuzzy
 msgid "Go forward one character"
 msgstr "Pindah satu karakter ke depan"
 
-#: src/global.c:558
+#: src/global.c:566
 #, fuzzy
 msgid "Go back one word"
 msgstr "Ke belakang satu kata"
 
-#: src/global.c:559
+#: src/global.c:567
 #, fuzzy
 msgid "Go forward one word"
 msgstr "Ke depan satu kata"
 
-#: src/global.c:561
+#: src/global.c:569
 #, fuzzy
 msgid "Go to previous line"
 msgstr "Pindah ke layar sebelumnya"
 
-#: src/global.c:562
+#: src/global.c:570
 #, fuzzy
 msgid "Go to next line"
 msgstr "Turun satu baris"
 
-#: src/global.c:563
+#: src/global.c:571
 #, fuzzy
 msgid "Go to beginning of current line"
 msgstr "Pindah ke awal baris ini"
 
-#: src/global.c:564
+#: src/global.c:572
 #, fuzzy
 msgid "Go to end of current line"
 msgstr "Pindah ke akhir baris ini"
 
-#: src/global.c:567
+#: src/global.c:575
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr ""
 
-#: src/global.c:569
+#: src/global.c:577
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr ""
 
-#: src/global.c:571
+#: src/global.c:579
 msgid "Go to the first line of the file"
 msgstr "Ke baris terawal file"
 
-#: src/global.c:572
+#: src/global.c:580
 msgid "Go to the last line of the file"
 msgstr "Ke baris terakhir file"
 
-#: src/global.c:574
+#: src/global.c:582
 #, fuzzy
 msgid "Go to the matching bracket"
 msgstr "Tidak ada tanda kurung yang cocok"
 
-#: src/global.c:576
+#: src/global.c:584
 msgid "Scroll up one line without scrolling the cursor"
 msgstr ""
 
-#: src/global.c:578
+#: src/global.c:586
 msgid "Scroll down one line without scrolling the cursor"
 msgstr ""
 
-#: src/global.c:581
+#: src/global.c:589
 #, fuzzy
 msgid "Switch to the previous file buffer"
 msgstr "Pindah ke layar sebelumnya"
 
-#: src/global.c:582
+#: src/global.c:590
 msgid "Switch to the next file buffer"
 msgstr ""
 
-#: src/global.c:584
+#: src/global.c:592
 msgid "Insert the next keystroke verbatim"
 msgstr ""
 
-#: src/global.c:585
+#: src/global.c:593
 #, fuzzy
 msgid "Insert a tab at the cursor position"
 msgstr "Sertakan carriage return di posisi kursor"
 
-#: src/global.c:586
+#: src/global.c:594
 #, fuzzy
 msgid "Insert a newline at the cursor position"
 msgstr "Sertakan carriage return di posisi kursor"
 
-#: src/global.c:587
+#: src/global.c:595
 msgid "Delete the character under the cursor"
 msgstr "Hapus karakter pada kursor"
 
-#: src/global.c:589
+#: src/global.c:597
 msgid "Delete the character to the left of the cursor"
 msgstr "Hapus satu karakter di kiri kursor"
 
-#: src/global.c:592
+#: src/global.c:600
 msgid "Cut backward from cursor to word start"
 msgstr ""
 
-#: src/global.c:594
+#: src/global.c:602
 msgid "Cut forward from cursor to next word start"
 msgstr ""
 
-#: src/global.c:596
+#: src/global.c:604
 #, fuzzy
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Kembalikan dari cutbuffer ke baris saat ini"
 
-#: src/global.c:599
+#: src/global.c:607
 #, fuzzy
 msgid "Justify the entire file"
 msgstr "Justifikasi paragraf saat ini"
 
-#: src/global.c:603
+#: src/global.c:611
 msgid "Count the number of words, lines, and characters"
 msgstr ""
 
-#: src/global.c:606
+#: src/global.c:614
 msgid "Refresh (redraw) the current screen"
 msgstr "Refresh (redraw) layar saat ini"
 
-#: src/global.c:608
+#: src/global.c:616
 msgid "Suspend the editor (if suspension is enabled)"
 msgstr ""
 
-#: src/global.c:610
+#: src/global.c:618
 msgid "Save file without prompting"
 msgstr ""
 
-#: src/global.c:611
+#: src/global.c:619
 #, fuzzy
 msgid "Search next occurrence backward"
 msgstr "Pencarian backward"
 
-#: src/global.c:612
+#: src/global.c:620
 msgid "Search next occurrence forward"
 msgstr ""
 
-#: src/global.c:614
+#: src/global.c:622
 msgid "Toggle the case sensitivity of the search"
 msgstr ""
 
-#: src/global.c:616
+#: src/global.c:624
 #, fuzzy
 msgid "Reverse the direction of the search"
 msgstr "Tampilkan posisi kursor"
 
-#: src/global.c:620
+#: src/global.c:628
 #, fuzzy
 msgid "Toggle the use of regular expressions"
 msgstr "Gunakan Regular expression"
 
-#: src/global.c:624
+#: src/global.c:632
 #, fuzzy
 msgid "Recall the previous search/replace string"
 msgstr "Edit string search/replace sebelumnya"
 
-#: src/global.c:626
+#: src/global.c:634
 #, fuzzy
 msgid "Recall the next search/replace string"
 msgstr "Edit string search/replace sebelumnya"
 
-#: src/global.c:629
+#: src/global.c:637
 msgid "Go to file browser"
 msgstr "Ke browser file"
 
-#: src/global.c:632
+#: src/global.c:640
 #, fuzzy
 msgid "Toggle the use of DOS format"
 msgstr "Tulis file dalam format DOS"
 
-#: src/global.c:633
+#: src/global.c:641
 #, fuzzy
 msgid "Toggle the use of Mac format"
 msgstr "Tulis file dalam format Mac"
 
-#: src/global.c:634
+#: src/global.c:642
 msgid "Toggle appending"
 msgstr ""
 
-#: src/global.c:635
+#: src/global.c:643
 msgid "Toggle prepending"
 msgstr ""
 
-#: src/global.c:636
+#: src/global.c:644
 msgid "Toggle backing up of the original file"
 msgstr ""
 
-#: src/global.c:637
+#: src/global.c:645
 msgid "Execute external command"
 msgstr "Eksekusi perintah eksternal"
 
-#: src/global.c:639
+#: src/global.c:647
 msgid "Close buffer without saving it"
 msgstr ""
 
-#: src/global.c:641
+#: src/global.c:649
 #, fuzzy
 msgid "Toggle the use of a new buffer"
 msgstr "Pilih insert ke buffer baru"
 
-#: src/global.c:644
+#: src/global.c:652
 #, fuzzy
 msgid "Exit from the file browser"
 msgstr "Ke browser file"
 
-#: src/global.c:645
+#: src/global.c:653
 #, fuzzy
 msgid "Go to the first file in the list"
 msgstr "Ke baris terawal file"
 
-#: src/global.c:646
+#: src/global.c:654
 #, fuzzy
 msgid "Go to the last file in the list"
 msgstr "Ke baris terakhir file"
 
-#: src/global.c:647
+#: src/global.c:655
 #, fuzzy
 msgid "Go to the previous file in the list"
 msgstr "Ke baris terawal file"
 
-#: src/global.c:648
+#: src/global.c:656
 #, fuzzy
 msgid "Go to the next file in the list"
 msgstr "Ke baris terakhir file"
 
-#: src/global.c:649
+#: src/global.c:657
 msgid "Go to directory"
 msgstr "Ke Direktori"
 
-#: src/global.c:652
+#: src/global.c:660
 #, fuzzy
 msgid "Invoke the linter, if available"
 msgstr "Panggil spell checker (jika ada)"
 
-#: src/global.c:653
+#: src/global.c:661
 #, fuzzy
 msgid "Go to previous linter msg"
 msgstr "Ke nomor baris tertentu"
 
-#: src/global.c:654
+#: src/global.c:662
 msgid "Go to next linter msg"
 msgstr ""
 
-#: src/global.c:656
+#: src/global.c:664
 #, fuzzy
 msgid "Invoke formatter, if available"
 msgstr "Panggil spell checker (jika ada)"
 
 #. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:671
+#: src/global.c:679
 msgid "Get Help"
 msgstr "Bantuan"
 
-#: src/global.c:674 src/prompt.c:858
+#: src/global.c:682 src/prompt.c:855
 msgid "Cancel"
 msgstr "Batal"
 
-#: src/global.c:687
+#: src/global.c:695
 #, fuzzy
 msgid "Write Out"
 msgstr "Tulis"
 
-#: src/global.c:723
+#: src/global.c:731
 msgid "Go To Dir"
 msgstr "Ke Direktori"
 
-#: src/global.c:738
+#: src/global.c:746
 msgid "Cut Text"
 msgstr "Ptng Teks"
 
-#: src/global.c:753
+#: src/global.c:761
 msgid "To Spell"
 msgstr "Mengeja"
 
-#: src/global.c:757
+#: src/global.c:765
 #, fuzzy
 msgid "To Linter"
 msgstr "Ke baris"
 
-#: src/global.c:760
+#: src/global.c:768
 #, fuzzy
 msgid "Formatter"
 msgstr "Format DOS"
 
-#: src/global.c:767
+#: src/global.c:775
 msgid "Case Sens"
 msgstr "Case Sens"
 
-#: src/global.c:772
+#: src/global.c:780
 msgid "Regexp"
 msgstr "Regexp"
 
-#: src/global.c:777
+#: src/global.c:785
 #, fuzzy
 msgid "Backwards"
 msgstr " [Backwards]"
 
-#: src/global.c:784
+#: src/global.c:792
 msgid "No Replace"
 msgstr "Tiada Replace"
 
-#: src/global.c:792
+#: src/global.c:800
 msgid "Cur Pos"
 msgstr "Pos Kursor"
 
-#: src/global.c:807
+#: src/global.c:815
 msgid "First Line"
 msgstr "Baris pertama"
 
-#: src/global.c:809
+#: src/global.c:817
 msgid "Last Line"
 msgstr "Baris terakhir"
 
-#: src/global.c:816
+#: src/global.c:824
 #, fuzzy
 msgid "To Bracket"
 msgstr "Bukan tanda kurung"
 
-#: src/global.c:819
+#: src/global.c:827
 msgid "Mark Text"
 msgstr "Tandai Teks"
 
-#: src/global.c:822
+#: src/global.c:830
 #, fuzzy
 msgid "Copy Text"
 msgstr "Ptng Teks"
 
-#: src/global.c:825
+#: src/global.c:833
 #, fuzzy
 msgid "Indent Text"
 msgstr "Ptng Teks"
 
-#: src/global.c:827
+#: src/global.c:835
 msgid "Unindent Text"
 msgstr ""
 
-#: src/global.c:830
+#: src/global.c:838
 msgid "Undo"
 msgstr ""
 
-#: src/global.c:832
+#: src/global.c:840
 msgid "Redo"
 msgstr ""
 
-#: src/global.c:836 src/global.c:842
+#: src/global.c:844 src/global.c:850
 msgid "Back"
 msgstr "Belakang"
 
-#: src/global.c:838 src/global.c:844
+#: src/global.c:846 src/global.c:852
 msgid "Forward"
 msgstr "Depan"
 
-#: src/global.c:849
+#: src/global.c:857
 msgid "Prev Word"
 msgstr "Kata Sebelum"
 
-#: src/global.c:851
+#: src/global.c:859
 msgid "Next Word"
 msgstr "Kata Berikut"
 
-#: src/global.c:855
+#: src/global.c:863
 msgid "Home"
 msgstr "Awal"
 
-#: src/global.c:857
+#: src/global.c:865
 msgid "End"
 msgstr "Akhir"
 
-#: src/global.c:866
+#: src/global.c:874
 msgid "Beg of Par"
 msgstr ""
 
-#: src/global.c:868
+#: src/global.c:876
 msgid "End of Par"
 msgstr ""
 
-#: src/global.c:873
+#: src/global.c:881
 msgid "Scroll Up"
 msgstr ""
 
-#: src/global.c:875
+#: src/global.c:883
 msgid "Scroll Down"
 msgstr ""
 
-#: src/global.c:880
+#: src/global.c:888
 #, fuzzy
 msgid "Prev File"
 msgstr "File Sebelumnya"
 
-#: src/global.c:882
+#: src/global.c:890
 msgid "Next File"
 msgstr "File Sesudahnya"
 
-#: src/global.c:891
+#: src/global.c:899
 msgid "Verbatim"
 msgstr ""
 
-#: src/global.c:894
+#: src/global.c:902
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:896
+#: src/global.c:904
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:899
+#: src/global.c:907
 msgid "Delete"
 msgstr "Hapus"
 
-#: src/global.c:901
+#: src/global.c:909
 msgid "Backspace"
 msgstr "Backspace"
 
 #. TRANSLATORS: The next two strings refer to cutting words.
-#: src/global.c:912
+#: src/global.c:920
 #, fuzzy
 msgid "Cut Left"
 msgstr "Ptng Teks"
 
-#: src/global.c:914
+#: src/global.c:922
 msgid "Cut Right"
 msgstr ""
 
-#: src/global.c:916
+#: src/global.c:924
 msgid "CutTillEnd"
 msgstr ""
 
-#: src/global.c:926
+#: src/global.c:934
 msgid "Word Count"
 msgstr ""
 
-#: src/global.c:933
+#: src/global.c:941
 msgid "Suspend"
 msgstr "Tunda"
 
-#: src/global.c:937
+#: src/global.c:945
+msgid "Comment Lines"
+msgstr ""
+
+#: src/global.c:949
 msgid "Save"
 msgstr ""
 
-#: src/global.c:940
+#: src/global.c:952
 #, fuzzy
 msgid "Previous"
 msgstr "File Sebelumnya"
 
-#: src/global.c:942
+#: src/global.c:954
 #, fuzzy
 msgid "Next"
 msgstr "Hlm berikutnya"
 
-#: src/global.c:948
+#: src/global.c:960
 #, fuzzy
 msgid "PrevHstory"
 msgstr "Sejarah"
 
-#: src/global.c:951
+#: src/global.c:963
 #, fuzzy
 msgid "NextHstory"
 msgstr "Sejarah"
 
-#: src/global.c:955
+#: src/global.c:972
 #, fuzzy
 msgid "Go To Text"
 msgstr "Ke baris"
 
-#: src/global.c:959
+#: src/global.c:976
 msgid "DOS Format"
 msgstr "Format DOS"
 
-#: src/global.c:961
+#: src/global.c:978
 msgid "Mac Format"
 msgstr "Format Mac"
 
-#: src/global.c:969
+#: src/global.c:986
 msgid "Append"
 msgstr "Tambah"
 
-#: src/global.c:971
+#: src/global.c:988
 msgid "Prepend"
 msgstr "Tambah"
 
-#: src/global.c:974
+#: src/global.c:991
 msgid "Backup File"
 msgstr "Backup File"
 
-#: src/global.c:981
+#: src/global.c:998
 msgid "Execute Command"
 msgstr "Eksekusi Perintah"
 
-#: src/global.c:996
+#: src/global.c:1013
 msgid "To Files"
 msgstr "Ke File"
 
-#: src/global.c:1004
+#: src/global.c:1021
 #, fuzzy
 msgid "First File"
 msgstr "Baris pertama"
 
-#: src/global.c:1006
+#: src/global.c:1023
 #, fuzzy
 msgid "Last File"
 msgstr "Baris terakhir"
 
-#: src/global.c:1010
+#: src/global.c:1027
 msgid "Discard buffer"
 msgstr ""
 
+#: src/global.c:1038
+msgid "Left Column"
+msgstr ""
+
+#: src/global.c:1040
+msgid "Right Column"
+msgstr ""
+
 #. TRANSLATORS: Try to keep the next two strings at most 20 characters.
-#: src/global.c:1020
+#: src/global.c:1047
 msgid "Prev Lint Msg"
 msgstr ""
 
-#: src/global.c:1022
+#: src/global.c:1049
 msgid "Next Lint Msg"
 msgstr ""
 
 #. TRANSLATORS: The next seventeen strings are toggle descriptions;
 #. * they are best kept shorter than 40 characters, but may be longer.
-#: src/global.c:1285
+#: src/global.c:1316
 msgid "Help mode"
 msgstr "Mode bantuan"
 
-#: src/global.c:1287
+#: src/global.c:1318
 #, fuzzy
 msgid "Constant cursor position display"
 msgstr "Posisi kursor konstan"
 
-#: src/global.c:1289
+#: src/global.c:1320
 msgid "Use of one more line for editing"
 msgstr ""
 
-#: src/global.c:1291
+#: src/global.c:1322
 msgid "Smooth scrolling"
 msgstr "Scrolling halus"
 
-#: src/global.c:1293
+#: src/global.c:1324
 #, fuzzy
 msgid "Soft wrapping of overlong lines"
 msgstr "Jangan wrap baris panjang"
 
-#: src/global.c:1295
+#: src/global.c:1326
 msgid "Whitespace display"
 msgstr ""
 
-#: src/global.c:1297
+#: src/global.c:1328
 msgid "Color syntax highlighting"
 msgstr "Pewarnaan sintaks"
 
-#: src/global.c:1299
+#: src/global.c:1330
 msgid "Smart home key"
 msgstr ""
 
-#: src/global.c:1301
+#: src/global.c:1332
 msgid "Auto indent"
 msgstr "Inden otomatis"
 
-#: src/global.c:1303
+#: src/global.c:1334
 msgid "Cut to end"
 msgstr "Cut hingga akhir"
 
-#: src/global.c:1305
+#: src/global.c:1336
 #, fuzzy
 msgid "Hard wrapping of overlong lines"
 msgstr "Jangan wrap baris panjang"
 
-#: src/global.c:1307
+#: src/global.c:1338
 msgid "Conversion of typed tabs to spaces"
 msgstr ""
 
-#: src/global.c:1309
+#: src/global.c:1340
 #, fuzzy
 msgid "Backup files"
 msgstr "Backup File"
 
-#: src/global.c:1311
+#: src/global.c:1342
 msgid "Reading file into separate buffer"
 msgstr ""
 
-#: src/global.c:1313
+#: src/global.c:1344
 msgid "Mouse support"
 msgstr "Dukungan mouse"
 
-#: src/global.c:1315
+#: src/global.c:1346
 msgid "No conversion from DOS/Mac format"
 msgstr "Tidak ada konversi dari format DOS/Mac"
 
-#: src/global.c:1317
+#: src/global.c:1348
 #, fuzzy
 msgid "Suspension"
 msgstr "Tunda"
 
-#: src/help.c:209
+#: src/help.c:211
 #, fuzzy
 msgid ""
 "Search Command Help Text\n"
@@ -1207,7 +1221,7 @@ msgstr ""
 " Tombol-tombol fungsi berikut tersedia dalam mode Search:\n"
 "\n"
 
-#: src/help.c:218
+#: src/help.c:220
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1216,7 +1230,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:224
+#: src/help.c:226
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1236,7 +1250,7 @@ msgstr ""
 " Tombol-tombol fungsi berikut tersedia dalam mode Goto Line:\n"
 "\n"
 
-#: src/help.c:233
+#: src/help.c:235
 #, fuzzy
 msgid ""
 "Insert File Help Text\n"
@@ -1267,7 +1281,7 @@ msgstr ""
 " Kunci-kunci fungsi berikut tersedia dalam mode Insert File:\n"
 "\n"
 
-#: src/help.c:242
+#: src/help.c:244
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1276,7 +1290,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:248
+#: src/help.c:250
 #, fuzzy
 msgid ""
 "Write File Help Text\n"
@@ -1305,7 +1319,7 @@ msgstr ""
 " Kunci-kunci fungsi berikut tersedia dalam mode Write File:\n"
 "\n"
 
-#: src/help.c:262
+#: src/help.c:264
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1329,7 +1343,7 @@ msgstr ""
 " Kunci-kunci fungsi berikut tersedia dalam file browser:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:277
 #, fuzzy
 msgid ""
 "Browser Search Command Help Text\n"
@@ -1355,13 +1369,13 @@ msgstr ""
 " Tombol-tombol fungsi berikut tersedia dalam mode Search:\n"
 "\n"
 
-#: src/help.c:284
+#: src/help.c:286
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
 msgstr ""
 
-#: src/help.c:288
+#: src/help.c:290
 #, fuzzy
 msgid ""
 "Browser Go To Directory Help Text\n"
@@ -1384,7 +1398,7 @@ msgstr ""
 "  Kunci-kunci fungsi berikut tersedia di dalam mode Browser GotoDir :\n"
 "\n"
 
-#: src/help.c:301
+#: src/help.c:303
 #, fuzzy
 msgid ""
 "Spell Check Help Text\n"
@@ -1409,7 +1423,7 @@ msgstr ""
 "Check:\n"
 "\n"
 
-#: src/help.c:316
+#: src/help.c:318
 #, fuzzy
 msgid ""
 "Execute Command Help Text\n"
@@ -1429,7 +1443,7 @@ msgstr ""
 " Kunci-kunci berikut tersedia dalam mode ini:\n"
 "\n"
 
-#: src/help.c:329
+#: src/help.c:331
 #, fuzzy
 msgid ""
 "Main nano help text\n"
@@ -1459,15 +1473,14 @@ msgstr ""
 "ditunjukkan dalam tanda kurung:\n"
 "\n"
 
-#: src/help.c:339
+#: src/help.c:341
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
-" The notation for shortcuts is as follows: Control-key sequences are notated "
-"with a caret (^) symbol and can be entered either by using the Control "
-"(Ctrl) key or pressing the Escape (Esc) key twice.  Escape-key sequences are "
-"notated with the Meta (M-) symbol and can be entered using either the Esc, "
-"Alt, or Meta key depending on your keyboard setup.  "
+" Shortcuts are written as follows: Control-key sequences are notated with a "
+"'^' and can be entered either by using the Ctrl key or pressing the Esc key "
+"twice.  Meta-key sequences are notated with 'M-' and can be entered using "
+"either the Alt, Cmd, or Esc key, depending on your keyboard setup.  "
 msgstr ""
 
 #: src/help.c:348
@@ -1483,21 +1496,21 @@ msgstr ""
 msgid "enable/disable"
 msgstr "enable/disable"
 
-#: src/nano.c:559
+#: src/nano.c:560
 #, fuzzy
 msgid "Key is invalid in view mode"
 msgstr "Kunci ilegal dalam mode VIEW"
 
-#: src/nano.c:565
+#: src/nano.c:566
 #, fuzzy
 msgid "This function is disabled in restricted mode"
 msgstr "Tidak dapat mengunjungi parent dalam mode terbatas"
 
-#: src/nano.c:573
+#: src/nano.c:574
 msgid "Help is not available"
 msgstr ""
 
-#: src/nano.c:684
+#: src/nano.c:686
 #, c-format
 msgid ""
 "\n"
@@ -1506,7 +1519,7 @@ msgstr ""
 "\n"
 "Buffer ditulis ke %s\n"
 
-#: src/nano.c:686
+#: src/nano.c:688
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -1515,7 +1528,7 @@ msgstr ""
 "\n"
 "Buffer ditulis ke %s\n"
 
-#: src/nano.c:689
+#: src/nano.c:691
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -1798,17 +1811,22 @@ msgstr "Aktifkan suspend"
 msgid "Enable soft line wrapping"
 msgstr ""
 
-#: src/nano.c:937
+#: src/nano.c:940
 #, fuzzy, c-format
-msgid " GNU nano, version %s\n"
-msgstr "GNU nano versi %s (dikompilasi %s, %s)\n"
+msgid " nano, version %s\n"
+msgstr "versi "
 
-#: src/nano.c:940
+#: src/nano.c:943
+#, c-format
+msgid " (C) 2014..%s the contributors to nano\n"
+msgstr ""
+
+#: src/nano.c:945
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 
-#: src/nano.c:941
+#: src/nano.c:946
 #, c-format
 msgid ""
 "\n"
@@ -1817,69 +1835,84 @@ msgstr ""
 "\n"
 " Option kompilasi:"
 
-#: src/nano.c:1073
+#: src/nano.c:1081
 msgid "No file name"
 msgstr ""
 
-#: src/nano.c:1108
-msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
-msgstr "Simpan buffer termodifikasi (JAWAB \"No\" AKAN MENGHAPUS PERUBAHAN) ?"
+#: src/nano.c:1115
+msgid "Save modified buffer?  (Answering \"No\" will DISCARD changes.) "
+msgstr ""
 
-#: src/nano.c:1168
+#: src/nano.c:1178
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr ""
 
-#: src/nano.c:1192
+#: src/nano.c:1202
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr ""
 
-#: src/nano.c:1256
+#: src/nano.c:1266
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Menerima SIGHUP atau SIGTERM\n"
 
-#: src/nano.c:1272
+#: src/nano.c:1282
 #, fuzzy, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Gunakan \"fg\" untuk kembali ke nano"
 
-#: src/nano.c:1294
+#: src/nano.c:1304
 msgid "Suspension is not enabled"
 msgstr ""
 
-#: src/nano.c:1448
+#: src/nano.c:1459
 msgid "enabled"
 msgstr "adakan"
 
-#: src/nano.c:1448
+#: src/nano.c:1459
 msgid "disabled"
 msgstr "tiadakan"
 
-#: src/nano.c:1607 src/winio.c:1125
-msgid "Unknown Command"
+#: src/nano.c:1573
+msgid "Unbound key"
+msgstr ""
+
+#: src/nano.c:1577
+#, c-format
+msgid "Unbound key: M-%c"
 msgstr ""
 
-#: src/nano.c:1720
+#: src/nano.c:1579
+#, c-format
+msgid "Unbound key: ^%c"
+msgstr ""
+
+#: src/nano.c:1581
+#, c-format
+msgid "Unbound key: %c"
+msgstr ""
+
+#: src/nano.c:1745
 #, fuzzy
 msgid "XON ignored, mumble mumble"
 msgstr "XON diabaikan, mumble mumble."
 
-#: src/nano.c:1725
+#: src/nano.c:1750
 #, fuzzy
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF diabaikan, mumble mumble."
 
-#: src/nano.c:2139 src/rcfile.c:1334
+#: src/nano.c:2166 src/rcfile.c:1187
 #, fuzzy, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "ukuran tab yang diminta %d tidak valid"
 
-#: src/nano.c:2200 src/rcfile.c:1259
+#: src/nano.c:2227 src/rcfile.c:1128
 #, fuzzy, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "ukuran fill yang diminta %d tidak valid"
 
-#: src/nano.c:2247
+#: src/nano.c:2276
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr ""
@@ -1887,116 +1920,119 @@ msgstr ""
 #. TRANSLATORS: For the next three strings, if possible, specify
 #. * the single-byte shortcuts for both your language and English.
 #. * For example, in French: "OoYy" for "Oui".
-#: src/prompt.c:821
+#: src/prompt.c:818
 msgid "Yy"
 msgstr "Yy"
 
-#: src/prompt.c:822
+#: src/prompt.c:819
 msgid "Nn"
 msgstr "Tt"
 
-#: src/prompt.c:823
+#: src/prompt.c:820
 msgid "Aa"
 msgstr "Aa"
 
-#: src/prompt.c:845
+#: src/prompt.c:842
 msgid "Yes"
 msgstr "Ya"
 
-#: src/prompt.c:850
+#: src/prompt.c:847
 msgid "All"
 msgstr "Semua"
 
-#: src/prompt.c:855
+#: src/prompt.c:852
 msgid "No"
 msgstr "Tidak"
 
-#: src/rcfile.c:142
+#: src/rcfile.c:144
 #, fuzzy, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Kesalahan dalam %s pada baris %d: "
 
-#: src/rcfile.c:201
+#: src/rcfile.c:203
 #, fuzzy, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "argumen %s telah selesai.\""
 
-#: src/rcfile.c:228 src/rcfile.c:280 src/rcfile.c:732 src/rcfile.c:793
-#: src/rcfile.c:882 src/rcfile.c:933
+#: src/rcfile.c:231 src/rcfile.c:674 src/rcfile.c:725 src/rcfile.c:824
 #, fuzzy
 msgid "Regex strings must begin and end with a \" character"
 msgstr "String regexp harus dimulai dan diakhiri dengan sebuah karakter \"\n"
 
-#: src/rcfile.c:254 src/search.c:62
+#: src/rcfile.c:257 src/search.c:61
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Regex jelek \"%s\": %s"
 
-#: src/rcfile.c:274
+#: src/rcfile.c:279
 msgid "Missing syntax name"
 msgstr "Nama sintaks tidak ada"
 
-#: src/rcfile.c:345
+#: src/rcfile.c:288
+msgid "A syntax name must be quoted"
+msgstr ""
+
+#: src/rcfile.c:297
 msgid "The \"none\" syntax is reserved"
 msgstr ""
 
-#: src/rcfile.c:352
-msgid "The \"default\" syntax must take no extensions"
+#: src/rcfile.c:327
+msgid "The \"default\" syntax does not accept extensions"
 msgstr ""
 
-#: src/rcfile.c:424
+#: src/rcfile.c:369
 #, fuzzy
 msgid "Missing key name"
 msgstr "Nama sintaks tidak ada"
 
-#: src/rcfile.c:433 src/rcfile.c:444
+#: src/rcfile.c:378 src/rcfile.c:389
 msgid "Key name is too short"
 msgstr ""
 
-#: src/rcfile.c:454
+#: src/rcfile.c:399
 msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr ""
 
-#: src/rcfile.c:457
+#: src/rcfile.c:402
 #, c-format
 msgid "Key name %s is invalid"
 msgstr ""
 
-#: src/rcfile.c:466
+#: src/rcfile.c:411
 msgid "Must specify a function to bind the key to"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the word "all".
-#: src/rcfile.c:476
+#: src/rcfile.c:421
 msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
 
-#: src/rcfile.c:483
+#: src/rcfile.c:428
 #, c-format
 msgid "Cannot map name \"%s\" to a function"
 msgstr ""
 
-#: src/rcfile.c:490
+#: src/rcfile.c:435
 #, c-format
 msgid "Cannot map name \"%s\" to a menu"
 msgstr ""
 
-#: src/rcfile.c:522
+#: src/rcfile.c:467
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr ""
 
-#: src/rcfile.c:534
+#: src/rcfile.c:479
 #, c-format
 msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr ""
 
-#: src/rcfile.c:631
+#: src/rcfile.c:576
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr ""
 
-#: src/rcfile.c:674
+#: src/rcfile.c:616
 #, fuzzy, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -2010,130 +2046,112 @@ msgstr ""
 "\"white\", \"yellow\", \"cyan\", \"magenta\" dan \n"
 "\"black\", dengan prefiks opsional \"bright\".\n"
 
-#: src/rcfile.c:696
-#, fuzzy
-msgid "Cannot add a color command without a syntax command"
-msgstr "Tidak dapat menambah direktif warna tanpa baris sintaks"
+#: src/rcfile.c:637 src/rcfile.c:795 src/rcfile.c:858
+#, c-format
+msgid "A '%s' command requires a preceding 'syntax' command"
+msgstr ""
 
-#: src/rcfile.c:701
+#: src/rcfile.c:643
 msgid "Missing color name"
 msgstr "Nama warna tidak ada"
 
-#: src/rcfile.c:711 src/rcfile.c:872
-msgid "Missing regex string"
+#: src/rcfile.c:653 src/rcfile.c:807
+#, c-format
+msgid "Missing regex string after '%s' command"
 msgstr ""
 
-#: src/rcfile.c:787
+#: src/rcfile.c:719
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\" membutuhkan \"end=\" yang sesuai"
 
-#: src/rcfile.c:839
+#: src/rcfile.c:768
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
 msgstr ""
 
-#: src/rcfile.c:867
-#, fuzzy
-msgid "Cannot add a header regex without a syntax command"
-msgstr "Tidak dapat menambah direktif warna tanpa baris sintaks"
-
-#: src/rcfile.c:922
-#, fuzzy
-msgid "Cannot add a magic string regex without a syntax command"
-msgstr "Tidak dapat menambah direktif warna tanpa baris sintaks"
-
-#: src/rcfile.c:927
-#, fuzzy
-msgid "Missing magic string name"
-msgstr "Nama warna tidak ada"
-
-#: src/rcfile.c:985
-#, fuzzy
-msgid "Cannot add a linter without a syntax command"
-msgstr "Tidak dapat menambah direktif warna tanpa baris sintaks"
-
-#: src/rcfile.c:990
-#, fuzzy
-msgid "Missing linter command"
-msgstr "Nama warna tidak ada"
+#: src/rcfile.c:802
+#, c-format
+msgid "The \"default\" syntax does not accept '%s' regexes"
+msgstr ""
 
-#: src/rcfile.c:1011
-#, fuzzy
-msgid "Cannot add formatter without a syntax command"
-msgstr "Tidak dapat menambah direktif warna tanpa baris sintaks"
+#: src/rcfile.c:863
+#, c-format
+msgid "Missing command after '%s'"
+msgstr ""
 
-#: src/rcfile.c:1016
-msgid "Missing formatter command"
+#: src/rcfile.c:879
+#, c-format
+msgid "Argument of '%s' lacks closing \""
 msgstr ""
 
-#: src/rcfile.c:1046
+#: src/rcfile.c:910
 #, c-format
 msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr ""
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:912
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
 
-#: src/rcfile.c:1109
+#: src/rcfile.c:971
 #, fuzzy, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "Tidak dapat membuka %s untuk menulis: %s"
 
-#: src/rcfile.c:1125 src/rcfile.c:1134 src/rcfile.c:1144
+#: src/rcfile.c:993 src/rcfile.c:1202
 #, c-format
-msgid "Command \"%s\" not allowed in included file"
+msgid "Syntax \"%s\" has no color commands"
 msgstr ""
 
-#: src/rcfile.c:1150 src/rcfile.c:1359
+#: src/rcfile.c:1024
 #, c-format
-msgid "Syntax \"%s\" has no color commands"
+msgid "Command \"%s\" not allowed in included file"
 msgstr ""
 
-#: src/rcfile.c:1180
+#: src/rcfile.c:1039
 #, fuzzy, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Perintah %s tidak dipahami"
 
-#: src/rcfile.c:1195
+#: src/rcfile.c:1051
 #, fuzzy
 msgid "Missing option"
 msgstr "Nama warna tidak ada"
 
-#: src/rcfile.c:1217
+#: src/rcfile.c:1065
+#, c-format
+msgid "Unknown option \"%s\""
+msgstr ""
+
+#: src/rcfile.c:1077
+#, fuzzy, c-format
+msgid "Cannot unset option \"%s\""
+msgstr "Tidak dapat menganti ukuran jendela atas"
+
+#: src/rcfile.c:1089
 #, fuzzy, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "opsi %s membutuhkan sebuah argumen"
 
-#: src/rcfile.c:1235
+#: src/rcfile.c:1105
 msgid "Option is not a valid multibyte string"
 msgstr ""
 
-#: src/rcfile.c:1272 src/rcfile.c:1300 src/rcfile.c:1309
+#: src/rcfile.c:1139 src/rcfile.c:1160 src/rcfile.c:1167
 msgid "Non-blank characters required"
 msgstr ""
 
-#: src/rcfile.c:1282
+#: src/rcfile.c:1146
 msgid "Two single-column characters required"
 msgstr ""
 
-#: src/rcfile.c:1348
-#, fuzzy, c-format
-msgid "Cannot unset option \"%s\""
-msgstr "Tidak dapat menganti ukuran jendela atas"
-
-#: src/rcfile.c:1354
-#, c-format
-msgid "Unknown option \"%s\""
-msgstr ""
-
-#: src/rcfile.c:1413
+#: src/rcfile.c:1258
 msgid "I can't find my home directory!  Wah!"
 msgstr "Saya tidak dapat menemukan direktori home!  Wah!"
 
-#: src/rcfile.c:1451
+#: src/rcfile.c:1295
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2142,348 +2160,381 @@ msgstr ""
 "\n"
 "Tekan return untuk lanjut memulai nano\n"
 
-#: src/search.c:96
+#: src/search.c:95
 #, fuzzy, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "\"%s\" tidak ditemukan"
 
 #. TRANSLATORS: The next three strings are modifiers of the search prompt.
-#: src/search.c:176
+#: src/search.c:169
 msgid " [Case Sensitive]"
 msgstr " [Case Sensitive]"
 
-#: src/search.c:180
+#: src/search.c:173
 msgid " [Regexp]"
 msgstr " [Regexp]"
 
-#: src/search.c:184
+#: src/search.c:177
 msgid " [Backwards]"
 msgstr " [Backwards]"
 
 #. TRANSLATORS: The next two strings are modifiers of the search prompt.
-#: src/search.c:189
+#: src/search.c:182
 #, fuzzy
 msgid " (to replace) in selection"
 msgstr " (ganti)"
 
-#: src/search.c:191
+#: src/search.c:184
 msgid " (to replace)"
 msgstr " (ganti)"
 
+#: src/search.c:305
+#, fuzzy
+msgid "Searching..."
+msgstr "Cari"
+
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:718
+#: src/search.c:693
 msgid "Replace this instance?"
 msgstr "Ganti kata ini?"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:883
+#: src/search.c:840
 msgid "Replace with"
 msgstr "Ganti dengan"
 
-#: src/search.c:924
+#: src/search.c:875
 #, fuzzy, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
 msgstr[0] "%d tempat terganti"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:964
+#: src/search.c:914
 #, fuzzy
 msgid "Enter line number, column number"
 msgstr "Masukkan nomor baris"
 
-#: src/search.c:991
+#: src/search.c:939
 msgid "Invalid line or column number"
 msgstr ""
 
-#: src/search.c:1124
+#: src/search.c:1080
 msgid "Not a bracket"
 msgstr "Bukan tanda kurung"
 
-#: src/search.c:1191
+#: src/search.c:1146
 msgid "No matching bracket"
 msgstr "Tidak ada tanda kurung yang cocok"
 
-#: src/text.c:54
+#: src/text.c:53
 msgid "Mark Set"
 msgstr "Set Tanda"
 
-#: src/text.c:58
+#: src/text.c:57
 #, fuzzy
 msgid "Mark Unset"
 msgstr "Unset Tanda"
 
-#: src/text.c:70
+#: src/text.c:69
 #, fuzzy, c-format
 msgid "Error invoking \"%s\""
 msgstr "Gagal memanggil \"spell\""
 
-#: src/text.c:475
-msgid "Nothing in undo buffer!"
+#: src/text.c:468
+msgid "Commenting is not supported for this file type"
 msgstr ""
 
-#: src/text.c:481 src/text.c:634
-#, c-format
-msgid "Internal error: can't match line %d.  Please save your work."
+#: src/text.c:484
+msgid "Cannot comment past end of file"
+msgstr ""
+
+#: src/text.c:677
+msgid "Nothing in undo buffer!"
 msgstr ""
 
 #. TRANSLATORS: Eight of the next nine strings describe actions
 #. * that are undone or redone.  It are all nouns, not verbs.
-#: src/text.c:495 src/text.c:524 src/text.c:645 src/text.c:686
+#: src/text.c:695 src/text.c:724 src/text.c:857 src/text.c:898
 msgid "text add"
 msgstr ""
 
-#: src/text.c:505 src/text.c:656
+#: src/text.c:705 src/text.c:868
 #, fuzzy
 msgid "text delete"
 msgstr "File Sesudahnya"
 
-#: src/text.c:528 src/text.c:694
+#: src/text.c:728 src/text.c:907
 msgid "line join"
 msgstr ""
 
-#: src/text.c:547 src/text.c:710
+#: src/text.c:747 src/text.c:923
 msgid "text cut"
 msgstr ""
 
-#: src/text.c:552 src/text.c:714
+#: src/text.c:752 src/text.c:927
 msgid "text uncut"
 msgstr ""
 
-#: src/text.c:558 src/text.c:691
+#: src/text.c:758 src/text.c:903
 msgid "Internal error: line is missing.  Please save your work."
 msgstr ""
 
-#: src/text.c:561 src/text.c:665
+#: src/text.c:762 src/text.c:877
 msgid "line break"
 msgstr ""
 
-#: src/text.c:569 src/text.c:725
+#: src/text.c:772 src/text.c:947
+msgid "comment"
+msgstr ""
+
+#: src/text.c:776 src/text.c:951
+msgid "uncomment"
+msgstr ""
+
+#: src/text.c:780 src/text.c:938
 #, fuzzy
 msgid "text insert"
 msgstr "File Sesudahnya"
 
-#: src/text.c:589 src/text.c:718
+#: src/text.c:800 src/text.c:931
 #, fuzzy
 msgid "text replace"
 msgstr " (ganti)"
 
-#: src/text.c:596 src/text.c:732 src/text.c:1030 src/text.c:1174
+#: src/text.c:807 src/text.c:955 src/text.c:1267 src/text.c:1437
 msgid "Internal error: unknown type.  Please save your work."
 msgstr ""
 
-#: src/text.c:601
+#: src/text.c:813
 #, c-format
 msgid "Undid action (%s)"
 msgstr ""
 
-#: src/text.c:619
+#: src/text.c:832
 msgid "Nothing to re-do!"
 msgstr ""
 
-#: src/text.c:628
+#: src/text.c:841
 msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
 
-#: src/text.c:737
+#: src/text.c:961
 #, c-format
 msgid "Redid action (%s)"
 msgstr ""
 
-#: src/text.c:827 src/text.c:2508 src/text.c:2944
+#: src/text.c:1051 src/text.c:2765 src/text.c:3198
 msgid "Could not create pipe"
 msgstr "Tidak dapat membuat pipe"
 
-#: src/text.c:853 src/text.c:2595 src/text.c:2750 src/text.c:2992
-#: src/text.c:3286
+#: src/text.c:1077 src/text.c:2852 src/text.c:3005 src/text.c:3246
+#: src/text.c:3540
 msgid "Could not fork"
 msgstr "Tidak dapat mem-fork"
 
-#: src/text.c:1853
+#: src/text.c:2117
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Quote string buruk %s: %s"
 
-#: src/text.c:2241
+#: src/text.c:2499
 msgid "Can now UnJustify!"
 msgstr "Sekarang dapat melakukan UnJustify"
 
-#: src/text.c:2435
+#: src/text.c:2697
 msgid "Edit a replacement"
 msgstr "Edit pengganti"
 
-#: src/text.c:2510
+#. TRANSLATORS: Shown after fixing misspellings in one word.
+#: src/text.c:2713
+#, fuzzy
+msgid "Next word..."
+msgstr "Kata Berikut"
+
+#: src/text.c:2767
 msgid "Creating misspelled word list, please wait..."
 msgstr "Membuat daftar kata yang misspelled, silakan tunggu..."
 
-#: src/text.c:2601 src/text.c:2999
+#: src/text.c:2858 src/text.c:3253
 msgid "Could not get size of pipe buffer"
 msgstr "Tidak dapat menentukan ukuran buffer pipe"
 
-#: src/text.c:2652
+#: src/text.c:2907
 msgid "Error invoking \"spell\""
 msgstr "Gagal memanggil \"spell\""
 
-#: src/text.c:2655
+#: src/text.c:2910
 msgid "Error invoking \"sort -f\""
 msgstr "Gagal memanggil \"sort -f\""
 
-#: src/text.c:2658
+#: src/text.c:2913
 msgid "Error invoking \"uniq\""
 msgstr "Gagal memanggil \"uniq\""
 
-#: src/text.c:2881
+#: src/text.c:3135
 #, fuzzy
 msgid "Invoking spell checker, please wait"
 msgstr "Panggil spell checker (jika ada)"
 
-#: src/text.c:2897
+#: src/text.c:3151
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Spell checking gagal: %s"
 
-#: src/text.c:2899
+#: src/text.c:3153
 #, fuzzy, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Spell checking gagal: %s"
 
-#: src/text.c:2902
+#: src/text.c:3156
 msgid "Finished checking spelling"
 msgstr "Selesai memeriksa ejaan"
 
-#: src/text.c:2927
+#: src/text.c:3181
 msgid "No linter defined for this type of file!"
 msgstr ""
 
-#: src/text.c:2932
+#: src/text.c:3186
 msgid "Save modified buffer before linting?"
 msgstr ""
 
-#: src/text.c:2949
+#: src/text.c:3203
 msgid "Invoking linter, please wait"
 msgstr ""
 
-#: src/text.c:3105
+#: src/text.c:3358
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr ""
 
-#: src/text.c:3134
+#: src/text.c:3388
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
 
-#: src/text.c:3153
+#: src/text.c:3407
 msgid "No more errors in unopened files, cancelling"
 msgstr ""
 
-#: src/text.c:3192
+#: src/text.c:3446
 #, fuzzy
 msgid "At last message"
 msgstr "Tampilkan pesan ini"
 
-#: src/text.c:3197
+#: src/text.c:3451
 #, fuzzy
 msgid "At first message"
 msgstr "Tampilkan pesan ini"
 
-#: src/text.c:3237
+#: src/text.c:3491
 msgid "Finished"
 msgstr ""
 
-#: src/text.c:3259
+#: src/text.c:3513
 msgid "Invoking formatter, please wait"
 msgstr ""
 
-#: src/text.c:3314
+#: src/text.c:3568
 msgid "Finished formatting"
 msgstr ""
 
-#: src/text.c:3396
+#: src/text.c:3650
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr ""
 
-#: src/text.c:3397
+#: src/text.c:3651
 #, fuzzy
 msgid "In Selection:  "
 msgstr "Menambahkan Pilihan ke File"
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3411
+#: src/text.c:3665
 msgid "Verbatim Input"
 msgstr ""
 
-#: src/utils.c:391 src/utils.c:403
+#: src/utils.c:392 src/utils.c:404
 msgid "nano is out of memory!"
 msgstr "nano kehabisan memori!"
 
+#: src/utils.c:625
+#, c-format
+msgid "Internal error: can't match line %d.  Please save your work."
+msgstr ""
+
+#. TRANSLATORS: This refers to a sequence of escape codes
+#. * (from the keyboard) that nano does not know about.
+#: src/winio.c:1121
+msgid "Unknown sequence"
+msgstr ""
+
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
 #: src/winio.c:1427
 msgid "Unicode Input"
 msgstr ""
 
-#: src/winio.c:1991 src/winio.c:1995
-#, fuzzy
-msgid "Modified"
-msgstr " Dimodifikasi "
-
-#: src/winio.c:1992
-#, fuzzy
-msgid "View"
-msgstr " View "
-
-#: src/winio.c:2006
+#: src/winio.c:1960
 #, fuzzy
 msgid "DIR:"
 msgstr " DIR: "
 
-#: src/winio.c:2013
+#: src/winio.c:1968
 #, fuzzy
 msgid "File:"
 msgstr "File: "
 
-#: src/winio.c:3141
+#: src/winio.c:1972 src/winio.c:1976
+#, fuzzy
+msgid "Modified"
+msgstr " Dimodifikasi "
+
+#: src/winio.c:1974
+#, fuzzy
+msgid "View"
+msgstr " View "
+
+#: src/winio.c:3105
 #, fuzzy, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "baris %ld/%ld (%d%%), kol %lu/%lu (%d%%), char %lu/%ld (%d%%)"
 
-#: src/winio.c:3271
+#: src/winio.c:3235
 msgid "The nano text editor"
 msgstr "Nano teks editor"
 
-#: src/winio.c:3272
+#: src/winio.c:3236
 #, fuzzy
 msgid "version"
 msgstr "versi "
 
-#: src/winio.c:3273
+#: src/winio.c:3237
 msgid "Brought to you by:"
 msgstr "Dibuat untuk anda oleh:"
 
-#: src/winio.c:3274
+#: src/winio.c:3238
 msgid "Special thanks to:"
 msgstr "Ucapan terima kasih khusus kepada:"
 
-#: src/winio.c:3275
+#: src/winio.c:3239
 msgid "The Free Software Foundation"
 msgstr "The Free Software Foundation"
 
-#: src/winio.c:3276
+#: src/winio.c:3240
 msgid "the many translators and the TP"
 msgstr ""
 
-#: src/winio.c:3277
+#: src/winio.c:3241
 msgid "For ncurses:"
 msgstr "Untuk ncurses:"
 
-#: src/winio.c:3278
+#: src/winio.c:3242
 msgid "and anyone else we forgot..."
 msgstr "dan orang lain yang kami lupa...."
 
-#: src/winio.c:3279
+#: src/winio.c:3243
 #, fuzzy
 msgid "Thank you for using nano!"
 msgstr "Terima kasih telah menggunakan nano!\n"
@@ -2673,6 +2724,9 @@ msgstr "Terima kasih telah menggunakan nano!\n"
 #~ msgid "(ignored, for Pico compatibility)"
 #~ msgstr "(abaikan, untuk kompatibilitas dengan Pico)"
 
+#~ msgid " GNU nano version %s (compiled %s, %s)\n"
+#~ msgstr "GNU nano versi %s (dikompilasi %s, %s)\n"
+
 #~ msgid "Sorry, support for this function has been disabled"
 #~ msgstr "Maaf, dukungan untuk fungsi ini telah ditiadakan"
 
@@ -2694,6 +2748,10 @@ msgstr "Terima kasih telah menggunakan nano!\n"
 #~ msgid "Spell checking failed: unable to write temp file!"
 #~ msgstr "Spell checking gagal: tidak dapat menulis file temp!"
 
+#~ msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
+#~ msgstr ""
+#~ "Simpan buffer termodifikasi (JAWAB \"No\" AKAN MENGHAPUS PERUBAHAN) ?"
+
 #~ msgid "Cannot move top win"
 #~ msgstr "Tidak dapat memindahkan jendela atas"
 
@@ -2753,6 +2811,9 @@ msgstr "Terima kasih telah menggunakan nano!\n"
 #~ msgid "Starting a new syntax type\n"
 #~ msgstr "Memulai tipe sintaks baru\n"
 
+#~ msgid "Cannot add a color directive without a syntax line"
+#~ msgstr "Tidak dapat menambah direktif warna tanpa baris sintaks"
+
 #~ msgid "Starting a new colorstring for fg %d bg %d\n"
 #~ msgstr "Memulai colorstring baru untuk fg %d bg %d\n"
 
diff --git a/po/it.po b/po/it.po
index ac458cea..d5ba8b33 100644
--- a/po/it.po
+++ b/po/it.po
@@ -2,13 +2,13 @@
 # Copyright (C) 2001-2006, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 # This file is distributed under the same license as the nano package.
 #
-# Marco Colombo <m.colombo@ed.ac.uk>, 2001-2015.
+# Marco Colombo <m.colombo@ed.ac.uk>, 2001-2016.
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 2.4.2\n"
+"Project-Id-Version: nano 2.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-25 16:41-0500\n"
-"PO-Revision-Date: 2015-08-05 11:54+0100\n"
+"POT-Creation-Date: 2016-06-17 15:41+0200\n"
+"PO-Revision-Date: 2016-04-25 16:36+0100\n"
 "Last-Translator: Marco Colombo <m.colombo@ed.ac.uk>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
 "Language: it\n"
@@ -17,376 +17,353 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: src/browser.c:144 src/browser.c:284 src/browser.c:334 src/files.c:996
+#: src/files.c:1003 src/files.c:1794 src/files.c:1919 src/files.c:1963
+#: src/files.c:1983 src/files.c:2099 src/files.c:3019 src/files.c:3242
+#: src/rcfile.c:540 src/rcfile.c:1280
+#, c-format
+msgid "Error reading %s: %s"
+msgstr "Errore durante la lettura di %s: %s"
+
 #. TRANSLATORS: This is a prompt.
-#: src/browser.c:220
+#: src/browser.c:247
 msgid "Go To Directory"
 msgstr "Vai alla directory"
 
-#: src/browser.c:227 src/browser.c:738 src/files.c:1174 src/files.c:2340
-#: src/nano.c:1120 src/search.c:202 src/search.c:290 src/search.c:895
-#: src/search.c:970 src/text.c:2935 src/text.c:3142
+#: src/browser.c:254 src/browser.c:723 src/files.c:1126 src/files.c:2292
+#: src/nano.c:1128 src/search.c:195 src/search.c:297 src/search.c:851
+#: src/search.c:918 src/text.c:3189 src/text.c:3396
 msgid "Cancelled"
 msgstr "Annullato"
 
-#: src/browser.c:253 src/browser.c:300
-#, c-format
-msgid "Can't go outside of %s in restricted mode"
+#. TRANSLATORS: This refers to the option --operatingdir,
+#. * not to --restricted.
+#: src/browser.c:274 src/browser.c:326
+#, fuzzy, c-format
+msgid "Can't go outside of %s in confined mode"
 msgstr "Impossibile uscire da %s in modalità ristretta"
 
-#: src/browser.c:264 src/browser.c:310 src/browser.c:326 src/files.c:1044
-#: src/files.c:1052 src/files.c:1844 src/files.c:1971 src/files.c:2016
-#: src/files.c:2037 src/files.c:2156 src/files.c:3062 src/files.c:3285
-#: src/rcfile.c:596 src/rcfile.c:1435
-#, c-format
-msgid "Error reading %s: %s"
-msgstr "Errore durante la lettura di %s: %s"
-
-#: src/browser.c:290
+#: src/browser.c:317
 msgid "Can't move up a directory"
 msgstr "Impossibile risalire la directory"
 
 #. TRANSLATORS: Try to keep this at most 7 characters.
-#: src/browser.c:615 src/browser.c:623
+#: src/browser.c:590 src/browser.c:598
 msgid "(dir)"
 msgstr "(dir)"
 
 #. TRANSLATORS: Try to keep this at most 12 characters.
-#: src/browser.c:620
+#: src/browser.c:595
 msgid "(parent dir)"
 msgstr "(dir super)"
 
 #. TRANSLATORS: Try to keep this at most 7 characters.
 #. * If necessary, you can leave out the parentheses.
-#: src/browser.c:650
+#: src/browser.c:625
 msgid "(huge)"
 msgstr "(grande)"
 
 #. TRANSLATORS: This is the main search prompt.
-#: src/browser.c:727 src/search.c:173
+#: src/browser.c:712 src/search.c:166
 msgid "Search"
 msgstr "Ricerca"
 
-#: src/browser.c:777 src/search.c:466 src/search.c:536
-msgid "This is the only occurrence"
-msgstr "Questa è l'unica occorrenza"
-
-#: src/browser.c:793 src/search.c:364
+#: src/browser.c:754 src/search.c:368
 msgid "Search Wrapped"
 msgstr "Ricerca ricominciata"
 
-#: src/browser.c:843 src/search.c:517
+#: src/browser.c:764 src/search.c:509
+msgid "This is the only occurrence"
+msgstr "Questa è l'unica occorrenza"
+
+#: src/browser.c:812 src/search.c:473
 msgid "No current search pattern"
 msgstr "Nessun pattern di ricerca attivo"
 
-#: src/files.c:50
+#: src/color.c:186
 #, fuzzy, c-format
-msgid "Directory '%s' does not exist"
+msgid "Unknown syntax name: %s"
+msgstr "Nome di sintassi mancante"
+
+#: src/color.c:247
+#, c-format
+msgid "magic_load() failed: %s"
 msgstr ""
-"Errore durante la scrittura del file di lock: directory \"%s\" non esiste"
 
-#: src/files.c:52
+#: src/color.c:251
 #, c-format
-msgid "Path '%s': %s"
+msgid "magic_file(%s) failed: %s"
 msgstr ""
 
-#: src/files.c:54
-#, fuzzy, c-format
+#: src/files.c:47
+#, c-format
+msgid "Directory '%s' does not exist"
+msgstr "La directory \"%s\" non esiste"
+
+#: src/files.c:49
+#, c-format
+msgid "Path '%s': %s"
+msgstr "Percorso \"%s\": %s"
+
+#: src/files.c:51
+#, c-format
 msgid "Path '%s' is not a directory"
-msgstr "\"%s\" è una directory"
+msgstr "Il percorso \"%s\" non è una directory"
 
-#: src/files.c:57
+#: src/files.c:53
 #, c-format
 msgid "Path '%s' is not accessible"
-msgstr ""
+msgstr "Il percorso \"%s\" non è accessibile"
 
-#. TRANSLATORS: Try to keep this at most 76 characters.
-#: src/files.c:158
+#. TRANSLATORS: Keep the next ten messages at most 76 characters.
+#: src/files.c:148
 msgid ""
 "Warning: Modifying a file which is not locked, check directory permission?"
 msgstr ""
 "Attenzione: modificazione di un file non bloccato, controllare i permessi "
 "della directory?"
 
-#: src/files.c:197
+#: src/files.c:187
 msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
 msgstr ""
 "Impossibile determinare la propria identità per il file di lock (getpwuid() "
 "non riuscito)"
 
-#: src/files.c:206
+#: src/files.c:196
 #, c-format
 msgid "Couldn't determine hostname for lock file: %s"
 msgstr "Impossibile determinare il nome dell'host per il file di lock: %s"
 
-#: src/files.c:227 src/files.c:238 src/files.c:275 src/files.c:285
+#: src/files.c:216 src/files.c:225 src/files.c:262 src/files.c:272
 #, c-format
 msgid "Error writing lock file %s: %s"
 msgstr "Errore durante la scrittura del file di lock %s: %s"
 
-#: src/files.c:305
+#: src/files.c:291
 #, c-format
 msgid "Error deleting lock file %s: %s"
 msgstr "Errore durante l'eliminazione del file di lock %s: %s"
 
-#: src/files.c:341
+#: src/files.c:325
 #, c-format
 msgid "Error opening lock file %s: %s"
 msgstr "Errore durante l'apertura del file di lock %s: %s"
 
-#: src/files.c:353
+#: src/files.c:337
 #, c-format
 msgid "Error reading lock file %s: Not enough data read"
 msgstr ""
 "Errore durante la lettura del file di lock %s: letti non abbastanza dati"
 
 #. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
-#: src/files.c:371
+#: src/files.c:354
 #, c-format
 msgid "File %s is being edited (by %s with %s, PID %d); continue?"
 msgstr ""
 "Il file %s sta venendo modificato (da %s usando %s, PID %d). Continuare?"
 
-#: src/files.c:426
+#: src/files.c:430
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Impossibile inserire il file dall'esterno di %s"
 
-#: src/files.c:439 src/files.c:1038 src/rcfile.c:589 src/rcfile.c:1385
-#: src/rcfile.c:1426
+#: src/files.c:445 src/files.c:991 src/rcfile.c:533 src/rcfile.c:1230
+#: src/rcfile.c:1271
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" è una directory"
 
-#: src/files.c:441
-#, fuzzy, c-format
+#: src/files.c:447
+#, c-format
 msgid "\"%s\" is not a normal file"
-msgstr "\"%s\" è un file di device"
+msgstr "\"%s\" non è un file normale"
 
-#: src/files.c:566
+#: src/files.c:571
 msgid "No more open file buffers"
 msgstr "Nessun altro buffer aperto"
 
-#: src/files.c:582
+#: src/files.c:586
 #, c-format
 msgid "Switched to %s"
 msgstr "Passato a %s"
 
-#: src/files.c:584 src/global.c:988 src/winio.c:2010
+#: src/files.c:588 src/global.c:1005 src/winio.c:1965
 msgid "New Buffer"
 msgstr "Nuovo buffer"
 
-#: src/files.c:943
+#. TRANSLATORS: Keep the next four messages at most 76 characters.
+#: src/files.c:913
 #, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
 msgstr[0] "Letta %lu riga (Convertita dal formato DOS e Mac)"
 msgstr[1] "Lette %lu righe (Convertite dal formato DOS e Mac)"
 
-#: src/files.c:948
-#, c-format
-msgid ""
-"Read %lu line (Converted from DOS and Mac format - Warning: No write "
-"permission)"
-msgid_plural ""
-"Read %lu lines (Converted from DOS and Mac format - Warning: No write "
-"permission)"
-msgstr[0] ""
-"Letta %lu riga (Convertita dal formato DOS e Mac - Senza permesso di "
-"scrittura)"
-msgstr[1] ""
-"Lette %lu righe (Convertite dal formato DOS e Mac - Senza permesso di "
-"scrittura)"
-
-#: src/files.c:954
+#: src/files.c:919
 #, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
 msgstr[0] "Letta %lu riga (Convertita dal formato Mac)"
 msgstr[1] "Lette %lu righe (Convertite dal formato Mac)"
 
-#: src/files.c:958
-#, c-format
-msgid ""
-"Read %lu line (Converted from Mac format - Warning: No write permission)"
-msgid_plural ""
-"Read %lu lines (Converted from Mac format - Warning: No write permission)"
-msgstr[0] ""
-"Letta %lu riga (Convertita dal formato Mac - Senza permesso di scrittura)"
-msgstr[1] ""
-"Lette %lu righe (Convertite dal formato Mac - Senza permesso di scrittura)"
-
-#: src/files.c:964
+#: src/files.c:925
 #, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
 msgstr[0] "Letta %lu riga (Convertita dal formato DOS)"
 msgstr[1] "Lette %lu righe (Convertite dal formato DOS)"
 
-#: src/files.c:968
-#, c-format
-msgid ""
-"Read %lu line (Converted from DOS format - Warning: No write permission)"
-msgid_plural ""
-"Read %lu lines (Converted from DOS format - Warning: No write permission)"
-msgstr[0] ""
-"Letta %lu riga (Convertita dal formato DOS - Senza permesso di scrittura)"
-msgstr[1] ""
-"Lette %lu righe (Convertite dal formato DOS - Senza permesso di scrittura)"
-
-#: src/files.c:974
+#: src/files.c:930
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "Letta %lu riga"
 msgstr[1] "Lette %lu righe"
 
-#: src/files.c:977
-#, fuzzy, c-format
-msgid "Read %lu line (Warning: No write permission)"
-msgid_plural "Read %lu lines (Warning: No write permission)"
-msgstr[0] "Letta %lu riga (Attenzione: permessi di scrittura mancanti)"
-msgstr[1] "Lette %lu righe (Attenzione: permessi di scrittura mancanti)"
-
-#: src/files.c:1019 src/files.c:1056
+#: src/files.c:974 src/files.c:1006
 msgid "Reading File"
 msgstr "Lettura file"
 
-#: src/files.c:1025
+#: src/files.c:980
 msgid "New File"
 msgstr "Nuovo file"
 
-#: src/files.c:1028
-#, c-format
-msgid "\"%s\" not found"
+#: src/files.c:983
+#, fuzzy, c-format
+msgid "File \"%s\" not found"
 msgstr "\"%s\" non trovato"
 
-#: src/files.c:1039 src/rcfile.c:590 src/rcfile.c:1386 src/rcfile.c:1427
+#: src/files.c:992 src/rcfile.c:534 src/rcfile.c:1231 src/rcfile.c:1272
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" è un file di device"
 
-#: src/files.c:1133
+#: src/files.c:1083
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Comando da eseguire in un nuovo buffer [da %s] "
 
-#: src/files.c:1135
+#: src/files.c:1085
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Comando da eseguire [da %s] "
 
-#: src/files.c:1142
+#: src/files.c:1092
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "File da inserire in un nuovo buffer [da %s] "
 
-#: src/files.c:1144
+#: src/files.c:1094
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "File da inserire [da %s] "
 
-#: src/files.c:1389
+#: src/files.c:1338
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Chiave non valida in modalità non multibuffer"
 
-#: src/files.c:1684
-msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+#: src/files.c:1632
+#, fuzzy
+msgid "Failed to write backup file; continue saving? (Say N if unsure.) "
 msgstr ""
 "Scrittura del file di backup non riuscita, continuare il salvataggio? (In "
 "dubbio, rispondere N) "
 
-#: src/files.c:1800
+#: src/files.c:1750
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Impossibile salvare fuori da %s"
 
-#: src/files.c:1885 src/files.c:1910 src/files.c:1928 src/files.c:1941
-#: src/files.c:1952 src/files.c:1981
+#: src/files.c:1833 src/files.c:1858 src/files.c:1876 src/files.c:1889
+#: src/files.c:1900 src/files.c:1928
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Errore durante la scrittura del file di backup %s: %s"
 
-#: src/files.c:1886 src/nano.c:690
+#: src/files.c:1834 src/nano.c:692
 msgid "Too many backup files?"
 msgstr "Troppi file di backup?"
 
-#: src/files.c:2026 src/text.c:2863 src/text.c:2875 src/text.c:3244
-#: src/text.c:3253
+#: src/files.c:1972 src/text.c:3117 src/text.c:3129 src/text.c:3498
+#: src/text.c:3507
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Errore durante la scrittura del file temporaneo: %s"
 
-#: src/files.c:2049 src/files.c:2068 src/files.c:2080 src/files.c:2104
-#: src/files.c:2121 src/files.c:2131 src/files.c:2164 src/files.c:2171
+#: src/files.c:1994 src/files.c:2013 src/files.c:2023 src/files.c:2047
+#: src/files.c:2064 src/files.c:2074 src/files.c:2106 src/files.c:2113
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Errore durante la scrittura di %s: %s"
 
-#: src/files.c:2200
+#: src/files.c:2154
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "Scritta %lu riga"
 msgstr[1] "Scritte %lu righe"
 
-#: src/files.c:2299
+#: src/files.c:2249
 msgid " [DOS Format]"
 msgstr " [Formato DOS]"
 
-#: src/files.c:2300
+#: src/files.c:2250
 msgid " [Mac Format]"
 msgstr " [Formato Mac]"
 
-#: src/files.c:2302
+#: src/files.c:2252
 msgid " [Backup]"
 msgstr " [Backup]"
 
-#: src/files.c:2309
+#: src/files.c:2259
 msgid "Prepend Selection to File"
 msgstr "Inserisce selezione in testa al file"
 
-#: src/files.c:2310
+#: src/files.c:2260
 msgid "Append Selection to File"
 msgstr "Accoda selezione al file"
 
-#: src/files.c:2311
+#: src/files.c:2261
 msgid "Write Selection to File"
 msgstr "Salva selezione nel file"
 
-#: src/files.c:2314
+#: src/files.c:2264
 msgid "File Name to Prepend to"
 msgstr "Nome del file in cui inserire in testa"
 
-#: src/files.c:2315
+#: src/files.c:2265
 msgid "File Name to Append to"
 msgstr "Nome del file a cui accodare"
 
-#: src/files.c:2316
+#: src/files.c:2266
 msgid "File Name to Write"
 msgstr "Nome del file in cui salvare"
 
-#: src/files.c:2349
+#: src/files.c:2301
 #, fuzzy
-msgid "Save modified buffer anyway ? "
-msgstr "Salvare il buffer prima dell'esecuzione del linter?"
+msgid "Save modified buffer anyway? "
+msgstr "Salvare le modifiche al buffer comunque?"
 
-#: src/files.c:2457
-msgid "File exists, OVERWRITE ? "
-msgstr "Il file esiste, SOVRASCRIVERE?"
-
-#: src/files.c:2466
-msgid "Save file under DIFFERENT NAME ? "
+#: src/files.c:2412
+#, fuzzy
+msgid "Save file under DIFFERENT NAME? "
 msgstr "Salvare il file con un NOME DIFFERENTE?"
 
-#: src/files.c:2480
-msgid "File was modified since you opened it, continue saving ? "
+#: src/files.c:2420
+#, fuzzy, c-format
+msgid "File \"%s\" exists; OVERWRITE? "
+msgstr "Il file esiste, SOVRASCRIVERE?"
+
+#: src/files.c:2441
+#, fuzzy
+msgid "File was modified since you opened it; continue saving? "
 msgstr "Il file è stato modificato dall'apertura. Continuare a salvare? "
 
-#: src/files.c:2917
+#: src/files.c:2874
 msgid "(more)"
 msgstr "(ancora)"
 
-#: src/files.c:3004
+#: src/files.c:2959
 #, c-format
 msgid ""
 "\n"
@@ -395,7 +372,7 @@ msgstr ""
 "\n"
 "Premere Invio per continuare\n"
 
-#: src/files.c:3020
+#: src/files.c:2975
 #, c-format
 msgid ""
 "Unable to create directory %s: %s\n"
@@ -404,7 +381,7 @@ msgstr ""
 "Impossibile creare la directory %s: %s\n"
 "È richiesta per salvare/caricare le ricerche o le posizioni del cursore.\n"
 
-#: src/files.c:3026
+#: src/files.c:2982
 #, c-format
 msgid ""
 "Path %s is not a directory and needs to be.\n"
@@ -414,7 +391,7 @@ msgstr ""
 "Nano non sarà in grado di caricare o salvare le ricerche o le posizioni del "
 "cursore.\n"
 
-#: src/files.c:3045
+#: src/files.c:3002
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I tried to move\n"
@@ -423,7 +400,7 @@ msgstr ""
 "Riscontrato un file di nano obsoleto (%s): si è cercato di spostarlo\n"
 "al percorso preferito (%s) ma si è verificato un errore: %s"
 
-#: src/files.c:3049
+#: src/files.c:3006
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I moved\n"
@@ -434,740 +411,766 @@ msgstr ""
 "preferito (%s)\n"
 "(vedere la FAQ di nano a proposito di questo cambiamento)"
 
-#: src/files.c:3132 src/files.c:3140 src/files.c:3164 src/files.c:3176
-#, fuzzy, c-format
+#: src/files.c:3089 src/files.c:3097 src/files.c:3121 src/files.c:3133
+#, c-format
 msgid "Error writing %s: %s\n"
-msgstr "Errore durante la scrittura di %s: %s"
+msgstr "Errore durante la scrittura di %s: %s\n"
 
 #. TRANSLATORS: Try to keep the next fifteen strings at most 10 characters.
-#: src/global.c:480
+#: src/global.c:483
 msgid "Exit"
 msgstr "Esci"
 
-#: src/global.c:481
+#: src/global.c:484
 msgid "Close"
 msgstr "Chiudi"
 
-#: src/global.c:482
+#: src/global.c:485
 msgid "Uncut Text"
 msgstr "Incolla"
 
-#: src/global.c:484
+#: src/global.c:487
 msgid "Unjustify"
 msgstr "Degiustif."
 
-#: src/global.c:490
+#: src/global.c:493
 msgid "Read File"
 msgstr "Inserisci"
 
-#: src/global.c:491
+#: src/global.c:494
 msgid "Where Is"
 msgstr "Cerca"
 
-#: src/global.c:492
+#: src/global.c:495
 msgid "Replace"
 msgstr "Sostituisci"
 
-#: src/global.c:493
+#: src/global.c:496
 msgid "Go To Line"
 msgstr "Vai a riga"
 
-#: src/global.c:494
+#: src/global.c:497
 msgid "Prev Line"
 msgstr "Riga prec."
 
-#: src/global.c:495
+#: src/global.c:498
 msgid "Next Line"
 msgstr "Riga succ."
 
-#: src/global.c:496
+#: src/global.c:499
 msgid "Prev Page"
 msgstr "Pag Prec."
 
-#: src/global.c:497
+#: src/global.c:500
 msgid "Next Page"
 msgstr "Pag Succ."
 
-#: src/global.c:499
+#: src/global.c:502
 msgid "Justify"
 msgstr "Giustifica"
 
-#: src/global.c:500
+#: src/global.c:503
 msgid "FullJstify"
 msgstr "Giust.File"
 
-#: src/global.c:502
+#: src/global.c:505
 msgid "Refresh"
 msgstr "Aggiorna"
 
 # FIXME
 #. TRANSLATORS: Try to keep this string at most 12 characters.
-#: src/global.c:505
+#: src/global.c:508
 msgid "WhereIs Next"
 msgstr "Successivo"
 
 #. TRANSLATORS: The next long series of strings are shortcut descriptions;
 #. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:512
+#: src/global.c:515
 msgid "Justify the current paragraph"
 msgstr "Giustifica il paragrafo corrente"
 
-#: src/global.c:514
+#: src/global.c:517
 msgid "Cancel the current function"
 msgstr "Annulla la funzione corrente"
 
-#: src/global.c:515
+#: src/global.c:518
 msgid "Display this help text"
 msgstr "Mostra questo messaggio di aiuto"
 
-#: src/global.c:518
+#: src/global.c:521
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Chiude il file corrente / Esce da nano"
 
-#: src/global.c:520
+#: src/global.c:523
 msgid "Exit from nano"
 msgstr "Esce da nano"
 
-#: src/global.c:524
+#: src/global.c:527
 msgid "Write the current file to disk"
 msgstr "Salva il file corrente su disco"
 
-#: src/global.c:526
+#: src/global.c:529
 msgid "Insert another file into the current one"
 msgstr "Inserisce un altro file nel corrente"
 
-#: src/global.c:528
+#: src/global.c:531
 msgid "Search for a string or a regular expression"
 msgstr "Cerca una stringa o un'espressione regolare"
 
-#: src/global.c:531
+#: src/global.c:533
 msgid "Search for a string"
 msgstr "Cerca una stringa"
 
-#: src/global.c:533
+#: src/global.c:534
+msgid "Refresh the file list"
+msgstr ""
+
+#: src/global.c:535
+#, fuzzy
+msgid "Go to lefthand column"
+msgstr "Va a un numero di riga e di colonna specifico"
+
+#: src/global.c:536
+#, fuzzy
+msgid "Go to righthand column"
+msgstr "Va a un numero di riga e di colonna specifico"
+
+#: src/global.c:538
 msgid "Go one screenful up"
 msgstr "Va alla schermata precedente"
 
-#: src/global.c:534
+#: src/global.c:539
 msgid "Go one screenful down"
 msgstr "Va alla schermata successiva"
 
-#: src/global.c:536
+#: src/global.c:541
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Taglia la riga corrente e la memorizza nel cutbuffer"
 
-#: src/global.c:538
+#: src/global.c:543
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Incolla dal cutbuffer nella riga corrente"
 
-#: src/global.c:539
+#: src/global.c:544
 msgid "Display the position of the cursor"
 msgstr "Mostra la posizione del cursore"
 
-#: src/global.c:541
+#: src/global.c:546
 msgid "Invoke the spell checker, if available"
 msgstr "Esegue il correttore ortografico, se disponibile"
 
-#: src/global.c:543
+#: src/global.c:548
 msgid "Replace a string or a regular expression"
 msgstr "Sostituisce una stringa o un'espressione regolare"
 
-#: src/global.c:544
+#: src/global.c:549
 msgid "Go to line and column number"
 msgstr "Va a un numero di riga e di colonna specifico"
 
-#: src/global.c:546
+#: src/global.c:551
 msgid "Mark text starting from the cursor position"
 msgstr "Marca testo partendo dalla posizione del cursore"
 
-#: src/global.c:547
+#: src/global.c:552
 msgid "Repeat the last search"
 msgstr "Ripete l'ultima ricerca"
 
-#: src/global.c:549
+#: src/global.c:554
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "Copia la riga corrente e la memorizza nel cutbuffer"
 
-#: src/global.c:550
+#: src/global.c:555
 msgid "Indent the current line"
 msgstr "Applica indentazione alla riga corrente"
 
-#: src/global.c:551
+#: src/global.c:556
 msgid "Unindent the current line"
 msgstr "Toglie indentazione dalla riga corrente"
 
-#: src/global.c:552
+#: src/global.c:558
+msgid "Comment/uncomment the current line or marked lines"
+msgstr ""
+
+#: src/global.c:560
 msgid "Undo the last operation"
 msgstr "Annulla l'ultima operazione"
 
-#: src/global.c:553
+#: src/global.c:561
 msgid "Redo the last undone operation"
 msgstr "Ripete l'ultima operazione"
 
-#: src/global.c:555
+#: src/global.c:563
 msgid "Go back one character"
 msgstr "Arretra di un carattere"
 
-#: src/global.c:556
+#: src/global.c:564
 msgid "Go forward one character"
 msgstr "Avanza di un carattere"
 
-#: src/global.c:558
+#: src/global.c:566
 msgid "Go back one word"
 msgstr "Arretra di una parola"
 
-#: src/global.c:559
+#: src/global.c:567
 msgid "Go forward one word"
 msgstr "Avanza di una parola"
 
-#: src/global.c:561
+#: src/global.c:569
 msgid "Go to previous line"
 msgstr "Va alla riga precedente"
 
-#: src/global.c:562
+#: src/global.c:570
 msgid "Go to next line"
 msgstr "Va alla riga successiva"
 
-#: src/global.c:563
+#: src/global.c:571
 msgid "Go to beginning of current line"
 msgstr "Va all'inizio della riga corrente"
 
-#: src/global.c:564
+#: src/global.c:572
 msgid "Go to end of current line"
 msgstr "Va alla fine della riga corrente"
 
-#: src/global.c:567
+#: src/global.c:575
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "Va all'inizio del paragrafo; poi al paragrafo precedente"
 
-#: src/global.c:569
+#: src/global.c:577
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr "Va alla fine del paragrafo; poi al paragrafo successivo"
 
-#: src/global.c:571
+#: src/global.c:579
 msgid "Go to the first line of the file"
 msgstr "Va alla prima riga del file"
 
-#: src/global.c:572
+#: src/global.c:580
 msgid "Go to the last line of the file"
 msgstr "Va all'ultima riga del file"
 
-#: src/global.c:574
+#: src/global.c:582
 msgid "Go to the matching bracket"
 msgstr "Va alla parentesi corrispondente"
 
-#: src/global.c:576
+#: src/global.c:584
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "Scorre in alto di una riga senza muovere il cursore"
 
-#: src/global.c:578
+#: src/global.c:586
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "Scorre in basso di una riga senza muovere il cursore"
 
-#: src/global.c:581
+#: src/global.c:589
 msgid "Switch to the previous file buffer"
 msgstr "Va al buffer precedente"
 
-#: src/global.c:582
+#: src/global.c:590
 msgid "Switch to the next file buffer"
 msgstr "Va al buffer successivo"
 
 # NdT: di fatto funziona per un solo carattere alla volta.
-#: src/global.c:584
+#: src/global.c:592
 msgid "Insert the next keystroke verbatim"
 msgstr "Inserisce un carattere letteralmente"
 
-#: src/global.c:585
+#: src/global.c:593
 msgid "Insert a tab at the cursor position"
 msgstr "Inserisce una tabulazione alla posizione del cursore"
 
-#: src/global.c:586
+#: src/global.c:594
 msgid "Insert a newline at the cursor position"
 msgstr "Inserisce un ritorno a capo alla posizione del cursore"
 
-#: src/global.c:587
+#: src/global.c:595
 msgid "Delete the character under the cursor"
 msgstr "Elimina il carattere sotto il cursore"
 
-#: src/global.c:589
+#: src/global.c:597
 msgid "Delete the character to the left of the cursor"
 msgstr "Elimina il carattere a sinistra del cursore"
 
-#: src/global.c:592
-#, fuzzy
+#: src/global.c:600
 msgid "Cut backward from cursor to word start"
-msgstr "Taglia dal cursore a fine riga"
+msgstr "Taglia all'indietro dal cursore a inizio parola"
 
-#: src/global.c:594
-#, fuzzy
+#: src/global.c:602
 msgid "Cut forward from cursor to next word start"
-msgstr "Taglia dal cursore a fine riga"
+msgstr "Taglia in avanti dal cursore all'inizio della prossima parola"
 
-#: src/global.c:596
+#: src/global.c:604
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Taglia dal cursore alla fine del file"
 
-#: src/global.c:599
+#: src/global.c:607
 msgid "Justify the entire file"
 msgstr "Giustifica l'intero file"
 
-#: src/global.c:603
+#: src/global.c:611
 msgid "Count the number of words, lines, and characters"
 msgstr "Conta il numero di parole, righe e caratteri"
 
-#: src/global.c:606
+#: src/global.c:614
 msgid "Refresh (redraw) the current screen"
 msgstr "Aggiorna la schermata corrente"
 
-#: src/global.c:608
-#, fuzzy
+#: src/global.c:616
 msgid "Suspend the editor (if suspension is enabled)"
 msgstr "Sospende l'editor (se la sospensione è abilitata)"
 
-#: src/global.c:610
+#: src/global.c:618
 msgid "Save file without prompting"
-msgstr ""
+msgstr "Salva il file senza chiedere conferma"
 
-#: src/global.c:611
+#: src/global.c:619
 msgid "Search next occurrence backward"
-msgstr ""
+msgstr "Ricerca la prossima occorrenza all'indietro"
 
-#: src/global.c:612
+#: src/global.c:620
 msgid "Search next occurrence forward"
-msgstr ""
+msgstr "Ricerca la prossima occorrenza in avanti"
 
 # FIXME
-#: src/global.c:614
+#: src/global.c:622
 msgid "Toggle the case sensitivity of the search"
 msgstr "Considera maiuscole/minuscole nella ricerca"
 
-#: src/global.c:616
+#: src/global.c:624
 msgid "Reverse the direction of the search"
 msgstr "Inverte la direzione di ricerca"
 
 # FIXME
-#: src/global.c:620
+#: src/global.c:628
 msgid "Toggle the use of regular expressions"
 msgstr "Attiva/disattiva uso di espressioni regolari"
 
-#: src/global.c:624
+#: src/global.c:632
 msgid "Recall the previous search/replace string"
 msgstr "Richiama la stringa di ricerca/sostituzione precedente"
 
-#: src/global.c:626
+#: src/global.c:634
 msgid "Recall the next search/replace string"
 msgstr "Richiama la stringa di ricerca/sostituzione successiva"
 
-#: src/global.c:629
+#: src/global.c:637
 msgid "Go to file browser"
 msgstr "Va al browser di file"
 
 # FIXME
-#: src/global.c:632
+#: src/global.c:640
 msgid "Toggle the use of DOS format"
 msgstr "Usa il formato DOS"
 
 # FIXME
-#: src/global.c:633
+#: src/global.c:641
 msgid "Toggle the use of Mac format"
 msgstr "Usa il formato Mac"
 
-#: src/global.c:634
+#: src/global.c:642
 msgid "Toggle appending"
 msgstr "Attiva/disattiva scrittura in coda al file"
 
-#: src/global.c:635
+#: src/global.c:643
 msgid "Toggle prepending"
 msgstr "Attiva/disattiva scrittura in testa al file"
 
-#: src/global.c:636
+#: src/global.c:644
 msgid "Toggle backing up of the original file"
 msgstr "Attiva/disattiva creazione copia di backup del file originale"
 
-#: src/global.c:637
+#: src/global.c:645
 msgid "Execute external command"
 msgstr "Esegue un comando esterno"
 
-#: src/global.c:639
+#: src/global.c:647
 msgid "Close buffer without saving it"
-msgstr ""
+msgstr "Chiude il buffer senza salvarlo"
 
 # FIXME
-#: src/global.c:641
+#: src/global.c:649
 msgid "Toggle the use of a new buffer"
 msgstr "Usa un nuovo buffer"
 
-#: src/global.c:644
+#: src/global.c:652
 msgid "Exit from the file browser"
 msgstr "Esce dal browser di file"
 
-#: src/global.c:645
+#: src/global.c:653
 msgid "Go to the first file in the list"
 msgstr "Va al primo file dell'elenco"
 
-#: src/global.c:646
+#: src/global.c:654
 msgid "Go to the last file in the list"
 msgstr "Va all'ultimo file dell'elenco"
 
-#: src/global.c:647
+#: src/global.c:655
 msgid "Go to the previous file in the list"
 msgstr "Va al precedente file dell'elenco"
 
-#: src/global.c:648
+#: src/global.c:656
 msgid "Go to the next file in the list"
 msgstr "Va al prossimo file dell'elenco"
 
 # NdT: questo messaggio è usato come comando.
-#: src/global.c:649
+#: src/global.c:657
 msgid "Go to directory"
 msgstr "Va alla directory"
 
-#: src/global.c:652
+#: src/global.c:660
 msgid "Invoke the linter, if available"
 msgstr "Esegue il linter, se disponibile"
 
-#: src/global.c:653
+#: src/global.c:661
 msgid "Go to previous linter msg"
 msgstr "Va alla messaggio precedente del linter"
 
-#: src/global.c:654
+#: src/global.c:662
 msgid "Go to next linter msg"
 msgstr "Va al messaggio successivo del linter"
 
-#: src/global.c:656
+#: src/global.c:664
 msgid "Invoke formatter, if available"
 msgstr "Esegue il formattatore, se disponibile"
 
 #. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:671
+#: src/global.c:679
 msgid "Get Help"
 msgstr "Guida"
 
-#: src/global.c:674 src/prompt.c:858
+#: src/global.c:682 src/prompt.c:855
 msgid "Cancel"
 msgstr "Annulla"
 
-#: src/global.c:687
+#: src/global.c:695
 msgid "Write Out"
 msgstr "Salva"
 
-#: src/global.c:723
+#: src/global.c:731
 msgid "Go To Dir"
-msgstr "Vai alla directory"
+msgstr "Vai a dir."
 
-#: src/global.c:738
+#: src/global.c:746
 msgid "Cut Text"
 msgstr "Taglia"
 
-#: src/global.c:753
+#: src/global.c:761
 msgid "To Spell"
 msgstr "Ortografia"
 
-#: src/global.c:757
+#: src/global.c:765
 msgid "To Linter"
 msgstr "Linter"
 
-#: src/global.c:760
+#: src/global.c:768
 msgid "Formatter"
 msgstr "Formattatore"
 
 # FIXME
-#: src/global.c:767
+#: src/global.c:775
 msgid "Case Sens"
 msgstr "Maius/Minus"
 
-#: src/global.c:772
+#: src/global.c:780
 msgid "Regexp"
 msgstr "Espr.Reg."
 
-#: src/global.c:777
+#: src/global.c:785
 msgid "Backwards"
 msgstr "Indietro"
 
-#: src/global.c:784
+#: src/global.c:792
 msgid "No Replace"
 msgstr "Non sost."
 
-#: src/global.c:792
+#: src/global.c:800
 msgid "Cur Pos"
 msgstr "Posizione"
 
-#: src/global.c:807
+#: src/global.c:815
 msgid "First Line"
 msgstr "Prima riga"
 
-#: src/global.c:809
+#: src/global.c:817
 msgid "Last Line"
 msgstr "Ultima riga"
 
-#: src/global.c:816
+#: src/global.c:824
 msgid "To Bracket"
 msgstr "Parentesi"
 
-#: src/global.c:819
+#: src/global.c:827
 msgid "Mark Text"
 msgstr "Marca testo"
 
-#: src/global.c:822
+#: src/global.c:830
 msgid "Copy Text"
 msgstr "Copia"
 
-#: src/global.c:825
+#: src/global.c:833
 msgid "Indent Text"
 msgstr "Indenta"
 
 # FIXME
-#: src/global.c:827
+#: src/global.c:835
 msgid "Unindent Text"
 msgstr "Deindenta"
 
-#: src/global.c:830
+#: src/global.c:838
 msgid "Undo"
 msgstr "Annulla"
 
-#: src/global.c:832
+#: src/global.c:840
 msgid "Redo"
 msgstr "Ripeti"
 
-#: src/global.c:836 src/global.c:842
+#: src/global.c:844 src/global.c:850
 msgid "Back"
 msgstr "Indietro"
 
-#: src/global.c:838 src/global.c:844
+#: src/global.c:846 src/global.c:852
 msgid "Forward"
 msgstr "Avanti"
 
-#: src/global.c:849
+#: src/global.c:857
 msgid "Prev Word"
 msgstr "Parola prec."
 
-#: src/global.c:851
+#: src/global.c:859
 msgid "Next Word"
 msgstr "Parola succ."
 
-#: src/global.c:855
+#: src/global.c:863
 msgid "Home"
 msgstr "Inizio"
 
-#: src/global.c:857
+#: src/global.c:865
 msgid "End"
 msgstr "Fine"
 
-#: src/global.c:866
+#: src/global.c:874
 msgid "Beg of Par"
 msgstr "Iniz.Par."
 
-#: src/global.c:868
+#: src/global.c:876
 msgid "End of Par"
 msgstr "Fine Par."
 
-#: src/global.c:873
+#: src/global.c:881
 msgid "Scroll Up"
 msgstr "Scorri su"
 
-#: src/global.c:875
+#: src/global.c:883
 msgid "Scroll Down"
 msgstr "Scorri giù"
 
-#: src/global.c:880
+#: src/global.c:888
 msgid "Prev File"
 msgstr "File prec."
 
-#: src/global.c:882
+#: src/global.c:890
 msgid "Next File"
 msgstr "File succ."
 
-#: src/global.c:891
+#: src/global.c:899
 msgid "Verbatim"
 msgstr "Letterale"
 
-#: src/global.c:894
+#: src/global.c:902
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:896
+#: src/global.c:904
 msgid "Enter"
 msgstr "Invio"
 
-#: src/global.c:899
+#: src/global.c:907
 msgid "Delete"
 msgstr "Elimina"
 
-#: src/global.c:901
+#: src/global.c:909
 msgid "Backspace"
 msgstr "Backspace"
 
 #. TRANSLATORS: The next two strings refer to cutting words.
-#: src/global.c:912
-#, fuzzy
+#: src/global.c:920
 msgid "Cut Left"
-msgstr "Taglia"
+msgstr "Taglia sin."
 
-#: src/global.c:914
+#: src/global.c:922
 msgid "Cut Right"
-msgstr ""
+msgstr "Taglia des."
 
 # FIXME
-#: src/global.c:916
+#: src/global.c:924
 msgid "CutTillEnd"
 msgstr "TagliaAFine"
 
-#: src/global.c:926
+#: src/global.c:934
 msgid "Word Count"
 msgstr "Conta parole"
 
-#: src/global.c:933
+#: src/global.c:941
 msgid "Suspend"
 msgstr "Sospendi"
 
-#: src/global.c:937
+#: src/global.c:945
+#, fuzzy
+msgid "Comment Lines"
+msgstr "Riga succ."
+
+#: src/global.c:949
 msgid "Save"
-msgstr ""
+msgstr "Salva"
 
-#: src/global.c:940
+#: src/global.c:952
 msgid "Previous"
-msgstr ""
+msgstr "Precedente"
 
-#: src/global.c:942
-#, fuzzy
+#: src/global.c:954
 msgid "Next"
-msgstr "Riga succ."
+msgstr "Successiva"
 
 # FIXME
-#: src/global.c:948
+#: src/global.c:960
 msgid "PrevHstory"
 msgstr "Precedente"
 
 # FIXME
-#: src/global.c:951
+#: src/global.c:963
 msgid "NextHstory"
 msgstr "Successivo"
 
-#: src/global.c:955
+#: src/global.c:972
 msgid "Go To Text"
 msgstr "Vai al testo"
 
-#: src/global.c:959
+#: src/global.c:976
 msgid "DOS Format"
 msgstr "Formato DOS"
 
-#: src/global.c:961
+#: src/global.c:978
 msgid "Mac Format"
 msgstr "Formato Mac"
 
-#: src/global.c:969
+#: src/global.c:986
 msgid "Append"
 msgstr "Accoda"
 
-#: src/global.c:971
+#: src/global.c:988
 msgid "Prepend"
 msgstr "Scrivi in testa"
 
-#: src/global.c:974
+#: src/global.c:991
 msgid "Backup File"
 msgstr "File di backup"
 
-#: src/global.c:981
+#: src/global.c:998
 msgid "Execute Command"
 msgstr "Esegui comando"
 
-#: src/global.c:996
+#: src/global.c:1013
 msgid "To Files"
 msgstr "Sfoglia"
 
-#: src/global.c:1004
+#: src/global.c:1021
 msgid "First File"
 msgstr "Primo file"
 
-#: src/global.c:1006
+#: src/global.c:1023
 msgid "Last File"
 msgstr "Ultimo file"
 
-#: src/global.c:1010
+#: src/global.c:1027
 msgid "Discard buffer"
 msgstr ""
 
+#: src/global.c:1038
+msgid "Left Column"
+msgstr ""
+
+#: src/global.c:1040
+msgid "Right Column"
+msgstr ""
+
 #. TRANSLATORS: Try to keep the next two strings at most 20 characters.
-#: src/global.c:1020
+#: src/global.c:1047
 msgid "Prev Lint Msg"
 msgstr "Msg lint prec."
 
-#: src/global.c:1022
+#: src/global.c:1049
 msgid "Next Lint Msg"
 msgstr "Msg lint succ."
 
 #. TRANSLATORS: The next seventeen strings are toggle descriptions;
 #. * they are best kept shorter than 40 characters, but may be longer.
-#: src/global.c:1285
+#: src/global.c:1316
 msgid "Help mode"
 msgstr "Barra dei comandi"
 
-#: src/global.c:1287
+#: src/global.c:1318
 msgid "Constant cursor position display"
 msgstr "Mostra sempre la posizione del cursore"
 
 # FIXME
-#: src/global.c:1289
+#: src/global.c:1320
 msgid "Use of one more line for editing"
 msgstr "Usa una riga in più per le modifiche"
 
-#: src/global.c:1291
+#: src/global.c:1322
 msgid "Smooth scrolling"
 msgstr "Scorrimento continuo"
 
-#: src/global.c:1293
+#: src/global.c:1324
 msgid "Soft wrapping of overlong lines"
 msgstr "A capo automatico morbido delle righe lunghe"
 
-#: src/global.c:1295
+#: src/global.c:1326
 msgid "Whitespace display"
 msgstr "Mostra spazi bianchi"
 
-#: src/global.c:1297
+#: src/global.c:1328
 msgid "Color syntax highlighting"
 msgstr "Sintassi colorata"
 
-#: src/global.c:1299
+#: src/global.c:1330
 msgid "Smart home key"
 msgstr "Tasto Inizio intelligente"
 
-#: src/global.c:1301
+#: src/global.c:1332
 msgid "Auto indent"
 msgstr "Indentazione automatica"
 
-#: src/global.c:1303
+#: src/global.c:1334
 msgid "Cut to end"
 msgstr "Taglia fino a fine riga"
 
-#: src/global.c:1305
+#: src/global.c:1336
 msgid "Hard wrapping of overlong lines"
 msgstr "A capo automatico delle righe lunghe"
 
-#: src/global.c:1307
+#: src/global.c:1338
 msgid "Conversion of typed tabs to spaces"
 msgstr "Conversione delle tabulazioni in spazi"
 
-#: src/global.c:1309
+#: src/global.c:1340
 msgid "Backup files"
 msgstr "File di backup"
 
-#: src/global.c:1311
+#: src/global.c:1342
 msgid "Reading file into separate buffer"
 msgstr "Lettura del file in un altro buffer"
 
-#: src/global.c:1313
+#: src/global.c:1344
 msgid "Mouse support"
 msgstr "Supporto per il mouse"
 
-#: src/global.c:1315
+#: src/global.c:1346
 msgid "No conversion from DOS/Mac format"
 msgstr "Nessuna conversione dai formati DOS/Mac"
 
-#: src/global.c:1317
+#: src/global.c:1348
 msgid "Suspension"
 msgstr "Sospensione"
 
-#: src/help.c:209
+#: src/help.c:211
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1189,7 +1192,7 @@ msgstr ""
 "prompt di ricerca. Premendo Invio senza inserire nulla, verrà eseguita la "
 "ricerca precedente. "
 
-#: src/help.c:218
+#: src/help.c:220
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1203,7 +1206,7 @@ msgstr ""
 " Le seguenti funzioni sono disponibili in modalità Cerca:\n"
 "\n"
 
-#: src/help.c:224
+#: src/help.c:226
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1223,7 +1226,7 @@ msgstr ""
 " Le seguenti funzioni sono disponibili in modalità Vai a Riga:\n"
 "\n"
 
-#: src/help.c:233
+#: src/help.c:235
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1246,7 +1249,7 @@ msgstr ""
 "provocherà il caricamento in un buffer separato (usare Meta-< e > per "
 "muoversi tra i buffer). "
 
-#: src/help.c:242
+#: src/help.c:244
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1260,7 +1263,7 @@ msgstr ""
 " Le seguenti funzioni sono disponibili in modalità Inserisci:\n"
 "\n"
 
-#: src/help.c:248
+#: src/help.c:250
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1287,7 +1290,7 @@ msgstr ""
 "\n"
 " Le seguenti funzioni sono disponibili in modalità Salva:\n"
 
-#: src/help.c:262
+#: src/help.c:264
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1311,7 +1314,7 @@ msgstr ""
 " Le seguenti funzioni sono disponibili nel file browser\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:277
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1336,7 +1339,7 @@ msgstr ""
 "\n"
 
 # FIXME
-#: src/help.c:284
+#: src/help.c:286
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1344,7 +1347,7 @@ msgstr ""
 "Le seguenti funzioni sono disponibili in modalità Cerca:\n"
 "\n"
 
-#: src/help.c:288
+#: src/help.c:290
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1366,7 +1369,7 @@ msgstr ""
 " Le seguenti funzioni sono disponibili in modalità Vai alla Directory:\n"
 "\n"
 
-#: src/help.c:301
+#: src/help.c:303
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1390,7 +1393,7 @@ msgstr ""
 " Le seguenti funzioni sono disponibili in modalità Ortografia:\n"
 "\n"
 
-#: src/help.c:316
+#: src/help.c:318
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1410,7 +1413,7 @@ msgstr ""
 " Le seguenti funzioni sono disponibili in modalità Esegui comando:\n"
 "\n"
 
-#: src/help.c:329
+#: src/help.c:331
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1430,15 +1433,15 @@ msgstr ""
 "mostra il contenuto del file che si sta modificando. La barra di stato è la "
 "terza riga dal basso e mostra importanti messaggi.  "
 
-#: src/help.c:339
+#: src/help.c:341
+#, fuzzy
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
-" The notation for shortcuts is as follows: Control-key sequences are notated "
-"with a caret (^) symbol and can be entered either by using the Control "
-"(Ctrl) key or pressing the Escape (Esc) key twice.  Escape-key sequences are "
-"notated with the Meta (M-) symbol and can be entered using either the Esc, "
-"Alt, or Meta key depending on your keyboard setup.  "
+" Shortcuts are written as follows: Control-key sequences are notated with a "
+"'^' and can be entered either by using the Ctrl key or pressing the Esc key "
+"twice.  Meta-key sequences are notated with 'M-' and can be entered using "
+"either the Alt, Cmd, or Esc key, depending on your keyboard setup.  "
 msgstr ""
 "Le due righe finali mostrano le abbreviazioni per i comandi usati più "
 "comunemente.\n"
@@ -1467,21 +1470,19 @@ msgstr ""
 msgid "enable/disable"
 msgstr "abilita/disabilita"
 
-#: src/nano.c:559
-#, fuzzy
+#: src/nano.c:560
 msgid "Key is invalid in view mode"
-msgstr "Chiave non valida in modalità Visualizza"
+msgstr "La chiave non è valida in modalità Visualizza"
 
-#: src/nano.c:565
-#, fuzzy
+#: src/nano.c:566
 msgid "This function is disabled in restricted mode"
-msgstr "Impossibile uscire da %s in modalità ristretta"
+msgstr "Questa funzione è disattivata in modalità ristretta"
 
-#: src/nano.c:573
+#: src/nano.c:574
 msgid "Help is not available"
-msgstr ""
+msgstr "Aiuto non disponibile"
 
-#: src/nano.c:684
+#: src/nano.c:686
 #, c-format
 msgid ""
 "\n"
@@ -1490,7 +1491,7 @@ msgstr ""
 "\n"
 "Buffer scritto su %s\n"
 
-#: src/nano.c:686
+#: src/nano.c:688
 #, c-format
 msgid ""
 "\n"
@@ -1499,7 +1500,7 @@ msgstr ""
 "\n"
 "Buffer scritto su %s: %s\n"
 
-#: src/nano.c:689
+#: src/nano.c:691
 #, c-format
 msgid ""
 "\n"
@@ -1675,9 +1676,8 @@ msgid "Fix Backspace/Delete confusion problem"
 msgstr "Risolve il problema Backspace/Canc"
 
 #: src/nano.c:888
-#, fuzzy
 msgid "Show this help text and exit"
-msgstr "Mostra questo messaggio di aiuto"
+msgstr "Mostra questo messaggio di aiuto ed esce"
 
 #: src/nano.c:890
 msgid "Automatically indent new lines"
@@ -1770,17 +1770,22 @@ msgstr "Abilita sospensione"
 msgid "Enable soft line wrapping"
 msgstr "Abilita interruzione morbida delle righe"
 
-#: src/nano.c:937
-#, c-format
-msgid " GNU nano, version %s\n"
+#: src/nano.c:940
+#, fuzzy, c-format
+msgid " nano, version %s\n"
 msgstr " GNU nano versione %s\n"
 
-#: src/nano.c:940
+#: src/nano.c:943
+#, c-format
+msgid " (C) 2014..%s the contributors to nano\n"
+msgstr ""
+
+#: src/nano.c:945
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 
-#: src/nano.c:941
+#: src/nano.c:946
 #, c-format
 msgid ""
 "\n"
@@ -1789,68 +1794,82 @@ msgstr ""
 "\n"
 " Opzioni di compilazione:"
 
-#: src/nano.c:1073
+#: src/nano.c:1081
 msgid "No file name"
 msgstr "Nessun nome di file"
 
-#: src/nano.c:1108
-msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
+#: src/nano.c:1115
+msgid "Save modified buffer?  (Answering \"No\" will DISCARD changes.) "
 msgstr ""
-"Salvare il buffer modificato? (RISPONDERE \"No\" PER ANNULLARE LE MODIFICHE) "
 
-#: src/nano.c:1168
+#: src/nano.c:1178
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "Impossibile riaprire stdin da tastiera\n"
 
-#: src/nano.c:1192
+#: src/nano.c:1202
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "Lettura dallo stdin, ^C per interrompere\n"
 
-#: src/nano.c:1256
+#: src/nano.c:1266
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Ricevuto SIGHUP o SIGTERM\n"
 
-#: src/nano.c:1272
+#: src/nano.c:1282
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Usare \"fg\" per tornare a nano.\n"
 
-#: src/nano.c:1294
+#: src/nano.c:1304
 msgid "Suspension is not enabled"
 msgstr ""
 
-#: src/nano.c:1448
+#: src/nano.c:1459
 msgid "enabled"
 msgstr "abilitato"
 
-#: src/nano.c:1448
+#: src/nano.c:1459
 msgid "disabled"
 msgstr "disabilitato"
 
-#: src/nano.c:1607 src/winio.c:1125
-msgid "Unknown Command"
-msgstr "Comando sconosciuto"
+#: src/nano.c:1573
+msgid "Unbound key"
+msgstr ""
+
+#: src/nano.c:1577
+#, c-format
+msgid "Unbound key: M-%c"
+msgstr ""
+
+#: src/nano.c:1579
+#, c-format
+msgid "Unbound key: ^%c"
+msgstr ""
+
+#: src/nano.c:1581
+#, c-format
+msgid "Unbound key: %c"
+msgstr ""
 
-#: src/nano.c:1720
+#: src/nano.c:1745
 msgid "XON ignored, mumble mumble"
 msgstr "XON ignorato, mmm..."
 
-#: src/nano.c:1725
+#: src/nano.c:1750
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF ignorato, mmm..."
 
-#: src/nano.c:2139 src/rcfile.c:1334
+#: src/nano.c:2166 src/rcfile.c:1187
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Lunghezza della tabulazione \"%s\" non valida"
 
-#: src/nano.c:2200 src/rcfile.c:1259
+#: src/nano.c:2227 src/rcfile.c:1128
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Lunghezza del riempimento \"%s\" non valida"
 
-#: src/nano.c:2247
+#: src/nano.c:2276
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr "Usare \"%s -h\" per elencare le opzioni disponibili.\n"
@@ -1858,114 +1877,118 @@ msgstr "Usare \"%s -h\" per elencare le opzioni disponibili.\n"
 #. TRANSLATORS: For the next three strings, if possible, specify
 #. * the single-byte shortcuts for both your language and English.
 #. * For example, in French: "OoYy" for "Oui".
-#: src/prompt.c:821
+#: src/prompt.c:818
 msgid "Yy"
 msgstr "SsYy"
 
-#: src/prompt.c:822
+#: src/prompt.c:819
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:823
+#: src/prompt.c:820
 msgid "Aa"
 msgstr "Tt"
 
-#: src/prompt.c:845
+#: src/prompt.c:842
 msgid "Yes"
 msgstr "Sì"
 
-#: src/prompt.c:850
+#: src/prompt.c:847
 msgid "All"
 msgstr "Tutti"
 
-#: src/prompt.c:855
+#: src/prompt.c:852
 msgid "No"
 msgstr "No"
 
-#: src/rcfile.c:142
+#: src/rcfile.c:144
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Errore in %s alla riga %lu: "
 
-#: src/rcfile.c:201
+#: src/rcfile.c:203
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "L'argomento \"%s\" ha un \" non terminato"
 
-#: src/rcfile.c:228 src/rcfile.c:280 src/rcfile.c:732 src/rcfile.c:793
-#: src/rcfile.c:882 src/rcfile.c:933
+#: src/rcfile.c:231 src/rcfile.c:674 src/rcfile.c:725 src/rcfile.c:824
 msgid "Regex strings must begin and end with a \" character"
 msgstr "L'espressione regolare deve iniziare e finire con il carattere \""
 
-#: src/rcfile.c:254 src/search.c:62
+#: src/rcfile.c:257 src/search.c:61
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Espressione regolare non corretta \"%s\": %s"
 
-#: src/rcfile.c:274
+#: src/rcfile.c:279
 msgid "Missing syntax name"
 msgstr "Nome di sintassi mancante"
 
-#: src/rcfile.c:345
+#: src/rcfile.c:288
+msgid "A syntax name must be quoted"
+msgstr ""
+
+#: src/rcfile.c:297
 msgid "The \"none\" syntax is reserved"
 msgstr "La sintassi \"none\" è riservata"
 
-#: src/rcfile.c:352
-msgid "The \"default\" syntax must take no extensions"
+#: src/rcfile.c:327
+#, fuzzy
+msgid "The \"default\" syntax does not accept extensions"
 msgstr "La sintassi \"default\" non accetta estensioni"
 
-#: src/rcfile.c:424
+#: src/rcfile.c:369
 msgid "Missing key name"
 msgstr "Nome di chiave mancante"
 
-#: src/rcfile.c:433 src/rcfile.c:444
+#: src/rcfile.c:378 src/rcfile.c:389
 msgid "Key name is too short"
 msgstr "Il nome di chiave è troppo corto"
 
-#: src/rcfile.c:454
+#: src/rcfile.c:399
 msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr "I nomi di chiavi devono cominciare con \"^\", \"M\", o \"F\""
 
-#: src/rcfile.c:457
-#, fuzzy, c-format
+#: src/rcfile.c:402
+#, c-format
 msgid "Key name %s is invalid"
-msgstr "Lunghezza della tabulazione \"%s\" non valida"
+msgstr "Nome della chiave \"%s\" non valido"
 
-#: src/rcfile.c:466
+#: src/rcfile.c:411
 msgid "Must specify a function to bind the key to"
 msgstr "Occorre specificare una funzione a cui associare la chiave"
 
 #. TRANSLATORS: Do not translate the word "all".
-#: src/rcfile.c:476
+#: src/rcfile.c:421
 msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr "Occorre specificare un menù (oppure \"all\") a cui associare la chiave"
 
-#: src/rcfile.c:483
+#: src/rcfile.c:428
 #, c-format
 msgid "Cannot map name \"%s\" to a function"
 msgstr "Impossibile associare il nome \"%s\" a una funzione"
 
-#: src/rcfile.c:490
+#: src/rcfile.c:435
 #, c-format
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "Impossibile associare il nome \"%s\" a un menù"
 
-#: src/rcfile.c:522
+#: src/rcfile.c:467
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr "La funzione \"%s\" non esiste nel menù \"%s\""
 
-#: src/rcfile.c:534
+#: src/rcfile.c:479
 #, c-format
 msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "La chiave \"%s\" non può essere reimpostata"
 
-#: src/rcfile.c:631
+#: src/rcfile.c:576
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr "Errore durante l'espansione di %s: %s"
 
-#: src/rcfile.c:674
+#: src/rcfile.c:616
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1980,68 +2003,51 @@ msgstr ""
 "\"black\", con il prefisso opzionale \"bright\"\n"
 "per i colori di primo piano."
 
-#: src/rcfile.c:696
-msgid "Cannot add a color command without a syntax command"
+#: src/rcfile.c:637 src/rcfile.c:795 src/rcfile.c:858
+#, c-format
+msgid "A '%s' command requires a preceding 'syntax' command"
 msgstr ""
-"Impossibile aggiungere una direttiva di colore senza una riga di sintassi"
 
-#: src/rcfile.c:701
+#: src/rcfile.c:643
 msgid "Missing color name"
 msgstr "Nome del colore mancante"
 
-#: src/rcfile.c:711 src/rcfile.c:872
-msgid "Missing regex string"
-msgstr "Stringa di espressione regolare mancante"
+#: src/rcfile.c:653 src/rcfile.c:807
+#, fuzzy, c-format
+msgid "Missing regex string after '%s' command"
+msgstr "Comando del linter mancante"
 
-#: src/rcfile.c:787
+#: src/rcfile.c:719
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\" richiede un \"end=\" corrispondente"
 
-#: src/rcfile.c:839
+#: src/rcfile.c:768
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
 msgstr "Il colore di sfondo \"%s\" non può essere \"bright\""
 
-# FIXME
-#: src/rcfile.c:867
-msgid "Cannot add a header regex without a syntax command"
-msgstr ""
-"Impossibile aggiungere un'intestazione regex senza una riga di sintassi"
-
-# FIXME
-#: src/rcfile.c:922
-msgid "Cannot add a magic string regex without a syntax command"
-msgstr ""
-"Impossibile aggiungere un'intestazione regex senza una riga di sintassi"
-
-# FIXME
-#: src/rcfile.c:927
-msgid "Missing magic string name"
-msgstr "Stringa di intestazione mancante"
-
-#: src/rcfile.c:985
-msgid "Cannot add a linter without a syntax command"
-msgstr "Impossibile aggiungere un linter senza una riga di sintassi"
+#: src/rcfile.c:802
+#, fuzzy, c-format
+msgid "The \"default\" syntax does not accept '%s' regexes"
+msgstr "La sintassi \"default\" non accetta estensioni"
 
-#: src/rcfile.c:990
-msgid "Missing linter command"
+#: src/rcfile.c:863
+#, fuzzy, c-format
+msgid "Missing command after '%s'"
 msgstr "Comando del linter mancante"
 
-#: src/rcfile.c:1011
-msgid "Cannot add formatter without a syntax command"
-msgstr "Impossibile aggiungere un formattatore senza una riga di sintassi"
-
-#: src/rcfile.c:1016
-msgid "Missing formatter command"
-msgstr "Comando del formattatore mancante"
+#: src/rcfile.c:879
+#, fuzzy, c-format
+msgid "Argument of '%s' lacks closing \""
+msgstr "L'argomento \"%s\" ha un \" non terminato"
 
-#: src/rcfile.c:1046
+#: src/rcfile.c:910
 #, c-format
 msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr ""
 "Errore fatale: nessuna chiave associata alla funzione \"%s\". Uscita.\n"
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:912
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
@@ -2049,63 +2055,63 @@ msgstr ""
 "Usare nano con l'opzione -I se occorre modificare le impostazioni di "
 "nanorc.\n"
 
-#: src/rcfile.c:1109
+#: src/rcfile.c:971
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "Impossibile trovare sintassi \"%s\" da estendere"
 
+#: src/rcfile.c:993 src/rcfile.c:1202
+#, c-format
+msgid "Syntax \"%s\" has no color commands"
+msgstr "La sintassi \"%s\" non ha direttive di colore"
+
 # FIXME
-#: src/rcfile.c:1125 src/rcfile.c:1134 src/rcfile.c:1144
+#: src/rcfile.c:1024
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Comando \"%s\" non permesso nel file incluso"
 
-#: src/rcfile.c:1150 src/rcfile.c:1359
-#, c-format
-msgid "Syntax \"%s\" has no color commands"
-msgstr "La sintassi \"%s\" non ha direttive di colore"
-
-#: src/rcfile.c:1180
+#: src/rcfile.c:1039
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Comando \"%s\" non riconosciuto"
 
-#: src/rcfile.c:1195
+#: src/rcfile.c:1051
 msgid "Missing option"
 msgstr "Opzione mancante"
 
-#: src/rcfile.c:1217
+#: src/rcfile.c:1065
+#, c-format
+msgid "Unknown option \"%s\""
+msgstr "Opzione \"%s\" sconosciuta"
+
+#: src/rcfile.c:1077
+#, c-format
+msgid "Cannot unset option \"%s\""
+msgstr "Impossibile rimuovere l'opzione \"%s\""
+
+#: src/rcfile.c:1089
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "L'opzione \"%s\" richiede un argomento"
 
-#: src/rcfile.c:1235
+#: src/rcfile.c:1105
 msgid "Option is not a valid multibyte string"
 msgstr "L'opzione non è una stringa multibyte valida"
 
-#: src/rcfile.c:1272 src/rcfile.c:1300 src/rcfile.c:1309
+#: src/rcfile.c:1139 src/rcfile.c:1160 src/rcfile.c:1167
 msgid "Non-blank characters required"
 msgstr "Sono richiesti caratteri non di spaziatura"
 
-#: src/rcfile.c:1282
+#: src/rcfile.c:1146
 msgid "Two single-column characters required"
 msgstr "Sono richiesti due caratteri a colonna singola"
 
-#: src/rcfile.c:1348
-#, c-format
-msgid "Cannot unset option \"%s\""
-msgstr "Impossibile rimuovere l'opzione \"%s\""
-
-#: src/rcfile.c:1354
-#, c-format
-msgid "Unknown option \"%s\""
-msgstr "Opzione \"%s\" sconosciuta"
-
-#: src/rcfile.c:1413
+#: src/rcfile.c:1258
 msgid "I can't find my home directory!  Wah!"
 msgstr "Impossibile trovare la directory home."
 
-#: src/rcfile.c:1451
+#: src/rcfile.c:1295
 #, c-format
 msgid ""
 "\n"
@@ -2114,45 +2120,50 @@ msgstr ""
 "\n"
 "Premere Invio per continuare l'avvio di nano.\n"
 
-#: src/search.c:96
+#: src/search.c:95
 #, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "\"%.*s%s\" non trovato"
 
 # FIXME
 #. TRANSLATORS: The next three strings are modifiers of the search prompt.
-#: src/search.c:176
+#: src/search.c:169
 msgid " [Case Sensitive]"
 msgstr " [Maiuscole/Minuscole]"
 
-#: src/search.c:180
+#: src/search.c:173
 msgid " [Regexp]"
 msgstr " [Espressione regolare]"
 
-#: src/search.c:184
+#: src/search.c:177
 msgid " [Backwards]"
 msgstr " [All'indietro]"
 
 #. TRANSLATORS: The next two strings are modifiers of the search prompt.
-#: src/search.c:189
+#: src/search.c:182
 msgid " (to replace) in selection"
 msgstr " (sostituisci) nella selezione"
 
-#: src/search.c:191
+#: src/search.c:184
 msgid " (to replace)"
 msgstr " (sostituisci)"
 
+#: src/search.c:305
+#, fuzzy
+msgid "Searching..."
+msgstr "Ricerca"
+
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:718
+#: src/search.c:693
 msgid "Replace this instance?"
 msgstr "Sostituire questa occorrenza?"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:883
+#: src/search.c:840
 msgid "Replace with"
 msgstr "Sostituire con"
 
-#: src/search.c:924
+#: src/search.c:875
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
@@ -2160,313 +2171,395 @@ msgstr[0] "%lu sostituzione effettuata"
 msgstr[1] "%lu sostituzioni effettuate"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:964
+#: src/search.c:914
 msgid "Enter line number, column number"
 msgstr "Inserire il numero di riga, numero di colonna"
 
-#: src/search.c:991
+#: src/search.c:939
 msgid "Invalid line or column number"
 msgstr "Numero di riga o di colonna non valido"
 
-#: src/search.c:1124
+#: src/search.c:1080
 msgid "Not a bracket"
 msgstr "Non è una parentesi"
 
-#: src/search.c:1191
+#: src/search.c:1146
 msgid "No matching bracket"
 msgstr "Parentesi corrispondente non trovata"
 
-#: src/text.c:54
+#: src/text.c:53
 msgid "Mark Set"
 msgstr "Marcatura impostata"
 
-#: src/text.c:58
+#: src/text.c:57
 msgid "Mark Unset"
 msgstr "Marcatura disattivata"
 
-#: src/text.c:70
+#: src/text.c:69
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Errore nel chiamare \"%s\""
 
-#: src/text.c:475
-msgid "Nothing in undo buffer!"
-msgstr "Buffer di annullamento vuoto."
+#: src/text.c:468
+msgid "Commenting is not supported for this file type"
+msgstr ""
 
-# FIXME
-#: src/text.c:481 src/text.c:634
-#, c-format
-msgid "Internal error: can't match line %d.  Please save your work."
+#: src/text.c:484
+msgid "Cannot comment past end of file"
 msgstr ""
-"Errore interno: impossibile trovare la corrispondenza della riga %d. Salvare "
-"il lavoro."
+
+#: src/text.c:677
+msgid "Nothing in undo buffer!"
+msgstr "Buffer di annullamento vuoto."
 
 #. TRANSLATORS: Eight of the next nine strings describe actions
 #. * that are undone or redone.  It are all nouns, not verbs.
-#: src/text.c:495 src/text.c:524 src/text.c:645 src/text.c:686
+#: src/text.c:695 src/text.c:724 src/text.c:857 src/text.c:898
 msgid "text add"
 msgstr "aggiunta testo"
 
-#: src/text.c:505 src/text.c:656
+#: src/text.c:705 src/text.c:868
 msgid "text delete"
 msgstr "rimozione testo"
 
-#: src/text.c:528 src/text.c:694
+#: src/text.c:728 src/text.c:907
 msgid "line join"
 msgstr "unione riga"
 
-#: src/text.c:547 src/text.c:710
+#: src/text.c:747 src/text.c:923
 msgid "text cut"
 msgstr "taglio testo"
 
 # FIXME
-#: src/text.c:552 src/text.c:714
+#: src/text.c:752 src/text.c:927
 msgid "text uncut"
 msgstr "incolla testo"
 
-# FIXME
-#: src/text.c:558 src/text.c:691
-#, fuzzy
+#: src/text.c:758 src/text.c:903
 msgid "Internal error: line is missing.  Please save your work."
-msgstr ""
-"Errore interno: impossibile trovare la corrispondenza della riga %d. Salvare "
-"il lavoro."
+msgstr "Errore interno: riga mancante. Salvare il lavoro."
 
-#: src/text.c:561 src/text.c:665
+#: src/text.c:762 src/text.c:877
 msgid "line break"
 msgstr "interruzione riga"
 
-#: src/text.c:569 src/text.c:725
+#: src/text.c:772 src/text.c:947
+msgid "comment"
+msgstr ""
+
+#: src/text.c:776 src/text.c:951
+msgid "uncomment"
+msgstr ""
+
+#: src/text.c:780 src/text.c:938
 msgid "text insert"
 msgstr "inserimento testo"
 
-#: src/text.c:589 src/text.c:718
+#: src/text.c:800 src/text.c:931
 msgid "text replace"
 msgstr "sostituzione testo"
 
-#: src/text.c:596 src/text.c:732 src/text.c:1030 src/text.c:1174
+#: src/text.c:807 src/text.c:955 src/text.c:1267 src/text.c:1437
 msgid "Internal error: unknown type.  Please save your work."
 msgstr "Errore interno: tipo sconosciuto. Salvare il lavoro."
 
-#: src/text.c:601
+#: src/text.c:813
 #, c-format
 msgid "Undid action (%s)"
 msgstr "Azione annullata (%s)"
 
-#: src/text.c:619
+#: src/text.c:832
 msgid "Nothing to re-do!"
 msgstr "Niente da ripetere."
 
-#: src/text.c:628
+#: src/text.c:841
 msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr "Errore interno: impossibile ripetere. Salvare il lavoro."
 
-#: src/text.c:737
+#: src/text.c:961
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Ripetuta azione (%s)"
 
-#: src/text.c:827 src/text.c:2508 src/text.c:2944
+#: src/text.c:1051 src/text.c:2765 src/text.c:3198
 msgid "Could not create pipe"
 msgstr "Impossibile creare la pipe"
 
-#: src/text.c:853 src/text.c:2595 src/text.c:2750 src/text.c:2992
-#: src/text.c:3286
+#: src/text.c:1077 src/text.c:2852 src/text.c:3005 src/text.c:3246
+#: src/text.c:3540
 msgid "Could not fork"
 msgstr "Impossibile effettuare un fork"
 
-#: src/text.c:1853
+#: src/text.c:2117
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Stringa di quoting non corretta %s: %s"
 
-#: src/text.c:2241
+#: src/text.c:2499
 msgid "Can now UnJustify!"
 msgstr "È ora possibile togliere la giustificazione."
 
-#: src/text.c:2435
+#: src/text.c:2697
 msgid "Edit a replacement"
 msgstr "Modifica sostituzione"
 
-#: src/text.c:2510
+#. TRANSLATORS: Shown after fixing misspellings in one word.
+#: src/text.c:2713
+#, fuzzy
+msgid "Next word..."
+msgstr "Parola succ."
+
+#: src/text.c:2767
 msgid "Creating misspelled word list, please wait..."
 msgstr "Creazione della lista delle parole non corrette, attendere..."
 
-#: src/text.c:2601 src/text.c:2999
+#: src/text.c:2858 src/text.c:3253
 msgid "Could not get size of pipe buffer"
 msgstr "Impossibile ottenere la dimensione del buffer della pipe"
 
-#: src/text.c:2652
+#: src/text.c:2907
 msgid "Error invoking \"spell\""
 msgstr "Errore nel chiamare \"spell\""
 
-#: src/text.c:2655
+#: src/text.c:2910
 msgid "Error invoking \"sort -f\""
 msgstr "Errore nel chiamare \"sort -f\""
 
-#: src/text.c:2658
+#: src/text.c:2913
 msgid "Error invoking \"uniq\""
 msgstr "Errore nel chiamare \"uniq\""
 
-#: src/text.c:2881
+#: src/text.c:3135
 msgid "Invoking spell checker, please wait"
 msgstr "Esecuzione del correttore ortografico, attendere"
 
-#: src/text.c:2897
+#: src/text.c:3151
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Controllo ortografico non riuscito: %s"
 
-#: src/text.c:2899
+#: src/text.c:3153
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Controllo ortografico non riuscito: %s: %s"
 
-#: src/text.c:2902
+#: src/text.c:3156
 msgid "Finished checking spelling"
 msgstr "Controllo ortografico terminato"
 
-#: src/text.c:2927
+#: src/text.c:3181
 msgid "No linter defined for this type of file!"
 msgstr "Nessun linter definito per questo tipo di file!"
 
-#: src/text.c:2932
+#: src/text.c:3186
 msgid "Save modified buffer before linting?"
 msgstr "Salvare il buffer prima dell'esecuzione del linter?"
 
-#: src/text.c:2949
+#: src/text.c:3203
 msgid "Invoking linter, please wait"
 msgstr "Esecuzione del linter, attendere"
 
-#: src/text.c:3105
+#: src/text.c:3358
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr "Ricevute 0 righe dal comando: %s"
 
-#: src/text.c:3134
+#: src/text.c:3388
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
 "Questo messaggio è per il file non aperto %s, aprire in un nuovo buffer?"
 
-#: src/text.c:3153
+#: src/text.c:3407
 msgid "No more errors in unopened files, cancelling"
 msgstr ""
 
-#: src/text.c:3192
+#: src/text.c:3446
 msgid "At last message"
 msgstr "Ultimo messaggio"
 
-#: src/text.c:3197
+#: src/text.c:3451
 msgid "At first message"
 msgstr "Primo messaggio"
 
-#: src/text.c:3237
+#: src/text.c:3491
 msgid "Finished"
 msgstr "Completato"
 
-#: src/text.c:3259
+#: src/text.c:3513
 msgid "Invoking formatter, please wait"
 msgstr "Esecuzione del formattatore, attendere"
 
-#: src/text.c:3314
+#: src/text.c:3568
 msgid "Finished formatting"
 msgstr "Formattazione completata"
 
-#: src/text.c:3396
+#: src/text.c:3650
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sParole: %lu  Righe: %ld  Caratteri: %lu"
 
-#: src/text.c:3397
+#: src/text.c:3651
 msgid "In Selection:  "
 msgstr "Nella selezione:  "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3411
+#: src/text.c:3665
 msgid "Verbatim Input"
 msgstr "Input letterale"
 
-#: src/utils.c:391 src/utils.c:403
+#: src/utils.c:392 src/utils.c:404
 msgid "nano is out of memory!"
 msgstr "nano ha esaurito la memoria."
 
+# FIXME
+#: src/utils.c:625
+#, c-format
+msgid "Internal error: can't match line %d.  Please save your work."
+msgstr ""
+"Errore interno: impossibile trovare la corrispondenza della riga %d. Salvare "
+"il lavoro."
+
+#. TRANSLATORS: This refers to a sequence of escape codes
+#. * (from the keyboard) that nano does not know about.
+#: src/winio.c:1121
+msgid "Unknown sequence"
+msgstr ""
+
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
 #: src/winio.c:1427
 msgid "Unicode Input"
 msgstr "Input Unicode"
 
-#: src/winio.c:1991 src/winio.c:1995
-msgid "Modified"
-msgstr "Modificato"
-
-#: src/winio.c:1992
-msgid "View"
-msgstr "Visualizza"
-
-#: src/winio.c:2006
+#: src/winio.c:1960
 msgid "DIR:"
 msgstr "Dir:"
 
-#: src/winio.c:2013
+#: src/winio.c:1968
 msgid "File:"
 msgstr "File:"
 
-#: src/winio.c:3141
+#: src/winio.c:1972 src/winio.c:1976
+msgid "Modified"
+msgstr "Modificato"
+
+#: src/winio.c:1974
+msgid "View"
+msgstr "Visualizza"
+
+#: src/winio.c:3105
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "Riga %ld/%ld (%d%%), colonna %lu/%lu (%d%%), carattere %lu/%lu (%d%%)"
 
-#: src/winio.c:3271
+#: src/winio.c:3235
 msgid "The nano text editor"
 msgstr "L'editor di testi nano"
 
-#: src/winio.c:3272
+#: src/winio.c:3236
 msgid "version"
 msgstr "versione"
 
-#: src/winio.c:3273
+#: src/winio.c:3237
 msgid "Brought to you by:"
 msgstr "Creato per voi da:"
 
-#: src/winio.c:3274
+#: src/winio.c:3238
 msgid "Special thanks to:"
 msgstr "Ringraziamenti speciali a:"
 
-#: src/winio.c:3275
+#: src/winio.c:3239
 msgid "The Free Software Foundation"
 msgstr "La Free Software Foundation"
 
-#: src/winio.c:3276
+#: src/winio.c:3240
 msgid "the many translators and the TP"
 msgstr "i numeriso traduttori e il Translation Project"
 
-#: src/winio.c:3277
+#: src/winio.c:3241
 msgid "For ncurses:"
 msgstr "Per ncurses:"
 
-#: src/winio.c:3278
+#: src/winio.c:3242
 msgid "and anyone else we forgot..."
 msgstr "e chiunque altro abbiamo dimenticato..."
 
-#: src/winio.c:3279
+#: src/winio.c:3243
 msgid "Thank you for using nano!"
 msgstr "Grazie di usare nano!"
 
-#~ msgid "Cannot prepend or append to a symlink with --nofollow set"
+#~ msgid ""
+#~ "Read %lu line (Converted from DOS and Mac format - Warning: No write "
+#~ "permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from DOS and Mac format - Warning: No write "
+#~ "permission)"
+#~ msgstr[0] ""
+#~ "Letta %lu riga (Convertita dal formato DOS e Mac - Senza permesso di "
+#~ "scrittura)"
+#~ msgstr[1] ""
+#~ "Lette %lu righe (Convertite dal formato DOS e Mac - Senza permesso di "
+#~ "scrittura)"
+
+#~ msgid ""
+#~ "Read %lu line (Converted from Mac format - Warning: No write permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from Mac format - Warning: No write permission)"
+#~ msgstr[0] ""
+#~ "Letta %lu riga (Convertita dal formato Mac - Senza permesso di scrittura)"
+#~ msgstr[1] ""
+#~ "Lette %lu righe (Convertite dal formato Mac - Senza permesso di scrittura)"
+
+#~ msgid ""
+#~ "Read %lu line (Converted from DOS format - Warning: No write permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from DOS format - Warning: No write permission)"
+#~ msgstr[0] ""
+#~ "Letta %lu riga (Convertita dal formato DOS - Senza permesso di scrittura)"
+#~ msgstr[1] ""
+#~ "Lette %lu righe (Convertite dal formato DOS - Senza permesso di scrittura)"
+
+#~ msgid "Read %lu line (Warning: No write permission)"
+#~ msgid_plural "Read %lu lines (Warning: No write permission)"
+#~ msgstr[0] "Letta %lu riga (Attenzione: permessi di scrittura mancanti)"
+#~ msgstr[1] "Lette %lu righe (Attenzione: permessi di scrittura mancanti)"
+
+#~ msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 #~ msgstr ""
-#~ "Impossibile aggiungere in testa/coda a un collegamento con --nofollow"
+#~ "Salvare il buffer modificato? (RISPONDERE \"No\" PER ANNULLARE LE "
+#~ "MODIFICHE) "
 
-#~ msgid "Don't follow symbolic links, overwrite"
-#~ msgstr "Non segue i collegamenti simbolici, sovrascrive"
+#~ msgid "Unknown Command"
+#~ msgstr "Comando sconosciuto"
+
+#~ msgid "Cannot add a color command without a syntax command"
+#~ msgstr ""
+#~ "Impossibile aggiungere una direttiva di colore senza una riga di sintassi"
+
+#~ msgid "Missing regex string"
+#~ msgstr "Stringa di espressione regolare mancante"
+
+# FIXME
+#~ msgid "Cannot add a header regex without a syntax command"
+#~ msgstr ""
+#~ "Impossibile aggiungere un'intestazione regex senza una riga di sintassi"
+
+# FIXME
+#~ msgid "Cannot add a magic string regex without a syntax command"
+#~ msgstr ""
+#~ "Impossibile aggiungere un'intestazione regex senza una riga di sintassi"
+
+# FIXME
+#~ msgid "Missing magic string name"
+#~ msgstr "Stringa di intestazione mancante"
 
-#~ msgid "Sorry, support for this function has been disabled"
-#~ msgstr "Il supporto per questa funzionalità è stato disabilitato"
+#~ msgid "Cannot add a linter without a syntax command"
+#~ msgstr "Impossibile aggiungere un linter senza una riga di sintassi"
 
-#~ msgid "Internal error: cannot set up uncut.  Please save your work."
-#~ msgstr "Errore interno: impossibile incollare. Salvare il lavoro."
+#~ msgid "Cannot add formatter without a syntax command"
+#~ msgstr "Impossibile aggiungere un formattatore senza una riga di sintassi"
 
-#~ msgid "Error: no formatter defined"
-#~ msgstr "Errore: nessun formattatore definito"
+#~ msgid "Missing formatter command"
+#~ msgstr "Comando del formattatore mancante"
diff --git a/po/ja.po b/po/ja.po
index cd5c70e9..f844ee78 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 2.3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-25 16:41-0500\n"
+"POT-Creation-Date: 2016-06-17 15:41+0200\n"
 "PO-Revision-Date: 2011-07-09 09:01+0900\n"
 "Last-Translator: Yasuaki Taniguchi <yasuakit@gmail.com>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
@@ -17,357 +17,341 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: src/browser.c:144 src/browser.c:284 src/browser.c:334 src/files.c:996
+#: src/files.c:1003 src/files.c:1794 src/files.c:1919 src/files.c:1963
+#: src/files.c:1983 src/files.c:2099 src/files.c:3019 src/files.c:3242
+#: src/rcfile.c:540 src/rcfile.c:1280
+#, c-format
+msgid "Error reading %s: %s"
+msgstr "%s: %s の読み込みに失敗しました"
+
 #. TRANSLATORS: This is a prompt.
-#: src/browser.c:220
+#: src/browser.c:247
 msgid "Go To Directory"
 msgstr "ディレクトリへ移動"
 
-#: src/browser.c:227 src/browser.c:738 src/files.c:1174 src/files.c:2340
-#: src/nano.c:1120 src/search.c:202 src/search.c:290 src/search.c:895
-#: src/search.c:970 src/text.c:2935 src/text.c:3142
+#: src/browser.c:254 src/browser.c:723 src/files.c:1126 src/files.c:2292
+#: src/nano.c:1128 src/search.c:195 src/search.c:297 src/search.c:851
+#: src/search.c:918 src/text.c:3189 src/text.c:3396
 msgid "Cancelled"
 msgstr "取り消しました"
 
-#: src/browser.c:253 src/browser.c:300
-#, c-format
-msgid "Can't go outside of %s in restricted mode"
+#. TRANSLATORS: This refers to the option --operatingdir,
+#. * not to --restricted.
+#: src/browser.c:274 src/browser.c:326
+#, fuzzy, c-format
+msgid "Can't go outside of %s in confined mode"
 msgstr "制限モードでは %s の外部へ移動できません"
 
-#: src/browser.c:264 src/browser.c:310 src/browser.c:326 src/files.c:1044
-#: src/files.c:1052 src/files.c:1844 src/files.c:1971 src/files.c:2016
-#: src/files.c:2037 src/files.c:2156 src/files.c:3062 src/files.c:3285
-#: src/rcfile.c:596 src/rcfile.c:1435
-#, c-format
-msgid "Error reading %s: %s"
-msgstr "%s: %s の読み込みに失敗しました"
-
-#: src/browser.c:290
+#: src/browser.c:317
 msgid "Can't move up a directory"
 msgstr "上位のディレクトリへ移動できません"
 
 #. TRANSLATORS: Try to keep this at most 7 characters.
-#: src/browser.c:615 src/browser.c:623
+#: src/browser.c:590 src/browser.c:598
 msgid "(dir)"
 msgstr "(dir)"
 
 #. TRANSLATORS: Try to keep this at most 12 characters.
-#: src/browser.c:620
+#: src/browser.c:595
 msgid "(parent dir)"
 msgstr "(parent dir)"
 
 #. TRANSLATORS: Try to keep this at most 7 characters.
 #. * If necessary, you can leave out the parentheses.
-#: src/browser.c:650
+#: src/browser.c:625
 msgid "(huge)"
 msgstr ""
 
 #. TRANSLATORS: This is the main search prompt.
-#: src/browser.c:727 src/search.c:173
+#: src/browser.c:712 src/search.c:166
 msgid "Search"
 msgstr "検索"
 
-#: src/browser.c:777 src/search.c:466 src/search.c:536
-msgid "This is the only occurrence"
-msgstr "他に見つかりません"
-
-#: src/browser.c:793 src/search.c:364
+#: src/browser.c:754 src/search.c:368
 msgid "Search Wrapped"
 msgstr "先頭から検索します"
 
-#: src/browser.c:843 src/search.c:517
+#: src/browser.c:764 src/search.c:509
+msgid "This is the only occurrence"
+msgstr "他に見つかりません"
+
+#: src/browser.c:812 src/search.c:473
 msgid "No current search pattern"
 msgstr "検索語が指定されていません"
 
-#: src/files.c:50
+#: src/color.c:186
+#, fuzzy, c-format
+msgid "Unknown syntax name: %s"
+msgstr "構文名がありません"
+
+#: src/color.c:247
+#, c-format
+msgid "magic_load() failed: %s"
+msgstr ""
+
+#: src/color.c:251
+#, c-format
+msgid "magic_file(%s) failed: %s"
+msgstr ""
+
+#: src/files.c:47
 #, c-format
 msgid "Directory '%s' does not exist"
 msgstr ""
 
-#: src/files.c:52
+#: src/files.c:49
 #, c-format
 msgid "Path '%s': %s"
 msgstr ""
 
-#: src/files.c:54
+#: src/files.c:51
 #, fuzzy, c-format
 msgid "Path '%s' is not a directory"
 msgstr "\"%s\" はディレクトリです"
 
-#: src/files.c:57
+#: src/files.c:53
 #, c-format
 msgid "Path '%s' is not accessible"
 msgstr ""
 
-#. TRANSLATORS: Try to keep this at most 76 characters.
-#: src/files.c:158
+#. TRANSLATORS: Keep the next ten messages at most 76 characters.
+#: src/files.c:148
 msgid ""
 "Warning: Modifying a file which is not locked, check directory permission?"
 msgstr ""
 
-#: src/files.c:197
+#: src/files.c:187
 msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
 msgstr ""
 
-#: src/files.c:206
+#: src/files.c:196
 #, c-format
 msgid "Couldn't determine hostname for lock file: %s"
 msgstr ""
 
-#: src/files.c:227 src/files.c:238 src/files.c:275 src/files.c:285
+#: src/files.c:216 src/files.c:225 src/files.c:262 src/files.c:272
 #, fuzzy, c-format
 msgid "Error writing lock file %s: %s"
 msgstr "バックアップファイル %s の書き込みエラー: %s"
 
-#: src/files.c:305
+#: src/files.c:291
 #, fuzzy, c-format
 msgid "Error deleting lock file %s: %s"
 msgstr "バックアップファイル %s の書き込みエラー: %s"
 
-#: src/files.c:341
+#: src/files.c:325
 #, fuzzy, c-format
 msgid "Error opening lock file %s: %s"
 msgstr "バックアップファイル %s の書き込みエラー: %s"
 
-#: src/files.c:353
+#: src/files.c:337
 #, c-format
 msgid "Error reading lock file %s: Not enough data read"
 msgstr ""
 
 #. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
-#: src/files.c:371
+#: src/files.c:354
 #, c-format
 msgid "File %s is being edited (by %s with %s, PID %d); continue?"
 msgstr ""
 
-#: src/files.c:426
+#: src/files.c:430
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "%s の外部からファイルを挿入できません"
 
-#: src/files.c:439 src/files.c:1038 src/rcfile.c:589 src/rcfile.c:1385
-#: src/rcfile.c:1426
+#: src/files.c:445 src/files.c:991 src/rcfile.c:533 src/rcfile.c:1230
+#: src/rcfile.c:1271
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" はディレクトリです"
 
-#: src/files.c:441
+#: src/files.c:447
 #, fuzzy, c-format
 msgid "\"%s\" is not a normal file"
 msgstr "\"%s\" はデバイスファイルです"
 
-#: src/files.c:566
+#: src/files.c:571
 msgid "No more open file buffers"
 msgstr "ファイルを開くためのバッファがありません"
 
-#: src/files.c:582
+#: src/files.c:586
 #, c-format
 msgid "Switched to %s"
 msgstr "%s に切り替えます"
 
-#: src/files.c:584 src/global.c:988 src/winio.c:2010
+#: src/files.c:588 src/global.c:1005 src/winio.c:1965
 msgid "New Buffer"
 msgstr "新しいバッファ"
 
-#: src/files.c:943
+#. TRANSLATORS: Keep the next four messages at most 76 characters.
+#: src/files.c:913
 #, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
 msgstr[0] "%lu 行を読み込みます（DOS または Mac のフォーマットを変換）"
 
-#: src/files.c:948
-#, c-format
-msgid ""
-"Read %lu line (Converted from DOS and Mac format - Warning: No write "
-"permission)"
-msgid_plural ""
-"Read %lu lines (Converted from DOS and Mac format - Warning: No write "
-"permission)"
-msgstr[0] ""
-"%lu 行を読み込みます（DOS または Mac のフォーマットを変換 - 警告: 書き込み権"
-"限がありません）"
-
-#: src/files.c:954
+#: src/files.c:919
 #, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
 msgstr[0] "%lu 行を読み込みます（Mac フォーマットを変換）"
 
-#: src/files.c:958
-#, c-format
-msgid ""
-"Read %lu line (Converted from Mac format - Warning: No write permission)"
-msgid_plural ""
-"Read %lu lines (Converted from Mac format - Warning: No write permission)"
-msgstr[0] ""
-"%lu 行を読み込みます（Mac フォーマットを変換 - 警告: 書き込み権限がありませ"
-"ん）"
-
-#: src/files.c:964
+#: src/files.c:925
 #, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
 msgstr[0] "%lu 行を読み込みます（DOS フォーマットを変換）"
 
-#: src/files.c:968
-#, c-format
-msgid ""
-"Read %lu line (Converted from DOS format - Warning: No write permission)"
-msgid_plural ""
-"Read %lu lines (Converted from DOS format - Warning: No write permission)"
-msgstr[0] ""
-"%lu 行を読み込みます（DOS フォーマットを変換 - 警告: 書き込み権限がありませ"
-"ん）"
-
-#: src/files.c:974
+#: src/files.c:930
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "%lu 行を読み込みます"
 
-#: src/files.c:977
-#, fuzzy, c-format
-msgid "Read %lu line (Warning: No write permission)"
-msgid_plural "Read %lu lines (Warning: No write permission)"
-msgstr[0] "%lu 行を読み込みます(警告: 書き込み権限がありません)"
-
-#: src/files.c:1019 src/files.c:1056
+#: src/files.c:974 src/files.c:1006
 msgid "Reading File"
 msgstr "ファイルを読み込んでいます"
 
-#: src/files.c:1025
+#: src/files.c:980
 msgid "New File"
 msgstr "新しいファイル"
 
-#: src/files.c:1028
-#, c-format
-msgid "\"%s\" not found"
+#: src/files.c:983
+#, fuzzy, c-format
+msgid "File \"%s\" not found"
 msgstr "\"%s\" が見つかりません"
 
-#: src/files.c:1039 src/rcfile.c:590 src/rcfile.c:1386 src/rcfile.c:1427
+#: src/files.c:992 src/rcfile.c:534 src/rcfile.c:1231 src/rcfile.c:1272
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" はデバイスファイルです"
 
-#: src/files.c:1133
+#: src/files.c:1083
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "新しいバッファでコマンドを実行 [from %s] "
 
-#: src/files.c:1135
+#: src/files.c:1085
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "コマンドを実行 [from %s] "
 
-#: src/files.c:1142
+#: src/files.c:1092
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "新しいバッファへファイルを読み込み [from %s] "
 
-#: src/files.c:1144
+#: src/files.c:1094
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "現在のバッファへファイルを読み込み [from %s] "
 
-#: src/files.c:1389
+#: src/files.c:1338
 msgid "Key invalid in non-multibuffer mode"
 msgstr "マルチバッファモードでの無効キー"
 
-#: src/files.c:1684
-msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+#: src/files.c:1632
+#, fuzzy
+msgid "Failed to write backup file; continue saving? (Say N if unsure.) "
 msgstr ""
 "バックアップファイルの書き込みに失敗しました。保存を継続しますか? (分からない"
 "場合は N としてください) "
 
-#: src/files.c:1800
+#: src/files.c:1750
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "%s の外部から書き込めません"
 
-#: src/files.c:1885 src/files.c:1910 src/files.c:1928 src/files.c:1941
-#: src/files.c:1952 src/files.c:1981
+#: src/files.c:1833 src/files.c:1858 src/files.c:1876 src/files.c:1889
+#: src/files.c:1900 src/files.c:1928
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "バックアップファイル %s の書き込みエラー: %s"
 
-#: src/files.c:1886 src/nano.c:690
+#: src/files.c:1834 src/nano.c:692
 msgid "Too many backup files?"
 msgstr "バックアップファイルが多すぎませんか?"
 
-#: src/files.c:2026 src/text.c:2863 src/text.c:2875 src/text.c:3244
-#: src/text.c:3253
+#: src/files.c:1972 src/text.c:3117 src/text.c:3129 src/text.c:3498
+#: src/text.c:3507
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "テンポラリファイルの書き込みエラー: %s"
 
-#: src/files.c:2049 src/files.c:2068 src/files.c:2080 src/files.c:2104
-#: src/files.c:2121 src/files.c:2131 src/files.c:2164 src/files.c:2171
+#: src/files.c:1994 src/files.c:2013 src/files.c:2023 src/files.c:2047
+#: src/files.c:2064 src/files.c:2074 src/files.c:2106 src/files.c:2113
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "%s の書き込みエラー: %s"
 
-#: src/files.c:2200
+#: src/files.c:2154
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "%lu 行を書き込みました"
 
-#: src/files.c:2299
+#: src/files.c:2249
 msgid " [DOS Format]"
 msgstr " [DOS フォーマット]"
 
-#: src/files.c:2300
+#: src/files.c:2250
 msgid " [Mac Format]"
 msgstr " [Mac フォーマット]"
 
-#: src/files.c:2302
+#: src/files.c:2252
 msgid " [Backup]"
 msgstr " [バックアップ]"
 
-#: src/files.c:2309
+#: src/files.c:2259
 msgid "Prepend Selection to File"
 msgstr "ファイルの先頭に追加"
 
-#: src/files.c:2310
+#: src/files.c:2260
 msgid "Append Selection to File"
 msgstr "ファイルの末尾に追加"
 
-#: src/files.c:2311
+#: src/files.c:2261
 msgid "Write Selection to File"
 msgstr "ファイルに書き込み"
 
-#: src/files.c:2314
+#: src/files.c:2264
 msgid "File Name to Prepend to"
 msgstr "先頭に追加するファイル"
 
-#: src/files.c:2315
+#: src/files.c:2265
 msgid "File Name to Append to"
 msgstr "末尾に追加するファイル"
 
-#: src/files.c:2316
+#: src/files.c:2266
 msgid "File Name to Write"
 msgstr "書き込むファイル"
 
-#: src/files.c:2349
-msgid "Save modified buffer anyway ? "
+#: src/files.c:2301
+msgid "Save modified buffer anyway? "
 msgstr ""
 
-#: src/files.c:2457
-msgid "File exists, OVERWRITE ? "
-msgstr "ファイルを上書きしてよいですか？ "
-
-#: src/files.c:2466
-msgid "Save file under DIFFERENT NAME ? "
+#: src/files.c:2412
+#, fuzzy
+msgid "Save file under DIFFERENT NAME? "
 msgstr "違う名前で保存しますか？ "
 
-#: src/files.c:2480
-msgid "File was modified since you opened it, continue saving ? "
+#: src/files.c:2420
+#, fuzzy, c-format
+msgid "File \"%s\" exists; OVERWRITE? "
+msgstr "ファイルを上書きしてよいですか？ "
+
+#: src/files.c:2441
+#, fuzzy
+msgid "File was modified since you opened it; continue saving? "
 msgstr "ファイルを開いた後に修正が入りました、保存しますか？ "
 
-#: src/files.c:2917
+#: src/files.c:2874
 msgid "(more)"
 msgstr "(続き)"
 
-#: src/files.c:3004
+#: src/files.c:2959
 #, c-format
 msgid ""
 "\n"
@@ -376,7 +360,7 @@ msgstr ""
 "\n"
 "継続するために Enter を押してください\n"
 
-#: src/files.c:3020
+#: src/files.c:2975
 #, fuzzy, c-format
 msgid ""
 "Unable to create directory %s: %s\n"
@@ -385,7 +369,7 @@ msgstr ""
 "ディレクトリ %s の作成に失敗しました: %s\n"
 "これは検索履歴およびカーソル位置の保存に必要なディレクトリです。\n"
 
-#: src/files.c:3026
+#: src/files.c:2982
 #, fuzzy, c-format
 msgid ""
 "Path %s is not a directory and needs to be.\n"
@@ -394,14 +378,14 @@ msgstr ""
 "パス %s はディレクトリである必要がありますが、ディレクトリではありません\n"
 "Nano は検索およびカーソル位置履歴の読み込みと保存ができません。\n"
 
-#: src/files.c:3045
+#: src/files.c:3002
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I tried to move\n"
 "to the preferred location (%s) but encountered an error: %s"
 msgstr ""
 
-#: src/files.c:3049
+#: src/files.c:3006
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I moved\n"
@@ -409,749 +393,780 @@ msgid ""
 "(see the nano FAQ about this change)"
 msgstr ""
 
-#: src/files.c:3132 src/files.c:3140 src/files.c:3164 src/files.c:3176
+#: src/files.c:3089 src/files.c:3097 src/files.c:3121 src/files.c:3133
 #, fuzzy, c-format
 msgid "Error writing %s: %s\n"
 msgstr "%s の書き込みエラー: %s"
 
 #. TRANSLATORS: Try to keep the next fifteen strings at most 10 characters.
-#: src/global.c:480
+#: src/global.c:483
 msgid "Exit"
 msgstr "終了"
 
-#: src/global.c:481
+#: src/global.c:484
 msgid "Close"
 msgstr "閉じる"
 
-#: src/global.c:482
+#: src/global.c:485
 #, fuzzy
 msgid "Uncut Text"
 msgstr "貼り付け"
 
-#: src/global.c:484
+#: src/global.c:487
 #, fuzzy
 msgid "Unjustify"
 msgstr "両端揃え"
 
-#: src/global.c:490
+#: src/global.c:493
 msgid "Read File"
 msgstr "読み込み"
 
-#: src/global.c:491
+#: src/global.c:494
 msgid "Where Is"
 msgstr "移動"
 
-#: src/global.c:492
+#: src/global.c:495
 msgid "Replace"
 msgstr "置換"
 
-#: src/global.c:493
+#: src/global.c:496
 msgid "Go To Line"
 msgstr "行を指定"
 
-#: src/global.c:494
+#: src/global.c:497
 msgid "Prev Line"
 msgstr "前の行"
 
-#: src/global.c:495
+#: src/global.c:498
 msgid "Next Line"
 msgstr "次の行"
 
-#: src/global.c:496
+#: src/global.c:499
 msgid "Prev Page"
 msgstr "前のページ"
 
-#: src/global.c:497
+#: src/global.c:500
 msgid "Next Page"
 msgstr "次のページ"
 
-#: src/global.c:499
+#: src/global.c:502
 msgid "Justify"
 msgstr "両端揃え"
 
-#: src/global.c:500
+#: src/global.c:503
 msgid "FullJstify"
 msgstr "全て均等化"
 
-#: src/global.c:502
+#: src/global.c:505
 msgid "Refresh"
 msgstr "æ›´æ–°"
 
 #. TRANSLATORS: Try to keep this string at most 12 characters.
-#: src/global.c:505
+#: src/global.c:508
 msgid "WhereIs Next"
 msgstr "次へ移動"
 
 #. TRANSLATORS: The next long series of strings are shortcut descriptions;
 #. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:512
+#: src/global.c:515
 msgid "Justify the current paragraph"
 msgstr "段落を均等化"
 
-#: src/global.c:514
+#: src/global.c:517
 msgid "Cancel the current function"
 msgstr "動作を取り消します"
 
-#: src/global.c:515
+#: src/global.c:518
 msgid "Display this help text"
 msgstr "ヘルプを表示"
 
-#: src/global.c:518
+#: src/global.c:521
 msgid "Close the current file buffer / Exit from nano"
 msgstr "現在のファイルを閉じて nano を終了"
 
-#: src/global.c:520
+#: src/global.c:523
 msgid "Exit from nano"
 msgstr "nano を終了"
 
-#: src/global.c:524
+#: src/global.c:527
 msgid "Write the current file to disk"
 msgstr "現在のファイルをディスクへ書き込み"
 
-#: src/global.c:526
+#: src/global.c:529
 msgid "Insert another file into the current one"
 msgstr "ファイルから読み込み"
 
-#: src/global.c:528
+#: src/global.c:531
 msgid "Search for a string or a regular expression"
 msgstr "正規表現で文字列を検索"
 
-#: src/global.c:531
+#: src/global.c:533
 #, fuzzy
 msgid "Search for a string"
 msgstr "正規表現で文字列を検索"
 
-#: src/global.c:533
+#: src/global.c:534
+msgid "Refresh the file list"
+msgstr ""
+
+#: src/global.c:535
+#, fuzzy
+msgid "Go to lefthand column"
+msgstr "指定位置へ移動"
+
+#: src/global.c:536
+#, fuzzy
+msgid "Go to righthand column"
+msgstr "指定位置へ移動"
+
+#: src/global.c:538
 #, fuzzy
 msgid "Go one screenful up"
 msgstr "次のページへ移動"
 
-#: src/global.c:534
+#: src/global.c:539
 #, fuzzy
 msgid "Go one screenful down"
 msgstr "次のページへ移動"
 
-#: src/global.c:536
+#: src/global.c:541
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "行の切り取り"
 
-#: src/global.c:538
+#: src/global.c:543
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "貼り付け"
 
-#: src/global.c:539
+#: src/global.c:544
 msgid "Display the position of the cursor"
 msgstr "カーソル位置を表示"
 
-#: src/global.c:541
+#: src/global.c:546
 msgid "Invoke the spell checker, if available"
 msgstr "スペルチェッカを起動 (利用可能な場合)"
 
-#: src/global.c:543
+#: src/global.c:548
 msgid "Replace a string or a regular expression"
 msgstr "正規表現置換"
 
-#: src/global.c:544
+#: src/global.c:549
 msgid "Go to line and column number"
 msgstr "指定位置へ移動"
 
-#: src/global.c:546
+#: src/global.c:551
 #, fuzzy
 msgid "Mark text starting from the cursor position"
 msgstr "現在位置をマーク"
 
-#: src/global.c:547
+#: src/global.c:552
 #, fuzzy
 msgid "Repeat the last search"
 msgstr "次を検索"
 
-#: src/global.c:549
+#: src/global.c:554
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "行のコピー"
 
-#: src/global.c:550
+#: src/global.c:555
 msgid "Indent the current line"
 msgstr "行のインデント"
 
-#: src/global.c:551
+#: src/global.c:556
 msgid "Unindent the current line"
 msgstr "インデントの削除"
 
-#: src/global.c:552
+#: src/global.c:558
+msgid "Comment/uncomment the current line or marked lines"
+msgstr ""
+
+#: src/global.c:560
 msgid "Undo the last operation"
 msgstr "直前の操作を取り消す (undo)"
 
-#: src/global.c:553
+#: src/global.c:561
 msgid "Redo the last undone operation"
 msgstr "取り消した直前の操作をやり直す (redo)"
 
-#: src/global.c:555
+#: src/global.c:563
 msgid "Go back one character"
 msgstr "前の文字へ戻る"
 
-#: src/global.c:556
+#: src/global.c:564
 msgid "Go forward one character"
 msgstr "次の文字へ進む"
 
-#: src/global.c:558
+#: src/global.c:566
 msgid "Go back one word"
 msgstr "前の単語へ戻る"
 
-#: src/global.c:559
+#: src/global.c:567
 msgid "Go forward one word"
 msgstr "次の単語へ進む"
 
-#: src/global.c:561
+#: src/global.c:569
 msgid "Go to previous line"
 msgstr "前の行へ移動する"
 
-#: src/global.c:562
+#: src/global.c:570
 msgid "Go to next line"
 msgstr "次の行へ移動する"
 
-#: src/global.c:563
+#: src/global.c:571
 msgid "Go to beginning of current line"
 msgstr "現在行の先頭へ移動"
 
-#: src/global.c:564
+#: src/global.c:572
 msgid "Go to end of current line"
 msgstr "現在行の末尾へ移動"
 
-#: src/global.c:567
+#: src/global.c:575
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "段落の先頭へ移動、カーソルがその位置にある場合その前の段落へ移動"
 
-#: src/global.c:569
+#: src/global.c:577
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr ""
 "段落の末尾の次の位置へ移動、カーソルがその位置にある場合その次の段落へ移動"
 
-#: src/global.c:571
+#: src/global.c:579
 msgid "Go to the first line of the file"
 msgstr "ファイルの先頭行へ移動"
 
-#: src/global.c:572
+#: src/global.c:580
 msgid "Go to the last line of the file"
 msgstr "ファイルの最終行へ移動"
 
-#: src/global.c:574
+#: src/global.c:582
 msgid "Go to the matching bracket"
 msgstr "対応する括弧へ移動"
 
-#: src/global.c:576
+#: src/global.c:584
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "カーソル位置を変えずにバッファを一行逆スクロールさせる"
 
-#: src/global.c:578
+#: src/global.c:586
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "カーソル位置を変えずにバッファを一行スクロールさせる"
 
-#: src/global.c:581
+#: src/global.c:589
 msgid "Switch to the previous file buffer"
 msgstr "前のバッファに切替え"
 
-#: src/global.c:582
+#: src/global.c:590
 msgid "Switch to the next file buffer"
 msgstr "次のバッファに切替え"
 
-#: src/global.c:584
+#: src/global.c:592
 msgid "Insert the next keystroke verbatim"
 msgstr "次のキーを逐語的に入力"
 
-#: src/global.c:585
+#: src/global.c:593
 msgid "Insert a tab at the cursor position"
 msgstr "タブ文字の挿入"
 
-#: src/global.c:586
+#: src/global.c:594
 msgid "Insert a newline at the cursor position"
 msgstr "行の挿入"
 
-#: src/global.c:587
+#: src/global.c:595
 msgid "Delete the character under the cursor"
 msgstr "カーソル位置の文字を削除"
 
-#: src/global.c:589
+#: src/global.c:597
 msgid "Delete the character to the left of the cursor"
 msgstr "カーソルの前の文字を削除"
 
-#: src/global.c:592
+#: src/global.c:600
 #, fuzzy
 msgid "Cut backward from cursor to word start"
 msgstr "行削除時に改行文字を削除しない"
 
-#: src/global.c:594
+#: src/global.c:602
 #, fuzzy
 msgid "Cut forward from cursor to next word start"
 msgstr "行削除時に改行文字を削除しない"
 
-#: src/global.c:596
+#: src/global.c:604
 msgid "Cut from the cursor position to the end of the file"
 msgstr "カーソル位置からファイル終端までを切り取り"
 
-#: src/global.c:599
+#: src/global.c:607
 msgid "Justify the entire file"
 msgstr "ファイル全体を均等化"
 
-#: src/global.c:603
+#: src/global.c:611
 msgid "Count the number of words, lines, and characters"
 msgstr "単語数、行数、文字数を表示"
 
-#: src/global.c:606
+#: src/global.c:614
 msgid "Refresh (redraw) the current screen"
 msgstr "画面の更新"
 
-#: src/global.c:608
+#: src/global.c:616
 #, fuzzy
 msgid "Suspend the editor (if suspension is enabled)"
 msgstr "編集を一時中断する (有効な場合)"
 
-#: src/global.c:610
+#: src/global.c:618
 msgid "Save file without prompting"
 msgstr ""
 
-#: src/global.c:611
+#: src/global.c:619
 msgid "Search next occurrence backward"
 msgstr ""
 
-#: src/global.c:612
+#: src/global.c:620
 msgid "Search next occurrence forward"
 msgstr ""
 
-#: src/global.c:614
+#: src/global.c:622
 msgid "Toggle the case sensitivity of the search"
 msgstr "検索時に大文字小文字を区別をするかしないかを切り替える"
 
-#: src/global.c:616
+#: src/global.c:624
 msgid "Reverse the direction of the search"
 msgstr "検索方向の順逆を切り替える"
 
-#: src/global.c:620
+#: src/global.c:628
 msgid "Toggle the use of regular expressions"
 msgstr "正規表現を使用するかしないかを切り替える"
 
-#: src/global.c:624
+#: src/global.c:632
 msgid "Recall the previous search/replace string"
 msgstr "前の検索文字 / 置換文字列を呼び出す"
 
-#: src/global.c:626
+#: src/global.c:634
 msgid "Recall the next search/replace string"
 msgstr "次の検索文字 / 置換文字列を呼び出す"
 
-#: src/global.c:629
+#: src/global.c:637
 msgid "Go to file browser"
 msgstr "ファイルブラウザの起動"
 
-#: src/global.c:632
+#: src/global.c:640
 msgid "Toggle the use of DOS format"
 msgstr "DOS フォーマットに切替え"
 
-#: src/global.c:633
+#: src/global.c:641
 msgid "Toggle the use of Mac format"
 msgstr "Mac フォーマットに切替え"
 
-#: src/global.c:634
+#: src/global.c:642
 msgid "Toggle appending"
 msgstr "ファイル末尾に追加する動作に切り替える"
 
-#: src/global.c:635
+#: src/global.c:643
 msgid "Toggle prepending"
 msgstr "ファイル先頭に追加する動作に切り替える"
 
-#: src/global.c:636
+#: src/global.c:644
 msgid "Toggle backing up of the original file"
 msgstr "元ファイルのバックアップを作成する動作に切り替える"
 
-#: src/global.c:637
+#: src/global.c:645
 msgid "Execute external command"
 msgstr "外部コマンドの実行"
 
-#: src/global.c:639
+#: src/global.c:647
 msgid "Close buffer without saving it"
 msgstr ""
 
-#: src/global.c:641
+#: src/global.c:649
 msgid "Toggle the use of a new buffer"
 msgstr "新しいバッファに切替え"
 
-#: src/global.c:644
+#: src/global.c:652
 msgid "Exit from the file browser"
 msgstr "ファイルブラウザの終了"
 
-#: src/global.c:645
+#: src/global.c:653
 msgid "Go to the first file in the list"
 msgstr "リストの先頭に移動"
 
-#: src/global.c:646
+#: src/global.c:654
 msgid "Go to the last file in the list"
 msgstr "リストの末尾に移動"
 
-#: src/global.c:647
+#: src/global.c:655
 msgid "Go to the previous file in the list"
 msgstr "リストの前のファイルへ移動"
 
-#: src/global.c:648
+#: src/global.c:656
 msgid "Go to the next file in the list"
 msgstr "リストの次のファイルへ移動"
 
-#: src/global.c:649
+#: src/global.c:657
 msgid "Go to directory"
 msgstr "ディレクトリに移動"
 
-#: src/global.c:652
+#: src/global.c:660
 #, fuzzy
 msgid "Invoke the linter, if available"
 msgstr "スペルチェッカを起動 (利用可能な場合)"
 
-#: src/global.c:653
+#: src/global.c:661
 #, fuzzy
 msgid "Go to previous linter msg"
 msgstr "前の行へ移動する"
 
-#: src/global.c:654
+#: src/global.c:662
 #, fuzzy
 msgid "Go to next linter msg"
 msgstr "次の行へ移動する"
 
-#: src/global.c:656
+#: src/global.c:664
 #, fuzzy
 msgid "Invoke formatter, if available"
 msgstr "スペルチェッカを起動 (利用可能な場合)"
 
 #. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:671
+#: src/global.c:679
 msgid "Get Help"
 msgstr "ヘルプ"
 
-#: src/global.c:674 src/prompt.c:858
+#: src/global.c:682 src/prompt.c:855
 msgid "Cancel"
 msgstr "取消"
 
-#: src/global.c:687
+#: src/global.c:695
 #, fuzzy
 msgid "Write Out"
 msgstr "保存"
 
-#: src/global.c:723
+#: src/global.c:731
 msgid "Go To Dir"
 msgstr "ディレクトリに移動"
 
-#: src/global.c:738
+#: src/global.c:746
 msgid "Cut Text"
 msgstr "切り取り"
 
-#: src/global.c:753
+#: src/global.c:761
 msgid "To Spell"
 msgstr "スペル確認"
 
-#: src/global.c:757
+#: src/global.c:765
 #, fuzzy
 msgid "To Linter"
 msgstr "行を指定"
 
-#: src/global.c:760
+#: src/global.c:768
 #, fuzzy
 msgid "Formatter"
 msgstr "DOS フォーマット"
 
-#: src/global.c:767
+#: src/global.c:775
 msgid "Case Sens"
 msgstr "大/小文字"
 
-#: src/global.c:772
+#: src/global.c:780
 msgid "Regexp"
 msgstr "正規表現"
 
-#: src/global.c:777
+#: src/global.c:785
 msgid "Backwards"
 msgstr "後方に"
 
-#: src/global.c:784
+#: src/global.c:792
 msgid "No Replace"
 msgstr "置換しない"
 
-#: src/global.c:792
+#: src/global.c:800
 msgid "Cur Pos"
 msgstr "位置"
 
-#: src/global.c:807
+#: src/global.c:815
 msgid "First Line"
 msgstr "先頭行"
 
-#: src/global.c:809
+#: src/global.c:817
 msgid "Last Line"
 msgstr "最終行"
 
-#: src/global.c:816
+#: src/global.c:824
 #, fuzzy
 msgid "To Bracket"
 msgstr "大括弧ではありません"
 
-#: src/global.c:819
+#: src/global.c:827
 msgid "Mark Text"
 msgstr "マーク"
 
-#: src/global.c:822
+#: src/global.c:830
 msgid "Copy Text"
 msgstr "コピー"
 
-#: src/global.c:825
+#: src/global.c:833
 msgid "Indent Text"
 msgstr "インデント"
 
-#: src/global.c:827
+#: src/global.c:835
 msgid "Unindent Text"
 msgstr "インデント削除"
 
-#: src/global.c:830
+#: src/global.c:838
 msgid "Undo"
 msgstr "Undo"
 
-#: src/global.c:832
+#: src/global.c:840
 msgid "Redo"
 msgstr "Redo"
 
-#: src/global.c:836 src/global.c:842
+#: src/global.c:844 src/global.c:850
 msgid "Back"
 msgstr "戻る"
 
-#: src/global.c:838 src/global.c:844
+#: src/global.c:846 src/global.c:852
 msgid "Forward"
 msgstr "進む"
 
-#: src/global.c:849
+#: src/global.c:857
 msgid "Prev Word"
 msgstr "前の単語"
 
-#: src/global.c:851
+#: src/global.c:859
 msgid "Next Word"
 msgstr "次の単語"
 
-#: src/global.c:855
+#: src/global.c:863
 msgid "Home"
 msgstr "先頭"
 
-#: src/global.c:857
+#: src/global.c:865
 msgid "End"
 msgstr "末尾"
 
-#: src/global.c:866
+#: src/global.c:874
 msgid "Beg of Par"
 msgstr "段落の始点"
 
-#: src/global.c:868
+#: src/global.c:876
 msgid "End of Par"
 msgstr "段落の終点"
 
-#: src/global.c:873
+#: src/global.c:881
 msgid "Scroll Up"
 msgstr "上にスクロール"
 
-#: src/global.c:875
+#: src/global.c:883
 msgid "Scroll Down"
 msgstr "下にスクロール"
 
-#: src/global.c:880
+#: src/global.c:888
 #, fuzzy
 msgid "Prev File"
 msgstr "前のファイル"
 
-#: src/global.c:882
+#: src/global.c:890
 msgid "Next File"
 msgstr "次のファイル"
 
-#: src/global.c:891
+#: src/global.c:899
 #, fuzzy
 msgid "Verbatim"
 msgstr "逐次入力"
 
-#: src/global.c:894
+#: src/global.c:902
 msgid "Tab"
 msgstr "タブ"
 
-#: src/global.c:896
+#: src/global.c:904
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:899
+#: src/global.c:907
 msgid "Delete"
 msgstr "削除"
 
-#: src/global.c:901
+#: src/global.c:909
 msgid "Backspace"
 msgstr "バックスペース"
 
 #. TRANSLATORS: The next two strings refer to cutting words.
-#: src/global.c:912
+#: src/global.c:920
 #, fuzzy
 msgid "Cut Left"
 msgstr "切り取り"
 
-#: src/global.c:914
+#: src/global.c:922
 msgid "Cut Right"
 msgstr ""
 
-#: src/global.c:916
+#: src/global.c:924
 msgid "CutTillEnd"
 msgstr "末尾まで切り取り"
 
-#: src/global.c:926
+#: src/global.c:934
 msgid "Word Count"
 msgstr "単語の合計数"
 
-#: src/global.c:933
+#: src/global.c:941
 msgid "Suspend"
 msgstr ""
 
-#: src/global.c:937
+#: src/global.c:945
+#, fuzzy
+msgid "Comment Lines"
+msgstr "次の行"
+
+#: src/global.c:949
 msgid "Save"
 msgstr ""
 
-#: src/global.c:940
+#: src/global.c:952
 #, fuzzy
 msgid "Previous"
 msgstr "前のファイル"
 
-#: src/global.c:942
+#: src/global.c:954
 #, fuzzy
 msgid "Next"
 msgstr "次のページ"
 
-#: src/global.c:948
+#: src/global.c:960
 msgid "PrevHstory"
 msgstr "前の履歴"
 
-#: src/global.c:951
+#: src/global.c:963
 msgid "NextHstory"
 msgstr "次の履歴"
 
-#: src/global.c:955
+#: src/global.c:972
 msgid "Go To Text"
 msgstr "検索"
 
-#: src/global.c:959
+#: src/global.c:976
 msgid "DOS Format"
 msgstr "DOS フォーマット"
 
-#: src/global.c:961
+#: src/global.c:978
 msgid "Mac Format"
 msgstr "Mac フォーマット"
 
-#: src/global.c:969
+#: src/global.c:986
 msgid "Append"
 msgstr "末尾に追加"
 
-#: src/global.c:971
+#: src/global.c:988
 msgid "Prepend"
 msgstr "先頭に追加"
 
-#: src/global.c:974
+#: src/global.c:991
 msgid "Backup File"
 msgstr "バックアップ"
 
-#: src/global.c:981
+#: src/global.c:998
 msgid "Execute Command"
 msgstr "コマンドを実行"
 
-#: src/global.c:996
+#: src/global.c:1013
 msgid "To Files"
 msgstr "ファイラ"
 
-#: src/global.c:1004
+#: src/global.c:1021
 msgid "First File"
 msgstr "先頭へ"
 
-#: src/global.c:1006
+#: src/global.c:1023
 msgid "Last File"
 msgstr "末尾へ"
 
-#: src/global.c:1010
+#: src/global.c:1027
 msgid "Discard buffer"
 msgstr ""
 
+#: src/global.c:1038
+msgid "Left Column"
+msgstr ""
+
+#: src/global.c:1040
+msgid "Right Column"
+msgstr ""
+
 #. TRANSLATORS: Try to keep the next two strings at most 20 characters.
-#: src/global.c:1020
+#: src/global.c:1047
 #, fuzzy
 msgid "Prev Lint Msg"
 msgstr "前の行"
 
-#: src/global.c:1022
+#: src/global.c:1049
 #, fuzzy
 msgid "Next Lint Msg"
 msgstr "次の行"
 
 #. TRANSLATORS: The next seventeen strings are toggle descriptions;
 #. * they are best kept shorter than 40 characters, but may be longer.
-#: src/global.c:1285
+#: src/global.c:1316
 msgid "Help mode"
 msgstr "ヘルプ"
 
-#: src/global.c:1287
+#: src/global.c:1318
 msgid "Constant cursor position display"
 msgstr "常にカーソル位置を表示"
 
-#: src/global.c:1289
+#: src/global.c:1320
 msgid "Use of one more line for editing"
 msgstr "編集用に一行余分に使用する"
 
-#: src/global.c:1291
+#: src/global.c:1322
 msgid "Smooth scrolling"
 msgstr "スムーズなスクロール"
 
-#: src/global.c:1293
+#: src/global.c:1324
 #, fuzzy
 msgid "Soft wrapping of overlong lines"
 msgstr "長い行の折り返しを禁止"
 
-#: src/global.c:1295
+#: src/global.c:1326
 msgid "Whitespace display"
 msgstr "空白を表示"
 
-#: src/global.c:1297
+#: src/global.c:1328
 msgid "Color syntax highlighting"
 msgstr "単語の強調"
 
-#: src/global.c:1299
+#: src/global.c:1330
 msgid "Smart home key"
 msgstr "スマートホームキー"
 
-#: src/global.c:1301
+#: src/global.c:1332
 msgid "Auto indent"
 msgstr "自動インデント"
 
-#: src/global.c:1303
+#: src/global.c:1334
 msgid "Cut to end"
 msgstr "改行の前まで削除"
 
-#: src/global.c:1305
+#: src/global.c:1336
 #, fuzzy
 msgid "Hard wrapping of overlong lines"
 msgstr "長い行の折り返しを禁止"
 
-#: src/global.c:1307
+#: src/global.c:1338
 msgid "Conversion of typed tabs to spaces"
 msgstr "タブをスペースに変換"
 
-#: src/global.c:1309
+#: src/global.c:1340
 msgid "Backup files"
 msgstr "バックアップファイル"
 
-#: src/global.c:1311
+#: src/global.c:1342
 msgid "Reading file into separate buffer"
 msgstr ""
 
-#: src/global.c:1313
+#: src/global.c:1344
 msgid "Mouse support"
 msgstr "マウスのサポート"
 
-#: src/global.c:1315
+#: src/global.c:1346
 msgid "No conversion from DOS/Mac format"
 msgstr "DOS/Mac フォーマットを変換しない"
 
-#: src/global.c:1317
+#: src/global.c:1348
 msgid "Suspension"
 msgstr "一時中断"
 
-#: src/help.c:209
+#: src/help.c:211
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1172,7 +1187,7 @@ msgstr ""
 " テキストを検索する方向は検索プロンプトの表示で見分けることができます。検索語"
 "を何も入力せずにエンターを押すと、前回の検索語が使用されます。  "
 
-#: src/help.c:218
+#: src/help.c:220
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1186,7 +1201,7 @@ msgstr ""
 " 検索モードでは以下のファンクションキーが使用できます。\n"
 "\n"
 
-#: src/help.c:224
+#: src/help.c:226
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1205,7 +1220,7 @@ msgstr ""
 " 指定行へ移動するモードでは以下のファンクションキーが使用できます。\n"
 "\n"
 
-#: src/help.c:233
+#: src/help.c:235
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1227,7 +1242,7 @@ msgstr ""
 "ファに読み込まれます(Meta-<とMeta->キーでバッファを切り替えることができま"
 "す)。  "
 
-#: src/help.c:242
+#: src/help.c:244
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1241,7 +1256,7 @@ msgstr ""
 " ファイルからの読み込みモードでは以下のファンクションキーが使用できます。\n"
 "\n"
 
-#: src/help.c:248
+#: src/help.c:250
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1267,7 +1282,7 @@ msgstr ""
 " ファイルへの書き込みモードでは以下のファンクションキーが使用できます。\n"
 "\n"
 
-#: src/help.c:262
+#: src/help.c:264
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1290,7 +1305,7 @@ msgstr ""
 " ファイルブラウザでは以下のファンクションキーが使用できます。\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:277
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1313,7 +1328,7 @@ msgstr ""
 "検索語を入力せずにエンターキーを押すと、再度その語で検索を行います。\n"
 "\n"
 
-#: src/help.c:284
+#: src/help.c:286
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1321,7 +1336,7 @@ msgstr ""
 " ファイルブラウザの検索コマンドでは以下のファンクションキーが使用できます。\n"
 "\n"
 
-#: src/help.c:288
+#: src/help.c:290
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1344,7 +1359,7 @@ msgstr ""
 "用できます。\n"
 "\n"
 
-#: src/help.c:301
+#: src/help.c:303
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1368,7 +1383,7 @@ msgstr ""
 " スペルチェックでは以下のファンクションキーが使用できます。\n"
 "\n"
 
-#: src/help.c:316
+#: src/help.c:318
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1388,7 +1403,7 @@ msgstr ""
 " コマンド実行モードでは以下のファンクションキーが使用できます。\n"
 "\n"
 
-#: src/help.c:329
+#: src/help.c:331
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1407,15 +1422,15 @@ msgstr ""
 "れています。次にファイルを編集する領域があります。下から三行目はステータス行"
 "で、重要なメッセージが表示されます。  "
 
-#: src/help.c:339
+#: src/help.c:341
+#, fuzzy
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
-" The notation for shortcuts is as follows: Control-key sequences are notated "
-"with a caret (^) symbol and can be entered either by using the Control "
-"(Ctrl) key or pressing the Escape (Esc) key twice.  Escape-key sequences are "
-"notated with the Meta (M-) symbol and can be entered using either the Esc, "
-"Alt, or Meta key depending on your keyboard setup.  "
+" Shortcuts are written as follows: Control-key sequences are notated with a "
+"'^' and can be entered either by using the Ctrl key or pressing the Esc key "
+"twice.  Meta-key sequences are notated with 'M-' and can be entered using "
+"either the Alt, Cmd, or Esc key, depending on your keyboard setup.  "
 msgstr ""
 "画面下部の二行には、一般的に使われるショートカットキーが表示されています。\n"
 "\n"
@@ -1441,21 +1456,21 @@ msgstr ""
 msgid "enable/disable"
 msgstr "有効/無効"
 
-#: src/nano.c:559
+#: src/nano.c:560
 #, fuzzy
 msgid "Key is invalid in view mode"
 msgstr "ビューモードでそのキー入力は無効です"
 
-#: src/nano.c:565
+#: src/nano.c:566
 #, fuzzy
 msgid "This function is disabled in restricted mode"
 msgstr "制限モードでは %s の外部へ移動できません"
 
-#: src/nano.c:573
+#: src/nano.c:574
 msgid "Help is not available"
 msgstr ""
 
-#: src/nano.c:684
+#: src/nano.c:686
 #, c-format
 msgid ""
 "\n"
@@ -1464,7 +1479,7 @@ msgstr ""
 "\n"
 "バッファを %s へ書き込みました\n"
 
-#: src/nano.c:686
+#: src/nano.c:688
 #, c-format
 msgid ""
 "\n"
@@ -1473,7 +1488,7 @@ msgstr ""
 "\n"
 "バッファを書き込めません %s: %s\n"
 
-#: src/nano.c:689
+#: src/nano.c:691
 #, c-format
 msgid ""
 "\n"
@@ -1738,17 +1753,22 @@ msgstr "一時中断を有効化する"
 msgid "Enable soft line wrapping"
 msgstr "穏やかな行の折り返しを有効にする"
 
-#: src/nano.c:937
-#, fuzzy, c-format
-msgid " GNU nano, version %s\n"
-msgstr " GNU nano バージョン %s (コンパイル日時: %s, %s)\n"
-
 #: src/nano.c:940
 #, c-format
+msgid " nano, version %s\n"
+msgstr ""
+
+#: src/nano.c:943
+#, c-format
+msgid " (C) 2014..%s the contributors to nano\n"
+msgstr ""
+
+#: src/nano.c:945
+#, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 
-#: src/nano.c:941
+#: src/nano.c:946
 #, c-format
 msgid ""
 "\n"
@@ -1757,67 +1777,82 @@ msgstr ""
 "\n"
 " コンパイルオプション:"
 
-#: src/nano.c:1073
+#: src/nano.c:1081
 msgid "No file name"
 msgstr ""
 
-#: src/nano.c:1108
-msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
-msgstr "変更されたバッファを保存しますか (保存しないと変更は破棄されます)？ "
+#: src/nano.c:1115
+msgid "Save modified buffer?  (Answering \"No\" will DISCARD changes.) "
+msgstr ""
 
-#: src/nano.c:1168
+#: src/nano.c:1178
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "申し訳ありませんが、キーボードからの標準入力を再オープンできません。\n"
 
-#: src/nano.c:1192
+#: src/nano.c:1202
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "標準入力から読み込んでいます。中止する場合は ^C を入力してください\n"
 
-#: src/nano.c:1256
+#: src/nano.c:1266
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "SIGHUP ないし SIGTERM を受信しました\n"
 
-#: src/nano.c:1272
+#: src/nano.c:1282
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "\"fg\" とタイプすることで nano を再開できます。\n"
 
-#: src/nano.c:1294
+#: src/nano.c:1304
 msgid "Suspension is not enabled"
 msgstr ""
 
-#: src/nano.c:1448
+#: src/nano.c:1459
 msgid "enabled"
 msgstr "使用する"
 
-#: src/nano.c:1448
+#: src/nano.c:1459
 msgid "disabled"
 msgstr "使用しない"
 
-#: src/nano.c:1607 src/winio.c:1125
-msgid "Unknown Command"
-msgstr "不明なコマンド"
+#: src/nano.c:1573
+msgid "Unbound key"
+msgstr ""
 
-#: src/nano.c:1720
+#: src/nano.c:1577
+#, c-format
+msgid "Unbound key: M-%c"
+msgstr ""
+
+#: src/nano.c:1579
+#, c-format
+msgid "Unbound key: ^%c"
+msgstr ""
+
+#: src/nano.c:1581
+#, c-format
+msgid "Unbound key: %c"
+msgstr ""
+
+#: src/nano.c:1745
 msgid "XON ignored, mumble mumble"
 msgstr "XON は効かないよ・・・ぶつぶつ"
 
-#: src/nano.c:1725
+#: src/nano.c:1750
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF は効かないよ・・・ぶつぶつ"
 
-#: src/nano.c:2139 src/rcfile.c:1334
+#: src/nano.c:2166 src/rcfile.c:1187
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "要求されたタブのサイズ \"%s\" は不正です"
 
-#: src/nano.c:2200 src/rcfile.c:1259
+#: src/nano.c:2227 src/rcfile.c:1128
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "要求されたサイズ \"%s\" は不正です"
 
-#: src/nano.c:2247
+#: src/nano.c:2276
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr ""
@@ -1825,81 +1860,84 @@ msgstr ""
 #. TRANSLATORS: For the next three strings, if possible, specify
 #. * the single-byte shortcuts for both your language and English.
 #. * For example, in French: "OoYy" for "Oui".
-#: src/prompt.c:821
+#: src/prompt.c:818
 msgid "Yy"
 msgstr "Yy"
 
-#: src/prompt.c:822
+#: src/prompt.c:819
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:823
+#: src/prompt.c:820
 msgid "Aa"
 msgstr "Aa"
 
-#: src/prompt.c:845
+#: src/prompt.c:842
 msgid "Yes"
 msgstr "はい"
 
-#: src/prompt.c:850
+#: src/prompt.c:847
 msgid "All"
 msgstr "全て"
 
-#: src/prompt.c:855
+#: src/prompt.c:852
 msgid "No"
 msgstr "いいえ"
 
-#: src/rcfile.c:142
+#: src/rcfile.c:144
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "エラー検出 %s の %lu 行目: "
 
-#: src/rcfile.c:201
+#: src/rcfile.c:203
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "引数 '%s' は \" で終端していません"
 
-#: src/rcfile.c:228 src/rcfile.c:280 src/rcfile.c:732 src/rcfile.c:793
-#: src/rcfile.c:882 src/rcfile.c:933
+#: src/rcfile.c:231 src/rcfile.c:674 src/rcfile.c:725 src/rcfile.c:824
 msgid "Regex strings must begin and end with a \" character"
 msgstr "正規表現文字列は \" で括ってください"
 
-#: src/rcfile.c:254 src/search.c:62
+#: src/rcfile.c:257 src/search.c:61
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "不正な正規表現 \"%s\": %s"
 
-#: src/rcfile.c:274
+#: src/rcfile.c:279
 msgid "Missing syntax name"
 msgstr "構文名がありません"
 
-#: src/rcfile.c:345
+#: src/rcfile.c:288
+msgid "A syntax name must be quoted"
+msgstr ""
+
+#: src/rcfile.c:297
 msgid "The \"none\" syntax is reserved"
 msgstr "\"none\" 構文は予約語です"
 
-#: src/rcfile.c:352
-msgid "The \"default\" syntax must take no extensions"
+#: src/rcfile.c:327
+msgid "The \"default\" syntax does not accept extensions"
 msgstr ""
 
-#: src/rcfile.c:424
+#: src/rcfile.c:369
 msgid "Missing key name"
 msgstr "キー名がみつかりません"
 
-#: src/rcfile.c:433 src/rcfile.c:444
+#: src/rcfile.c:378 src/rcfile.c:389
 msgid "Key name is too short"
 msgstr ""
 
-#: src/rcfile.c:454
+#: src/rcfile.c:399
 #, fuzzy
 msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr "キーバインドは \"^\", \"M\" ないし \"F\" で始めてください"
 
-#: src/rcfile.c:457
+#: src/rcfile.c:402
 #, fuzzy, c-format
 msgid "Key name %s is invalid"
 msgstr "要求されたタブのサイズ \"%s\" は不正です"
 
-#: src/rcfile.c:466
+#: src/rcfile.c:411
 #, fuzzy
 msgid "Must specify a function to bind the key to"
 msgstr ""
@@ -1907,36 +1945,36 @@ msgstr ""
 "てください)"
 
 #. TRANSLATORS: Do not translate the word "all".
-#: src/rcfile.c:476
+#: src/rcfile.c:421
 msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
 
-#: src/rcfile.c:483
+#: src/rcfile.c:428
 #, fuzzy, c-format
 msgid "Cannot map name \"%s\" to a function"
 msgstr "\"%s\" に対応する機能はありません"
 
-#: src/rcfile.c:490
+#: src/rcfile.c:435
 #, fuzzy, c-format
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "\"%s\" に対応するメニューはありません"
 
-#: src/rcfile.c:522
+#: src/rcfile.c:467
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr ""
 
-#: src/rcfile.c:534
+#: src/rcfile.c:479
 #, fuzzy, c-format
 msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "申し訳ありませんが、キー \"%s\" は無効なバインディングです"
 
-#: src/rcfile.c:631
+#: src/rcfile.c:576
 #, fuzzy, c-format
 msgid "Error expanding %s: %s"
 msgstr "%s: %s の読み込みに失敗しました"
 
-#: src/rcfile.c:674
+#: src/rcfile.c:616
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1951,62 +1989,50 @@ msgstr ""
 "\"magenta\"、\"black\"で、それぞれに任意で\n"
 "接頭語\"bright\"をつけることが出来ます。"
 
-#: src/rcfile.c:696
-msgid "Cannot add a color command without a syntax command"
+#: src/rcfile.c:637 src/rcfile.c:795 src/rcfile.c:858
+#, c-format
+msgid "A '%s' command requires a preceding 'syntax' command"
 msgstr ""
 
-#: src/rcfile.c:701
+#: src/rcfile.c:643
 msgid "Missing color name"
 msgstr "色の名前がありません"
 
-#: src/rcfile.c:711 src/rcfile.c:872
-msgid "Missing regex string"
+#: src/rcfile.c:653 src/rcfile.c:807
+#, fuzzy, c-format
+msgid "Missing regex string after '%s' command"
 msgstr "正規表現文字列がみつかりません"
 
-#: src/rcfile.c:787
+#: src/rcfile.c:719
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\" には対応する \"end=\" が必要です"
 
-#: src/rcfile.c:839
+#: src/rcfile.c:768
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
 msgstr "背景色 \"%s\" が明るい色ではありません"
 
-#: src/rcfile.c:867
-msgid "Cannot add a header regex without a syntax command"
-msgstr ""
-
-#: src/rcfile.c:922
-msgid "Cannot add a magic string regex without a syntax command"
-msgstr ""
-
-#: src/rcfile.c:927
-msgid "Missing magic string name"
-msgstr ""
-
-#: src/rcfile.c:985
-msgid "Cannot add a linter without a syntax command"
+#: src/rcfile.c:802
+#, c-format
+msgid "The \"default\" syntax does not accept '%s' regexes"
 msgstr ""
 
-#: src/rcfile.c:990
-#, fuzzy
-msgid "Missing linter command"
-msgstr "色の名前がありません"
-
-#: src/rcfile.c:1011
-msgid "Cannot add formatter without a syntax command"
+#: src/rcfile.c:863
+#, c-format
+msgid "Missing command after '%s'"
 msgstr ""
 
-#: src/rcfile.c:1016
-msgid "Missing formatter command"
-msgstr ""
+#: src/rcfile.c:879
+#, fuzzy, c-format
+msgid "Argument of '%s' lacks closing \""
+msgstr "引数 '%s' は \" で終端していません"
 
-#: src/rcfile.c:1046
+#: src/rcfile.c:910
 #, fuzzy, c-format
 msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr "致命的なエラー: \"%s\" の機能に対応するキーがありません"
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:912
 #, fuzzy, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
@@ -2014,63 +2040,63 @@ msgstr ""
 "終了します。nanorc の設定を調整する必要がある場合は、 -I オプションを指定し"
 "て nano を使用してください。\n"
 
-#: src/rcfile.c:1109
+#: src/rcfile.c:971
 #, fuzzy, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "\"%s\" に対応するメニューはありません"
 
-#: src/rcfile.c:1125 src/rcfile.c:1134 src/rcfile.c:1144
-#, c-format
-msgid "Command \"%s\" not allowed in included file"
-msgstr "コマンド \"%s\" はインクルードファイル内では許可されていません"
-
-#: src/rcfile.c:1150 src/rcfile.c:1359
+#: src/rcfile.c:993 src/rcfile.c:1202
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "構文 \"%s\" は色のコマンドではありません"
 
-#: src/rcfile.c:1180
+#: src/rcfile.c:1024
+#, c-format
+msgid "Command \"%s\" not allowed in included file"
+msgstr "コマンド \"%s\" はインクルードファイル内では許可されていません"
+
+#: src/rcfile.c:1039
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "コマンド \"%s\" を解釈できません"
 
-#: src/rcfile.c:1195
+#: src/rcfile.c:1051
 #, fuzzy
 msgid "Missing option"
 msgstr "色の名前がありません"
 
-#: src/rcfile.c:1217
+#: src/rcfile.c:1065
+#, fuzzy, c-format
+msgid "Unknown option \"%s\""
+msgstr "未知のフラグ \"%s\""
+
+#: src/rcfile.c:1077
+#, fuzzy, c-format
+msgid "Cannot unset option \"%s\""
+msgstr "\"%s\" フラグを解除できません"
+
+#: src/rcfile.c:1089
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "オプション \"%s\" には引数が必要です"
 
-#: src/rcfile.c:1235
+#: src/rcfile.c:1105
 msgid "Option is not a valid multibyte string"
 msgstr "オプションが有効なマルチバイト文字ではありません"
 
-#: src/rcfile.c:1272 src/rcfile.c:1300 src/rcfile.c:1309
+#: src/rcfile.c:1139 src/rcfile.c:1160 src/rcfile.c:1167
 msgid "Non-blank characters required"
 msgstr "非空白類文字が必要です"
 
-#: src/rcfile.c:1282
+#: src/rcfile.c:1146
 msgid "Two single-column characters required"
 msgstr ""
 
-#: src/rcfile.c:1348
-#, fuzzy, c-format
-msgid "Cannot unset option \"%s\""
-msgstr "\"%s\" フラグを解除できません"
-
-#: src/rcfile.c:1354
-#, fuzzy, c-format
-msgid "Unknown option \"%s\""
-msgstr "未知のフラグ \"%s\""
-
-#: src/rcfile.c:1413
+#: src/rcfile.c:1258
 msgid "I can't find my home directory!  Wah!"
 msgstr "ホームディレクトリが見つかりません"
 
-#: src/rcfile.c:1451
+#: src/rcfile.c:1295
 #, c-format
 msgid ""
 "\n"
@@ -2079,342 +2105,405 @@ msgstr ""
 "\n"
 "エンターキーで開始します\n"
 
-#: src/search.c:96
+#: src/search.c:95
 #, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "\"%.*s%s\" が見つかりません"
 
 #. TRANSLATORS: The next three strings are modifiers of the search prompt.
-#: src/search.c:176
+#: src/search.c:169
 msgid " [Case Sensitive]"
 msgstr " [大文字と小文字を区別する]"
 
-#: src/search.c:180
+#: src/search.c:173
 msgid " [Regexp]"
 msgstr " [正規表現]"
 
-#: src/search.c:184
+#: src/search.c:177
 msgid " [Backwards]"
 msgstr " [戻る]"
 
 #. TRANSLATORS: The next two strings are modifiers of the search prompt.
-#: src/search.c:189
+#: src/search.c:182
 msgid " (to replace) in selection"
 msgstr ""
 
-#: src/search.c:191
+#: src/search.c:184
 msgid " (to replace)"
 msgstr ""
 
+#: src/search.c:305
+#, fuzzy
+msgid "Searching..."
+msgstr "検索"
+
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:718
+#: src/search.c:693
 msgid "Replace this instance?"
 msgstr ""
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:883
+#: src/search.c:840
 msgid "Replace with"
 msgstr "置換候補"
 
-#: src/search.c:924
+#: src/search.c:875
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
 msgstr[0] "%lu 個置換されました"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:964
+#: src/search.c:914
 msgid "Enter line number, column number"
 msgstr "行番号と列番号を入力"
 
-#: src/search.c:991
+#: src/search.c:939
 msgid "Invalid line or column number"
 msgstr "無効な行または列番号です"
 
-#: src/search.c:1124
+#: src/search.c:1080
 msgid "Not a bracket"
 msgstr "大括弧ではありません"
 
-#: src/search.c:1191
+#: src/search.c:1146
 msgid "No matching bracket"
 msgstr "大括弧が一致しません"
 
-#: src/text.c:54
+#: src/text.c:53
 msgid "Mark Set"
 msgstr "マークセット"
 
-#: src/text.c:58
+#: src/text.c:57
 msgid "Mark Unset"
 msgstr "マーク解除"
 
-#: src/text.c:70
+#: src/text.c:69
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "\"%s\" の呼び出しに失敗"
 
-#: src/text.c:475
+#: src/text.c:468
+msgid "Commenting is not supported for this file type"
+msgstr ""
+
+#: src/text.c:484
+msgid "Cannot comment past end of file"
+msgstr ""
+
+#: src/text.c:677
 msgid "Nothing in undo buffer!"
 msgstr "undo バッファに何もありません!"
 
-#: src/text.c:481 src/text.c:634
-#, fuzzy, c-format
-msgid "Internal error: can't match line %d.  Please save your work."
-msgstr "内部エラー: 行 %d が一致しません。作業を保存してください"
-
 #. TRANSLATORS: Eight of the next nine strings describe actions
 #. * that are undone or redone.  It are all nouns, not verbs.
-#: src/text.c:495 src/text.c:524 src/text.c:645 src/text.c:686
+#: src/text.c:695 src/text.c:724 src/text.c:857 src/text.c:898
 msgid "text add"
 msgstr "テキストの追加"
 
-#: src/text.c:505 src/text.c:656
+#: src/text.c:705 src/text.c:868
 msgid "text delete"
 msgstr "テキストの削除"
 
-#: src/text.c:528 src/text.c:694
+#: src/text.c:728 src/text.c:907
 msgid "line join"
 msgstr "行の結合"
 
-#: src/text.c:547 src/text.c:710
+#: src/text.c:747 src/text.c:923
 msgid "text cut"
 msgstr "テキストの切り取り"
 
-#: src/text.c:552 src/text.c:714
+#: src/text.c:752 src/text.c:927
 msgid "text uncut"
 msgstr "テキストの貼り付け"
 
-#: src/text.c:558 src/text.c:691
+#: src/text.c:758 src/text.c:903
 #, fuzzy
 msgid "Internal error: line is missing.  Please save your work."
 msgstr "内部エラー: uncut のセットアップに失敗しました。作業を保存してください"
 
-#: src/text.c:561 src/text.c:665
+#: src/text.c:762 src/text.c:877
 msgid "line break"
 msgstr "改行"
 
-#: src/text.c:569 src/text.c:725
+#: src/text.c:772 src/text.c:947
+msgid "comment"
+msgstr ""
+
+#: src/text.c:776 src/text.c:951
+msgid "uncomment"
+msgstr ""
+
+#: src/text.c:780 src/text.c:938
 msgid "text insert"
 msgstr "テキスト挿入"
 
-#: src/text.c:589 src/text.c:718
+#: src/text.c:800 src/text.c:931
 msgid "text replace"
 msgstr "テキストの置換"
 
-#: src/text.c:596 src/text.c:732 src/text.c:1030 src/text.c:1174
+#: src/text.c:807 src/text.c:955 src/text.c:1267 src/text.c:1437
 msgid "Internal error: unknown type.  Please save your work."
 msgstr "内部エラー: 不明な型です。作業を保存してください。"
 
-#: src/text.c:601
+#: src/text.c:813
 #, c-format
 msgid "Undid action (%s)"
 msgstr "操作 (%s) を取り消しました"
 
-#: src/text.c:619
+#: src/text.c:832
 msgid "Nothing to re-do!"
 msgstr "やり直す操作はありません!"
 
-#: src/text.c:628
+#: src/text.c:841
 #, fuzzy
 msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr "内部エラー: uncut のセットアップに失敗しました。作業を保存してください"
 
-#: src/text.c:737
+#: src/text.c:961
 #, c-format
 msgid "Redid action (%s)"
 msgstr "操作 (%s) をやり直しました"
 
-#: src/text.c:827 src/text.c:2508 src/text.c:2944
+#: src/text.c:1051 src/text.c:2765 src/text.c:3198
 msgid "Could not create pipe"
 msgstr "pipe を作成できません"
 
-#: src/text.c:853 src/text.c:2595 src/text.c:2750 src/text.c:2992
-#: src/text.c:3286
+#: src/text.c:1077 src/text.c:2852 src/text.c:3005 src/text.c:3246
+#: src/text.c:3540
 msgid "Could not fork"
 msgstr "forkできません"
 
-#: src/text.c:1853
+#: src/text.c:2117
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr ""
 
-#: src/text.c:2241
+#: src/text.c:2499
 msgid "Can now UnJustify!"
 msgstr ""
 
-#: src/text.c:2435
+#: src/text.c:2697
 msgid "Edit a replacement"
 msgstr ""
 
-#: src/text.c:2510
+#. TRANSLATORS: Shown after fixing misspellings in one word.
+#: src/text.c:2713
+#, fuzzy
+msgid "Next word..."
+msgstr "次の単語"
+
+#: src/text.c:2767
 msgid "Creating misspelled word list, please wait..."
 msgstr "スペルミスのある単語リストを作成しています。しばらくお待ちください..."
 
-#: src/text.c:2601 src/text.c:2999
+#: src/text.c:2858 src/text.c:3253
 msgid "Could not get size of pipe buffer"
 msgstr "pipe バッファのサイズを取得できませんでした"
 
-#: src/text.c:2652
+#: src/text.c:2907
 msgid "Error invoking \"spell\""
 msgstr "\"spell\" の呼び出しに失敗"
 
-#: src/text.c:2655
+#: src/text.c:2910
 msgid "Error invoking \"sort -f\""
 msgstr "\"sort -f\" の呼び出しに失敗"
 
-#: src/text.c:2658
+#: src/text.c:2913
 msgid "Error invoking \"uniq\""
 msgstr "\"uniq\" の呼び出しに失敗"
 
-#: src/text.c:2881
+#: src/text.c:3135
 #, fuzzy
 msgid "Invoking spell checker, please wait"
 msgstr "スペルチェッカを起動 (利用可能な場合)"
 
-#: src/text.c:2897
+#: src/text.c:3151
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "スペルチェック失敗: %s"
 
-#: src/text.c:2899
+#: src/text.c:3153
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "スペルチェック失敗: %s: %s"
 
-#: src/text.c:2902
+#: src/text.c:3156
 msgid "Finished checking spelling"
 msgstr "スペルチェック完了"
 
-#: src/text.c:2927
+#: src/text.c:3181
 #, fuzzy
 msgid "No linter defined for this type of file!"
 msgstr "ファイル末尾に空行を追加しない"
 
-#: src/text.c:2932
+#: src/text.c:3186
 msgid "Save modified buffer before linting?"
 msgstr ""
 
-#: src/text.c:2949
+#: src/text.c:3203
 msgid "Invoking linter, please wait"
 msgstr ""
 
-#: src/text.c:3105
+#: src/text.c:3358
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr ""
 
-#: src/text.c:3134
+#: src/text.c:3388
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
 
-#: src/text.c:3153
+#: src/text.c:3407
 msgid "No more errors in unopened files, cancelling"
 msgstr ""
 
-#: src/text.c:3192
+#: src/text.c:3446
 #, fuzzy
 msgid "At last message"
 msgstr "このメッセージを表示"
 
-#: src/text.c:3197
+#: src/text.c:3451
 #, fuzzy
 msgid "At first message"
 msgstr "このメッセージを表示"
 
-#: src/text.c:3237
+#: src/text.c:3491
 msgid "Finished"
 msgstr ""
 
-#: src/text.c:3259
+#: src/text.c:3513
 msgid "Invoking formatter, please wait"
 msgstr ""
 
-#: src/text.c:3314
+#: src/text.c:3568
 msgid "Finished formatting"
 msgstr ""
 
-#: src/text.c:3396
+#: src/text.c:3650
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%s単語数: %lu  行数: %ld  文字数: %lu"
 
-#: src/text.c:3397
+#: src/text.c:3651
 msgid "In Selection:  "
 msgstr "選択範囲内:  "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3411
+#: src/text.c:3665
 msgid "Verbatim Input"
 msgstr "逐次入力"
 
-#: src/utils.c:391 src/utils.c:403
+#: src/utils.c:392 src/utils.c:404
 msgid "nano is out of memory!"
 msgstr "nano のメモリが足りなくなりました!"
 
+#: src/utils.c:625
+#, fuzzy, c-format
+msgid "Internal error: can't match line %d.  Please save your work."
+msgstr "内部エラー: 行 %d が一致しません。作業を保存してください"
+
+#. TRANSLATORS: This refers to a sequence of escape codes
+#. * (from the keyboard) that nano does not know about.
+#: src/winio.c:1121
+msgid "Unknown sequence"
+msgstr ""
+
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
 #: src/winio.c:1427
 msgid "Unicode Input"
 msgstr "ユニコード入力"
 
-#: src/winio.c:1991 src/winio.c:1995
-msgid "Modified"
-msgstr "変更済み"
-
-#: src/winio.c:1992
-msgid "View"
-msgstr "表示"
-
-#: src/winio.c:2006
+#: src/winio.c:1960
 msgid "DIR:"
 msgstr "ディレクトリ:"
 
-#: src/winio.c:2013
+#: src/winio.c:1968
 msgid "File:"
 msgstr "ファイル:"
 
-#: src/winio.c:3141
+#: src/winio.c:1972 src/winio.c:1976
+msgid "Modified"
+msgstr "変更済み"
+
+#: src/winio.c:1974
+msgid "View"
+msgstr "表示"
+
+#: src/winio.c:3105
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "行 %ld/%ld (%d%%), 列 %lu/%lu (%d%%), 文字 %lu/%lu (%d%%)"
 
-#: src/winio.c:3271
+#: src/winio.c:3235
 msgid "The nano text editor"
 msgstr "nano テキストエディタ"
 
-#: src/winio.c:3272
+#: src/winio.c:3236
 msgid "version"
 msgstr "バージョン"
 
-#: src/winio.c:3273
+#: src/winio.c:3237
 msgid "Brought to you by:"
 msgstr "貢献してくれた方々:"
 
-#: src/winio.c:3274
+#: src/winio.c:3238
 msgid "Special thanks to:"
 msgstr "スペシャルサンクス:"
 
-#: src/winio.c:3275
+#: src/winio.c:3239
 msgid "The Free Software Foundation"
 msgstr "The Free Software Foundation"
 
-#: src/winio.c:3276
+#: src/winio.c:3240
 msgid "the many translators and the TP"
 msgstr ""
 
-#: src/winio.c:3277
+#: src/winio.c:3241
 msgid "For ncurses:"
 msgstr "ncurses に関して:"
 
-#: src/winio.c:3278
+#: src/winio.c:3242
 msgid "and anyone else we forgot..."
 msgstr "および他のすべての方々..."
 
-#: src/winio.c:3279
+#: src/winio.c:3243
 msgid "Thank you for using nano!"
 msgstr "nano を使用していただきありがとうございます!"
 
+#~ msgid ""
+#~ "Read %lu line (Converted from DOS and Mac format - Warning: No write "
+#~ "permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from DOS and Mac format - Warning: No write "
+#~ "permission)"
+#~ msgstr[0] ""
+#~ "%lu 行を読み込みます（DOS または Mac のフォーマットを変換 - 警告: 書き込み"
+#~ "権限がありません）"
+
+#~ msgid ""
+#~ "Read %lu line (Converted from Mac format - Warning: No write permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from Mac format - Warning: No write permission)"
+#~ msgstr[0] ""
+#~ "%lu 行を読み込みます（Mac フォーマットを変換 - 警告: 書き込み権限がありま"
+#~ "せん）"
+
+#~ msgid ""
+#~ "Read %lu line (Converted from DOS format - Warning: No write permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from DOS format - Warning: No write permission)"
+#~ msgstr[0] ""
+#~ "%lu 行を読み込みます（DOS フォーマットを変換 - 警告: 書き込み権限がありま"
+#~ "せん）"
+
+#~ msgid "Read %lu line ( Warning: No write permission)"
+#~ msgid_plural "Read %lu lines (Warning: No write permission)"
+#~ msgstr[0] "%lu 行を読み込みます(警告: 書き込み権限がありません)"
+
 #~ msgid "Cannot prepend or append to a symlink with --nofollow set"
 #~ msgstr "--nofollow が設定されている状態ではリンク先を変更できません"
 
@@ -2445,9 +2534,19 @@ msgstr "nano を使用していただきありがとうございます!"
 #~ msgid "(ignored, for Pico compatibility)"
 #~ msgstr "(Pico との互換性のためのオプション。無視されます)"
 
+#~ msgid " GNU nano version %s (compiled %s, %s)\n"
+#~ msgstr " GNU nano バージョン %s (コンパイル日時: %s, %s)\n"
+
 #~ msgid "Sorry, support for this function has been disabled"
 #~ msgstr "その機能は無効です"
 
+#~ msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
+#~ msgstr ""
+#~ "変更されたバッファを保存しますか (保存しないと変更は破棄されます)？ "
+
+#~ msgid "Unknown Command"
+#~ msgstr "不明なコマンド"
+
 #~ msgid "Missing flag"
 #~ msgstr "フラグがみつかりません"
 
diff --git a/po/ms.po b/po/ms.po
index e716bcb4..04c24492 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 2.3.99pre4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-25 16:41-0500\n"
+"POT-Creation-Date: 2016-06-17 15:41+0200\n"
 "PO-Revision-Date: 2015-06-30 17:28+0800\n"
 "Last-Translator: Sharuzzaman Ahmat Raslan <sharuzzaman@gmail.com>\n"
 "Language-Team: Malay <translation-team-ms@lists.sourceforge.net>\n"
@@ -18,354 +18,344 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Poedit 1.8.2\n"
 
+#: src/browser.c:144 src/browser.c:284 src/browser.c:334 src/files.c:996
+#: src/files.c:1003 src/files.c:1794 src/files.c:1919 src/files.c:1963
+#: src/files.c:1983 src/files.c:2099 src/files.c:3019 src/files.c:3242
+#: src/rcfile.c:540 src/rcfile.c:1280
+#, c-format
+msgid "Error reading %s: %s"
+msgstr "Ralat membaca %s: %s"
+
 #. TRANSLATORS: This is a prompt.
-#: src/browser.c:220
+#: src/browser.c:247
 msgid "Go To Directory"
 msgstr "Pergi Ke Direktori"
 
-#: src/browser.c:227 src/browser.c:738 src/files.c:1174 src/files.c:2340
-#: src/nano.c:1120 src/search.c:202 src/search.c:290 src/search.c:895
-#: src/search.c:970 src/text.c:2935 src/text.c:3142
+#: src/browser.c:254 src/browser.c:723 src/files.c:1126 src/files.c:2292
+#: src/nano.c:1128 src/search.c:195 src/search.c:297 src/search.c:851
+#: src/search.c:918 src/text.c:3189 src/text.c:3396
 msgid "Cancelled"
 msgstr "Dibatalkan"
 
-#: src/browser.c:253 src/browser.c:300
-#, c-format
-msgid "Can't go outside of %s in restricted mode"
+#. TRANSLATORS: This refers to the option --operatingdir,
+#. * not to --restricted.
+#: src/browser.c:274 src/browser.c:326
+#, fuzzy, c-format
+msgid "Can't go outside of %s in confined mode"
 msgstr "Tidak boleh ke luar dari %s dalam mod terhad"
 
-#: src/browser.c:264 src/browser.c:310 src/browser.c:326 src/files.c:1044
-#: src/files.c:1052 src/files.c:1844 src/files.c:1971 src/files.c:2016
-#: src/files.c:2037 src/files.c:2156 src/files.c:3062 src/files.c:3285
-#: src/rcfile.c:596 src/rcfile.c:1435
-#, c-format
-msgid "Error reading %s: %s"
-msgstr "Ralat membaca %s: %s"
-
-#: src/browser.c:290
+#: src/browser.c:317
 msgid "Can't move up a directory"
 msgstr "Tidak dapat pindah naik direktori"
 
 #. TRANSLATORS: Try to keep this at most 7 characters.
-#: src/browser.c:615 src/browser.c:623
+#: src/browser.c:590 src/browser.c:598
 msgid "(dir)"
 msgstr "(dir)"
 
 #. TRANSLATORS: Try to keep this at most 12 characters.
-#: src/browser.c:620
+#: src/browser.c:595
 msgid "(parent dir)"
 msgstr "(dir induk)"
 
 #. TRANSLATORS: Try to keep this at most 7 characters.
 #. * If necessary, you can leave out the parentheses.
-#: src/browser.c:650
+#: src/browser.c:625
 msgid "(huge)"
 msgstr ""
 
 #. TRANSLATORS: This is the main search prompt.
-#: src/browser.c:727 src/search.c:173
+#: src/browser.c:712 src/search.c:166
 msgid "Search"
 msgstr "Cari"
 
-#: src/browser.c:777 src/search.c:466 src/search.c:536
-msgid "This is the only occurrence"
-msgstr "Hanya inilah sahaja yang dijumpai"
-
-#: src/browser.c:793 src/search.c:364
+#: src/browser.c:754 src/search.c:368
 msgid "Search Wrapped"
 msgstr "Pancarian diulangi dari awal"
 
-#: src/browser.c:843 src/search.c:517
+#: src/browser.c:764 src/search.c:509
+msgid "This is the only occurrence"
+msgstr "Hanya inilah sahaja yang dijumpai"
+
+#: src/browser.c:812 src/search.c:473
 msgid "No current search pattern"
 msgstr "Tiada corak carian semasa"
 
-#: src/files.c:50
+#: src/color.c:186
+#, fuzzy, c-format
+msgid "Unknown syntax name: %s"
+msgstr "Nama sintaks tiada"
+
+#: src/color.c:247
+#, c-format
+msgid "magic_load() failed: %s"
+msgstr ""
+
+#: src/color.c:251
+#, c-format
+msgid "magic_file(%s) failed: %s"
+msgstr ""
+
+#: src/files.c:47
 #, fuzzy, c-format
 msgid "Directory '%s' does not exist"
 msgstr "Ralat menulis fail salinan %s: %s"
 
-#: src/files.c:52
+#: src/files.c:49
 #, c-format
 msgid "Path '%s': %s"
 msgstr ""
 
-#: src/files.c:54
+#: src/files.c:51
 #, fuzzy, c-format
 msgid "Path '%s' is not a directory"
 msgstr "\"%s\" adalah sebuah direktori"
 
-#: src/files.c:57
+#: src/files.c:53
 #, c-format
 msgid "Path '%s' is not accessible"
 msgstr ""
 
-#. TRANSLATORS: Try to keep this at most 76 characters.
-#: src/files.c:158
+#. TRANSLATORS: Keep the next ten messages at most 76 characters.
+#: src/files.c:148
 msgid ""
 "Warning: Modifying a file which is not locked, check directory permission?"
 msgstr ""
 
-#: src/files.c:197
+#: src/files.c:187
 msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
 msgstr ""
 "Tidak dapat menentukan identiti saya untuk fail kunci (getpwuid() gagal)"
 
-#: src/files.c:206
+#: src/files.c:196
 #, fuzzy, c-format
 msgid "Couldn't determine hostname for lock file: %s"
 msgstr ""
 "Tidak dapat menentukan identiti saya untuk fail kunci (getpwuid() gagal)"
 
-#: src/files.c:227 src/files.c:238 src/files.c:275 src/files.c:285
+#: src/files.c:216 src/files.c:225 src/files.c:262 src/files.c:272
 #, fuzzy, c-format
 msgid "Error writing lock file %s: %s"
 msgstr "Ralat menulis fail salinan %s: %s"
 
-#: src/files.c:305
+#: src/files.c:291
 #, fuzzy, c-format
 msgid "Error deleting lock file %s: %s"
 msgstr "Ralat membaca fail kunci %s: Tidak cukup membaca data"
 
-#: src/files.c:341
+#: src/files.c:325
 #, fuzzy, c-format
 msgid "Error opening lock file %s: %s"
 msgstr "Ralat membaca fail kunci %s: Tidak cukup membaca data"
 
-#: src/files.c:353
+#: src/files.c:337
 #, c-format
 msgid "Error reading lock file %s: Not enough data read"
 msgstr "Ralat membaca fail kunci %s: Tidak cukup membaca data"
 
 #. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
-#: src/files.c:371
+#: src/files.c:354
 #, c-format
 msgid "File %s is being edited (by %s with %s, PID %d); continue?"
 msgstr "Fail %s sedang disunting (oleh %s dengan %s, PID %d); teruskan?"
 
-#: src/files.c:426
+#: src/files.c:430
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Tidak dapat memasukkan fail luar daripada %s"
 
-#: src/files.c:439 src/files.c:1038 src/rcfile.c:589 src/rcfile.c:1385
-#: src/rcfile.c:1426
+#: src/files.c:445 src/files.c:991 src/rcfile.c:533 src/rcfile.c:1230
+#: src/rcfile.c:1271
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" adalah sebuah direktori"
 
-#: src/files.c:441
+#: src/files.c:447
 #, fuzzy, c-format
 msgid "\"%s\" is not a normal file"
 msgstr "\"%s\" adalah sebuah fail peranti"
 
-#: src/files.c:566
+#: src/files.c:571
 msgid "No more open file buffers"
 msgstr "Tiada lagi buffer fail terbuka"
 
-#: src/files.c:582
+#: src/files.c:586
 #, c-format
 msgid "Switched to %s"
 msgstr "Ditukar kepada %s"
 
-#: src/files.c:584 src/global.c:988 src/winio.c:2010
+#: src/files.c:588 src/global.c:1005 src/winio.c:1965
 msgid "New Buffer"
 msgstr "Buffer Baru"
 
-#: src/files.c:943
+#. TRANSLATORS: Keep the next four messages at most 76 characters.
+#: src/files.c:913
 #, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
 msgstr[0] "%lu baris dibaca (Ditukar daripada format Mac dan DOS)"
 
-#: src/files.c:948
-#, fuzzy, c-format
-msgid ""
-"Read %lu line (Converted from DOS and Mac format - Warning: No write "
-"permission)"
-msgid_plural ""
-"Read %lu lines (Converted from DOS and Mac format - Warning: No write "
-"permission)"
-msgstr[0] "%lu baris dibaca (Ditukar daripada format Mac dan DOS)"
-
-#: src/files.c:954
+#: src/files.c:919
 #, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
 msgstr[0] "%lu baris dibaca (Ditukar daripada format Mac)"
 
-#: src/files.c:958
-#, fuzzy, c-format
-msgid ""
-"Read %lu line (Converted from Mac format - Warning: No write permission)"
-msgid_plural ""
-"Read %lu lines (Converted from Mac format - Warning: No write permission)"
-msgstr[0] "%lu baris dibaca (Ditukar daripada format Mac)"
-
-#: src/files.c:964
+#: src/files.c:925
 #, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
 msgstr[0] "%lu baris dibaca (Ditukar daripada format DOS)"
 
-#: src/files.c:968
-#, fuzzy, c-format
-msgid ""
-"Read %lu line (Converted from DOS format - Warning: No write permission)"
-msgid_plural ""
-"Read %lu lines (Converted from DOS format - Warning: No write permission)"
-msgstr[0] "%lu baris dibaca (Ditukar daripada format DOS)"
-
-#: src/files.c:974
+#: src/files.c:930
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "%lu baris dibaca"
 
-#: src/files.c:977
-#, fuzzy, c-format
-msgid "Read %lu line (Warning: No write permission)"
-msgid_plural "Read %lu lines (Warning: No write permission)"
-msgstr[0] "Membaca %lu baris (Amaran: Tiada kebenaran menulis)"
-
-#: src/files.c:1019 src/files.c:1056
+#: src/files.c:974 src/files.c:1006
 msgid "Reading File"
 msgstr "Membaca fail"
 
-#: src/files.c:1025
+#: src/files.c:980
 msgid "New File"
 msgstr "Fail Baru"
 
-#: src/files.c:1028
-#, c-format
-msgid "\"%s\" not found"
+#: src/files.c:983
+#, fuzzy, c-format
+msgid "File \"%s\" not found"
 msgstr "\"%s\" tidak dijumpai"
 
-#: src/files.c:1039 src/rcfile.c:590 src/rcfile.c:1386 src/rcfile.c:1427
+#: src/files.c:992 src/rcfile.c:534 src/rcfile.c:1231 src/rcfile.c:1272
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" adalah sebuah fail peranti"
 
-#: src/files.c:1133
+#: src/files.c:1083
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Arahan untuk dilaksanakan dalam buffer baru [daripada %s] "
 
-#: src/files.c:1135
+#: src/files.c:1085
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Arahan untuk dilaksanakan [dari %s]"
 
-#: src/files.c:1142
+#: src/files.c:1092
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Fail untuk dimasukkan kedalam buffer baru [daripada %s] "
 
-#: src/files.c:1144
+#: src/files.c:1094
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Fail untuk dimasukkan [daripada %s] "
 
-#: src/files.c:1389
+#: src/files.c:1338
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Kekunci tidak sah dalam mod bukan multibuffer"
 
-#: src/files.c:1684
-msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+#: src/files.c:1632
+#, fuzzy
+msgid "Failed to write backup file; continue saving? (Say N if unsure.) "
 msgstr ""
 "Gagal menulis fail sandaran, terus menyimpan? (Katakanlah N jika tidak pasti)"
 
-#: src/files.c:1800
+#: src/files.c:1750
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Tidak dapat menulis diluar daripada %s"
 
-#: src/files.c:1885 src/files.c:1910 src/files.c:1928 src/files.c:1941
-#: src/files.c:1952 src/files.c:1981
+#: src/files.c:1833 src/files.c:1858 src/files.c:1876 src/files.c:1889
+#: src/files.c:1900 src/files.c:1928
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Ralat menulis fail salinan %s: %s"
 
-#: src/files.c:1886 src/nano.c:690
+#: src/files.c:1834 src/nano.c:692
 msgid "Too many backup files?"
 msgstr "Terlalu banyak fail salinan?"
 
-#: src/files.c:2026 src/text.c:2863 src/text.c:2875 src/text.c:3244
-#: src/text.c:3253
+#: src/files.c:1972 src/text.c:3117 src/text.c:3129 src/text.c:3498
+#: src/text.c:3507
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Ralat menulis fail sementara: %s"
 
-#: src/files.c:2049 src/files.c:2068 src/files.c:2080 src/files.c:2104
-#: src/files.c:2121 src/files.c:2131 src/files.c:2164 src/files.c:2171
+#: src/files.c:1994 src/files.c:2013 src/files.c:2023 src/files.c:2047
+#: src/files.c:2064 src/files.c:2074 src/files.c:2106 src/files.c:2113
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Ralat menulis %s: %s"
 
-#: src/files.c:2200
+#: src/files.c:2154
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "%lu baris ditulis"
 
-#: src/files.c:2299
+#: src/files.c:2249
 msgid " [DOS Format]"
 msgstr " [Format DOS]"
 
-#: src/files.c:2300
+#: src/files.c:2250
 msgid " [Mac Format]"
 msgstr " [Format Mac]"
 
-#: src/files.c:2302
+#: src/files.c:2252
 msgid " [Backup]"
 msgstr " [Salinan]"
 
-#: src/files.c:2309
+#: src/files.c:2259
 msgid "Prepend Selection to File"
 msgstr "Tambahan Awalan Pilihan ke Fail"
 
-#: src/files.c:2310
+#: src/files.c:2260
 msgid "Append Selection to File"
 msgstr "Tambahan Akhiran Pilihan ke Fail"
 
-#: src/files.c:2311
+#: src/files.c:2261
 msgid "Write Selection to File"
 msgstr "Tulis Pilihan ke Fail"
 
-#: src/files.c:2314
+#: src/files.c:2264
 msgid "File Name to Prepend to"
 msgstr "Nama Fail untuk di Tambah Awalan"
 
-#: src/files.c:2315
+#: src/files.c:2265
 msgid "File Name to Append to"
 msgstr "Nama Fail untuk di Tambah Akhiran"
 
-#: src/files.c:2316
+#: src/files.c:2266
 msgid "File Name to Write"
 msgstr "Nama Fail untuk di Tulis"
 
-#: src/files.c:2349
+#: src/files.c:2301
 #, fuzzy
-msgid "Save modified buffer anyway ? "
+msgid "Save modified buffer anyway? "
 msgstr ""
 "Simpan buffer ubahsuai (JAWAB \"Tidak\" AKAN MENGHILANGKAN PERUBAHAN) ? "
 
-#: src/files.c:2457
-msgid "File exists, OVERWRITE ? "
-msgstr "Fail telah wujud, TINDIH ? "
-
-#: src/files.c:2466
-msgid "Save file under DIFFERENT NAME ? "
+#: src/files.c:2412
+#, fuzzy
+msgid "Save file under DIFFERENT NAME? "
 msgstr "Simpan fail dengan NAMA BERLAINAN ? "
 
-#: src/files.c:2480
-msgid "File was modified since you opened it, continue saving ? "
+#: src/files.c:2420
+#, fuzzy, c-format
+msgid "File \"%s\" exists; OVERWRITE? "
+msgstr "Fail telah wujud, TINDIH ? "
+
+#: src/files.c:2441
+#, fuzzy
+msgid "File was modified since you opened it; continue saving? "
 msgstr "Fail telah diubahsuai semenjak anda membukanya, teruskan menyimpan ?"
 
-#: src/files.c:2917
+#: src/files.c:2874
 msgid "(more)"
 msgstr "(lagi)"
 
-#: src/files.c:3004
+#: src/files.c:2959
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -374,28 +364,28 @@ msgstr ""
 "\n"
 "Tekan Enter untuk meneruskan memulakan nano.\n"
 
-#: src/files.c:3020
+#: src/files.c:2975
 #, c-format
 msgid ""
 "Unable to create directory %s: %s\n"
 "It is required for saving/loading search history or cursor positions.\n"
 msgstr ""
 
-#: src/files.c:3026
+#: src/files.c:2982
 #, c-format
 msgid ""
 "Path %s is not a directory and needs to be.\n"
 "Nano will be unable to load or save search history or cursor positions.\n"
 msgstr ""
 
-#: src/files.c:3045
+#: src/files.c:3002
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I tried to move\n"
 "to the preferred location (%s) but encountered an error: %s"
 msgstr ""
 
-#: src/files.c:3049
+#: src/files.c:3006
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I moved\n"
@@ -403,114 +393,114 @@ msgid ""
 "(see the nano FAQ about this change)"
 msgstr ""
 
-#: src/files.c:3132 src/files.c:3140 src/files.c:3164 src/files.c:3176
+#: src/files.c:3089 src/files.c:3097 src/files.c:3121 src/files.c:3133
 #, fuzzy, c-format
 msgid "Error writing %s: %s\n"
 msgstr "Ralat menulis %s: %s"
 
 #. TRANSLATORS: Try to keep the next fifteen strings at most 10 characters.
-#: src/global.c:480
+#: src/global.c:483
 msgid "Exit"
 msgstr "Keluar"
 
-#: src/global.c:481
+#: src/global.c:484
 msgid "Close"
 msgstr "Tutup"
 
-#: src/global.c:482
+#: src/global.c:485
 #, fuzzy
 msgid "Uncut Text"
 msgstr "nyahpotong teks"
 
-#: src/global.c:484
+#: src/global.c:487
 #, fuzzy
 msgid "Unjustify"
 msgstr "Sekarang boleh UnJustify!"
 
-#: src/global.c:490
+#: src/global.c:493
 msgid "Read File"
 msgstr "Baca Fail"
 
-#: src/global.c:491
+#: src/global.c:494
 msgid "Where Is"
 msgstr "Di mana"
 
-#: src/global.c:492
+#: src/global.c:495
 msgid "Replace"
 msgstr "Ganti"
 
-#: src/global.c:493
+#: src/global.c:496
 msgid "Go To Line"
 msgstr "Ke Baris"
 
-#: src/global.c:494
+#: src/global.c:497
 msgid "Prev Line"
 msgstr "Baris Terdahulu"
 
-#: src/global.c:495
+#: src/global.c:498
 msgid "Next Line"
 msgstr "Baris Berikut"
 
-#: src/global.c:496
+#: src/global.c:499
 msgid "Prev Page"
 msgstr "Terdahulu"
 
-#: src/global.c:497
+#: src/global.c:500
 msgid "Next Page"
 msgstr "Berikut"
 
-#: src/global.c:499
+#: src/global.c:502
 msgid "Justify"
 msgstr "Justifikasi"
 
-#: src/global.c:500
+#: src/global.c:503
 msgid "FullJstify"
 msgstr "JustifiPenuh"
 
-#: src/global.c:502
+#: src/global.c:505
 msgid "Refresh"
 msgstr "Segarkan"
 
 #. TRANSLATORS: Try to keep this string at most 12 characters.
-#: src/global.c:505
+#: src/global.c:508
 msgid "WhereIs Next"
 msgstr "Dimana Seterusnya"
 
 #. TRANSLATORS: The next long series of strings are shortcut descriptions;
 #. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:512
+#: src/global.c:515
 msgid "Justify the current paragraph"
 msgstr "Justifikasi perenggan semasa"
 
-#: src/global.c:514
+#: src/global.c:517
 msgid "Cancel the current function"
 msgstr "Batal fungsi semasa"
 
-#: src/global.c:515
+#: src/global.c:518
 msgid "Display this help text"
 msgstr "Papar teks bantuan ini"
 
-#: src/global.c:518
+#: src/global.c:521
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Tutup fail penimbal semasa / Keluar dari nano"
 
-#: src/global.c:520
+#: src/global.c:523
 msgid "Exit from nano"
 msgstr "Keluar dari nano"
 
-#: src/global.c:524
+#: src/global.c:527
 msgid "Write the current file to disk"
 msgstr "Tulis fail semasa ke cakera"
 
-#: src/global.c:526
+#: src/global.c:529
 msgid "Insert another file into the current one"
 msgstr "Masukkan fail lain ke file semasa"
 
-#: src/global.c:528
+#: src/global.c:531
 msgid "Search for a string or a regular expression"
 msgstr "Cari rentetan atau regular expression"
 
-#: src/global.c:531
+#: src/global.c:533
 #, fuzzy
 msgid "Search for a string"
 msgstr ""
@@ -524,640 +514,671 @@ msgstr ""
 "carian.  Menekan Enter tanpa memasukkan sebarang teks akan melaksanakan "
 "carian terdahulu."
 
-#: src/global.c:533
+#: src/global.c:534
+msgid "Refresh the file list"
+msgstr ""
+
+#: src/global.c:535
+#, fuzzy
+msgid "Go to lefthand column"
+msgstr "Pergi ke nombor baris dan lajur"
+
+#: src/global.c:536
+#, fuzzy
+msgid "Go to righthand column"
+msgstr "Pergi ke nombor baris dan lajur"
+
+#: src/global.c:538
 #, fuzzy
 msgid "Go one screenful up"
 msgstr "Maju ke depan satu perkataan"
 
-#: src/global.c:534
+#: src/global.c:539
 #, fuzzy
 msgid "Go one screenful down"
 msgstr "Maju ke depan satu aksara"
 
-#: src/global.c:536
+#: src/global.c:541
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Potong baris semasa dan simpan dalam cutbuffer"
 
-#: src/global.c:538
+#: src/global.c:543
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Kembalikan dari cutbuffer ke baris semasa"
 
-#: src/global.c:539
+#: src/global.c:544
 msgid "Display the position of the cursor"
 msgstr "Papar posisi kursor"
 
-#: src/global.c:541
+#: src/global.c:546
 msgid "Invoke the spell checker, if available"
 msgstr "Panggil penyemak ejaan, jika ada"
 
-#: src/global.c:543
+#: src/global.c:548
 msgid "Replace a string or a regular expression"
 msgstr "Ganti rentetan atau regular expression"
 
-#: src/global.c:544
+#: src/global.c:549
 msgid "Go to line and column number"
 msgstr "Pergi ke nombor baris dan lajur"
 
-#: src/global.c:546
+#: src/global.c:551
 #, fuzzy
 msgid "Mark text starting from the cursor position"
 msgstr "Tanda teks pada lokasi kursor"
 
-#: src/global.c:547
+#: src/global.c:552
 #, fuzzy
 msgid "Repeat the last search"
 msgstr "Brs Akhir"
 
-#: src/global.c:549
+#: src/global.c:554
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "Salin baris semasa dan simpan dalam cutbuffer"
 
-#: src/global.c:550
+#: src/global.c:555
 msgid "Indent the current line"
 msgstr "Inden baris semasa"
 
-#: src/global.c:551
+#: src/global.c:556
 msgid "Unindent the current line"
 msgstr "Nyahindent baris semasa"
 
-#: src/global.c:552
+#: src/global.c:558
+msgid "Comment/uncomment the current line or marked lines"
+msgstr ""
+
+#: src/global.c:560
 msgid "Undo the last operation"
 msgstr "Nyahbuat tindakan terakhir"
 
-#: src/global.c:553
+#: src/global.c:561
 msgid "Redo the last undone operation"
 msgstr "Buat semula tindakan nyahbuat terakhir"
 
-#: src/global.c:555
+#: src/global.c:563
 msgid "Go back one character"
 msgstr "Undur ke belakang satu aksara"
 
-#: src/global.c:556
+#: src/global.c:564
 msgid "Go forward one character"
 msgstr "Maju ke depan satu aksara"
 
-#: src/global.c:558
+#: src/global.c:566
 msgid "Go back one word"
 msgstr "Undur belakang satu perkataan"
 
-#: src/global.c:559
+#: src/global.c:567
 msgid "Go forward one word"
 msgstr "Maju ke depan satu perkataan"
 
-#: src/global.c:561
+#: src/global.c:569
 msgid "Go to previous line"
 msgstr "Pergi ke baris terdahulu"
 
-#: src/global.c:562
+#: src/global.c:570
 msgid "Go to next line"
 msgstr "Pergi ke baris berikutnya"
 
-#: src/global.c:563
+#: src/global.c:571
 msgid "Go to beginning of current line"
 msgstr "Pergi ke permulaan baris semasa"
 
-#: src/global.c:564
+#: src/global.c:572
 msgid "Go to end of current line"
 msgstr "Pergi ke penghujung baris semasa"
 
-#: src/global.c:567
+#: src/global.c:575
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr ""
 "Pergi hingga ke permulaan perenggan semasa; kemudian ke perenggan sebelumnya"
 
-#: src/global.c:569
+#: src/global.c:577
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr ""
 "Pergi hingga ke penghujung perenggan semasa; kemudian ke perenggan seterusnya"
 
-#: src/global.c:571
+#: src/global.c:579
 msgid "Go to the first line of the file"
 msgstr "Pergi ke baris pertama fail"
 
-#: src/global.c:572
+#: src/global.c:580
 msgid "Go to the last line of the file"
 msgstr "Pergi ke baris terakhir fail"
 
-#: src/global.c:574
+#: src/global.c:582
 msgid "Go to the matching bracket"
 msgstr "Pergi ke braket sepadan"
 
-#: src/global.c:576
+#: src/global.c:584
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "Skrol atas satu baris tanpa skrol kursor"
 
-#: src/global.c:578
+#: src/global.c:586
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "Skrol bawah satu baris tanpa skrol kursor"
 
-#: src/global.c:581
+#: src/global.c:589
 msgid "Switch to the previous file buffer"
 msgstr "Tukar ke buffer fail terdahulu"
 
-#: src/global.c:582
+#: src/global.c:590
 msgid "Switch to the next file buffer"
 msgstr "Tukar ke buffer fail berikut"
 
-#: src/global.c:584
+#: src/global.c:592
 msgid "Insert the next keystroke verbatim"
 msgstr "Selit kekunci seterusnya setiap satu"
 
-#: src/global.c:585
+#: src/global.c:593
 msgid "Insert a tab at the cursor position"
 msgstr "Masukkan tab di kedudukan kursor"
 
-#: src/global.c:586
+#: src/global.c:594
 msgid "Insert a newline at the cursor position"
 msgstr "Masukkan baris baru di kedudukan kursor"
 
-#: src/global.c:587
+#: src/global.c:595
 msgid "Delete the character under the cursor"
 msgstr "Padam aksara dibawah kursor"
 
-#: src/global.c:589
+#: src/global.c:597
 msgid "Delete the character to the left of the cursor"
 msgstr "Padam aksara di kiri kursor"
 
-#: src/global.c:592
+#: src/global.c:600
 #, fuzzy
 msgid "Cut backward from cursor to word start"
 msgstr "Potong dari kursor hingga ke akhir baris"
 
-#: src/global.c:594
+#: src/global.c:602
 #, fuzzy
 msgid "Cut forward from cursor to next word start"
 msgstr "Potong dari kursor hingga ke akhir baris"
 
-#: src/global.c:596
+#: src/global.c:604
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Potong dari kedudukan kursor hingga ke akhir fail"
 
-#: src/global.c:599
+#: src/global.c:607
 msgid "Justify the entire file"
 msgstr "Justifi keseluruhan fail"
 
-#: src/global.c:603
+#: src/global.c:611
 msgid "Count the number of words, lines, and characters"
 msgstr "Kira jumlah perkataan, baris, dan aksara"
 
-#: src/global.c:606
+#: src/global.c:614
 msgid "Refresh (redraw) the current screen"
 msgstr "Segarkan (lukis semula) skrin semasa"
 
-#: src/global.c:608
+#: src/global.c:616
 #, fuzzy
 msgid "Suspend the editor (if suspension is enabled)"
 msgstr "Gantung penyunting (jika gantung dihidupkan)"
 
-#: src/global.c:610
+#: src/global.c:618
 msgid "Save file without prompting"
 msgstr ""
 
-#: src/global.c:611
+#: src/global.c:619
 msgid "Search next occurrence backward"
 msgstr ""
 
-#: src/global.c:612
+#: src/global.c:620
 msgid "Search next occurrence forward"
 msgstr ""
 
-#: src/global.c:614
+#: src/global.c:622
 msgid "Toggle the case sensitivity of the search"
 msgstr "Toggle pencarian case sensitif"
 
-#: src/global.c:616
+#: src/global.c:624
 msgid "Reverse the direction of the search"
 msgstr "Terbalikkan arah carian"
 
-#: src/global.c:620
+#: src/global.c:628
 msgid "Toggle the use of regular expressions"
 msgstr "Toggle penggunaan ungkapan nalar"
 
-#: src/global.c:624
+#: src/global.c:632
 msgid "Recall the previous search/replace string"
 msgstr "Panggil semula rentetan cari/ganti terdahulu"
 
-#: src/global.c:626
+#: src/global.c:634
 msgid "Recall the next search/replace string"
 msgstr "Panggil semula rentetan cari/ganti seterusnya"
 
-#: src/global.c:629
+#: src/global.c:637
 msgid "Go to file browser"
 msgstr "Pergi ke pelayar fail"
 
-#: src/global.c:632
+#: src/global.c:640
 msgid "Toggle the use of DOS format"
 msgstr "Toggle penggunaan format DOS"
 
-#: src/global.c:633
+#: src/global.c:641
 msgid "Toggle the use of Mac format"
 msgstr "Toggle penggunaan format Mac"
 
-#: src/global.c:634
+#: src/global.c:642
 msgid "Toggle appending"
 msgstr "Toggle tambahan akhiran"
 
-#: src/global.c:635
+#: src/global.c:643
 msgid "Toggle prepending"
 msgstr "Toggle tambahan awalan"
 
-#: src/global.c:636
+#: src/global.c:644
 msgid "Toggle backing up of the original file"
 msgstr "Toggle salinan fail asal"
 
-#: src/global.c:637
+#: src/global.c:645
 msgid "Execute external command"
 msgstr "Laksanakan arahan luaran"
 
-#: src/global.c:639
+#: src/global.c:647
 msgid "Close buffer without saving it"
 msgstr ""
 
-#: src/global.c:641
+#: src/global.c:649
 msgid "Toggle the use of a new buffer"
 msgstr "Toggle kegunaan buffer baru"
 
-#: src/global.c:644
+#: src/global.c:652
 msgid "Exit from the file browser"
 msgstr "Keluar dari pelayar fail"
 
-#: src/global.c:645
+#: src/global.c:653
 msgid "Go to the first file in the list"
 msgstr "Pergi ke fail pertama dalam senarai"
 
-#: src/global.c:646
+#: src/global.c:654
 msgid "Go to the last file in the list"
 msgstr "Pergi ke fail terakhir dalam senarai"
 
-#: src/global.c:647
+#: src/global.c:655
 #, fuzzy
 msgid "Go to the previous file in the list"
 msgstr "Pergi ke fail pertama dalam senarai"
 
-#: src/global.c:648
+#: src/global.c:656
 #, fuzzy
 msgid "Go to the next file in the list"
 msgstr "Pergi ke fail terakhir dalam senarai"
 
-#: src/global.c:649
+#: src/global.c:657
 msgid "Go to directory"
 msgstr "Pergi ke direktori"
 
-#: src/global.c:652
+#: src/global.c:660
 #, fuzzy
 msgid "Invoke the linter, if available"
 msgstr "Panggil penyemak ejaan, jika ada"
 
-#: src/global.c:653
+#: src/global.c:661
 #, fuzzy
 msgid "Go to previous linter msg"
 msgstr ""
 "Pergi hingga ke permulaan perenggan semasa; kemudian ke perenggan sebelumnya"
 
-#: src/global.c:654
+#: src/global.c:662
 #, fuzzy
 msgid "Go to next linter msg"
 msgstr "Pergi ke baris berikutnya"
 
-#: src/global.c:656
+#: src/global.c:664
 #, fuzzy
 msgid "Invoke formatter, if available"
 msgstr "Panggil penyemak ejaan, jika ada"
 
 #. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:671
+#: src/global.c:679
 msgid "Get Help"
 msgstr "Bantuan"
 
-#: src/global.c:674 src/prompt.c:858
+#: src/global.c:682 src/prompt.c:855
 msgid "Cancel"
 msgstr "Batal"
 
-#: src/global.c:687
+#: src/global.c:695
 #, fuzzy
 msgid "Write Out"
 msgstr "gagal menulis"
 
-#: src/global.c:723
+#: src/global.c:731
 msgid "Go To Dir"
 msgstr "Pergi Ke Dir"
 
-#: src/global.c:738
+#: src/global.c:746
 msgid "Cut Text"
 msgstr "Kerat Teks"
 
-#: src/global.c:753
+#: src/global.c:761
 msgid "To Spell"
 msgstr "Ke Pengeja"
 
-#: src/global.c:757
+#: src/global.c:765
 #, fuzzy
 msgid "To Linter"
 msgstr "Ke Baris"
 
-#: src/global.c:760
+#: src/global.c:768
 #, fuzzy
 msgid "Formatter"
 msgstr "Format DOS"
 
-#: src/global.c:767
+#: src/global.c:775
 msgid "Case Sens"
 msgstr "Case Sens"
 
-#: src/global.c:772
+#: src/global.c:780
 msgid "Regexp"
 msgstr "Regexp"
 
-#: src/global.c:777
+#: src/global.c:785
 msgid "Backwards"
 msgstr "Kebelakang"
 
-#: src/global.c:784
+#: src/global.c:792
 msgid "No Replace"
 msgstr "Jangan Ganti"
 
-#: src/global.c:792
+#: src/global.c:800
 msgid "Cur Pos"
 msgstr "Pos Kursor"
 
-#: src/global.c:807
+#: src/global.c:815
 msgid "First Line"
 msgstr "Brs Awal"
 
-#: src/global.c:809
+#: src/global.c:817
 msgid "Last Line"
 msgstr "Brs Akhir"
 
-#: src/global.c:816
+#: src/global.c:824
 #, fuzzy
 msgid "To Bracket"
 msgstr "Bukan kurungan"
 
-#: src/global.c:819
+#: src/global.c:827
 msgid "Mark Text"
 msgstr "Tanda Teks"
 
-#: src/global.c:822
+#: src/global.c:830
 msgid "Copy Text"
 msgstr "Salin Teks"
 
-#: src/global.c:825
+#: src/global.c:833
 msgid "Indent Text"
 msgstr "Teks Indent"
 
-#: src/global.c:827
+#: src/global.c:835
 msgid "Unindent Text"
 msgstr "Teks Tidak Indent"
 
-#: src/global.c:830
+#: src/global.c:838
 msgid "Undo"
 msgstr "Nyahbuat"
 
-#: src/global.c:832
+#: src/global.c:840
 msgid "Redo"
 msgstr "Buat semula"
 
-#: src/global.c:836 src/global.c:842
+#: src/global.c:844 src/global.c:850
 msgid "Back"
 msgstr "Undur"
 
-#: src/global.c:838 src/global.c:844
+#: src/global.c:846 src/global.c:852
 msgid "Forward"
 msgstr "Maju"
 
-#: src/global.c:849
+#: src/global.c:857
 msgid "Prev Word"
 msgstr "Perkataan Terdahulu"
 
-#: src/global.c:851
+#: src/global.c:859
 msgid "Next Word"
 msgstr "Perkataan Selepas"
 
-#: src/global.c:855
+#: src/global.c:863
 msgid "Home"
 msgstr "Asal"
 
-#: src/global.c:857
+#: src/global.c:865
 msgid "End"
 msgstr "Akhir"
 
-#: src/global.c:866
+#: src/global.c:874
 msgid "Beg of Par"
 msgstr "Minta untuk Par"
 
-#: src/global.c:868
+#: src/global.c:876
 msgid "End of Par"
 msgstr "Pengakhir Par"
 
-#: src/global.c:873
+#: src/global.c:881
 msgid "Scroll Up"
 msgstr "Skrol Atas"
 
-#: src/global.c:875
+#: src/global.c:883
 msgid "Scroll Down"
 msgstr "Skrol Bawah"
 
-#: src/global.c:880
+#: src/global.c:888
 #, fuzzy
 msgid "Prev File"
 msgstr "Baris Terdahulu"
 
-#: src/global.c:882
+#: src/global.c:890
 msgid "Next File"
 msgstr "Fail Selepas"
 
-#: src/global.c:891
+#: src/global.c:899
 #, fuzzy
 msgid "Verbatim"
 msgstr "Selit kekunci seterusnya setiap satu"
 
-#: src/global.c:894
+#: src/global.c:902
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:896
+#: src/global.c:904
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:899
+#: src/global.c:907
 msgid "Delete"
 msgstr "Padam"
 
-#: src/global.c:901
+#: src/global.c:909
 msgid "Backspace"
 msgstr "Backspace"
 
 #. TRANSLATORS: The next two strings refer to cutting words.
-#: src/global.c:912
+#: src/global.c:920
 #, fuzzy
 msgid "Cut Left"
 msgstr "Kerat Teks"
 
-#: src/global.c:914
+#: src/global.c:922
 msgid "Cut Right"
 msgstr ""
 
-#: src/global.c:916
+#: src/global.c:924
 msgid "CutTillEnd"
 msgstr "PtngHnggAkhr"
 
-#: src/global.c:926
+#: src/global.c:934
 msgid "Word Count"
 msgstr "Kiraan Perkataan"
 
-#: src/global.c:933
+#: src/global.c:941
 msgid "Suspend"
 msgstr "Gantung"
 
-#: src/global.c:937
+#: src/global.c:945
+#, fuzzy
+msgid "Comment Lines"
+msgstr "Baris Berikut"
+
+#: src/global.c:949
 msgid "Save"
 msgstr ""
 
-#: src/global.c:940
+#: src/global.c:952
 msgid "Previous"
 msgstr ""
 
-#: src/global.c:942
+#: src/global.c:954
 #, fuzzy
 msgid "Next"
 msgstr "Baris Berikut"
 
-#: src/global.c:948
+#: src/global.c:960
 msgid "PrevHstory"
 msgstr "SjrhUndur"
 
-#: src/global.c:951
+#: src/global.c:963
 msgid "NextHstory"
 msgstr "SjrhMaju"
 
-#: src/global.c:955
+#: src/global.c:972
 msgid "Go To Text"
 msgstr "Ke Teks"
 
-#: src/global.c:959
+#: src/global.c:976
 msgid "DOS Format"
 msgstr "Format DOS"
 
-#: src/global.c:961
+#: src/global.c:978
 msgid "Mac Format"
 msgstr "Format Mac"
 
-#: src/global.c:969
+#: src/global.c:986
 msgid "Append"
 msgstr "Tambah"
 
-#: src/global.c:971
+#: src/global.c:988
 msgid "Prepend"
 msgstr "Tambahan awalan"
 
-#: src/global.c:974
+#: src/global.c:991
 msgid "Backup File"
 msgstr "Fail Salinan"
 
-#: src/global.c:981
+#: src/global.c:998
 msgid "Execute Command"
 msgstr "Laksanakan Arahan"
 
-#: src/global.c:996
+#: src/global.c:1013
 msgid "To Files"
 msgstr "Ke Fail"
 
-#: src/global.c:1004
+#: src/global.c:1021
 msgid "First File"
 msgstr "Fail Pertama"
 
-#: src/global.c:1006
+#: src/global.c:1023
 msgid "Last File"
 msgstr "Fail Terakhir"
 
-#: src/global.c:1010
+#: src/global.c:1027
 msgid "Discard buffer"
 msgstr ""
 
+#: src/global.c:1038
+msgid "Left Column"
+msgstr ""
+
+#: src/global.c:1040
+msgid "Right Column"
+msgstr ""
+
 #. TRANSLATORS: Try to keep the next two strings at most 20 characters.
-#: src/global.c:1020
+#: src/global.c:1047
 #, fuzzy
 msgid "Prev Lint Msg"
 msgstr "Baris Terdahulu"
 
-#: src/global.c:1022
+#: src/global.c:1049
 #, fuzzy
 msgid "Next Lint Msg"
 msgstr "\t\tSeterusnya pada: %s\n"
 
 #. TRANSLATORS: The next seventeen strings are toggle descriptions;
 #. * they are best kept shorter than 40 characters, but may be longer.
-#: src/global.c:1285
+#: src/global.c:1316
 msgid "Help mode"
 msgstr "Mod bantuan"
 
-#: src/global.c:1287
+#: src/global.c:1318
 msgid "Constant cursor position display"
 msgstr "Paparan posisi tetap kursor"
 
-#: src/global.c:1289
+#: src/global.c:1320
 msgid "Use of one more line for editing"
 msgstr "Guna satu lagi baris untuk menyunting"
 
-#: src/global.c:1291
+#: src/global.c:1322
 msgid "Smooth scrolling"
 msgstr "Gulungan lancar"
 
-#: src/global.c:1293
+#: src/global.c:1324
 #, fuzzy
 msgid "Soft wrapping of overlong lines"
 msgstr "Jangan lilit baris panjang"
 
-#: src/global.c:1295
+#: src/global.c:1326
 msgid "Whitespace display"
 msgstr "Papar ruangputih"
 
-#: src/global.c:1297
+#: src/global.c:1328
 msgid "Color syntax highlighting"
 msgstr "Sorotan warna sintaks"
 
-#: src/global.c:1299
+#: src/global.c:1330
 msgid "Smart home key"
 msgstr "Kekunci Home pintar"
 
-#: src/global.c:1301
+#: src/global.c:1332
 msgid "Auto indent"
 msgstr "Auto indent"
 
-#: src/global.c:1303
+#: src/global.c:1334
 msgid "Cut to end"
 msgstr "Potong hingga akhir"
 
-#: src/global.c:1305
+#: src/global.c:1336
 #, fuzzy
 msgid "Hard wrapping of overlong lines"
 msgstr "Jangan lilit baris panjang"
 
-#: src/global.c:1307
+#: src/global.c:1338
 msgid "Conversion of typed tabs to spaces"
 msgstr "Penukaran tab ditaip kepada ruang"
 
-#: src/global.c:1309
+#: src/global.c:1340
 msgid "Backup files"
 msgstr "Salinan fail"
 
-#: src/global.c:1311
+#: src/global.c:1342
 msgid "Reading file into separate buffer"
 msgstr ""
 
-#: src/global.c:1313
+#: src/global.c:1344
 msgid "Mouse support"
 msgstr "Sokongan tetikus"
 
-#: src/global.c:1315
+#: src/global.c:1346
 msgid "No conversion from DOS/Mac format"
 msgstr "Tiada pertukaran dari format DOS/Mac"
 
-#: src/global.c:1317
+#: src/global.c:1348
 msgid "Suspension"
 msgstr "Gantungan"
 
-#: src/help.c:209
+#: src/help.c:211
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1179,7 +1200,7 @@ msgstr ""
 "carian.  Menekan Enter tanpa memasukkan sebarang teks akan melaksanakan "
 "carian terdahulu."
 
-#: src/help.c:218
+#: src/help.c:220
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1193,7 +1214,7 @@ msgstr ""
 " Kekunci fungsi berikut terdapat didalam mod Cari:\n"
 "\n"
 
-#: src/help.c:224
+#: src/help.c:226
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1213,7 +1234,7 @@ msgstr ""
 " Kekunci fungsi berikut terdapat didalam mod Pergi Ke Baris:\n"
 "\n"
 
-#: src/help.c:233
+#: src/help.c:235
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1236,7 +1257,7 @@ msgstr ""
 "menyebabkannya dimuatkan ke dalam buffer berlainan (guna Meta-< dan > untuk "
 "menukar diantara buffer fail)."
 
-#: src/help.c:242
+#: src/help.c:244
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1250,7 +1271,7 @@ msgstr ""
 " Kekunci fungsi berikut terdapat didalam mod Sisipan Fail:\n"
 "\n"
 
-#: src/help.c:248
+#: src/help.c:250
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1278,7 +1299,7 @@ msgstr ""
 " Kekunci fungsi berikut terdapat didalam mod Menulis Fail:\n"
 "\n"
 
-#: src/help.c:262
+#: src/help.c:264
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1302,7 +1323,7 @@ msgstr ""
 " Kekunci fungsi berikut terdapat didalam pelayar fail:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:277
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1326,7 +1347,7 @@ msgstr ""
 "carian terdahulu.\n"
 "\n"
 
-#: src/help.c:284
+#: src/help.c:286
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1334,7 +1355,7 @@ msgstr ""
 " Kekunci fungsi berikut terdapat dalam mod Pencarian Pelayar:\n"
 "\n"
 
-#: src/help.c:288
+#: src/help.c:290
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1357,7 +1378,7 @@ msgstr ""
 "  Kekunci fungsi berikut terdapat didalam mod Pelayar Pergi ke Direktori:\n"
 "\n"
 
-#: src/help.c:301
+#: src/help.c:303
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1381,7 +1402,7 @@ msgstr ""
 " Kekunci fungsi berikut terdapat didalam mod Penyemak Ejaan:\n"
 "\n"
 
-#: src/help.c:316
+#: src/help.c:318
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1402,7 +1423,7 @@ msgstr ""
 " Kekunci fungsi berikut terdapat didalam mod Laksana Arahan:\n"
 "\n"
 
-#: src/help.c:329
+#: src/help.c:331
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1422,15 +1443,15 @@ msgstr ""
 "penyunting yang menunjukkan fail yang sedang disunting.  Baris status adalah "
 "baris ketiga dari bawah dan menunjukkan mesej-mesej penting."
 
-#: src/help.c:339
+#: src/help.c:341
+#, fuzzy
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
-" The notation for shortcuts is as follows: Control-key sequences are notated "
-"with a caret (^) symbol and can be entered either by using the Control "
-"(Ctrl) key or pressing the Escape (Esc) key twice.  Escape-key sequences are "
-"notated with the Meta (M-) symbol and can be entered using either the Esc, "
-"Alt, or Meta key depending on your keyboard setup.  "
+" Shortcuts are written as follows: Control-key sequences are notated with a "
+"'^' and can be entered either by using the Ctrl key or pressing the Esc key "
+"twice.  Meta-key sequences are notated with 'M-' and can be entered using "
+"either the Alt, Cmd, or Esc key, depending on your keyboard setup.  "
 msgstr ""
 "Dua baris terbawah memaparkan pintasan yang biasa digunakan dalam "
 "penyunting.\n"
@@ -1460,21 +1481,21 @@ msgstr ""
 msgid "enable/disable"
 msgstr "enable/disable"
 
-#: src/nano.c:559
+#: src/nano.c:560
 #, fuzzy
 msgid "Key is invalid in view mode"
 msgstr "Kekunci tidak sah dalam mod lihat"
 
-#: src/nano.c:565
+#: src/nano.c:566
 #, fuzzy
 msgid "This function is disabled in restricted mode"
 msgstr "Tidak boleh ke luar dari %s dalam mod terhad"
 
-#: src/nano.c:573
+#: src/nano.c:574
 msgid "Help is not available"
 msgstr ""
 
-#: src/nano.c:684
+#: src/nano.c:686
 #, c-format
 msgid ""
 "\n"
@@ -1483,7 +1504,7 @@ msgstr ""
 "\n"
 "Buffer ditulis ke %s\n"
 
-#: src/nano.c:686
+#: src/nano.c:688
 #, c-format
 msgid ""
 "\n"
@@ -1492,7 +1513,7 @@ msgstr ""
 "\n"
 "Buffer tidak ditulis ke %s: %s\n"
 
-#: src/nano.c:689
+#: src/nano.c:691
 #, c-format
 msgid ""
 "\n"
@@ -1759,17 +1780,22 @@ msgstr "Aktifkan gantungan"
 msgid "Enable soft line wrapping"
 msgstr "Lilit baris panjang"
 
-#: src/nano.c:937
+#: src/nano.c:940
 #, fuzzy, c-format
-msgid " GNU nano, version %s\n"
+msgid " nano, version %s\n"
 msgstr "bison (GNU Bison) %s"
 
-#: src/nano.c:940
+#: src/nano.c:943
+#, c-format
+msgid " (C) 2014..%s the contributors to nano\n"
+msgstr ""
+
+#: src/nano.c:945
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr " Emel: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 
-#: src/nano.c:941
+#: src/nano.c:946
 #, c-format
 msgid ""
 "\n"
@@ -1778,69 +1804,83 @@ msgstr ""
 "\n"
 " Pilihan kompilasi:"
 
-#: src/nano.c:1073
+#: src/nano.c:1081
 #, fuzzy
 msgid "No file name"
 msgstr "Nama Fail untuk di Tulis"
 
-#: src/nano.c:1108
-msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
+#: src/nano.c:1115
+msgid "Save modified buffer?  (Answering \"No\" will DISCARD changes.) "
 msgstr ""
-"Simpan buffer ubahsuai (JAWAB \"Tidak\" AKAN MENGHILANGKAN PERUBAHAN) ? "
 
-#: src/nano.c:1168
+#: src/nano.c:1178
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr ""
 
-#: src/nano.c:1192
+#: src/nano.c:1202
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr ""
 
-#: src/nano.c:1256
+#: src/nano.c:1266
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "SIGHUP atau SIGTERM diterima\n"
 
-#: src/nano.c:1272
+#: src/nano.c:1282
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Guna \"fg\" untuk kembali ke nano.\n"
 
-#: src/nano.c:1294
+#: src/nano.c:1304
 msgid "Suspension is not enabled"
 msgstr ""
 
-#: src/nano.c:1448
+#: src/nano.c:1459
 msgid "enabled"
 msgstr "dihidupkan"
 
-#: src/nano.c:1448
+#: src/nano.c:1459
 msgid "disabled"
 msgstr "dimatikan"
 
-#: src/nano.c:1607 src/winio.c:1125
-msgid "Unknown Command"
-msgstr "Arahan Tidak Diketahui"
+#: src/nano.c:1573
+msgid "Unbound key"
+msgstr ""
+
+#: src/nano.c:1577
+#, c-format
+msgid "Unbound key: M-%c"
+msgstr ""
+
+#: src/nano.c:1579
+#, c-format
+msgid "Unbound key: ^%c"
+msgstr ""
+
+#: src/nano.c:1581
+#, c-format
+msgid "Unbound key: %c"
+msgstr ""
 
-#: src/nano.c:1720
+#: src/nano.c:1745
 msgid "XON ignored, mumble mumble"
 msgstr "XON diabaikan, mumble mumble"
 
-#: src/nano.c:1725
+#: src/nano.c:1750
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF diabaikan, mumble mumble"
 
-#: src/nano.c:2139 src/rcfile.c:1334
+#: src/nano.c:2166 src/rcfile.c:1187
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Saiz tab \"%s\" yang diminta tidak sah"
 
-#: src/nano.c:2200 src/rcfile.c:1259
+#: src/nano.c:2227 src/rcfile.c:1128
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Saiz isian \"%s\" yang diminta tidak sah"
 
-#: src/nano.c:2247
+#: src/nano.c:2276
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr ""
@@ -1848,117 +1888,121 @@ msgstr ""
 #. TRANSLATORS: For the next three strings, if possible, specify
 #. * the single-byte shortcuts for both your language and English.
 #. * For example, in French: "OoYy" for "Oui".
-#: src/prompt.c:821
+#: src/prompt.c:818
 msgid "Yy"
 msgstr "Yy"
 
-#: src/prompt.c:822
+#: src/prompt.c:819
 msgid "Nn"
 msgstr "Tt"
 
-#: src/prompt.c:823
+#: src/prompt.c:820
 msgid "Aa"
 msgstr "Ss"
 
-#: src/prompt.c:845
+#: src/prompt.c:842
 msgid "Yes"
 msgstr "Ya"
 
-#: src/prompt.c:850
+#: src/prompt.c:847
 msgid "All"
 msgstr "Semua"
 
-#: src/prompt.c:855
+#: src/prompt.c:852
 msgid "No"
 msgstr "Tidak"
 
-#: src/rcfile.c:142
+#: src/rcfile.c:144
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Ralat dalam %s pada baris %lu: "
 
-#: src/rcfile.c:201
+#: src/rcfile.c:203
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "Hujah '%s' tiada pengakhiran \""
 
-#: src/rcfile.c:228 src/rcfile.c:280 src/rcfile.c:732 src/rcfile.c:793
-#: src/rcfile.c:882 src/rcfile.c:933
+#: src/rcfile.c:231 src/rcfile.c:674 src/rcfile.c:725 src/rcfile.c:824
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Rentetan regex mesti bermula dan tamat dengan aksara \""
 
-#: src/rcfile.c:254 src/search.c:62
+#: src/rcfile.c:257 src/search.c:61
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Regex tidak sah \"%s\": %s"
 
-#: src/rcfile.c:274
+#: src/rcfile.c:279
 msgid "Missing syntax name"
 msgstr "Nama sintaks tiada"
 
-#: src/rcfile.c:345
+#: src/rcfile.c:288
+msgid "A syntax name must be quoted"
+msgstr ""
+
+#: src/rcfile.c:297
 msgid "The \"none\" syntax is reserved"
 msgstr "Sintaks \"none\" adalah dikhaskan"
 
-#: src/rcfile.c:352
-msgid "The \"default\" syntax must take no extensions"
+#: src/rcfile.c:327
+#, fuzzy
+msgid "The \"default\" syntax does not accept extensions"
 msgstr "Sintaks \"default\" mesti tidak mempunyai sambungan"
 
-#: src/rcfile.c:424
+#: src/rcfile.c:369
 msgid "Missing key name"
 msgstr "Nama kekunci hilang"
 
-#: src/rcfile.c:433 src/rcfile.c:444
+#: src/rcfile.c:378 src/rcfile.c:389
 #, fuzzy
 msgid "Key name is too short"
 msgstr "Nama kekunci hilang"
 
-#: src/rcfile.c:454
+#: src/rcfile.c:399
 #, fuzzy
 msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr "ikatankekunci mesti bermula dengan \"^\", \"M\", atau \"F\"\n"
 
-#: src/rcfile.c:457
+#: src/rcfile.c:402
 #, fuzzy, c-format
 msgid "Key name %s is invalid"
 msgstr "Saiz tab \"%s\" yang diminta tidak sah"
 
-#: src/rcfile.c:466
+#: src/rcfile.c:411
 #, fuzzy
 msgid "Must specify a function to bind the key to"
 msgstr "Mesti menyatakan fungsi untuk mengikat kekunci ke\n"
 
 #. TRANSLATORS: Do not translate the word "all".
-#: src/rcfile.c:476
+#: src/rcfile.c:421
 msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
 
-#: src/rcfile.c:483
+#: src/rcfile.c:428
 #, fuzzy, c-format
 msgid "Cannot map name \"%s\" to a function"
 msgstr "Tidak dapat memetakan nama \"%s\" ke fungsi\n"
 
-#: src/rcfile.c:490
+#: src/rcfile.c:435
 #, fuzzy, c-format
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "Tidak dapat memetakan nama \"%s\" ke menu\n"
 
-#: src/rcfile.c:522
+#: src/rcfile.c:467
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr ""
 
-#: src/rcfile.c:534
+#: src/rcfile.c:479
 #, fuzzy, c-format
 msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "Maaf, kekunci \"%s\" adalah ikatan tidak sah\n"
 
-#: src/rcfile.c:631
+#: src/rcfile.c:576
 #, fuzzy, c-format
 msgid "Error expanding %s: %s"
 msgstr "Ralat membaca %s: %s"
 
-#: src/rcfile.c:674
+#: src/rcfile.c:616
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1973,67 +2017,50 @@ msgstr ""
 "\"black\", dengan prefiks pilihan \"bright\"\n"
 "untuk warna latar hadapan."
 
-#: src/rcfile.c:696
-msgid "Cannot add a color command without a syntax command"
-msgstr "Tidak dapat menambah arahan warna tanpa arahan sintaks"
+#: src/rcfile.c:637 src/rcfile.c:795 src/rcfile.c:858
+#, c-format
+msgid "A '%s' command requires a preceding 'syntax' command"
+msgstr ""
 
-#: src/rcfile.c:701
+#: src/rcfile.c:643
 msgid "Missing color name"
 msgstr "Nama warna tiada"
 
-#: src/rcfile.c:711 src/rcfile.c:872
-msgid "Missing regex string"
-msgstr "Rentetan regex hilang"
+#: src/rcfile.c:653 src/rcfile.c:807
+#, fuzzy, c-format
+msgid "Missing regex string after '%s' command"
+msgstr "Nama sintaks tiada"
 
-#: src/rcfile.c:787
+#: src/rcfile.c:719
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\" memerlukan padanan \"end=\""
 
-#: src/rcfile.c:839
+#: src/rcfile.c:768
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
 msgstr "Warna latarbelakang \"%s\" tidak boleh terang"
 
-#: src/rcfile.c:867
-msgid "Cannot add a header regex without a syntax command"
-msgstr "Tidak dapat menambah pengepala regex tanpa arahan sintaks"
-
-#: src/rcfile.c:922
-#, fuzzy
-msgid "Cannot add a magic string regex without a syntax command"
-msgstr "Tidak dapat menambah pengepala regex tanpa arahan sintaks"
-
-#: src/rcfile.c:927
-#, fuzzy
-msgid "Missing magic string name"
-msgstr "Nama sintaks tiada"
-
-#: src/rcfile.c:985
-#, fuzzy
-msgid "Cannot add a linter without a syntax command"
-msgstr "Tidak dapat menambah pengepala regex tanpa arahan sintaks"
+#: src/rcfile.c:802
+#, fuzzy, c-format
+msgid "The \"default\" syntax does not accept '%s' regexes"
+msgstr "Sintaks \"default\" mesti tidak mempunyai sambungan"
 
-#: src/rcfile.c:990
-#, fuzzy
-msgid "Missing linter command"
+#: src/rcfile.c:863
+#, fuzzy, c-format
+msgid "Missing command after '%s'"
 msgstr "Nama sintaks tiada"
 
-#: src/rcfile.c:1011
-#, fuzzy
-msgid "Cannot add formatter without a syntax command"
-msgstr "Tidak dapat menambah pengepala regex tanpa arahan sintaks"
-
-#: src/rcfile.c:1016
-#, fuzzy
-msgid "Missing formatter command"
-msgstr "Nama sintaks tiada"
+#: src/rcfile.c:879
+#, fuzzy, c-format
+msgid "Argument of '%s' lacks closing \""
+msgstr "Hujah '%s' tiada pengakhiran \""
 
-#: src/rcfile.c:1046
+#: src/rcfile.c:910
 #, fuzzy, c-format
 msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr "Ralat maut: tiada kekunci dipetakan untuk fungsi \"%s\""
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:912
 #, fuzzy, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
@@ -2041,63 +2068,63 @@ msgstr ""
 "Keluar. Sila guna nano dengan pilihan -I jika perlu untuk mengubah tetapan "
 "nanorc anda\n"
 
-#: src/rcfile.c:1109
+#: src/rcfile.c:971
 #, fuzzy, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "Tidak dapat memetakan nama \"%s\" ke menu\n"
 
-#: src/rcfile.c:1125 src/rcfile.c:1134 src/rcfile.c:1144
-#, c-format
-msgid "Command \"%s\" not allowed in included file"
-msgstr "Arahan \"%s\" tidak dibenarkan dalam fail diselitkan"
-
-#: src/rcfile.c:1150 src/rcfile.c:1359
+#: src/rcfile.c:993 src/rcfile.c:1202
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Sintaks \"%s\" tidak mempunyai arahan warna"
 
-#: src/rcfile.c:1180
+#: src/rcfile.c:1024
+#, c-format
+msgid "Command \"%s\" not allowed in included file"
+msgstr "Arahan \"%s\" tidak dibenarkan dalam fail diselitkan"
+
+#: src/rcfile.c:1039
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Arahan \"%s\" tidak difahami"
 
-#: src/rcfile.c:1195
+#: src/rcfile.c:1051
 #, fuzzy
 msgid "Missing option"
 msgstr "PILIHAN"
 
-#: src/rcfile.c:1217
+#: src/rcfile.c:1065
+#, fuzzy, c-format
+msgid "Unknown option \"%s\""
+msgstr "Pilihan lanjutan tidak diketahui: %s\n"
+
+#: src/rcfile.c:1077
+#, fuzzy, c-format
+msgid "Cannot unset option \"%s\""
+msgstr "nilai pilihan %s berkonflik `%s'"
+
+#: src/rcfile.c:1089
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Pilihan \"%s\" memerlukan hujah"
 
-#: src/rcfile.c:1235
+#: src/rcfile.c:1105
 msgid "Option is not a valid multibyte string"
 msgstr "Pilihan bukan rentetan pelbagai byte yang sah"
 
-#: src/rcfile.c:1272 src/rcfile.c:1300 src/rcfile.c:1309
+#: src/rcfile.c:1139 src/rcfile.c:1160 src/rcfile.c:1167
 msgid "Non-blank characters required"
 msgstr "Aksara bukan-kosong diperlukan"
 
-#: src/rcfile.c:1282
+#: src/rcfile.c:1146
 msgid "Two single-column characters required"
 msgstr "Dua aksara satu-lajur diperlukan"
 
-#: src/rcfile.c:1348
-#, fuzzy, c-format
-msgid "Cannot unset option \"%s\""
-msgstr "nilai pilihan %s berkonflik `%s'"
-
-#: src/rcfile.c:1354
-#, fuzzy, c-format
-msgid "Unknown option \"%s\""
-msgstr "Pilihan lanjutan tidak diketahui: %s\n"
-
-#: src/rcfile.c:1413
+#: src/rcfile.c:1258
 msgid "I can't find my home directory!  Wah!"
 msgstr "Saya tidak dapat mencari direktori utama!  Wah!"
 
-#: src/rcfile.c:1451
+#: src/rcfile.c:1295
 #, c-format
 msgid ""
 "\n"
@@ -2106,351 +2133,417 @@ msgstr ""
 "\n"
 "Tekan Enter untuk meneruskan memulakan nano.\n"
 
-#: src/search.c:96
+#: src/search.c:95
 #, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "\"%.*s%s\" tidak dijumpai"
 
 #. TRANSLATORS: The next three strings are modifiers of the search prompt.
-#: src/search.c:176
+#: src/search.c:169
 msgid " [Case Sensitive]"
 msgstr " [Case Sensitif]"
 
-#: src/search.c:180
+#: src/search.c:173
 msgid " [Regexp]"
 msgstr " [Regexp]"
 
-#: src/search.c:184
+#: src/search.c:177
 msgid " [Backwards]"
 msgstr " [Undur]"
 
 #. TRANSLATORS: The next two strings are modifiers of the search prompt.
-#: src/search.c:189
+#: src/search.c:182
 msgid " (to replace) in selection"
 msgstr " (untuk mengganti) dalam pilihan"
 
-#: src/search.c:191
+#: src/search.c:184
 msgid " (to replace)"
 msgstr " (untuk mengganti)"
 
+#: src/search.c:305
+#, fuzzy
+msgid "Searching..."
+msgstr "Cari"
+
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:718
+#: src/search.c:693
 msgid "Replace this instance?"
 msgstr "Ganti dikedudukan ini?"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:883
+#: src/search.c:840
 msgid "Replace with"
 msgstr "Ganti dengan"
 
-#: src/search.c:924
+#: src/search.c:875
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
 msgstr[0] "%lu tempat telah diganti"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:964
+#: src/search.c:914
 msgid "Enter line number, column number"
 msgstr "Masukkan nombor baris, nombor lajur"
 
-#: src/search.c:991
+#: src/search.c:939
 msgid "Invalid line or column number"
 msgstr "Nombor baris atau lajur tidak sah"
 
-#: src/search.c:1124
+#: src/search.c:1080
 msgid "Not a bracket"
 msgstr "Bukan kurungan"
 
-#: src/search.c:1191
+#: src/search.c:1146
 msgid "No matching bracket"
 msgstr "Tiada padanan kurungan"
 
-#: src/text.c:54
+#: src/text.c:53
 msgid "Mark Set"
 msgstr "Tetapkan Tanda"
 
-#: src/text.c:58
+#: src/text.c:57
 msgid "Mark Unset"
 msgstr "Nyahtetap Tanda"
 
-#: src/text.c:70
+#: src/text.c:69
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Ralat melaksanakan \"%s\""
 
-#: src/text.c:475
+#: src/text.c:468
+msgid "Commenting is not supported for this file type"
+msgstr ""
+
+#: src/text.c:484
+msgid "Cannot comment past end of file"
+msgstr ""
+
+#: src/text.c:677
 msgid "Nothing in undo buffer!"
 msgstr "Tiada apa dalam buffer nyahbuat!"
 
-#: src/text.c:481 src/text.c:634
-#, fuzzy, c-format
-msgid "Internal error: can't match line %d.  Please save your work."
-msgstr "Ralat dalaman: tidak dapat memadan baris %d. Sila simpan kerja anda"
-
 #. TRANSLATORS: Eight of the next nine strings describe actions
 #. * that are undone or redone.  It are all nouns, not verbs.
-#: src/text.c:495 src/text.c:524 src/text.c:645 src/text.c:686
+#: src/text.c:695 src/text.c:724 src/text.c:857 src/text.c:898
 msgid "text add"
 msgstr "tambah teks"
 
-#: src/text.c:505 src/text.c:656
+#: src/text.c:705 src/text.c:868
 msgid "text delete"
 msgstr "padam teks"
 
-#: src/text.c:528 src/text.c:694
+#: src/text.c:728 src/text.c:907
 msgid "line join"
 msgstr "gabung baris"
 
-#: src/text.c:547 src/text.c:710
+#: src/text.c:747 src/text.c:923
 msgid "text cut"
 msgstr "potong teks"
 
-#: src/text.c:552 src/text.c:714
+#: src/text.c:752 src/text.c:927
 msgid "text uncut"
 msgstr "nyahpotong teks"
 
-#: src/text.c:558 src/text.c:691
+#: src/text.c:758 src/text.c:903
 #, fuzzy
 msgid "Internal error: line is missing.  Please save your work."
 msgstr "Ralat dalaman: tidak dapat memadan baris %d. Sila simpan kerja anda"
 
-#: src/text.c:561 src/text.c:665
+#: src/text.c:762 src/text.c:877
 #, fuzzy
 msgid "line break"
 msgstr "Ke Baris"
 
-#: src/text.c:569 src/text.c:725
+#: src/text.c:772 src/text.c:947
+msgid "comment"
+msgstr ""
+
+#: src/text.c:776 src/text.c:951
+msgid "uncomment"
+msgstr ""
+
+#: src/text.c:780 src/text.c:938
 msgid "text insert"
 msgstr "selit teks"
 
-#: src/text.c:589 src/text.c:718
+#: src/text.c:800 src/text.c:931
 msgid "text replace"
 msgstr "ganti teks"
 
-#: src/text.c:596 src/text.c:732 src/text.c:1030 src/text.c:1174
+#: src/text.c:807 src/text.c:955 src/text.c:1267 src/text.c:1437
 msgid "Internal error: unknown type.  Please save your work."
 msgstr "Ralat dalaman: jenis tidak diketahui. Sila simpan kerja anda."
 
-#: src/text.c:601
+#: src/text.c:813
 #, c-format
 msgid "Undid action (%s)"
 msgstr "Nyahbuat tindakan (%s)"
 
-#: src/text.c:619
+#: src/text.c:832
 msgid "Nothing to re-do!"
 msgstr "Tiada apa hendak di ulangbuat!"
 
-#: src/text.c:628
+#: src/text.c:841
 #, fuzzy
 msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
 "Ralat dalaman: tidak dapat menetapkan nyahpotong. Sila simpan kerja anda."
 
-#: src/text.c:737
+#: src/text.c:961
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Ulangbuat tindakan (%s)"
 
-#: src/text.c:827 src/text.c:2508 src/text.c:2944
+#: src/text.c:1051 src/text.c:2765 src/text.c:3198
 msgid "Could not create pipe"
 msgstr "Tidak dapat mencipta paip"
 
-#: src/text.c:853 src/text.c:2595 src/text.c:2750 src/text.c:2992
-#: src/text.c:3286
+#: src/text.c:1077 src/text.c:2852 src/text.c:3005 src/text.c:3246
+#: src/text.c:3540
 msgid "Could not fork"
 msgstr "Tidak dapat mencabang"
 
-#: src/text.c:1853
+#: src/text.c:2117
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Petikan rentetan tidak sesuai %s: %s"
 
-#: src/text.c:2241
+#: src/text.c:2499
 msgid "Can now UnJustify!"
 msgstr "Sekarang boleh UnJustify!"
 
-#: src/text.c:2435
+#: src/text.c:2697
 msgid "Edit a replacement"
 msgstr "Ubah penggantian"
 
-#: src/text.c:2510
+#. TRANSLATORS: Shown after fixing misspellings in one word.
+#: src/text.c:2713
+#, fuzzy
+msgid "Next word..."
+msgstr "Perkataan Selepas"
+
+#: src/text.c:2767
 msgid "Creating misspelled word list, please wait..."
 msgstr "Menghasilkan senarai perkataan salah eja, sila tunggu..."
 
-#: src/text.c:2601 src/text.c:2999
+#: src/text.c:2858 src/text.c:3253
 msgid "Could not get size of pipe buffer"
 msgstr "Tidak dapat memperoleh saiz buffer paip"
 
-#: src/text.c:2652
+#: src/text.c:2907
 msgid "Error invoking \"spell\""
 msgstr "Ralat melaksanakan \"spell\""
 
-#: src/text.c:2655
+#: src/text.c:2910
 msgid "Error invoking \"sort -f\""
 msgstr "Ralat melaksanakan \"sort -f\""
 
-#: src/text.c:2658
+#: src/text.c:2913
 msgid "Error invoking \"uniq\""
 msgstr "Ralat melaksanakan \"uniq\""
 
-#: src/text.c:2881
+#: src/text.c:3135
 #, fuzzy
 msgid "Invoking spell checker, please wait"
 msgstr "Panggil penyemak ejaan, jika ada"
 
-#: src/text.c:2897
+#: src/text.c:3151
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Semakan ejaan gagal: %s"
 
-#: src/text.c:2899
+#: src/text.c:3153
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Semakan ejaan gagal: %s: %s"
 
-#: src/text.c:2902
+#: src/text.c:3156
 msgid "Finished checking spelling"
 msgstr "Selesai memeriksa ejaan"
 
-#: src/text.c:2927
+#: src/text.c:3181
 #, fuzzy
 msgid "No linter defined for this type of file!"
 msgstr "Jangan tambah baris baru pada penghujung fail"
 
-#: src/text.c:2932
+#: src/text.c:3186
 #, fuzzy
 msgid "Save modified buffer before linting?"
 msgstr ""
 "Simpan buffer ubahsuai (JAWAB \"Tidak\" AKAN MENGHILANGKAN PERUBAHAN) ? "
 
-#: src/text.c:2949
+#: src/text.c:3203
 #, fuzzy
 msgid "Invoking linter, please wait"
 msgstr "Menghasilkan senarai perkataan salah eja, sila tunggu..."
 
-#: src/text.c:3105
+#: src/text.c:3358
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr ""
 
-#: src/text.c:3134
+#: src/text.c:3388
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
 
-#: src/text.c:3153
+#: src/text.c:3407
 msgid "No more errors in unopened files, cancelling"
 msgstr ""
 
-#: src/text.c:3192
+#: src/text.c:3446
 #, fuzzy
 msgid "At last message"
 msgstr "barisan mesej"
 
-#: src/text.c:3197
+#: src/text.c:3451
 #, fuzzy
 msgid "At first message"
 msgstr "Mesej tidak dijangka"
 
-#: src/text.c:3237
+#: src/text.c:3491
 #, fuzzy
 msgid "Finished"
 msgstr "Selesai dengan %s (status keluar %d)\n"
 
-#: src/text.c:3259
+#: src/text.c:3513
 #, fuzzy
 msgid "Invoking formatter, please wait"
 msgstr "Menghasilkan senarai perkataan salah eja, sila tunggu..."
 
-#: src/text.c:3314
+#: src/text.c:3568
 #, fuzzy
 msgid "Finished formatting"
 msgstr "Selesai memeriksa ejaan"
 
-#: src/text.c:3396
+#: src/text.c:3650
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sPerkataan: %lu  Baris: %ld  Aksara: %lu"
 
-#: src/text.c:3397
+#: src/text.c:3651
 msgid "In Selection:  "
 msgstr "Dalam Pilihan:"
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3411
+#: src/text.c:3665
 msgid "Verbatim Input"
 msgstr "Masukan Verbatim"
 
-#: src/utils.c:391 src/utils.c:403
+#: src/utils.c:392 src/utils.c:404
 msgid "nano is out of memory!"
 msgstr "nano tidak cukup memori!"
 
+#: src/utils.c:625
+#, fuzzy, c-format
+msgid "Internal error: can't match line %d.  Please save your work."
+msgstr "Ralat dalaman: tidak dapat memadan baris %d. Sila simpan kerja anda"
+
+#. TRANSLATORS: This refers to a sequence of escape codes
+#. * (from the keyboard) that nano does not know about.
+#: src/winio.c:1121
+msgid "Unknown sequence"
+msgstr ""
+
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
 #: src/winio.c:1427
 msgid "Unicode Input"
 msgstr "Masukan Unicode"
 
-#: src/winio.c:1991 src/winio.c:1995
-msgid "Modified"
-msgstr "Diubahsuai"
-
-#: src/winio.c:1992
-msgid "View"
-msgstr "Lihat"
-
-#: src/winio.c:2006
+#: src/winio.c:1960
 msgid "DIR:"
 msgstr "DIR:"
 
-#: src/winio.c:2013
+#: src/winio.c:1968
 msgid "File:"
 msgstr "Fail:"
 
-#: src/winio.c:3141
+#: src/winio.c:1972 src/winio.c:1976
+msgid "Modified"
+msgstr "Diubahsuai"
+
+#: src/winio.c:1974
+msgid "View"
+msgstr "Lihat"
+
+#: src/winio.c:3105
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "baris %ld/%ld (%d%%), lajur %lu/%lu (%d%%), aksara %lu/%lu (%d%%)"
 
-#: src/winio.c:3271
+#: src/winio.c:3235
 msgid "The nano text editor"
 msgstr "Penyunting teks nano"
 
-#: src/winio.c:3272
+#: src/winio.c:3236
 msgid "version"
 msgstr "versi"
 
-#: src/winio.c:3273
+#: src/winio.c:3237
 msgid "Brought to you by:"
 msgstr "Dibawakan kepada anda oleh:"
 
-#: src/winio.c:3274
+#: src/winio.c:3238
 msgid "Special thanks to:"
 msgstr "Terima kasih khas kepada:"
 
-#: src/winio.c:3275
+#: src/winio.c:3239
 msgid "The Free Software Foundation"
 msgstr "The Free Software Foundation"
 
-#: src/winio.c:3276
+#: src/winio.c:3240
 #, fuzzy
 msgid "the many translators and the TP"
 msgstr "Sepadan, tetapi terlalu banyak subrentetan."
 
-#: src/winio.c:3277
+#: src/winio.c:3241
 msgid "For ncurses:"
 msgstr "Untuk ncurses:"
 
-#: src/winio.c:3278
+#: src/winio.c:3242
 msgid "and anyone else we forgot..."
 msgstr "dan sesiapa yang kami lupa...."
 
-#: src/winio.c:3279
+#: src/winio.c:3243
 msgid "Thank you for using nano!"
 msgstr "Terima kasih kerana menggunakan nano!"
 
+#, fuzzy
+#~| msgid "Read %lu line (Converted from DOS and Mac format)"
+#~| msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
+#~ msgid ""
+#~ "Read %lu line (Converted from DOS and Mac format - Warning: No write "
+#~ "permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from DOS and Mac format - Warning: No write "
+#~ "permission)"
+#~ msgstr[0] "%lu baris dibaca (Ditukar daripada format Mac dan DOS)"
+
+#, fuzzy
+#~| msgid "Read %lu line (Converted from Mac format)"
+#~| msgid_plural "Read %lu lines (Converted from Mac format)"
+#~ msgid ""
+#~ "Read %lu line (Converted from Mac format - Warning: No write permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from Mac format - Warning: No write permission)"
+#~ msgstr[0] "%lu baris dibaca (Ditukar daripada format Mac)"
+
+#, fuzzy
+#~| msgid "Read %lu line (Converted from DOS format)"
+#~| msgid_plural "Read %lu lines (Converted from DOS format)"
+#~ msgid ""
+#~ "Read %lu line (Converted from DOS format - Warning: No write permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from DOS format - Warning: No write permission)"
+#~ msgstr[0] "%lu baris dibaca (Ditukar daripada format DOS)"
+
+#~ msgid "Read %lu line ( Warning: No write permission)"
+#~ msgid_plural "Read %lu lines (Warning: No write permission)"
+#~ msgstr[0] "Membaca %lu baris (Amaran: Tiada kebenaran menulis)"
+
 #~ msgid "Cannot prepend or append to a symlink with --nofollow set"
 #~ msgstr ""
 #~ "Tidak dapat tambah awal atau tambah ke symlink dengan set --nofollow"
@@ -2467,6 +2560,46 @@ msgstr "Terima kasih kerana menggunakan nano!"
 #~ msgid "Sorry, support for this function has been disabled"
 #~ msgstr "Maaf, sokongan untuk fungsi ini telah dimatikan"
 
+#~ msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
+#~ msgstr ""
+#~ "Simpan buffer ubahsuai (JAWAB \"Tidak\" AKAN MENGHILANGKAN PERUBAHAN) ? "
+
+#~ msgid "Unknown Command"
+#~ msgstr "Arahan Tidak Diketahui"
+
+#~ msgid "Cannot add a color command without a syntax command"
+#~ msgstr "Tidak dapat menambah arahan warna tanpa arahan sintaks"
+
+#~ msgid "Missing regex string"
+#~ msgstr "Rentetan regex hilang"
+
+#~ msgid "Cannot add a header regex without a syntax command"
+#~ msgstr "Tidak dapat menambah pengepala regex tanpa arahan sintaks"
+
+#, fuzzy
+#~| msgid "Cannot add a header regex without a syntax command"
+#~ msgid "Cannot add a magic string regex without a syntax command"
+#~ msgstr "Tidak dapat menambah pengepala regex tanpa arahan sintaks"
+
+#, fuzzy
+#~| msgid "Missing regex string"
+#~ msgid "Missing magic string name"
+#~ msgstr "Nama sintaks tiada"
+
+#, fuzzy
+#~| msgid "Cannot add a header regex without a syntax command"
+#~ msgid "Cannot add a linter without a syntax command"
+#~ msgstr "Tidak dapat menambah pengepala regex tanpa arahan sintaks"
+
+#, fuzzy
+#~| msgid "Cannot add a color command without a syntax command"
+#~ msgid "Cannot add formatter without a syntax command"
+#~ msgstr "Tidak dapat menambah pengepala regex tanpa arahan sintaks"
+
+#, fuzzy
+#~ msgid "Missing formatter command"
+#~ msgstr "Nama sintaks tiada"
+
 #, fuzzy
 #~| msgid "Internal error: can't match line %d.  Please save your work"
 #~ msgid "Internal error: can't match line %ld.  Please save your work."
diff --git a/po/nano.pot b/po/nano.pot
index f3332a4f..823ba099 100644
--- a/po/nano.pot
+++ b/po/nano.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-25 16:41-0500\n"
+"POT-Creation-Date: 2016-06-17 15:41+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,386 +18,369 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
+#: src/browser.c:144 src/browser.c:284 src/browser.c:334 src/files.c:996
+#: src/files.c:1003 src/files.c:1794 src/files.c:1919 src/files.c:1963
+#: src/files.c:1983 src/files.c:2099 src/files.c:3019 src/files.c:3242
+#: src/rcfile.c:540 src/rcfile.c:1280
+#, c-format
+msgid "Error reading %s: %s"
+msgstr ""
+
 #. TRANSLATORS: This is a prompt.
-#: src/browser.c:220
+#: src/browser.c:247
 msgid "Go To Directory"
 msgstr ""
 
-#: src/browser.c:227 src/browser.c:738 src/files.c:1174 src/files.c:2340
-#: src/nano.c:1120 src/search.c:202 src/search.c:290 src/search.c:895
-#: src/search.c:970 src/text.c:2935 src/text.c:3142
+#: src/browser.c:254 src/browser.c:723 src/files.c:1126 src/files.c:2292
+#: src/nano.c:1128 src/search.c:195 src/search.c:297 src/search.c:851
+#: src/search.c:918 src/text.c:3189 src/text.c:3396
 msgid "Cancelled"
 msgstr ""
 
-#: src/browser.c:253 src/browser.c:300
+#. TRANSLATORS: This refers to the option --operatingdir,
+#. * not to --restricted.
+#: src/browser.c:274 src/browser.c:326
 #, c-format
-msgid "Can't go outside of %s in restricted mode"
+msgid "Can't go outside of %s in confined mode"
 msgstr ""
 
-#: src/browser.c:264 src/browser.c:310 src/browser.c:326 src/files.c:1044
-#: src/files.c:1052 src/files.c:1844 src/files.c:1971 src/files.c:2016
-#: src/files.c:2037 src/files.c:2156 src/files.c:3062 src/files.c:3285
-#: src/rcfile.c:596 src/rcfile.c:1435
-#, c-format
-msgid "Error reading %s: %s"
-msgstr ""
-
-#: src/browser.c:290
+#: src/browser.c:317
 msgid "Can't move up a directory"
 msgstr ""
 
 #. TRANSLATORS: Try to keep this at most 7 characters.
-#: src/browser.c:615 src/browser.c:623
+#: src/browser.c:590 src/browser.c:598
 msgid "(dir)"
 msgstr ""
 
 #. TRANSLATORS: Try to keep this at most 12 characters.
-#: src/browser.c:620
+#: src/browser.c:595
 msgid "(parent dir)"
 msgstr ""
 
 #. TRANSLATORS: Try to keep this at most 7 characters.
 #. * If necessary, you can leave out the parentheses.
-#: src/browser.c:650
+#: src/browser.c:625
 msgid "(huge)"
 msgstr ""
 
 #. TRANSLATORS: This is the main search prompt.
-#: src/browser.c:727 src/search.c:173
+#: src/browser.c:712 src/search.c:166
 msgid "Search"
 msgstr ""
 
-#: src/browser.c:777 src/search.c:466 src/search.c:536
-msgid "This is the only occurrence"
+#: src/browser.c:754 src/search.c:368
+msgid "Search Wrapped"
 msgstr ""
 
-#: src/browser.c:793 src/search.c:364
-msgid "Search Wrapped"
+#: src/browser.c:764 src/search.c:509
+msgid "This is the only occurrence"
 msgstr ""
 
-#: src/browser.c:843 src/search.c:517
+#: src/browser.c:812 src/search.c:473
 msgid "No current search pattern"
 msgstr ""
 
-#: src/files.c:50
+#: src/color.c:186
+#, c-format
+msgid "Unknown syntax name: %s"
+msgstr ""
+
+#: src/color.c:247
+#, c-format
+msgid "magic_load() failed: %s"
+msgstr ""
+
+#: src/color.c:251
+#, c-format
+msgid "magic_file(%s) failed: %s"
+msgstr ""
+
+#: src/files.c:47
 #, c-format
 msgid "Directory '%s' does not exist"
 msgstr ""
 
-#: src/files.c:52
+#: src/files.c:49
 #, c-format
 msgid "Path '%s': %s"
 msgstr ""
 
-#: src/files.c:54
+#: src/files.c:51
 #, c-format
 msgid "Path '%s' is not a directory"
 msgstr ""
 
-#: src/files.c:57
+#: src/files.c:53
 #, c-format
 msgid "Path '%s' is not accessible"
 msgstr ""
 
-#. TRANSLATORS: Try to keep this at most 76 characters.
-#: src/files.c:158
+#. TRANSLATORS: Keep the next ten messages at most 76 characters.
+#: src/files.c:148
 msgid ""
 "Warning: Modifying a file which is not locked, check directory permission?"
 msgstr ""
 
-#: src/files.c:197
+#: src/files.c:187
 msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
 msgstr ""
 
-#: src/files.c:206
+#: src/files.c:196
 #, c-format
 msgid "Couldn't determine hostname for lock file: %s"
 msgstr ""
 
-#: src/files.c:227 src/files.c:238 src/files.c:275 src/files.c:285
+#: src/files.c:216 src/files.c:225 src/files.c:262 src/files.c:272
 #, c-format
 msgid "Error writing lock file %s: %s"
 msgstr ""
 
-#: src/files.c:305
+#: src/files.c:291
 #, c-format
 msgid "Error deleting lock file %s: %s"
 msgstr ""
 
-#: src/files.c:341
+#: src/files.c:325
 #, c-format
 msgid "Error opening lock file %s: %s"
 msgstr ""
 
-#: src/files.c:353
+#: src/files.c:337
 #, c-format
 msgid "Error reading lock file %s: Not enough data read"
 msgstr ""
 
 #. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
-#: src/files.c:371
+#: src/files.c:354
 #, c-format
 msgid "File %s is being edited (by %s with %s, PID %d); continue?"
 msgstr ""
 
-#: src/files.c:426
+#: src/files.c:430
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr ""
 
-#: src/files.c:439 src/files.c:1038 src/rcfile.c:589 src/rcfile.c:1385
-#: src/rcfile.c:1426
+#: src/files.c:445 src/files.c:991 src/rcfile.c:533 src/rcfile.c:1230
+#: src/rcfile.c:1271
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr ""
 
-#: src/files.c:441
+#: src/files.c:447
 #, c-format
 msgid "\"%s\" is not a normal file"
 msgstr ""
 
-#: src/files.c:566
+#: src/files.c:571
 msgid "No more open file buffers"
 msgstr ""
 
-#: src/files.c:582
+#: src/files.c:586
 #, c-format
 msgid "Switched to %s"
 msgstr ""
 
-#: src/files.c:584 src/global.c:988 src/winio.c:2010
+#: src/files.c:588 src/global.c:1005 src/winio.c:1965
 msgid "New Buffer"
 msgstr ""
 
-#: src/files.c:943
+#. TRANSLATORS: Keep the next four messages at most 76 characters.
+#: src/files.c:913
 #, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/files.c:948
-#, c-format
-msgid ""
-"Read %lu line (Converted from DOS and Mac format - Warning: No write "
-"permission)"
-msgid_plural ""
-"Read %lu lines (Converted from DOS and Mac format - Warning: No write "
-"permission)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/files.c:954
+#: src/files.c:919
 #, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/files.c:958
-#, c-format
-msgid ""
-"Read %lu line (Converted from Mac format - Warning: No write permission)"
-msgid_plural ""
-"Read %lu lines (Converted from Mac format - Warning: No write permission)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/files.c:964
+#: src/files.c:925
 #, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/files.c:968
-#, c-format
-msgid ""
-"Read %lu line (Converted from DOS format - Warning: No write permission)"
-msgid_plural ""
-"Read %lu lines (Converted from DOS format - Warning: No write permission)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/files.c:974
+#: src/files.c:930
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/files.c:977
-#, c-format
-msgid "Read %lu line (Warning: No write permission)"
-msgid_plural "Read %lu lines (Warning: No write permission)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/files.c:1019 src/files.c:1056
+#: src/files.c:974 src/files.c:1006
 msgid "Reading File"
 msgstr ""
 
-#: src/files.c:1025
+#: src/files.c:980
 msgid "New File"
 msgstr ""
 
-#: src/files.c:1028
+#: src/files.c:983
 #, c-format
-msgid "\"%s\" not found"
+msgid "File \"%s\" not found"
 msgstr ""
 
-#: src/files.c:1039 src/rcfile.c:590 src/rcfile.c:1386 src/rcfile.c:1427
+#: src/files.c:992 src/rcfile.c:534 src/rcfile.c:1231 src/rcfile.c:1272
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr ""
 
-#: src/files.c:1133
+#: src/files.c:1083
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr ""
 
-#: src/files.c:1135
+#: src/files.c:1085
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr ""
 
-#: src/files.c:1142
+#: src/files.c:1092
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr ""
 
-#: src/files.c:1144
+#: src/files.c:1094
 #, c-format
 msgid "File to insert [from %s] "
 msgstr ""
 
-#: src/files.c:1389
+#: src/files.c:1338
 msgid "Key invalid in non-multibuffer mode"
 msgstr ""
 
-#: src/files.c:1684
-msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+#: src/files.c:1632
+msgid "Failed to write backup file; continue saving? (Say N if unsure.) "
 msgstr ""
 
-#: src/files.c:1800
+#: src/files.c:1750
 #, c-format
 msgid "Can't write outside of %s"
 msgstr ""
 
-#: src/files.c:1885 src/files.c:1910 src/files.c:1928 src/files.c:1941
-#: src/files.c:1952 src/files.c:1981
+#: src/files.c:1833 src/files.c:1858 src/files.c:1876 src/files.c:1889
+#: src/files.c:1900 src/files.c:1928
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr ""
 
-#: src/files.c:1886 src/nano.c:690
+#: src/files.c:1834 src/nano.c:692
 msgid "Too many backup files?"
 msgstr ""
 
-#: src/files.c:2026 src/text.c:2863 src/text.c:2875 src/text.c:3244
-#: src/text.c:3253
+#: src/files.c:1972 src/text.c:3117 src/text.c:3129 src/text.c:3498
+#: src/text.c:3507
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr ""
 
-#: src/files.c:2049 src/files.c:2068 src/files.c:2080 src/files.c:2104
-#: src/files.c:2121 src/files.c:2131 src/files.c:2164 src/files.c:2171
+#: src/files.c:1994 src/files.c:2013 src/files.c:2023 src/files.c:2047
+#: src/files.c:2064 src/files.c:2074 src/files.c:2106 src/files.c:2113
 #, c-format
 msgid "Error writing %s: %s"
 msgstr ""
 
-#: src/files.c:2200
+#: src/files.c:2154
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/files.c:2299
+#: src/files.c:2249
 msgid " [DOS Format]"
 msgstr ""
 
-#: src/files.c:2300
+#: src/files.c:2250
 msgid " [Mac Format]"
 msgstr ""
 
-#: src/files.c:2302
+#: src/files.c:2252
 msgid " [Backup]"
 msgstr ""
 
-#: src/files.c:2309
+#: src/files.c:2259
 msgid "Prepend Selection to File"
 msgstr ""
 
-#: src/files.c:2310
+#: src/files.c:2260
 msgid "Append Selection to File"
 msgstr ""
 
-#: src/files.c:2311
+#: src/files.c:2261
 msgid "Write Selection to File"
 msgstr ""
 
-#: src/files.c:2314
+#: src/files.c:2264
 msgid "File Name to Prepend to"
 msgstr ""
 
-#: src/files.c:2315
+#: src/files.c:2265
 msgid "File Name to Append to"
 msgstr ""
 
-#: src/files.c:2316
+#: src/files.c:2266
 msgid "File Name to Write"
 msgstr ""
 
-#: src/files.c:2349
-msgid "Save modified buffer anyway ? "
+#: src/files.c:2301
+msgid "Save modified buffer anyway? "
 msgstr ""
 
-#: src/files.c:2457
-msgid "File exists, OVERWRITE ? "
+#: src/files.c:2412
+msgid "Save file under DIFFERENT NAME? "
 msgstr ""
 
-#: src/files.c:2466
-msgid "Save file under DIFFERENT NAME ? "
+#: src/files.c:2420
+#, c-format
+msgid "File \"%s\" exists; OVERWRITE? "
 msgstr ""
 
-#: src/files.c:2480
-msgid "File was modified since you opened it, continue saving ? "
+#: src/files.c:2441
+msgid "File was modified since you opened it; continue saving? "
 msgstr ""
 
-#: src/files.c:2917
+#: src/files.c:2874
 msgid "(more)"
 msgstr ""
 
-#: src/files.c:3004
+#: src/files.c:2959
 #, c-format
 msgid ""
 "\n"
 "Press Enter to continue\n"
 msgstr ""
 
-#: src/files.c:3020
+#: src/files.c:2975
 #, c-format
 msgid ""
 "Unable to create directory %s: %s\n"
 "It is required for saving/loading search history or cursor positions.\n"
 msgstr ""
 
-#: src/files.c:3026
+#: src/files.c:2982
 #, c-format
 msgid ""
 "Path %s is not a directory and needs to be.\n"
 "Nano will be unable to load or save search history or cursor positions.\n"
 msgstr ""
 
-#: src/files.c:3045
+#: src/files.c:3002
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I tried to move\n"
 "to the preferred location (%s) but encountered an error: %s"
 msgstr ""
 
-#: src/files.c:3049
+#: src/files.c:3006
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I moved\n"
@@ -405,721 +388,749 @@ msgid ""
 "(see the nano FAQ about this change)"
 msgstr ""
 
-#: src/files.c:3132 src/files.c:3140 src/files.c:3164 src/files.c:3176
+#: src/files.c:3089 src/files.c:3097 src/files.c:3121 src/files.c:3133
 #, c-format
 msgid "Error writing %s: %s\n"
 msgstr ""
 
 #. TRANSLATORS: Try to keep the next fifteen strings at most 10 characters.
-#: src/global.c:480
+#: src/global.c:483
 msgid "Exit"
 msgstr ""
 
-#: src/global.c:481
+#: src/global.c:484
 msgid "Close"
 msgstr ""
 
-#: src/global.c:482
+#: src/global.c:485
 msgid "Uncut Text"
 msgstr ""
 
-#: src/global.c:484
+#: src/global.c:487
 msgid "Unjustify"
 msgstr ""
 
-#: src/global.c:490
+#: src/global.c:493
 msgid "Read File"
 msgstr ""
 
-#: src/global.c:491
+#: src/global.c:494
 msgid "Where Is"
 msgstr ""
 
-#: src/global.c:492
+#: src/global.c:495
 msgid "Replace"
 msgstr ""
 
-#: src/global.c:493
+#: src/global.c:496
 msgid "Go To Line"
 msgstr ""
 
-#: src/global.c:494
+#: src/global.c:497
 msgid "Prev Line"
 msgstr ""
 
-#: src/global.c:495
+#: src/global.c:498
 msgid "Next Line"
 msgstr ""
 
-#: src/global.c:496
+#: src/global.c:499
 msgid "Prev Page"
 msgstr ""
 
-#: src/global.c:497
+#: src/global.c:500
 msgid "Next Page"
 msgstr ""
 
-#: src/global.c:499
+#: src/global.c:502
 msgid "Justify"
 msgstr ""
 
-#: src/global.c:500
+#: src/global.c:503
 msgid "FullJstify"
 msgstr ""
 
-#: src/global.c:502
+#: src/global.c:505
 msgid "Refresh"
 msgstr ""
 
 #. TRANSLATORS: Try to keep this string at most 12 characters.
-#: src/global.c:505
+#: src/global.c:508
 msgid "WhereIs Next"
 msgstr ""
 
 #. TRANSLATORS: The next long series of strings are shortcut descriptions;
 #. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:512
+#: src/global.c:515
 msgid "Justify the current paragraph"
 msgstr ""
 
-#: src/global.c:514
+#: src/global.c:517
 msgid "Cancel the current function"
 msgstr ""
 
-#: src/global.c:515
+#: src/global.c:518
 msgid "Display this help text"
 msgstr ""
 
-#: src/global.c:518
+#: src/global.c:521
 msgid "Close the current file buffer / Exit from nano"
 msgstr ""
 
-#: src/global.c:520
+#: src/global.c:523
 msgid "Exit from nano"
 msgstr ""
 
-#: src/global.c:524
+#: src/global.c:527
 msgid "Write the current file to disk"
 msgstr ""
 
-#: src/global.c:526
+#: src/global.c:529
 msgid "Insert another file into the current one"
 msgstr ""
 
-#: src/global.c:528
+#: src/global.c:531
 msgid "Search for a string or a regular expression"
 msgstr ""
 
-#: src/global.c:531
+#: src/global.c:533
 msgid "Search for a string"
 msgstr ""
 
-#: src/global.c:533
+#: src/global.c:534
+msgid "Refresh the file list"
+msgstr ""
+
+#: src/global.c:535
+msgid "Go to lefthand column"
+msgstr ""
+
+#: src/global.c:536
+msgid "Go to righthand column"
+msgstr ""
+
+#: src/global.c:538
 msgid "Go one screenful up"
 msgstr ""
 
-#: src/global.c:534
+#: src/global.c:539
 msgid "Go one screenful down"
 msgstr ""
 
-#: src/global.c:536
+#: src/global.c:541
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr ""
 
-#: src/global.c:538
+#: src/global.c:543
 msgid "Uncut from the cutbuffer into the current line"
 msgstr ""
 
-#: src/global.c:539
+#: src/global.c:544
 msgid "Display the position of the cursor"
 msgstr ""
 
-#: src/global.c:541
+#: src/global.c:546
 msgid "Invoke the spell checker, if available"
 msgstr ""
 
-#: src/global.c:543
+#: src/global.c:548
 msgid "Replace a string or a regular expression"
 msgstr ""
 
-#: src/global.c:544
+#: src/global.c:549
 msgid "Go to line and column number"
 msgstr ""
 
-#: src/global.c:546
+#: src/global.c:551
 msgid "Mark text starting from the cursor position"
 msgstr ""
 
-#: src/global.c:547
+#: src/global.c:552
 msgid "Repeat the last search"
 msgstr ""
 
-#: src/global.c:549
+#: src/global.c:554
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr ""
 
-#: src/global.c:550
+#: src/global.c:555
 msgid "Indent the current line"
 msgstr ""
 
-#: src/global.c:551
+#: src/global.c:556
 msgid "Unindent the current line"
 msgstr ""
 
-#: src/global.c:552
+#: src/global.c:558
+msgid "Comment/uncomment the current line or marked lines"
+msgstr ""
+
+#: src/global.c:560
 msgid "Undo the last operation"
 msgstr ""
 
-#: src/global.c:553
+#: src/global.c:561
 msgid "Redo the last undone operation"
 msgstr ""
 
-#: src/global.c:555
+#: src/global.c:563
 msgid "Go back one character"
 msgstr ""
 
-#: src/global.c:556
+#: src/global.c:564
 msgid "Go forward one character"
 msgstr ""
 
-#: src/global.c:558
+#: src/global.c:566
 msgid "Go back one word"
 msgstr ""
 
-#: src/global.c:559
+#: src/global.c:567
 msgid "Go forward one word"
 msgstr ""
 
-#: src/global.c:561
+#: src/global.c:569
 msgid "Go to previous line"
 msgstr ""
 
-#: src/global.c:562
+#: src/global.c:570
 msgid "Go to next line"
 msgstr ""
 
-#: src/global.c:563
+#: src/global.c:571
 msgid "Go to beginning of current line"
 msgstr ""
 
-#: src/global.c:564
+#: src/global.c:572
 msgid "Go to end of current line"
 msgstr ""
 
-#: src/global.c:567
+#: src/global.c:575
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr ""
 
-#: src/global.c:569
+#: src/global.c:577
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr ""
 
-#: src/global.c:571
+#: src/global.c:579
 msgid "Go to the first line of the file"
 msgstr ""
 
-#: src/global.c:572
+#: src/global.c:580
 msgid "Go to the last line of the file"
 msgstr ""
 
-#: src/global.c:574
+#: src/global.c:582
 msgid "Go to the matching bracket"
 msgstr ""
 
-#: src/global.c:576
+#: src/global.c:584
 msgid "Scroll up one line without scrolling the cursor"
 msgstr ""
 
-#: src/global.c:578
+#: src/global.c:586
 msgid "Scroll down one line without scrolling the cursor"
 msgstr ""
 
-#: src/global.c:581
+#: src/global.c:589
 msgid "Switch to the previous file buffer"
 msgstr ""
 
-#: src/global.c:582
+#: src/global.c:590
 msgid "Switch to the next file buffer"
 msgstr ""
 
-#: src/global.c:584
+#: src/global.c:592
 msgid "Insert the next keystroke verbatim"
 msgstr ""
 
-#: src/global.c:585
+#: src/global.c:593
 msgid "Insert a tab at the cursor position"
 msgstr ""
 
-#: src/global.c:586
+#: src/global.c:594
 msgid "Insert a newline at the cursor position"
 msgstr ""
 
-#: src/global.c:587
+#: src/global.c:595
 msgid "Delete the character under the cursor"
 msgstr ""
 
-#: src/global.c:589
+#: src/global.c:597
 msgid "Delete the character to the left of the cursor"
 msgstr ""
 
-#: src/global.c:592
+#: src/global.c:600
 msgid "Cut backward from cursor to word start"
 msgstr ""
 
-#: src/global.c:594
+#: src/global.c:602
 msgid "Cut forward from cursor to next word start"
 msgstr ""
 
-#: src/global.c:596
+#: src/global.c:604
 msgid "Cut from the cursor position to the end of the file"
 msgstr ""
 
-#: src/global.c:599
+#: src/global.c:607
 msgid "Justify the entire file"
 msgstr ""
 
-#: src/global.c:603
+#: src/global.c:611
 msgid "Count the number of words, lines, and characters"
 msgstr ""
 
-#: src/global.c:606
+#: src/global.c:614
 msgid "Refresh (redraw) the current screen"
 msgstr ""
 
-#: src/global.c:608
+#: src/global.c:616
 msgid "Suspend the editor (if suspension is enabled)"
 msgstr ""
 
-#: src/global.c:610
+#: src/global.c:618
 msgid "Save file without prompting"
 msgstr ""
 
-#: src/global.c:611
+#: src/global.c:619
 msgid "Search next occurrence backward"
 msgstr ""
 
-#: src/global.c:612
+#: src/global.c:620
 msgid "Search next occurrence forward"
 msgstr ""
 
-#: src/global.c:614
+#: src/global.c:622
 msgid "Toggle the case sensitivity of the search"
 msgstr ""
 
-#: src/global.c:616
+#: src/global.c:624
 msgid "Reverse the direction of the search"
 msgstr ""
 
-#: src/global.c:620
+#: src/global.c:628
 msgid "Toggle the use of regular expressions"
 msgstr ""
 
-#: src/global.c:624
+#: src/global.c:632
 msgid "Recall the previous search/replace string"
 msgstr ""
 
-#: src/global.c:626
+#: src/global.c:634
 msgid "Recall the next search/replace string"
 msgstr ""
 
-#: src/global.c:629
+#: src/global.c:637
 msgid "Go to file browser"
 msgstr ""
 
-#: src/global.c:632
+#: src/global.c:640
 msgid "Toggle the use of DOS format"
 msgstr ""
 
-#: src/global.c:633
+#: src/global.c:641
 msgid "Toggle the use of Mac format"
 msgstr ""
 
-#: src/global.c:634
+#: src/global.c:642
 msgid "Toggle appending"
 msgstr ""
 
-#: src/global.c:635
+#: src/global.c:643
 msgid "Toggle prepending"
 msgstr ""
 
-#: src/global.c:636
+#: src/global.c:644
 msgid "Toggle backing up of the original file"
 msgstr ""
 
-#: src/global.c:637
+#: src/global.c:645
 msgid "Execute external command"
 msgstr ""
 
-#: src/global.c:639
+#: src/global.c:647
 msgid "Close buffer without saving it"
 msgstr ""
 
-#: src/global.c:641
+#: src/global.c:649
 msgid "Toggle the use of a new buffer"
 msgstr ""
 
-#: src/global.c:644
+#: src/global.c:652
 msgid "Exit from the file browser"
 msgstr ""
 
-#: src/global.c:645
+#: src/global.c:653
 msgid "Go to the first file in the list"
 msgstr ""
 
-#: src/global.c:646
+#: src/global.c:654
 msgid "Go to the last file in the list"
 msgstr ""
 
-#: src/global.c:647
+#: src/global.c:655
 msgid "Go to the previous file in the list"
 msgstr ""
 
-#: src/global.c:648
+#: src/global.c:656
 msgid "Go to the next file in the list"
 msgstr ""
 
-#: src/global.c:649
+#: src/global.c:657
 msgid "Go to directory"
 msgstr ""
 
-#: src/global.c:652
+#: src/global.c:660
 msgid "Invoke the linter, if available"
 msgstr ""
 
-#: src/global.c:653
+#: src/global.c:661
 msgid "Go to previous linter msg"
 msgstr ""
 
-#: src/global.c:654
+#: src/global.c:662
 msgid "Go to next linter msg"
 msgstr ""
 
-#: src/global.c:656
+#: src/global.c:664
 msgid "Invoke formatter, if available"
 msgstr ""
 
 #. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:671
+#: src/global.c:679
 msgid "Get Help"
 msgstr ""
 
-#: src/global.c:674 src/prompt.c:858
+#: src/global.c:682 src/prompt.c:855
 msgid "Cancel"
 msgstr ""
 
-#: src/global.c:687
+#: src/global.c:695
 msgid "Write Out"
 msgstr ""
 
-#: src/global.c:723
+#: src/global.c:731
 msgid "Go To Dir"
 msgstr ""
 
-#: src/global.c:738
+#: src/global.c:746
 msgid "Cut Text"
 msgstr ""
 
-#: src/global.c:753
+#: src/global.c:761
 msgid "To Spell"
 msgstr ""
 
-#: src/global.c:757
+#: src/global.c:765
 msgid "To Linter"
 msgstr ""
 
-#: src/global.c:760
+#: src/global.c:768
 msgid "Formatter"
 msgstr ""
 
-#: src/global.c:767
+#: src/global.c:775
 msgid "Case Sens"
 msgstr ""
 
-#: src/global.c:772
+#: src/global.c:780
 msgid "Regexp"
 msgstr ""
 
-#: src/global.c:777
+#: src/global.c:785
 msgid "Backwards"
 msgstr ""
 
-#: src/global.c:784
+#: src/global.c:792
 msgid "No Replace"
 msgstr ""
 
-#: src/global.c:792
+#: src/global.c:800
 msgid "Cur Pos"
 msgstr ""
 
-#: src/global.c:807
+#: src/global.c:815
 msgid "First Line"
 msgstr ""
 
-#: src/global.c:809
+#: src/global.c:817
 msgid "Last Line"
 msgstr ""
 
-#: src/global.c:816
+#: src/global.c:824
 msgid "To Bracket"
 msgstr ""
 
-#: src/global.c:819
+#: src/global.c:827
 msgid "Mark Text"
 msgstr ""
 
-#: src/global.c:822
+#: src/global.c:830
 msgid "Copy Text"
 msgstr ""
 
-#: src/global.c:825
+#: src/global.c:833
 msgid "Indent Text"
 msgstr ""
 
-#: src/global.c:827
+#: src/global.c:835
 msgid "Unindent Text"
 msgstr ""
 
-#: src/global.c:830
+#: src/global.c:838
 msgid "Undo"
 msgstr ""
 
-#: src/global.c:832
+#: src/global.c:840
 msgid "Redo"
 msgstr ""
 
-#: src/global.c:836 src/global.c:842
+#: src/global.c:844 src/global.c:850
 msgid "Back"
 msgstr ""
 
-#: src/global.c:838 src/global.c:844
+#: src/global.c:846 src/global.c:852
 msgid "Forward"
 msgstr ""
 
-#: src/global.c:849
+#: src/global.c:857
 msgid "Prev Word"
 msgstr ""
 
-#: src/global.c:851
+#: src/global.c:859
 msgid "Next Word"
 msgstr ""
 
-#: src/global.c:855
+#: src/global.c:863
 msgid "Home"
 msgstr ""
 
-#: src/global.c:857
+#: src/global.c:865
 msgid "End"
 msgstr ""
 
-#: src/global.c:866
+#: src/global.c:874
 msgid "Beg of Par"
 msgstr ""
 
-#: src/global.c:868
+#: src/global.c:876
 msgid "End of Par"
 msgstr ""
 
-#: src/global.c:873
+#: src/global.c:881
 msgid "Scroll Up"
 msgstr ""
 
-#: src/global.c:875
+#: src/global.c:883
 msgid "Scroll Down"
 msgstr ""
 
-#: src/global.c:880
+#: src/global.c:888
 msgid "Prev File"
 msgstr ""
 
-#: src/global.c:882
+#: src/global.c:890
 msgid "Next File"
 msgstr ""
 
-#: src/global.c:891
+#: src/global.c:899
 msgid "Verbatim"
 msgstr ""
 
-#: src/global.c:894
+#: src/global.c:902
 msgid "Tab"
 msgstr ""
 
-#: src/global.c:896
+#: src/global.c:904
 msgid "Enter"
 msgstr ""
 
-#: src/global.c:899
+#: src/global.c:907
 msgid "Delete"
 msgstr ""
 
-#: src/global.c:901
+#: src/global.c:909
 msgid "Backspace"
 msgstr ""
 
 #. TRANSLATORS: The next two strings refer to cutting words.
-#: src/global.c:912
+#: src/global.c:920
 msgid "Cut Left"
 msgstr ""
 
-#: src/global.c:914
+#: src/global.c:922
 msgid "Cut Right"
 msgstr ""
 
-#: src/global.c:916
+#: src/global.c:924
 msgid "CutTillEnd"
 msgstr ""
 
-#: src/global.c:926
+#: src/global.c:934
 msgid "Word Count"
 msgstr ""
 
-#: src/global.c:933
+#: src/global.c:941
 msgid "Suspend"
 msgstr ""
 
-#: src/global.c:937
+#: src/global.c:945
+msgid "Comment Lines"
+msgstr ""
+
+#: src/global.c:949
 msgid "Save"
 msgstr ""
 
-#: src/global.c:940
+#: src/global.c:952
 msgid "Previous"
 msgstr ""
 
-#: src/global.c:942
+#: src/global.c:954
 msgid "Next"
 msgstr ""
 
-#: src/global.c:948
+#: src/global.c:960
 msgid "PrevHstory"
 msgstr ""
 
-#: src/global.c:951
+#: src/global.c:963
 msgid "NextHstory"
 msgstr ""
 
-#: src/global.c:955
+#: src/global.c:972
 msgid "Go To Text"
 msgstr ""
 
-#: src/global.c:959
+#: src/global.c:976
 msgid "DOS Format"
 msgstr ""
 
-#: src/global.c:961
+#: src/global.c:978
 msgid "Mac Format"
 msgstr ""
 
-#: src/global.c:969
+#: src/global.c:986
 msgid "Append"
 msgstr ""
 
-#: src/global.c:971
+#: src/global.c:988
 msgid "Prepend"
 msgstr ""
 
-#: src/global.c:974
+#: src/global.c:991
 msgid "Backup File"
 msgstr ""
 
-#: src/global.c:981
+#: src/global.c:998
 msgid "Execute Command"
 msgstr ""
 
-#: src/global.c:996
+#: src/global.c:1013
 msgid "To Files"
 msgstr ""
 
-#: src/global.c:1004
+#: src/global.c:1021
 msgid "First File"
 msgstr ""
 
-#: src/global.c:1006
+#: src/global.c:1023
 msgid "Last File"
 msgstr ""
 
-#: src/global.c:1010
+#: src/global.c:1027
 msgid "Discard buffer"
 msgstr ""
 
+#: src/global.c:1038
+msgid "Left Column"
+msgstr ""
+
+#: src/global.c:1040
+msgid "Right Column"
+msgstr ""
+
 #. TRANSLATORS: Try to keep the next two strings at most 20 characters.
-#: src/global.c:1020
+#: src/global.c:1047
 msgid "Prev Lint Msg"
 msgstr ""
 
-#: src/global.c:1022
+#: src/global.c:1049
 msgid "Next Lint Msg"
 msgstr ""
 
 #. TRANSLATORS: The next seventeen strings are toggle descriptions;
 #. * they are best kept shorter than 40 characters, but may be longer.
-#: src/global.c:1285
+#: src/global.c:1316
 msgid "Help mode"
 msgstr ""
 
-#: src/global.c:1287
+#: src/global.c:1318
 msgid "Constant cursor position display"
 msgstr ""
 
-#: src/global.c:1289
+#: src/global.c:1320
 msgid "Use of one more line for editing"
 msgstr ""
 
-#: src/global.c:1291
+#: src/global.c:1322
 msgid "Smooth scrolling"
 msgstr ""
 
-#: src/global.c:1293
+#: src/global.c:1324
 msgid "Soft wrapping of overlong lines"
 msgstr ""
 
-#: src/global.c:1295
+#: src/global.c:1326
 msgid "Whitespace display"
 msgstr ""
 
-#: src/global.c:1297
+#: src/global.c:1328
 msgid "Color syntax highlighting"
 msgstr ""
 
-#: src/global.c:1299
+#: src/global.c:1330
 msgid "Smart home key"
 msgstr ""
 
-#: src/global.c:1301
+#: src/global.c:1332
 msgid "Auto indent"
 msgstr ""
 
-#: src/global.c:1303
+#: src/global.c:1334
 msgid "Cut to end"
 msgstr ""
 
-#: src/global.c:1305
+#: src/global.c:1336
 msgid "Hard wrapping of overlong lines"
 msgstr ""
 
-#: src/global.c:1307
+#: src/global.c:1338
 msgid "Conversion of typed tabs to spaces"
 msgstr ""
 
-#: src/global.c:1309
+#: src/global.c:1340
 msgid "Backup files"
 msgstr ""
 
-#: src/global.c:1311
+#: src/global.c:1342
 msgid "Reading file into separate buffer"
 msgstr ""
 
-#: src/global.c:1313
+#: src/global.c:1344
 msgid "Mouse support"
 msgstr ""
 
-#: src/global.c:1315
+#: src/global.c:1346
 msgid "No conversion from DOS/Mac format"
 msgstr ""
 
-#: src/global.c:1317
+#: src/global.c:1348
 msgid "Suspension"
 msgstr ""
 
-#: src/help.c:209
+#: src/help.c:211
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1132,7 +1143,7 @@ msgid ""
 "search.  "
 msgstr ""
 
-#: src/help.c:218
+#: src/help.c:220
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1141,7 +1152,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:224
+#: src/help.c:226
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1153,7 +1164,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:233
+#: src/help.c:235
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1166,7 +1177,7 @@ msgid ""
 "into a separate buffer (use Meta-< and > to switch between file buffers).  "
 msgstr ""
 
-#: src/help.c:242
+#: src/help.c:244
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1175,7 +1186,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:248
+#: src/help.c:250
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1191,7 +1202,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:262
+#: src/help.c:264
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1205,7 +1216,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:275
+#: src/help.c:277
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1219,13 +1230,13 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:284
+#: src/help.c:286
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
 msgstr ""
 
-#: src/help.c:288
+#: src/help.c:290
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1238,7 +1249,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:301
+#: src/help.c:303
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1252,7 +1263,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:316
+#: src/help.c:318
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1264,7 +1275,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:329
+#: src/help.c:331
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1276,15 +1287,14 @@ msgid ""
 "bottom and shows important messages.  "
 msgstr ""
 
-#: src/help.c:339
+#: src/help.c:341
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
-" The notation for shortcuts is as follows: Control-key sequences are notated "
-"with a caret (^) symbol and can be entered either by using the Control "
-"(Ctrl) key or pressing the Escape (Esc) key twice.  Escape-key sequences are "
-"notated with the Meta (M-) symbol and can be entered using either the Esc, "
-"Alt, or Meta key depending on your keyboard setup.  "
+" Shortcuts are written as follows: Control-key sequences are notated with a "
+"'^' and can be entered either by using the Ctrl key or pressing the Esc key "
+"twice.  Meta-key sequences are notated with 'M-' and can be entered using "
+"either the Alt, Cmd, or Esc key, depending on your keyboard setup.  "
 msgstr ""
 
 #: src/help.c:348
@@ -1300,33 +1310,33 @@ msgstr ""
 msgid "enable/disable"
 msgstr ""
 
-#: src/nano.c:559
+#: src/nano.c:560
 msgid "Key is invalid in view mode"
 msgstr ""
 
-#: src/nano.c:565
+#: src/nano.c:566
 msgid "This function is disabled in restricted mode"
 msgstr ""
 
-#: src/nano.c:573
+#: src/nano.c:574
 msgid "Help is not available"
 msgstr ""
 
-#: src/nano.c:684
+#: src/nano.c:686
 #, c-format
 msgid ""
 "\n"
 "Buffer written to %s\n"
 msgstr ""
 
-#: src/nano.c:686
+#: src/nano.c:688
 #, c-format
 msgid ""
 "\n"
 "Buffer not written to %s: %s\n"
 msgstr ""
 
-#: src/nano.c:689
+#: src/nano.c:691
 #, c-format
 msgid ""
 "\n"
@@ -1584,84 +1594,104 @@ msgstr ""
 msgid "Enable soft line wrapping"
 msgstr ""
 
-#: src/nano.c:937
+#: src/nano.c:940
 #, c-format
-msgid " GNU nano, version %s\n"
+msgid " nano, version %s\n"
 msgstr ""
 
-#: src/nano.c:940
+#: src/nano.c:943
+#, c-format
+msgid " (C) 2014..%s the contributors to nano\n"
+msgstr ""
+
+#: src/nano.c:945
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr ""
 
-#: src/nano.c:941
+#: src/nano.c:946
 #, c-format
 msgid ""
 "\n"
 " Compiled options:"
 msgstr ""
 
-#: src/nano.c:1073
+#: src/nano.c:1081
 msgid "No file name"
 msgstr ""
 
-#: src/nano.c:1108
-msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
+#: src/nano.c:1115
+msgid "Save modified buffer?  (Answering \"No\" will DISCARD changes.) "
 msgstr ""
 
-#: src/nano.c:1168
+#: src/nano.c:1178
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr ""
 
-#: src/nano.c:1192
+#: src/nano.c:1202
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr ""
 
-#: src/nano.c:1256
+#: src/nano.c:1266
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr ""
 
-#: src/nano.c:1272
+#: src/nano.c:1282
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr ""
 
-#: src/nano.c:1294
+#: src/nano.c:1304
 msgid "Suspension is not enabled"
 msgstr ""
 
-#: src/nano.c:1448
+#: src/nano.c:1459
 msgid "enabled"
 msgstr ""
 
-#: src/nano.c:1448
+#: src/nano.c:1459
 msgid "disabled"
 msgstr ""
 
-#: src/nano.c:1607 src/winio.c:1125
-msgid "Unknown Command"
+#: src/nano.c:1573
+msgid "Unbound key"
+msgstr ""
+
+#: src/nano.c:1577
+#, c-format
+msgid "Unbound key: M-%c"
+msgstr ""
+
+#: src/nano.c:1579
+#, c-format
+msgid "Unbound key: ^%c"
 msgstr ""
 
-#: src/nano.c:1720
+#: src/nano.c:1581
+#, c-format
+msgid "Unbound key: %c"
+msgstr ""
+
+#: src/nano.c:1745
 msgid "XON ignored, mumble mumble"
 msgstr ""
 
-#: src/nano.c:1725
+#: src/nano.c:1750
 msgid "XOFF ignored, mumble mumble"
 msgstr ""
 
-#: src/nano.c:2139 src/rcfile.c:1334
+#: src/nano.c:2166 src/rcfile.c:1187
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr ""
 
-#: src/nano.c:2200 src/rcfile.c:1259
+#: src/nano.c:2227 src/rcfile.c:1128
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr ""
 
-#: src/nano.c:2247
+#: src/nano.c:2276
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr ""
@@ -1669,114 +1699,117 @@ msgstr ""
 #. TRANSLATORS: For the next three strings, if possible, specify
 #. * the single-byte shortcuts for both your language and English.
 #. * For example, in French: "OoYy" for "Oui".
-#: src/prompt.c:821
+#: src/prompt.c:818
 msgid "Yy"
 msgstr ""
 
-#: src/prompt.c:822
+#: src/prompt.c:819
 msgid "Nn"
 msgstr ""
 
-#: src/prompt.c:823
+#: src/prompt.c:820
 msgid "Aa"
 msgstr ""
 
-#: src/prompt.c:845
+#: src/prompt.c:842
 msgid "Yes"
 msgstr ""
 
-#: src/prompt.c:850
+#: src/prompt.c:847
 msgid "All"
 msgstr ""
 
-#: src/prompt.c:855
+#: src/prompt.c:852
 msgid "No"
 msgstr ""
 
-#: src/rcfile.c:142
+#: src/rcfile.c:144
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr ""
 
-#: src/rcfile.c:201
+#: src/rcfile.c:203
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr ""
 
-#: src/rcfile.c:228 src/rcfile.c:280 src/rcfile.c:732 src/rcfile.c:793
-#: src/rcfile.c:882 src/rcfile.c:933
+#: src/rcfile.c:231 src/rcfile.c:674 src/rcfile.c:725 src/rcfile.c:824
 msgid "Regex strings must begin and end with a \" character"
 msgstr ""
 
-#: src/rcfile.c:254 src/search.c:62
+#: src/rcfile.c:257 src/search.c:61
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr ""
 
-#: src/rcfile.c:274
+#: src/rcfile.c:279
 msgid "Missing syntax name"
 msgstr ""
 
-#: src/rcfile.c:345
+#: src/rcfile.c:288
+msgid "A syntax name must be quoted"
+msgstr ""
+
+#: src/rcfile.c:297
 msgid "The \"none\" syntax is reserved"
 msgstr ""
 
-#: src/rcfile.c:352
-msgid "The \"default\" syntax must take no extensions"
+#: src/rcfile.c:327
+msgid "The \"default\" syntax does not accept extensions"
 msgstr ""
 
-#: src/rcfile.c:424
+#: src/rcfile.c:369
 msgid "Missing key name"
 msgstr ""
 
-#: src/rcfile.c:433 src/rcfile.c:444
+#: src/rcfile.c:378 src/rcfile.c:389
 msgid "Key name is too short"
 msgstr ""
 
-#: src/rcfile.c:454
+#: src/rcfile.c:399
 msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr ""
 
-#: src/rcfile.c:457
+#: src/rcfile.c:402
 #, c-format
 msgid "Key name %s is invalid"
 msgstr ""
 
-#: src/rcfile.c:466
+#: src/rcfile.c:411
 msgid "Must specify a function to bind the key to"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the word "all".
-#: src/rcfile.c:476
+#: src/rcfile.c:421
 msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
 
-#: src/rcfile.c:483
+#: src/rcfile.c:428
 #, c-format
 msgid "Cannot map name \"%s\" to a function"
 msgstr ""
 
-#: src/rcfile.c:490
+#: src/rcfile.c:435
 #, c-format
 msgid "Cannot map name \"%s\" to a menu"
 msgstr ""
 
-#: src/rcfile.c:522
+#: src/rcfile.c:467
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr ""
 
-#: src/rcfile.c:534
+#: src/rcfile.c:479
 #, c-format
 msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr ""
 
-#: src/rcfile.c:631
+#: src/rcfile.c:576
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr ""
 
-#: src/rcfile.c:674
+#: src/rcfile.c:616
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1786,166 +1819,159 @@ msgid ""
 "for foreground colors."
 msgstr ""
 
-#: src/rcfile.c:696
-msgid "Cannot add a color command without a syntax command"
+#: src/rcfile.c:637 src/rcfile.c:795 src/rcfile.c:858
+#, c-format
+msgid "A '%s' command requires a preceding 'syntax' command"
 msgstr ""
 
-#: src/rcfile.c:701
+#: src/rcfile.c:643
 msgid "Missing color name"
 msgstr ""
 
-#: src/rcfile.c:711 src/rcfile.c:872
-msgid "Missing regex string"
+#: src/rcfile.c:653 src/rcfile.c:807
+#, c-format
+msgid "Missing regex string after '%s' command"
 msgstr ""
 
-#: src/rcfile.c:787
+#: src/rcfile.c:719
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr ""
 
-#: src/rcfile.c:839
+#: src/rcfile.c:768
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
 msgstr ""
 
-#: src/rcfile.c:867
-msgid "Cannot add a header regex without a syntax command"
-msgstr ""
-
-#: src/rcfile.c:922
-msgid "Cannot add a magic string regex without a syntax command"
-msgstr ""
-
-#: src/rcfile.c:927
-msgid "Missing magic string name"
-msgstr ""
-
-#: src/rcfile.c:985
-msgid "Cannot add a linter without a syntax command"
-msgstr ""
-
-#: src/rcfile.c:990
-msgid "Missing linter command"
+#: src/rcfile.c:802
+#, c-format
+msgid "The \"default\" syntax does not accept '%s' regexes"
 msgstr ""
 
-#: src/rcfile.c:1011
-msgid "Cannot add formatter without a syntax command"
+#: src/rcfile.c:863
+#, c-format
+msgid "Missing command after '%s'"
 msgstr ""
 
-#: src/rcfile.c:1016
-msgid "Missing formatter command"
+#: src/rcfile.c:879
+#, c-format
+msgid "Argument of '%s' lacks closing \""
 msgstr ""
 
-#: src/rcfile.c:1046
+#: src/rcfile.c:910
 #, c-format
 msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr ""
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:912
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
 
-#: src/rcfile.c:1109
+#: src/rcfile.c:971
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr ""
 
-#: src/rcfile.c:1125 src/rcfile.c:1134 src/rcfile.c:1144
+#: src/rcfile.c:993 src/rcfile.c:1202
 #, c-format
-msgid "Command \"%s\" not allowed in included file"
+msgid "Syntax \"%s\" has no color commands"
 msgstr ""
 
-#: src/rcfile.c:1150 src/rcfile.c:1359
+#: src/rcfile.c:1024
 #, c-format
-msgid "Syntax \"%s\" has no color commands"
+msgid "Command \"%s\" not allowed in included file"
 msgstr ""
 
-#: src/rcfile.c:1180
+#: src/rcfile.c:1039
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr ""
 
-#: src/rcfile.c:1195
+#: src/rcfile.c:1051
 msgid "Missing option"
 msgstr ""
 
-#: src/rcfile.c:1217
+#: src/rcfile.c:1065
 #, c-format
-msgid "Option \"%s\" requires an argument"
+msgid "Unknown option \"%s\""
 msgstr ""
 
-#: src/rcfile.c:1235
-msgid "Option is not a valid multibyte string"
+#: src/rcfile.c:1077
+#, c-format
+msgid "Cannot unset option \"%s\""
 msgstr ""
 
-#: src/rcfile.c:1272 src/rcfile.c:1300 src/rcfile.c:1309
-msgid "Non-blank characters required"
+#: src/rcfile.c:1089
+#, c-format
+msgid "Option \"%s\" requires an argument"
 msgstr ""
 
-#: src/rcfile.c:1282
-msgid "Two single-column characters required"
+#: src/rcfile.c:1105
+msgid "Option is not a valid multibyte string"
 msgstr ""
 
-#: src/rcfile.c:1348
-#, c-format
-msgid "Cannot unset option \"%s\""
+#: src/rcfile.c:1139 src/rcfile.c:1160 src/rcfile.c:1167
+msgid "Non-blank characters required"
 msgstr ""
 
-#: src/rcfile.c:1354
-#, c-format
-msgid "Unknown option \"%s\""
+#: src/rcfile.c:1146
+msgid "Two single-column characters required"
 msgstr ""
 
-#: src/rcfile.c:1413
+#: src/rcfile.c:1258
 msgid "I can't find my home directory!  Wah!"
 msgstr ""
 
-#: src/rcfile.c:1451
+#: src/rcfile.c:1295
 #, c-format
 msgid ""
 "\n"
 "Press Enter to continue starting nano.\n"
 msgstr ""
 
-#: src/search.c:96
+#: src/search.c:95
 #, c-format
 msgid "\"%.*s%s\" not found"
 msgstr ""
 
 #. TRANSLATORS: The next three strings are modifiers of the search prompt.
-#: src/search.c:176
+#: src/search.c:169
 msgid " [Case Sensitive]"
 msgstr ""
 
-#: src/search.c:180
+#: src/search.c:173
 msgid " [Regexp]"
 msgstr ""
 
-#: src/search.c:184
+#: src/search.c:177
 msgid " [Backwards]"
 msgstr ""
 
 #. TRANSLATORS: The next two strings are modifiers of the search prompt.
-#: src/search.c:189
+#: src/search.c:182
 msgid " (to replace) in selection"
 msgstr ""
 
-#: src/search.c:191
+#: src/search.c:184
 msgid " (to replace)"
 msgstr ""
 
+#: src/search.c:305
+msgid "Searching..."
+msgstr ""
+
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:718
+#: src/search.c:693
 msgid "Replace this instance?"
 msgstr ""
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:883
+#: src/search.c:840
 msgid "Replace with"
 msgstr ""
 
-#: src/search.c:924
+#: src/search.c:875
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
@@ -1953,288 +1979,315 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:964
+#: src/search.c:914
 msgid "Enter line number, column number"
 msgstr ""
 
-#: src/search.c:991
+#: src/search.c:939
 msgid "Invalid line or column number"
 msgstr ""
 
-#: src/search.c:1124
+#: src/search.c:1080
 msgid "Not a bracket"
 msgstr ""
 
-#: src/search.c:1191
+#: src/search.c:1146
 msgid "No matching bracket"
 msgstr ""
 
-#: src/text.c:54
+#: src/text.c:53
 msgid "Mark Set"
 msgstr ""
 
-#: src/text.c:58
+#: src/text.c:57
 msgid "Mark Unset"
 msgstr ""
 
-#: src/text.c:70
+#: src/text.c:69
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr ""
 
-#: src/text.c:475
-msgid "Nothing in undo buffer!"
+#: src/text.c:468
+msgid "Commenting is not supported for this file type"
 msgstr ""
 
-#: src/text.c:481 src/text.c:634
-#, c-format
-msgid "Internal error: can't match line %d.  Please save your work."
+#: src/text.c:484
+msgid "Cannot comment past end of file"
+msgstr ""
+
+#: src/text.c:677
+msgid "Nothing in undo buffer!"
 msgstr ""
 
 #. TRANSLATORS: Eight of the next nine strings describe actions
 #. * that are undone or redone.  It are all nouns, not verbs.
-#: src/text.c:495 src/text.c:524 src/text.c:645 src/text.c:686
+#: src/text.c:695 src/text.c:724 src/text.c:857 src/text.c:898
 msgid "text add"
 msgstr ""
 
-#: src/text.c:505 src/text.c:656
+#: src/text.c:705 src/text.c:868
 msgid "text delete"
 msgstr ""
 
-#: src/text.c:528 src/text.c:694
+#: src/text.c:728 src/text.c:907
 msgid "line join"
 msgstr ""
 
-#: src/text.c:547 src/text.c:710
+#: src/text.c:747 src/text.c:923
 msgid "text cut"
 msgstr ""
 
-#: src/text.c:552 src/text.c:714
+#: src/text.c:752 src/text.c:927
 msgid "text uncut"
 msgstr ""
 
-#: src/text.c:558 src/text.c:691
+#: src/text.c:758 src/text.c:903
 msgid "Internal error: line is missing.  Please save your work."
 msgstr ""
 
-#: src/text.c:561 src/text.c:665
+#: src/text.c:762 src/text.c:877
 msgid "line break"
 msgstr ""
 
-#: src/text.c:569 src/text.c:725
+#: src/text.c:772 src/text.c:947
+msgid "comment"
+msgstr ""
+
+#: src/text.c:776 src/text.c:951
+msgid "uncomment"
+msgstr ""
+
+#: src/text.c:780 src/text.c:938
 msgid "text insert"
 msgstr ""
 
-#: src/text.c:589 src/text.c:718
+#: src/text.c:800 src/text.c:931
 msgid "text replace"
 msgstr ""
 
-#: src/text.c:596 src/text.c:732 src/text.c:1030 src/text.c:1174
+#: src/text.c:807 src/text.c:955 src/text.c:1267 src/text.c:1437
 msgid "Internal error: unknown type.  Please save your work."
 msgstr ""
 
-#: src/text.c:601
+#: src/text.c:813
 #, c-format
 msgid "Undid action (%s)"
 msgstr ""
 
-#: src/text.c:619
+#: src/text.c:832
 msgid "Nothing to re-do!"
 msgstr ""
 
-#: src/text.c:628
+#: src/text.c:841
 msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
 
-#: src/text.c:737
+#: src/text.c:961
 #, c-format
 msgid "Redid action (%s)"
 msgstr ""
 
-#: src/text.c:827 src/text.c:2508 src/text.c:2944
+#: src/text.c:1051 src/text.c:2765 src/text.c:3198
 msgid "Could not create pipe"
 msgstr ""
 
-#: src/text.c:853 src/text.c:2595 src/text.c:2750 src/text.c:2992
-#: src/text.c:3286
+#: src/text.c:1077 src/text.c:2852 src/text.c:3005 src/text.c:3246
+#: src/text.c:3540
 msgid "Could not fork"
 msgstr ""
 
-#: src/text.c:1853
+#: src/text.c:2117
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr ""
 
-#: src/text.c:2241
+#: src/text.c:2499
 msgid "Can now UnJustify!"
 msgstr ""
 
-#: src/text.c:2435
+#: src/text.c:2697
 msgid "Edit a replacement"
 msgstr ""
 
-#: src/text.c:2510
+#. TRANSLATORS: Shown after fixing misspellings in one word.
+#: src/text.c:2713
+msgid "Next word..."
+msgstr ""
+
+#: src/text.c:2767
 msgid "Creating misspelled word list, please wait..."
 msgstr ""
 
-#: src/text.c:2601 src/text.c:2999
+#: src/text.c:2858 src/text.c:3253
 msgid "Could not get size of pipe buffer"
 msgstr ""
 
-#: src/text.c:2652
+#: src/text.c:2907
 msgid "Error invoking \"spell\""
 msgstr ""
 
-#: src/text.c:2655
+#: src/text.c:2910
 msgid "Error invoking \"sort -f\""
 msgstr ""
 
-#: src/text.c:2658
+#: src/text.c:2913
 msgid "Error invoking \"uniq\""
 msgstr ""
 
-#: src/text.c:2881
+#: src/text.c:3135
 msgid "Invoking spell checker, please wait"
 msgstr ""
 
-#: src/text.c:2897
+#: src/text.c:3151
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr ""
 
-#: src/text.c:2899
+#: src/text.c:3153
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr ""
 
-#: src/text.c:2902
+#: src/text.c:3156
 msgid "Finished checking spelling"
 msgstr ""
 
-#: src/text.c:2927
+#: src/text.c:3181
 msgid "No linter defined for this type of file!"
 msgstr ""
 
-#: src/text.c:2932
+#: src/text.c:3186
 msgid "Save modified buffer before linting?"
 msgstr ""
 
-#: src/text.c:2949
+#: src/text.c:3203
 msgid "Invoking linter, please wait"
 msgstr ""
 
-#: src/text.c:3105
+#: src/text.c:3358
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr ""
 
-#: src/text.c:3134
+#: src/text.c:3388
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
 
-#: src/text.c:3153
+#: src/text.c:3407
 msgid "No more errors in unopened files, cancelling"
 msgstr ""
 
-#: src/text.c:3192
+#: src/text.c:3446
 msgid "At last message"
 msgstr ""
 
-#: src/text.c:3197
+#: src/text.c:3451
 msgid "At first message"
 msgstr ""
 
-#: src/text.c:3237
+#: src/text.c:3491
 msgid "Finished"
 msgstr ""
 
-#: src/text.c:3259
+#: src/text.c:3513
 msgid "Invoking formatter, please wait"
 msgstr ""
 
-#: src/text.c:3314
+#: src/text.c:3568
 msgid "Finished formatting"
 msgstr ""
 
-#: src/text.c:3396
+#: src/text.c:3650
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr ""
 
-#: src/text.c:3397
+#: src/text.c:3651
 msgid "In Selection:  "
 msgstr ""
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3411
+#: src/text.c:3665
 msgid "Verbatim Input"
 msgstr ""
 
-#: src/utils.c:391 src/utils.c:403
+#: src/utils.c:392 src/utils.c:404
 msgid "nano is out of memory!"
 msgstr ""
 
+#: src/utils.c:625
+#, c-format
+msgid "Internal error: can't match line %d.  Please save your work."
+msgstr ""
+
+#. TRANSLATORS: This refers to a sequence of escape codes
+#. * (from the keyboard) that nano does not know about.
+#: src/winio.c:1121
+msgid "Unknown sequence"
+msgstr ""
+
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
 #: src/winio.c:1427
 msgid "Unicode Input"
 msgstr ""
 
-#: src/winio.c:1991 src/winio.c:1995
-msgid "Modified"
+#: src/winio.c:1960
+msgid "DIR:"
 msgstr ""
 
-#: src/winio.c:1992
-msgid "View"
+#: src/winio.c:1968
+msgid "File:"
 msgstr ""
 
-#: src/winio.c:2006
-msgid "DIR:"
+#: src/winio.c:1972 src/winio.c:1976
+msgid "Modified"
 msgstr ""
 
-#: src/winio.c:2013
-msgid "File:"
+#: src/winio.c:1974
+msgid "View"
 msgstr ""
 
-#: src/winio.c:3141
+#: src/winio.c:3105
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr ""
 
-#: src/winio.c:3271
+#: src/winio.c:3235
 msgid "The nano text editor"
 msgstr ""
 
-#: src/winio.c:3272
+#: src/winio.c:3236
 msgid "version"
 msgstr ""
 
-#: src/winio.c:3273
+#: src/winio.c:3237
 msgid "Brought to you by:"
 msgstr ""
 
-#: src/winio.c:3274
+#: src/winio.c:3238
 msgid "Special thanks to:"
 msgstr ""
 
-#: src/winio.c:3275
+#: src/winio.c:3239
 msgid "The Free Software Foundation"
 msgstr ""
 
-#: src/winio.c:3276
+#: src/winio.c:3240
 msgid "the many translators and the TP"
 msgstr ""
 
-#: src/winio.c:3277
+#: src/winio.c:3241
 msgid "For ncurses:"
 msgstr ""
 
-#: src/winio.c:3278
+#: src/winio.c:3242
 msgid "and anyone else we forgot..."
 msgstr ""
 
-#: src/winio.c:3279
+#: src/winio.c:3243
 msgid "Thank you for using nano!"
 msgstr ""
diff --git a/po/nb.po b/po/nb.po
index 3f89a883..d316f830 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 2.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-25 16:41-0500\n"
+"POT-Creation-Date: 2016-06-17 15:41+0200\n"
 "PO-Revision-Date: 2016-02-13 09:40+0100\n"
 "Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n"
 "Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
@@ -21,369 +21,348 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.6.9\n"
 
+#: src/browser.c:144 src/browser.c:284 src/browser.c:334 src/files.c:996
+#: src/files.c:1003 src/files.c:1794 src/files.c:1919 src/files.c:1963
+#: src/files.c:1983 src/files.c:2099 src/files.c:3019 src/files.c:3242
+#: src/rcfile.c:540 src/rcfile.c:1280
+#, c-format
+msgid "Error reading %s: %s"
+msgstr "Lesefeil på %s: %s"
+
 #. TRANSLATORS: This is a prompt.
-#: src/browser.c:220
+#: src/browser.c:247
 msgid "Go To Directory"
 msgstr "GÃ¥ til katalog"
 
-#: src/browser.c:227 src/browser.c:738 src/files.c:1174 src/files.c:2340
-#: src/nano.c:1120 src/search.c:202 src/search.c:290 src/search.c:895
-#: src/search.c:970 src/text.c:2935 src/text.c:3142
+#: src/browser.c:254 src/browser.c:723 src/files.c:1126 src/files.c:2292
+#: src/nano.c:1128 src/search.c:195 src/search.c:297 src/search.c:851
+#: src/search.c:918 src/text.c:3189 src/text.c:3396
 msgid "Cancelled"
 msgstr "Avbrutt"
 
-#: src/browser.c:253 src/browser.c:300
-#, c-format
-msgid "Can't go outside of %s in restricted mode"
+#. TRANSLATORS: This refers to the option --operatingdir,
+#. * not to --restricted.
+#: src/browser.c:274 src/browser.c:326
+#, fuzzy, c-format
+msgid "Can't go outside of %s in confined mode"
 msgstr "Kan ikke gå utenfor %s i begrenset modus"
 
-#: src/browser.c:264 src/browser.c:310 src/browser.c:326 src/files.c:1044
-#: src/files.c:1052 src/files.c:1844 src/files.c:1971 src/files.c:2016
-#: src/files.c:2037 src/files.c:2156 src/files.c:3062 src/files.c:3285
-#: src/rcfile.c:596 src/rcfile.c:1435
-#, c-format
-msgid "Error reading %s: %s"
-msgstr "Lesefeil på %s: %s"
-
-#: src/browser.c:290
+#: src/browser.c:317
 msgid "Can't move up a directory"
 msgstr "Kan ikke bevege seg opp en katalog"
 
 #. TRANSLATORS: Try to keep this at most 7 characters.
-#: src/browser.c:615 src/browser.c:623
+#: src/browser.c:590 src/browser.c:598
 msgid "(dir)"
 msgstr "(kat)"
 
 #. TRANSLATORS: Try to keep this at most 12 characters.
-#: src/browser.c:620
+#: src/browser.c:595
 msgid "(parent dir)"
 msgstr "(foreldrekatalog)"
 
 #. TRANSLATORS: Try to keep this at most 7 characters.
 #. * If necessary, you can leave out the parentheses.
-#: src/browser.c:650
+#: src/browser.c:625
 msgid "(huge)"
 msgstr "(stor)"
 
 #. TRANSLATORS: This is the main search prompt.
-#: src/browser.c:727 src/search.c:173
+#: src/browser.c:712 src/search.c:166
 msgid "Search"
 msgstr "Søk"
 
-#: src/browser.c:777 src/search.c:466 src/search.c:536
-msgid "This is the only occurrence"
-msgstr "Dette er eneste forekomst"
-
-#: src/browser.c:793 src/search.c:364
+#: src/browser.c:754 src/search.c:368
 msgid "Search Wrapped"
 msgstr "Søket gikk rundt"
 
-#: src/browser.c:843 src/search.c:517
+#: src/browser.c:764 src/search.c:509
+msgid "This is the only occurrence"
+msgstr "Dette er eneste forekomst"
+
+#: src/browser.c:812 src/search.c:473
 msgid "No current search pattern"
 msgstr "Tomt søkemønster"
 
-#: src/files.c:50
+#: src/color.c:186
+#, fuzzy, c-format
+msgid "Unknown syntax name: %s"
+msgstr "Mangler syntaksnavn"
+
+#: src/color.c:247
+#, c-format
+msgid "magic_load() failed: %s"
+msgstr ""
+
+#: src/color.c:251
+#, c-format
+msgid "magic_file(%s) failed: %s"
+msgstr ""
+
+#: src/files.c:47
 #, c-format
 msgid "Directory '%s' does not exist"
 msgstr "Mappen «%s» finnes ikke"
 
-#: src/files.c:52
+#: src/files.c:49
 #, c-format
 msgid "Path '%s': %s"
 msgstr "Sti «%s»: %s"
 
-#: src/files.c:54
+#: src/files.c:51
 #, c-format
 msgid "Path '%s' is not a directory"
 msgstr "Sti «%s» er ikke en katalog"
 
-#: src/files.c:57
+#: src/files.c:53
 #, c-format
 msgid "Path '%s' is not accessible"
 msgstr "Sti «%s» er ikke tilgjengelig"
 
-#. TRANSLATORS: Try to keep this at most 76 characters.
-#: src/files.c:158
+#. TRANSLATORS: Keep the next ten messages at most 76 characters.
+#: src/files.c:148
 msgid ""
 "Warning: Modifying a file which is not locked, check directory permission?"
 msgstr "Advarsel: Endrer en fil som ikke er låst, sjekk katalogtillatelse?"
 
-#: src/files.c:197
+#: src/files.c:187
 msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
 msgstr "Kan ikke fastslå identiteten min for låsefil (getpwuid() mislyktes)"
 
-#: src/files.c:206
+#: src/files.c:196
 #, c-format
 msgid "Couldn't determine hostname for lock file: %s"
 msgstr "Finner ikke ut vertsnavnet for låsefilen: %s"
 
-#: src/files.c:227 src/files.c:238 src/files.c:275 src/files.c:285
+#: src/files.c:216 src/files.c:225 src/files.c:262 src/files.c:272
 #, c-format
 msgid "Error writing lock file %s: %s"
 msgstr "Feil ved skriving til låssfil %s: %s"
 
-#: src/files.c:305
+#: src/files.c:291
 #, c-format
 msgid "Error deleting lock file %s: %s"
 msgstr "Feil ved sletting av låsefil %s: %s"
 
-#: src/files.c:341
+#: src/files.c:325
 #, c-format
 msgid "Error opening lock file %s: %s"
 msgstr "Feil ved åpning av låsefil %s: %s"
 
-#: src/files.c:353
+#: src/files.c:337
 #, c-format
 msgid "Error reading lock file %s: Not enough data read"
 msgstr "Feil ved lesing av låsefil %s: Ikke nok data lest"
 
 #. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
-#: src/files.c:371
+#: src/files.c:354
 #, c-format
 msgid "File %s is being edited (by %s with %s, PID %d); continue?"
 msgstr "Filen %s blir redigert (av %s med %s, PID %d); fortsette?"
 
-#: src/files.c:426
+#: src/files.c:430
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Kan ikke sette inn fil fra utsiden av %s"
 
-#: src/files.c:439 src/files.c:1038 src/rcfile.c:589 src/rcfile.c:1385
-#: src/rcfile.c:1426
+#: src/files.c:445 src/files.c:991 src/rcfile.c:533 src/rcfile.c:1230
+#: src/rcfile.c:1271
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "«%s» er en katalog"
 
 # "enhet" = "device", kanskje, men det er litt forvirrande
-#: src/files.c:441
+#: src/files.c:447
 #, c-format
 msgid "\"%s\" is not a normal file"
 msgstr "«%s» er ikke en normal fil"
 
-#: src/files.c:566
+#: src/files.c:571
 msgid "No more open file buffers"
 msgstr "Ikke flere åpne filbuffer"
 
-#: src/files.c:582
+#: src/files.c:586
 #, c-format
 msgid "Switched to %s"
 msgstr "Byttet til %s"
 
-#: src/files.c:584 src/global.c:988 src/winio.c:2010
+#: src/files.c:588 src/global.c:1005 src/winio.c:1965
 msgid "New Buffer"
 msgstr "Ny buffer"
 
-#: src/files.c:943
+#. TRANSLATORS: Keep the next four messages at most 76 characters.
+#: src/files.c:913
 #, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
 msgstr[0] "Leste %lu linje (Konvertert fra DOS og Mac-format)"
 msgstr[1] "Leste %lu linjer (Konvertert fra DOS og Mac-format)"
 
-#: src/files.c:948
-#, c-format
-msgid ""
-"Read %lu line (Converted from DOS and Mac format - Warning: No write "
-"permission)"
-msgid_plural ""
-"Read %lu lines (Converted from DOS and Mac format - Warning: No write "
-"permission)"
-msgstr[0] ""
-"Leste %lu linje (Konvertert fra DOS og Mac-format - Advarsel: Ingen "
-"skrivetilgang)"
-msgstr[1] ""
-"Leste %lu linjer (Konvertert fra DOS og Mac-format - Advarsel: Ingen "
-"skrivetilgang)"
-
-#: src/files.c:954
+#: src/files.c:919
 #, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
 msgstr[0] "Leste %lu linje (Konvertert fra Mac-format)"
 msgstr[1] "Leste %lu linjer (Konvertert fra Mac-format)"
 
-#: src/files.c:958
-#, c-format
-msgid ""
-"Read %lu line (Converted from Mac format - Warning: No write permission)"
-msgid_plural ""
-"Read %lu lines (Converted from Mac format - Warning: No write permission)"
-msgstr[0] ""
-"Leste %lu linje (Konvertert fra Mac-format - Advarsel: Ingen skrivetilgang)"
-msgstr[1] ""
-"Leste %lu linjer (Konvertert fra Mac-format - Advarsel: Ingen skrivetilgang)"
-
-#: src/files.c:964
+#: src/files.c:925
 #, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
 msgstr[0] "Leste %lu linje (Konvertert fra DOS-format)"
 msgstr[1] "Leste %lu linjer (Konvertert fra DOS-format)"
 
-#: src/files.c:968
-#, c-format
-msgid ""
-"Read %lu line (Converted from DOS format - Warning: No write permission)"
-msgid_plural ""
-"Read %lu lines (Converted from DOS format - Warning: No write permission)"
-msgstr[0] ""
-"Leste %lu linje (Konvertert fra DOS-format - Advarsel: Ingen skrivetilgang)"
-msgstr[1] ""
-"Leste %lu linjer (Konvertert fra DOS-format - Advarsel: Ingen skrivetilgang)"
-
-#: src/files.c:974
+#: src/files.c:930
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "Leste %lu linje"
 msgstr[1] "Leste %lu linjer"
 
-#: src/files.c:977
-#, c-format
-msgid "Read %lu line (Warning: No write permission)"
-msgid_plural "Read %lu lines (Warning: No write permission)"
-msgstr[0] "Les %lu linje (Advarsel: Ingen skrivetilgang)"
-msgstr[1] "Les %lu linjer (Advarsel: Ingen skrivetilgang)"
-
-#: src/files.c:1019 src/files.c:1056
+#: src/files.c:974 src/files.c:1006
 msgid "Reading File"
 msgstr "Leser fil"
 
-#: src/files.c:1025
+#: src/files.c:980
 msgid "New File"
 msgstr "Ny fil"
 
-#: src/files.c:1028
-#, c-format
-msgid "\"%s\" not found"
+#: src/files.c:983
+#, fuzzy, c-format
+msgid "File \"%s\" not found"
 msgstr "«%s» ikke funnet"
 
 # "enhet" = "device", kanskje, men det er litt forvirrande
-#: src/files.c:1039 src/rcfile.c:590 src/rcfile.c:1386 src/rcfile.c:1427
+#: src/files.c:992 src/rcfile.c:534 src/rcfile.c:1231 src/rcfile.c:1272
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "«%s» er en enhetsfil (device)"
 
-#: src/files.c:1133
+#: src/files.c:1083
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Kommando som skal kjøres i nytt buffer [fra %s] "
 
-#: src/files.c:1135
+#: src/files.c:1085
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Kommando som skal kjøres [fra %s] "
 
-#: src/files.c:1142
+#: src/files.c:1092
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Fil som skal settes inn [fra %s] "
 
-#: src/files.c:1144
+#: src/files.c:1094
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Fil som skal settes inn [fra %s] "
 
-#: src/files.c:1389
+#: src/files.c:1338
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Tasten er ugyldig utenfor multibuffer-modus"
 
-#: src/files.c:1684
-msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+#: src/files.c:1632
+#, fuzzy
+msgid "Failed to write backup file; continue saving? (Say N if unsure.) "
 msgstr ""
 "Klarte ikke å skrive backup fil, fortsette å lagre? (Si N hvis du er usikker)"
 
-#: src/files.c:1800
+#: src/files.c:1750
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Kan ikke skrive utenfor %s"
 
-#: src/files.c:1885 src/files.c:1910 src/files.c:1928 src/files.c:1941
-#: src/files.c:1952 src/files.c:1981
+#: src/files.c:1833 src/files.c:1858 src/files.c:1876 src/files.c:1889
+#: src/files.c:1900 src/files.c:1928
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Feil ved skriving av backup-fil %s: %s"
 
-#: src/files.c:1886 src/nano.c:690
+#: src/files.c:1834 src/nano.c:692
 msgid "Too many backup files?"
 msgstr "For mange sikkerhetskopier?"
 
-#: src/files.c:2026 src/text.c:2863 src/text.c:2875 src/text.c:3244
-#: src/text.c:3253
+#: src/files.c:1972 src/text.c:3117 src/text.c:3129 src/text.c:3498
+#: src/text.c:3507
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Feil ved skriving til midlertidlig fil: %s"
 
-#: src/files.c:2049 src/files.c:2068 src/files.c:2080 src/files.c:2104
-#: src/files.c:2121 src/files.c:2131 src/files.c:2164 src/files.c:2171
+#: src/files.c:1994 src/files.c:2013 src/files.c:2023 src/files.c:2047
+#: src/files.c:2064 src/files.c:2074 src/files.c:2106 src/files.c:2113
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Skrivefeil %s: %s"
 
-#: src/files.c:2200
+#: src/files.c:2154
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "Skrev %lu linje"
 msgstr[1] "Skrev %lu linjer"
 
-#: src/files.c:2299
+#: src/files.c:2249
 msgid " [DOS Format]"
 msgstr " [DOS Format]"
 
-#: src/files.c:2300
+#: src/files.c:2250
 msgid " [Mac Format]"
 msgstr " [Mac Format]"
 
-#: src/files.c:2302
+#: src/files.c:2252
 msgid " [Backup]"
 msgstr " [Sikkerhetskopi]"
 
-#: src/files.c:2309
+#: src/files.c:2259
 msgid "Prepend Selection to File"
 msgstr "Legg til valgt område først i fil"
 
-#: src/files.c:2310
+#: src/files.c:2260
 msgid "Append Selection to File"
 msgstr "Legg til valgt område sist i fil"
 
-#: src/files.c:2311
+#: src/files.c:2261
 msgid "Write Selection to File"
 msgstr "Skriv valgt område til fil"
 
-#: src/files.c:2314
+#: src/files.c:2264
 msgid "File Name to Prepend to"
 msgstr "Filnavn det skal legges til på slutten av"
 
-#: src/files.c:2315
+#: src/files.c:2265
 msgid "File Name to Append to"
 msgstr "Filnavn det skal legges til først i"
 
-#: src/files.c:2316
+#: src/files.c:2266
 msgid "File Name to Write"
 msgstr "Filnavn som skal skrives til"
 
-#: src/files.c:2349
-msgid "Save modified buffer anyway ? "
+#: src/files.c:2301
+#, fuzzy
+msgid "Save modified buffer anyway? "
 msgstr "Lagre endret buffer likevel?"
 
-#: src/files.c:2457
-msgid "File exists, OVERWRITE ? "
-msgstr "Filen finnes, SKRIVE OVER ? "
-
-#: src/files.c:2466
-msgid "Save file under DIFFERENT NAME ? "
+#: src/files.c:2412
+#, fuzzy
+msgid "Save file under DIFFERENT NAME? "
 msgstr "Lagre filen under et ANNET NAVN ? "
 
-#: src/files.c:2480
-msgid "File was modified since you opened it, continue saving ? "
+#: src/files.c:2420
+#, fuzzy, c-format
+msgid "File \"%s\" exists; OVERWRITE? "
+msgstr "Filen finnes, SKRIVE OVER ? "
+
+#: src/files.c:2441
+#, fuzzy
+msgid "File was modified since you opened it; continue saving? "
 msgstr "Filen ble endret etter at du åpnet den, fortsette å lagre?"
 
-#: src/files.c:2917
+#: src/files.c:2874
 msgid "(more)"
 msgstr "(mer)"
 
-#: src/files.c:3004
+#: src/files.c:2959
 #, c-format
 msgid ""
 "\n"
@@ -392,7 +371,7 @@ msgstr ""
 "\n"
 "Trykk linjeskift for å fortsette\n"
 
-#: src/files.c:3020
+#: src/files.c:2975
 #, c-format
 msgid ""
 "Unable to create directory %s: %s\n"
@@ -402,7 +381,7 @@ msgstr ""
 "Det er nødvendig for lagring/lasting av søkehistorikk eller "
 "markørposisjoner\n"
 
-#: src/files.c:3026
+#: src/files.c:2982
 #, c-format
 msgid ""
 "Path %s is not a directory and needs to be.\n"
@@ -412,7 +391,7 @@ msgstr ""
 "Nano vil være ute av stand til å laste eller lagre søk- eller "
 "markørposisjonhistorikk\n"
 
-#: src/files.c:3045
+#: src/files.c:3002
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I tried to move\n"
@@ -421,7 +400,7 @@ msgstr ""
 "Oppdaget en eldre nano historiefil (%s) som jeg prøvde å flytte\n"
 "til den ønskede plasseringen (%s), men oppdaget en feil: %s"
 
-#: src/files.c:3049
+#: src/files.c:3006
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I moved\n"
@@ -432,721 +411,752 @@ msgstr ""
 "til den ønskede plasseringen (%s)\n"
 "(se nano FAQ om denne endringen)"
 
-#: src/files.c:3132 src/files.c:3140 src/files.c:3164 src/files.c:3176
+#: src/files.c:3089 src/files.c:3097 src/files.c:3121 src/files.c:3133
 #, c-format
 msgid "Error writing %s: %s\n"
 msgstr "Feil ved skriving %s: %s\n"
 
 #. TRANSLATORS: Try to keep the next fifteen strings at most 10 characters.
-#: src/global.c:480
+#: src/global.c:483
 msgid "Exit"
 msgstr "Avslutt"
 
-#: src/global.c:481
+#: src/global.c:484
 msgid "Close"
 msgstr "Lukk"
 
-#: src/global.c:482
+#: src/global.c:485
 msgid "Uncut Text"
 msgstr "Angre «klipp ut»"
 
-#: src/global.c:484
+#: src/global.c:487
 msgid "Unjustify"
 msgstr "Avjuster"
 
-#: src/global.c:490
+#: src/global.c:493
 msgid "Read File"
 msgstr "Les fil"
 
-#: src/global.c:491
+#: src/global.c:494
 msgid "Where Is"
 msgstr "Finn"
 
-#: src/global.c:492
+#: src/global.c:495
 msgid "Replace"
 msgstr "Erstatt"
 
-#: src/global.c:493
+#: src/global.c:496
 msgid "Go To Line"
 msgstr "GÃ¥ til linje"
 
-#: src/global.c:494
+#: src/global.c:497
 msgid "Prev Line"
 msgstr "Forrige side"
 
-#: src/global.c:495
+#: src/global.c:498
 msgid "Next Line"
 msgstr "Siste linje"
 
-#: src/global.c:496
+#: src/global.c:499
 msgid "Prev Page"
 msgstr "Forrige side"
 
-#: src/global.c:497
+#: src/global.c:500
 msgid "Next Page"
 msgstr "Neste side"
 
-#: src/global.c:499
+#: src/global.c:502
 msgid "Justify"
 msgstr "Juster"
 
-#: src/global.c:500
+#: src/global.c:503
 msgid "FullJstify"
 msgstr "JusterAlt"
 
-#: src/global.c:502
+#: src/global.c:505
 msgid "Refresh"
 msgstr "Oppfrisk"
 
 #. TRANSLATORS: Try to keep this string at most 12 characters.
-#: src/global.c:505
+#: src/global.c:508
 msgid "WhereIs Next"
 msgstr "Finn neste"
 
 #. TRANSLATORS: The next long series of strings are shortcut descriptions;
 #. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:512
+#: src/global.c:515
 msgid "Justify the current paragraph"
 msgstr "Juster gjeldende avsnitt"
 
-#: src/global.c:514
+#: src/global.c:517
 msgid "Cancel the current function"
 msgstr "Avbryt gjeldende funksjon"
 
-#: src/global.c:515
+#: src/global.c:518
 msgid "Display this help text"
 msgstr "Vis denne hjelpeteksten"
 
-#: src/global.c:518
+#: src/global.c:521
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Lukk gjeldende filbuffer/ Avslutt nano"
 
-#: src/global.c:520
+#: src/global.c:523
 msgid "Exit from nano"
 msgstr "Avslutt nano"
 
-#: src/global.c:524
+#: src/global.c:527
 msgid "Write the current file to disk"
 msgstr "Lagre nåværende fil"
 
-#: src/global.c:526
+#: src/global.c:529
 msgid "Insert another file into the current one"
 msgstr "Sett inn en annen fil i denne"
 
-#: src/global.c:528
+#: src/global.c:531
 msgid "Search for a string or a regular expression"
 msgstr "Søk etter streng eller regulært uttrykk"
 
-#: src/global.c:531
+#: src/global.c:533
 msgid "Search for a string"
 msgstr "Søk etter streng"
 
-#: src/global.c:533
+#: src/global.c:534
+msgid "Refresh the file list"
+msgstr ""
+
+#: src/global.c:535
+#, fuzzy
+msgid "Go to lefthand column"
+msgstr "GÃ¥ til linje- og kolonnenummer"
+
+#: src/global.c:536
+#, fuzzy
+msgid "Go to righthand column"
+msgstr "GÃ¥ til linje- og kolonnenummer"
+
+#: src/global.c:538
 msgid "Go one screenful up"
 msgstr "GÃ¥ en skjerm opp"
 
-#: src/global.c:534
+#: src/global.c:539
 msgid "Go one screenful down"
 msgstr "GÃ¥ en skjerm ned"
 
-#: src/global.c:536
+#: src/global.c:541
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Klipp denne linjen og lagre den i klippebufferet"
 
-#: src/global.c:538
+#: src/global.c:543
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Sett inn klippebufferet her"
 
-#: src/global.c:539
+#: src/global.c:544
 msgid "Display the position of the cursor"
 msgstr "Vis pekerposisjon"
 
-#: src/global.c:541
+#: src/global.c:546
 msgid "Invoke the spell checker, if available"
 msgstr "Start stavesjekk, dersom tilgjengelig"
 
-#: src/global.c:543
+#: src/global.c:548
 msgid "Replace a string or a regular expression"
 msgstr "Erstatt streng eller regulært uttrykk"
 
-#: src/global.c:544
+#: src/global.c:549
 msgid "Go to line and column number"
 msgstr "GÃ¥ til linje- og kolonnenummer"
 
-#: src/global.c:546
+#: src/global.c:551
 msgid "Mark text starting from the cursor position"
 msgstr "Marker tekst fra markørposisjonen"
 
-#: src/global.c:547
+#: src/global.c:552
 msgid "Repeat the last search"
 msgstr "Gjenta siste søk"
 
-#: src/global.c:549
+#: src/global.c:554
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "Kopier gjeldende linje og lagre i utklippstavlen"
 
-#: src/global.c:550
+#: src/global.c:555
 msgid "Indent the current line"
 msgstr "Indenter gjeldende linje"
 
-#: src/global.c:551
+#: src/global.c:556
 msgid "Unindent the current line"
 msgstr "Fjern indentering fra gjeldende linje"
 
-#: src/global.c:552
+#: src/global.c:558
+msgid "Comment/uncomment the current line or marked lines"
+msgstr ""
+
+#: src/global.c:560
 msgid "Undo the last operation"
 msgstr "Angre siste handling"
 
-#: src/global.c:553
+#: src/global.c:561
 msgid "Redo the last undone operation"
 msgstr "Gjør om siste angre-operasjon"
 
-#: src/global.c:555
+#: src/global.c:563
 msgid "Go back one character"
 msgstr "GÃ¥ ett tegn tilbake"
 
-#: src/global.c:556
+#: src/global.c:564
 msgid "Go forward one character"
 msgstr "GÃ¥ tett tegn frem"
 
-#: src/global.c:558
+#: src/global.c:566
 msgid "Go back one word"
 msgstr "GÃ¥ til forrige ord"
 
-#: src/global.c:559
+#: src/global.c:567
 msgid "Go forward one word"
 msgstr "GÃ¥ til neste ord"
 
-#: src/global.c:561
+#: src/global.c:569
 msgid "Go to previous line"
 msgstr "GÃ¥ til forrige linje"
 
-#: src/global.c:562
+#: src/global.c:570
 msgid "Go to next line"
 msgstr "GÃ¥ til neste linje"
 
-#: src/global.c:563
+#: src/global.c:571
 msgid "Go to beginning of current line"
 msgstr "GÃ¥ til begynnelsen av linjen"
 
-#: src/global.c:564
+#: src/global.c:572
 msgid "Go to end of current line"
 msgstr "GÃ¥ til slutten av linjen"
 
-#: src/global.c:567
+#: src/global.c:575
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "GÃ¥ til begynnelsen av avsnittet, deretter forrige avsnitt"
 
-#: src/global.c:569
+#: src/global.c:577
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr "GÃ¥ akkurat utenfor slutten av avsnittet, deretter neste avsnitt"
 
-#: src/global.c:571
+#: src/global.c:579
 msgid "Go to the first line of the file"
 msgstr "Gå til første linje i filen"
 
-#: src/global.c:572
+#: src/global.c:580
 msgid "Go to the last line of the file"
 msgstr "GÃ¥ til siste linje i filen"
 
-#: src/global.c:574
+#: src/global.c:582
 msgid "Go to the matching bracket"
 msgstr "GÃ¥ til matchende brakett"
 
-#: src/global.c:576
+#: src/global.c:584
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "Rull opp en linje uten å flytte markøren"
 
-#: src/global.c:578
+#: src/global.c:586
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "Rull ned en linje uten å flytte markøren"
 
-#: src/global.c:581
+#: src/global.c:589
 msgid "Switch to the previous file buffer"
 msgstr "Bytt til forrige buffer"
 
-#: src/global.c:582
+#: src/global.c:590
 msgid "Switch to the next file buffer"
 msgstr "Bytt til neste buffer"
 
-#: src/global.c:584
+#: src/global.c:592
 msgid "Insert the next keystroke verbatim"
 msgstr "Sett inn ett og ett tegn"
 
-#: src/global.c:585
+#: src/global.c:593
 msgid "Insert a tab at the cursor position"
 msgstr "Sett inn tabulatortegn ved markøren"
 
-#: src/global.c:586
+#: src/global.c:594
 msgid "Insert a newline at the cursor position"
 msgstr "Sett inn et linjeskift ved markøren"
 
-#: src/global.c:587
+#: src/global.c:595
 msgid "Delete the character under the cursor"
 msgstr "Slett tegnet under peker"
 
-#: src/global.c:589
+#: src/global.c:597
 msgid "Delete the character to the left of the cursor"
 msgstr "Slett tegnet til venstre for peker"
 
-#: src/global.c:592
+#: src/global.c:600
 msgid "Cut backward from cursor to word start"
 msgstr "Kutt bakover fra markøren til starten av ordet"
 
-#: src/global.c:594
+#: src/global.c:602
 msgid "Cut forward from cursor to next word start"
 msgstr "Kutt fremover fra markøren til starten av neste ord"
 
-#: src/global.c:596
+#: src/global.c:604
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Kutt fra markøren til slutten av filen"
 
-#: src/global.c:599
+#: src/global.c:607
 msgid "Justify the entire file"
 msgstr "Juster hele filen"
 
-#: src/global.c:603
+#: src/global.c:611
 msgid "Count the number of words, lines, and characters"
 msgstr "Tell antall ord, linjer og tegn"
 
-#: src/global.c:606
+#: src/global.c:614
 msgid "Refresh (redraw) the current screen"
 msgstr "Tegn skjermen på nytt"
 
-#: src/global.c:608
+#: src/global.c:616
 msgid "Suspend the editor (if suspension is enabled)"
 msgstr "Suspender editoren (hvis suspensjon er aktivert)"
 
-#: src/global.c:610
+#: src/global.c:618
 msgid "Save file without prompting"
 msgstr "Lagre filen uten å spørre"
 
-#: src/global.c:611
+#: src/global.c:619
 msgid "Search next occurrence backward"
 msgstr "Søk bakover etter neste forekomst"
 
-#: src/global.c:612
+#: src/global.c:620
 msgid "Search next occurrence forward"
 msgstr "Søk fremover etter neste forekomst"
 
-#: src/global.c:614
+#: src/global.c:622
 msgid "Toggle the case sensitivity of the search"
 msgstr "Inverter valg for skille mellom små og store bokstaver i søk"
 
-#: src/global.c:616
+#: src/global.c:624
 msgid "Reverse the direction of the search"
 msgstr "Reverser søkeretning"
 
-#: src/global.c:620
+#: src/global.c:628
 msgid "Toggle the use of regular expressions"
 msgstr "Regulære uttrykk av/på"
 
-#: src/global.c:624
+#: src/global.c:632
 msgid "Recall the previous search/replace string"
 msgstr "Hent tilbake forrige søk-/erstatt tekst"
 
-#: src/global.c:626
+#: src/global.c:634
 msgid "Recall the next search/replace string"
 msgstr "Hent tilbake neste søk-/erstatt tekst"
 
-#: src/global.c:629
+#: src/global.c:637
 msgid "Go to file browser"
 msgstr "GÃ¥ til fil-leser"
 
-#: src/global.c:632
+#: src/global.c:640
 msgid "Toggle the use of DOS format"
 msgstr "DOS filformat av/på"
 
-#: src/global.c:633
+#: src/global.c:641
 msgid "Toggle the use of Mac format"
 msgstr "Mac filformat av/på"
 
-#: src/global.c:634
+#: src/global.c:642
 msgid "Toggle appending"
 msgstr "Inverter valg for appendering"
 
-#: src/global.c:635
+#: src/global.c:643
 msgid "Toggle prepending"
 msgstr "Inverter valg for prependering"
 
-#: src/global.c:636
+#: src/global.c:644
 msgid "Toggle backing up of the original file"
 msgstr "Inverter valg for sikkerhetskopi av orginalfil"
 
-#: src/global.c:637
+#: src/global.c:645
 msgid "Execute external command"
 msgstr "Eksekver ekstern kommando"
 
-#: src/global.c:639
+#: src/global.c:647
 msgid "Close buffer without saving it"
 msgstr "Lukk buffer uten å lagre den"
 
-#: src/global.c:641
+#: src/global.c:649
 msgid "Toggle the use of a new buffer"
 msgstr "Bruk nytt buffer av/på"
 
-#: src/global.c:644
+#: src/global.c:652
 msgid "Exit from the file browser"
 msgstr "GÃ¥ ut av fil-leser"
 
-#: src/global.c:645
+#: src/global.c:653
 msgid "Go to the first file in the list"
 msgstr "Gå til første linje i listen"
 
-#: src/global.c:646
+#: src/global.c:654
 msgid "Go to the last file in the list"
 msgstr "GÃ¥ til siste linje i listen"
 
-#: src/global.c:647
+#: src/global.c:655
 msgid "Go to the previous file in the list"
 msgstr "GÃ¥ til forrige fil i listen"
 
-#: src/global.c:648
+#: src/global.c:656
 msgid "Go to the next file in the list"
 msgstr "GÃ¥ til neste fil i listen"
 
-#: src/global.c:649
+#: src/global.c:657
 msgid "Go to directory"
 msgstr "GÃ¥ til katalog"
 
-#: src/global.c:652
+#: src/global.c:660
 msgid "Invoke the linter, if available"
 msgstr "Start linter, hvis tilgjengelig"
 
-#: src/global.c:653
+#: src/global.c:661
 msgid "Go to previous linter msg"
 msgstr "GÃ¥ til forrige lintermelding"
 
-#: src/global.c:654
+#: src/global.c:662
 msgid "Go to next linter msg"
 msgstr "GÃ¥ til neste lintermelding"
 
-#: src/global.c:656
+#: src/global.c:664
 msgid "Invoke formatter, if available"
 msgstr "Start formaterer, hvis tilgjengelig"
 
 #. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:671
+#: src/global.c:679
 msgid "Get Help"
 msgstr "Hjelp"
 
-#: src/global.c:674 src/prompt.c:858
+#: src/global.c:682 src/prompt.c:855
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: src/global.c:687
+#: src/global.c:695
 msgid "Write Out"
 msgstr "Lagre"
 
-#: src/global.c:723
+#: src/global.c:731
 msgid "Go To Dir"
 msgstr "GÃ¥ til katalog"
 
-#: src/global.c:738
+#: src/global.c:746
 msgid "Cut Text"
 msgstr "Klipp ut"
 
-#: src/global.c:753
+#: src/global.c:761
 msgid "To Spell"
 msgstr "Staving"
 
-#: src/global.c:757
+#: src/global.c:765
 msgid "To Linter"
 msgstr "Til linter"
 
-#: src/global.c:760
+#: src/global.c:768
 msgid "Formatter"
 msgstr "Formatterer"
 
-#: src/global.c:767
+#: src/global.c:775
 msgid "Case Sens"
 msgstr "Følsomt for store/små bokstavar"
 
-#: src/global.c:772
+#: src/global.c:780
 msgid "Regexp"
 msgstr "Regulært uttrykk"
 
-#: src/global.c:777
+#: src/global.c:785
 msgid "Backwards"
 msgstr "Bakover"
 
-#: src/global.c:784
+#: src/global.c:792
 msgid "No Replace"
 msgstr "Ikke erstatt"
 
-#: src/global.c:792
+#: src/global.c:800
 msgid "Cur Pos"
 msgstr "Posisjon"
 
-#: src/global.c:807
+#: src/global.c:815
 msgid "First Line"
 msgstr "Første linje"
 
-#: src/global.c:809
+#: src/global.c:817
 msgid "Last Line"
 msgstr "Siste linje"
 
-#: src/global.c:816
+#: src/global.c:824
 msgid "To Bracket"
 msgstr "Til klamme"
 
-#: src/global.c:819
+#: src/global.c:827
 msgid "Mark Text"
 msgstr "Marker tekst"
 
-#: src/global.c:822
+#: src/global.c:830
 msgid "Copy Text"
 msgstr "Kopier tekst"
 
-#: src/global.c:825
+#: src/global.c:833
 msgid "Indent Text"
 msgstr "Rykk inn tekst"
 
-#: src/global.c:827
+#: src/global.c:835
 msgid "Unindent Text"
 msgstr "Angre «innrykk»"
 
-#: src/global.c:830
+#: src/global.c:838
 msgid "Undo"
 msgstr "Angre"
 
-#: src/global.c:832
+#: src/global.c:840
 msgid "Redo"
 msgstr "Gjør om"
 
-#: src/global.c:836 src/global.c:842
+#: src/global.c:844 src/global.c:850
 msgid "Back"
 msgstr "Bakover"
 
-#: src/global.c:838 src/global.c:844
+#: src/global.c:846 src/global.c:852
 msgid "Forward"
 msgstr "Fremover"
 
-#: src/global.c:849
+#: src/global.c:857
 msgid "Prev Word"
 msgstr "Forrige ord"
 
-#: src/global.c:851
+#: src/global.c:859
 msgid "Next Word"
 msgstr "Neste ord"
 
-#: src/global.c:855
+#: src/global.c:863
 msgid "Home"
 msgstr "Hjem"
 
-#: src/global.c:857
+#: src/global.c:865
 msgid "End"
 msgstr "Bunn"
 
-#: src/global.c:866
+#: src/global.c:874
 msgid "Beg of Par"
 msgstr "Avsn. start"
 
-#: src/global.c:868
+#: src/global.c:876
 msgid "End of Par"
 msgstr "Avsn. slutt"
 
-#: src/global.c:873
+#: src/global.c:881
 msgid "Scroll Up"
 msgstr "Rull opp"
 
-#: src/global.c:875
+#: src/global.c:883
 msgid "Scroll Down"
 msgstr "Rull ned"
 
-#: src/global.c:880
+#: src/global.c:888
 msgid "Prev File"
 msgstr "Forrige fil"
 
-#: src/global.c:882
+#: src/global.c:890
 msgid "Next File"
 msgstr "Neste fil"
 
-#: src/global.c:891
+#: src/global.c:899
 msgid "Verbatim"
 msgstr "Ordrett"
 
-#: src/global.c:894
+#: src/global.c:902
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:896
+#: src/global.c:904
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:899
+#: src/global.c:907
 msgid "Delete"
 msgstr "Slett"
 
-#: src/global.c:901
+#: src/global.c:909
 msgid "Backspace"
 msgstr "Slettetast"
 
 #. TRANSLATORS: The next two strings refer to cutting words.
-#: src/global.c:912
+#: src/global.c:920
 msgid "Cut Left"
 msgstr "Kutt venstre"
 
-#: src/global.c:914
+#: src/global.c:922
 msgid "Cut Right"
 msgstr "Kutt høyre"
 
-#: src/global.c:916
+#: src/global.c:924
 msgid "CutTillEnd"
 msgstr "Kutt Til Slutt"
 
-#: src/global.c:926
+#: src/global.c:934
 msgid "Word Count"
 msgstr "Antall ord"
 
-#: src/global.c:933
+#: src/global.c:941
 msgid "Suspend"
 msgstr "Suspender"
 
-#: src/global.c:937
+#: src/global.c:945
+#, fuzzy
+msgid "Comment Lines"
+msgstr "Siste linje"
+
+#: src/global.c:949
 msgid "Save"
 msgstr "Lagre"
 
-#: src/global.c:940
+#: src/global.c:952
 msgid "Previous"
 msgstr "Forige"
 
-#: src/global.c:942
+#: src/global.c:954
 msgid "Next"
 msgstr "Neste"
 
-#: src/global.c:948
+#: src/global.c:960
 msgid "PrevHstory"
 msgstr "ForrigeHistorie"
 
-#: src/global.c:951
+#: src/global.c:963
 msgid "NextHstory"
 msgstr "NesteHistorie"
 
-#: src/global.c:955
+#: src/global.c:972
 msgid "Go To Text"
 msgstr "GÃ¥ til tekst"
 
-#: src/global.c:959
+#: src/global.c:976
 msgid "DOS Format"
 msgstr "DOS Format"
 
-#: src/global.c:961
+#: src/global.c:978
 msgid "Mac Format"
 msgstr "Mac Format"
 
-#: src/global.c:969
+#: src/global.c:986
 msgid "Append"
 msgstr "Legg til etter"
 
-#: src/global.c:971
+#: src/global.c:988
 msgid "Prepend"
 msgstr "Legg til før"
 
-#: src/global.c:974
+#: src/global.c:991
 msgid "Backup File"
 msgstr "Sikkerhetskopi"
 
-#: src/global.c:981
+#: src/global.c:998
 msgid "Execute Command"
 msgstr "Eksekver kommando"
 
-#: src/global.c:996
+#: src/global.c:1013
 msgid "To Files"
 msgstr "Til filer"
 
-#: src/global.c:1004
+#: src/global.c:1021
 msgid "First File"
 msgstr "Første fil"
 
-#: src/global.c:1006
+#: src/global.c:1023
 msgid "Last File"
 msgstr "Siste fil"
 
-#: src/global.c:1010
+#: src/global.c:1027
 msgid "Discard buffer"
 msgstr "Forkast buffer"
 
+#: src/global.c:1038
+msgid "Left Column"
+msgstr ""
+
+#: src/global.c:1040
+msgid "Right Column"
+msgstr ""
+
 #. TRANSLATORS: Try to keep the next two strings at most 20 characters.
-#: src/global.c:1020
+#: src/global.c:1047
 msgid "Prev Lint Msg"
 msgstr "Forrige Lint-melding"
 
-#: src/global.c:1022
+#: src/global.c:1049
 msgid "Next Lint Msg"
 msgstr "Neste Lint-melding"
 
 #. TRANSLATORS: The next seventeen strings are toggle descriptions;
 #. * they are best kept shorter than 40 characters, but may be longer.
-#: src/global.c:1285
+#: src/global.c:1316
 msgid "Help mode"
 msgstr "Hjelp-modus"
 
-#: src/global.c:1287
+#: src/global.c:1318
 msgid "Constant cursor position display"
 msgstr "Lås markørposisjon"
 
-#: src/global.c:1289
+#: src/global.c:1320
 msgid "Use of one more line for editing"
 msgstr "Bruk mer plass til editering"
 
-#: src/global.c:1291
+#: src/global.c:1322
 msgid "Smooth scrolling"
 msgstr "Jevn tekstrulling"
 
-#: src/global.c:1293
+#: src/global.c:1324
 msgid "Soft wrapping of overlong lines"
 msgstr "Myk bryting av lange linjer"
 
-#: src/global.c:1295
+#: src/global.c:1326
 msgid "Whitespace display"
 msgstr "Vis usynlige tegn (mellomrom, tab, linjeskift osv.)"
 
-#: src/global.c:1297
+#: src/global.c:1328
 msgid "Color syntax highlighting"
 msgstr "Fremhev syntaks ved hjelp av farger"
 
-#: src/global.c:1299
+#: src/global.c:1330
 msgid "Smart home key"
 msgstr "Smart home tast"
 
-#: src/global.c:1301
+#: src/global.c:1332
 msgid "Auto indent"
 msgstr "Automatisk indentering"
 
-#: src/global.c:1303
+#: src/global.c:1334
 msgid "Cut to end"
 msgstr "Klipp til slutten"
 
-#: src/global.c:1305
+#: src/global.c:1336
 msgid "Hard wrapping of overlong lines"
 msgstr "Hard bryting av lange linjer"
 
-#: src/global.c:1307
+#: src/global.c:1338
 msgid "Conversion of typed tabs to spaces"
 msgstr "Konverter tabulator til mellomslag"
 
-#: src/global.c:1309
+#: src/global.c:1340
 msgid "Backup files"
 msgstr "Sikkerhetskopier"
 
-#: src/global.c:1311
+#: src/global.c:1342
 msgid "Reading file into separate buffer"
 msgstr "Leser filen inn i egen buffer"
 
-#: src/global.c:1313
+#: src/global.c:1344
 msgid "Mouse support"
 msgstr "Musestøtte"
 
-#: src/global.c:1315
+#: src/global.c:1346
 msgid "No conversion from DOS/Mac format"
 msgstr "Ingen konvertering fra DOS/Mac format"
 
-#: src/global.c:1317
+#: src/global.c:1348
 msgid "Suspension"
 msgstr "Legg i bakgrunnen"
 
-#: src/help.c:209
+#: src/help.c:211
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1167,7 +1177,7 @@ msgstr ""
 "Forrige søketekst vises i braketter etter søkepromptet. Trykk linjeskift "
 "uten å skrive inn ny søketekst for å gjenta forrige søk."
 
-#: src/help.c:218
+#: src/help.c:220
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1180,7 +1190,7 @@ msgstr ""
 "\n"
 "Følgende funksjonstaster er tilgjengelig i Søkemodus:\n"
 
-#: src/help.c:224
+#: src/help.c:226
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1200,7 +1210,7 @@ msgstr ""
 "Følgende funksjonstaster er tilgjengelig i Gå Til Linje modus:\n"
 "\n"
 
-#: src/help.c:233
+#: src/help.c:235
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1222,7 +1232,7 @@ msgstr ""
 "eller i nanorc filen vil filen som settes inn lastes i et eget buffer. Bruk "
 "Meta-< og > til å bytte mellom buffer."
 
-#: src/help.c:242
+#: src/help.c:244
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1236,7 +1246,7 @@ msgstr ""
 "\n"
 " Følgende funksjonstaster er tilgjengelig i Sett Inn Fil modus.\n"
 
-#: src/help.c:248
+#: src/help.c:250
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1262,7 +1272,7 @@ msgstr ""
 "Følgende funksjonstaster er tilgjengelig i Lagre Fil modus:\n"
 "\n"
 
-#: src/help.c:262
+#: src/help.c:264
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1286,7 +1296,7 @@ msgstr ""
 "Følgende funksjonstaster er tilgjengelig i fil-leseren: \n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:277
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1308,7 +1318,7 @@ msgstr ""
 "Forrige søketekst vises i braketter etter søkepromptet. Trykk linjeskift "
 "uten å skrive inn ny søketekst for å gjenta forrige søk.\n"
 
-#: src/help.c:284
+#: src/help.c:286
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1316,7 +1326,7 @@ msgstr ""
 "Følgende funksjontaster er tilgjengelig i søkemodus:\\\n"
 "\n"
 
-#: src/help.c:288
+#: src/help.c:290
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1337,7 +1347,7 @@ msgstr ""
 "\n"
 "Følgende funksjonstaster er definert for Gå til Dir modus:\n"
 
-#: src/help.c:301
+#: src/help.c:303
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1361,7 +1371,7 @@ msgstr ""
 "Følgende funksjonstaster er definert for stavekontroll modus:\n"
 "\n"
 
-#: src/help.c:316
+#: src/help.c:318
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1381,7 +1391,7 @@ msgstr ""
 "Følgende funksjonstaster er definert for Kjør Kommando-modus:\n"
 "\n"
 
-#: src/help.c:329
+#: src/help.c:331
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1404,15 +1414,15 @@ msgstr ""
 "\n"
 " "
 
-#: src/help.c:339
+#: src/help.c:341
+#, fuzzy
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
-" The notation for shortcuts is as follows: Control-key sequences are notated "
-"with a caret (^) symbol and can be entered either by using the Control "
-"(Ctrl) key or pressing the Escape (Esc) key twice.  Escape-key sequences are "
-"notated with the Meta (M-) symbol and can be entered using either the Esc, "
-"Alt, or Meta key depending on your keyboard setup.  "
+" Shortcuts are written as follows: Control-key sequences are notated with a "
+"'^' and can be entered either by using the Ctrl key or pressing the Esc key "
+"twice.  Meta-key sequences are notated with 'M-' and can be entered using "
+"either the Alt, Cmd, or Esc key, depending on your keyboard setup.  "
 msgstr ""
 "De to nederste linjene viser de meste brukte kommandosnarveiene i "
 "programmet.\n"
@@ -1440,19 +1450,19 @@ msgstr ""
 msgid "enable/disable"
 msgstr "skru på/av"
 
-#: src/nano.c:559
+#: src/nano.c:560
 msgid "Key is invalid in view mode"
 msgstr "Tasten ugyldig i visninsmodus"
 
-#: src/nano.c:565
+#: src/nano.c:566
 msgid "This function is disabled in restricted mode"
 msgstr "Denne funksjonen er deaktivert i begrenset modus"
 
-#: src/nano.c:573
+#: src/nano.c:574
 msgid "Help is not available"
 msgstr "Hjelp er ikke tilgjengelig"
 
-#: src/nano.c:684
+#: src/nano.c:686
 #, c-format
 msgid ""
 "\n"
@@ -1461,7 +1471,7 @@ msgstr ""
 "\n"
 "Buffer lagret til %s\n"
 
-#: src/nano.c:686
+#: src/nano.c:688
 #, c-format
 msgid ""
 "\n"
@@ -1470,7 +1480,7 @@ msgstr ""
 "\n"
 "Buffer ble ikke lagret til %s: %s\n"
 
-#: src/nano.c:689
+#: src/nano.c:691
 #, c-format
 msgid ""
 "\n"
@@ -1732,17 +1742,22 @@ msgstr "Tillat suspendering"
 msgid "Enable soft line wrapping"
 msgstr "Aktiver myk linjebryting"
 
-#: src/nano.c:937
-#, c-format
-msgid " GNU nano, version %s\n"
+#: src/nano.c:940
+#, fuzzy, c-format
+msgid " nano, version %s\n"
 msgstr "GNU nano, versjon %s\n"
 
-#: src/nano.c:940
+#: src/nano.c:943
+#, c-format
+msgid " (C) 2014..%s the contributors to nano\n"
+msgstr ""
+
+#: src/nano.c:945
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr "Epost: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 
-#: src/nano.c:941
+#: src/nano.c:946
 #, c-format
 msgid ""
 "\n"
@@ -1751,67 +1766,82 @@ msgstr ""
 "\n"
 " Kompilerte opsjoner:"
 
-#: src/nano.c:1073
+#: src/nano.c:1081
 msgid "No file name"
 msgstr "Ingen filnavn"
 
-#: src/nano.c:1108
-msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
-msgstr "Lagre endret buffer («NEI» VIL ØDELEGGE ENDRINGENR) ? "
+#: src/nano.c:1115
+msgid "Save modified buffer?  (Answering \"No\" will DISCARD changes.) "
+msgstr ""
 
-#: src/nano.c:1168
+#: src/nano.c:1178
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "Kunne ikke gjenåpne standard inn fra tastaturet, beklager\n"
 
-#: src/nano.c:1192
+#: src/nano.c:1202
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "Leser fra standard inn, ^C for å avbryte\n"
 
-#: src/nano.c:1256
+#: src/nano.c:1266
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Mottok SIGHUP eller SIGTERM\n"
 
-#: src/nano.c:1272
+#: src/nano.c:1282
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Bruk «fg» for å returnere til nano\n"
 
-#: src/nano.c:1294
+#: src/nano.c:1304
 msgid "Suspension is not enabled"
 msgstr "Suspensjon er ikke aktivert"
 
-#: src/nano.c:1448
+#: src/nano.c:1459
 msgid "enabled"
 msgstr "på"
 
-#: src/nano.c:1448
+#: src/nano.c:1459
 msgid "disabled"
 msgstr "av"
 
-#: src/nano.c:1607 src/winio.c:1125
-msgid "Unknown Command"
-msgstr "Ukjent kommando"
+#: src/nano.c:1573
+msgid "Unbound key"
+msgstr ""
+
+#: src/nano.c:1577
+#, c-format
+msgid "Unbound key: M-%c"
+msgstr ""
+
+#: src/nano.c:1579
+#, c-format
+msgid "Unbound key: ^%c"
+msgstr ""
 
-#: src/nano.c:1720
+#: src/nano.c:1581
+#, c-format
+msgid "Unbound key: %c"
+msgstr ""
+
+#: src/nano.c:1745
 msgid "XON ignored, mumble mumble"
 msgstr "XON ignorert, mumle mumle."
 
-#: src/nano.c:1725
+#: src/nano.c:1750
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF ignorert, mumle mumle."
 
-#: src/nano.c:2139 src/rcfile.c:1334
+#: src/nano.c:2166 src/rcfile.c:1187
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Angitt tabulatorstørrelse «%s» er ugyldig"
 
-#: src/nano.c:2200 src/rcfile.c:1259
+#: src/nano.c:2227 src/rcfile.c:1128
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Foreslått fyllbredde «%s» er ugyldig"
 
-#: src/nano.c:2247
+#: src/nano.c:2276
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr "Skriv «%s -»' for en liste over tilgjengelige alternativer.\n"
@@ -1819,114 +1849,118 @@ msgstr "Skriv «%s -»' for en liste over tilgjengelige alternativer.\n"
 #. TRANSLATORS: For the next three strings, if possible, specify
 #. * the single-byte shortcuts for both your language and English.
 #. * For example, in French: "OoYy" for "Oui".
-#: src/prompt.c:821
+#: src/prompt.c:818
 msgid "Yy"
 msgstr "JjYy"
 
-#: src/prompt.c:822
+#: src/prompt.c:819
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:823
+#: src/prompt.c:820
 msgid "Aa"
 msgstr "Aa"
 
-#: src/prompt.c:845
+#: src/prompt.c:842
 msgid "Yes"
 msgstr "Ja"
 
-#: src/prompt.c:850
+#: src/prompt.c:847
 msgid "All"
 msgstr "Alle"
 
-#: src/prompt.c:855
+#: src/prompt.c:852
 msgid "No"
 msgstr "Nei"
 
-#: src/rcfile.c:142
+#: src/rcfile.c:144
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Feil i %s på linje %lu: "
 
-#: src/rcfile.c:201
+#: src/rcfile.c:203
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "Argument '%s' har en uterminert \""
 
-#: src/rcfile.c:228 src/rcfile.c:280 src/rcfile.c:732 src/rcfile.c:793
-#: src/rcfile.c:882 src/rcfile.c:933
+#: src/rcfile.c:231 src/rcfile.c:674 src/rcfile.c:725 src/rcfile.c:824
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Strenger med reg-uttrykk må begynne med et \"-tegn"
 
-#: src/rcfile.c:254 src/search.c:62
+#: src/rcfile.c:257 src/search.c:61
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Ugyldig reg-uttrykk «%s»: %s"
 
-#: src/rcfile.c:274
+#: src/rcfile.c:279
 msgid "Missing syntax name"
 msgstr "Mangler syntaksnavn"
 
-#: src/rcfile.c:345
+#: src/rcfile.c:288
+msgid "A syntax name must be quoted"
+msgstr ""
+
+#: src/rcfile.c:297
 msgid "The \"none\" syntax is reserved"
 msgstr "Syntaksen «none» (ingen) er reservert"
 
-#: src/rcfile.c:352
-msgid "The \"default\" syntax must take no extensions"
+#: src/rcfile.c:327
+#, fuzzy
+msgid "The \"default\" syntax does not accept extensions"
 msgstr "Syntaksen «default» (forvalgt) kan ikke ta utvidelser"
 
-#: src/rcfile.c:424
+#: src/rcfile.c:369
 msgid "Missing key name"
 msgstr "Mangler tastenavn"
 
-#: src/rcfile.c:433 src/rcfile.c:444
+#: src/rcfile.c:378 src/rcfile.c:389
 msgid "Key name is too short"
 msgstr "Tastenavnet er for kort"
 
-#: src/rcfile.c:454
+#: src/rcfile.c:399
 msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr "Tastebindinger må begynne med «^», «M», eller «F»"
 
-#: src/rcfile.c:457
+#: src/rcfile.c:402
 #, c-format
 msgid "Key name %s is invalid"
 msgstr "Nøkkelnavn «%s» er ugyldig"
 
-#: src/rcfile.c:466
+#: src/rcfile.c:411
 msgid "Must specify a function to bind the key to"
 msgstr "Må spesifisere en funksjon å binde tasten til"
 
 #. TRANSLATORS: Do not translate the word "all".
-#: src/rcfile.c:476
+#: src/rcfile.c:421
 msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr "Må spesifisere en meny (eller «alle») i å binde / frigi tasten"
 
-#: src/rcfile.c:483
+#: src/rcfile.c:428
 #, c-format
 msgid "Cannot map name \"%s\" to a function"
 msgstr "Kunne ikke tilordne navn «%s» til en funksjon"
 
-#: src/rcfile.c:490
+#: src/rcfile.c:435
 #, c-format
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "Kunne ikke tilordne navn «%s» til en meny"
 
-#: src/rcfile.c:522
+#: src/rcfile.c:467
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr "Funksjon «%s» eksisterer ikke i meny «%s»"
 
-#: src/rcfile.c:534
+#: src/rcfile.c:479
 #, c-format
 msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "Beklager, tastekombinasjonen «%s» kan ikke rebindes"
 
-#: src/rcfile.c:631
+#: src/rcfile.c:576
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr "Feil ved utviding %s: %s"
 
-#: src/rcfile.c:674
+#: src/rcfile.c:616
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1942,61 +1976,50 @@ msgstr ""
 "(sort), med valgfritt prefiks «bright» (lys)\n"
 "på forgrunnsfarver."
 
-#: src/rcfile.c:696
-msgid "Cannot add a color command without a syntax command"
-msgstr "Kan ikke legge til et fargedirektiv uten en syntakskommando"
+#: src/rcfile.c:637 src/rcfile.c:795 src/rcfile.c:858
+#, c-format
+msgid "A '%s' command requires a preceding 'syntax' command"
+msgstr ""
 
-#: src/rcfile.c:701
+#: src/rcfile.c:643
 msgid "Missing color name"
 msgstr "Mangler farvenavn"
 
-#: src/rcfile.c:711 src/rcfile.c:872
-msgid "Missing regex string"
-msgstr "Regulært uttrykk mangler"
+#: src/rcfile.c:653 src/rcfile.c:807
+#, fuzzy, c-format
+msgid "Missing regex string after '%s' command"
+msgstr "Mangler linter-kommando"
 
-#: src/rcfile.c:787
+#: src/rcfile.c:719
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "«start=» forutsetter et korresponderende «end=»"
 
-#: src/rcfile.c:839
+#: src/rcfile.c:768
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
 msgstr "Bakgrunnsfargen %s kan ikke være lys"
 
-#: src/rcfile.c:867
-msgid "Cannot add a header regex without a syntax command"
-msgstr "Kan ikke legge til topptekst-regex uten syntakskommando"
-
-#: src/rcfile.c:922
-msgid "Cannot add a magic string regex without a syntax command"
-msgstr "Kan ikke legge til en magisk regulær-streng uten syntakskommando"
-
-#: src/rcfile.c:927
-msgid "Missing magic string name"
-msgstr "Mangler magisk strengnavn"
-
-#: src/rcfile.c:985
-msgid "Cannot add a linter without a syntax command"
-msgstr "Kan ikke legge til linter uten en syntakskommando"
+#: src/rcfile.c:802
+#, fuzzy, c-format
+msgid "The \"default\" syntax does not accept '%s' regexes"
+msgstr "Syntaksen «default» (forvalgt) kan ikke ta utvidelser"
 
-#: src/rcfile.c:990
-msgid "Missing linter command"
+#: src/rcfile.c:863
+#, fuzzy, c-format
+msgid "Missing command after '%s'"
 msgstr "Mangler linter-kommando"
 
-#: src/rcfile.c:1011
-msgid "Cannot add formatter without a syntax command"
-msgstr "Kan ikke legge til formaterer uten en syntakskommando"
-
-#: src/rcfile.c:1016
-msgid "Missing formatter command"
-msgstr "Mangler formaterer-kommando"
+#: src/rcfile.c:879
+#, fuzzy, c-format
+msgid "Argument of '%s' lacks closing \""
+msgstr "Argument '%s' har en uterminert \""
 
-#: src/rcfile.c:1046
+#: src/rcfile.c:910
 #, c-format
 msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr "Fatal feil: ingen taster kartlagt for funksjon «%s», avslutter.\n"
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:912
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
@@ -2004,62 +2027,62 @@ msgstr ""
 "Hvis nødvendig, bruk nano med -I alternativ for å justere nanorc-"
 "innstillinger.\n"
 
-#: src/rcfile.c:1109
+#: src/rcfile.c:971
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "Kunne ikke finne syntax «%s» å forlenge"
 
-#: src/rcfile.c:1125 src/rcfile.c:1134 src/rcfile.c:1144
-#, c-format
-msgid "Command \"%s\" not allowed in included file"
-msgstr "Kommandoen «%s» tillates ikke i inkludert fil"
-
-#: src/rcfile.c:1150 src/rcfile.c:1359
+#: src/rcfile.c:993 src/rcfile.c:1202
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Syntaksen «%s» har ingen fargekommandoer"
 
-#: src/rcfile.c:1180
+#: src/rcfile.c:1024
+#, c-format
+msgid "Command \"%s\" not allowed in included file"
+msgstr "Kommandoen «%s» tillates ikke i inkludert fil"
+
+#: src/rcfile.c:1039
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "kommando «%s» ikke forstått"
 
-#: src/rcfile.c:1195
+#: src/rcfile.c:1051
 msgid "Missing option"
 msgstr "Mangler flagg"
 
-#: src/rcfile.c:1217
+#: src/rcfile.c:1065
+#, c-format
+msgid "Unknown option \"%s\""
+msgstr "Ukjent flagg «%s»"
+
+#: src/rcfile.c:1077
+#, c-format
+msgid "Cannot unset option \"%s\""
+msgstr "Kan ikke tilbakestille flagg «%s»"
+
+#: src/rcfile.c:1089
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Valg «%s» krever et argument"
 
-#: src/rcfile.c:1235
+#: src/rcfile.c:1105
 msgid "Option is not a valid multibyte string"
 msgstr "Brukervalget er ikke gyldig for flerbyte strenger"
 
-#: src/rcfile.c:1272 src/rcfile.c:1300 src/rcfile.c:1309
+#: src/rcfile.c:1139 src/rcfile.c:1160 src/rcfile.c:1167
 msgid "Non-blank characters required"
 msgstr "MÃ¥ ha tegn som ikke er tabulator eller mellomslag"
 
-#: src/rcfile.c:1282
+#: src/rcfile.c:1146
 msgid "Two single-column characters required"
 msgstr "To enkelt-tegn kreves"
 
-#: src/rcfile.c:1348
-#, c-format
-msgid "Cannot unset option \"%s\""
-msgstr "Kan ikke tilbakestille flagg «%s»"
-
-#: src/rcfile.c:1354
-#, c-format
-msgid "Unknown option \"%s\""
-msgstr "Ukjent flagg «%s»"
-
-#: src/rcfile.c:1413
+#: src/rcfile.c:1258
 msgid "I can't find my home directory!  Wah!"
 msgstr "Finner ikke hjemmekatalogen! Buhu!"
 
-#: src/rcfile.c:1451
+#: src/rcfile.c:1295
 #, c-format
 msgid ""
 "\n"
@@ -2068,44 +2091,49 @@ msgstr ""
 "\n"
 "Trykk linjeskift for å fortsette oppstarten av nano\n"
 
-#: src/search.c:96
+#: src/search.c:95
 #, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "«%.*s%s» ikke funnet"
 
 #. TRANSLATORS: The next three strings are modifiers of the search prompt.
-#: src/search.c:176
+#: src/search.c:169
 msgid " [Case Sensitive]"
 msgstr " [Ta hensyn til store/små bokstaver]"
 
-#: src/search.c:180
+#: src/search.c:173
 msgid " [Regexp]"
 msgstr " [Regulært uttrykk]"
 
-#: src/search.c:184
+#: src/search.c:177
 msgid " [Backwards]"
 msgstr " [Bakover]"
 
 #. TRANSLATORS: The next two strings are modifiers of the search prompt.
-#: src/search.c:189
+#: src/search.c:182
 msgid " (to replace) in selection"
 msgstr " (Ã¥ erstatte) i seksjon"
 
-#: src/search.c:191
+#: src/search.c:184
 msgid " (to replace)"
 msgstr " (Ã¥ erstatte)"
 
+#: src/search.c:305
+#, fuzzy
+msgid "Searching..."
+msgstr "Søk"
+
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:718
+#: src/search.c:693
 msgid "Replace this instance?"
 msgstr "Erstatt dette tilfellet?"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:883
+#: src/search.c:840
 msgid "Replace with"
 msgstr "Erstatt med"
 
-#: src/search.c:924
+#: src/search.c:875
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
@@ -2113,294 +2141,392 @@ msgstr[0] "Erstattet %lu tilfelle"
 msgstr[1] "Erstattet %lu tilfeller"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:964
+#: src/search.c:914
 msgid "Enter line number, column number"
 msgstr "Skriv linjenummer, kolonnenummer"
 
-#: src/search.c:991
+#: src/search.c:939
 msgid "Invalid line or column number"
 msgstr "Ugyldig linje eller kolonnenummer"
 
-#: src/search.c:1124
+#: src/search.c:1080
 msgid "Not a bracket"
 msgstr "Ikke en klamme"
 
-#: src/search.c:1191
+#: src/search.c:1146
 msgid "No matching bracket"
 msgstr "Ingen matchende klamme"
 
-#: src/text.c:54
+#: src/text.c:53
 msgid "Mark Set"
 msgstr "Merke satt"
 
-#: src/text.c:58
+#: src/text.c:57
 msgid "Mark Unset"
 msgstr "Fjern merke"
 
-#: src/text.c:70
+#: src/text.c:69
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Feil ved start av «%s»"
 
-#: src/text.c:475
+#: src/text.c:468
+msgid "Commenting is not supported for this file type"
+msgstr ""
+
+#: src/text.c:484
+msgid "Cannot comment past end of file"
+msgstr ""
+
+#: src/text.c:677
 msgid "Nothing in undo buffer!"
 msgstr "Ingenting i angrebuffer!"
 
-#: src/text.c:481 src/text.c:634
-#, c-format
-msgid "Internal error: can't match line %d.  Please save your work."
-msgstr "Intern feil: kan ikke matche linje %d. Vennligst lagre arbeidet ditt"
-
 #. TRANSLATORS: Eight of the next nine strings describe actions
 #. * that are undone or redone.  It are all nouns, not verbs.
-#: src/text.c:495 src/text.c:524 src/text.c:645 src/text.c:686
+#: src/text.c:695 src/text.c:724 src/text.c:857 src/text.c:898
 msgid "text add"
 msgstr "Legg til tekst"
 
-#: src/text.c:505 src/text.c:656
+#: src/text.c:705 src/text.c:868
 msgid "text delete"
 msgstr "slett tekst"
 
-#: src/text.c:528 src/text.c:694
+#: src/text.c:728 src/text.c:907
 msgid "line join"
 msgstr "linjesammenføy"
 
-#: src/text.c:547 src/text.c:710
+#: src/text.c:747 src/text.c:923
 msgid "text cut"
 msgstr "klipp tekst"
 
-#: src/text.c:552 src/text.c:714
+#: src/text.c:752 src/text.c:927
 msgid "text uncut"
 msgstr "Angre «klipp ut»"
 
-#: src/text.c:558 src/text.c:691
+#: src/text.c:758 src/text.c:903
 msgid "Internal error: line is missing.  Please save your work."
 msgstr "Intern feil: linje mangler. Vennligst lagre arbeidet ditt."
 
-#: src/text.c:561 src/text.c:665
+#: src/text.c:762 src/text.c:877
 msgid "line break"
 msgstr "linjeskift"
 
-#: src/text.c:569 src/text.c:725
+#: src/text.c:772 src/text.c:947
+msgid "comment"
+msgstr ""
+
+#: src/text.c:776 src/text.c:951
+msgid "uncomment"
+msgstr ""
+
+#: src/text.c:780 src/text.c:938
 msgid "text insert"
 msgstr "sett inn tekst"
 
-#: src/text.c:589 src/text.c:718
+#: src/text.c:800 src/text.c:931
 msgid "text replace"
 msgstr "erstatt tekst"
 
-#: src/text.c:596 src/text.c:732 src/text.c:1030 src/text.c:1174
+#: src/text.c:807 src/text.c:955 src/text.c:1267 src/text.c:1437
 msgid "Internal error: unknown type.  Please save your work."
 msgstr "Intern feil: ukjent type. Vennligst lagre arbeidet ditt."
 
-#: src/text.c:601
+#: src/text.c:813
 #, c-format
 msgid "Undid action (%s)"
 msgstr "Angret handling (%s)"
 
-#: src/text.c:619
+#: src/text.c:832
 msgid "Nothing to re-do!"
 msgstr "Ingenting å omgjøre"
 
-#: src/text.c:628
+#: src/text.c:841
 msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
 "Intern feil: kan ikke sette opp Gjør om. Vennligst lagre arbeidet ditt."
 
-#: src/text.c:737
+#: src/text.c:961
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Omgjorde handling (%s)"
 
-#: src/text.c:827 src/text.c:2508 src/text.c:2944
+#: src/text.c:1051 src/text.c:2765 src/text.c:3198
 msgid "Could not create pipe"
 msgstr "Kunne ikke opprette pipe"
 
-#: src/text.c:853 src/text.c:2595 src/text.c:2750 src/text.c:2992
-#: src/text.c:3286
+#: src/text.c:1077 src/text.c:2852 src/text.c:3005 src/text.c:3246
+#: src/text.c:3540
 msgid "Could not fork"
 msgstr "Kunne ikke forke"
 
-#: src/text.c:1853
+#: src/text.c:2117
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Ugyldig kvoteringstekst %s: %s"
 
-#: src/text.c:2241
+#: src/text.c:2499
 msgid "Can now UnJustify!"
 msgstr "Du kan nå avjustere!"
 
-#: src/text.c:2435
+#: src/text.c:2697
 msgid "Edit a replacement"
 msgstr "Rediger erstatning"
 
-#: src/text.c:2510
+#. TRANSLATORS: Shown after fixing misspellings in one word.
+#: src/text.c:2713
+#, fuzzy
+msgid "Next word..."
+msgstr "Neste ord"
+
+#: src/text.c:2767
 msgid "Creating misspelled word list, please wait..."
 msgstr "Oppretter ordliste for feilstavelser, vennligst vent..."
 
-#: src/text.c:2601 src/text.c:2999
+#: src/text.c:2858 src/text.c:3253
 msgid "Could not get size of pipe buffer"
 msgstr "Kunne ikke finne størrelse på pipe buffer"
 
-#: src/text.c:2652
+#: src/text.c:2907
 msgid "Error invoking \"spell\""
 msgstr "Feil ved start av «ispell»"
 
-#: src/text.c:2655
+#: src/text.c:2910
 msgid "Error invoking \"sort -f\""
 msgstr "Feil ved start av zsort -f»"
 
-#: src/text.c:2658
+#: src/text.c:2913
 msgid "Error invoking \"uniq\""
 msgstr "Feil ved start av «uniq»"
 
-#: src/text.c:2881
+#: src/text.c:3135
 msgid "Invoking spell checker, please wait"
 msgstr "Start stavesjekk, vennligst vent"
 
-#: src/text.c:2897
+#: src/text.c:3151
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Stavekontroll feilet: %s"
 
-#: src/text.c:2899
+#: src/text.c:3153
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Stavekontroll feilet: %s: %s"
 
-#: src/text.c:2902
+#: src/text.c:3156
 msgid "Finished checking spelling"
 msgstr "Stavekontroll fullført"
 
-#: src/text.c:2927
+#: src/text.c:3181
 msgid "No linter defined for this type of file!"
 msgstr "Ingen linter definert for denne filtypen!"
 
-#: src/text.c:2932
+#: src/text.c:3186
 msgid "Save modified buffer before linting?"
 msgstr "Lagre endret buffer før linting?"
 
-#: src/text.c:2949
+#: src/text.c:3203
 msgid "Invoking linter, please wait"
 msgstr "Starter linter, vennligst vent"
 
-#: src/text.c:3105
+#: src/text.c:3358
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr "Fikk 0 maskinlesbare linjer fra kommando: %s"
 
-#: src/text.c:3134
+#: src/text.c:3388
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr "Denne meldingen er for uåpnet fil %s, åpne den i en ny buffer?"
 
-#: src/text.c:3153
+#: src/text.c:3407
 msgid "No more errors in unopened files, cancelling"
 msgstr "Ingen flere feil i uåpnede filer, avbryter"
 
-#: src/text.c:3192
+#: src/text.c:3446
 msgid "At last message"
 msgstr "Ved siste melding"
 
-#: src/text.c:3197
+#: src/text.c:3451
 msgid "At first message"
 msgstr "Ved første melding"
 
-#: src/text.c:3237
+#: src/text.c:3491
 msgid "Finished"
 msgstr "Ferdig"
 
-#: src/text.c:3259
+#: src/text.c:3513
 msgid "Invoking formatter, please wait"
 msgstr "Starter formaterer, vennligst vent"
 
-#: src/text.c:3314
+#: src/text.c:3568
 msgid "Finished formatting"
 msgstr "Formatering ferdig"
 
-#: src/text.c:3396
+#: src/text.c:3650
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sOrd: %lu Linjer: %ld Tegn: %lu"
 
-#: src/text.c:3397
+#: src/text.c:3651
 msgid "In Selection:  "
 msgstr "I seksjon:  "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3411
+#: src/text.c:3665
 msgid "Verbatim Input"
 msgstr "Legg inn ord for ord"
 
-#: src/utils.c:391 src/utils.c:403
+#: src/utils.c:392 src/utils.c:404
 msgid "nano is out of memory!"
 msgstr "nano er tom for minne!"
 
+#: src/utils.c:625
+#, c-format
+msgid "Internal error: can't match line %d.  Please save your work."
+msgstr "Intern feil: kan ikke matche linje %d. Vennligst lagre arbeidet ditt"
+
+#. TRANSLATORS: This refers to a sequence of escape codes
+#. * (from the keyboard) that nano does not know about.
+#: src/winio.c:1121
+msgid "Unknown sequence"
+msgstr ""
+
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
 #: src/winio.c:1427
 msgid "Unicode Input"
 msgstr "Unikode inndata"
 
-#: src/winio.c:1991 src/winio.c:1995
-msgid "Modified"
-msgstr "Endret"
-
-#: src/winio.c:1992
-msgid "View"
-msgstr "Vis"
-
-#: src/winio.c:2006
+#: src/winio.c:1960
 msgid "DIR:"
 msgstr "KAT: "
 
-#: src/winio.c:2013
+#: src/winio.c:1968
 msgid "File:"
 msgstr "Fil:"
 
-#: src/winio.c:3141
+#: src/winio.c:1972 src/winio.c:1976
+msgid "Modified"
+msgstr "Endret"
+
+#: src/winio.c:1974
+msgid "View"
+msgstr "Vis"
+
+#: src/winio.c:3105
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "linje %ld/%ld (%d%%), kolonne %lu/%lu (%d%%), tegn %lu/%lu (%d%%)"
 
-#: src/winio.c:3271
+#: src/winio.c:3235
 msgid "The nano text editor"
 msgstr "Tekstbehandleren nano"
 
-#: src/winio.c:3272
+#: src/winio.c:3236
 msgid "version"
 msgstr "versjon"
 
-#: src/winio.c:3273
+#: src/winio.c:3237
 msgid "Brought to you by:"
 msgstr "Brakt til deg av:"
 
-#: src/winio.c:3274
+#: src/winio.c:3238
 msgid "Special thanks to:"
 msgstr "Mange takk til:"
 
 # Oversette dette ?
-#: src/winio.c:3275
+#: src/winio.c:3239
 msgid "The Free Software Foundation"
 msgstr "The Free Software Foundation"
 
-#: src/winio.c:3276
+#: src/winio.c:3240
 msgid "the many translators and the TP"
 msgstr "de mange oversettere og TP"
 
-#: src/winio.c:3277
+#: src/winio.c:3241
 msgid "For ncurses:"
 msgstr "For ncurses:"
 
-#: src/winio.c:3278
+#: src/winio.c:3242
 msgid "and anyone else we forgot..."
 msgstr "og alle de andre vi glemte..."
 
-#: src/winio.c:3279
+#: src/winio.c:3243
 msgid "Thank you for using nano!"
 msgstr "Takk for at du bruker nano!"
 
+#~ msgid ""
+#~ "Read %lu line (Converted from DOS and Mac format - Warning: No write "
+#~ "permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from DOS and Mac format - Warning: No write "
+#~ "permission)"
+#~ msgstr[0] ""
+#~ "Leste %lu linje (Konvertert fra DOS og Mac-format - Advarsel: Ingen "
+#~ "skrivetilgang)"
+#~ msgstr[1] ""
+#~ "Leste %lu linjer (Konvertert fra DOS og Mac-format - Advarsel: Ingen "
+#~ "skrivetilgang)"
+
+#~ msgid ""
+#~ "Read %lu line (Converted from Mac format - Warning: No write permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from Mac format - Warning: No write permission)"
+#~ msgstr[0] ""
+#~ "Leste %lu linje (Konvertert fra Mac-format - Advarsel: Ingen "
+#~ "skrivetilgang)"
+#~ msgstr[1] ""
+#~ "Leste %lu linjer (Konvertert fra Mac-format - Advarsel: Ingen "
+#~ "skrivetilgang)"
+
+#~ msgid ""
+#~ "Read %lu line (Converted from DOS format - Warning: No write permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from DOS format - Warning: No write permission)"
+#~ msgstr[0] ""
+#~ "Leste %lu linje (Konvertert fra DOS-format - Advarsel: Ingen "
+#~ "skrivetilgang)"
+#~ msgstr[1] ""
+#~ "Leste %lu linjer (Konvertert fra DOS-format - Advarsel: Ingen "
+#~ "skrivetilgang)"
+
+#~ msgid "Read %lu line (Warning: No write permission)"
+#~ msgid_plural "Read %lu lines (Warning: No write permission)"
+#~ msgstr[0] "Les %lu linje (Advarsel: Ingen skrivetilgang)"
+#~ msgstr[1] "Les %lu linjer (Advarsel: Ingen skrivetilgang)"
+
+#~ msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
+#~ msgstr "Lagre endret buffer («NEI» VIL ØDELEGGE ENDRINGENR) ? "
+
+#~ msgid "Unknown Command"
+#~ msgstr "Ukjent kommando"
+
+#~ msgid "Cannot add a color command without a syntax command"
+#~ msgstr "Kan ikke legge til et fargedirektiv uten en syntakskommando"
+
+#~ msgid "Missing regex string"
+#~ msgstr "Regulært uttrykk mangler"
+
+#~ msgid "Cannot add a header regex without a syntax command"
+#~ msgstr "Kan ikke legge til topptekst-regex uten syntakskommando"
+
+#~ msgid "Cannot add a magic string regex without a syntax command"
+#~ msgstr "Kan ikke legge til en magisk regulær-streng uten syntakskommando"
+
+#~ msgid "Missing magic string name"
+#~ msgstr "Mangler magisk strengnavn"
+
+#~ msgid "Cannot add a linter without a syntax command"
+#~ msgstr "Kan ikke legge til linter uten en syntakskommando"
+
+#~ msgid "Cannot add formatter without a syntax command"
+#~ msgstr "Kan ikke legge til formaterer uten en syntakskommando"
+
+#~ msgid "Missing formatter command"
+#~ msgstr "Mangler formaterer-kommando"
+
 #~ msgid "Cannot prepend or append to a symlink with --nofollow set"
 #~ msgstr ""
 #~ "Kan ikke prependere eller appendere til en symbolsk lenke med --nofollow "
diff --git a/po/nl.po b/po/nl.po
index 4a82ecf7..9cc1f368 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano-2.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-25 16:41-0500\n"
+"POT-Creation-Date: 2016-06-17 15:41+0200\n"
 "PO-Revision-Date: 2016-02-14 16:11+0100\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -24,367 +24,350 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Lokalize 1.0\n"
 
+#: src/browser.c:144 src/browser.c:284 src/browser.c:334 src/files.c:996
+#: src/files.c:1003 src/files.c:1794 src/files.c:1919 src/files.c:1963
+#: src/files.c:1983 src/files.c:2099 src/files.c:3019 src/files.c:3242
+#: src/rcfile.c:540 src/rcfile.c:1280
+#, c-format
+msgid "Error reading %s: %s"
+msgstr "Fout tijdens lezen van %s: %s"
+
 #. TRANSLATORS: This is a prompt.
-#: src/browser.c:220
+#: src/browser.c:247
 msgid "Go To Directory"
 msgstr "Naar map"
 
-#: src/browser.c:227 src/browser.c:738 src/files.c:1174 src/files.c:2340
-#: src/nano.c:1120 src/search.c:202 src/search.c:290 src/search.c:895
-#: src/search.c:970 src/text.c:2935 src/text.c:3142
+#: src/browser.c:254 src/browser.c:723 src/files.c:1126 src/files.c:2292
+#: src/nano.c:1128 src/search.c:195 src/search.c:297 src/search.c:851
+#: src/search.c:918 src/text.c:3189 src/text.c:3396
 msgid "Cancelled"
 msgstr "Geannuleerd"
 
-#: src/browser.c:253 src/browser.c:300
-#, c-format
-msgid "Can't go outside of %s in restricted mode"
+#. TRANSLATORS: This refers to the option --operatingdir,
+#. * not to --restricted.
+#: src/browser.c:274 src/browser.c:326
+#, fuzzy, c-format
+msgid "Can't go outside of %s in confined mode"
 msgstr "Kan in beperkte modus niet buiten %s gaan"
 
-#: src/browser.c:264 src/browser.c:310 src/browser.c:326 src/files.c:1044
-#: src/files.c:1052 src/files.c:1844 src/files.c:1971 src/files.c:2016
-#: src/files.c:2037 src/files.c:2156 src/files.c:3062 src/files.c:3285
-#: src/rcfile.c:596 src/rcfile.c:1435
-#, c-format
-msgid "Error reading %s: %s"
-msgstr "Fout tijdens lezen van %s: %s"
-
-#: src/browser.c:290
+#: src/browser.c:317
 msgid "Can't move up a directory"
 msgstr "Kan niet naar bovenliggende map gaan"
 
 #. TRANSLATORS: Try to keep this at most 7 characters.
-#: src/browser.c:615 src/browser.c:623
+#: src/browser.c:590 src/browser.c:598
 msgid "(dir)"
 msgstr "(map)"
 
 #. TRANSLATORS: Try to keep this at most 12 characters.
-#: src/browser.c:620
+#: src/browser.c:595
 msgid "(parent dir)"
 msgstr "(oudermap)"
 
 #. TRANSLATORS: Try to keep this at most 7 characters.
 #. * If necessary, you can leave out the parentheses.
-#: src/browser.c:650
+#: src/browser.c:625
 msgid "(huge)"
 msgstr "(enorm)"
 
 #. TRANSLATORS: This is the main search prompt.
-#: src/browser.c:727 src/search.c:173
+#: src/browser.c:712 src/search.c:166
 msgid "Search"
 msgstr "Zoeken"
 
-#: src/browser.c:777 src/search.c:466 src/search.c:536
-msgid "This is the only occurrence"
-msgstr "Dit is de enige overeenkomst"
-
-#: src/browser.c:793 src/search.c:364
+#: src/browser.c:754 src/search.c:368
 msgid "Search Wrapped"
 msgstr "Rondgelopen"
 
-#: src/browser.c:843 src/search.c:517
+#: src/browser.c:764 src/search.c:509
+msgid "This is the only occurrence"
+msgstr "Dit is de enige overeenkomst"
+
+#: src/browser.c:812 src/search.c:473
 msgid "No current search pattern"
 msgstr "Nog geen zoekpatroon bekend"
 
-#: src/files.c:50
+#: src/color.c:186
+#, fuzzy, c-format
+msgid "Unknown syntax name: %s"
+msgstr "Ontbrekende syntaxnaam"
+
+#: src/color.c:247
+#, c-format
+msgid "magic_load() failed: %s"
+msgstr ""
+
+#: src/color.c:251
+#, c-format
+msgid "magic_file(%s) failed: %s"
+msgstr ""
+
+#: src/files.c:47
 #, c-format
 msgid "Directory '%s' does not exist"
 msgstr "Map '%s' bestaat niet"
 
-#: src/files.c:52
+#: src/files.c:49
 #, c-format
 msgid "Path '%s': %s"
 msgstr "Pad '%s': %s"
 
-#: src/files.c:54
+#: src/files.c:51
 #, c-format
 msgid "Path '%s' is not a directory"
 msgstr "Pad '%s' is geen map"
 
-#: src/files.c:57
+#: src/files.c:53
 #, c-format
 msgid "Path '%s' is not accessible"
 msgstr "Pad '%s' is niet toegankelijk"
 
-#. TRANSLATORS: Try to keep this at most 76 characters.
-#: src/files.c:158
+#. TRANSLATORS: Keep the next ten messages at most 76 characters.
+#: src/files.c:148
 msgid ""
 "Warning: Modifying a file which is not locked, check directory permission?"
 msgstr ""
 "Waarschuwing: wijzigen van onvergrendeld bestand; maptoegangsrechten "
 "controleren?"
 
-#: src/files.c:197
+#: src/files.c:187
 msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
 msgstr ""
 "Kan eigen identiteit niet bepalen (voor vergrendelingsbestand; getpwuid() is "
 "mislukt)"
 
-#: src/files.c:206
+#: src/files.c:196
 #, c-format
 msgid "Couldn't determine hostname for lock file: %s"
 msgstr "Kan hostnaam voor vergrendelingsbestand niet bepalen: %s"
 
-#: src/files.c:227 src/files.c:238 src/files.c:275 src/files.c:285
+#: src/files.c:216 src/files.c:225 src/files.c:262 src/files.c:272
 #, c-format
 msgid "Error writing lock file %s: %s"
 msgstr "Fout bij schrijven van vergrendelingsbestand %s: %s"
 
-#: src/files.c:305
+#: src/files.c:291
 #, c-format
 msgid "Error deleting lock file %s: %s"
 msgstr "Fout bij verwijderen van vergrendelingsbestand %s: %s"
 
-#: src/files.c:341
+#: src/files.c:325
 #, c-format
 msgid "Error opening lock file %s: %s"
 msgstr "Fout bij openen van vergrendelingsbestand %s: %s"
 
-#: src/files.c:353
+#: src/files.c:337
 #, c-format
 msgid "Error reading lock file %s: Not enough data read"
 msgstr ""
 "Fout tijdens lezen van vergrendelingsbestand %s: niet genoeg gegevens gelezen"
 
 #. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
-#: src/files.c:371
+#: src/files.c:354
 #, c-format
 msgid "File %s is being edited (by %s with %s, PID %d); continue?"
 msgstr "Bestand %s wordt al bewerkt (door %s met %s, PID %d); doorgaan?"
 
-#: src/files.c:426
+#: src/files.c:430
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Kan bestand van buiten %s niet invoegen"
 
-#: src/files.c:439 src/files.c:1038 src/rcfile.c:589 src/rcfile.c:1385
-#: src/rcfile.c:1426
+#: src/files.c:445 src/files.c:991 src/rcfile.c:533 src/rcfile.c:1230
+#: src/rcfile.c:1271
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "'%s' is een map"
 
-#: src/files.c:441
+#: src/files.c:447
 #, c-format
 msgid "\"%s\" is not a normal file"
 msgstr "'%s' is geen gewoon bestand"
 
-#: src/files.c:566
+#: src/files.c:571
 msgid "No more open file buffers"
 msgstr "Geen andere open buffers"
 
-#: src/files.c:582
+#: src/files.c:586
 #, c-format
 msgid "Switched to %s"
 msgstr "Overgeschakeld naar %s"
 
-#: src/files.c:584 src/global.c:988 src/winio.c:2010
+#: src/files.c:588 src/global.c:1005 src/winio.c:1965
 msgid "New Buffer"
 msgstr "Nieuwe buffer"
 
-#: src/files.c:943
+#. TRANSLATORS: Keep the next four messages at most 76 characters.
+#: src/files.c:913
 #, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
 msgstr[0] "%lu regel gelezen (omgezet uit DOS- en Mac-indeling)"
 msgstr[1] "%lu regels gelezen (omgezet uit DOS- en Mac-indeling)"
 
-#: src/files.c:948
-#, c-format
-msgid ""
-"Read %lu line (Converted from DOS and Mac format - Warning: No write "
-"permission)"
-msgid_plural ""
-"Read %lu lines (Converted from DOS and Mac format - Warning: No write "
-"permission)"
-msgstr[0] ""
-"%lu regel gelezen (omgezet uit DOS+Mac-indeling -- MAAR: onschrijfbaar)"
-msgstr[1] ""
-"%lu regels gelezen (omgezet uit DOS+Mac-indeling -- MAAR: onschrijfbaar)"
-
-#: src/files.c:954
+#: src/files.c:919
 #, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
 msgstr[0] "%lu regel gelezen (omgezet uit Mac-indeling)"
 msgstr[1] "%lu regels gelezen (omgezet uit Mac-indeling)"
 
-#: src/files.c:958
-#, c-format
-msgid ""
-"Read %lu line (Converted from Mac format - Warning: No write permission)"
-msgid_plural ""
-"Read %lu lines (Converted from Mac format - Warning: No write permission)"
-msgstr[0] "%lu regel gelezen (omgezet uit Mac-indeling -- MAAR: onschrijfbaar)"
-msgstr[1] ""
-"%lu regels gelezen (omgezet uit Mac-indeling -- MAAR: onschrijfbaar)"
-
-#: src/files.c:964
+#: src/files.c:925
 #, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
 msgstr[0] "%lu regel gelezen (omgezet uit DOS-indeling)"
 msgstr[1] "%lu regels gelezen (omgezet uit DOS-indeling)"
 
-#: src/files.c:968
-#, c-format
-msgid ""
-"Read %lu line (Converted from DOS format - Warning: No write permission)"
-msgid_plural ""
-"Read %lu lines (Converted from DOS format - Warning: No write permission)"
-msgstr[0] "%lu regel gelezen (omgezet uit DOS-indeling -- MAAR: onschrijfbaar)"
-msgstr[1] ""
-"%lu regels gelezen (omgezet uit DOS-indeling -- MAAR: onschrijfbaar)"
-
-#: src/files.c:974
+#: src/files.c:930
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "%lu regel gelezen"
 msgstr[1] "%lu regels gelezen"
 
-#: src/files.c:977
-#, c-format
-msgid "Read %lu line (Warning: No write permission)"
-msgid_plural "Read %lu lines (Warning: No write permission)"
-msgstr[0] "%lu regel ingelezen  (MAAR: onschrijfbaar)"
-msgstr[1] "%lu regels ingelezen  (MAAR: onschrijfbaar)"
-
-#: src/files.c:1019 src/files.c:1056
+#: src/files.c:974 src/files.c:1006
 msgid "Reading File"
 msgstr "Inlezen van bestand"
 
-#: src/files.c:1025
+#: src/files.c:980
 msgid "New File"
 msgstr "Nieuw bestand"
 
-#: src/files.c:1028
-#, c-format
-msgid "\"%s\" not found"
+#: src/files.c:983
+#, fuzzy, c-format
+msgid "File \"%s\" not found"
 msgstr "'%s' is niet gevonden"
 
-#: src/files.c:1039 src/rcfile.c:590 src/rcfile.c:1386 src/rcfile.c:1427
+#: src/files.c:992 src/rcfile.c:534 src/rcfile.c:1231 src/rcfile.c:1272
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "'%s' is een apparaat"
 
-#: src/files.c:1133
+#: src/files.c:1083
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "In nieuwe buffer uit te voeren opdracht [vanuit %s] "
 
-#: src/files.c:1135
+#: src/files.c:1085
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Uit te voeren opdracht [vanuit %s] "
 
-#: src/files.c:1142
+#: src/files.c:1092
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "In nieuwe buffer in te voegen bestand [vanuit %s] "
 
-#: src/files.c:1144
+#: src/files.c:1094
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "In te voegen bestand [vanuit %s] "
 
-#: src/files.c:1389
+#: src/files.c:1338
 msgid "Key invalid in non-multibuffer mode"
 msgstr "In Kijkmodus is deze toets alleen geldig in multibuffermodus"
 
-#: src/files.c:1684
-msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+#: src/files.c:1632
+#, fuzzy
+msgid "Failed to write backup file; continue saving? (Say N if unsure.) "
 msgstr "Maken van reservekopie is mislukt; toch opslaan? (N als onzeker) "
 
-#: src/files.c:1800
+#: src/files.c:1750
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Kan buiten %s niets opslaan"
 
-#: src/files.c:1885 src/files.c:1910 src/files.c:1928 src/files.c:1941
-#: src/files.c:1952 src/files.c:1981
+#: src/files.c:1833 src/files.c:1858 src/files.c:1876 src/files.c:1889
+#: src/files.c:1900 src/files.c:1928
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Fout tijdens schrijven van reservekopiebestand %s: %s"
 
-#: src/files.c:1886 src/nano.c:690
+#: src/files.c:1834 src/nano.c:692
 msgid "Too many backup files?"
 msgstr "Te veel reservekopieën?"
 
-#: src/files.c:2026 src/text.c:2863 src/text.c:2875 src/text.c:3244
-#: src/text.c:3253
+#: src/files.c:1972 src/text.c:3117 src/text.c:3129 src/text.c:3498
+#: src/text.c:3507
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Fout tijdens schrijven van tijdelijk bestand: %s"
 
-#: src/files.c:2049 src/files.c:2068 src/files.c:2080 src/files.c:2104
-#: src/files.c:2121 src/files.c:2131 src/files.c:2164 src/files.c:2171
+#: src/files.c:1994 src/files.c:2013 src/files.c:2023 src/files.c:2047
+#: src/files.c:2064 src/files.c:2074 src/files.c:2106 src/files.c:2113
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Fout tijdens schrijven van %s: %s"
 
-#: src/files.c:2200
+#: src/files.c:2154
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "%lu regel geschreven"
 msgstr[1] "%lu regels geschreven"
 
-#: src/files.c:2299
+#: src/files.c:2249
 msgid " [DOS Format]"
 msgstr " [DOS-indeling]"
 
-#: src/files.c:2300
+#: src/files.c:2250
 msgid " [Mac Format]"
 msgstr " [Mac-indeling]"
 
-#: src/files.c:2302
+#: src/files.c:2252
 msgid " [Backup]"
 msgstr " [Kopie maken]"
 
-#: src/files.c:2309
+#: src/files.c:2259
 msgid "Prepend Selection to File"
 msgstr "Selectie toevoegen vooraan bestand"
 
-#: src/files.c:2310
+#: src/files.c:2260
 msgid "Append Selection to File"
 msgstr "Selectie toevoegen achteraan bestand"
 
-#: src/files.c:2311
+#: src/files.c:2261
 msgid "Write Selection to File"
 msgstr "Selectie opslaan in bestand"
 
-#: src/files.c:2314
+#: src/files.c:2264
 msgid "File Name to Prepend to"
 msgstr "Vooraan toevoegen aan bestand"
 
-#: src/files.c:2315
+#: src/files.c:2265
 msgid "File Name to Append to"
 msgstr "Achteraan toevoegen aan bestand"
 
-#: src/files.c:2316
+#: src/files.c:2266
 msgid "File Name to Write"
 msgstr "Opslaan in bestand"
 
-#: src/files.c:2349
-msgid "Save modified buffer anyway ? "
+#: src/files.c:2301
+#, fuzzy
+msgid "Save modified buffer anyway? "
 msgstr "Gewijzigd buffer toch opslaan? "
 
-#: src/files.c:2457
-msgid "File exists, OVERWRITE ? "
-msgstr "Bestand bestaat al; OVERSCHRIJVEN? "
-
-#: src/files.c:2466
-msgid "Save file under DIFFERENT NAME ? "
+#: src/files.c:2412
+#, fuzzy
+msgid "Save file under DIFFERENT NAME? "
 msgstr "Bestand opslaan onder een ANDERE NAAM? "
 
-#: src/files.c:2480
-msgid "File was modified since you opened it, continue saving ? "
+#: src/files.c:2420
+#, fuzzy, c-format
+msgid "File \"%s\" exists; OVERWRITE? "
+msgstr "Bestand bestaat al; OVERSCHRIJVEN? "
+
+#: src/files.c:2441
+#, fuzzy
+msgid "File was modified since you opened it; continue saving? "
 msgstr "Bestand is gewijzigd na opening; doorgaan met opslaan? "
 
-#: src/files.c:2917
+#: src/files.c:2874
 msgid "(more)"
 msgstr "(meer)"
 
-#: src/files.c:3004
+#: src/files.c:2959
 #, c-format
 msgid ""
 "\n"
@@ -393,7 +376,7 @@ msgstr ""
 "\n"
 "Druk op Enter om verder te gaan.\n"
 
-#: src/files.c:3020
+#: src/files.c:2975
 #, c-format
 msgid ""
 "Unable to create directory %s: %s\n"
@@ -403,7 +386,7 @@ msgstr ""
 "Deze is vereist voor opslaan en inlezen van zoekgeschiedenis en "
 "cursorposities.\n"
 
-#: src/files.c:3026
+#: src/files.c:2982
 #, c-format
 msgid ""
 "Path %s is not a directory and needs to be.\n"
@@ -413,7 +396,7 @@ msgstr ""
 "Nano kan nu de zoekgeschiedenis en cursorposities niet opslaan noch "
 "inlezen.\n"
 
-#: src/files.c:3045
+#: src/files.c:3002
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I tried to move\n"
@@ -423,7 +406,7 @@ msgstr ""
 "maar bij het verplaatsen ervan naar de voorkeurslocatie (%s)\n"
 "trad er een fout op: %s"
 
-#: src/files.c:3049
+#: src/files.c:3006
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I moved\n"
@@ -434,723 +417,754 @@ msgstr ""
 "deze is nu naar de voorkeurslocatie (%s) verplaatst.\n"
 "(Zie de nano-FAQ voor uitleg over deze verandering.)"
 
-#: src/files.c:3132 src/files.c:3140 src/files.c:3164 src/files.c:3176
+#: src/files.c:3089 src/files.c:3097 src/files.c:3121 src/files.c:3133
 #, c-format
 msgid "Error writing %s: %s\n"
 msgstr "Fout tijdens schrijven van %s: %s\n"
 
 #. TRANSLATORS: Try to keep the next fifteen strings at most 10 characters.
-#: src/global.c:480
+#: src/global.c:483
 msgid "Exit"
 msgstr "Afsluiten"
 
-#: src/global.c:481
+#: src/global.c:484
 msgid "Close"
 msgstr "Sluiten"
 
-#: src/global.c:482
+#: src/global.c:485
 msgid "Uncut Text"
 msgstr "Plakken"
 
-#: src/global.c:484
+#: src/global.c:487
 msgid "Unjustify"
 msgstr "onUitvullen"
 
-#: src/global.c:490
+#: src/global.c:493
 msgid "Read File"
 msgstr "Inlezen"
 
-#: src/global.c:491
+#: src/global.c:494
 msgid "Where Is"
 msgstr "Zoeken"
 
-#: src/global.c:492
+#: src/global.c:495
 msgid "Replace"
 msgstr "Vervangen"
 
-#: src/global.c:493
+#: src/global.c:496
 msgid "Go To Line"
 msgstr "Naar regel"
 
-#: src/global.c:494
+#: src/global.c:497
 msgid "Prev Line"
 msgstr "Regel terug"
 
-#: src/global.c:495
+#: src/global.c:498
 msgid "Next Line"
 msgstr "Regel verder"
 
-#: src/global.c:496
+#: src/global.c:499
 msgid "Prev Page"
 msgstr "Blad terug"
 
-#: src/global.c:497
+#: src/global.c:500
 msgid "Next Page"
 msgstr "Blad verder"
 
-#: src/global.c:499
+#: src/global.c:502
 msgid "Justify"
 msgstr "Uitvullen"
 
-#: src/global.c:500
+#: src/global.c:503
 msgid "FullJstify"
 msgstr "VolUitvullen"
 
-#: src/global.c:502
+#: src/global.c:505
 msgid "Refresh"
 msgstr "Verversen"
 
 #. TRANSLATORS: Try to keep this string at most 12 characters.
-#: src/global.c:505
+#: src/global.c:508
 msgid "WhereIs Next"
 msgstr "Verderzoeken"
 
 #. TRANSLATORS: The next long series of strings are shortcut descriptions;
 #. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:512
+#: src/global.c:515
 msgid "Justify the current paragraph"
 msgstr "huidige alinea uitvullen"
 
-#: src/global.c:514
+#: src/global.c:517
 msgid "Cancel the current function"
 msgstr "huidige functie annuleren"
 
-#: src/global.c:515
+#: src/global.c:518
 msgid "Display this help text"
 msgstr "dit hulpscherm tonen"
 
-#: src/global.c:518
+#: src/global.c:521
 msgid "Close the current file buffer / Exit from nano"
 msgstr "huidige buffer sluiten / nano afsluiten"
 
-#: src/global.c:520
+#: src/global.c:523
 msgid "Exit from nano"
 msgstr "nano afsluiten"
 
-#: src/global.c:524
+#: src/global.c:527
 msgid "Write the current file to disk"
 msgstr "huidige buffer op schijf opslaan"
 
-#: src/global.c:526
+#: src/global.c:529
 msgid "Insert another file into the current one"
 msgstr "een ander bestand in het huidige invoegen"
 
-#: src/global.c:528
+#: src/global.c:531
 msgid "Search for a string or a regular expression"
 msgstr "tekst zoeken (of een reguliere expressie)"
 
-#: src/global.c:531
+#: src/global.c:533
 msgid "Search for a string"
 msgstr "deel van naam zoeken"
 
-#: src/global.c:533
+#: src/global.c:534
+msgid "Refresh the file list"
+msgstr ""
+
+#: src/global.c:535
+#, fuzzy
+msgid "Go to lefthand column"
+msgstr "naar op te geven regelnummer (en kolomnummer) gaan"
+
+#: src/global.c:536
+#, fuzzy
+msgid "Go to righthand column"
+msgstr "naar op te geven regelnummer (en kolomnummer) gaan"
+
+#: src/global.c:538
 msgid "Go one screenful up"
 msgstr "een schermvol terugscrollen"
 
-#: src/global.c:534
+#: src/global.c:539
 msgid "Go one screenful down"
 msgstr "een schermvol verderscrollen"
 
-#: src/global.c:536
+#: src/global.c:541
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "huidige regel knippen en bewaren in knipbuffer"
 
-#: src/global.c:538
+#: src/global.c:543
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "plakken vanuit knipbuffer naar de huidige regel"
 
-#: src/global.c:539
+#: src/global.c:544
 msgid "Display the position of the cursor"
 msgstr "huidige cursorpositie tonen"
 
-#: src/global.c:541
+#: src/global.c:546
 msgid "Invoke the spell checker, if available"
 msgstr "spellingscontrole aanroepen (indien beschikbaar)"
 
-#: src/global.c:543
+#: src/global.c:548
 msgid "Replace a string or a regular expression"
 msgstr "tekst vervangen (of een reguliere expressie)"
 
-#: src/global.c:544
+#: src/global.c:549
 msgid "Go to line and column number"
 msgstr "naar op te geven regelnummer (en kolomnummer) gaan"
 
-#: src/global.c:546
+#: src/global.c:551
 msgid "Mark text starting from the cursor position"
 msgstr "tekst markeren vanaf huidige cursorpositie"
 
-#: src/global.c:547
+#: src/global.c:552
 msgid "Repeat the last search"
 msgstr "laatste zoekactie herhalen"
 
-#: src/global.c:549
+#: src/global.c:554
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "huidige regel kopiëren naar knipbuffer"
 
-#: src/global.c:550
+#: src/global.c:555
 msgid "Indent the current line"
 msgstr "huidige regel laten inspringen"
 
-#: src/global.c:551
+#: src/global.c:556
 msgid "Unindent the current line"
 msgstr "huidige regel laten terugspringen"
 
-#: src/global.c:552
+#: src/global.c:558
+msgid "Comment/uncomment the current line or marked lines"
+msgstr ""
+
+#: src/global.c:560
 msgid "Undo the last operation"
 msgstr "de laatste bewerking ongedaan maken"
 
-#: src/global.c:553
+#: src/global.c:561
 msgid "Redo the last undone operation"
 msgstr "de laatst ongedaangemaakte bewerking herdoen"
 
-#: src/global.c:555
+#: src/global.c:563
 msgid "Go back one character"
 msgstr "één teken achteruit"
 
-#: src/global.c:556
+#: src/global.c:564
 msgid "Go forward one character"
 msgstr "één teken vooruit"
 
-#: src/global.c:558
+#: src/global.c:566
 msgid "Go back one word"
 msgstr "één woord achteruit"
 
-#: src/global.c:559
+#: src/global.c:567
 msgid "Go forward one word"
 msgstr "één woord vooruit"
 
-#: src/global.c:561
+#: src/global.c:569
 msgid "Go to previous line"
 msgstr "naar de voorgaande regel"
 
-#: src/global.c:562
+#: src/global.c:570
 msgid "Go to next line"
 msgstr "naar de volgende regel"
 
-#: src/global.c:563
+#: src/global.c:571
 msgid "Go to beginning of current line"
 msgstr "naar het begin van de huidige regel"
 
-#: src/global.c:564
+#: src/global.c:572
 msgid "Go to end of current line"
 msgstr "naar het eind van de huidige regel"
 
-#: src/global.c:567
+#: src/global.c:575
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "naar het begin van huidige alinea; daarna naar vorige"
 
-#: src/global.c:569
+#: src/global.c:577
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr "naar het eind van huidige alinea; daarna naar volgende"
 
-#: src/global.c:571
+#: src/global.c:579
 msgid "Go to the first line of the file"
 msgstr "naar de eerste regel (top) van het bestand"
 
-#: src/global.c:572
+#: src/global.c:580
 msgid "Go to the last line of the file"
 msgstr "naar de laatste regel (eind) van het bestand"
 
-#: src/global.c:574
+#: src/global.c:582
 msgid "Go to the matching bracket"
 msgstr "naar bijbehorend haakje gaan"
 
-#: src/global.c:576
+#: src/global.c:584
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "één regel terugscrollen (cursor niet verplaatsen)"
 
-#: src/global.c:578
+#: src/global.c:586
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "één regel vooruitscrollen (cursor niet verplaatsen)"
 
-#: src/global.c:581
+#: src/global.c:589
 msgid "Switch to the previous file buffer"
 msgstr "overschakelen naar voorgaande bestandsbuffer"
 
-#: src/global.c:582
+#: src/global.c:590
 msgid "Switch to the next file buffer"
 msgstr "overschakelen naar volgende bestandsbuffer"
 
-#: src/global.c:584
+#: src/global.c:592
 msgid "Insert the next keystroke verbatim"
 msgstr "eerstvolgende toetsaanslag verbatim invoegen"
 
-#: src/global.c:585
+#: src/global.c:593
 msgid "Insert a tab at the cursor position"
 msgstr "een tab invoegen op de cursorpositie"
 
-#: src/global.c:586
+#: src/global.c:594
 msgid "Insert a newline at the cursor position"
 msgstr "een regeleinde invoegen op de cursorpositie"
 
-#: src/global.c:587
+#: src/global.c:595
 msgid "Delete the character under the cursor"
 msgstr "het teken onder de cursor verwijderen"
 
-#: src/global.c:589
+#: src/global.c:597
 msgid "Delete the character to the left of the cursor"
 msgstr "het teken links van de cursor verwijderen"
 
-#: src/global.c:592
+#: src/global.c:600
 msgid "Cut backward from cursor to word start"
 msgstr "achterwaarts verwijderen tot begin van woord"
 
-#: src/global.c:594
+#: src/global.c:602
 msgid "Cut forward from cursor to next word start"
 msgstr "voorwaarts verwijderen tot begin van volgend woord"
 
-#: src/global.c:596
+#: src/global.c:604
 msgid "Cut from the cursor position to the end of the file"
 msgstr "de hele rest van het bestand knippen (vanaf de cursor)"
 
-#: src/global.c:599
+#: src/global.c:607
 msgid "Justify the entire file"
 msgstr "het gehele bestand uitvullen"
 
-#: src/global.c:603
+#: src/global.c:611
 msgid "Count the number of words, lines, and characters"
 msgstr "aantal woorden, regels en tekens in het bestand tellen"
 
-#: src/global.c:606
+#: src/global.c:614
 msgid "Refresh (redraw) the current screen"
 msgstr "het scherm verversen (opnieuw tekenen)"
 
-#: src/global.c:608
+#: src/global.c:616
 msgid "Suspend the editor (if suspension is enabled)"
 msgstr "de editor laten pauzeren (indien pauzering is ingeschakeld)"
 
-#: src/global.c:610
+#: src/global.c:618
 msgid "Save file without prompting"
 msgstr "bestand opslaan zonder te vragen"
 
-#: src/global.c:611
+#: src/global.c:619
 msgid "Search next occurrence backward"
 msgstr "volgende voorkomen achterwaarts zoeken"
 
-#: src/global.c:612
+#: src/global.c:620
 msgid "Search next occurrence forward"
 msgstr "volgende voorkomen voorwaarts zoeken"
 
-#: src/global.c:614
+#: src/global.c:622
 msgid "Toggle the case sensitivity of the search"
 msgstr "hoofdlettergevoeligheid aan-/uitzetten"
 
-#: src/global.c:616
+#: src/global.c:624
 msgid "Reverse the direction of the search"
 msgstr "de zoekrichting omdraaien"
 
-#: src/global.c:620
+#: src/global.c:628
 msgid "Toggle the use of regular expressions"
 msgstr "gebruik van reguliere expressies aan-/uitzetten"
 
-#: src/global.c:624
+#: src/global.c:632
 msgid "Recall the previous search/replace string"
 msgstr "eerdere zoek-/vervangtekst oproepen"
 
-#: src/global.c:626
+#: src/global.c:634
 msgid "Recall the next search/replace string"
 msgstr "latere zoek-/vervangtekst oproepen"
 
-#: src/global.c:629
+#: src/global.c:637
 msgid "Go to file browser"
 msgstr "bestandenlijst oproepen"
 
-#: src/global.c:632
+#: src/global.c:640
 msgid "Toggle the use of DOS format"
 msgstr "DOS-indeling aan-/uitzetten"
 
-#: src/global.c:633
+#: src/global.c:641
 msgid "Toggle the use of Mac format"
 msgstr "Mac-indeling aan-/uitzetten"
 
-#: src/global.c:634
+#: src/global.c:642
 msgid "Toggle appending"
 msgstr "achteraantoevoegen aan-/uitzetten"
 
-#: src/global.c:635
+#: src/global.c:643
 msgid "Toggle prepending"
 msgstr "vooraantoevoegen aan-/uitzetten"
 
-#: src/global.c:636
+#: src/global.c:644
 msgid "Toggle backing up of the original file"
 msgstr "maken van reservekopieën aan-/uitzetten"
 
-#: src/global.c:637
+#: src/global.c:645
 msgid "Execute external command"
 msgstr "externe opdracht uitvoeren"
 
-#: src/global.c:639
+#: src/global.c:647
 msgid "Close buffer without saving it"
 msgstr "buffer sluiten zonder op te slaan"
 
-#: src/global.c:641
+#: src/global.c:649
 msgid "Toggle the use of a new buffer"
 msgstr "gebruik van een nieuwe buffer aan-/uitzetten"
 
-#: src/global.c:644
+#: src/global.c:652
 msgid "Exit from the file browser"
 msgstr "bestandenlijst verlaten"
 
-#: src/global.c:645
+#: src/global.c:653
 msgid "Go to the first file in the list"
 msgstr "naar het eerste bestand in de lijst gaan"
 
-#: src/global.c:646
+#: src/global.c:654
 msgid "Go to the last file in the list"
 msgstr "naar het laatste bestand in de lijst gaan"
 
-#: src/global.c:647
+#: src/global.c:655
 msgid "Go to the previous file in the list"
 msgstr "naar het vorige bestand in de lijst gaan"
 
-#: src/global.c:648
+#: src/global.c:656
 msgid "Go to the next file in the list"
 msgstr "naar het volgende bestand in de lijst gaan"
 
-#: src/global.c:649
+#: src/global.c:657
 msgid "Go to directory"
 msgstr "naar een op te geven map gaan"
 
-#: src/global.c:652
+#: src/global.c:660
 msgid "Invoke the linter, if available"
 msgstr "een linter aanroepen (syntaxcontrole, indien beschikbaar)"
 
-#: src/global.c:653
+#: src/global.c:661
 msgid "Go to previous linter msg"
 msgstr "naar de voorgaande lintermelding springen"
 
-#: src/global.c:654
+#: src/global.c:662
 msgid "Go to next linter msg"
 msgstr "naar de volgende lintermelding springen"
 
-#: src/global.c:656
+#: src/global.c:664
 msgid "Invoke formatter, if available"
 msgstr "een opmaakprogramma aanroepen (indien beschikbaar)"
 
 #. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:671
+#: src/global.c:679
 msgid "Get Help"
 msgstr "Hulp"
 
-#: src/global.c:674 src/prompt.c:858
+#: src/global.c:682 src/prompt.c:855
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: src/global.c:687
+#: src/global.c:695
 msgid "Write Out"
 msgstr "Opslaan"
 
-#: src/global.c:723
+#: src/global.c:731
 msgid "Go To Dir"
 msgstr "Naar map"
 
-#: src/global.c:738
+#: src/global.c:746
 msgid "Cut Text"
 msgstr "Knippen"
 
-#: src/global.c:753
+#: src/global.c:761
 msgid "To Spell"
 msgstr "Spelling"
 
-#: src/global.c:757
+#: src/global.c:765
 msgid "To Linter"
 msgstr "Linter"
 
-#: src/global.c:760
+#: src/global.c:768
 msgid "Formatter"
 msgstr "Opmaker"
 
-#: src/global.c:767
+#: src/global.c:775
 msgid "Case Sens"
 msgstr "Hfdlgevoelig"
 
-#: src/global.c:772
+#: src/global.c:780
 msgid "Regexp"
 msgstr "Reg.exp."
 
-#: src/global.c:777
+#: src/global.c:785
 msgid "Backwards"
 msgstr "Achterwaarts"
 
-#: src/global.c:784
+#: src/global.c:792
 msgid "No Replace"
 msgstr "Zoeken"
 
-#: src/global.c:792
+#: src/global.c:800
 msgid "Cur Pos"
 msgstr "Positie"
 
-#: src/global.c:807
+#: src/global.c:815
 msgid "First Line"
 msgstr "Naar top"
 
-#: src/global.c:809
+#: src/global.c:817
 msgid "Last Line"
 msgstr "Naar eind"
 
-#: src/global.c:816
+#: src/global.c:824
 msgid "To Bracket"
 msgstr "Naar haakje"
 
-#: src/global.c:819
+#: src/global.c:827
 msgid "Mark Text"
 msgstr "Markeren"
 
-#: src/global.c:822
+#: src/global.c:830
 msgid "Copy Text"
 msgstr "Kopiëren"
 
-#: src/global.c:825
+#: src/global.c:833
 msgid "Indent Text"
 msgstr "Inspringen"
 
-#: src/global.c:827
+#: src/global.c:835
 msgid "Unindent Text"
 msgstr "Terugspringen"
 
-#: src/global.c:830
+#: src/global.c:838
 msgid "Undo"
 msgstr "Ongedaan maken"
 
-#: src/global.c:832
+#: src/global.c:840
 msgid "Redo"
 msgstr "Herdoen"
 
-#: src/global.c:836 src/global.c:842
+#: src/global.c:844 src/global.c:850
 msgid "Back"
 msgstr "Terug"
 
-#: src/global.c:838 src/global.c:844
+#: src/global.c:846 src/global.c:852
 msgid "Forward"
 msgstr "Vooruit"
 
-#: src/global.c:849
+#: src/global.c:857
 msgid "Prev Word"
 msgstr "Woord terug"
 
-#: src/global.c:851
+#: src/global.c:859
 msgid "Next Word"
 msgstr "Woord verder"
 
-#: src/global.c:855
+#: src/global.c:863
 msgid "Home"
 msgstr "Begin"
 
-#: src/global.c:857
+#: src/global.c:865
 msgid "End"
 msgstr "Eind"
 
-#: src/global.c:866
+#: src/global.c:874
 msgid "Beg of Par"
 msgstr "Beg.v.alinea"
 
-#: src/global.c:868
+#: src/global.c:876
 msgid "End of Par"
 msgstr "Eind v.alinea"
 
-#: src/global.c:873
+#: src/global.c:881
 msgid "Scroll Up"
 msgstr "Omhoog scrollen"
 
-#: src/global.c:875
+#: src/global.c:883
 msgid "Scroll Down"
 msgstr "Omlaag scrollen"
 
-#: src/global.c:880
+#: src/global.c:888
 msgid "Prev File"
 msgstr "Vorig bestand"
 
-#: src/global.c:882
+#: src/global.c:890
 msgid "Next File"
 msgstr "Volgend bestand"
 
-#: src/global.c:891
+#: src/global.c:899
 msgid "Verbatim"
 msgstr "Verbatim"
 
-#: src/global.c:894
+#: src/global.c:902
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:896
+#: src/global.c:904
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:899
+#: src/global.c:907
 msgid "Delete"
 msgstr "Delete"
 
-#: src/global.c:901
+#: src/global.c:909
 msgid "Backspace"
 msgstr "Backspace"
 
 #. TRANSLATORS: The next two strings refer to cutting words.
-#: src/global.c:912
+#: src/global.c:920
 msgid "Cut Left"
 msgstr "Wis links"
 
-#: src/global.c:914
+#: src/global.c:922
 msgid "Cut Right"
 msgstr "Wis rechts"
 
-#: src/global.c:916
+#: src/global.c:924
 msgid "CutTillEnd"
 msgstr "RestKnippen"
 
-#: src/global.c:926
+#: src/global.c:934
 msgid "Word Count"
 msgstr "Woordentelling"
 
-#: src/global.c:933
+#: src/global.c:941
 msgid "Suspend"
 msgstr "Pauzeren"
 
-#: src/global.c:937
+#: src/global.c:945
+#, fuzzy
+msgid "Comment Lines"
+msgstr "Regel verder"
+
+#: src/global.c:949
 msgid "Save"
 msgstr "Opslaan"
 
-#: src/global.c:940
+#: src/global.c:952
 msgid "Previous"
 msgstr "Voorgaande"
 
-#: src/global.c:942
+#: src/global.c:954
 msgid "Next"
 msgstr "Volgende"
 
-#: src/global.c:948
+#: src/global.c:960
 msgid "PrevHstory"
 msgstr "Eerdere"
 
-#: src/global.c:951
+#: src/global.c:963
 msgid "NextHstory"
 msgstr "Latere"
 
-#: src/global.c:955
+#: src/global.c:972
 msgid "Go To Text"
 msgstr "Zoeken"
 
-#: src/global.c:959
+#: src/global.c:976
 msgid "DOS Format"
 msgstr "DOS-indeling"
 
-#: src/global.c:961
+#: src/global.c:978
 msgid "Mac Format"
 msgstr "Mac-indeling"
 
-#: src/global.c:969
+#: src/global.c:986
 msgid "Append"
 msgstr "Achtertoevoegen"
 
-#: src/global.c:971
+#: src/global.c:988
 msgid "Prepend"
 msgstr "Voortoevoegen"
 
-#: src/global.c:974
+#: src/global.c:991
 msgid "Backup File"
 msgstr "Reservekopie"
 
-#: src/global.c:981
+#: src/global.c:998
 msgid "Execute Command"
 msgstr "Opdracht uitvoeren"
 
-#: src/global.c:996
+#: src/global.c:1013
 msgid "To Files"
 msgstr "Bestandenlijst"
 
-#: src/global.c:1004
+#: src/global.c:1021
 msgid "First File"
 msgstr "Naar top"
 
-#: src/global.c:1006
+#: src/global.c:1023
 msgid "Last File"
 msgstr "Naar eind"
 
-#: src/global.c:1010
+#: src/global.c:1027
 msgid "Discard buffer"
 msgstr "Verwerpen"
 
+#: src/global.c:1038
+msgid "Left Column"
+msgstr ""
+
+#: src/global.c:1040
+msgid "Right Column"
+msgstr ""
+
 #. TRANSLATORS: Try to keep the next two strings at most 20 characters.
-#: src/global.c:1020
+#: src/global.c:1047
 msgid "Prev Lint Msg"
 msgstr "Vorige Lint"
 
-#: src/global.c:1022
+#: src/global.c:1049
 msgid "Next Lint Msg"
 msgstr "Volgende Lint"
 
 #. TRANSLATORS: The next seventeen strings are toggle descriptions;
 #. * they are best kept shorter than 40 characters, but may be longer.
-#: src/global.c:1285
+#: src/global.c:1316
 msgid "Help mode"
 msgstr "Hulpregels"
 
-#: src/global.c:1287
+#: src/global.c:1318
 msgid "Constant cursor position display"
 msgstr "Voortdurende cursorpositieweergave"
 
-#: src/global.c:1289
+#: src/global.c:1320
 msgid "Use of one more line for editing"
 msgstr "Extra regel voor bewerkingsvenster"
 
-#: src/global.c:1291
+#: src/global.c:1322
 msgid "Smooth scrolling"
 msgstr "Per regel scrollen"
 
-#: src/global.c:1293
+#: src/global.c:1324
 msgid "Soft wrapping of overlong lines"
 msgstr "Zachte terugloop van te lange regels"
 
-#: src/global.c:1295
+#: src/global.c:1326
 msgid "Whitespace display"
 msgstr "Weergave van witruimte"
 
-#: src/global.c:1297
+#: src/global.c:1328
 msgid "Color syntax highlighting"
 msgstr "Syntaxaanduiding met kleuren"
 
-#: src/global.c:1299
+#: src/global.c:1330
 msgid "Smart home key"
 msgstr "Slimme Home-toets"
 
-#: src/global.c:1301
+#: src/global.c:1332
 msgid "Auto indent"
 msgstr "Automatisch inspringen"
 
-#: src/global.c:1303
+#: src/global.c:1334
 msgid "Cut to end"
 msgstr "Knippen vanaf cursor tot regeleinde"
 
-#: src/global.c:1305
+#: src/global.c:1336
 msgid "Hard wrapping of overlong lines"
 msgstr "Afbreking van lange regels"
 
-#: src/global.c:1307
+#: src/global.c:1338
 msgid "Conversion of typed tabs to spaces"
 msgstr "Omzetting van getypte tabs naar spaties"
 
-#: src/global.c:1309
+#: src/global.c:1340
 msgid "Backup files"
 msgstr "Reservekopieën maken"
 
 # De vertaling kan hier beknopter zijn, omdat "Inlezen" in deze context
 # al voldoende aangeeft dat het om een bestand gaat.
-#: src/global.c:1311
+#: src/global.c:1342
 msgid "Reading file into separate buffer"
 msgstr "Inlezen in apart buffer"
 
-#: src/global.c:1313
+#: src/global.c:1344
 msgid "Mouse support"
 msgstr "Muisondersteuning"
 
-#: src/global.c:1315
+#: src/global.c:1346
 msgid "No conversion from DOS/Mac format"
 msgstr "Geen omzetting uit DOS/Mac-indeling"
 
-#: src/global.c:1317
+#: src/global.c:1348
 msgid "Suspension"
 msgstr "Proces-pauzering"
 
-#: src/help.c:209
+#: src/help.c:211
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1172,7 +1186,7 @@ msgstr ""
 "getoond: op Enter drukken zonder tekst in te voeren herhaalt deze vorige "
 "zoekopdracht.  "
 
-#: src/help.c:218
+#: src/help.c:220
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1186,7 +1200,7 @@ msgstr ""
 " De volgende toetsen zijn beschikbaar in 'Zoek/vervang'-modus:\n"
 "\n"
 
-#: src/help.c:224
+#: src/help.c:226
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1206,7 +1220,7 @@ msgstr ""
 " De volgende toetsen zijn beschikbaar in 'Naar regel'-modus:\n"
 "\n"
 
-#: src/help.c:233
+#: src/help.c:235
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1229,7 +1243,7 @@ msgstr ""
 "aparte buffer geladen.  Gebruik dan Meta-< en > om tussen bestandsbuffers te "
 "schakelen.  "
 
-#: src/help.c:242
+#: src/help.c:244
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1243,7 +1257,7 @@ msgstr ""
 " De volgende toetsen zijn beschikbaar in 'Bestand invoegen'-modus:\n"
 "\n"
 
-#: src/help.c:248
+#: src/help.c:250
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1271,7 +1285,7 @@ msgstr ""
 " De volgende toetsen zijn beschikbaar in 'Bestand opslaan'-modus:\n"
 "\n"
 
-#: src/help.c:262
+#: src/help.c:264
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1296,7 +1310,7 @@ msgstr ""
 " De volgende toetsen zijn beschikbaar in 'Bestandenlijst'-modus:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:277
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1320,7 +1334,7 @@ msgstr ""
 "zoekopdracht.\n"
 "\n"
 
-#: src/help.c:284
+#: src/help.c:286
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1328,7 +1342,7 @@ msgstr ""
 " De volgende toetsen zijn beschikbaar in 'Bestand zoeken'-modus:\n"
 "\n"
 
-#: src/help.c:288
+#: src/help.c:290
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1350,7 +1364,7 @@ msgstr ""
 " De volgende toetsen zijn beschikbaar in 'Naar map'-modus:\n"
 "\n"
 
-#: src/help.c:301
+#: src/help.c:303
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1375,7 +1389,7 @@ msgstr ""
 " De volgende toetsen zijn beschikbaar in 'Spellingscontrole'-modus:\n"
 "\n"
 
-#: src/help.c:316
+#: src/help.c:318
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1395,7 +1409,7 @@ msgstr ""
 " De volgende toetsen zijn beschikbaar in 'Externe opdracht'-modus:\n"
 "\n"
 
-#: src/help.c:329
+#: src/help.c:331
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1416,15 +1430,15 @@ msgstr ""
 "wordt.  De derde regel van onderen is de statusregel en toont belangrijke "
 "berichten.  "
 
-#: src/help.c:339
+#: src/help.c:341
+#, fuzzy
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
-" The notation for shortcuts is as follows: Control-key sequences are notated "
-"with a caret (^) symbol and can be entered either by using the Control "
-"(Ctrl) key or pressing the Escape (Esc) key twice.  Escape-key sequences are "
-"notated with the Meta (M-) symbol and can be entered using either the Esc, "
-"Alt, or Meta key depending on your keyboard setup.  "
+" Shortcuts are written as follows: Control-key sequences are notated with a "
+"'^' and can be entered either by using the Ctrl key or pressing the Esc key "
+"twice.  Meta-key sequences are notated with 'M-' and can be entered using "
+"either the Alt, Cmd, or Esc key, depending on your keyboard setup.  "
 msgstr ""
 "De onderste twee regels tonen de meest gebruikte sneltoetsen.\n"
 "\n"
@@ -1454,19 +1468,19 @@ msgstr ""
 msgid "enable/disable"
 msgstr "aan-/uitzetten"
 
-#: src/nano.c:559
+#: src/nano.c:560
 msgid "Key is invalid in view mode"
 msgstr "Toets is ongeldig in Kijkmodus"
 
-#: src/nano.c:565
+#: src/nano.c:566
 msgid "This function is disabled in restricted mode"
 msgstr "Deze functie is uitgeschakeld in beperkte modus"
 
-#: src/nano.c:573
+#: src/nano.c:574
 msgid "Help is not available"
 msgstr "Hulp is niet beschikbaar"
 
-#: src/nano.c:684
+#: src/nano.c:686
 #, c-format
 msgid ""
 "\n"
@@ -1475,7 +1489,7 @@ msgstr ""
 "\n"
 "Buffer is geschreven naar %s\n"
 
-#: src/nano.c:686
+#: src/nano.c:688
 #, c-format
 msgid ""
 "\n"
@@ -1484,7 +1498,7 @@ msgstr ""
 "\n"
 "Buffer is niet geschreven naar %s: %s\n"
 
-#: src/nano.c:689
+#: src/nano.c:691
 #, c-format
 msgid ""
 "\n"
@@ -1746,19 +1760,24 @@ msgstr "pauzeren van editor toestaan"
 msgid "Enable soft line wrapping"
 msgstr "rest van lange regels tonen op volgende"
 
-#: src/nano.c:937
-#, c-format
-msgid " GNU nano, version %s\n"
+#: src/nano.c:940
+#, fuzzy, c-format
+msgid " nano, version %s\n"
 msgstr " GNU nano, versie %s\n"
 
-#: src/nano.c:940
+#: src/nano.c:943
+#, c-format
+msgid " (C) 2014..%s the contributors to nano\n"
+msgstr ""
+
+#: src/nano.c:945
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr ""
 " E-mail: <nano@nano-editor.org>  Website: http://www.nano-editor.org/\n"
 " Meld fouten in de vertaling aan <vertaling@vrijschrift.org>."
 
-#: src/nano.c:941
+#: src/nano.c:946
 #, c-format
 msgid ""
 "\n"
@@ -1767,68 +1786,82 @@ msgstr ""
 "\n"
 " Compilatie-opties:"
 
-#: src/nano.c:1073
+#: src/nano.c:1081
 msgid "No file name"
 msgstr "Geen bestandsnaam"
 
-#: src/nano.c:1108
-msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
+#: src/nano.c:1115
+msgid "Save modified buffer?  (Answering \"No\" will DISCARD changes.) "
 msgstr ""
-"Gewijzigde buffer opslaan? (bij \"Nee\" gaan ALLE WIJZIGINGEN VERLOREN) "
 
-#: src/nano.c:1168
+#: src/nano.c:1178
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "Kan standaardinvoer vanaf toetsenbord niet heropenen\n"
 
-#: src/nano.c:1192
+#: src/nano.c:1202
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "Lezen van standaardinvoer; ^C om af te breken\n"
 
-#: src/nano.c:1256
+#: src/nano.c:1266
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "SIGHUP of SIGTERM ontvangen\n"
 
-#: src/nano.c:1272
+#: src/nano.c:1282
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Gebruik 'fg' om terug te keren naar nano.\n"
 
-#: src/nano.c:1294
+#: src/nano.c:1304
 msgid "Suspension is not enabled"
 msgstr "Pauzering is niet ingeschakeld"
 
-#: src/nano.c:1448
+#: src/nano.c:1459
 msgid "enabled"
 msgstr " (aangezet)"
 
-#: src/nano.c:1448
+#: src/nano.c:1459
 msgid "disabled"
 msgstr "is uitgezet"
 
-#: src/nano.c:1607 src/winio.c:1125
-msgid "Unknown Command"
-msgstr "Onbekend commando"
+#: src/nano.c:1573
+msgid "Unbound key"
+msgstr ""
+
+#: src/nano.c:1577
+#, c-format
+msgid "Unbound key: M-%c"
+msgstr ""
+
+#: src/nano.c:1579
+#, c-format
+msgid "Unbound key: ^%c"
+msgstr ""
+
+#: src/nano.c:1581
+#, c-format
+msgid "Unbound key: %c"
+msgstr ""
 
-#: src/nano.c:1720
+#: src/nano.c:1745
 msgid "XON ignored, mumble mumble"
 msgstr "XON genegeerd; mmm-mmm"
 
-#: src/nano.c:1725
+#: src/nano.c:1750
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF genegeerd; mmm-mmm"
 
-#: src/nano.c:2139 src/rcfile.c:1334
+#: src/nano.c:2166 src/rcfile.c:1187
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Gevraagde tabgrootte '%s' is ongeldig"
 
-#: src/nano.c:2200 src/rcfile.c:1259
+#: src/nano.c:2227 src/rcfile.c:1128
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Gevraagde uitvulbreedte '%s' is ongeldig"
 
-#: src/nano.c:2247
+#: src/nano.c:2276
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr "Typ '%s -h' voor een lijst van beschikbare opties.\n"
@@ -1836,116 +1869,120 @@ msgstr "Typ '%s -h' voor een lijst van beschikbare opties.\n"
 #. TRANSLATORS: For the next three strings, if possible, specify
 #. * the single-byte shortcuts for both your language and English.
 #. * For example, in French: "OoYy" for "Oui".
-#: src/prompt.c:821
+#: src/prompt.c:818
 msgid "Yy"
 msgstr "JjYy"
 
-#: src/prompt.c:822
+#: src/prompt.c:819
 msgid "Nn"
 msgstr "NnNn"
 
 # Accepteert ook de "O" van "Overal":
-#: src/prompt.c:823
+#: src/prompt.c:820
 msgid "Aa"
 msgstr "AaOo"
 
-#: src/prompt.c:845
+#: src/prompt.c:842
 msgid "Yes"
 msgstr "Ja"
 
-#: src/prompt.c:850
+#: src/prompt.c:847
 msgid "All"
 msgstr "Alle"
 
-#: src/prompt.c:855
+#: src/prompt.c:852
 msgid "No"
 msgstr "Nee"
 
-#: src/rcfile.c:142
+#: src/rcfile.c:144
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Fout in %s op regel %lu: "
 
-#: src/rcfile.c:201
+#: src/rcfile.c:203
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "Argument '%s' heeft een ongepaarde \""
 
-#: src/rcfile.c:228 src/rcfile.c:280 src/rcfile.c:732 src/rcfile.c:793
-#: src/rcfile.c:882 src/rcfile.c:933
+#: src/rcfile.c:231 src/rcfile.c:674 src/rcfile.c:725 src/rcfile.c:824
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Reg.exp.-reeksen moeten beginnen en eindigen met een \"-teken"
 
-#: src/rcfile.c:254 src/search.c:62
+#: src/rcfile.c:257 src/search.c:61
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Onjuiste reguliere expressie '%s': %s"
 
-#: src/rcfile.c:274
+#: src/rcfile.c:279
 msgid "Missing syntax name"
 msgstr "Ontbrekende syntaxnaam"
 
-#: src/rcfile.c:345
+#: src/rcfile.c:288
+msgid "A syntax name must be quoted"
+msgstr ""
+
+#: src/rcfile.c:297
 msgid "The \"none\" syntax is reserved"
 msgstr "Het woordje 'none' is gereserveerd"
 
-#: src/rcfile.c:352
-msgid "The \"default\" syntax must take no extensions"
+#: src/rcfile.c:327
+#, fuzzy
+msgid "The \"default\" syntax does not accept extensions"
 msgstr "Bij het woordje 'default' horen geen extensies"
 
-#: src/rcfile.c:424
+#: src/rcfile.c:369
 msgid "Missing key name"
 msgstr "Ontbrekende toetsnaam"
 
-#: src/rcfile.c:433 src/rcfile.c:444
+#: src/rcfile.c:378 src/rcfile.c:389
 msgid "Key name is too short"
 msgstr "Toetsnaam is te kort"
 
-#: src/rcfile.c:454
+#: src/rcfile.c:399
 msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr "Toetsnaam moet beginnen met \"^\", \"M\", of \"F\""
 
-#: src/rcfile.c:457
+#: src/rcfile.c:402
 #, c-format
 msgid "Key name %s is invalid"
 msgstr "Toetsnaam %s is ongeldig"
 
-#: src/rcfile.c:466
+#: src/rcfile.c:411
 msgid "Must specify a function to bind the key to"
 msgstr "Functie waaraan de toets gebonden moet worden ontbreekt"
 
 #. TRANSLATORS: Do not translate the word "all".
-#: src/rcfile.c:476
+#: src/rcfile.c:421
 msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
 "Menu waarin de toets gebonden/ontbonden moet worden ontbreekt (of \"all\")"
 
-#: src/rcfile.c:483
+#: src/rcfile.c:428
 #, c-format
 msgid "Cannot map name \"%s\" to a function"
 msgstr "Kan in naam '%s' geen functie herkennen"
 
-#: src/rcfile.c:490
+#: src/rcfile.c:435
 #, c-format
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "Kan in naam '%s' geen menu herkennen"
 
-#: src/rcfile.c:522
+#: src/rcfile.c:467
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr "Functie '%s' bestaat niet in menu '%s'"
 
-#: src/rcfile.c:534
+#: src/rcfile.c:479
 #, c-format
 msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "Toets '%s' mag niet herbonden worden"
 
-#: src/rcfile.c:631
+#: src/rcfile.c:576
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr "Fout bij expanderen van %s: %s"
 
-#: src/rcfile.c:674
+#: src/rcfile.c:616
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1959,125 +1996,112 @@ msgstr ""
 "'magenta', 'yellow', 'cyan', 'black' en 'white',\n"
 "met voor voorgrondkleuren het optionele voorvoegsel 'bright'."
 
-#: src/rcfile.c:696
-msgid "Cannot add a color command without a syntax command"
-msgstr "Kan geen 'color'-commando verwerken zonder een 'syntax'-commando"
+#: src/rcfile.c:637 src/rcfile.c:795 src/rcfile.c:858
+#, c-format
+msgid "A '%s' command requires a preceding 'syntax' command"
+msgstr ""
 
-#: src/rcfile.c:701
+#: src/rcfile.c:643
 msgid "Missing color name"
 msgstr "Ontbrekende kleurnaam"
 
-#: src/rcfile.c:711 src/rcfile.c:872
-msgid "Missing regex string"
-msgstr "Ontbrekende reg.exp.-tekenreeks"
+#: src/rcfile.c:653 src/rcfile.c:807
+#, fuzzy, c-format
+msgid "Missing regex string after '%s' command"
+msgstr "Ontbrekend commando bij 'linter'"
 
-#: src/rcfile.c:787
+#: src/rcfile.c:719
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "'start=' vereist een bijbehorende 'end='"
 
-#: src/rcfile.c:839
+#: src/rcfile.c:768
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
 msgstr "Achtergrondkleur '%s' kan niet 'bright' zijn"
 
-#: src/rcfile.c:867
-msgid "Cannot add a header regex without a syntax command"
-msgstr "Kan geen topregel-expressie verwerken zonder een 'syntax'-commando"
-
-#: src/rcfile.c:922
-msgid "Cannot add a magic string regex without a syntax command"
-msgstr ""
-"Kan geen reguliere expressie voor magische tekenreeks toevoegen zonder een "
-"'syntax'-commando"
-
-#: src/rcfile.c:927
-msgid "Missing magic string name"
-msgstr "Ontbrekende naam van magische tekenreeks"
-
-#: src/rcfile.c:985
-msgid "Cannot add a linter without a syntax command"
-msgstr "Kan geen linter toevoegen zonder een 'syntax'-commando"
+#: src/rcfile.c:802
+#, fuzzy, c-format
+msgid "The \"default\" syntax does not accept '%s' regexes"
+msgstr "Bij het woordje 'default' horen geen extensies"
 
-#: src/rcfile.c:990
-msgid "Missing linter command"
+#: src/rcfile.c:863
+#, fuzzy, c-format
+msgid "Missing command after '%s'"
 msgstr "Ontbrekend commando bij 'linter'"
 
-#: src/rcfile.c:1011
-msgid "Cannot add formatter without a syntax command"
-msgstr "Kan geen opmaker toevoegen zonder een 'syntax'-commando"
-
-#: src/rcfile.c:1016
-msgid "Missing formatter command"
-msgstr "Ontbrekend commando bij 'formatter'"
+#: src/rcfile.c:879
+#, fuzzy, c-format
+msgid "Argument of '%s' lacks closing \""
+msgstr "Argument '%s' heeft een ongepaarde \""
 
-#: src/rcfile.c:1046
+#: src/rcfile.c:910
 #, c-format
 msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr "Fatale fout: aan functie '%s' is geen toets gebonden.  Gestopt.\n"
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:912
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr "Start eventueel nano met optie -I om uw nanorc te corrigeren.\n"
 
-#: src/rcfile.c:1109
+#: src/rcfile.c:971
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "Kan geen syntax '%s' vinden om aan toe te voegen"
 
-#: src/rcfile.c:1125 src/rcfile.c:1134 src/rcfile.c:1144
-#, c-format
-msgid "Command \"%s\" not allowed in included file"
-msgstr "Commando '%s' is niet toegestaan in 'include'-bestand"
-
-#: src/rcfile.c:1150 src/rcfile.c:1359
+#: src/rcfile.c:993 src/rcfile.c:1202
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Bij syntax '%s' ontbreken 'color'-commando's"
 
-#: src/rcfile.c:1180
+#: src/rcfile.c:1024
+#, c-format
+msgid "Command \"%s\" not allowed in included file"
+msgstr "Commando '%s' is niet toegestaan in 'include'-bestand"
+
+#: src/rcfile.c:1039
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Commando '%s' is onbekend"
 
-#: src/rcfile.c:1195
+#: src/rcfile.c:1051
 msgid "Missing option"
 msgstr "Ontbrekende optie"
 
-#: src/rcfile.c:1217
+#: src/rcfile.c:1065
+#, c-format
+msgid "Unknown option \"%s\""
+msgstr "Onbekende optie '%s'"
+
+#: src/rcfile.c:1077
+#, c-format
+msgid "Cannot unset option \"%s\""
+msgstr "Kan optie '%s' niet uitzetten"
+
+#: src/rcfile.c:1089
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Optie '%s' vereist een argument"
 
 # FIXME: option *argument* is meant
-#: src/rcfile.c:1235
+#: src/rcfile.c:1105
 msgid "Option is not a valid multibyte string"
 msgstr "Argument is geen geldige multibyte-tekenreeks"
 
-#: src/rcfile.c:1272 src/rcfile.c:1300 src/rcfile.c:1309
+#: src/rcfile.c:1139 src/rcfile.c:1160 src/rcfile.c:1167
 msgid "Non-blank characters required"
 msgstr "Niet-blanco tekens zijn vereist"
 
-#: src/rcfile.c:1282
+#: src/rcfile.c:1146
 msgid "Two single-column characters required"
 msgstr "Twee enkelkoloms-tekens zijn vereist"
 
-#: src/rcfile.c:1348
-#, c-format
-msgid "Cannot unset option \"%s\""
-msgstr "Kan optie '%s' niet uitzetten"
-
-#: src/rcfile.c:1354
-#, c-format
-msgid "Unknown option \"%s\""
-msgstr "Onbekende optie '%s'"
-
-#: src/rcfile.c:1413
+#: src/rcfile.c:1258
 msgid "I can't find my home directory!  Wah!"
 msgstr "Kan de thuismap niet vinden!  Boehoe!"
 
-#: src/rcfile.c:1451
+#: src/rcfile.c:1295
 #, c-format
 msgid ""
 "\n"
@@ -2086,44 +2110,49 @@ msgstr ""
 "\n"
 "Druk op Enter om verder te gaan met het starten van nano.\n"
 
-#: src/search.c:96
+#: src/search.c:95
 #, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "'%.*s%s' niet gevonden"
 
 #. TRANSLATORS: The next three strings are modifiers of the search prompt.
-#: src/search.c:176
+#: src/search.c:169
 msgid " [Case Sensitive]"
 msgstr " [Hoofdlettergevoelig]"
 
-#: src/search.c:180
+#: src/search.c:173
 msgid " [Regexp]"
 msgstr " [Reg.exp.]"
 
-#: src/search.c:184
+#: src/search.c:177
 msgid " [Backwards]"
 msgstr " [Achterwaarts]"
 
 #. TRANSLATORS: The next two strings are modifiers of the search prompt.
-#: src/search.c:189
+#: src/search.c:182
 msgid " (to replace) in selection"
 msgstr " (om te vervangen) in selectie"
 
-#: src/search.c:191
+#: src/search.c:184
 msgid " (to replace)"
 msgstr " (om te vervangen)"
 
+#: src/search.c:305
+#, fuzzy
+msgid "Searching..."
+msgstr "Zoeken"
+
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:718
+#: src/search.c:693
 msgid "Replace this instance?"
 msgstr "Deze overeenkomst vervangen?"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:883
+#: src/search.c:840
 msgid "Replace with"
 msgstr "Vervangen door"
 
-#: src/search.c:924
+#: src/search.c:875
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
@@ -2131,294 +2160,389 @@ msgstr[0] "%lu overeenkomst vervangen"
 msgstr[1] "%lu overeenkomsten vervangen"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:964
+#: src/search.c:914
 msgid "Enter line number, column number"
 msgstr "Geef regelnummer, kolomnummer"
 
-#: src/search.c:991
+#: src/search.c:939
 msgid "Invalid line or column number"
 msgstr "Ongeldig regel- of kolomnummer"
 
-#: src/search.c:1124
+#: src/search.c:1080
 msgid "Not a bracket"
 msgstr "Is geen haakje"
 
-#: src/search.c:1191
+#: src/search.c:1146
 msgid "No matching bracket"
 msgstr "Geen overeenkomend haakje"
 
-#: src/text.c:54
+#: src/text.c:53
 msgid "Mark Set"
 msgstr "Markering is aangezet"
 
-#: src/text.c:58
+#: src/text.c:57
 msgid "Mark Unset"
 msgstr "Uitgezet"
 
-#: src/text.c:70
+#: src/text.c:69
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Fout bij aanroepen van '%s'"
 
-#: src/text.c:475
+#: src/text.c:468
+msgid "Commenting is not supported for this file type"
+msgstr ""
+
+#: src/text.c:484
+msgid "Cannot comment past end of file"
+msgstr ""
+
+#: src/text.c:677
 msgid "Nothing in undo buffer!"
 msgstr "Er is niets om ongedaan te maken"
 
-# FIXME: make identical to other -- %ld
-#: src/text.c:481 src/text.c:634
-#, c-format
-msgid "Internal error: can't match line %d.  Please save your work."
-msgstr "*Interne fout*: kan regel %d niet vinden.  Sla uw werk op."
-
 #. TRANSLATORS: Eight of the next nine strings describe actions
 #. * that are undone or redone.  It are all nouns, not verbs.
-#: src/text.c:495 src/text.c:524 src/text.c:645 src/text.c:686
+#: src/text.c:695 src/text.c:724 src/text.c:857 src/text.c:898
 msgid "text add"
 msgstr "teksttoevoeging"
 
-#: src/text.c:505 src/text.c:656
+#: src/text.c:705 src/text.c:868
 msgid "text delete"
 msgstr "tekstverwijdering"
 
-#: src/text.c:528 src/text.c:694
+#: src/text.c:728 src/text.c:907
 msgid "line join"
 msgstr "regelsamenvoeging"
 
-#: src/text.c:547 src/text.c:710
+#: src/text.c:747 src/text.c:923
 msgid "text cut"
 msgstr "tekstwegneming"
 
-#: src/text.c:552 src/text.c:714
+#: src/text.c:752 src/text.c:927
 msgid "text uncut"
 msgstr "tekstterugplaatsing"
 
 # FIXME: make identical to other -- %ld
-#: src/text.c:558 src/text.c:691
+#: src/text.c:758 src/text.c:903
 msgid "Internal error: line is missing.  Please save your work."
 msgstr "*Interne fout*: regel ontbreekt.  Sla uw werk op."
 
-#: src/text.c:561 src/text.c:665
+#: src/text.c:762 src/text.c:877
 msgid "line break"
 msgstr "regelafbreking"
 
-#: src/text.c:569 src/text.c:725
+#: src/text.c:772 src/text.c:947
+msgid "comment"
+msgstr ""
+
+#: src/text.c:776 src/text.c:951
+msgid "uncomment"
+msgstr ""
+
+#: src/text.c:780 src/text.c:938
 msgid "text insert"
 msgstr "tekstinvoeging"
 
-#: src/text.c:589 src/text.c:718
+#: src/text.c:800 src/text.c:931
 msgid "text replace"
 msgstr "tekstvervanging"
 
-#: src/text.c:596 src/text.c:732 src/text.c:1030 src/text.c:1174
+#: src/text.c:807 src/text.c:955 src/text.c:1267 src/text.c:1437
 msgid "Internal error: unknown type.  Please save your work."
 msgstr "*Interne fout*: onbekend type.  Sla uw werk op."
 
-#: src/text.c:601
+#: src/text.c:813
 #, c-format
 msgid "Undid action (%s)"
 msgstr "Bewerking (%s) is ongedaan gemaakt"
 
-#: src/text.c:619
+#: src/text.c:832
 msgid "Nothing to re-do!"
 msgstr "Er is niets om opnieuw te doen"
 
-#: src/text.c:628
+#: src/text.c:841
 msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr "*Interne fout*: kan herdoening niet voorbereiden.  Sla uw werk op."
 
-#: src/text.c:737
+#: src/text.c:961
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Bewerking (%s) is opnieuw gedaan"
 
-#: src/text.c:827 src/text.c:2508 src/text.c:2944
+#: src/text.c:1051 src/text.c:2765 src/text.c:3198
 msgid "Could not create pipe"
 msgstr "Kan geen pijp aanmaken"
 
-#: src/text.c:853 src/text.c:2595 src/text.c:2750 src/text.c:2992
-#: src/text.c:3286
+#: src/text.c:1077 src/text.c:2852 src/text.c:3005 src/text.c:3246
+#: src/text.c:3540
 msgid "Could not fork"
 msgstr "Kan geen nieuw proces starten"
 
-#: src/text.c:1853
+#: src/text.c:2117
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Ongeldige aanhaaltekens-tekenreeks '%s': %s"
 
-#: src/text.c:2241
+#: src/text.c:2499
 msgid "Can now UnJustify!"
 msgstr "Kan nu onuitvullen!"
 
-#: src/text.c:2435
+#: src/text.c:2697
 msgid "Edit a replacement"
 msgstr "Vervanging bewerken"
 
-#: src/text.c:2510
+#. TRANSLATORS: Shown after fixing misspellings in one word.
+#: src/text.c:2713
+#, fuzzy
+msgid "Next word..."
+msgstr "Woord verder"
+
+#: src/text.c:2767
 msgid "Creating misspelled word list, please wait..."
 msgstr "Aanmaken van lijst van verkeerd gespelde woorden; even geduld..."
 
-#: src/text.c:2601 src/text.c:2999
+#: src/text.c:2858 src/text.c:3253
 msgid "Could not get size of pipe buffer"
 msgstr "Kan grootte van doorsluisbuffer niet bepalen"
 
-#: src/text.c:2652
+#: src/text.c:2907
 msgid "Error invoking \"spell\""
 msgstr "Fout bij aanroepen van 'spell'"
 
-#: src/text.c:2655
+#: src/text.c:2910
 msgid "Error invoking \"sort -f\""
 msgstr "Fout bij aanroepen van 'sort -f'"
 
-#: src/text.c:2658
+#: src/text.c:2913
 msgid "Error invoking \"uniq\""
 msgstr "Fout bij aanroepen van 'uniq'"
 
-#: src/text.c:2881
+#: src/text.c:3135
 msgid "Invoking spell checker, please wait"
 msgstr "Aanroepen van spellingscontrole; even geduld..."
 
-#: src/text.c:2897
+#: src/text.c:3151
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Spellingscontrole is mislukt: %s"
 
-#: src/text.c:2899
+#: src/text.c:3153
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Spellingscontrole is mislukt: %s: %s"
 
-#: src/text.c:2902
+#: src/text.c:3156
 msgid "Finished checking spelling"
 msgstr "Spellingscontrole is voltooid"
 
-#: src/text.c:2927
+#: src/text.c:3181
 msgid "No linter defined for this type of file!"
 msgstr "Er is geen linter gedefinieerd voor dit type bestand"
 
-#: src/text.c:2932
+#: src/text.c:3186
 msgid "Save modified buffer before linting?"
 msgstr "Gewijzigd buffer opslaan alvorens te linten?"
 
-#: src/text.c:2949
+#: src/text.c:3203
 msgid "Invoking linter, please wait"
 msgstr "Aanroepen van de linter; even geduld..."
 
-#: src/text.c:3105
+#: src/text.c:3358
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr "Kreeg nul ontleedbare regels terug van commando '%s'"
 
-#: src/text.c:3134
+#: src/text.c:3388
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr "Deze melding is voor ongeopend bestand %s; in nieuwe buffer openen?"
 
-#: src/text.c:3153
+#: src/text.c:3407
 msgid "No more errors in unopened files, cancelling"
 msgstr "Geen verdere fouten in ongeopende bestanden; gestopt"
 
-#: src/text.c:3192
+#: src/text.c:3446
 msgid "At last message"
 msgstr "Dit is de laatste melding"
 
-#: src/text.c:3197
+#: src/text.c:3451
 msgid "At first message"
 msgstr "Dit is de eerste melding"
 
-#: src/text.c:3237
+#: src/text.c:3491
 msgid "Finished"
 msgstr "Klaar"
 
-#: src/text.c:3259
+#: src/text.c:3513
 msgid "Invoking formatter, please wait"
 msgstr "Aanroepen van de opmaker; even geduld..."
 
-#: src/text.c:3314
+#: src/text.c:3568
 msgid "Finished formatting"
 msgstr "Het opmaken is klaar"
 
-#: src/text.c:3396
+#: src/text.c:3650
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%swoorden: %lu  regels: %ld  tekens: %lu"
 
-#: src/text.c:3397
+#: src/text.c:3651
 msgid "In Selection:  "
 msgstr "In de selectie:  "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3411
+#: src/text.c:3665
 msgid "Verbatim Input"
 msgstr "Verbatim invoer"
 
-#: src/utils.c:391 src/utils.c:403
+#: src/utils.c:392 src/utils.c:404
 msgid "nano is out of memory!"
 msgstr "Onvoldoende geheugen beschikbaar voor nano!"
 
+# FIXME: make identical to other -- %ld
+#: src/utils.c:625
+#, c-format
+msgid "Internal error: can't match line %d.  Please save your work."
+msgstr "*Interne fout*: kan regel %d niet vinden.  Sla uw werk op."
+
+#. TRANSLATORS: This refers to a sequence of escape codes
+#. * (from the keyboard) that nano does not know about.
+#: src/winio.c:1121
+msgid "Unknown sequence"
+msgstr ""
+
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
 #: src/winio.c:1427
 msgid "Unicode Input"
 msgstr "Invoer van Unicode"
 
-#: src/winio.c:1991 src/winio.c:1995
-msgid "Modified"
-msgstr "Gewijzigd"
-
-#: src/winio.c:1992
-msgid "View"
-msgstr "Kijken"
-
-#: src/winio.c:2006
+#: src/winio.c:1960
 msgid "DIR:"
 msgstr "Map:"
 
-#: src/winio.c:2013
+#: src/winio.c:1968
 msgid "File:"
 msgstr "Bestand:"
 
-#: src/winio.c:3141
+#: src/winio.c:1972 src/winio.c:1976
+msgid "Modified"
+msgstr "Gewijzigd"
+
+#: src/winio.c:1974
+msgid "View"
+msgstr "Kijken"
+
+#: src/winio.c:3105
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "regel %ld/%ld (%d%%), kolom %lu/%lu (%d%%), teken %lu/%lu (%d%%)"
 
-#: src/winio.c:3271
+#: src/winio.c:3235
 msgid "The nano text editor"
 msgstr "De nano-teksteditor"
 
-#: src/winio.c:3272
+#: src/winio.c:3236
 msgid "version"
 msgstr "versie"
 
-#: src/winio.c:3273
+#: src/winio.c:3237
 msgid "Brought to you by:"
 msgstr "U bezorgd door:"
 
-#: src/winio.c:3274
+#: src/winio.c:3238
 msgid "Special thanks to:"
 msgstr "Met speciale dank aan:"
 
-#: src/winio.c:3275
+#: src/winio.c:3239
 msgid "The Free Software Foundation"
 msgstr "de Free Software Foundation"
 
-#: src/winio.c:3276
+#: src/winio.c:3240
 msgid "the many translators and the TP"
 msgstr "de vele vertalers en de TP"
 
-#: src/winio.c:3277
+#: src/winio.c:3241
 msgid "For ncurses:"
 msgstr "Voor ncurses:"
 
-#: src/winio.c:3278
+#: src/winio.c:3242
 msgid "and anyone else we forgot..."
 msgstr "en iedereen die we vergeten zijn..."
 
-#: src/winio.c:3279
+#: src/winio.c:3243
 msgid "Thank you for using nano!"
 msgstr "Dank u voor het gebruiken van nano!"
 
+#~ msgid ""
+#~ "Read %lu line (Converted from DOS and Mac format - Warning: No write "
+#~ "permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from DOS and Mac format - Warning: No write "
+#~ "permission)"
+#~ msgstr[0] ""
+#~ "%lu regel gelezen (omgezet uit DOS+Mac-indeling -- MAAR: onschrijfbaar)"
+#~ msgstr[1] ""
+#~ "%lu regels gelezen (omgezet uit DOS+Mac-indeling -- MAAR: onschrijfbaar)"
+
+#~ msgid ""
+#~ "Read %lu line (Converted from Mac format - Warning: No write permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from Mac format - Warning: No write permission)"
+#~ msgstr[0] ""
+#~ "%lu regel gelezen (omgezet uit Mac-indeling -- MAAR: onschrijfbaar)"
+#~ msgstr[1] ""
+#~ "%lu regels gelezen (omgezet uit Mac-indeling -- MAAR: onschrijfbaar)"
+
+#~ msgid ""
+#~ "Read %lu line (Converted from DOS format - Warning: No write permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from DOS format - Warning: No write permission)"
+#~ msgstr[0] ""
+#~ "%lu regel gelezen (omgezet uit DOS-indeling -- MAAR: onschrijfbaar)"
+#~ msgstr[1] ""
+#~ "%lu regels gelezen (omgezet uit DOS-indeling -- MAAR: onschrijfbaar)"
+
+#~ msgid "Read %lu line (Warning: No write permission)"
+#~ msgid_plural "Read %lu lines (Warning: No write permission)"
+#~ msgstr[0] "%lu regel ingelezen  (MAAR: onschrijfbaar)"
+#~ msgstr[1] "%lu regels ingelezen  (MAAR: onschrijfbaar)"
+
+#~ msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
+#~ msgstr ""
+#~ "Gewijzigde buffer opslaan? (bij \"Nee\" gaan ALLE WIJZIGINGEN VERLOREN) "
+
+#~ msgid "Unknown Command"
+#~ msgstr "Onbekend commando"
+
+#~ msgid "Cannot add a color command without a syntax command"
+#~ msgstr "Kan geen 'color'-commando verwerken zonder een 'syntax'-commando"
+
+#~ msgid "Missing regex string"
+#~ msgstr "Ontbrekende reg.exp.-tekenreeks"
+
+#~ msgid "Cannot add a header regex without a syntax command"
+#~ msgstr "Kan geen topregel-expressie verwerken zonder een 'syntax'-commando"
+
+#~ msgid "Cannot add a magic string regex without a syntax command"
+#~ msgstr ""
+#~ "Kan geen reguliere expressie voor magische tekenreeks toevoegen zonder "
+#~ "een 'syntax'-commando"
+
+#~ msgid "Missing magic string name"
+#~ msgstr "Ontbrekende naam van magische tekenreeks"
+
+#~ msgid "Cannot add a linter without a syntax command"
+#~ msgstr "Kan geen linter toevoegen zonder een 'syntax'-commando"
+
+#~ msgid "Cannot add formatter without a syntax command"
+#~ msgstr "Kan geen opmaker toevoegen zonder een 'syntax'-commando"
+
+#~ msgid "Missing formatter command"
+#~ msgstr "Ontbrekend commando bij 'formatter'"
+
 #~ msgid "Cannot prepend or append to a symlink with --nofollow set"
 #~ msgstr "Kan met '--nofollow' niet aan een symbolische koppeling toevoegen"
 
diff --git a/po/nn.po b/po/nn.po
index 4f3310ef..b34de56f 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 1.1.7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-25 16:41-0500\n"
+"POT-Creation-Date: 2016-06-17 15:41+0200\n"
 "PO-Revision-Date: 2002-03-22 20:34+0100\n"
 "Last-Translator: Kjetil Torgrim Homme <kjetilho@linpro.no>\n"
 "Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -17,370 +17,352 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: src/browser.c:144 src/browser.c:284 src/browser.c:334 src/files.c:996
+#: src/files.c:1003 src/files.c:1794 src/files.c:1919 src/files.c:1963
+#: src/files.c:1983 src/files.c:2099 src/files.c:3019 src/files.c:3242
+#: src/rcfile.c:540 src/rcfile.c:1280
+#, c-format
+msgid "Error reading %s: %s"
+msgstr ""
+
 #. TRANSLATORS: This is a prompt.
-#: src/browser.c:220
+#: src/browser.c:247
 #, fuzzy
 msgid "Go To Directory"
 msgstr "Gå til katalog"
 
-#: src/browser.c:227 src/browser.c:738 src/files.c:1174 src/files.c:2340
-#: src/nano.c:1120 src/search.c:202 src/search.c:290 src/search.c:895
-#: src/search.c:970 src/text.c:2935 src/text.c:3142
+#: src/browser.c:254 src/browser.c:723 src/files.c:1126 src/files.c:2292
+#: src/nano.c:1128 src/search.c:195 src/search.c:297 src/search.c:851
+#: src/search.c:918 src/text.c:3189 src/text.c:3396
 msgid "Cancelled"
 msgstr "Avbrote"
 
-#: src/browser.c:253 src/browser.c:300
-#, c-format
-msgid "Can't go outside of %s in restricted mode"
+#. TRANSLATORS: This refers to the option --operatingdir,
+#. * not to --restricted.
+#: src/browser.c:274 src/browser.c:326
+#, fuzzy, c-format
+msgid "Can't go outside of %s in confined mode"
 msgstr "Kan ikkje gå utanfor %s i avgrensa modus"
 
-#: src/browser.c:264 src/browser.c:310 src/browser.c:326 src/files.c:1044
-#: src/files.c:1052 src/files.c:1844 src/files.c:1971 src/files.c:2016
-#: src/files.c:2037 src/files.c:2156 src/files.c:3062 src/files.c:3285
-#: src/rcfile.c:596 src/rcfile.c:1435
-#, c-format
-msgid "Error reading %s: %s"
-msgstr ""
-
-#: src/browser.c:290
+#: src/browser.c:317
 msgid "Can't move up a directory"
 msgstr "Kan ikkje skifta til foreldrekatalogen"
 
 #. TRANSLATORS: Try to keep this at most 7 characters.
-#: src/browser.c:615 src/browser.c:623
+#: src/browser.c:590 src/browser.c:598
 msgid "(dir)"
 msgstr ""
 
 #. TRANSLATORS: Try to keep this at most 12 characters.
-#: src/browser.c:620
+#: src/browser.c:595
 msgid "(parent dir)"
 msgstr ""
 
 #. TRANSLATORS: Try to keep this at most 7 characters.
 #. * If necessary, you can leave out the parentheses.
-#: src/browser.c:650
+#: src/browser.c:625
 msgid "(huge)"
 msgstr ""
 
 #. TRANSLATORS: This is the main search prompt.
-#: src/browser.c:727 src/search.c:173
+#: src/browser.c:712 src/search.c:166
 msgid "Search"
 msgstr "Søk"
 
-#: src/browser.c:777 src/search.c:466 src/search.c:536
-msgid "This is the only occurrence"
-msgstr "Dette er einaste forekomst"
-
-#: src/browser.c:793 src/search.c:364
+#: src/browser.c:754 src/search.c:368
 msgid "Search Wrapped"
 msgstr "Søket gjekk rundt"
 
-#: src/browser.c:843 src/search.c:517
+#: src/browser.c:764 src/search.c:509
+msgid "This is the only occurrence"
+msgstr "Dette er einaste forekomst"
+
+#: src/browser.c:812 src/search.c:473
 msgid "No current search pattern"
 msgstr ""
 
-#: src/files.c:50
+#: src/color.c:186
+#, c-format
+msgid "Unknown syntax name: %s"
+msgstr ""
+
+#: src/color.c:247
+#, c-format
+msgid "magic_load() failed: %s"
+msgstr ""
+
+#: src/color.c:251
+#, c-format
+msgid "magic_file(%s) failed: %s"
+msgstr ""
+
+#: src/files.c:47
 #, c-format
 msgid "Directory '%s' does not exist"
 msgstr ""
 
-#: src/files.c:52
+#: src/files.c:49
 #, c-format
 msgid "Path '%s': %s"
 msgstr ""
 
-#: src/files.c:54
+#: src/files.c:51
 #, fuzzy, c-format
 msgid "Path '%s' is not a directory"
 msgstr "Fila «%s» er ein katalog"
 
-#: src/files.c:57
+#: src/files.c:53
 #, c-format
 msgid "Path '%s' is not accessible"
 msgstr ""
 
-#. TRANSLATORS: Try to keep this at most 76 characters.
-#: src/files.c:158
+#. TRANSLATORS: Keep the next ten messages at most 76 characters.
+#: src/files.c:148
 msgid ""
 "Warning: Modifying a file which is not locked, check directory permission?"
 msgstr ""
 
-#: src/files.c:197
+#: src/files.c:187
 msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
 msgstr ""
 
-#: src/files.c:206
+#: src/files.c:196
 #, fuzzy, c-format
 msgid "Couldn't determine hostname for lock file: %s"
 msgstr "Kunne ikkje setja tilgangsnivå %o på %s: %s"
 
-#: src/files.c:227 src/files.c:238 src/files.c:275 src/files.c:285
+#: src/files.c:216 src/files.c:225 src/files.c:262 src/files.c:272
 #, fuzzy, c-format
 msgid "Error writing lock file %s: %s"
 msgstr "Feil i %s på linje %d: "
 
-#: src/files.c:305
+#: src/files.c:291
 #, fuzzy, c-format
 msgid "Error deleting lock file %s: %s"
 msgstr "Feil i %s på linje %d: "
 
-#: src/files.c:341
+#: src/files.c:325
 #, fuzzy, c-format
 msgid "Error opening lock file %s: %s"
 msgstr "Feil i %s på linje %d: "
 
-#: src/files.c:353
+#: src/files.c:337
 #, c-format
 msgid "Error reading lock file %s: Not enough data read"
 msgstr ""
 
 #. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
-#: src/files.c:371
+#: src/files.c:354
 #, c-format
 msgid "File %s is being edited (by %s with %s, PID %d); continue?"
 msgstr ""
 
-#: src/files.c:426
+#: src/files.c:430
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Kan ikkje setja inn fil frå utanfor %s"
 
-#: src/files.c:439 src/files.c:1038 src/rcfile.c:589 src/rcfile.c:1385
-#: src/rcfile.c:1426
+#: src/files.c:445 src/files.c:991 src/rcfile.c:533 src/rcfile.c:1230
+#: src/rcfile.c:1271
 #, fuzzy, c-format
 msgid "\"%s\" is a directory"
 msgstr "Fila «%s» er ein katalog"
 
-#: src/files.c:441
+#: src/files.c:447
 #, c-format
 msgid "\"%s\" is not a normal file"
 msgstr ""
 
-#: src/files.c:566
+#: src/files.c:571
 #, fuzzy
 msgid "No more open file buffers"
 msgstr "Ingen fleire opne filer"
 
-#: src/files.c:582
+#: src/files.c:586
 #, c-format
 msgid "Switched to %s"
 msgstr "Bytta til %s"
 
-#: src/files.c:584 src/global.c:988 src/winio.c:2010
+#: src/files.c:588 src/global.c:1005 src/winio.c:1965
 msgid "New Buffer"
 msgstr "Ny buffer"
 
-#: src/files.c:943
+#. TRANSLATORS: Keep the next four messages at most 76 characters.
+#: src/files.c:913
 #, fuzzy, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
 msgstr[0] "Leste %d linjer (på Mac-format)"
 msgstr[1] "Leste %d linjer (på Mac-format)"
 
-#: src/files.c:948
-#, fuzzy, c-format
-msgid ""
-"Read %lu line (Converted from DOS and Mac format - Warning: No write "
-"permission)"
-msgid_plural ""
-"Read %lu lines (Converted from DOS and Mac format - Warning: No write "
-"permission)"
-msgstr[0] "Leste %d linjer (på Mac-format)"
-msgstr[1] "Leste %d linjer (på Mac-format)"
-
-#: src/files.c:954
+#: src/files.c:919
 #, fuzzy, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
 msgstr[0] "Leste %d linjer (på Mac-format)"
 msgstr[1] "Leste %d linjer (på Mac-format)"
 
-#: src/files.c:958
-#, fuzzy, c-format
-msgid ""
-"Read %lu line (Converted from Mac format - Warning: No write permission)"
-msgid_plural ""
-"Read %lu lines (Converted from Mac format - Warning: No write permission)"
-msgstr[0] "Leste %d linjer (på Mac-format)"
-msgstr[1] "Leste %d linjer (på Mac-format)"
-
-#: src/files.c:964
+#: src/files.c:925
 #, fuzzy, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
 msgstr[0] "Leste %d linjer (på DOS-format)"
 msgstr[1] "Leste %d linjer (på DOS-format)"
 
-#: src/files.c:968
-#, fuzzy, c-format
-msgid ""
-"Read %lu line (Converted from DOS format - Warning: No write permission)"
-msgid_plural ""
-"Read %lu lines (Converted from DOS format - Warning: No write permission)"
-msgstr[0] "Leste %d linjer (på DOS-format)"
-msgstr[1] "Leste %d linjer (på DOS-format)"
-
-#: src/files.c:974
+#: src/files.c:930
 #, fuzzy, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "Leste %d linjer"
 msgstr[1] "Leste %d linjer"
 
-#: src/files.c:977
-#, c-format
-msgid "Read %lu line (Warning: No write permission)"
-msgid_plural "Read %lu lines (Warning: No write permission)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/files.c:1019 src/files.c:1056
+#: src/files.c:974 src/files.c:1006
 msgid "Reading File"
 msgstr "Les fil"
 
-#: src/files.c:1025
+#: src/files.c:980
 msgid "New File"
 msgstr "Ny fil"
 
-#: src/files.c:1028
-#, c-format
-msgid "\"%s\" not found"
+#: src/files.c:983
+#, fuzzy, c-format
+msgid "File \"%s\" not found"
 msgstr "«%s» ikkje funne"
 
 # "enhet" = "device", kanskje, men det er litt forvirrande
-#: src/files.c:1039 src/rcfile.c:590 src/rcfile.c:1386 src/rcfile.c:1427
+#: src/files.c:992 src/rcfile.c:534 src/rcfile.c:1231 src/rcfile.c:1272
 #, fuzzy, c-format
 msgid "\"%s\" is a device file"
 msgstr "Fila «%s» er ikkje ei vanleg fil"
 
-#: src/files.c:1133
+#: src/files.c:1083
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr ""
 
-#: src/files.c:1135
+#: src/files.c:1085
 #, fuzzy, c-format
 msgid "Command to execute [from %s] "
 msgstr "Fila som skal setjast inn [frå %s] "
 
-#: src/files.c:1142
+#: src/files.c:1092
 #, fuzzy, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Fila som skal setjast inn [frå %s] "
 
-#: src/files.c:1144
+#: src/files.c:1094
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Fila som skal setjast inn [frå %s] "
 
-#: src/files.c:1389
+#: src/files.c:1338
 #, fuzzy
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Tasten er ugyldig utan fleire buffer"
 
-#: src/files.c:1684
-msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+#: src/files.c:1632
+msgid "Failed to write backup file; continue saving? (Say N if unsure.) "
 msgstr ""
 
-#: src/files.c:1800
+#: src/files.c:1750
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Kan ikkje skriva utanfor %s"
 
-#: src/files.c:1885 src/files.c:1910 src/files.c:1928 src/files.c:1941
-#: src/files.c:1952 src/files.c:1981
+#: src/files.c:1833 src/files.c:1858 src/files.c:1876 src/files.c:1889
+#: src/files.c:1900 src/files.c:1928
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr ""
 
-#: src/files.c:1886 src/nano.c:690
+#: src/files.c:1834 src/nano.c:692
 #, fuzzy
 msgid "Too many backup files?"
 msgstr ""
 "\n"
 "%s vart ikkje lagra (for mange sikringskopiar?)\n"
 
-#: src/files.c:2026 src/text.c:2863 src/text.c:2875 src/text.c:3244
-#: src/text.c:3253
+#: src/files.c:1972 src/text.c:3117 src/text.c:3129 src/text.c:3498
+#: src/text.c:3507
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr ""
 
-#: src/files.c:2049 src/files.c:2068 src/files.c:2080 src/files.c:2104
-#: src/files.c:2121 src/files.c:2131 src/files.c:2164 src/files.c:2171
+#: src/files.c:1994 src/files.c:2013 src/files.c:2023 src/files.c:2047
+#: src/files.c:2064 src/files.c:2074 src/files.c:2106 src/files.c:2113
 #, c-format
 msgid "Error writing %s: %s"
 msgstr ""
 
-#: src/files.c:2200
+#: src/files.c:2154
 #, fuzzy, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "Skreiv %d linjer"
 msgstr[1] "Skreiv %d linjer"
 
-#: src/files.c:2299
+#: src/files.c:2249
 msgid " [DOS Format]"
 msgstr " [DOS-format]"
 
-#: src/files.c:2300
+#: src/files.c:2250
 msgid " [Mac Format]"
 msgstr " [Mac-format]"
 
-#: src/files.c:2302
+#: src/files.c:2252
 #, fuzzy
 msgid " [Backup]"
 msgstr " [Bakover]"
 
-#: src/files.c:2309
+#: src/files.c:2259
 #, fuzzy
 msgid "Prepend Selection to File"
 msgstr "Legg til valt område på slutten av fil"
 
-#: src/files.c:2310
+#: src/files.c:2260
 msgid "Append Selection to File"
 msgstr "Legg til valt område på slutten av fil"
 
-#: src/files.c:2311
+#: src/files.c:2261
 msgid "Write Selection to File"
 msgstr "Lagra valt område til fil"
 
-#: src/files.c:2314
+#: src/files.c:2264
 #, fuzzy
 msgid "File Name to Prepend to"
 msgstr "Namn på fil som skal leggjast til"
 
-#: src/files.c:2315
+#: src/files.c:2265
 #, fuzzy
 msgid "File Name to Append to"
 msgstr "Namn på fil som skal leggjast til"
 
-#: src/files.c:2316
+#: src/files.c:2266
 msgid "File Name to Write"
 msgstr "Namn på fila som skal lagrast"
 
-#: src/files.c:2349
-msgid "Save modified buffer anyway ? "
+#: src/files.c:2301
+msgid "Save modified buffer anyway? "
 msgstr ""
 
-#: src/files.c:2457
-#, fuzzy
-msgid "File exists, OVERWRITE ? "
-msgstr "Fila eksisterer, SKRIV OVER?"
-
-#: src/files.c:2466
-msgid "Save file under DIFFERENT NAME ? "
+#: src/files.c:2412
+msgid "Save file under DIFFERENT NAME? "
 msgstr ""
 
-#: src/files.c:2480
-msgid "File was modified since you opened it, continue saving ? "
+#: src/files.c:2420
+#, fuzzy, c-format
+msgid "File \"%s\" exists; OVERWRITE? "
+msgstr "Fila eksisterer, SKRIV OVER?"
+
+#: src/files.c:2441
+msgid "File was modified since you opened it; continue saving? "
 msgstr ""
 
-#: src/files.c:2917
+#: src/files.c:2874
 msgid "(more)"
 msgstr "(meir)"
 
-#: src/files.c:3004
+#: src/files.c:2959
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -389,28 +371,28 @@ msgstr ""
 "\n"
 "Trykk Enter for å halda fram lastinga av nano\n"
 
-#: src/files.c:3020
+#: src/files.c:2975
 #, c-format
 msgid ""
 "Unable to create directory %s: %s\n"
 "It is required for saving/loading search history or cursor positions.\n"
 msgstr ""
 
-#: src/files.c:3026
+#: src/files.c:2982
 #, c-format
 msgid ""
 "Path %s is not a directory and needs to be.\n"
 "Nano will be unable to load or save search history or cursor positions.\n"
 msgstr ""
 
-#: src/files.c:3045
+#: src/files.c:3002
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I tried to move\n"
 "to the preferred location (%s) but encountered an error: %s"
 msgstr ""
 
-#: src/files.c:3049
+#: src/files.c:3006
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I moved\n"
@@ -418,785 +400,814 @@ msgid ""
 "(see the nano FAQ about this change)"
 msgstr ""
 
-#: src/files.c:3132 src/files.c:3140 src/files.c:3164 src/files.c:3176
+#: src/files.c:3089 src/files.c:3097 src/files.c:3121 src/files.c:3133
 #, c-format
 msgid "Error writing %s: %s\n"
 msgstr ""
 
 #. TRANSLATORS: Try to keep the next fifteen strings at most 10 characters.
-#: src/global.c:480
+#: src/global.c:483
 msgid "Exit"
 msgstr "Avslutt"
 
-#: src/global.c:481
+#: src/global.c:484
 msgid "Close"
 msgstr "Lukk"
 
-#: src/global.c:482
+#: src/global.c:485
 #, fuzzy
 msgid "Uncut Text"
 msgstr "U-klipp"
 
-#: src/global.c:484
+#: src/global.c:487
 #, fuzzy
 msgid "Unjustify"
 msgstr "U-ombrekk"
 
-#: src/global.c:490
+#: src/global.c:493
 msgid "Read File"
 msgstr "Les fil"
 
-#: src/global.c:491
+#: src/global.c:494
 msgid "Where Is"
 msgstr "Finn"
 
-#: src/global.c:492
+#: src/global.c:495
 msgid "Replace"
 msgstr "Erstatt"
 
-#: src/global.c:493
+#: src/global.c:496
 #, fuzzy
 msgid "Go To Line"
 msgstr "Gå til linje"
 
-#: src/global.c:494
+#: src/global.c:497
 #, fuzzy
 msgid "Prev Line"
 msgstr "Førre side"
 
-#: src/global.c:495
+#: src/global.c:498
 #, fuzzy
 msgid "Next Line"
 msgstr "Neste fil"
 
-#: src/global.c:496
+#: src/global.c:499
 msgid "Prev Page"
 msgstr "Førre side"
 
-#: src/global.c:497
+#: src/global.c:500
 msgid "Next Page"
 msgstr "Neste side"
 
-#: src/global.c:499
+#: src/global.c:502
 msgid "Justify"
 msgstr "Brekk om"
 
-#: src/global.c:500
+#: src/global.c:503
 #, fuzzy
 msgid "FullJstify"
 msgstr "Brekk om"
 
-#: src/global.c:502
+#: src/global.c:505
 msgid "Refresh"
 msgstr "Frisk opp"
 
 #. TRANSLATORS: Try to keep this string at most 12 characters.
-#: src/global.c:505
+#: src/global.c:508
 #, fuzzy
 msgid "WhereIs Next"
 msgstr "Finn"
 
 #. TRANSLATORS: The next long series of strings are shortcut descriptions;
 #. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:512
+#: src/global.c:515
 msgid "Justify the current paragraph"
 msgstr "Brekk om avsnittet"
 
-#: src/global.c:514
+#: src/global.c:517
 msgid "Cancel the current function"
 msgstr "Avbryt gjeldande funksjon"
 
-#: src/global.c:515
+#: src/global.c:518
 msgid "Display this help text"
 msgstr ""
 
-#: src/global.c:518
+#: src/global.c:521
 #, fuzzy
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Lukk gjeldande fil/Avslutt nano"
 
-#: src/global.c:520
+#: src/global.c:523
 msgid "Exit from nano"
 msgstr "Avslutt nano"
 
-#: src/global.c:524
+#: src/global.c:527
 msgid "Write the current file to disk"
 msgstr "Lagra gjeldande fil"
 
-#: src/global.c:526
+#: src/global.c:529
 msgid "Insert another file into the current one"
 msgstr "Sett inn ei anna fil i denne"
 
-#: src/global.c:528
+#: src/global.c:531
 msgid "Search for a string or a regular expression"
 msgstr ""
 
-#: src/global.c:531
+#: src/global.c:533
 msgid "Search for a string"
 msgstr ""
 
-#: src/global.c:533
+#: src/global.c:534
+msgid "Refresh the file list"
+msgstr ""
+
+#: src/global.c:535
+msgid "Go to lefthand column"
+msgstr ""
+
+#: src/global.c:536
+msgid "Go to righthand column"
+msgstr ""
+
+#: src/global.c:538
 msgid "Go one screenful up"
 msgstr ""
 
-#: src/global.c:534
+#: src/global.c:539
 msgid "Go one screenful down"
 msgstr ""
 
-#: src/global.c:536
+#: src/global.c:541
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Klipp ut denne linja og lagra ho i utklippsbufferet"
 
-#: src/global.c:538
+#: src/global.c:543
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Set inn utklippsbufferet her"
 
-#: src/global.c:539
+#: src/global.c:544
 #, fuzzy
 msgid "Display the position of the cursor"
 msgstr "Vis markørposisjonen"
 
-#: src/global.c:541
+#: src/global.c:546
 #, fuzzy
 msgid "Invoke the spell checker, if available"
 msgstr "Start stavekontroll (om tilgjengeleg)"
 
-#: src/global.c:543
+#: src/global.c:548
 #, fuzzy
 msgid "Replace a string or a regular expression"
 msgstr "Erstatt feila: ukjent deluttrykk!"
 
-#: src/global.c:544
+#: src/global.c:549
 #, fuzzy
 msgid "Go to line and column number"
 msgstr "Hopp til eit linjenummer"
 
-#: src/global.c:546
+#: src/global.c:551
 #, fuzzy
 msgid "Mark text starting from the cursor position"
 msgstr "Marker teksten ved markøren"
 
-#: src/global.c:547
+#: src/global.c:552
 msgid "Repeat the last search"
 msgstr ""
 
-#: src/global.c:549
+#: src/global.c:554
 #, fuzzy
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "Klipp ut denne linja og lagra ho i utklippsbufferet"
 
-#: src/global.c:550
+#: src/global.c:555
 #, fuzzy
 msgid "Indent the current line"
 msgstr "Legg til noverande fil"
 
-#: src/global.c:551
+#: src/global.c:556
 #, fuzzy
 msgid "Unindent the current line"
 msgstr "Legg til noverande fil"
 
-#: src/global.c:552
+#: src/global.c:558
+msgid "Comment/uncomment the current line or marked lines"
+msgstr ""
+
+#: src/global.c:560
 msgid "Undo the last operation"
 msgstr ""
 
-#: src/global.c:553
+#: src/global.c:561
 msgid "Redo the last undone operation"
 msgstr ""
 
-#: src/global.c:555
+#: src/global.c:563
 #, fuzzy
 msgid "Go back one character"
 msgstr "Gå ein bokstav attende"
 
-#: src/global.c:556
+#: src/global.c:564
 #, fuzzy
 msgid "Go forward one character"
 msgstr "Gå ein bokstav fram"
 
-#: src/global.c:558
+#: src/global.c:566
 #, fuzzy
 msgid "Go back one word"
 msgstr "Gå ein bokstav attende"
 
-#: src/global.c:559
+#: src/global.c:567
 #, fuzzy
 msgid "Go forward one word"
 msgstr "Gå ein bokstav fram"
 
-#: src/global.c:561
+#: src/global.c:569
 #, fuzzy
 msgid "Go to previous line"
 msgstr "Gå til førre skjerm"
 
-#: src/global.c:562
+#: src/global.c:570
 #, fuzzy
 msgid "Go to next line"
 msgstr "Gå ei linje ned"
 
-#: src/global.c:563
+#: src/global.c:571
 #, fuzzy
 msgid "Go to beginning of current line"
 msgstr "Gå til starten av linja"
 
-#: src/global.c:564
+#: src/global.c:572
 #, fuzzy
 msgid "Go to end of current line"
 msgstr "Gå til slutten av linja"
 
-#: src/global.c:567
+#: src/global.c:575
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr ""
 
-#: src/global.c:569
+#: src/global.c:577
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr ""
 
-#: src/global.c:571
+#: src/global.c:579
 msgid "Go to the first line of the file"
 msgstr "Gå til første linje i fila"
 
-#: src/global.c:572
+#: src/global.c:580
 msgid "Go to the last line of the file"
 msgstr "Gå til siste linje i fila"
 
-#: src/global.c:574
+#: src/global.c:582
 #, fuzzy
 msgid "Go to the matching bracket"
 msgstr "Inga motsvarande klamme"
 
-#: src/global.c:576
+#: src/global.c:584
 msgid "Scroll up one line without scrolling the cursor"
 msgstr ""
 
-#: src/global.c:578
+#: src/global.c:586
 msgid "Scroll down one line without scrolling the cursor"
 msgstr ""
 
-#: src/global.c:581
+#: src/global.c:589
 #, fuzzy
 msgid "Switch to the previous file buffer"
 msgstr "Gå til førre skjerm"
 
-#: src/global.c:582
+#: src/global.c:590
 msgid "Switch to the next file buffer"
 msgstr ""
 
-#: src/global.c:584
+#: src/global.c:592
 msgid "Insert the next keystroke verbatim"
 msgstr ""
 
-#: src/global.c:585
+#: src/global.c:593
 #, fuzzy
 msgid "Insert a tab at the cursor position"
 msgstr "Sett inn eit linjeskift"
 
-#: src/global.c:586
+#: src/global.c:594
 #, fuzzy
 msgid "Insert a newline at the cursor position"
 msgstr "Sett inn eit linjeskift"
 
-#: src/global.c:587
+#: src/global.c:595
 msgid "Delete the character under the cursor"
 msgstr "Slett bokstaven under markøren"
 
-#: src/global.c:589
+#: src/global.c:597
 msgid "Delete the character to the left of the cursor"
 msgstr "Slett bokstaven til venstre for markøren"
 
-#: src/global.c:592
+#: src/global.c:600
 msgid "Cut backward from cursor to word start"
 msgstr ""
 
-#: src/global.c:594
+#: src/global.c:602
 msgid "Cut forward from cursor to next word start"
 msgstr ""
 
-#: src/global.c:596
+#: src/global.c:604
 #, fuzzy
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Set inn utklippsbufferet her"
 
-#: src/global.c:599
+#: src/global.c:607
 #, fuzzy
 msgid "Justify the entire file"
 msgstr "Brekk om avsnittet"
 
-#: src/global.c:603
+#: src/global.c:611
 msgid "Count the number of words, lines, and characters"
 msgstr ""
 
-#: src/global.c:606
+#: src/global.c:614
 msgid "Refresh (redraw) the current screen"
 msgstr "Teikn skjermen på nytt"
 
-#: src/global.c:608
+#: src/global.c:616
 msgid "Suspend the editor (if suspension is enabled)"
 msgstr ""
 
-#: src/global.c:610
+#: src/global.c:618
 msgid "Save file without prompting"
 msgstr ""
 
-#: src/global.c:611
+#: src/global.c:619
 #, fuzzy
 msgid "Search next occurrence backward"
 msgstr "Søk bakover"
 
-#: src/global.c:612
+#: src/global.c:620
 msgid "Search next occurrence forward"
 msgstr ""
 
-#: src/global.c:614
+#: src/global.c:622
 #, fuzzy
 msgid "Toggle the case sensitivity of the search"
 msgstr "Søk (skil mellom store og små bokstavar)"
 
-#: src/global.c:616
+#: src/global.c:624
 #, fuzzy
 msgid "Reverse the direction of the search"
 msgstr "Vis markørposisjonen"
 
-#: src/global.c:620
+#: src/global.c:628
 #, fuzzy
 msgid "Toggle the use of regular expressions"
 msgstr "Bruk regulære uttrykk"
 
-#: src/global.c:624
+#: src/global.c:632
 #, fuzzy
 msgid "Recall the previous search/replace string"
 msgstr "Gå til førre skjerm"
 
-#: src/global.c:626
+#: src/global.c:634
 msgid "Recall the next search/replace string"
 msgstr ""
 
-#: src/global.c:629
+#: src/global.c:637
 msgid "Go to file browser"
 msgstr "Gå til fillesar"
 
-#: src/global.c:632
+#: src/global.c:640
 #, fuzzy
 msgid "Toggle the use of DOS format"
 msgstr "Skriv fila på DOS-format"
 
-#: src/global.c:633
+#: src/global.c:641
 #, fuzzy
 msgid "Toggle the use of Mac format"
 msgstr "Skriv fila på Mac-format"
 
-#: src/global.c:634
+#: src/global.c:642
 msgid "Toggle appending"
 msgstr ""
 
-#: src/global.c:635
+#: src/global.c:643
 msgid "Toggle prepending"
 msgstr ""
 
-#: src/global.c:636
+#: src/global.c:644
 msgid "Toggle backing up of the original file"
 msgstr ""
 
-#: src/global.c:637
+#: src/global.c:645
 msgid "Execute external command"
 msgstr ""
 
-#: src/global.c:639
+#: src/global.c:647
 msgid "Close buffer without saving it"
 msgstr ""
 
-#: src/global.c:641
+#: src/global.c:649
 msgid "Toggle the use of a new buffer"
 msgstr ""
 
-#: src/global.c:644
+#: src/global.c:652
 #, fuzzy
 msgid "Exit from the file browser"
 msgstr "Gå til fillesar"
 
-#: src/global.c:645
+#: src/global.c:653
 #, fuzzy
 msgid "Go to the first file in the list"
 msgstr "Gå til første linje i fila"
 
-#: src/global.c:646
+#: src/global.c:654
 #, fuzzy
 msgid "Go to the last file in the list"
 msgstr "Gå til siste linje i fila"
 
-#: src/global.c:647
+#: src/global.c:655
 #, fuzzy
 msgid "Go to the previous file in the list"
 msgstr "Gå til første linje i fila"
 
-#: src/global.c:648
+#: src/global.c:656
 #, fuzzy
 msgid "Go to the next file in the list"
 msgstr "Gå til siste linje i fila"
 
-#: src/global.c:649
+#: src/global.c:657
 #, fuzzy
 msgid "Go to directory"
 msgstr "Gå til katalog"
 
-#: src/global.c:652
+#: src/global.c:660
 #, fuzzy
 msgid "Invoke the linter, if available"
 msgstr "Start stavekontroll (om tilgjengeleg)"
 
-#: src/global.c:653
+#: src/global.c:661
 msgid "Go to previous linter msg"
 msgstr ""
 
-#: src/global.c:654
+#: src/global.c:662
 msgid "Go to next linter msg"
 msgstr ""
 
-#: src/global.c:656
+#: src/global.c:664
 #, fuzzy
 msgid "Invoke formatter, if available"
 msgstr "Start stavekontroll (om tilgjengeleg)"
 
 #. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:671
+#: src/global.c:679
 msgid "Get Help"
 msgstr "Hjelp"
 
-#: src/global.c:674 src/prompt.c:858
+#: src/global.c:682 src/prompt.c:855
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: src/global.c:687
+#: src/global.c:695
 #, fuzzy
 msgid "Write Out"
 msgstr "Lagra"
 
-#: src/global.c:723
+#: src/global.c:731
 #, fuzzy
 msgid "Go To Dir"
 msgstr "Gå til katalog"
 
-#: src/global.c:738
+#: src/global.c:746
 msgid "Cut Text"
 msgstr "Klipp"
 
-#: src/global.c:753
+#: src/global.c:761
 msgid "To Spell"
 msgstr "Staving"
 
-#: src/global.c:757
+#: src/global.c:765
 #, fuzzy
 msgid "To Linter"
 msgstr "Gå til linje"
 
-#: src/global.c:760
+#: src/global.c:768
 #, fuzzy
 msgid "Formatter"
 msgstr "DOS-format"
 
-#: src/global.c:767
+#: src/global.c:775
 msgid "Case Sens"
 msgstr "Store/små"
 
-#: src/global.c:772
+#: src/global.c:780
 msgid "Regexp"
 msgstr "Reguttrykk"
 
-#: src/global.c:777
+#: src/global.c:785
 #, fuzzy
 msgid "Backwards"
 msgstr " [Bakover]"
 
-#: src/global.c:784
+#: src/global.c:792
 msgid "No Replace"
 msgstr "Inga erstatting"
 
-#: src/global.c:792
+#: src/global.c:800
 msgid "Cur Pos"
 msgstr "Posisjon"
 
-#: src/global.c:807
+#: src/global.c:815
 msgid "First Line"
 msgstr "Første linje"
 
-#: src/global.c:809
+#: src/global.c:817
 msgid "Last Line"
 msgstr "Siste linje"
 
-#: src/global.c:816
+#: src/global.c:824
 #, fuzzy
 msgid "To Bracket"
 msgstr "Ikkje ei klamme"
 
-#: src/global.c:819
+#: src/global.c:827
 msgid "Mark Text"
 msgstr "Merk tekst"
 
-#: src/global.c:822
+#: src/global.c:830
 #, fuzzy
 msgid "Copy Text"
 msgstr "Klipp"
 
-#: src/global.c:825
+#: src/global.c:833
 #, fuzzy
 msgid "Indent Text"
 msgstr "Klipp"
 
-#: src/global.c:827
+#: src/global.c:835
 msgid "Unindent Text"
 msgstr ""
 
-#: src/global.c:830
+#: src/global.c:838
 msgid "Undo"
 msgstr ""
 
-#: src/global.c:832
+#: src/global.c:840
 msgid "Redo"
 msgstr ""
 
-#: src/global.c:836 src/global.c:842
+#: src/global.c:844 src/global.c:850
 msgid "Back"
 msgstr "Bakover"
 
-#: src/global.c:838 src/global.c:844
+#: src/global.c:846 src/global.c:852
 msgid "Forward"
 msgstr "Framover"
 
-#: src/global.c:849
+#: src/global.c:857
 msgid "Prev Word"
 msgstr ""
 
-#: src/global.c:851
+#: src/global.c:859
 msgid "Next Word"
 msgstr ""
 
-#: src/global.c:855
+#: src/global.c:863
 msgid "Home"
 msgstr "Home"
 
-#: src/global.c:857
+#: src/global.c:865
 msgid "End"
 msgstr "End"
 
-#: src/global.c:866
+#: src/global.c:874
 msgid "Beg of Par"
 msgstr ""
 
-#: src/global.c:868
+#: src/global.c:876
 msgid "End of Par"
 msgstr ""
 
-#: src/global.c:873
+#: src/global.c:881
 msgid "Scroll Up"
 msgstr ""
 
-#: src/global.c:875
+#: src/global.c:883
 msgid "Scroll Down"
 msgstr ""
 
-#: src/global.c:880
+#: src/global.c:888
 #, fuzzy
 msgid "Prev File"
 msgstr "Førre fil"
 
-#: src/global.c:882
+#: src/global.c:890
 msgid "Next File"
 msgstr "Neste fil"
 
-#: src/global.c:891
+#: src/global.c:899
 msgid "Verbatim"
 msgstr ""
 
-#: src/global.c:894
+#: src/global.c:902
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:896
+#: src/global.c:904
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:899
+#: src/global.c:907
 msgid "Delete"
 msgstr "Delete"
 
-#: src/global.c:901
+#: src/global.c:909
 msgid "Backspace"
 msgstr "Backspace"
 
 #. TRANSLATORS: The next two strings refer to cutting words.
-#: src/global.c:912
+#: src/global.c:920
 #, fuzzy
 msgid "Cut Left"
 msgstr "Klipp"
 
-#: src/global.c:914
+#: src/global.c:922
 msgid "Cut Right"
 msgstr ""
 
-#: src/global.c:916
+#: src/global.c:924
 msgid "CutTillEnd"
 msgstr ""
 
-#: src/global.c:926
+#: src/global.c:934
 msgid "Word Count"
 msgstr ""
 
-#: src/global.c:933
+#: src/global.c:941
 msgid "Suspend"
 msgstr "Legg i bakgrunnen"
 
-#: src/global.c:937
+#: src/global.c:945
+#, fuzzy
+msgid "Comment Lines"
+msgstr "Gå til linje"
+
+#: src/global.c:949
 msgid "Save"
 msgstr ""
 
-#: src/global.c:940
+#: src/global.c:952
 #, fuzzy
 msgid "Previous"
 msgstr "Førre fil"
 
-#: src/global.c:942
+#: src/global.c:954
 #, fuzzy
 msgid "Next"
 msgstr "Neste side"
 
-#: src/global.c:948
+#: src/global.c:960
 msgid "PrevHstory"
 msgstr ""
 
-#: src/global.c:951
+#: src/global.c:963
 msgid "NextHstory"
 msgstr ""
 
-#: src/global.c:955
+#: src/global.c:972
 msgid "Go To Text"
 msgstr ""
 
-#: src/global.c:959
+#: src/global.c:976
 msgid "DOS Format"
 msgstr "DOS-format"
 
-#: src/global.c:961
+#: src/global.c:978
 msgid "Mac Format"
 msgstr "Mac-format"
 
-#: src/global.c:969
+#: src/global.c:986
 msgid "Append"
 msgstr "Legg til"
 
-#: src/global.c:971
+#: src/global.c:988
 #, fuzzy
 msgid "Prepend"
 msgstr "Legg til"
 
-#: src/global.c:974
+#: src/global.c:991
 #, fuzzy
 msgid "Backup File"
 msgstr "Les fil"
 
-#: src/global.c:981
+#: src/global.c:998
 msgid "Execute Command"
 msgstr ""
 
-#: src/global.c:996
+#: src/global.c:1013
 msgid "To Files"
 msgstr "Til filer"
 
-#: src/global.c:1004
+#: src/global.c:1021
 #, fuzzy
 msgid "First File"
 msgstr "Første linje"
 
-#: src/global.c:1006
+#: src/global.c:1023
 #, fuzzy
 msgid "Last File"
 msgstr "Siste linje"
 
-#: src/global.c:1010
+#: src/global.c:1027
 msgid "Discard buffer"
 msgstr ""
 
+#: src/global.c:1038
+msgid "Left Column"
+msgstr ""
+
+#: src/global.c:1040
+msgid "Right Column"
+msgstr ""
+
 #. TRANSLATORS: Try to keep the next two strings at most 20 characters.
-#: src/global.c:1020
+#: src/global.c:1047
 msgid "Prev Lint Msg"
 msgstr ""
 
-#: src/global.c:1022
+#: src/global.c:1049
 msgid "Next Lint Msg"
 msgstr ""
 
 #. TRANSLATORS: The next seventeen strings are toggle descriptions;
 #. * they are best kept shorter than 40 characters, but may be longer.
-#: src/global.c:1285
+#: src/global.c:1316
 msgid "Help mode"
 msgstr "Hjelpetekst"
 
-#: src/global.c:1287
+#: src/global.c:1318
 #, fuzzy
 msgid "Constant cursor position display"
 msgstr "Fast markørposisjon"
 
-#: src/global.c:1289
+#: src/global.c:1320
 msgid "Use of one more line for editing"
 msgstr ""
 
-#: src/global.c:1291
+#: src/global.c:1322
 msgid "Smooth scrolling"
 msgstr "Jamn linjerulling"
 
-#: src/global.c:1293
+#: src/global.c:1324
 #, fuzzy
 msgid "Soft wrapping of overlong lines"
 msgstr " -w \t\tIkkje bryt lange linjer\n"
 
-#: src/global.c:1295
+#: src/global.c:1326
 msgid "Whitespace display"
 msgstr ""
 
-#: src/global.c:1297
+#: src/global.c:1328
 msgid "Color syntax highlighting"
 msgstr ""
 
-#: src/global.c:1299
+#: src/global.c:1330
 msgid "Smart home key"
 msgstr ""
 
-#: src/global.c:1301
+#: src/global.c:1332
 msgid "Auto indent"
 msgstr "Automatisk innrykk"
 
-#: src/global.c:1303
+#: src/global.c:1334
 msgid "Cut to end"
 msgstr "Klipp til slutten"
 
-#: src/global.c:1305
+#: src/global.c:1336
 msgid "Hard wrapping of overlong lines"
 msgstr ""
 
-#: src/global.c:1307
+#: src/global.c:1338
 msgid "Conversion of typed tabs to spaces"
 msgstr ""
 
-#: src/global.c:1309
+#: src/global.c:1340
 msgid "Backup files"
 msgstr ""
 
-#: src/global.c:1311
+#: src/global.c:1342
 msgid "Reading file into separate buffer"
 msgstr ""
 
-#: src/global.c:1313
+#: src/global.c:1344
 msgid "Mouse support"
 msgstr "Musestøtte"
 
-#: src/global.c:1315
+#: src/global.c:1346
 msgid "No conversion from DOS/Mac format"
 msgstr "Inga omsetjing frå DOS/Mac-format"
 
-#: src/global.c:1317
+#: src/global.c:1348
 #, fuzzy
 msgid "Suspension"
 msgstr "Legg i bakgrunnen"
 
-#: src/help.c:209
+#: src/help.c:211
 #, fuzzy
 msgid ""
 "Search Command Help Text\n"
@@ -1224,7 +1235,7 @@ msgstr ""
 " Følgjande funksjonstastar er tilgjengelege i søkjemodus:\n"
 "\n"
 
-#: src/help.c:218
+#: src/help.c:220
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1233,7 +1244,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:224
+#: src/help.c:226
 #, fuzzy
 msgid ""
 "Go To Line Help Text\n"
@@ -1254,7 +1265,7 @@ msgstr ""
 " Følgjande funksjonstastar er tilgjengelege i Gå til linje-modus:\n"
 "\n"
 
-#: src/help.c:233
+#: src/help.c:235
 #, fuzzy
 msgid ""
 "Insert File Help Text\n"
@@ -1282,7 +1293,7 @@ msgstr ""
 " Følgjande funksjonstastar er tilgjengelege i Set inn fil-modus:\n"
 "\n"
 
-#: src/help.c:242
+#: src/help.c:244
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1291,7 +1302,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:248
+#: src/help.c:250
 #, fuzzy
 msgid ""
 "Write File Help Text\n"
@@ -1319,7 +1330,7 @@ msgstr ""
 " Følgjande funksjonstastar er tilgjengelege i Lagre fil-modus:\n"
 "\n"
 
-#: src/help.c:262
+#: src/help.c:264
 #, fuzzy
 msgid ""
 "File Browser Help Text\n"
@@ -1344,7 +1355,7 @@ msgstr ""
 " Følgjande funksjonstastar er tilgjengelege i filutforskaren:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:277
 #, fuzzy
 msgid ""
 "Browser Search Command Help Text\n"
@@ -1373,13 +1384,13 @@ msgstr ""
 " Følgjande funksjonstastar er tilgjengelege i søkjemodus:\n"
 "\n"
 
-#: src/help.c:284
+#: src/help.c:286
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
 msgstr ""
 
-#: src/help.c:288
+#: src/help.c:290
 #, fuzzy
 msgid ""
 "Browser Go To Directory Help Text\n"
@@ -1402,7 +1413,7 @@ msgstr ""
 " Følgjande funksjonstastar er tilgjengelege i Gå til katalog-modus:\n"
 "\n"
 
-#: src/help.c:301
+#: src/help.c:303
 #, fuzzy
 msgid ""
 "Spell Check Help Text\n"
@@ -1425,7 +1436,7 @@ msgstr ""
 " Følgjande andre funksjonar er tilgjengelege i stavesjekkingsmodus:\n"
 "\n"
 
-#: src/help.c:316
+#: src/help.c:318
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1437,7 +1448,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:329
+#: src/help.c:331
 #, fuzzy
 msgid ""
 "Main nano help text\n"
@@ -1464,15 +1475,14 @@ msgstr ""
 "tastaturoppsettet ditt. Dei følgjande tastetrykkja er tilgjengelege i "
 "hovudvindauget. Valfrie tastar er vist i parentes:\n"
 
-#: src/help.c:339
+#: src/help.c:341
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
-" The notation for shortcuts is as follows: Control-key sequences are notated "
-"with a caret (^) symbol and can be entered either by using the Control "
-"(Ctrl) key or pressing the Escape (Esc) key twice.  Escape-key sequences are "
-"notated with the Meta (M-) symbol and can be entered using either the Esc, "
-"Alt, or Meta key depending on your keyboard setup.  "
+" Shortcuts are written as follows: Control-key sequences are notated with a "
+"'^' and can be entered either by using the Ctrl key or pressing the Esc key "
+"twice.  Meta-key sequences are notated with 'M-' and can be entered using "
+"either the Alt, Cmd, or Esc key, depending on your keyboard setup.  "
 msgstr ""
 
 #: src/help.c:348
@@ -1489,21 +1499,21 @@ msgstr ""
 msgid "enable/disable"
 msgstr "%s skru på/av"
 
-#: src/nano.c:559
+#: src/nano.c:560
 #, fuzzy
 msgid "Key is invalid in view mode"
 msgstr "Tasten er ulovleg i VIS-modus"
 
-#: src/nano.c:565
+#: src/nano.c:566
 #, fuzzy
 msgid "This function is disabled in restricted mode"
 msgstr "Kan ikkje gå til foreldrekatalogen i avgrensa modus"
 
-#: src/nano.c:573
+#: src/nano.c:574
 msgid "Help is not available"
 msgstr ""
 
-#: src/nano.c:684
+#: src/nano.c:686
 #, c-format
 msgid ""
 "\n"
@@ -1512,7 +1522,7 @@ msgstr ""
 "\n"
 "Buffer lagra til %s\n"
 
-#: src/nano.c:686
+#: src/nano.c:688
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -1521,7 +1531,7 @@ msgstr ""
 "\n"
 "Buffer lagra til %s\n"
 
-#: src/nano.c:689
+#: src/nano.c:691
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -1797,17 +1807,22 @@ msgstr " -z \t\tTillat 
 msgid "Enable soft line wrapping"
 msgstr ""
 
-#: src/nano.c:937
+#: src/nano.c:940
 #, fuzzy, c-format
-msgid " GNU nano, version %s\n"
-msgstr "GNU nano versjon %s (kompilert %s, %s)\n"
+msgid " nano, version %s\n"
+msgstr "versjon "
 
-#: src/nano.c:940
+#: src/nano.c:943
+#, c-format
+msgid " (C) 2014..%s the contributors to nano\n"
+msgstr ""
+
+#: src/nano.c:945
 #, fuzzy, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr "Epost: nano@nano-editor.org\tVev: http://www.nano-editor.org"
 
-#: src/nano.c:941
+#: src/nano.c:946
 #, c-format
 msgid ""
 "\n"
@@ -1816,69 +1831,84 @@ msgstr ""
 "\n"
 " Kompilerte tillegg:"
 
-#: src/nano.c:1073
+#: src/nano.c:1081
 #, fuzzy
 msgid "No file name"
 msgstr "filnamnet er %s"
 
-#: src/nano.c:1108
-msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
-msgstr "Lagra endra buffer (\"No\" VIL MISSA ENDRINGANE)? "
+#: src/nano.c:1115
+msgid "Save modified buffer?  (Answering \"No\" will DISCARD changes.) "
+msgstr ""
 
-#: src/nano.c:1168
+#: src/nano.c:1178
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr ""
 
-#: src/nano.c:1192
+#: src/nano.c:1202
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr ""
 
-#: src/nano.c:1256
+#: src/nano.c:1266
 #, fuzzy
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Mottok SIGHUP"
 
-#: src/nano.c:1272
+#: src/nano.c:1282
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr ""
 
-#: src/nano.c:1294
+#: src/nano.c:1304
 msgid "Suspension is not enabled"
 msgstr ""
 
-#: src/nano.c:1448
+#: src/nano.c:1459
 msgid "enabled"
 msgstr "på"
 
-#: src/nano.c:1448
+#: src/nano.c:1459
 msgid "disabled"
 msgstr "av"
 
-#: src/nano.c:1607 src/winio.c:1125
-msgid "Unknown Command"
+#: src/nano.c:1573
+msgid "Unbound key"
+msgstr ""
+
+#: src/nano.c:1577
+#, c-format
+msgid "Unbound key: M-%c"
+msgstr ""
+
+#: src/nano.c:1579
+#, c-format
+msgid "Unbound key: ^%c"
 msgstr ""
 
-#: src/nano.c:1720
+#: src/nano.c:1581
+#, c-format
+msgid "Unbound key: %c"
+msgstr ""
+
+#: src/nano.c:1745
 msgid "XON ignored, mumble mumble"
 msgstr ""
 
-#: src/nano.c:1725
+#: src/nano.c:1750
 msgid "XOFF ignored, mumble mumble"
 msgstr ""
 
-#: src/nano.c:2139 src/rcfile.c:1334
+#: src/nano.c:2166 src/rcfile.c:1187
 #, fuzzy, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "tab-breidda du foreslo (%d) er for smal"
 
-#: src/nano.c:2200 src/rcfile.c:1259
+#: src/nano.c:2227 src/rcfile.c:1128
 #, fuzzy, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "fyllbreidda du foreslo (%d) er for smal"
 
-#: src/nano.c:2247
+#: src/nano.c:2276
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr ""
@@ -1886,117 +1916,120 @@ msgstr ""
 #. TRANSLATORS: For the next three strings, if possible, specify
 #. * the single-byte shortcuts for both your language and English.
 #. * For example, in French: "OoYy" for "Oui".
-#: src/prompt.c:821
+#: src/prompt.c:818
 msgid "Yy"
 msgstr "JjYy"
 
-#: src/prompt.c:822
+#: src/prompt.c:819
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:823
+#: src/prompt.c:820
 msgid "Aa"
 msgstr "Aa"
 
-#: src/prompt.c:845
+#: src/prompt.c:842
 msgid "Yes"
 msgstr "Ja"
 
-#: src/prompt.c:850
+#: src/prompt.c:847
 msgid "All"
 msgstr "Alle"
 
-#: src/prompt.c:855
+#: src/prompt.c:852
 msgid "No"
 msgstr "Nei"
 
-#: src/rcfile.c:142
+#: src/rcfile.c:144
 #, fuzzy, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Feil i %s på linje %d: "
 
-#: src/rcfile.c:201
+#: src/rcfile.c:203
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr ""
 
-#: src/rcfile.c:228 src/rcfile.c:280 src/rcfile.c:732 src/rcfile.c:793
-#: src/rcfile.c:882 src/rcfile.c:933
+#: src/rcfile.c:231 src/rcfile.c:674 src/rcfile.c:725 src/rcfile.c:824
 #, fuzzy
 msgid "Regex strings must begin and end with a \" character"
 msgstr "reguttrykk må starte og slutte med eit \"-teikn\n"
 
-#: src/rcfile.c:254 src/search.c:62
+#: src/rcfile.c:257 src/search.c:61
 #, fuzzy, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Kan ikkje opna «%s»: %s"
 
-#: src/rcfile.c:274
+#: src/rcfile.c:279
 #, fuzzy
 msgid "Missing syntax name"
 msgstr "Fargenamnet manglar"
 
-#: src/rcfile.c:345
+#: src/rcfile.c:288
+msgid "A syntax name must be quoted"
+msgstr ""
+
+#: src/rcfile.c:297
 msgid "The \"none\" syntax is reserved"
 msgstr ""
 
-#: src/rcfile.c:352
-msgid "The \"default\" syntax must take no extensions"
+#: src/rcfile.c:327
+msgid "The \"default\" syntax does not accept extensions"
 msgstr ""
 
-#: src/rcfile.c:424
+#: src/rcfile.c:369
 #, fuzzy
 msgid "Missing key name"
 msgstr "Fargenamnet manglar"
 
-#: src/rcfile.c:433 src/rcfile.c:444
+#: src/rcfile.c:378 src/rcfile.c:389
 msgid "Key name is too short"
 msgstr ""
 
-#: src/rcfile.c:454
+#: src/rcfile.c:399
 msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr ""
 
-#: src/rcfile.c:457
+#: src/rcfile.c:402
 #, c-format
 msgid "Key name %s is invalid"
 msgstr ""
 
-#: src/rcfile.c:466
+#: src/rcfile.c:411
 msgid "Must specify a function to bind the key to"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the word "all".
-#: src/rcfile.c:476
+#: src/rcfile.c:421
 msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
 
-#: src/rcfile.c:483
+#: src/rcfile.c:428
 #, c-format
 msgid "Cannot map name \"%s\" to a function"
 msgstr ""
 
-#: src/rcfile.c:490
+#: src/rcfile.c:435
 #, c-format
 msgid "Cannot map name \"%s\" to a menu"
 msgstr ""
 
-#: src/rcfile.c:522
+#: src/rcfile.c:467
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr ""
 
-#: src/rcfile.c:534
+#: src/rcfile.c:479
 #, c-format
 msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr ""
 
-#: src/rcfile.c:631
+#: src/rcfile.c:576
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr ""
 
-#: src/rcfile.c:674
+#: src/rcfile.c:616
 #, fuzzy, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -2010,128 +2043,115 @@ msgstr ""
 "«white» (kvit), «yellow» (gul), «cyan» (lysblå), «magenta» (fiolett) og\n"
 "«black» (svart), med den valfrie nemninga «bright» (lys) først.\n"
 
-#: src/rcfile.c:696
-msgid "Cannot add a color command without a syntax command"
+#: src/rcfile.c:637 src/rcfile.c:795 src/rcfile.c:858
+#, c-format
+msgid "A '%s' command requires a preceding 'syntax' command"
 msgstr ""
 
-#: src/rcfile.c:701
+#: src/rcfile.c:643
 msgid "Missing color name"
 msgstr "Fargenamnet manglar"
 
-#: src/rcfile.c:711 src/rcfile.c:872
-msgid "Missing regex string"
+#: src/rcfile.c:653 src/rcfile.c:807
+#, c-format
+msgid "Missing regex string after '%s' command"
 msgstr ""
 
-#: src/rcfile.c:787
+#: src/rcfile.c:719
 #, fuzzy
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr ""
 "\n"
 "\tfor kvar «start=» må der vera ein «end=»"
 
-#: src/rcfile.c:839
+#: src/rcfile.c:768
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
 msgstr ""
 
-#: src/rcfile.c:867
-msgid "Cannot add a header regex without a syntax command"
-msgstr ""
-
-#: src/rcfile.c:922
-msgid "Cannot add a magic string regex without a syntax command"
-msgstr ""
-
-#: src/rcfile.c:927
-#, fuzzy
-msgid "Missing magic string name"
-msgstr "Fargenamnet manglar"
-
-#: src/rcfile.c:985
-msgid "Cannot add a linter without a syntax command"
+#: src/rcfile.c:802
+#, c-format
+msgid "The \"default\" syntax does not accept '%s' regexes"
 msgstr ""
 
-#: src/rcfile.c:990
-#, fuzzy
-msgid "Missing linter command"
-msgstr "Fargenamnet manglar"
-
-#: src/rcfile.c:1011
-msgid "Cannot add formatter without a syntax command"
+#: src/rcfile.c:863
+#, c-format
+msgid "Missing command after '%s'"
 msgstr ""
 
-#: src/rcfile.c:1016
-msgid "Missing formatter command"
+#: src/rcfile.c:879
+#, c-format
+msgid "Argument of '%s' lacks closing \""
 msgstr ""
 
-#: src/rcfile.c:1046
+#: src/rcfile.c:910
 #, c-format
 msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr ""
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:912
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
 
-#: src/rcfile.c:1109
+#: src/rcfile.c:971
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr ""
 
-#: src/rcfile.c:1125 src/rcfile.c:1134 src/rcfile.c:1144
+#: src/rcfile.c:993 src/rcfile.c:1202
 #, c-format
-msgid "Command \"%s\" not allowed in included file"
+msgid "Syntax \"%s\" has no color commands"
 msgstr ""
 
-#: src/rcfile.c:1150 src/rcfile.c:1359
+#: src/rcfile.c:1024
 #, c-format
-msgid "Syntax \"%s\" has no color commands"
+msgid "Command \"%s\" not allowed in included file"
 msgstr ""
 
-#: src/rcfile.c:1180
+#: src/rcfile.c:1039
 #, fuzzy, c-format
 msgid "Command \"%s\" not understood"
 msgstr "kommandoen %s er ikkje forståeleg"
 
-#: src/rcfile.c:1195
+#: src/rcfile.c:1051
 #, fuzzy
 msgid "Missing option"
 msgstr "Fargenamnet manglar"
 
-#: src/rcfile.c:1217
+#: src/rcfile.c:1065
+#, c-format
+msgid "Unknown option \"%s\""
+msgstr ""
+
+#: src/rcfile.c:1077
+#, fuzzy, c-format
+msgid "Cannot unset option \"%s\""
+msgstr "Kan ikkje endra storleik på toppvindauget"
+
+#: src/rcfile.c:1089
 #, fuzzy, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "opsjonen %s krev eit argument"
 
-#: src/rcfile.c:1235
+#: src/rcfile.c:1105
 msgid "Option is not a valid multibyte string"
 msgstr ""
 
-#: src/rcfile.c:1272 src/rcfile.c:1300 src/rcfile.c:1309
+#: src/rcfile.c:1139 src/rcfile.c:1160 src/rcfile.c:1167
 msgid "Non-blank characters required"
 msgstr ""
 
-#: src/rcfile.c:1282
+#: src/rcfile.c:1146
 msgid "Two single-column characters required"
 msgstr ""
 
-#: src/rcfile.c:1348
-#, fuzzy, c-format
-msgid "Cannot unset option \"%s\""
-msgstr "Kan ikkje endra storleik på toppvindauget"
-
-#: src/rcfile.c:1354
-#, c-format
-msgid "Unknown option \"%s\""
-msgstr ""
-
-#: src/rcfile.c:1413
+#: src/rcfile.c:1258
 msgid "I can't find my home directory!  Wah!"
 msgstr ""
 
-#: src/rcfile.c:1451
+#: src/rcfile.c:1295
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2140,45 +2160,50 @@ msgstr ""
 "\n"
 "Trykk Enter for å halda fram lastinga av nano\n"
 
-#: src/search.c:96
+#: src/search.c:95
 #, fuzzy, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "«%s» ikkje funne"
 
 #. TRANSLATORS: The next three strings are modifiers of the search prompt.
-#: src/search.c:176
+#: src/search.c:169
 msgid " [Case Sensitive]"
 msgstr " [Skil store/små]"
 
-#: src/search.c:180
+#: src/search.c:173
 msgid " [Regexp]"
 msgstr " [Reguttrykk]"
 
-#: src/search.c:184
+#: src/search.c:177
 msgid " [Backwards]"
 msgstr " [Bakover]"
 
 #. TRANSLATORS: The next two strings are modifiers of the search prompt.
-#: src/search.c:189
+#: src/search.c:182
 #, fuzzy
 msgid " (to replace) in selection"
 msgstr " (å erstatta)"
 
-#: src/search.c:191
+#: src/search.c:184
 msgid " (to replace)"
 msgstr " (å erstatta)"
 
+#: src/search.c:305
+#, fuzzy
+msgid "Searching..."
+msgstr "Søk"
+
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:718
+#: src/search.c:693
 msgid "Replace this instance?"
 msgstr "Erstatta dette tilfellet?"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:883
+#: src/search.c:840
 msgid "Replace with"
 msgstr "Erstatt med"
 
-#: src/search.c:924
+#: src/search.c:875
 #, fuzzy, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
@@ -2186,303 +2211,330 @@ msgstr[0] "Erstatta %d tilfelle"
 msgstr[1] "Erstatta %d tilfelle"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:964
+#: src/search.c:914
 #, fuzzy
 msgid "Enter line number, column number"
 msgstr "Skriv linjenummer"
 
-#: src/search.c:991
+#: src/search.c:939
 msgid "Invalid line or column number"
 msgstr ""
 
-#: src/search.c:1124
+#: src/search.c:1080
 msgid "Not a bracket"
 msgstr "Ikkje ei klamme"
 
-#: src/search.c:1191
+#: src/search.c:1146
 msgid "No matching bracket"
 msgstr "Inga motsvarande klamme"
 
-#: src/text.c:54
+#: src/text.c:53
 msgid "Mark Set"
 msgstr "Merke sett"
 
-#: src/text.c:58
+#: src/text.c:57
 #, fuzzy
 msgid "Mark Unset"
 msgstr "Merke fjerna"
 
-#: src/text.c:70
+#: src/text.c:69
 #, fuzzy, c-format
 msgid "Error invoking \"%s\""
 msgstr "Feil i %s på linje %d: "
 
-#: src/text.c:475
-msgid "Nothing in undo buffer!"
+#: src/text.c:468
+msgid "Commenting is not supported for this file type"
 msgstr ""
 
-#: src/text.c:481 src/text.c:634
-#, c-format
-msgid "Internal error: can't match line %d.  Please save your work."
+#: src/text.c:484
+msgid "Cannot comment past end of file"
+msgstr ""
+
+#: src/text.c:677
+msgid "Nothing in undo buffer!"
 msgstr ""
 
 #. TRANSLATORS: Eight of the next nine strings describe actions
 #. * that are undone or redone.  It are all nouns, not verbs.
-#: src/text.c:495 src/text.c:524 src/text.c:645 src/text.c:686
+#: src/text.c:695 src/text.c:724 src/text.c:857 src/text.c:898
 msgid "text add"
 msgstr ""
 
-#: src/text.c:505 src/text.c:656
+#: src/text.c:705 src/text.c:868
 #, fuzzy
 msgid "text delete"
 msgstr "Neste fil"
 
-#: src/text.c:528 src/text.c:694
+#: src/text.c:728 src/text.c:907
 msgid "line join"
 msgstr ""
 
-#: src/text.c:547 src/text.c:710
+#: src/text.c:747 src/text.c:923
 msgid "text cut"
 msgstr ""
 
-#: src/text.c:552 src/text.c:714
+#: src/text.c:752 src/text.c:927
 msgid "text uncut"
 msgstr ""
 
-#: src/text.c:558 src/text.c:691
+#: src/text.c:758 src/text.c:903
 msgid "Internal error: line is missing.  Please save your work."
 msgstr ""
 
-#: src/text.c:561 src/text.c:665
+#: src/text.c:762 src/text.c:877
 msgid "line break"
 msgstr ""
 
-#: src/text.c:569 src/text.c:725
+#: src/text.c:772 src/text.c:947
+msgid "comment"
+msgstr ""
+
+#: src/text.c:776 src/text.c:951
+msgid "uncomment"
+msgstr ""
+
+#: src/text.c:780 src/text.c:938
 #, fuzzy
 msgid "text insert"
 msgstr "Neste fil"
 
-#: src/text.c:589 src/text.c:718
+#: src/text.c:800 src/text.c:931
 #, fuzzy
 msgid "text replace"
 msgstr " (å erstatta)"
 
-#: src/text.c:596 src/text.c:732 src/text.c:1030 src/text.c:1174
+#: src/text.c:807 src/text.c:955 src/text.c:1267 src/text.c:1437
 msgid "Internal error: unknown type.  Please save your work."
 msgstr ""
 
-#: src/text.c:601
+#: src/text.c:813
 #, c-format
 msgid "Undid action (%s)"
 msgstr ""
 
-#: src/text.c:619
+#: src/text.c:832
 msgid "Nothing to re-do!"
 msgstr ""
 
-#: src/text.c:628
+#: src/text.c:841
 msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
 
-#: src/text.c:737
+#: src/text.c:961
 #, c-format
 msgid "Redid action (%s)"
 msgstr ""
 
-#: src/text.c:827 src/text.c:2508 src/text.c:2944
+#: src/text.c:1051 src/text.c:2765 src/text.c:3198
 #, fuzzy
 msgid "Could not create pipe"
 msgstr "Kunne ikkje oppretta mellombels fil: %s"
 
-#: src/text.c:853 src/text.c:2595 src/text.c:2750 src/text.c:2992
-#: src/text.c:3286
+#: src/text.c:1077 src/text.c:2852 src/text.c:3005 src/text.c:3246
+#: src/text.c:3540
 #, fuzzy
 msgid "Could not fork"
 msgstr "Kunne ikkje lukka %s: %s"
 
-#: src/text.c:1853
+#: src/text.c:2117
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr ""
 
-#: src/text.c:2241
+#: src/text.c:2499
 msgid "Can now UnJustify!"
 msgstr "Du kan no gjera om ombrekkinga!"
 
-#: src/text.c:2435
+#: src/text.c:2697
 msgid "Edit a replacement"
 msgstr "Rediger erstatning"
 
-#: src/text.c:2510
+#. TRANSLATORS: Shown after fixing misspellings in one word.
+#: src/text.c:2713
+msgid "Next word..."
+msgstr ""
+
+#: src/text.c:2767
 msgid "Creating misspelled word list, please wait..."
 msgstr ""
 
-#: src/text.c:2601 src/text.c:2999
+#: src/text.c:2858 src/text.c:3253
 msgid "Could not get size of pipe buffer"
 msgstr ""
 
-#: src/text.c:2652
+#: src/text.c:2907
 msgid "Error invoking \"spell\""
 msgstr ""
 
-#: src/text.c:2655
+#: src/text.c:2910
 msgid "Error invoking \"sort -f\""
 msgstr ""
 
-#: src/text.c:2658
+#: src/text.c:2913
 msgid "Error invoking \"uniq\""
 msgstr ""
 
-#: src/text.c:2881
+#: src/text.c:3135
 #, fuzzy
 msgid "Invoking spell checker, please wait"
 msgstr "Start stavekontroll (om tilgjengeleg)"
 
-#: src/text.c:2897
+#: src/text.c:3151
 #, fuzzy, c-format
 msgid "Spell checking failed: %s"
 msgstr "Stavekontroll feila"
 
-#: src/text.c:2899
+#: src/text.c:3153
 #, fuzzy, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Stavekontroll feila"
 
-#: src/text.c:2902
+#: src/text.c:3156
 msgid "Finished checking spelling"
 msgstr "Stavekontroll fullført"
 
-#: src/text.c:2927
+#: src/text.c:3181
 msgid "No linter defined for this type of file!"
 msgstr ""
 
-#: src/text.c:2932
+#: src/text.c:3186
 msgid "Save modified buffer before linting?"
 msgstr ""
 
-#: src/text.c:2949
+#: src/text.c:3203
 msgid "Invoking linter, please wait"
 msgstr ""
 
-#: src/text.c:3105
+#: src/text.c:3358
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr ""
 
-#: src/text.c:3134
+#: src/text.c:3388
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
 
-#: src/text.c:3153
+#: src/text.c:3407
 msgid "No more errors in unopened files, cancelling"
 msgstr ""
 
-#: src/text.c:3192
+#: src/text.c:3446
 msgid "At last message"
 msgstr ""
 
-#: src/text.c:3197
+#: src/text.c:3451
 msgid "At first message"
 msgstr ""
 
-#: src/text.c:3237
+#: src/text.c:3491
 msgid "Finished"
 msgstr ""
 
-#: src/text.c:3259
+#: src/text.c:3513
 msgid "Invoking formatter, please wait"
 msgstr ""
 
-#: src/text.c:3314
+#: src/text.c:3568
 msgid "Finished formatting"
 msgstr ""
 
-#: src/text.c:3396
+#: src/text.c:3650
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr ""
 
-#: src/text.c:3397
+#: src/text.c:3651
 #, fuzzy
 msgid "In Selection:  "
 msgstr "Legg til valt område på slutten av fil"
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3411
+#: src/text.c:3665
 msgid "Verbatim Input"
 msgstr ""
 
-#: src/utils.c:391 src/utils.c:403
+#: src/utils.c:392 src/utils.c:404
 #, fuzzy
 msgid "nano is out of memory!"
 msgstr "nano: malloc: tom for minne!"
 
+#: src/utils.c:625
+#, c-format
+msgid "Internal error: can't match line %d.  Please save your work."
+msgstr ""
+
+#. TRANSLATORS: This refers to a sequence of escape codes
+#. * (from the keyboard) that nano does not know about.
+#: src/winio.c:1121
+msgid "Unknown sequence"
+msgstr ""
+
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
 #: src/winio.c:1427
 msgid "Unicode Input"
 msgstr ""
 
-#: src/winio.c:1991 src/winio.c:1995
-msgid "Modified"
-msgstr "Endra"
-
-#: src/winio.c:1992
-msgid "View"
-msgstr ""
-
-#: src/winio.c:2006
+#: src/winio.c:1960
 #, fuzzy
 msgid "DIR:"
 msgstr " KAT: "
 
-#: src/winio.c:2013
+#: src/winio.c:1968
 #, fuzzy
 msgid "File:"
 msgstr "Fil: "
 
-#: src/winio.c:3141
+#: src/winio.c:1972 src/winio.c:1976
+msgid "Modified"
+msgstr "Endra"
+
+#: src/winio.c:1974
+msgid "View"
+msgstr ""
+
+#: src/winio.c:3105
 #, fuzzy, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "linje %d/%d (%.0f%%), kol %ld/%ld (%.0f%%), teikn %ld/%ld (%.0f%%)"
 
-#: src/winio.c:3271
+#: src/winio.c:3235
 msgid "The nano text editor"
 msgstr "Teksteditoren nano"
 
-#: src/winio.c:3272
+#: src/winio.c:3236
 #, fuzzy
 msgid "version"
 msgstr "versjon "
 
-#: src/winio.c:3273
+#: src/winio.c:3237
 msgid "Brought to you by:"
 msgstr "Gjeve til deg av:"
 
-#: src/winio.c:3274
+#: src/winio.c:3238
 msgid "Special thanks to:"
 msgstr "Spesiell takk til:"
 
 # Oversette dette ?
-#: src/winio.c:3275
+#: src/winio.c:3239
 msgid "The Free Software Foundation"
 msgstr "Free Sofware Foundation"
 
-#: src/winio.c:3276
+#: src/winio.c:3240
 msgid "the many translators and the TP"
 msgstr ""
 
-#: src/winio.c:3277
+#: src/winio.c:3241
 msgid "For ncurses:"
 msgstr ""
 
-#: src/winio.c:3278
+#: src/winio.c:3242
 msgid "and anyone else we forgot..."
 msgstr "og alle dei andre vi gløymde..."
 
-#: src/winio.c:3279
+#: src/winio.c:3243
 #, fuzzy
 msgid "Thank you for using nano!"
 msgstr "Takk for at du brukar nano!\n"
@@ -2714,6 +2766,9 @@ msgstr "Takk for at du brukar nano!\n"
 #~ msgid " +LINE\t\tStart at line number LINE\n"
 #~ msgstr " +LINJE\t\tStart på linje nummer LINJE\n"
 
+#~ msgid " GNU nano version %s (compiled %s, %s)\n"
+#~ msgstr "GNU nano versjon %s (kompilert %s, %s)\n"
+
 #~ msgid "check_wrap called with inptr->data=\"%s\"\n"
 #~ msgstr "check_wrap kalla med inptr->data=\"%s\"\n"
 
@@ -2726,6 +2781,9 @@ msgstr "Takk for at du brukar nano!\n"
 #~ msgid "Spell checking failed: unable to write temp file!"
 #~ msgstr "Stavekontroll feila: kunne ikkje laga mellombels fil!"
 
+#~ msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
+#~ msgstr "Lagra endra buffer (\"No\" VIL MISSA ENDRINGANE)? "
+
 #~ msgid "Cannot move top win"
 #~ msgstr "Kan ikke flytta toppvindauget"
 
diff --git a/po/pl.po b/po/pl.po
index b3a6c9f4..e97a9de0 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,447 +1,411 @@
 # Polish translations for the nano editor messages
-# Copyright (C) 2015 Free Software Foundation, Inc.
+# Copyright (C) 2016 Free Software Foundation, Inc.
 # This file is distributed under the same license as the nano package.
 #
 # Cezary Sliwa <sliwa@cft.edu.pl>, 2001.
 # Wojciech Kotwica <wkotwica@post.pl>, 2002.
-# Sergey Poznyakoff <gray@gnu.org>, 2010, 2015.
+# Sergey Poznyakoff <gray@gnu.org>, 2010, 2015-2016.
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 2.5.0\n"
+"Project-Id-Version: nano 2.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-25 16:41-0500\n"
-"PO-Revision-Date: 2015-12-14 23:51+0200\n"
+"POT-Creation-Date: 2016-06-17 15:41+0200\n"
+"PO-Revision-Date: 2016-03-15 18:18+0200\n"
 "Last-Translator: Sergey Poznyakoff <gray@gnu.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-2\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
+#: src/browser.c:144 src/browser.c:284 src/browser.c:334 src/files.c:996
+#: src/files.c:1003 src/files.c:1794 src/files.c:1919 src/files.c:1963
+#: src/files.c:1983 src/files.c:2099 src/files.c:3019 src/files.c:3242
+#: src/rcfile.c:540 src/rcfile.c:1280
+#, c-format
+msgid "Error reading %s: %s"
+msgstr "BÅ‚Ä…d odczytu %s: %s"
+
 #. TRANSLATORS: This is a prompt.
-#: src/browser.c:220
+#: src/browser.c:247
 msgid "Go To Directory"
-msgstr "Przejd¼ do katalogu"
+msgstr "Przejdź do katalogu"
 
-#: src/browser.c:227 src/browser.c:738 src/files.c:1174 src/files.c:2340
-#: src/nano.c:1120 src/search.c:202 src/search.c:290 src/search.c:895
-#: src/search.c:970 src/text.c:2935 src/text.c:3142
+#: src/browser.c:254 src/browser.c:723 src/files.c:1126 src/files.c:2292
+#: src/nano.c:1128 src/search.c:195 src/search.c:297 src/search.c:851
+#: src/search.c:918 src/text.c:3189 src/text.c:3396
 msgid "Cancelled"
 msgstr "Anulowano"
 
-#: src/browser.c:253 src/browser.c:300
-#, c-format
-msgid "Can't go outside of %s in restricted mode"
-msgstr "W trybie ograniczonym nie mo¿na wyj¶æ poza %s"
-
-#: src/browser.c:264 src/browser.c:310 src/browser.c:326 src/files.c:1044
-#: src/files.c:1052 src/files.c:1844 src/files.c:1971 src/files.c:2016
-#: src/files.c:2037 src/files.c:2156 src/files.c:3062 src/files.c:3285
-#: src/rcfile.c:596 src/rcfile.c:1435
-#, c-format
-msgid "Error reading %s: %s"
-msgstr "B³±d odczytu %s: %s"
+#. TRANSLATORS: This refers to the option --operatingdir,
+#. * not to --restricted.
+#: src/browser.c:274 src/browser.c:326
+#, fuzzy, c-format
+msgid "Can't go outside of %s in confined mode"
+msgstr "W trybie ograniczonym nie można wyjść poza %s"
 
-#: src/browser.c:290
+#: src/browser.c:317
 msgid "Can't move up a directory"
-msgstr "Nie mo¿na przej¶æ do katalogu wy¿ej"
+msgstr "Nie można przejść do katalogu wyżej"
 
 #. TRANSLATORS: Try to keep this at most 7 characters.
-#: src/browser.c:615 src/browser.c:623
+#: src/browser.c:590 src/browser.c:598
 msgid "(dir)"
 msgstr "(kat)"
 
 #. TRANSLATORS: Try to keep this at most 12 characters.
-#: src/browser.c:620
+#: src/browser.c:595
 msgid "(parent dir)"
 msgstr "(kat nad)"
 
 #. TRANSLATORS: Try to keep this at most 7 characters.
 #. * If necessary, you can leave out the parentheses.
-#: src/browser.c:650
+#: src/browser.c:625
 msgid "(huge)"
 msgstr "(ogromny)"
 
 #. TRANSLATORS: This is the main search prompt.
-#: src/browser.c:727 src/search.c:173
+#: src/browser.c:712 src/search.c:166
 msgid "Search"
 msgstr "Szukaj"
 
-#: src/browser.c:777 src/search.c:466 src/search.c:536
-msgid "This is the only occurrence"
-msgstr "To jedyne wyst±pienie"
-
-#: src/browser.c:793 src/search.c:364
+#: src/browser.c:754 src/search.c:368
 msgid "Search Wrapped"
-msgstr "Wyszukiwanie minê³o granicê pliku - kontynuowane od pocz±tku (koñca)"
+msgstr "Wyszukiwanie minęło granicę pliku - kontynuowane od początku (końca)"
+
+#: src/browser.c:764 src/search.c:509
+msgid "This is the only occurrence"
+msgstr "To jedyne wystÄ…pienie"
 
-#: src/browser.c:843 src/search.c:517
+#: src/browser.c:812 src/search.c:473
 msgid "No current search pattern"
 msgstr "Brak wzorca wyszukiwania"
 
-#: src/files.c:50
+#: src/color.c:186
 #, fuzzy, c-format
+msgid "Unknown syntax name: %s"
+msgstr "Brak nazwy składni"
+
+#: src/color.c:247
+#, c-format
+msgid "magic_load() failed: %s"
+msgstr ""
+
+#: src/color.c:251
+#, c-format
+msgid "magic_file(%s) failed: %s"
+msgstr ""
+
+#: src/files.c:47
+#, c-format
 msgid "Directory '%s' does not exist"
-msgstr "B³±d zapisu pliku blokowania: Katalog '%s' nie istnieje"
+msgstr "Katalog '%s' nie istnieje"
 
-#: src/files.c:52
+#: src/files.c:49
 #, c-format
 msgid "Path '%s': %s"
-msgstr ""
+msgstr "Ścieżka '%s': %s"
 
-#: src/files.c:54
-#, fuzzy, c-format
+#: src/files.c:51
+#, c-format
 msgid "Path '%s' is not a directory"
-msgstr "\"%s\" jest katalogiem"
+msgstr "Ścieżka '%s' nie jest katalogiem"
 
-#: src/files.c:57
+#: src/files.c:53
 #, c-format
 msgid "Path '%s' is not accessible"
-msgstr ""
+msgstr "Ścieżka '%s' nie jest dostępna"
 
-#. TRANSLATORS: Try to keep this at most 76 characters.
-#: src/files.c:158
+#. TRANSLATORS: Keep the next ten messages at most 76 characters.
+#: src/files.c:148
 msgid ""
 "Warning: Modifying a file which is not locked, check directory permission?"
 msgstr ""
-"Ostrze¿enie: Plik nie zosta³ zablokowany; sprawd¼ uprawnienia katalogu?"
+"Ostrzeżenie: Plik nie został zablokowany; sprawdź uprawnienia katalogu?"
 
-#: src/files.c:197
+#: src/files.c:187
 msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
-msgstr "Nie mo¿na ustaliæ u¿ytkownika pliku blokowania (b³±d getpwuid())"
+msgstr "Nie można ustalić użytkownika pliku blokowania (błąd getpwuid())"
 
-#: src/files.c:206
+#: src/files.c:196
 #, c-format
 msgid "Couldn't determine hostname for lock file: %s"
-msgstr "Nie mo¿na ustaliæ nazwy hosta do blokowania: %s"
+msgstr "Nie można ustalić nazwy hosta do blokowania: %s"
 
-#: src/files.c:227 src/files.c:238 src/files.c:275 src/files.c:285
+#: src/files.c:216 src/files.c:225 src/files.c:262 src/files.c:272
 #, c-format
 msgid "Error writing lock file %s: %s"
-msgstr "B³±d zapisu pliku blokowania %s: %s"
+msgstr "BÅ‚Ä…d zapisu pliku blokowania %s: %s"
 
-#: src/files.c:305
+#: src/files.c:291
 #, c-format
 msgid "Error deleting lock file %s: %s"
-msgstr "B³±d usuwania pliku blokowania %s: %s"
+msgstr "BÅ‚Ä…d usuwania pliku blokowania %s: %s"
 
-#: src/files.c:341
+#: src/files.c:325
 #, c-format
 msgid "Error opening lock file %s: %s"
-msgstr "B³±d otwierania pliku blokowania %s: %s"
+msgstr "BÅ‚Ä…d otwierania pliku blokowania %s: %s"
 
-#: src/files.c:353
+#: src/files.c:337
 #, c-format
 msgid "Error reading lock file %s: Not enough data read"
-msgstr "B³±d odczytu pliku blokowania %s. Przeczytano za ma³o danych"
+msgstr "Błąd odczytu pliku blokowania %s. Przeczytano za mało danych"
 
 #. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
-#: src/files.c:371
+#: src/files.c:354
 #, c-format
 msgid "File %s is being edited (by %s with %s, PID %d); continue?"
-msgstr "Edytowanie pliku %s (przez %s u¿ywaj±c %s, PID %d): kontynuowaæ?"
+msgstr "Edytowanie pliku %s (przez %s używając %s, PID %d): kontynuować?"
 
-#: src/files.c:426
+#: src/files.c:430
 #, c-format
 msgid "Can't insert file from outside of %s"
-msgstr "Nie mo¿na wstawiæ pliku spoza %s "
+msgstr "Nie można wstawić pliku spoza %s "
 
-#: src/files.c:439 src/files.c:1038 src/rcfile.c:589 src/rcfile.c:1385
-#: src/rcfile.c:1426
+#: src/files.c:445 src/files.c:991 src/rcfile.c:533 src/rcfile.c:1230
+#: src/rcfile.c:1271
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" jest katalogiem"
 
-#: src/files.c:441
+#: src/files.c:447
 #, c-format
 msgid "\"%s\" is not a normal file"
-msgstr "\"%s\" nie jest zwyk³ym plikiem"
+msgstr "\"%s\" nie jest zwykłym plikiem"
 
-#: src/files.c:566
+#: src/files.c:571
 msgid "No more open file buffers"
-msgstr "Nie ma wiêcej otwartych buforów"
+msgstr "Nie ma więcej otwartych buforów"
 
-#: src/files.c:582
+#: src/files.c:586
 #, c-format
 msgid "Switched to %s"
-msgstr "Prze³±czono na %s"
+msgstr "Przełączono na %s"
 
-#: src/files.c:584 src/global.c:988 src/winio.c:2010
+#: src/files.c:588 src/global.c:1005 src/winio.c:1965
 msgid "New Buffer"
 msgstr "Nowy bufor"
 
-#: src/files.c:943
+#. TRANSLATORS: Keep the next four messages at most 76 characters.
+#: src/files.c:913
 #, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
-msgstr[0] "Wczytano %lu liniê (przekonwertowana z formatu DOS i Mac)"
+msgstr[0] "Wczytano %lu liniÄ™ (przekonwertowana z formatu DOS i Mac)"
 msgstr[1] "Wczytano %lu linie (przekonwertowane z formatu DOS i Mac)"
 msgstr[2] "Wczytano %lu linii (przekonwertowane z formatu DOS i Mac)"
 
-#: src/files.c:948
-#, c-format
-msgid ""
-"Read %lu line (Converted from DOS and Mac format - Warning: No write "
-"permission)"
-msgid_plural ""
-"Read %lu lines (Converted from DOS and Mac format - Warning: No write "
-"permission)"
-msgstr[0] ""
-"Wczytano %lu liniê (przekonwertowana z formatu DOS i Mac - Ostrze¿enie: brak "
-"pozwolenia na zapis)"
-msgstr[1] ""
-"Wczytano %lu linie (przekonwertowane z formatu DOS i Mac - Ostrze¿enie: brak "
-"pozwolenia na zapis)"
-msgstr[2] ""
-"Wczytano %lu linii (przekonwertowane z formatu DOS i Mac - Ostrze¿enie: brak "
-"pozwolenia na zapis)"
-
-#: src/files.c:954
+#: src/files.c:919
 #, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
-msgstr[0] "Wczytano %lu liniê (przekonwertowana z formatu Mac)"
+msgstr[0] "Wczytano %lu liniÄ™ (przekonwertowana z formatu Mac)"
 msgstr[1] "Wczytano %lu linie (przekonwertowane z formatu Mac)"
 msgstr[2] "Wczytano %lu linii (przekonwertowane z formatu Mac)"
 
-#: src/files.c:958
-#, c-format
-msgid ""
-"Read %lu line (Converted from Mac format - Warning: No write permission)"
-msgid_plural ""
-"Read %lu lines (Converted from Mac format - Warning: No write permission)"
-msgstr[0] ""
-"Wczytano %lu liniê (przekonwertowana z formatu Mac - Ostrze¿enie: brak "
-"pozwolenia na zapis)"
-msgstr[1] ""
-"Wczytano %lu linie (przekonwertowane z formatu Mac - Ostrze¿enie: brak "
-"pozwolenia na zapis)"
-msgstr[2] ""
-"Wczytano %lu linii (przekonwertowane z formatu Mac - Ostrze¿enie: brak "
-"pozwolenia na zapis)"
-
-#: src/files.c:964
+#: src/files.c:925
 #, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
-msgstr[0] "Wczytano %lu liniê (przekonwertowana z formatu DOS)"
+msgstr[0] "Wczytano %lu liniÄ™ (przekonwertowana z formatu DOS)"
 msgstr[1] "Wczytano %lu linie (przekonwertowane z formatu DOS)"
 msgstr[2] "Wczytano %lu linii (przekonwertowane z formatu DOS)"
 
-#: src/files.c:968
-#, c-format
-msgid ""
-"Read %lu line (Converted from DOS format - Warning: No write permission)"
-msgid_plural ""
-"Read %lu lines (Converted from DOS format - Warning: No write permission)"
-msgstr[0] ""
-"Wczytano %lu liniê (przekonwertowana z formatu DOS - Ostrze¿enie: brak "
-"pozwolenia na zapis)"
-msgstr[1] ""
-"Wczytano %lu linie (przekonwertowane z formatu DOS - Ostrze¿enie: brak "
-"pozwolenia na zapis)"
-msgstr[2] ""
-"Wczytano %lu linii (przekonwertowane z formatu DOS - Ostrze¿enie: brak "
-"pozwolenia na zapis)"
-
-#: src/files.c:974
+#: src/files.c:930
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
-msgstr[0] "Wczytano %lu liniê"
+msgstr[0] "Wczytano %lu liniÄ™"
 msgstr[1] "Wczytano %lu linie"
 msgstr[2] "Wczytano %lu linii"
 
-#: src/files.c:977
-#, c-format
-msgid "Read %lu line (Warning: No write permission)"
-msgid_plural "Read %lu lines (Warning: No write permission)"
-msgstr[0] "Wczytano %lu liniê (Ostrze¿enie: brak pozwolenia na zapis)"
-msgstr[1] "Wczytano %lu linie (Ostrze¿enie: brak pozwolenia na zapis)"
-msgstr[2] "Wczytano %lu linii (Ostrze¿enie: brak pozwolenia na zapis)"
-
-#: src/files.c:1019 src/files.c:1056
+#: src/files.c:974 src/files.c:1006
 msgid "Reading File"
 msgstr "Wczytywanie pliku"
 
-#: src/files.c:1025
+#: src/files.c:980
 msgid "New File"
 msgstr "Nowy plik"
 
-#: src/files.c:1028
-#, c-format
-msgid "\"%s\" not found"
+#: src/files.c:983
+#, fuzzy, c-format
+msgid "File \"%s\" not found"
 msgstr "Nie znaleziono \"%s\""
 
-#: src/files.c:1039 src/rcfile.c:590 src/rcfile.c:1386 src/rcfile.c:1427
+#: src/files.c:992 src/rcfile.c:534 src/rcfile.c:1231 src/rcfile.c:1272
 #, c-format
 msgid "\"%s\" is a device file"
-msgstr "\"%s\" jest plikiem urz±dzenia"
+msgstr "\"%s\" jest plikiem urzÄ…dzenia"
 
-#: src/files.c:1133
+#: src/files.c:1083
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Polecenie do wykonania w nowym buforze [z %s] "
 
-#: src/files.c:1135
+#: src/files.c:1085
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Polecenie do wykonania [z %s] "
 
-#: src/files.c:1142
+#: src/files.c:1092
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Plik do wstawienia do nowego bufora [z %s] "
 
-#: src/files.c:1144
+#: src/files.c:1094
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Plik do wstawienia [z %s] "
 
-#: src/files.c:1389
+#: src/files.c:1338
 msgid "Key invalid in non-multibuffer mode"
-msgstr "Klawisz niedozwolony w trybie innym ni¿ wielu buforów"
+msgstr "Klawisz niedozwolony w trybie innym niż wielu buforów"
 
-#: src/files.c:1684
-msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+#: src/files.c:1632
+#, fuzzy
+msgid "Failed to write backup file; continue saving? (Say N if unsure.) "
 msgstr ""
-"Utworzenie kopii zapasowej nie powiod³o siê, kontynuowaæ zapis? (N je¶li "
+"Utworzenie kopii zapasowej nie powiodło się, kontynuować zapis? (N jeśli "
 "nie\n"
-"jeste¶ pewien)"
+"jesteÅ› pewien)"
 
-#: src/files.c:1800
+#: src/files.c:1750
 #, c-format
 msgid "Can't write outside of %s"
-msgstr "Nie mo¿na zapisaæ poza %s"
+msgstr "Nie można zapisać poza %s"
 
-#: src/files.c:1885 src/files.c:1910 src/files.c:1928 src/files.c:1941
-#: src/files.c:1952 src/files.c:1981
+#: src/files.c:1833 src/files.c:1858 src/files.c:1876 src/files.c:1889
+#: src/files.c:1900 src/files.c:1928
 #, c-format
 msgid "Error writing backup file %s: %s"
-msgstr "B³±d zapisu kopii zapasowej %s: %s"
+msgstr "BÅ‚Ä…d zapisu kopii zapasowej %s: %s"
 
-#: src/files.c:1886 src/nano.c:690
+#: src/files.c:1834 src/nano.c:692
 msgid "Too many backup files?"
 msgstr "Za wiele kopii zapasowych?"
 
-#: src/files.c:2026 src/text.c:2863 src/text.c:2875 src/text.c:3244
-#: src/text.c:3253
+#: src/files.c:1972 src/text.c:3117 src/text.c:3129 src/text.c:3498
+#: src/text.c:3507
 #, c-format
 msgid "Error writing temp file: %s"
-msgstr "B³±d zapisu pliku tymczasowego: %s"
+msgstr "BÅ‚Ä…d zapisu pliku tymczasowego: %s"
 
-#: src/files.c:2049 src/files.c:2068 src/files.c:2080 src/files.c:2104
-#: src/files.c:2121 src/files.c:2131 src/files.c:2164 src/files.c:2171
+#: src/files.c:1994 src/files.c:2013 src/files.c:2023 src/files.c:2047
+#: src/files.c:2064 src/files.c:2074 src/files.c:2106 src/files.c:2113
 #, c-format
 msgid "Error writing %s: %s"
-msgstr "B³±d zapisu %s: %s"
+msgstr "BÅ‚Ä…d zapisu %s: %s"
 
-#: src/files.c:2200
+#: src/files.c:2154
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
-msgstr[0] "Zapisano %lu liniê"
+msgstr[0] "Zapisano %lu liniÄ™"
 msgstr[1] "Zapisano %lu linie"
 msgstr[2] "Zapisano %lu linii"
 
-#: src/files.c:2299
+#: src/files.c:2249
 msgid " [DOS Format]"
 msgstr " [format DOS]"
 
-#: src/files.c:2300
+#: src/files.c:2250
 msgid " [Mac Format]"
 msgstr " [format Mac]"
 
-#: src/files.c:2302
+#: src/files.c:2252
 msgid " [Backup]"
 msgstr " [Kopia zap.]"
 
-#: src/files.c:2309
+#: src/files.c:2259
 msgid "Prepend Selection to File"
-msgstr "Wpisz wybór na pocz±tek pliku"
+msgstr "Wpisz wybór na początek pliku"
 
-#: src/files.c:2310
+#: src/files.c:2260
 msgid "Append Selection to File"
-msgstr "Dopisz wybór do pliku"
+msgstr "Dopisz wybór do pliku"
 
-#: src/files.c:2311
+#: src/files.c:2261
 msgid "Write Selection to File"
-msgstr "Zapisz wybór do pliku"
+msgstr "Zapisz wybór do pliku"
 
-#: src/files.c:2314
+#: src/files.c:2264
 msgid "File Name to Prepend to"
 msgstr "Nazwa pliku do wpisania"
 
-#: src/files.c:2315
+#: src/files.c:2265
 msgid "File Name to Append to"
 msgstr "Nazwa pliku do dopisania"
 
-#: src/files.c:2316
+#: src/files.c:2266
 msgid "File Name to Write"
 msgstr "Nazwa pliku do zapisu"
 
-#: src/files.c:2349
+#: src/files.c:2301
 #, fuzzy
-msgid "Save modified buffer anyway ? "
-msgstr "Zapisaæ bufor przed sprawdzaniem sk³adni?"
+msgid "Save modified buffer anyway? "
+msgstr "Zapisać modyfikowany bufor mimo to?"
 
-#: src/files.c:2457
-msgid "File exists, OVERWRITE ? "
-msgstr "Plik istnieje, ZAMAZAÆ ? "
+#: src/files.c:2412
+#, fuzzy
+msgid "Save file under DIFFERENT NAME? "
+msgstr "Zapisać plik pod INNĄ NAZWĄ ? "
 
-#: src/files.c:2466
-msgid "Save file under DIFFERENT NAME ? "
-msgstr "Zapisaæ plik pod INN¡ NAZW¡ ? "
+#: src/files.c:2420
+#, fuzzy, c-format
+msgid "File \"%s\" exists; OVERWRITE? "
+msgstr "Plik istnieje, ZAMAZAĆ ? "
 
-#: src/files.c:2480
-msgid "File was modified since you opened it, continue saving ? "
-msgstr "Plik zosta³ zmodyfikowany po otworzeniu, kontynuowaæ zapis ? "
+#: src/files.c:2441
+#, fuzzy
+msgid "File was modified since you opened it; continue saving? "
+msgstr "Plik został zmodyfikowany po otworzeniu, kontynuować zapis ? "
 
-#: src/files.c:2917
+#: src/files.c:2874
 msgid "(more)"
-msgstr "(wiêcej)"
+msgstr "(więcej)"
 
-#: src/files.c:3004
+#: src/files.c:2959
 #, c-format
 msgid ""
 "\n"
 "Press Enter to continue\n"
 msgstr ""
 "\n"
-"Naci¶nij Enter aby kontynuowaæ\n"
+"Naciśnij Enter aby kontynuować\n"
 
-#: src/files.c:3020
+#: src/files.c:2975
 #, c-format
 msgid ""
 "Unable to create directory %s: %s\n"
 "It is required for saving/loading search history or cursor positions.\n"
 msgstr ""
-"Nie mo¿na utworzyæ katalogu %s: %s\n"
-"Jest on niezbêdny do zapisu/odczytu historii wyszukiwañ i pozycji kursora.\n"
+"Nie można utworzyć katalogu %s: %s\n"
+"Jest on niezbędny do zapisu/odczytu historii wyszukiwań i pozycji kursora.\n"
 
-#: src/files.c:3026
+#: src/files.c:2982
 #, c-format
 msgid ""
 "Path %s is not a directory and needs to be.\n"
 "Nano will be unable to load or save search history or cursor positions.\n"
 msgstr ""
-"¦cie¿ka %s nie jest katalogiem, a musi nim byæ.\n"
-"Nano nie potrafi zapisaæ lub odczytaæ historii wyszukiwañ i pozycji\n"
+"Ścieżka %s nie jest katalogiem, a musi nim być.\n"
+"Nano nie potrafi zapisać lub odczytać historii wyszukiwań i pozycji\n"
 "kursora.\n"
 
-#: src/files.c:3045
+#: src/files.c:3002
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I tried to move\n"
 "to the preferred location (%s) but encountered an error: %s"
 msgstr ""
-"Znaleziono stary plik historii nano (%s) oraz spróbowano\n"
-"przenie¶æ go do preferowanego miejsca (%s), pod czas czego\n"
-"wynik³ b³±d: %s"
+"Znaleziono stary plik historii nano (%s) oraz spróbowano\n"
+"przenieść go do preferowanego miejsca (%s), pod czas czego\n"
+"wynikł błąd: %s"
 
-#: src/files.c:3049
+#: src/files.c:3006
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I moved\n"
@@ -452,721 +416,752 @@ msgstr ""
 "go do preferowanego miejsca (%s)\n"
 "(patrz FAQ nano co do tej zmiany)"
 
-#: src/files.c:3132 src/files.c:3140 src/files.c:3164 src/files.c:3176
-#, fuzzy, c-format
+#: src/files.c:3089 src/files.c:3097 src/files.c:3121 src/files.c:3133
+#, c-format
 msgid "Error writing %s: %s\n"
-msgstr "B³±d zapisu %s: %s"
+msgstr "BÅ‚Ä…d zapisu %s: %s\n"
 
 #. TRANSLATORS: Try to keep the next fifteen strings at most 10 characters.
-#: src/global.c:480
+#: src/global.c:483
 msgid "Exit"
-msgstr "Wyjd¼"
+msgstr "Wyjdź"
 
-#: src/global.c:481
+#: src/global.c:484
 msgid "Close"
 msgstr "Zamknij"
 
-#: src/global.c:482
+#: src/global.c:485
 msgid "Uncut Text"
-msgstr "Odnów Tekst"
+msgstr "Odnów Tekst"
 
-#: src/global.c:484
+#: src/global.c:487
 msgid "Unjustify"
 msgstr "Cofnij just."
 
-#: src/global.c:490
+#: src/global.c:493
 msgid "Read File"
 msgstr "Wczyt.plik"
 
-#: src/global.c:491
+#: src/global.c:494
 msgid "Where Is"
 msgstr "Wyszukaj"
 
-#: src/global.c:492
+#: src/global.c:495
 msgid "Replace"
-msgstr "Zast±p"
+msgstr "ZastÄ…p"
 
-#: src/global.c:493
+#: src/global.c:496
 msgid "Go To Line"
-msgstr "Przejd¼ do linii"
+msgstr "Przejdź do linii"
 
-#: src/global.c:494
+#: src/global.c:497
 msgid "Prev Line"
 msgstr "Poprz.lin."
 
-#: src/global.c:495
+#: src/global.c:498
 msgid "Next Line"
 msgstr "Nast. lin."
 
-#: src/global.c:496
+#: src/global.c:499
 msgid "Prev Page"
 msgstr "Poprz.str."
 
-#: src/global.c:497
+#: src/global.c:500
 msgid "Next Page"
 msgstr "Nast.str."
 
-#: src/global.c:499
+#: src/global.c:502
 msgid "Justify"
 msgstr "Wyjustuj"
 
-#: src/global.c:500
+#: src/global.c:503
 msgid "FullJstify"
 msgstr "Wyjustuj"
 
-#: src/global.c:502
+#: src/global.c:505
 msgid "Refresh"
-msgstr "Od¶wie¿"
+msgstr "Odśwież"
 
 #. TRANSLATORS: Try to keep this string at most 12 characters.
-#: src/global.c:505
+#: src/global.c:508
 msgid "WhereIs Next"
-msgstr "Szukaj Znów"
+msgstr "Szukaj Znów"
 
 #. TRANSLATORS: The next long series of strings are shortcut descriptions;
 #. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:512
+#: src/global.c:515
 msgid "Justify the current paragraph"
-msgstr "Wyjustuj bie¿±cy akapit"
+msgstr "Wyjustuj bieżący akapit"
 
-#: src/global.c:514
+#: src/global.c:517
 msgid "Cancel the current function"
-msgstr "Anuluj bie¿±c± funkcjê"
+msgstr "Anuluj bieżącą funkcję"
 
-#: src/global.c:515
+#: src/global.c:518
 msgid "Display this help text"
-msgstr "Wy¶wietla ten tekst pomocy"
+msgstr "Wyświetla ten tekst pomocy"
 
-#: src/global.c:518
+#: src/global.c:521
 msgid "Close the current file buffer / Exit from nano"
-msgstr "Zamknij bie¿±cy bufor / Wyjd¼ z nano"
+msgstr "Zamknij bieżący bufor / Wyjdź z nano"
 
-#: src/global.c:520
+#: src/global.c:523
 msgid "Exit from nano"
-msgstr "Wyjd¼ z nano"
+msgstr "Wyjdź z nano"
 
-#: src/global.c:524
+#: src/global.c:527
 msgid "Write the current file to disk"
-msgstr "Zapisz bie¿±cy plik na dysku"
+msgstr "Zapisz bieżący plik na dysku"
 
-#: src/global.c:526
+#: src/global.c:529
 msgid "Insert another file into the current one"
-msgstr "Wstaw do bie¿±cego pliku zawarto¶æ innego pliku"
+msgstr "Wstaw do bieżącego pliku zawartość innego pliku"
 
-#: src/global.c:528
+#: src/global.c:531
 msgid "Search for a string or a regular expression"
-msgstr "Szukaj ³añcucha lub wyra¿enia regularnego"
+msgstr "Szukaj łańcucha lub wyrażenia regularnego"
 
-#: src/global.c:531
+#: src/global.c:533
 msgid "Search for a string"
-msgstr "Szukaj ³añcucha"
+msgstr "Szukaj łańcucha"
 
-#: src/global.c:533
+#: src/global.c:534
+msgid "Refresh the file list"
+msgstr ""
+
+#: src/global.c:535
+#, fuzzy
+msgid "Go to lefthand column"
+msgstr "Przejdź do linii i kolumny"
+
+#: src/global.c:536
+#, fuzzy
+msgid "Go to righthand column"
+msgstr "Przejdź do linii i kolumny"
+
+#: src/global.c:538
 msgid "Go one screenful up"
-msgstr "Przejd¼ do poprzedniego ekranu"
+msgstr "Przejdź do poprzedniego ekranu"
 
-#: src/global.c:534
+#: src/global.c:539
 msgid "Go one screenful down"
-msgstr "Przejd¼ do nastêpnego ekranu"
+msgstr "Przejdź do następnego ekranu"
 
-#: src/global.c:536
+#: src/global.c:541
 msgid "Cut the current line and store it in the cutbuffer"
-msgstr "Wytnij bie¿±c± liniê i przechowaj w buforze wycinania"
+msgstr "Wytnij bieżącą linię i przechowaj w buforze wycinania"
 
-#: src/global.c:538
+#: src/global.c:543
 msgid "Uncut from the cutbuffer into the current line"
-msgstr "Wklej zawarto¶æ bufora wycinania w bie¿±cej linii"
+msgstr "Wklej zawartość bufora wycinania w bieżącej linii"
 
-#: src/global.c:539
+#: src/global.c:544
 msgid "Display the position of the cursor"
-msgstr "Poka¿ informacjê o pozycji kursora"
+msgstr "Pokaż informację o pozycji kursora"
 
-#: src/global.c:541
+#: src/global.c:546
 msgid "Invoke the spell checker, if available"
-msgstr "Wywo³aj sprawdzanie pisowni, je¶li dostêpne"
+msgstr "Wywołaj sprawdzanie pisowni, jeśli dostępne"
 
-#: src/global.c:543
+#: src/global.c:548
 msgid "Replace a string or a regular expression"
-msgstr "Zamieñ ³añcuch lub wyra¿enie regularne"
+msgstr "Zamień łańcuch lub wyrażenie regularne"
 
-#: src/global.c:544
+#: src/global.c:549
 msgid "Go to line and column number"
-msgstr "Przejd¼ do linii i kolumny"
+msgstr "Przejdź do linii i kolumny"
 
-#: src/global.c:546
+#: src/global.c:551
 msgid "Mark text starting from the cursor position"
-msgstr "Ustaw znacznik w bie¿±cym po³o¿eniu kursora"
+msgstr "Ustaw znacznik w bieżącym położeniu kursora"
 
-#: src/global.c:547
+#: src/global.c:552
 msgid "Repeat the last search"
-msgstr "Powtórz ostatnie wyszukiwanie"
+msgstr "Powtórz ostatnie wyszukiwanie"
 
-#: src/global.c:549
+#: src/global.c:554
 msgid "Copy the current line and store it in the cutbuffer"
-msgstr "Skopiuj bie¿±c± liniê i przechowaj w buforze wycinania"
+msgstr "Skopiuj bieżącą linię i przechowaj w buforze wycinania"
 
-#: src/global.c:550
+#: src/global.c:555
 msgid "Indent the current line"
-msgstr "Wyrównaj bie¿±c± liniê"
+msgstr "Wyrównaj bieżącą linię"
 
-#: src/global.c:551
+#: src/global.c:556
 msgid "Unindent the current line"
-msgstr "Usuñ wciêcia z bie¿±cej linii"
+msgstr "Usuń wcięcia z bieżącej linii"
 
-#: src/global.c:552
+#: src/global.c:558
+msgid "Comment/uncomment the current line or marked lines"
+msgstr ""
+
+#: src/global.c:560
 msgid "Undo the last operation"
-msgstr "Odwo³aj ostatni± operacjê"
+msgstr "Odwołaj ostatnią operację"
 
-#: src/global.c:553
+#: src/global.c:561
 msgid "Redo the last undone operation"
-msgstr "Odtwórz ostatni± operacjê"
+msgstr "Odtwórz ostatnią operację"
 
-#: src/global.c:555
+#: src/global.c:563
 msgid "Go back one character"
-msgstr "Przejd¼ o znak wstecz"
+msgstr "Przejdź o znak wstecz"
 
-#: src/global.c:556
+#: src/global.c:564
 msgid "Go forward one character"
-msgstr "Przejd¼ o znak do przodu"
+msgstr "Przejdź o znak do przodu"
 
-#: src/global.c:558
+#: src/global.c:566
 msgid "Go back one word"
-msgstr "Przejd¼ o s³owo wstecz"
+msgstr "Przejdź o słowo wstecz"
 
-#: src/global.c:559
+#: src/global.c:567
 msgid "Go forward one word"
-msgstr "Przejd¼ o s³owo do przodu"
+msgstr "Przejdź o słowo do przodu"
 
-#: src/global.c:561
+#: src/global.c:569
 msgid "Go to previous line"
-msgstr "Przejd¼ do poprzedniej linii"
+msgstr "Przejdź do poprzedniej linii"
 
-#: src/global.c:562
+#: src/global.c:570
 msgid "Go to next line"
-msgstr "Przejd¼ do nastêpnej linii"
+msgstr "Przejdź do następnej linii"
 
-#: src/global.c:563
+#: src/global.c:571
 msgid "Go to beginning of current line"
-msgstr "Przejd¼ na pocz±tek bie¿±cej linii"
+msgstr "Przejdź na początek bieżącej linii"
 
-#: src/global.c:564
+#: src/global.c:572
 msgid "Go to end of current line"
-msgstr "Przejd¼ na koniec bie¿±cej linii"
+msgstr "Przejdź na koniec bieżącej linii"
 
-#: src/global.c:567
+#: src/global.c:575
 msgid "Go to beginning of paragraph; then of previous paragraph"
-msgstr "Przejd¼ na pocz±tek akapitu; potem na pocz±tek poprzedniego akapitu"
+msgstr "Przejdź na początek akapitu; potem na początek poprzedniego akapitu"
 
-#: src/global.c:569
+#: src/global.c:577
 msgid "Go just beyond end of paragraph; then of next paragraph"
-msgstr "Przejd¼ w koniec akapitu; potem w koniec nastêpnego akapitu"
+msgstr "Przejdź w koniec akapitu; potem w koniec następnego akapitu"
 
-#: src/global.c:571
+#: src/global.c:579
 msgid "Go to the first line of the file"
-msgstr "Przejd¼ do pierwszej linii pliku"
+msgstr "Przejdź do pierwszej linii pliku"
 
-#: src/global.c:572
+#: src/global.c:580
 msgid "Go to the last line of the file"
-msgstr "Przejd¼ do ostatniej linii pliku"
+msgstr "Przejdź do ostatniej linii pliku"
 
-#: src/global.c:574
+#: src/global.c:582
 msgid "Go to the matching bracket"
-msgstr "Przejd¼ do parzystego nawiasu"
+msgstr "Przejdź do parzystego nawiasu"
 
-#: src/global.c:576
+#: src/global.c:584
 msgid "Scroll up one line without scrolling the cursor"
-msgstr "Przewiñ na jedn± liniê w górê bez przesuniêcia kursora"
+msgstr "Przewiń na jedną linię w górę bez przesunięcia kursora"
 
-#: src/global.c:578
+#: src/global.c:586
 msgid "Scroll down one line without scrolling the cursor"
-msgstr "Przewiñ na jedn± liniê w dó³ bez przesuniêcia kursora"
+msgstr "Przewiń na jedną linię w dół bez przesunięcia kursora"
 
-#: src/global.c:581
+#: src/global.c:589
 msgid "Switch to the previous file buffer"
-msgstr "Przejd¼ do poprzedniego bufora"
+msgstr "Przejdź do poprzedniego bufora"
 
-#: src/global.c:582
+#: src/global.c:590
 msgid "Switch to the next file buffer"
-msgstr "Przejd¼ do nastêpnego bufora"
+msgstr "Przejdź do następnego bufora"
 
-#: src/global.c:584
+#: src/global.c:592
 msgid "Insert the next keystroke verbatim"
-msgstr "Wstaw nastêpne naci¶niêcie klawisza dos³ownie"
+msgstr "Wstaw następne naciśnięcie klawisza dosłownie"
 
-#: src/global.c:585
+#: src/global.c:593
 msgid "Insert a tab at the cursor position"
 msgstr "Wstaw znak tabulacji na pozycji kursora"
 
-#: src/global.c:586
+#: src/global.c:594
 msgid "Insert a newline at the cursor position"
 msgstr "Wstaw znak nowej linii na pozycji kursora"
 
-#: src/global.c:587
+#: src/global.c:595
 msgid "Delete the character under the cursor"
-msgstr "Usuñ znak na pozycji kursora"
+msgstr "Usuń znak na pozycji kursora"
 
-#: src/global.c:589
+#: src/global.c:597
 msgid "Delete the character to the left of the cursor"
-msgstr "Usuñ znak na lewo od kursora"
+msgstr "Usuń znak na lewo od kursora"
 
-#: src/global.c:592
+#: src/global.c:600
 msgid "Cut backward from cursor to word start"
-msgstr "Wycina wstecz od kursora do pocz±tku s³owa"
+msgstr "Wycina wstecz od kursora do początku słowa"
 
-#: src/global.c:594
+#: src/global.c:602
 msgid "Cut forward from cursor to next word start"
-msgstr "Wycina od kursora do pocz±tku nastêpnego s³owa"
+msgstr "Wycina od kursora do początku następnego słowa"
 
-#: src/global.c:596
+#: src/global.c:604
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Wytnij wszystko z pozycji kursora po koniec pliku"
 
-#: src/global.c:599
+#: src/global.c:607
 msgid "Justify the entire file"
-msgstr "Wyjustuj ca³y plik"
+msgstr "Wyjustuj cały plik"
 
-#: src/global.c:603
+#: src/global.c:611
 msgid "Count the number of words, lines, and characters"
-msgstr "Policz ilo¶æ s³ów, linii i znaków"
+msgstr "Policz ilość słów, linii i znaków"
 
-#: src/global.c:606
+#: src/global.c:614
 msgid "Refresh (redraw) the current screen"
-msgstr "Od¶wie¿ (ponownie wy¶wietl) bie¿±cy ekran"
+msgstr "Odśwież (ponownie wyświetl) bieżący ekran"
 
-#: src/global.c:608
+#: src/global.c:616
 msgid "Suspend the editor (if suspension is enabled)"
-msgstr "Zawie¶ edytor (je¿eli zawieszenie jest w³±czone)"
+msgstr "Zawieś edytor (jeżeli zawieszenie jest włączone)"
 
-#: src/global.c:610
+#: src/global.c:618
 msgid "Save file without prompting"
-msgstr "Zapisaæ plik bez podpowiedzi"
+msgstr "Zapisać plik bez podpowiedzi"
 
-#: src/global.c:611
+#: src/global.c:619
 msgid "Search next occurrence backward"
 msgstr "Szukanie wstecz"
 
-#: src/global.c:612
+#: src/global.c:620
 msgid "Search next occurrence forward"
-msgstr "Szukanie naprzód"
+msgstr "Szukanie naprzód"
 
-#: src/global.c:614
+#: src/global.c:622
 msgid "Toggle the case sensitivity of the search"
-msgstr "Prze³±cz uwzglêdnienie rozmiaru znaków pod czas wyszukiwania"
+msgstr "Przełącz uwzględnienie rozmiaru znaków pod czas wyszukiwania"
 
-#: src/global.c:616
+#: src/global.c:624
 msgid "Reverse the direction of the search"
-msgstr "Odwróæ kierunek wyszukiwania"
+msgstr "Odwróć kierunek wyszukiwania"
 
-#: src/global.c:620
+#: src/global.c:628
 msgid "Toggle the use of regular expressions"
-msgstr "Prze³±cz u¿ycie wyra¿eñ regularnych"
+msgstr "Przełącz użycie wyrażeń regularnych"
 
-#: src/global.c:624
+#: src/global.c:632
 msgid "Recall the previous search/replace string"
-msgstr "Przywróæ poprzednie ³añcuchy wyszukiwania/zamiany"
+msgstr "Przywróć poprzednie łańcuchy wyszukiwania/zamiany"
 
-#: src/global.c:626
+#: src/global.c:634
 msgid "Recall the next search/replace string"
-msgstr "Przywróæ nastêpne ³añcuchy wyszukiwania/zamiany"
+msgstr "Przywróć następne łańcuchy wyszukiwania/zamiany"
 
-#: src/global.c:629
+#: src/global.c:637
 msgid "Go to file browser"
-msgstr "Poka¿ przegl±darkê plików"
+msgstr "Pokaż przeglądarkę plików"
 
-#: src/global.c:632
+#: src/global.c:640
 msgid "Toggle the use of DOS format"
-msgstr "Prze³±cz u¿ycie formatu DOS"
+msgstr "Przełącz użycie formatu DOS"
 
-#: src/global.c:633
+#: src/global.c:641
 msgid "Toggle the use of Mac format"
-msgstr "Prze³±cz u¿ycie formatu Mac"
+msgstr "Przełącz użycie formatu Mac"
 
-#: src/global.c:634
+#: src/global.c:642
 msgid "Toggle appending"
-msgstr "Prze³±cz dopisywanie w koniec"
+msgstr "Przełącz dopisywanie w koniec"
 
-#: src/global.c:635
+#: src/global.c:643
 msgid "Toggle prepending"
-msgstr "Prze³±cz dopisywanie na pocz±tek"
+msgstr "Przełącz dopisywanie na początek"
 
-#: src/global.c:636
+#: src/global.c:644
 msgid "Toggle backing up of the original file"
-msgstr "Prze³±cz utworzenie kopii zapasowych oryginalnego pliku"
+msgstr "Przełącz utworzenie kopii zapasowych oryginalnego pliku"
 
-#: src/global.c:637
+#: src/global.c:645
 msgid "Execute external command"
-msgstr "Wywo³aj polecenie zewnêtrzne"
+msgstr "Wywołaj polecenie zewnętrzne"
 
-#: src/global.c:639
+#: src/global.c:647
 msgid "Close buffer without saving it"
-msgstr ""
+msgstr "Zamknij bufor bez zapisu"
 
-#: src/global.c:641
+#: src/global.c:649
 msgid "Toggle the use of a new buffer"
-msgstr "Prze³±cz u¿ycie nowego bufora"
+msgstr "Przełącz użycie nowego bufora"
 
-#: src/global.c:644
+#: src/global.c:652
 msgid "Exit from the file browser"
-msgstr "Wyjd¼ z przegl±darki plików"
+msgstr "Wyjdź z przeglądarki plików"
 
-#: src/global.c:645
+#: src/global.c:653
 msgid "Go to the first file in the list"
-msgstr "Przejd¼ do pierwszego pliku na li¶cie"
+msgstr "Przejdź do pierwszego pliku na liście"
 
-#: src/global.c:646
+#: src/global.c:654
 msgid "Go to the last file in the list"
-msgstr "Przejd¼ do ostatniego pliku na li¶cie"
+msgstr "Przejdź do ostatniego pliku na liście"
 
-#: src/global.c:647
+#: src/global.c:655
 msgid "Go to the previous file in the list"
-msgstr "Przejd¼ do poprzedniego pliku na li¶cie"
+msgstr "Przejdź do poprzedniego pliku na liście"
 
-#: src/global.c:648
+#: src/global.c:656
 msgid "Go to the next file in the list"
-msgstr "Przejd¼ do nastêpnego pliku na li¶cie"
+msgstr "Przejdź do następnego pliku na liście"
 
-#: src/global.c:649
+#: src/global.c:657
 msgid "Go to directory"
-msgstr "Przejd¼ do katalogu"
+msgstr "Przejdź do katalogu"
 
-#: src/global.c:652
+#: src/global.c:660
 msgid "Invoke the linter, if available"
-msgstr "Wywo³aj sprawdzanie sk³adni, je¶li dostêpne"
+msgstr "Wywołaj sprawdzanie składni, jeśli dostępne"
 
-#: src/global.c:653
+#: src/global.c:661
 msgid "Go to previous linter msg"
-msgstr "Przejd¼ do poprzedniej linii"
+msgstr "Przejdź do poprzedniej linii"
 
-#: src/global.c:654
+#: src/global.c:662
 msgid "Go to next linter msg"
-msgstr "Przejd¼ do nastêpnej linii"
+msgstr "Przejdź do następnej linii"
 
-#: src/global.c:656
+#: src/global.c:664
 msgid "Invoke formatter, if available"
-msgstr "Wywo³aj formater, je¶li jest dostêpny"
+msgstr "Wywołaj formater, jeśli jest dostępny"
 
 #. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:671
+#: src/global.c:679
 msgid "Get Help"
 msgstr "Pomoc"
 
-#: src/global.c:674 src/prompt.c:858
+#: src/global.c:682 src/prompt.c:855
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: src/global.c:687
+#: src/global.c:695
 msgid "Write Out"
 msgstr "Zapisz"
 
-#: src/global.c:723
+#: src/global.c:731
 msgid "Go To Dir"
 msgstr "Do kat."
 
-#: src/global.c:738
+#: src/global.c:746
 msgid "Cut Text"
 msgstr "Wytnij"
 
-#: src/global.c:753
+#: src/global.c:761
 msgid "To Spell"
 msgstr "Pisownia"
 
-#: src/global.c:757
+#: src/global.c:765
 msgid "To Linter"
-msgstr "Sk³adnia"
+msgstr "Składnia"
 
-#: src/global.c:760
+#: src/global.c:768
 msgid "Formatter"
 msgstr "Formater"
 
-#: src/global.c:767
+#: src/global.c:775
 msgid "Case Sens"
 msgstr "Wielk.liter"
 
-#: src/global.c:772
+#: src/global.c:780
 msgid "Regexp"
 msgstr "Wyr.reg."
 
-#: src/global.c:777
+#: src/global.c:785
 msgid "Backwards"
 msgstr "Wstecz"
 
-#: src/global.c:784
+#: src/global.c:792
 msgid "No Replace"
 msgstr "Nie zast."
 
-#: src/global.c:792
+#: src/global.c:800
 msgid "Cur Pos"
-msgstr "Bie¿.poz."
+msgstr "Bież.poz."
 
-#: src/global.c:807
+#: src/global.c:815
 msgid "First Line"
 msgstr "Pierw.lin."
 
-#: src/global.c:809
+#: src/global.c:817
 msgid "Last Line"
 msgstr "Ost.lin."
 
-#: src/global.c:816
+#: src/global.c:824
 msgid "To Bracket"
 msgstr "Do nawiasu"
 
-#: src/global.c:819
+#: src/global.c:827
 msgid "Mark Text"
 msgstr "Zaznacz"
 
-#: src/global.c:822
+#: src/global.c:830
 msgid "Copy Text"
 msgstr "Kopiuj"
 
-#: src/global.c:825
+#: src/global.c:833
 msgid "Indent Text"
-msgstr "Wciêcie"
+msgstr "Wcięcie"
 
-#: src/global.c:827
+#: src/global.c:835
 msgid "Unindent Text"
-msgstr "Usuñ Wciêcia"
+msgstr "Usuń Wcięcia"
 
-#: src/global.c:830
+#: src/global.c:838
 msgid "Undo"
-msgstr "Odwo³aj"
+msgstr "Odwołaj"
 
-#: src/global.c:832
+#: src/global.c:840
 msgid "Redo"
-msgstr "Odtwórz"
+msgstr "Odtwórz"
 
-#: src/global.c:836 src/global.c:842
+#: src/global.c:844 src/global.c:850
 msgid "Back"
 msgstr "Wstecz"
 
-#: src/global.c:838 src/global.c:844
+#: src/global.c:846 src/global.c:852
 msgid "Forward"
-msgstr "W przód"
+msgstr "W przód"
 
-#: src/global.c:849
+#: src/global.c:857
 msgid "Prev Word"
-msgstr "Poprz.s³owo"
+msgstr "Poprz.słowo"
 
-#: src/global.c:851
+#: src/global.c:859
 msgid "Next Word"
-msgstr "Nast.s³owo"
+msgstr "Nast.słowo"
 
-#: src/global.c:855
+#: src/global.c:863
 msgid "Home"
-msgstr "Pocz±tek"
+msgstr "PoczÄ…tek"
 
-#: src/global.c:857
+#: src/global.c:865
 msgid "End"
 msgstr "Koniec"
 
-#: src/global.c:866
+#: src/global.c:874
 msgid "Beg of Par"
 msgstr "PoczAkapit"
 
-#: src/global.c:868
+#: src/global.c:876
 msgid "End of Par"
 msgstr "KonAkapit"
 
-#: src/global.c:873
+#: src/global.c:881
 msgid "Scroll Up"
-msgstr "W górê"
+msgstr "W górę"
 
-#: src/global.c:875
+#: src/global.c:883
 msgid "Scroll Down"
-msgstr "W dó³"
+msgstr "W dół"
 
-#: src/global.c:880
+#: src/global.c:888
 msgid "Prev File"
 msgstr "Plik poprz."
 
-#: src/global.c:882
+#: src/global.c:890
 msgid "Next File"
 msgstr "Plik nast."
 
-#: src/global.c:891
+#: src/global.c:899
 msgid "Verbatim"
-msgstr "Dos³ownie"
+msgstr "Dosłownie"
 
-#: src/global.c:894
+#: src/global.c:902
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:896
+#: src/global.c:904
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:899
+#: src/global.c:907
 msgid "Delete"
-msgstr "Usuñ"
+msgstr "Usuń"
 
-#: src/global.c:901
+#: src/global.c:909
 msgid "Backspace"
 msgstr "Backspace"
 
 #. TRANSLATORS: The next two strings refer to cutting words.
-#: src/global.c:912
+#: src/global.c:920
 msgid "Cut Left"
 msgstr "Wytnij w lewo"
 
-#: src/global.c:914
+#: src/global.c:922
 msgid "Cut Right"
 msgstr "Wytnij w prawo"
 
-#: src/global.c:916
+#: src/global.c:924
 msgid "CutTillEnd"
 msgstr "WytnDoKonc"
 
-#: src/global.c:926
+#: src/global.c:934
 msgid "Word Count"
-msgstr "Ilo¶æ s³ów"
+msgstr "Ilość słów"
 
-#: src/global.c:933
+#: src/global.c:941
 msgid "Suspend"
-msgstr "Zawie¶"
+msgstr "ZawieÅ›"
 
-#: src/global.c:937
+#: src/global.c:945
+#, fuzzy
+msgid "Comment Lines"
+msgstr "Nast. lin."
+
+#: src/global.c:949
 msgid "Save"
 msgstr "Zapisz"
 
-#: src/global.c:940
+#: src/global.c:952
 msgid "Previous"
 msgstr "Poprzedni"
 
-#: src/global.c:942
+#: src/global.c:954
 msgid "Next"
-msgstr "Nastêpny"
+msgstr "Następny"
 
-#: src/global.c:948
+#: src/global.c:960
 msgid "PrevHstory"
 msgstr "Poprz.Hist"
 
-#: src/global.c:951
+#: src/global.c:963
 msgid "NextHstory"
 msgstr "Nast.Hist"
 
-#: src/global.c:955
+#: src/global.c:972
 msgid "Go To Text"
 msgstr "Do tekstu"
 
-#: src/global.c:959
+#: src/global.c:976
 msgid "DOS Format"
 msgstr "Format DOS"
 
-#: src/global.c:961
+#: src/global.c:978
 msgid "Mac Format"
 msgstr "Format Mac"
 
-#: src/global.c:969
+#: src/global.c:986
 msgid "Append"
 msgstr "Dopisz"
 
-#: src/global.c:971
+#: src/global.c:988
 msgid "Prepend"
 msgstr "Wpisz"
 
-#: src/global.c:974
+#: src/global.c:991
 msgid "Backup File"
 msgstr "Kopia zapas."
 
-#: src/global.c:981
+#: src/global.c:998
 msgid "Execute Command"
-msgstr "Wywo³aj polecenie"
+msgstr "Wywołaj polecenie"
 
-#: src/global.c:996
+#: src/global.c:1013
 msgid "To Files"
 msgstr "Pliki"
 
-#: src/global.c:1004
+#: src/global.c:1021
 msgid "First File"
 msgstr "Pierw.Plik"
 
-#: src/global.c:1006
+#: src/global.c:1023
 msgid "Last File"
 msgstr "Ost.Plik"
 
-#: src/global.c:1010
+#: src/global.c:1027
 msgid "Discard buffer"
+msgstr "Porzuć bufor"
+
+#: src/global.c:1038
+msgid "Left Column"
+msgstr ""
+
+#: src/global.c:1040
+msgid "Right Column"
 msgstr ""
 
 #. TRANSLATORS: Try to keep the next two strings at most 20 characters.
-#: src/global.c:1020
+#: src/global.c:1047
 msgid "Prev Lint Msg"
 msgstr "Lint:Poprz.lin."
 
-#: src/global.c:1022
+#: src/global.c:1049
 msgid "Next Lint Msg"
 msgstr "Lint:Nast.lin."
 
 #. TRANSLATORS: The next seventeen strings are toggle descriptions;
 #. * they are best kept shorter than 40 characters, but may be longer.
-#: src/global.c:1285
+#: src/global.c:1316
 msgid "Help mode"
 msgstr "Tryb pomocy"
 
-#: src/global.c:1287
+#: src/global.c:1318
 msgid "Constant cursor position display"
-msgstr "Sta³e po³o¿enie kursora"
+msgstr "Stałe położenie kursora"
 
-#: src/global.c:1289
+#: src/global.c:1320
 msgid "Use of one more line for editing"
-msgstr "U¿ycie dodatkowej linii do redagowania"
+msgstr "Użycie dodatkowej linii do redagowania"
 
-#: src/global.c:1291
+#: src/global.c:1322
 msgid "Smooth scrolling"
-msgstr "P³ynne przewijanie"
+msgstr "PÅ‚ynne przewijanie"
 
-#: src/global.c:1293
+#: src/global.c:1324
 msgid "Soft wrapping of overlong lines"
-msgstr "Miêkkie zawijanie d³ugich linii"
+msgstr "Miękkie zawijanie długich linii"
 
-#: src/global.c:1295
+#: src/global.c:1326
 msgid "Whitespace display"
-msgstr "Wy¶wietlanie bia³ych znaków"
+msgstr "Wyświetlanie białych znaków"
 
-#: src/global.c:1297
+#: src/global.c:1328
 msgid "Color syntax highlighting"
-msgstr "Kolorowanie sk³adni"
+msgstr "Kolorowanie składni"
 
-#: src/global.c:1299
+#: src/global.c:1330
 msgid "Smart home key"
-msgstr "Rozumny klawisz \"w pocz±tek\""
+msgstr "Rozumny klawisz \"w poczÄ…tek\""
 
-#: src/global.c:1301
+#: src/global.c:1332
 msgid "Auto indent"
-msgstr "Auto wciêcia"
+msgstr "Auto wcięcia"
 
-#: src/global.c:1303
+#: src/global.c:1334
 msgid "Cut to end"
-msgstr "Wytnij do koñca"
+msgstr "Wytnij do końca"
 
-#: src/global.c:1305
+#: src/global.c:1336
 msgid "Hard wrapping of overlong lines"
-msgstr "Twarde zawijanie d³ugich linii"
+msgstr "Twarde zawijanie długich linii"
 
-#: src/global.c:1307
+#: src/global.c:1338
 msgid "Conversion of typed tabs to spaces"
 msgstr "Przetworzenie tabulacji na spacji"
 
-#: src/global.c:1309
+#: src/global.c:1340
 msgid "Backup files"
 msgstr "Kopie zapasowe"
 
-#: src/global.c:1311
+#: src/global.c:1342
 msgid "Reading file into separate buffer"
 msgstr "Odczyt pliku do osobnego bufora"
 
-#: src/global.c:1313
+#: src/global.c:1344
 msgid "Mouse support"
-msgstr "Obs³uga myszy"
+msgstr "Obsługa myszy"
 
-#: src/global.c:1315
+#: src/global.c:1346
 msgid "No conversion from DOS/Mac format"
 msgstr "Bez konwersji z formatu DOS/Mac"
 
-#: src/global.c:1317
+#: src/global.c:1348
 msgid "Suspension"
-msgstr "Zawie¶"
+msgstr "ZawieÅ›"
 
-#: src/help.c:209
+#: src/help.c:211
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1180,15 +1175,15 @@ msgid ""
 msgstr ""
 "Tekst pomocy polecenia szukania\n"
 "\n"
-" Wprowad¼ s³owa lub znaki, których chcesz szukaæ, nastêpnie naci¶nij Enter. "
-"Je¶li istnieje fragment tekstu do nich pasuj±cy, ekran zostanie od¶wie¿ony "
-"pokazuj±c po³o¿enie najbli¿szego dopasowania.\n"
+" Wprowadź słowa lub znaki, których chcesz szukać, następnie naciśnij Enter. "
+"Jeśli istnieje fragment tekstu do nich pasujący, ekran zostanie odświeżony "
+"pokazując położenie najbliższego dopasowania.\n"
 "\n"
-" Po zachêcie 'Szukaj:' w nawiasach kwadratowych zostanie pokazany poprzednio "
-"szukany ³añcuch. Naci¶niêcie Enter bez wprowadzania tekstu spowoduje "
+" Po zachęcie 'Szukaj:' w nawiasach kwadratowych zostanie pokazany poprzednio "
+"szukany łańcuch. Naciśnięcie Enter bez wprowadzania tekstu spowoduje "
 "wykonanie poprzedniego szukania.  "
 
-#: src/help.c:218
+#: src/help.c:220
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1196,13 +1191,13 @@ msgid ""
 " The following function keys are available in Search mode:\n"
 "\n"
 msgstr ""
-"Je¿eli zaznaczy³e¶ fragment tekstu, i wybra³e¶ szukanie z zast±pieniem, "
-"tylko wyst±pienia w zaznaczonej czê¶ci zostan± zast±pione.\n"
+"Jeżeli zaznaczyłeś fragment tekstu, i wybrałeś szukanie z zastąpieniem, "
+"tylko wystąpienia w zaznaczonej części zostaną zastąpione.\n"
 "\n"
-" W trybie szukania dostêpne s± nastêpuj±ce klawisze funkcyjne:\n"
+" W trybie szukania dostępne są następujące klawisze funkcyjne:\n"
 "\n"
 
-#: src/help.c:224
+#: src/help.c:226
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1213,16 +1208,16 @@ msgid ""
 " The following function keys are available in Go To Line mode:\n"
 "\n"
 msgstr ""
-"Tekst pomocy polecenia przej¶cia do zadanej linii\n"
-" Wprowad¼ numer linii, do której chcesz przej¶æ i naci¶nij Enter. Je¿eli w "
-"pliku jest mniej linii ni¿ liczba, któr± wprowadzi³e¶, zostaniesz "
+"Tekst pomocy polecenia przejścia do zadanej linii\n"
+" Wprowadź numer linii, do której chcesz przejść i naciśnij Enter. Jeżeli w "
+"pliku jest mniej linii niż liczba, którą wprowadziłeś, zostaniesz "
 "przeniesiony do ostatniej linii pliku.\n"
 "\n"
-" W trybie przej¶cia do zadanej linii dostêpne s± nastêpuj±ce klawisze "
+" W trybie przejścia do zadanej linii dostępne są następujące klawisze "
 "funkcyjne:\n"
 "\n"
 
-#: src/help.c:233
+#: src/help.c:235
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1236,15 +1231,15 @@ msgid ""
 msgstr ""
 "Tekst pomocy polecenia wstawienia pliku\n"
 "\n"
-" Wpisz nazwê pliku, którego zawarto¶æ ma zostaæ wstawiona do bufora "
-"bie¿±cego pliku w bie¿±cym po³o¿eniu kursora.\n"
+" Wpisz nazwę pliku, którego zawartość ma zostać wstawiona do bufora "
+"bieżącego pliku w bieżącym położeniu kursora.\n"
 "\n"
-" Je¶li skompilowa³e¶ nano z obs³ug± wielu buforów plikowych i w³±czy³e¶ j± "
-"opcj± wiersza poleceñ -F lub --multibuffer, kombinacj± Meta-F albo za pomoc± "
+" Jeśli skompilowałeś nano z obsługą wielu buforów plikowych i włączyłeś ją "
+"opcją wiersza poleceń -F lub --multibuffer, kombinacją Meta-F albo za pomocą "
 "pliku nanorc, wstawianie pliku spowoduje wczytanie go do oddzielnego bufora "
-"(u¿yj Meta-< i > do prze³±czania siê miêdzy buforami plikowymi.  "
+"(użyj Meta-< i > do przełączania się między buforami plikowymi.  "
 
-#: src/help.c:242
+#: src/help.c:244
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1252,13 +1247,13 @@ msgid ""
 " The following function keys are available in Insert File mode:\n"
 "\n"
 msgstr ""
-"Je¶li potrzebujesz kolejnego pustego bufora, nie wpisuj nazwy lub wpisz "
-"nazwê nieistniej±cego jeszcze pliku i naci¶nij Enter.\n"
+"Jeśli potrzebujesz kolejnego pustego bufora, nie wpisuj nazwy lub wpisz "
+"nazwę nieistniejącego jeszcze pliku i naciśnij Enter.\n"
 "\n"
-"W trybie wstawiania pliku dostêpne s± nastêpuj±ce klawisze funkcyjne:\n"
+"W trybie wstawiania pliku dostępne są następujące klawisze funkcyjne:\n"
 "\n"
 
-#: src/help.c:248
+#: src/help.c:250
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1275,17 +1270,17 @@ msgid ""
 msgstr ""
 "Tekst pomocy polecenia zapisu pliku\n"
 "\n"
-" Wpisz nazwê, pod jak± chcesz zapisaæ bie¿±cy plik i naci¶nij Enter.\n"
+" Wpisz nazwę, pod jaką chcesz zapisać bieżący plik i naciśnij Enter.\n"
 "\n"
-" Je¶li zaznaczy³e¶ fragment tekstu, zostanie ci zaproponowany zapis tylko "
-"zaznaczonej czê¶ci do osobnego pliku. Aby zmniejszyæ ryzyko nadpisania "
-"bie¿±cego pliku jego czê¶ci±, w tym trybie nazwa bie¿±cego pliku nie jest "
-"nazw± domy¶ln±.\n"
+" Jeśli zaznaczyłeś fragment tekstu, zostanie ci zaproponowany zapis tylko "
+"zaznaczonej części do osobnego pliku. Aby zmniejszyć ryzyko nadpisania "
+"bieżącego pliku jego częścią, w tym trybie nazwa bieżącego pliku nie jest "
+"nazwą domyślną.\n"
 "\n"
-" W trybie zapisu pliku dostêpne s± nastêpuj±ce klawisze funkcyjne:\n"
+" W trybie zapisu pliku dostępne są następujące klawisze funkcyjne:\n"
 "\n"
 
-#: src/help.c:262
+#: src/help.c:264
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1298,19 +1293,19 @@ msgid ""
 " The following function keys are available in the file browser:\n"
 "\n"
 msgstr ""
-"Tekst pomocy przegl±darki plików\n"
+"Tekst pomocy przeglądarki plików\n"
 "\n"
-" Przegl±darka plików s³u¿y do wizualnego przegl±dania katalogu w celu "
-"wybrania pliku do odczytu lub zapisu.  Do przemieszczania siê po plikach w "
-"katalogu u¿yj klawiszy strza³ek oraz Page Up/Down, za¶ do wyboru pliku lub "
-"wej¶cia do zaznaczonego katalogu klawiszy S i Enter.  Aby przej¶æ o jeden "
-"katalog wy¿ej wybierz katalog o nazwie \"..\" znajduj±cy siê na samej górze "
-"listy plików.\n"
+" Przeglądarka plików służy do wizualnego przeglądania katalogu w celu "
+"wybrania pliku do odczytu lub zapisu.  Do przemieszczania siÄ™ po plikach w "
+"katalogu użyj klawiszy strzałek oraz Page Up/Down, zaś do wyboru pliku lub "
+"wejścia do zaznaczonego katalogu klawiszy S i Enter.  Aby przejść o jeden "
+"katalog wyżej wybierz katalog o nazwie \"..\" znajdujący się na samej górze "
+"listy plików.\n"
 "\n"
-" W przegl±darce plików dostêpne s± nastêpuj±ce klawisze funkcyjne:\n"
+" W przeglądarce plików dostępne są następujące klawisze funkcyjne:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:277
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1325,24 +1320,24 @@ msgid ""
 msgstr ""
 "Tekst pomocy polecenia szukania\n"
 "\n"
-" Wprowad¼ s³owa lub znaki, których chcesz szukaæ, nastêpnie naci¶nij Enter. "
-"Je¶li istnieje fragment tekstu do nich pasuj±cy, ekran zostanie od¶wie¿ony "
-"pokazuj±c po³o¿enie najbli¿szego dopasowania.\n"
+" Wprowadź słowa lub znaki, których chcesz szukać, następnie naciśnij Enter. "
+"Jeśli istnieje fragment tekstu do nich pasujący, ekran zostanie odświeżony "
+"pokazując położenie najbliższego dopasowania.\n"
 "\n"
-" Po zachêcie 'Szukaj:' w nawiasach kwadratowych zostanie pokazany poprzednio "
-"szukany ³añcuch. Naci¶niêcie Enter bez wprowadzania tekstu spowoduje "
+" Po zachęcie 'Szukaj:' w nawiasach kwadratowych zostanie pokazany poprzednio "
+"szukany łańcuch. Naciśnięcie Enter bez wprowadzania tekstu spowoduje "
 "wykonanie poprzedniego szukania.\n"
 "\n"
 
-#: src/help.c:284
+#: src/help.c:286
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
 msgstr ""
-" W trybie wyszukiwania dostêpne s± nastêpuj±ce klawisze funkcyjne:\n"
+" W trybie wyszukiwania dostępne są następujące klawisze funkcyjne:\n"
 "\n"
 
-#: src/help.c:288
+#: src/help.c:290
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1354,19 +1349,19 @@ msgid ""
 " The following function keys are available in Browser Go To Directory mode:\n"
 "\n"
 msgstr ""
-"Tekst pomocy polecenia przej¶cia do katalogu w przegl±darce\n"
+"Tekst pomocy polecenia przejścia do katalogu w przeglądarce\n"
 "\n"
-" Wprowad¼ nazwê katalogu, jaki chcesz przegl±dn±æ.\n"
+" Wprowadź nazwę katalogu, jaki chcesz przeglądnąć.\n"
 "\n"
-" Je¶li dope³nianie za pomoc± tabulacji nie zosta³o wy³±czone, mo¿esz "
-"skorzystaæ z klawisza TAB, co automatycznie dope³ni (je¶li to mo¿liwe) nazwê "
+" Jeśli dopełnianie za pomocą tabulacji nie zostało wyłączone, możesz "
+"skorzystać z klawisza TAB, co automatycznie dopełni (jeśli to możliwe) nazwę "
 "wpisywanego katalogu.\n"
 "\n"
-" W trybie przej¶cia do katalogu w przegl±darce dostêpne s± nastêpuj±ce "
+" W trybie przejścia do katalogu w przeglądarce dostępne są następujące "
 "klawisze funkcyjne:\n"
 "\n"
 
-#: src/help.c:301
+#: src/help.c:303
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1381,16 +1376,16 @@ msgid ""
 msgstr ""
 "Tekst pomocy sprawdzania pisowni\n"
 "\n"
-" Program do sprawdzania pisowni sprawdza pisowniê ca³o¶ci tekstu bie¿±cego "
-"pliku.  Gdy zostanie napotkane nieznane s³owo, jest ono pod¶wietlane i mo¿na "
-"poprawiæ wersjê, która je zast±pi.  Nastêpnie pojawia siê propozycja "
-"zast±pienia w bie¿±cym pliku, lub, je¿eli zaznaczy³e¶ fragment tekstu, w tym "
-"fragmencie wszystkich wyst±pieñ danego niepoprawnie napisanego s³owa.\n"
+" Program do sprawdzania pisowni sprawdza pisownię całości tekstu bieżącego "
+"pliku.  Gdy zostanie napotkane nieznane słowo, jest ono podświetlane i można "
+"poprawić wersję, która je zastąpi.  Następnie pojawia się propozycja "
+"zastąpienia w bieżącym pliku, lub, jeżeli zaznaczyłeś fragment tekstu, w tym "
+"fragmencie wszystkich wystąpień danego niepoprawnie napisanego słowa.\n"
 "\n"
-" W trybie sprawdzania pisowni dostêpne s± nastêpuj±ce klawisze funkcyjne:\n"
+" W trybie sprawdzania pisowni dostępne są następujące klawisze funkcyjne:\n"
 "\n"
 
-#: src/help.c:316
+#: src/help.c:318
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1401,17 +1396,17 @@ msgid ""
 " The following function keys are available in Execute Command mode:\n"
 "\n"
 msgstr ""
-"Tekst pomocy wywo³ania polecenia zewnêtrznego\n"
+"Tekst pomocy wywołania polecenia zewnętrznego\n"
 "\n"
-" Ten tryb umo¿liwia wstawienie do bie¿±cego bufora (lub, w trybie wielu "
-"buforów, do nowego bufora) wyj¶cia otrzymanego z polecenia uruchomionego "
-"przez pow³okê. Je¿eli potrzebujesz nowego pustego bufora, nie podawaj "
-"¿adnego polecenia.\n"
+" Ten tryb umożliwia wstawienie do bieżącego bufora (lub, w trybie wielu "
+"buforów, do nowego bufora) wyjścia otrzymanego z polecenia uruchomionego "
+"przez powłokę. Jeżeli potrzebujesz nowego pustego bufora, nie podawaj "
+"żadnego polecenia.\n"
 "\n"
-" W tym trybie dostêpne s± nastêpuj±ce klawisze:\n"
+" W tym trybie dostępne są następujące klawisze:\n"
 "\n"
 
-#: src/help.c:329
+#: src/help.c:331
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1424,29 +1419,29 @@ msgid ""
 msgstr ""
 "Podstawowy tekst pomocy nano\n"
 "\n"
-" Edytor nano zosta³ zaprojektowany z my¶l± o emulacji mo¿liwo¶ci i prostoty "
-"obs³ugi edytora tekstowego UW Pico. Ekran edycji mo¿na podzieliæ na cztery "
-"czê¶ci: górna linia pokazuje wersjê programu i nazwê w³a¶nie edytowanego "
-"pliku oraz mówi, czy plik zosta³ zmieniony. Dalej, g³ówne okno edytora "
-"zawiera edytowany tekst. Trzecia linia od do³u, czyli linia stanu, s³u¿y do "
-"wy¶wietlania wa¿nych komunikatów. "
+" Edytor nano został zaprojektowany z myślą o emulacji możliwości i prostoty "
+"obsługi edytora tekstowego UW Pico. Ekran edycji można podzielić na cztery "
+"części: górna linia pokazuje wersję programu i nazwę właśnie edytowanego "
+"pliku oraz mówi, czy plik został zmieniony. Dalej, główne okno edytora "
+"zawiera edytowany tekst. Trzecia linia od dołu, czyli linia stanu, służy do "
+"wyświetlania ważnych komunikatów. "
 
-#: src/help.c:339
+#: src/help.c:341
+#, fuzzy
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
-" The notation for shortcuts is as follows: Control-key sequences are notated "
-"with a caret (^) symbol and can be entered either by using the Control "
-"(Ctrl) key or pressing the Escape (Esc) key twice.  Escape-key sequences are "
-"notated with the Meta (M-) symbol and can be entered using either the Esc, "
-"Alt, or Meta key depending on your keyboard setup.  "
+" Shortcuts are written as follows: Control-key sequences are notated with a "
+"'^' and can be entered either by using the Ctrl key or pressing the Esc key "
+"twice.  Meta-key sequences are notated with 'M-' and can be entered using "
+"either the Alt, Cmd, or Esc key, depending on your keyboard setup.  "
 msgstr ""
-"Dwie najni¿sze linie przypominaj± najczê¶ciej u¿ywane kombinacje klawiszy.\n"
+"Dwie najniższe linie przypominają najczęściej używane kombinacje klawiszy.\n"
 "\n"
-" Kombinacje klawiszy zosta³y opisane w nastêpuj±cy sposób: sekwencje "
-"steruj±ce wprowadzane klawiszem Control (Ctrl) lub podwójnym naci¶niêciem "
-"klawisza Escape s± oznaczone daszkiem (^). Sekwencje Escape, wprowadzane "
-"zale¿nie od uk³adu klawiatury jednym z klawiszy Esc, Alt lub Meta, s± "
+" Kombinacje klawiszy zostały opisane w następujący sposób: sekwencje "
+"sterujące wprowadzane klawiszem Control (Ctrl) lub podwójnym naciśnięciem "
+"klawisza Escape sÄ… oznaczone daszkiem (^). Sekwencje Escape, wprowadzane "
+"zależnie od układu klawiatury jednym z klawiszy Esc, Alt lub Meta, są "
 "oznaczone Meta (M-). "
 
 #: src/help.c:348
@@ -1457,30 +1452,30 @@ msgid ""
 "keys are shown in parentheses:\n"
 "\n"
 msgstr ""
-"Aby wprowadziæ dowolny znak, nale¿y dwukrotnie nacisn±æ Esc i wprowadziæ "
-"dziesiêtny kod tego znaku (w zakresie 000 - 255).\n"
+"Aby wprowadzić dowolny znak, należy dwukrotnie nacisnąć Esc i wprowadzić "
+"dziesiętny kod tego znaku (w zakresie 000 - 255).\n"
 "\n"
-" W g³ównym oknie edytora dostêpne s± wymienione poni¿ej kombinacje klawiszy. "
-"Klawisze alternatywne ujêto w nawiasy:\n"
+" W głównym oknie edytora dostępne są wymienione poniżej kombinacje klawiszy. "
+"Klawisze alternatywne ujęto w nawiasy:\n"
 "\n"
 
 #: src/help.c:380 src/help.c:457
 msgid "enable/disable"
-msgstr "w³±cz/wy³±cz"
+msgstr "włącz/wyłącz"
 
-#: src/nano.c:559
+#: src/nano.c:560
 msgid "Key is invalid in view mode"
-msgstr "Klawisz niedozwolony w trybie przegl±dania"
+msgstr "Klawisz niedozwolony w trybie przeglÄ…dania"
 
-#: src/nano.c:565
+#: src/nano.c:566
 msgid "This function is disabled in restricted mode"
-msgstr "Ta funkcja nie jest dostêpna w trybie ograniczonym"
+msgstr "Ta funkcja nie jest dostępna w trybie ograniczonym"
 
-#: src/nano.c:573
+#: src/nano.c:574
 msgid "Help is not available"
-msgstr "Pomoc niedostêpna"
+msgstr "Pomoc niedostępna"
 
-#: src/nano.c:684
+#: src/nano.c:686
 #, c-format
 msgid ""
 "\n"
@@ -1489,39 +1484,39 @@ msgstr ""
 "\n"
 "Bufor zapisany w %s\n"
 
-#: src/nano.c:686
+#: src/nano.c:688
 #, c-format
 msgid ""
 "\n"
 "Buffer not written to %s: %s\n"
 msgstr ""
 "\n"
-"Bufor nie zosta³ zapisany w %s: %s\n"
+"Bufor nie został zapisany w %s: %s\n"
 
-#: src/nano.c:689
+#: src/nano.c:691
 #, c-format
 msgid ""
 "\n"
 "Buffer not written: %s\n"
 msgstr ""
 "\n"
-"Bufor nie zosta³ zapisany w %s\n"
+"Bufor nie został zapisany w %s\n"
 
 #: src/nano.c:714
 msgid "Window size is too small for nano...\n"
-msgstr "Rozmiar okna za ma³y dla nano...\n"
+msgstr "Rozmiar okna za mały dla nano...\n"
 
 #: src/nano.c:807
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
 "\n"
-msgstr "Sk³adnia: nano [OPCJE] [[+LINIA,KOLUMNA] PLIK]...\n"
+msgstr "Składnia: nano [OPCJE] [[+LINIA,KOLUMNA] PLIK]...\n"
 
 #: src/nano.c:810
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
-msgstr "Opcja\t\tD³uga opcja GNU\t\tZnaczenie\n"
+msgstr "Opcja\t\tDÅ‚uga opcja GNU\t\tZnaczenie\n"
 
 #: src/nano.c:812
 #, c-format
@@ -1536,15 +1531,15 @@ msgstr "+LINIA,KOLUMNA"
 #. * for the --help output.  Try to keep them at most 40 characters.
 #: src/nano.c:818
 msgid "Start at line LINE, column COLUMN"
-msgstr "Rozpoczêcie w linii i kolumnie o podanych numerach"
+msgstr "Rozpoczęcie w linii i kolumnie o podanych numerach"
 
 #: src/nano.c:820
 msgid "Enable smart home key"
-msgstr "W³±cza rozumny przycisk \"w pocz±tek\""
+msgstr "WÅ‚Ä…cza rozumny przycisk \"w poczÄ…tek\""
 
 #: src/nano.c:822
 msgid "Save backups of existing files"
-msgstr "Tworzenie kopii zapasowych istniej±cych plików"
+msgstr "Tworzenie kopii zapasowych istniejących plików"
 
 #: src/nano.c:823
 msgid "-C <dir>"
@@ -1560,7 +1555,7 @@ msgstr "Katalog przechowywania unikatowych kopii zapasowych"
 
 #: src/nano.c:827
 msgid "Use bold instead of reverse video text"
-msgstr "U¿ywa tekstu pogrubionego zamiast negacji obrazu"
+msgstr "Używa tekstu pogrubionego zamiast negacji obrazu"
 
 #: src/nano.c:829
 msgid "Convert typed tabs to spaces"
@@ -1568,19 +1563,19 @@ msgstr "Przetwarza tabulacje na spacje"
 
 #: src/nano.c:834
 msgid "Read a file into a new buffer by default"
-msgstr "Domy¶lny odczyt pliku do nowego bufora"
+msgstr "Domyślny odczyt pliku do nowego bufora"
 
 #: src/nano.c:837
 msgid "Use (vim-style) lock files"
-msgstr "U¿ywaj plików blokowania w stylu vim"
+msgstr "Używaj plików blokowania w stylu vim"
 
 #: src/nano.c:842
 msgid "Log & read search/replace string history"
-msgstr "Rejestrowanie i odczyt historii wyszukiwania/zamiany ³añcuchów"
+msgstr "Rejestrowanie i odczyt historii wyszukiwania/zamiany łańcuchów"
 
 #: src/nano.c:846
 msgid "Don't look at nanorc files"
-msgstr "Bez korzystania z plików nanorc"
+msgstr "Bez korzystania z plików nanorc"
 
 #: src/nano.c:849
 msgid "Fix numeric keypad key confusion problem"
@@ -1588,7 +1583,7 @@ msgstr "Naprawia problem pomylenia klawiszy klawiatury numerycznej"
 
 #: src/nano.c:851
 msgid "Don't add newlines to the ends of files"
-msgstr "Wy³±cza dodanie znaku nowej linii na koñcu pliku"
+msgstr "Wyłącza dodanie znaku nowej linii na końcu pliku"
 
 #: src/nano.c:854
 msgid "Don't convert files from DOS/Mac format"
@@ -1596,19 +1591,19 @@ msgstr "Bez konwersji z formatu DOS/Mac"
 
 #: src/nano.c:856
 msgid "Use one more line for editing"
-msgstr "U¿ycie dodatkowej linii do redagowania"
+msgstr "Użycie dodatkowej linii do redagowania"
 
 #: src/nano.c:860
 msgid "Log & read location of cursor position"
-msgstr "Zapisz i odczytaj pozycjê kursora"
+msgstr "Zapisz i odczytaj pozycjÄ™ kursora"
 
 #: src/nano.c:863
 msgid "-Q <str>"
-msgstr "-Q <³añcuch>"
+msgstr "-Q <łańcuch>"
 
 #: src/nano.c:863
 msgid "--quotestr=<str>"
-msgstr "--quotestr=<³añcuch>"
+msgstr "--quotestr=<łańcuch>"
 
 #: src/nano.c:863
 msgid "Quoting string"
@@ -1616,11 +1611,11 @@ msgstr "Znacznik cytowania"
 
 #: src/nano.c:866
 msgid "Restricted mode"
-msgstr "Tryb zastrze¿ony"
+msgstr "Tryb zastrzeżony"
 
 #: src/nano.c:868
 msgid "Scroll by line instead of half-screen"
-msgstr "Przewija po liniach zamiast po pó³-ekranu"
+msgstr "Przewija po liniach zamiast po pół-ekranu"
 
 #: src/nano.c:870
 msgid "-T <#cols>"
@@ -1632,7 +1627,7 @@ msgstr "--tabsize=<#kol>"
 
 #: src/nano.c:871
 msgid "Set width of a tab to #cols columns"
-msgstr "Ustawienie szeroko¶ci tabulacji na podan± ilo¶æ kolumn"
+msgstr "Ustawienie szerokości tabulacji na podaną ilość kolumn"
 
 #: src/nano.c:873
 msgid "Do quick statusbar blanking"
@@ -1640,27 +1635,27 @@ msgstr "Szybkie oczyszczenie linii stanu"
 
 #: src/nano.c:875
 msgid "Print version information and exit"
-msgstr "Wypisanie wersji i zakoñczenie pracy"
+msgstr "Wypisanie wersji i zakończenie pracy"
 
 #: src/nano.c:878
 msgid "Detect word boundaries more accurately"
-msgstr "U¶ci¶la okre¶lenie granic s³ów"
+msgstr "Uściśla określenie granic słów"
 
 #: src/nano.c:882
 msgid "-Y <str>"
-msgstr "-Y <³añc>"
+msgstr "-Y <łańc>"
 
 #: src/nano.c:882
 msgid "--syntax=<str>"
-msgstr "--syntax=<³añc>"
+msgstr "--syntax=<łańc>"
 
 #: src/nano.c:883
 msgid "Syntax definition to use for coloring"
-msgstr "U¿ycie zadanej definicji sk³adni do pod¶wietlania"
+msgstr "Użycie zadanej definicji składni do podświetlania"
 
 #: src/nano.c:885
 msgid "Constantly show cursor position"
-msgstr "Sta³e pokazywanie po³o¿enia kursora"
+msgstr "Stałe pokazywanie położenia kursora"
 
 #: src/nano.c:887
 msgid "Fix Backspace/Delete confusion problem"
@@ -1668,19 +1663,19 @@ msgstr "Naprawia problem pomylenia klawiszy Backspace/Delete"
 
 #: src/nano.c:888
 msgid "Show this help text and exit"
-msgstr "Wy¶wietla ten tekst pomocy i wychodzi"
+msgstr "Wyświetla ten tekst pomocy i wychodzi"
 
 #: src/nano.c:890
 msgid "Automatically indent new lines"
-msgstr "Automatyczne wciêcia nowych linii"
+msgstr "Automatyczne wcięcia nowych linii"
 
 #: src/nano.c:891
 msgid "Cut from cursor to end of line"
-msgstr "Wycina od kursora do koñca linii"
+msgstr "Wycina od kursora do końca linii"
 
 #: src/nano.c:894
 msgid "Enable the use of the mouse"
-msgstr "W³±czenie myszy"
+msgstr "WÅ‚Ä…czenie myszy"
 
 #: src/nano.c:896
 msgid "Do not read the file (only write it)"
@@ -1700,11 +1695,11 @@ msgstr "Ustawienie katalogu pracy"
 
 #: src/nano.c:901
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
-msgstr "Zachowanie dzia³ania klawiszy XON (^Q) i XOFF (^S)"
+msgstr "Zachowanie działania klawiszy XON (^Q) i XOFF (^S)"
 
 #: src/nano.c:905
 msgid "Silently ignore startup issues like rc file errors"
-msgstr "Ignoruje b³êdy podczas rozruchu, jak np. b³êdy w pliku rc"
+msgstr "Ignoruje błędy podczas rozruchu, jak np. błędy w pliku rc"
 
 #: src/nano.c:908
 msgid "-r <#cols>"
@@ -1732,7 +1727,7 @@ msgstr "Alternatywny program sprawdzania pisowni"
 
 #: src/nano.c:916
 msgid "Auto save on exit, don't prompt"
-msgstr "Automatyczny zapis przy koñczeniu pracy, bez pytania"
+msgstr "Automatyczny zapis przy kończeniu pracy, bez pytania"
 
 #: src/nano.c:918
 msgid "Save a file by default in Unix format"
@@ -1740,11 +1735,11 @@ msgstr "Zapisz plik w formacie Unix"
 
 #: src/nano.c:920
 msgid "View mode (read-only)"
-msgstr "Tryb przegl±dania (tylko odczyt)"
+msgstr "Tryb przeglÄ…dania (tylko odczyt)"
 
 #: src/nano.c:922
 msgid "Don't hard-wrap long lines"
-msgstr "Bez przewijania d³ugich linii"
+msgstr "Bez przewijania długich linii"
 
 #: src/nano.c:924
 msgid "Don't show the two help lines"
@@ -1752,23 +1747,28 @@ msgstr "Bez pokazywania linii pomocy"
 
 #: src/nano.c:926
 msgid "Enable suspension"
-msgstr "W³±czenie zawieszania"
+msgstr "WÅ‚Ä…czenie zawieszania"
 
 #: src/nano.c:928
 msgid "Enable soft line wrapping"
-msgstr "W³±cza miêkkie przewijanie linii"
+msgstr "Włącza miękkie przewijanie linii"
 
-#: src/nano.c:937
-#, c-format
-msgid " GNU nano, version %s\n"
+#: src/nano.c:940
+#, fuzzy, c-format
+msgid " nano, version %s\n"
 msgstr " GNU nano wersja %s\n"
 
-#: src/nano.c:940
+#: src/nano.c:943
+#, c-format
+msgid " (C) 2014..%s the contributors to nano\n"
+msgstr ""
+
+#: src/nano.c:945
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr " E-mail: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 
-#: src/nano.c:941
+#: src/nano.c:946
 #, c-format
 msgid ""
 "\n"
@@ -1777,184 +1777,203 @@ msgstr ""
 "\n"
 " Skompilowane opcje:"
 
-#: src/nano.c:1073
+#: src/nano.c:1081
 msgid "No file name"
 msgstr "Brak nazwy pliku"
 
-#: src/nano.c:1108
-msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
-msgstr "Zapisaæ zmieniony bufor (ODPOWIED¬ \"Nie\" SPOWODUJE UTRATÊ ZMIAN) ? "
+#: src/nano.c:1115
+msgid "Save modified buffer?  (Answering \"No\" will DISCARD changes.) "
+msgstr ""
 
-#: src/nano.c:1168
+#: src/nano.c:1178
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr ""
-"Nie uda³o siê ponownie otworzyæ wej¶cie standardowe z klawiatury, "
+"Nie udało się ponownie otworzyć wejście standardowe z klawiatury, "
 "przepraszamy\n"
 
-#: src/nano.c:1192
+#: src/nano.c:1202
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
-msgstr "Odczyt z wej¶cia standardowego. Aby przerwaæ, naci¶nij ^C\n"
+msgstr "Odczyt z wejścia standardowego. Aby przerwać, naciśnij ^C\n"
 
-#: src/nano.c:1256
+#: src/nano.c:1266
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Otrzymano SIGHUP lub SIGTERM\n"
 
-#: src/nano.c:1272
+#: src/nano.c:1282
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
-msgstr "Aby powróciæ do nano, u¿yj \"fg\".\n"
+msgstr "Aby powrócić do nano, użyj \"fg\".\n"
 
-#: src/nano.c:1294
+#: src/nano.c:1304
 msgid "Suspension is not enabled"
-msgstr "Zawieszenie nie jest w³±czone"
+msgstr "Zawieszenie nie jest włączone"
 
-#: src/nano.c:1448
+#: src/nano.c:1459
 msgid "enabled"
-msgstr "w³±czony(e)"
+msgstr "włączony(e)"
 
-#: src/nano.c:1448
+#: src/nano.c:1459
 msgid "disabled"
-msgstr "wy³±czony(e)"
+msgstr "wyłączony(e)"
 
-#: src/nano.c:1607 src/winio.c:1125
-msgid "Unknown Command"
-msgstr "Nieznane polecenie"
+#: src/nano.c:1573
+msgid "Unbound key"
+msgstr ""
 
-#: src/nano.c:1720
+#: src/nano.c:1577
+#, c-format
+msgid "Unbound key: M-%c"
+msgstr ""
+
+#: src/nano.c:1579
+#, c-format
+msgid "Unbound key: ^%c"
+msgstr ""
+
+#: src/nano.c:1581
+#, c-format
+msgid "Unbound key: %c"
+msgstr ""
+
+#: src/nano.c:1745
 msgid "XON ignored, mumble mumble"
 msgstr "Zignorowano XON, hmm, hmm."
 
-#: src/nano.c:1725
+#: src/nano.c:1750
 msgid "XOFF ignored, mumble mumble"
 msgstr "Zignorowano XOFF, hmm, hmm."
 
-#: src/nano.c:2139 src/rcfile.c:1334
+#: src/nano.c:2166 src/rcfile.c:1187
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
-msgstr "¯±dana wielko¶æ tabulacji \"%s\" nie jest poprawna"
+msgstr "Żądana wielkość tabulacji \"%s\" nie jest poprawna"
 
-#: src/nano.c:2200 src/rcfile.c:1259
+#: src/nano.c:2227 src/rcfile.c:1128
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
-msgstr "¯±dana pozycja ³amania linii \"%s\" nie jest poprawna"
+msgstr "Żądana pozycja łamania linii \"%s\" nie jest poprawna"
 
-#: src/nano.c:2247
+#: src/nano.c:2276
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
-msgstr "Podaj '%s -h' aby uzyskaæ listê dostêpnych opcji.\n"
+msgstr "Podaj '%s -h' aby uzyskać listę dostępnych opcji.\n"
 
 #. TRANSLATORS: For the next three strings, if possible, specify
 #. * the single-byte shortcuts for both your language and English.
 #. * For example, in French: "OoYy" for "Oui".
-#: src/prompt.c:821
+#: src/prompt.c:818
 msgid "Yy"
 msgstr "Tt"
 
-#: src/prompt.c:822
+#: src/prompt.c:819
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:823
+#: src/prompt.c:820
 msgid "Aa"
 msgstr "Ww"
 
-#: src/prompt.c:845
+#: src/prompt.c:842
 msgid "Yes"
 msgstr "Tak"
 
-#: src/prompt.c:850
+#: src/prompt.c:847
 msgid "All"
 msgstr "Wszystko"
 
-#: src/prompt.c:855
+#: src/prompt.c:852
 msgid "No"
 msgstr "Nie"
 
-#: src/rcfile.c:142
+#: src/rcfile.c:144
 #, c-format
 msgid "Error in %s on line %lu: "
-msgstr "B³±d w %s w linii %lu: "
+msgstr "BÅ‚Ä…d w %s w linii %lu: "
 
-#: src/rcfile.c:201
+#: src/rcfile.c:203
 #, c-format
 msgid "Argument '%s' has an unterminated \""
-msgstr "Argument %s ma niedomkniêty \""
+msgstr "Argument %s ma niedomknięty \""
 
-#: src/rcfile.c:228 src/rcfile.c:280 src/rcfile.c:732 src/rcfile.c:793
-#: src/rcfile.c:882 src/rcfile.c:933
+#: src/rcfile.c:231 src/rcfile.c:674 src/rcfile.c:725 src/rcfile.c:824
 msgid "Regex strings must begin and end with a \" character"
-msgstr "Wyra¿enia regularne musz± zaczynaæ siê i koñczyæ znakiem \""
+msgstr "Wyrażenia regularne muszą zaczynać się i kończyć znakiem \""
 
-#: src/rcfile.c:254 src/search.c:62
+#: src/rcfile.c:257 src/search.c:61
 #, c-format
 msgid "Bad regex \"%s\": %s"
-msgstr "B³êdne wyra¿enie regularne \"%s\": %s"
+msgstr "Błędne wyrażenie regularne \"%s\": %s"
 
-#: src/rcfile.c:274
+#: src/rcfile.c:279
 msgid "Missing syntax name"
-msgstr "Brak nazwy sk³adni"
+msgstr "Brak nazwy składni"
 
-#: src/rcfile.c:345
+#: src/rcfile.c:288
+msgid "A syntax name must be quoted"
+msgstr ""
+
+#: src/rcfile.c:297
 msgid "The \"none\" syntax is reserved"
-msgstr "Sk³adnia \"none\" jest zarezerwowana"
+msgstr "Składnia \"none\" jest zarezerwowana"
 
-#: src/rcfile.c:352
-msgid "The \"default\" syntax must take no extensions"
-msgstr "Sk³adnia \"default\" nie przyjmuje rozszerzeñ"
+#: src/rcfile.c:327
+#, fuzzy
+msgid "The \"default\" syntax does not accept extensions"
+msgstr "Składnia \"default\" nie przyjmuje rozszerzeń"
 
-#: src/rcfile.c:424
+#: src/rcfile.c:369
 msgid "Missing key name"
 msgstr "Brak nazwy klawisza"
 
-#: src/rcfile.c:433 src/rcfile.c:444
+#: src/rcfile.c:378 src/rcfile.c:389
 msgid "Key name is too short"
-msgstr "Za krótka nazwa klawisza"
+msgstr "Za krótka nazwa klawisza"
 
-#: src/rcfile.c:454
+#: src/rcfile.c:399
 msgid "Key name must begin with \"^\", \"M\", or \"F\""
-msgstr "Nazwa klawisza musi zaczynaæ siê z \"^\", \"M\", lub \"F\""
+msgstr "Nazwa klawisza musi zaczynać się z \"^\", \"M\", lub \"F\""
 
-#: src/rcfile.c:457
-#, fuzzy, c-format
+#: src/rcfile.c:402
+#, c-format
 msgid "Key name %s is invalid"
-msgstr "¯±dana wielko¶æ tabulacji \"%s\" nie jest poprawna"
+msgstr "Niepoprawna nazwa klucza %s"
 
-#: src/rcfile.c:466
+#: src/rcfile.c:411
 msgid "Must specify a function to bind the key to"
-msgstr "Podaj funkcje do jakiej przypisuje siê klawisz"
+msgstr "Podaj funkcje do jakiej przypisuje siÄ™ klawisz"
 
 #. TRANSLATORS: Do not translate the word "all".
-#: src/rcfile.c:476
+#: src/rcfile.c:421
 msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
-msgstr "Musisz podaæ menu (lub \"all\") w którym przypisuje siê klawisz"
+msgstr "Musisz podać menu (lub \"all\") w którym przypisuje się klawisz"
 
-#: src/rcfile.c:483
+#: src/rcfile.c:428
 #, c-format
 msgid "Cannot map name \"%s\" to a function"
-msgstr "Nie mo¿na odwzorowaæ nazwy \"%s\" na funkcje"
+msgstr "Nie można odwzorować nazwy \"%s\" na funkcje"
 
-#: src/rcfile.c:490
+#: src/rcfile.c:435
 #, c-format
 msgid "Cannot map name \"%s\" to a menu"
-msgstr "Nie mo¿na odwzorowaæ nazwy \"%s\" na menu"
+msgstr "Nie można odwzorować nazwy \"%s\" na menu"
 
-#: src/rcfile.c:522
+#: src/rcfile.c:467
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr "Brak funkcji '%s' w menu '%s'"
 
-#: src/rcfile.c:534
+#: src/rcfile.c:479
 #, c-format
 msgid "Sorry, keystroke \"%s\" may not be rebound"
-msgstr "Przepraszam, przyci¶niêcie \"%s\" nie mo¿e byæ przypisane ponownie"
+msgstr "Przepraszam, przyciśnięcie \"%s\" nie może być przypisane ponownie"
 
-#: src/rcfile.c:631
+#: src/rcfile.c:576
 #, c-format
 msgid "Error expanding %s: %s"
-msgstr "B³±d rozszerzenia %s: %s"
+msgstr "BÅ‚Ä…d rozszerzenia %s: %s"
 
-#: src/rcfile.c:674
+#: src/rcfile.c:616
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1967,473 +1986,570 @@ msgstr ""
 "Dozwolone kolory to \"green\", \"red\", \"blue\", \n"
 "\"white\", \"yellow\", \"cyan\", \"magenta\" i \n"
 "\"black\", z opcjonalnym przedrostkiem \"bright\"\n"
-"dla kolorów pierwszoplanowych."
+"dla kolorów pierwszoplanowych."
 
-#: src/rcfile.c:696
-msgid "Cannot add a color command without a syntax command"
-msgstr "Nie mo¿na dodaæ polecenia koloru bez polecenia sk³adni"
+#: src/rcfile.c:637 src/rcfile.c:795 src/rcfile.c:858
+#, c-format
+msgid "A '%s' command requires a preceding 'syntax' command"
+msgstr ""
 
-#: src/rcfile.c:701
+#: src/rcfile.c:643
 msgid "Missing color name"
 msgstr "Brak nazwy koloru"
 
-#: src/rcfile.c:711 src/rcfile.c:872
-msgid "Missing regex string"
-msgstr "Brak wyra¿enia regularnego"
+#: src/rcfile.c:653 src/rcfile.c:807
+#, fuzzy, c-format
+msgid "Missing regex string after '%s' command"
+msgstr "Brak nazwy analizatora składni"
 
-#: src/rcfile.c:787
+#: src/rcfile.c:719
 msgid "\"start=\" requires a corresponding \"end=\""
-msgstr "\"start=\" wymaga odpowiadaj±cego mu \"end=\""
+msgstr "\"start=\" wymaga odpowiadajÄ…cego mu \"end=\""
 
-#: src/rcfile.c:839
+#: src/rcfile.c:768
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
-msgstr "Kolor t³a \"%s\" nie mo¿e byæ jaskrawy"
-
-#: src/rcfile.c:867
-msgid "Cannot add a header regex without a syntax command"
-msgstr "Nie mo¿na dodaæ regularnego wyra¿enia nag³ówka bez polecenia sk³adni"
+msgstr "Kolor tła \"%s\" nie może być jaskrawy"
 
-#: src/rcfile.c:922
-msgid "Cannot add a magic string regex without a syntax command"
-msgstr "Nie mo¿na dodaæ wyra¿enia regularnego bez polecenia sk³adni"
-
-#: src/rcfile.c:927
-msgid "Missing magic string name"
-msgstr "Brak nazwy ³añcucha magicznego"
-
-#: src/rcfile.c:985
-msgid "Cannot add a linter without a syntax command"
-msgstr "Nie mo¿na dodaæ analizatora sk³adni bez polecenia sk³adni"
-
-#: src/rcfile.c:990
-msgid "Missing linter command"
-msgstr "Brak nazwy analizatora sk³adni"
+#: src/rcfile.c:802
+#, fuzzy, c-format
+msgid "The \"default\" syntax does not accept '%s' regexes"
+msgstr "Składnia \"default\" nie przyjmuje rozszerzeń"
 
-#: src/rcfile.c:1011
-msgid "Cannot add formatter without a syntax command"
-msgstr "Nie mo¿na dodaæ formatera bez polecenia sk³adni"
+#: src/rcfile.c:863
+#, fuzzy, c-format
+msgid "Missing command after '%s'"
+msgstr "Brak nazwy analizatora składni"
 
-#: src/rcfile.c:1016
-msgid "Missing formatter command"
-msgstr "Brak nazwy formatera"
+#: src/rcfile.c:879
+#, fuzzy, c-format
+msgid "Argument of '%s' lacks closing \""
+msgstr "Argument %s ma niedomknięty \""
 
-#: src/rcfile.c:1046
+#: src/rcfile.c:910
 #, c-format
 msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr ""
-"B³±d krytyczny: brak przypisanego klawisza dla funkcji \"%s\".  "
-"Zakoñczenie.\n"
+"BÅ‚Ä…d krytyczny: brak przypisanego klawisza dla funkcji \"%s\".  "
+"Zakończenie.\n"
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:912
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
-msgstr "Je¶li trzeba, uruchom nano z opcj± -I aby dopasowaæ ustawienia.\n"
+msgstr "Jeśli trzeba, uruchom nano z opcją -I aby dopasować ustawienia.\n"
 
-#: src/rcfile.c:1109
+#: src/rcfile.c:971
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
-msgstr "Nie znaleziono sk³adni \"%s\" do rozszerzenia"
+msgstr "Nie znaleziono składni \"%s\" do rozszerzenia"
 
-#: src/rcfile.c:1125 src/rcfile.c:1134 src/rcfile.c:1144
+#: src/rcfile.c:993 src/rcfile.c:1202
 #, c-format
-msgid "Command \"%s\" not allowed in included file"
-msgstr "Poliecenie \"%s\" nie jest dozwolone w pliku do³±czonym"
+msgid "Syntax \"%s\" has no color commands"
+msgstr "Składnia \"%s\" nie ma ustawień kolorów"
 
-#: src/rcfile.c:1150 src/rcfile.c:1359
+#: src/rcfile.c:1024
 #, c-format
-msgid "Syntax \"%s\" has no color commands"
-msgstr "Sk³adnia \"%s\" nie ma ustawieñ kolorów"
+msgid "Command \"%s\" not allowed in included file"
+msgstr "Poliecenie \"%s\" nie jest dozwolone w pliku dołączonym"
 
-#: src/rcfile.c:1180
+#: src/rcfile.c:1039
 #, c-format
 msgid "Command \"%s\" not understood"
-msgstr "Niezrozumia³e polecenie \"%s\""
+msgstr "Niezrozumiałe polecenie \"%s\""
 
-#: src/rcfile.c:1195
+#: src/rcfile.c:1051
 msgid "Missing option"
 msgstr "Brak opcji"
 
-#: src/rcfile.c:1217
+#: src/rcfile.c:1065
+#, c-format
+msgid "Unknown option \"%s\""
+msgstr "Nieznana opcja \"%s\""
+
+#: src/rcfile.c:1077
+#, c-format
+msgid "Cannot unset option \"%s\""
+msgstr "Nie można zresetować opcji \"%s\""
+
+#: src/rcfile.c:1089
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Opcja \"%s\" wymaga argumentu"
 
-#: src/rcfile.c:1235
+#: src/rcfile.c:1105
 msgid "Option is not a valid multibyte string"
-msgstr "Opcja nie jest poprawnym ³añcuchem wielobajtowym"
+msgstr "Opcja nie jest poprawnym łańcuchem wielobajtowym"
 
-#: src/rcfile.c:1272 src/rcfile.c:1300 src/rcfile.c:1309
+#: src/rcfile.c:1139 src/rcfile.c:1160 src/rcfile.c:1167
 msgid "Non-blank characters required"
-msgstr "Wymagane s± nie-bia³e znaki"
+msgstr "Wymagane są nie-białe znaki"
 
-#: src/rcfile.c:1282
+#: src/rcfile.c:1146
 msgid "Two single-column characters required"
-msgstr "Wymagane s± dwa jednobajtowych znaki"
+msgstr "Wymagane sÄ… dwa jednobajtowych znaki"
 
-#: src/rcfile.c:1348
-#, c-format
-msgid "Cannot unset option \"%s\""
-msgstr "Nie mo¿na zresetowaæ opcji \"%s\""
-
-#: src/rcfile.c:1354
-#, c-format
-msgid "Unknown option \"%s\""
-msgstr "Nieznana opcja \"%s\""
-
-#: src/rcfile.c:1413
+#: src/rcfile.c:1258
 msgid "I can't find my home directory!  Wah!"
-msgstr "Nie mogê znale¼æ swojego katalogu domowego!  Aj!"
+msgstr "Nie mogę znaleźć swojego katalogu domowego!  Aj!"
 
-#: src/rcfile.c:1451
+#: src/rcfile.c:1295
 #, c-format
 msgid ""
 "\n"
 "Press Enter to continue starting nano.\n"
 msgstr ""
 "\n"
-"Naci¶nij return aby kontynuowaæ rozruch nano.\n"
+"Naciśnij return aby kontynuować rozruch nano.\n"
 
-#: src/search.c:96
+#: src/search.c:95
 #, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "Nie znaleziono \"%.*s%s\""
 
 #. TRANSLATORS: The next three strings are modifiers of the search prompt.
-#: src/search.c:176
+#: src/search.c:169
 msgid " [Case Sensitive]"
 msgstr " [Uwzgl.wielk.liter]"
 
-#: src/search.c:180
+#: src/search.c:173
 msgid " [Regexp]"
 msgstr " [Wyr.reg.]"
 
-#: src/search.c:184
+#: src/search.c:177
 msgid " [Backwards]"
 msgstr " [Wstecz]"
 
 #. TRANSLATORS: The next two strings are modifiers of the search prompt.
-#: src/search.c:189
+#: src/search.c:182
 msgid " (to replace) in selection"
-msgstr " (i zast±p) w zaznaczeniu"
+msgstr " (i zastÄ…p) w zaznaczeniu"
 
-#: src/search.c:191
+#: src/search.c:184
 msgid " (to replace)"
-msgstr " (i zast±p)"
+msgstr " (i zastÄ…p)"
+
+#: src/search.c:305
+#, fuzzy
+msgid "Searching..."
+msgstr "Szukaj"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:718
+#: src/search.c:693
 msgid "Replace this instance?"
-msgstr "Czy zast±piæ to wyst±pienie?"
+msgstr "Czy zastąpić to wystąpienie?"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:883
+#: src/search.c:840
 msgid "Replace with"
-msgstr "Zast±p przez"
+msgstr "ZastÄ…p przez"
 
-#: src/search.c:924
+#: src/search.c:875
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
-msgstr[0] "Zast±piono %lu wyst±pienie"
-msgstr[1] "Zast±piono %lu wyst±pienia"
-msgstr[2] "Zast±piono %lu wyst±pieñ"
+msgstr[0] "ZastÄ…piono %lu wystÄ…pienie"
+msgstr[1] "ZastÄ…piono %lu wystÄ…pienia"
+msgstr[2] "Zastąpiono %lu wystąpień"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:964
+#: src/search.c:914
 msgid "Enter line number, column number"
-msgstr "Wprowad¼ numer linii, numer kolumny"
+msgstr "Wprowadź numer linii, numer kolumny"
 
-#: src/search.c:991
+#: src/search.c:939
 msgid "Invalid line or column number"
 msgstr "Niepoprawny numer linii lub kolumny"
 
-#: src/search.c:1124
+#: src/search.c:1080
 msgid "Not a bracket"
 msgstr "To nie nawias"
 
-#: src/search.c:1191
+#: src/search.c:1146
 msgid "No matching bracket"
 msgstr "Brak nawiasu do pary"
 
-#: src/text.c:54
+#: src/text.c:53
 msgid "Mark Set"
 msgstr "Znacznik ustawiony"
 
-#: src/text.c:58
+#: src/text.c:57
 msgid "Mark Unset"
 msgstr "Znacznik skasowany"
 
-#: src/text.c:70
+#: src/text.c:69
 #, c-format
 msgid "Error invoking \"%s\""
-msgstr "B³±d podczas wywo³ywania \"%s\""
+msgstr "Błąd podczas wywoływania \"%s\""
 
-#: src/text.c:475
-msgid "Nothing in undo buffer!"
-msgstr "Nie ma nic w buforze odwo³ania"
+#: src/text.c:468
+msgid "Commenting is not supported for this file type"
+msgstr ""
 
-#: src/text.c:481 src/text.c:634
-#, c-format
-msgid "Internal error: can't match line %d.  Please save your work."
+#: src/text.c:484
+msgid "Cannot comment past end of file"
 msgstr ""
-"B³±d wewnêtrzny: nie mo¿na dopasowaæ linii %d. Proszê zapisaæ swoj± pracê."
+
+#: src/text.c:677
+msgid "Nothing in undo buffer!"
+msgstr "Nie ma nic w buforze odwołania"
 
 #. TRANSLATORS: Eight of the next nine strings describe actions
 #. * that are undone or redone.  It are all nouns, not verbs.
-#: src/text.c:495 src/text.c:524 src/text.c:645 src/text.c:686
+#: src/text.c:695 src/text.c:724 src/text.c:857 src/text.c:898
 msgid "text add"
 msgstr "tekst dodany"
 
-#: src/text.c:505 src/text.c:656
+#: src/text.c:705 src/text.c:868
 msgid "text delete"
-msgstr "tekst usuniêty"
+msgstr "tekst usunięty"
 
-#: src/text.c:528 src/text.c:694
+#: src/text.c:728 src/text.c:907
 msgid "line join"
-msgstr "po³±czenie linii"
+msgstr "połączenie linii"
 
-#: src/text.c:547 src/text.c:710
+#: src/text.c:747 src/text.c:923
 msgid "text cut"
-msgstr "wyciêcie tekstu"
+msgstr "wycięcie tekstu"
 
-#: src/text.c:552 src/text.c:714
+#: src/text.c:752 src/text.c:927
 msgid "text uncut"
 msgstr "wklejanie tekstu"
 
-#: src/text.c:558 src/text.c:691
+#: src/text.c:758 src/text.c:903
 msgid "Internal error: line is missing.  Please save your work."
-msgstr "B³±d wewnêtrzny: brak linii. Proszê zapisaæ swoj± pracê."
+msgstr "Błąd wewnętrzny: brak linii. Proszę zapisać swoją pracę."
 
-#: src/text.c:561 src/text.c:665
+#: src/text.c:762 src/text.c:877
 msgid "line break"
-msgstr "³amanie linii"
+msgstr "Å‚amanie linii"
 
-#: src/text.c:569 src/text.c:725
+#: src/text.c:772 src/text.c:947
+msgid "comment"
+msgstr ""
+
+#: src/text.c:776 src/text.c:951
+msgid "uncomment"
+msgstr ""
+
+#: src/text.c:780 src/text.c:938
 msgid "text insert"
 msgstr "tekst wprowadzony"
 
-#: src/text.c:589 src/text.c:718
+#: src/text.c:800 src/text.c:931
 msgid "text replace"
 msgstr "tekst zamieniony"
 
-#: src/text.c:596 src/text.c:732 src/text.c:1030 src/text.c:1174
+#: src/text.c:807 src/text.c:955 src/text.c:1267 src/text.c:1437
 msgid "Internal error: unknown type.  Please save your work."
-msgstr "B³±d wewnêtrzny: nieznany typ. Proszê zapisaæ swoj± pracê."
+msgstr "Błąd wewnętrzny: nieznany typ. Proszę zapisać swoją pracę."
 
-#: src/text.c:601
+#: src/text.c:813
 #, c-format
 msgid "Undid action (%s)"
-msgstr "Odwo³ano operacjê (%s)"
+msgstr "Odwołano operację (%s)"
 
-#: src/text.c:619
+#: src/text.c:832
 msgid "Nothing to re-do!"
-msgstr "Nic do powtórzenia!"
+msgstr "Nic do powtórzenia!"
 
-#: src/text.c:628
+#: src/text.c:841
 msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
-"B³±d wewnêtrzny: ustawianie powtórzenia nie powiod³o siê. Proszê zapisaæ "
-"swoj± pracê."
+"Błąd wewnętrzny: ustawianie powtórzenia nie powiodło się. Proszę zapisać "
+"swojÄ… pracÄ™."
 
-#: src/text.c:737
+#: src/text.c:961
 #, c-format
 msgid "Redid action (%s)"
-msgstr "Powtórzono operacjê (%s)"
+msgstr "Powtórzono operację (%s)"
 
-#: src/text.c:827 src/text.c:2508 src/text.c:2944
+#: src/text.c:1051 src/text.c:2765 src/text.c:3198
 msgid "Could not create pipe"
-msgstr "Nie mo¿na utworzyæ potoku"
+msgstr "Nie można utworzyć potoku"
 
-#: src/text.c:853 src/text.c:2595 src/text.c:2750 src/text.c:2992
-#: src/text.c:3286
+#: src/text.c:1077 src/text.c:2852 src/text.c:3005 src/text.c:3246
+#: src/text.c:3540
 msgid "Could not fork"
-msgstr "Nie mo¿na rozwidliæ procesu"
+msgstr "Nie można rozwidlić procesu"
 
-#: src/text.c:1853
+#: src/text.c:2117
 #, c-format
 msgid "Bad quote string %s: %s"
-msgstr "Nieprawid³owy znacznik cytowania %s: %s"
+msgstr "Nieprawidłowy znacznik cytowania %s: %s"
 
-#: src/text.c:2241
+#: src/text.c:2499
 msgid "Can now UnJustify!"
-msgstr "Mo¿na teraz cofn±æ justowanie!"
+msgstr "Można teraz cofnąć justowanie!"
 
-#: src/text.c:2435
+#: src/text.c:2697
 msgid "Edit a replacement"
-msgstr "Edytuj zast±pienie"
+msgstr "Edytuj zastÄ…pienie"
 
-#: src/text.c:2510
+#. TRANSLATORS: Shown after fixing misspellings in one word.
+#: src/text.c:2713
+#, fuzzy
+msgid "Next word..."
+msgstr "Nast.słowo"
+
+#: src/text.c:2767
 msgid "Creating misspelled word list, please wait..."
-msgstr "Tworzenie listy b³êdnie napisanych s³ów, proszê czekaæ..."
+msgstr "Tworzenie listy błędnie napisanych słów, proszę czekać..."
 
-#: src/text.c:2601 src/text.c:2999
+#: src/text.c:2858 src/text.c:3253
 msgid "Could not get size of pipe buffer"
-msgstr "Nie mo¿na uzyskaæ wielko¶ci bufora potoku"
+msgstr "Nie można uzyskać wielkości bufora potoku"
 
-#: src/text.c:2652
+#: src/text.c:2907
 msgid "Error invoking \"spell\""
-msgstr "B³±d podczas wywo³ywania \"spell\""
+msgstr "Błąd podczas wywoływania \"spell\""
 
-#: src/text.c:2655
+#: src/text.c:2910
 msgid "Error invoking \"sort -f\""
-msgstr "B³±d podczas wywo³ywania \"sort -f\""
+msgstr "Błąd podczas wywoływania \"sort -f\""
 
-#: src/text.c:2658
+#: src/text.c:2913
 msgid "Error invoking \"uniq\""
-msgstr "B³±d podczas wywo³ywania \"uniq\""
+msgstr "Błąd podczas wywoływania \"uniq\""
 
-#: src/text.c:2881
+#: src/text.c:3135
 msgid "Invoking spell checker, please wait"
-msgstr "Wywo³anie sprawdzania pisowni, proszê zaczekaæ"
+msgstr "Wywołanie sprawdzania pisowni, proszę zaczekać"
 
-#: src/text.c:2897
+#: src/text.c:3151
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Niepowodzenie sprawdzania pisowni: %s"
 
-#: src/text.c:2899
+#: src/text.c:3153
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Niepowodzenie sprawdzania pisowni: %s: %s"
 
-#: src/text.c:2902
+#: src/text.c:3156
 msgid "Finished checking spelling"
-msgstr "Zakoñczono sprawdzanie pisowni"
+msgstr "Zakończono sprawdzanie pisowni"
 
-#: src/text.c:2927
+#: src/text.c:3181
 msgid "No linter defined for this type of file!"
-msgstr "Brak analizatora sk³adni dla tego typu pliku!"
+msgstr "Brak analizatora składni dla tego typu pliku!"
 
-#: src/text.c:2932
+#: src/text.c:3186
 msgid "Save modified buffer before linting?"
-msgstr "Zapisaæ bufor przed sprawdzaniem sk³adni?"
+msgstr "Zapisać bufor przed sprawdzaniem składni?"
 
-#: src/text.c:2949
+#: src/text.c:3203
 msgid "Invoking linter, please wait"
-msgstr "Sprawdzanie sk³adni, proszê zaczekaæ"
+msgstr "Sprawdzanie składni, proszę zaczekać"
 
-#: src/text.c:3105
+#: src/text.c:3358
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr "Otrzymano 0 poprawnych linii od polecenia: %s"
 
-#: src/text.c:3134
+#: src/text.c:3388
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
-"Ten komunikat dotyczy nie otworzonego pliku %s; otworzyæ go w nowym buforze?"
+"Ten komunikat dotyczy nie otworzonego pliku %s; otworzyć go w nowym buforze?"
 
-#: src/text.c:3153
+#: src/text.c:3407
 msgid "No more errors in unopened files, cancelling"
-msgstr ""
+msgstr "W nieotwartych plikach nie ma więcej błędów; anulowanie"
 
-#: src/text.c:3192
+#: src/text.c:3446
 msgid "At last message"
 msgstr "Ostatni komunikat"
 
-#: src/text.c:3197
+#: src/text.c:3451
 msgid "At first message"
 msgstr "Pierwszy komunikat"
 
-#: src/text.c:3237
+#: src/text.c:3491
 msgid "Finished"
-msgstr "Zakoñczono"
+msgstr "Zakończono"
 
-#: src/text.c:3259
+#: src/text.c:3513
 msgid "Invoking formatter, please wait"
-msgstr "Wywo³anie formatera, proszê zaczekaæ"
+msgstr "Wywołanie formatera, proszę zaczekać"
 
-#: src/text.c:3314
+#: src/text.c:3568
 msgid "Finished formatting"
-msgstr "Zakoñczono formatowanie"
+msgstr "Zakończono formatowanie"
 
-#: src/text.c:3396
+#: src/text.c:3650
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
-msgstr "%sS³owa: %lu  Linii: %ld  Znaki: %lu"
+msgstr "%sSÅ‚owa: %lu  Linii: %ld  Znaki: %lu"
 
-#: src/text.c:3397
+#: src/text.c:3651
 msgid "In Selection:  "
 msgstr "W zaznaczeniu:  "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3411
+#: src/text.c:3665
 msgid "Verbatim Input"
-msgstr "wprowadzanie dos³owne"
+msgstr "wprowadzanie dosłowne"
 
-#: src/utils.c:391 src/utils.c:403
+#: src/utils.c:392 src/utils.c:404
 msgid "nano is out of memory!"
-msgstr "nano brak³o pamiêci!"
+msgstr "nano brakło pamięci!"
+
+#: src/utils.c:625
+#, c-format
+msgid "Internal error: can't match line %d.  Please save your work."
+msgstr ""
+"Błąd wewnętrzny: nie można dopasować linii %d. Proszę zapisać swoją pracę."
+
+#. TRANSLATORS: This refers to a sequence of escape codes
+#. * (from the keyboard) that nano does not know about.
+#: src/winio.c:1121
+msgid "Unknown sequence"
+msgstr ""
 
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
 #: src/winio.c:1427
 msgid "Unicode Input"
-msgstr "Wej¶cie Unicode"
-
-#: src/winio.c:1991 src/winio.c:1995
-msgid "Modified"
-msgstr "Zmieniony "
+msgstr "Wejście Unicode"
 
-#: src/winio.c:1992
-msgid "View"
-msgstr "Przegl."
-
-#: src/winio.c:2006
+#: src/winio.c:1960
 msgid "DIR:"
 msgstr "KAT:"
 
-#: src/winio.c:2013
+#: src/winio.c:1968
 msgid "File:"
 msgstr "Plik:"
 
-#: src/winio.c:3141
+#: src/winio.c:1972 src/winio.c:1976
+msgid "Modified"
+msgstr "Zmieniony "
+
+#: src/winio.c:1974
+msgid "View"
+msgstr "Przegl."
+
+#: src/winio.c:3105
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "lin.%ld/%ld (%d%%), kol.%lu/%lu (%d%%), zn.%lu/%lu (%d%%)"
 
-#: src/winio.c:3271
+#: src/winio.c:3235
 msgid "The nano text editor"
 msgstr "Edytor tekstu nano"
 
-#: src/winio.c:3272
+#: src/winio.c:3236
 msgid "version"
 msgstr "wersja"
 
-#: src/winio.c:3273
+#: src/winio.c:3237
 msgid "Brought to you by:"
 msgstr "Stworzony przez:"
 
-#: src/winio.c:3274
+#: src/winio.c:3238
 msgid "Special thanks to:"
-msgstr "Specjalne podziêkowania otrzymuj±:"
+msgstr "Specjalne podziękowania otrzymują:"
 
-#: src/winio.c:3275
+#: src/winio.c:3239
 msgid "The Free Software Foundation"
 msgstr "Free Software Foundation (Fundacja Wolnego Oprogramowania)"
 
-#: src/winio.c:3276
+#: src/winio.c:3240
 msgid "the many translators and the TP"
-msgstr "wielu t³umaczy i TP"
+msgstr "wielu tłumaczy i TP"
 
-#: src/winio.c:3277
+#: src/winio.c:3241
 msgid "For ncurses:"
 msgstr "Za ncurses:"
 
-#: src/winio.c:3278
+#: src/winio.c:3242
 msgid "and anyone else we forgot..."
-msgstr "oraz wszyscy pozostali, o których zapomnieli¶my..."
+msgstr "oraz wszyscy pozostali, o których zapomnieliśmy..."
 
-#: src/winio.c:3279
+#: src/winio.c:3243
 msgid "Thank you for using nano!"
-msgstr "Dziêkujemy za korzystanie z nano!"
+msgstr "Dziękujemy za korzystanie z nano!"
+
+#~ msgid ""
+#~ "Read %lu line (Converted from DOS and Mac format - Warning: No write "
+#~ "permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from DOS and Mac format - Warning: No write "
+#~ "permission)"
+#~ msgstr[0] ""
+#~ "Wczytano %lu linię (przekonwertowana z formatu DOS i Mac - Ostrzeżenie: "
+#~ "brak pozwolenia na zapis)"
+#~ msgstr[1] ""
+#~ "Wczytano %lu linie (przekonwertowane z formatu DOS i Mac - Ostrzeżenie: "
+#~ "brak pozwolenia na zapis)"
+#~ msgstr[2] ""
+#~ "Wczytano %lu linii (przekonwertowane z formatu DOS i Mac - Ostrzeżenie: "
+#~ "brak pozwolenia na zapis)"
+
+#~ msgid ""
+#~ "Read %lu line (Converted from Mac format - Warning: No write permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from Mac format - Warning: No write permission)"
+#~ msgstr[0] ""
+#~ "Wczytano %lu linię (przekonwertowana z formatu Mac - Ostrzeżenie: brak "
+#~ "pozwolenia na zapis)"
+#~ msgstr[1] ""
+#~ "Wczytano %lu linie (przekonwertowane z formatu Mac - Ostrzeżenie: brak "
+#~ "pozwolenia na zapis)"
+#~ msgstr[2] ""
+#~ "Wczytano %lu linii (przekonwertowane z formatu Mac - Ostrzeżenie: brak "
+#~ "pozwolenia na zapis)"
+
+#~ msgid ""
+#~ "Read %lu line (Converted from DOS format - Warning: No write permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from DOS format - Warning: No write permission)"
+#~ msgstr[0] ""
+#~ "Wczytano %lu linię (przekonwertowana z formatu DOS - Ostrzeżenie: brak "
+#~ "pozwolenia na zapis)"
+#~ msgstr[1] ""
+#~ "Wczytano %lu linie (przekonwertowane z formatu DOS - Ostrzeżenie: brak "
+#~ "pozwolenia na zapis)"
+#~ msgstr[2] ""
+#~ "Wczytano %lu linii (przekonwertowane z formatu DOS - Ostrzeżenie: brak "
+#~ "pozwolenia na zapis)"
+
+#~ msgid "Read %lu line (Warning: No write permission)"
+#~ msgid_plural "Read %lu lines (Warning: No write permission)"
+#~ msgstr[0] "Wczytano %lu linię (Ostrzeżenie: brak pozwolenia na zapis)"
+#~ msgstr[1] "Wczytano %lu linie (Ostrzeżenie: brak pozwolenia na zapis)"
+#~ msgstr[2] "Wczytano %lu linii (Ostrzeżenie: brak pozwolenia na zapis)"
+
+#~ msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
+#~ msgstr ""
+#~ "Zapisać zmieniony bufor (ODPOWIEDŹ \"Nie\" SPOWODUJE UTRATĘ ZMIAN) ? "
+
+#~ msgid "Unknown Command"
+#~ msgstr "Nieznane polecenie"
+
+#~ msgid "Cannot add a color command without a syntax command"
+#~ msgstr "Nie można dodać polecenia koloru bez polecenia składni"
+
+#~ msgid "Missing regex string"
+#~ msgstr "Brak wyrażenia regularnego"
 
-#~ msgid "Cannot prepend or append to a symlink with --nofollow set"
+#~ msgid "Cannot add a header regex without a syntax command"
 #~ msgstr ""
-#~ "Nie mo¿na dopisywaæ do ³±cza symbolicznego przy w³±czonej opcji --nofollow"
+#~ "Nie można dodać regularnego wyrażenia nagłówka bez polecenia składni"
+
+#~ msgid "Cannot add a magic string regex without a syntax command"
+#~ msgstr "Nie można dodać wyrażenia regularnego bez polecenia składni"
+
+#~ msgid "Missing magic string name"
+#~ msgstr "Brak nazwy łańcucha magicznego"
+
+#~ msgid "Cannot add a linter without a syntax command"
+#~ msgstr "Nie można dodać analizatora składni bez polecenia składni"
+
+#~ msgid "Cannot add formatter without a syntax command"
+#~ msgstr "Nie można dodać formatera bez polecenia składni"
 
-#~ msgid "Don't follow symbolic links, overwrite"
-#~ msgstr "Bez pod±¿ania za dowi±zaniami symbolicznymi, nadpisywanie"
+#~ msgid "Missing formatter command"
+#~ msgstr "Brak nazwy formatera"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index c705cde9..8c5880c4 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 2.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-25 16:41-0500\n"
+"POT-Creation-Date: 2016-06-17 15:41+0200\n"
 "PO-Revision-Date: 2016-02-12 11:01-0200\n"
 "Last-Translator: Rafael Fontenelle <rffontenelle@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge."
@@ -20,379 +20,354 @@ msgstr ""
 "X-Generator: Poedit 1.8.7\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: src/browser.c:144 src/browser.c:284 src/browser.c:334 src/files.c:996
+#: src/files.c:1003 src/files.c:1794 src/files.c:1919 src/files.c:1963
+#: src/files.c:1983 src/files.c:2099 src/files.c:3019 src/files.c:3242
+#: src/rcfile.c:540 src/rcfile.c:1280
+#, c-format
+msgid "Error reading %s: %s"
+msgstr "Erro ao ler %s: %s"
+
 #. TRANSLATORS: This is a prompt.
-#: src/browser.c:220
+#: src/browser.c:247
 msgid "Go To Directory"
 msgstr "Ir para o diretório"
 
-#: src/browser.c:227 src/browser.c:738 src/files.c:1174 src/files.c:2340
-#: src/nano.c:1120 src/search.c:202 src/search.c:290 src/search.c:895
-#: src/search.c:970 src/text.c:2935 src/text.c:3142
+#: src/browser.c:254 src/browser.c:723 src/files.c:1126 src/files.c:2292
+#: src/nano.c:1128 src/search.c:195 src/search.c:297 src/search.c:851
+#: src/search.c:918 src/text.c:3189 src/text.c:3396
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: src/browser.c:253 src/browser.c:300
-#, c-format
-msgid "Can't go outside of %s in restricted mode"
+#. TRANSLATORS: This refers to the option --operatingdir,
+#. * not to --restricted.
+#: src/browser.c:274 src/browser.c:326
+#, fuzzy, c-format
+msgid "Can't go outside of %s in confined mode"
 msgstr "Não é possível mover-se para fora de %s no modo restrito"
 
-#: src/browser.c:264 src/browser.c:310 src/browser.c:326 src/files.c:1044
-#: src/files.c:1052 src/files.c:1844 src/files.c:1971 src/files.c:2016
-#: src/files.c:2037 src/files.c:2156 src/files.c:3062 src/files.c:3285
-#: src/rcfile.c:596 src/rcfile.c:1435
-#, c-format
-msgid "Error reading %s: %s"
-msgstr "Erro ao ler %s: %s"
-
-#: src/browser.c:290
+#: src/browser.c:317
 msgid "Can't move up a directory"
 msgstr "Não é possível mover um diretório"
 
 #. TRANSLATORS: Try to keep this at most 7 characters.
-#: src/browser.c:615 src/browser.c:623
+#: src/browser.c:590 src/browser.c:598
 msgid "(dir)"
 msgstr "(dir)"
 
 #. TRANSLATORS: Try to keep this at most 12 characters.
-#: src/browser.c:620
+#: src/browser.c:595
 msgid "(parent dir)"
 msgstr "(dir acima)"
 
 #. TRANSLATORS: Try to keep this at most 7 characters.
 #. * If necessary, you can leave out the parentheses.
-#: src/browser.c:650
+#: src/browser.c:625
 msgid "(huge)"
 msgstr "gigante"
 
 #. TRANSLATORS: This is the main search prompt.
-#: src/browser.c:727 src/search.c:173
+#: src/browser.c:712 src/search.c:166
 msgid "Search"
 msgstr "Pesquisa"
 
-#: src/browser.c:777 src/search.c:466 src/search.c:536
-msgid "This is the only occurrence"
-msgstr "Esta é a única ocorrência"
-
-#: src/browser.c:793 src/search.c:364
+#: src/browser.c:754 src/search.c:368
 msgid "Search Wrapped"
 msgstr "Pesquisa ajustada"
 
-#: src/browser.c:843 src/search.c:517
+#: src/browser.c:764 src/search.c:509
+msgid "This is the only occurrence"
+msgstr "Esta é a única ocorrência"
+
+#: src/browser.c:812 src/search.c:473
 msgid "No current search pattern"
 msgstr "Nenhum padrão de pesquisa atualmente"
 
-#: src/files.c:50
+#: src/color.c:186
+#, fuzzy, c-format
+msgid "Unknown syntax name: %s"
+msgstr "Falta o nome da sintaxe"
+
+#: src/color.c:247
+#, c-format
+msgid "magic_load() failed: %s"
+msgstr ""
+
+#: src/color.c:251
+#, c-format
+msgid "magic_file(%s) failed: %s"
+msgstr ""
+
+#: src/files.c:47
 #, c-format
 msgid "Directory '%s' does not exist"
 msgstr "O diretório \"%s\" não existe"
 
-#: src/files.c:52
+#: src/files.c:49
 #, c-format
 msgid "Path '%s': %s"
 msgstr "Caminho \"%s\": %s"
 
-#: src/files.c:54
+#: src/files.c:51
 #, c-format
 msgid "Path '%s' is not a directory"
 msgstr "O caminho \"%s\" não é um diretório"
 
-#: src/files.c:57
+#: src/files.c:53
 #, c-format
 msgid "Path '%s' is not accessible"
 msgstr "O caminho \"%s\" não é acessível"
 
 # Mantive em 74 caracteres. -- Rafael
-#. TRANSLATORS: Try to keep this at most 76 characters.
-#: src/files.c:158
+#. TRANSLATORS: Keep the next ten messages at most 76 characters.
+#: src/files.c:148
 msgid ""
 "Warning: Modifying a file which is not locked, check directory permission?"
 msgstr ""
 "Aviso: Modificando arquivo não travado, verificar permissão do diretório?"
 
-#: src/files.c:197
+#: src/files.c:187
 msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
 msgstr ""
 "Não foi possível determinar minha identidade para o arquivo de trava "
 "(getpwuid() falhou)"
 
-#: src/files.c:206
+#: src/files.c:196
 #, c-format
 msgid "Couldn't determine hostname for lock file: %s"
 msgstr ""
 "Não foi possível determinar o nome de máquina para o arquivo de trava: %s"
 
-#: src/files.c:227 src/files.c:238 src/files.c:275 src/files.c:285
+#: src/files.c:216 src/files.c:225 src/files.c:262 src/files.c:272
 #, c-format
 msgid "Error writing lock file %s: %s"
 msgstr "Erro ao escrever o arquivo de trava %s: %s"
 
-#: src/files.c:305
+#: src/files.c:291
 #, c-format
 msgid "Error deleting lock file %s: %s"
 msgstr "Erro ao escrever o arquivo de trava %s: %s"
 
-#: src/files.c:341
+#: src/files.c:325
 #, c-format
 msgid "Error opening lock file %s: %s"
 msgstr "Erro ao abrir o arquivo de trava %s: %s"
 
-#: src/files.c:353
+#: src/files.c:337
 #, c-format
 msgid "Error reading lock file %s: Not enough data read"
 msgstr "Erro ao ler o arquivo de trava %s: Leitura de dados insuficiente"
 
 #. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
-#: src/files.c:371
+#: src/files.c:354
 #, c-format
 msgid "File %s is being edited (by %s with %s, PID %d); continue?"
 msgstr "Arquivo %s está sendo editado (por %s com %s, PID %d). Continuar?"
 
-#: src/files.c:426
+#: src/files.c:430
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Não foi possível inserir a linha de fora de %s"
 
-#: src/files.c:439 src/files.c:1038 src/rcfile.c:589 src/rcfile.c:1385
-#: src/rcfile.c:1426
+#: src/files.c:445 src/files.c:991 src/rcfile.c:533 src/rcfile.c:1230
+#: src/rcfile.c:1271
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" é um diretório"
 
-#: src/files.c:441
+#: src/files.c:447
 #, c-format
 msgid "\"%s\" is not a normal file"
 msgstr "\"%s\" não é um arquivo normal"
 
-#: src/files.c:566
+#: src/files.c:571
 msgid "No more open file buffers"
 msgstr "Não há mais nenhum buffer de arquivos abertos"
 
-#: src/files.c:582
+#: src/files.c:586
 #, c-format
 msgid "Switched to %s"
 msgstr "Alternado para %s"
 
-#: src/files.c:584 src/global.c:988 src/winio.c:2010
+#: src/files.c:588 src/global.c:1005 src/winio.c:1965
 msgid "New Buffer"
 msgstr "Novo buffer"
 
-#: src/files.c:943
+#. TRANSLATORS: Keep the next four messages at most 76 characters.
+#: src/files.c:913
 #, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
 msgstr[0] "%lu linha lida (Convertida do formato DOS e Mac)"
 msgstr[1] "%lu linhas lidas (Convertidas do formato DOS e Mac)"
 
-#: src/files.c:948
-#, c-format
-msgid ""
-"Read %lu line (Converted from DOS and Mac format - Warning: No write "
-"permission)"
-msgid_plural ""
-"Read %lu lines (Converted from DOS and Mac format - Warning: No write "
-"permission)"
-msgstr[0] ""
-"%lu linha lida (Convertida do formato DOS e Mac - Atenção: Sem permissão de "
-"escrita)"
-msgstr[1] ""
-"%lu linhas lidas (Convertidas do formato DOS e Mac - Atenção: Sem permissão "
-"de escrita)"
-
-#: src/files.c:954
+#: src/files.c:919
 #, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
 msgstr[0] "%lu linha lida (Convertida do formato Mac)"
 msgstr[1] "%lu linhas lidas (Convertidas do formato Mac)"
 
-#: src/files.c:958
-#, c-format
-msgid ""
-"Read %lu line (Converted from Mac format - Warning: No write permission)"
-msgid_plural ""
-"Read %lu lines (Converted from Mac format - Warning: No write permission)"
-msgstr[0] ""
-"%lu linha lida (Convertida do formato Mac - Atenção: Sem permissão de "
-"escrita)"
-msgstr[1] ""
-"%lu linhas lidas (Convertidas do formato Mac - Atenção: Sem permissão de "
-"escrita)"
-
-#: src/files.c:964
+#: src/files.c:925
 #, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
 msgstr[0] "%lu linha lida (Convertida do formato DOS)"
 msgstr[1] "%lu linhas lidas (Convertidas do formato DOS)"
 
-#: src/files.c:968
-#, c-format
-msgid ""
-"Read %lu line (Converted from DOS format - Warning: No write permission)"
-msgid_plural ""
-"Read %lu lines (Converted from DOS format - Warning: No write permission)"
-msgstr[0] ""
-"%lu linha lida (Convertida do formato DOS - Atenção: Sem permissão de "
-"escrita)"
-msgstr[1] ""
-"%lu linhas lidas (Convertidas do formato DOS - Atenção: Sem permissão de "
-"escrita)"
-
-#: src/files.c:974
+#: src/files.c:930
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "%lu linha lida"
 msgstr[1] "%lu linhas lidas"
 
-#: src/files.c:977
-#, c-format
-msgid "Read %lu line (Warning: No write permission)"
-msgid_plural "Read %lu lines (Warning: No write permission)"
-msgstr[0] "%lu linha lida (Atenção: Sem permissão de escrita)"
-msgstr[1] "%lu linhas lidas (Atenção: sem permissão de escrita)"
-
-#: src/files.c:1019 src/files.c:1056
+#: src/files.c:974 src/files.c:1006
 msgid "Reading File"
 msgstr "Lendo o arquivo"
 
-#: src/files.c:1025
+#: src/files.c:980
 msgid "New File"
 msgstr "Novo arquivo"
 
-#: src/files.c:1028
-#, c-format
-msgid "\"%s\" not found"
+#: src/files.c:983
+#, fuzzy, c-format
+msgid "File \"%s\" not found"
 msgstr "\"%s\" não encontrado"
 
-#: src/files.c:1039 src/rcfile.c:590 src/rcfile.c:1386 src/rcfile.c:1427
+#: src/files.c:992 src/rcfile.c:534 src/rcfile.c:1231 src/rcfile.c:1272
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" é um arquivo dispositivo"
 
-#: src/files.c:1133
+#: src/files.c:1083
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Comando para execução no novo buffer [de %s] "
 
-#: src/files.c:1135
+#: src/files.c:1085
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Comando para execução [de %s] "
 
-#: src/files.c:1142
+#: src/files.c:1092
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Arquivo para inserção no novo buffer [de %s] "
 
-#: src/files.c:1144
+#: src/files.c:1094
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Arquivo para inserção [de %s] "
 
-#: src/files.c:1389
+#: src/files.c:1338
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Tecla inválida em modo não-multibuffer"
 
-#: src/files.c:1684
-msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+#: src/files.c:1632
+#, fuzzy
+msgid "Failed to write backup file; continue saving? (Say N if unsure.) "
 msgstr ""
 "Falha ao escrever o arquivo reserva, continuar salvando? (Diga N se não "
 "tiver certeza)"
 
-#: src/files.c:1800
+#: src/files.c:1750
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Não foi possível escrever fora de %s"
 
-#: src/files.c:1885 src/files.c:1910 src/files.c:1928 src/files.c:1941
-#: src/files.c:1952 src/files.c:1981
+#: src/files.c:1833 src/files.c:1858 src/files.c:1876 src/files.c:1889
+#: src/files.c:1900 src/files.c:1928
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Erro ao escrever o arquivo reserva %s: %s"
 
-#: src/files.c:1886 src/nano.c:690
+#: src/files.c:1834 src/nano.c:692
 msgid "Too many backup files?"
 msgstr "Muitos arquivos reserva?"
 
-#: src/files.c:2026 src/text.c:2863 src/text.c:2875 src/text.c:3244
-#: src/text.c:3253
+#: src/files.c:1972 src/text.c:3117 src/text.c:3129 src/text.c:3498
+#: src/text.c:3507
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Erro ao escrever o arquivo temporário: %s"
 
-#: src/files.c:2049 src/files.c:2068 src/files.c:2080 src/files.c:2104
-#: src/files.c:2121 src/files.c:2131 src/files.c:2164 src/files.c:2171
+#: src/files.c:1994 src/files.c:2013 src/files.c:2023 src/files.c:2047
+#: src/files.c:2064 src/files.c:2074 src/files.c:2106 src/files.c:2113
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Erro ao escrever %s: %s"
 
-#: src/files.c:2200
+#: src/files.c:2154
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "Escrita %lu linha"
 msgstr[1] "Escritas %lu linhas"
 
-#: src/files.c:2299
+#: src/files.c:2249
 msgid " [DOS Format]"
 msgstr " [Formato DOS]"
 
-#: src/files.c:2300
+#: src/files.c:2250
 msgid " [Mac Format]"
 msgstr " [Formato Mac]"
 
-#: src/files.c:2302
+#: src/files.c:2252
 msgid " [Backup]"
 msgstr " [Arq Reserva]"
 
-#: src/files.c:2309
+#: src/files.c:2259
 msgid "Prepend Selection to File"
 msgstr "Pré-adicionar seleção para o arquivo"
 
-#: src/files.c:2310
+#: src/files.c:2260
 msgid "Append Selection to File"
 msgstr "Adicionar seleção para o arquivo"
 
-#: src/files.c:2311
+#: src/files.c:2261
 msgid "Write Selection to File"
 msgstr "Escrever a seleção para o arquivo"
 
-#: src/files.c:2314
+#: src/files.c:2264
 msgid "File Name to Prepend to"
 msgstr "Nome arquivo para pré-adicionar"
 
-#: src/files.c:2315
+#: src/files.c:2265
 msgid "File Name to Append to"
 msgstr "Nome do arquivo para adicionar a"
 
-#: src/files.c:2316
+#: src/files.c:2266
 msgid "File Name to Write"
 msgstr "Nome do arquivo para gravar"
 
-#: src/files.c:2349
-msgid "Save modified buffer anyway ? "
+#: src/files.c:2301
+#, fuzzy
+msgid "Save modified buffer anyway? "
 msgstr "Salvar o buffer modificado mesmo assim?"
 
-#: src/files.c:2457
-msgid "File exists, OVERWRITE ? "
-msgstr "Arquivo já existe, SOBRESCREVER ? "
-
-#: src/files.c:2466
-msgid "Save file under DIFFERENT NAME ? "
+#: src/files.c:2412
+#, fuzzy
+msgid "Save file under DIFFERENT NAME? "
 msgstr "Salvar o arquivo com um NOME DIFERENTE ? "
 
-#: src/files.c:2480
-msgid "File was modified since you opened it, continue saving ? "
+#: src/files.c:2420
+#, fuzzy, c-format
+msgid "File \"%s\" exists; OVERWRITE? "
+msgstr "Arquivo já existe, SOBRESCREVER ? "
+
+#: src/files.c:2441
+#, fuzzy
+msgid "File was modified since you opened it; continue saving? "
 msgstr ""
 "O arquivo foi modificado desde a última vez que você abriu, continuar "
 "salvando ? "
 
-#: src/files.c:2917
+#: src/files.c:2874
 msgid "(more)"
 msgstr "(mais)"
 
-#: src/files.c:3004
+#: src/files.c:2959
 #, c-format
 msgid ""
 "\n"
@@ -401,7 +376,7 @@ msgstr ""
 "\n"
 "Pressione Enter para continuar\n"
 
-#: src/files.c:3020
+#: src/files.c:2975
 #, c-format
 msgid ""
 "Unable to create directory %s: %s\n"
@@ -411,7 +386,7 @@ msgstr ""
 "É necessário para salvar/carregar posições do cursor ou histórico de "
 "pesquisa.\n"
 
-#: src/files.c:3026
+#: src/files.c:2982
 #, c-format
 msgid ""
 "Path %s is not a directory and needs to be.\n"
@@ -421,7 +396,7 @@ msgstr ""
 "Nano não poderá carregar ou salvar posições do cursor ou histórico de "
 "pesquisa.\n"
 
-#: src/files.c:3045
+#: src/files.c:3002
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I tried to move\n"
@@ -430,7 +405,7 @@ msgstr ""
 "Detectado um arquivo de histórico (%s) de nano legado que eu tentei mover\n"
 "para a localização preferida (%s), mas encontrei um erro: %s"
 
-#: src/files.c:3049
+#: src/files.c:3006
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I moved\n"
@@ -441,722 +416,753 @@ msgstr ""
 "para a localização preferida (%s)\n"
 "(veja o FAQ do nano sobre essa alteração)"
 
-#: src/files.c:3132 src/files.c:3140 src/files.c:3164 src/files.c:3176
+#: src/files.c:3089 src/files.c:3097 src/files.c:3121 src/files.c:3133
 #, c-format
 msgid "Error writing %s: %s\n"
 msgstr "Erro ao escrever %s: %s\n"
 
 #. TRANSLATORS: Try to keep the next fifteen strings at most 10 characters.
-#: src/global.c:480
+#: src/global.c:483
 msgid "Exit"
 msgstr "Sair"
 
-#: src/global.c:481
+#: src/global.c:484
 msgid "Close"
 msgstr "Fechar"
 
-#: src/global.c:482
+#: src/global.c:485
 msgid "Uncut Text"
 msgstr "Colar txt"
 
-#: src/global.c:484
+#: src/global.c:487
 msgid "Unjustify"
 msgstr "Desjustifi"
 
-#: src/global.c:490
+#: src/global.c:493
 msgid "Read File"
 msgstr "Ler o arq"
 
-#: src/global.c:491
+#: src/global.c:494
 msgid "Where Is"
 msgstr "Onde está?"
 
-#: src/global.c:492
+#: src/global.c:495
 msgid "Replace"
 msgstr "Substituir"
 
-#: src/global.c:493
+#: src/global.c:496
 msgid "Go To Line"
 msgstr "Ir p/ linha"
 
-#: src/global.c:494
+#: src/global.c:497
 msgid "Prev Line"
 msgstr "Linha ant"
 
-#: src/global.c:495
+#: src/global.c:498
 msgid "Next Line"
 msgstr "Prox linha"
 
-#: src/global.c:496
+#: src/global.c:499
 msgid "Prev Page"
 msgstr "Pág anter"
 
-#: src/global.c:497
+#: src/global.c:500
 msgid "Next Page"
 msgstr "Próx pág"
 
-#: src/global.c:499
+#: src/global.c:502
 msgid "Justify"
 msgstr "Justificar"
 
-#: src/global.c:500
+#: src/global.c:503
 msgid "FullJstify"
 msgstr "JstifiCmpl"
 
-#: src/global.c:502
+#: src/global.c:505
 msgid "Refresh"
 msgstr "Atualiz"
 
 #. TRANSLATORS: Try to keep this string at most 12 characters.
-#: src/global.c:505
+#: src/global.c:508
 msgid "WhereIs Next"
 msgstr "OndeTá próx."
 
 #. TRANSLATORS: The next long series of strings are shortcut descriptions;
 #. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:512
+#: src/global.c:515
 msgid "Justify the current paragraph"
 msgstr "Justifica o parágrafo atual"
 
-#: src/global.c:514
+#: src/global.c:517
 msgid "Cancel the current function"
 msgstr "Cancela a função atual"
 
-#: src/global.c:515
+#: src/global.c:518
 msgid "Display this help text"
 msgstr "Abre este texto de ajuda"
 
-#: src/global.c:518
+#: src/global.c:521
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Fecha o buffer do arquivo atual / Sai do nano"
 
-#: src/global.c:520
+#: src/global.c:523
 msgid "Exit from nano"
 msgstr "Sai do nano"
 
-#: src/global.c:524
+#: src/global.c:527
 msgid "Write the current file to disk"
 msgstr "Escreve o arquivo atual no disco"
 
-#: src/global.c:526
+#: src/global.c:529
 msgid "Insert another file into the current one"
 msgstr "Insere outro arquivo no atual"
 
-#: src/global.c:528
+#: src/global.c:531
 msgid "Search for a string or a regular expression"
 msgstr "Procura por um texto ou uma expressão regular"
 
-#: src/global.c:531
+#: src/global.c:533
 msgid "Search for a string"
 msgstr "Pesquisa por um texto"
 
-#: src/global.c:533
+#: src/global.c:534
+msgid "Refresh the file list"
+msgstr ""
+
+#: src/global.c:535
+#, fuzzy
+msgid "Go to lefthand column"
+msgstr "Vai para linha e coluna número"
+
+#: src/global.c:536
+#, fuzzy
+msgid "Go to righthand column"
+msgstr "Vai para linha e coluna número"
+
+#: src/global.c:538
 msgid "Go one screenful up"
 msgstr "Vai uma tela acima"
 
-#: src/global.c:534
+#: src/global.c:539
 msgid "Go one screenful down"
 msgstr "Vai uma tela abaixo"
 
-#: src/global.c:536
+#: src/global.c:541
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Recorta a linha atual e guardá-la no buffer-de-transferência"
 
-#: src/global.c:538
+#: src/global.c:543
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Cola do buffer-de-transferência para a linha atual"
 
-#: src/global.c:539
+#: src/global.c:544
 msgid "Display the position of the cursor"
 msgstr "Mostra a posição do cursor"
 
-#: src/global.c:541
+#: src/global.c:546
 msgid "Invoke the spell checker, if available"
 msgstr "Chama o verificador ortográfico, se disponível"
 
-#: src/global.c:543
+#: src/global.c:548
 msgid "Replace a string or a regular expression"
 msgstr "Substitui um texto ou expressão regular"
 
-#: src/global.c:544
+#: src/global.c:549
 msgid "Go to line and column number"
 msgstr "Vai para linha e coluna número"
 
-#: src/global.c:546
+#: src/global.c:551
 msgid "Mark text starting from the cursor position"
 msgstr "Marca o texto iniciando na posição do cursor"
 
-#: src/global.c:547
+#: src/global.c:552
 msgid "Repeat the last search"
 msgstr "Repete a última pesquisa"
 
-#: src/global.c:549
+#: src/global.c:554
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "Copia a linha atual e guardá-la no buffer-de-transferência"
 
-#: src/global.c:550
+#: src/global.c:555
 msgid "Indent the current line"
 msgstr "Avança o recuo da linha atual"
 
-#: src/global.c:551
+#: src/global.c:556
 msgid "Unindent the current line"
 msgstr "Recua a linha atual"
 
-#: src/global.c:552
+#: src/global.c:558
+msgid "Comment/uncomment the current line or marked lines"
+msgstr ""
+
+#: src/global.c:560
 msgid "Undo the last operation"
 msgstr "Desfaz a última operação"
 
-#: src/global.c:553
+#: src/global.c:561
 msgid "Redo the last undone operation"
 msgstr "Refaz a última operação desfeita"
 
-#: src/global.c:555
+#: src/global.c:563
 msgid "Go back one character"
 msgstr "Volta em um caractere"
 
-#: src/global.c:556
+#: src/global.c:564
 msgid "Go forward one character"
 msgstr "Avança em um caractere"
 
-#: src/global.c:558
+#: src/global.c:566
 msgid "Go back one word"
 msgstr "Retrocede em uma palavra"
 
-#: src/global.c:559
+#: src/global.c:567
 msgid "Go forward one word"
 msgstr "Avança em uma palavra"
 
-#: src/global.c:561
+#: src/global.c:569
 msgid "Go to previous line"
 msgstr "Vai para a última linha"
 
-#: src/global.c:562
+#: src/global.c:570
 msgid "Go to next line"
 msgstr "Vai para a próxima linha"
 
-#: src/global.c:563
+#: src/global.c:571
 msgid "Go to beginning of current line"
 msgstr "Vai para o início da linha atual"
 
-#: src/global.c:564
+#: src/global.c:572
 msgid "Go to end of current line"
 msgstr "Vai para o fim da linha atual"
 
-#: src/global.c:567
+#: src/global.c:575
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "Vai para o início do parágrafo; depois para o parágrafo anterior"
 
-#: src/global.c:569
+#: src/global.c:577
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr "Vai para o fim do parágrafo; depois para o próximo parágrafo"
 
-#: src/global.c:571
+#: src/global.c:579
 msgid "Go to the first line of the file"
 msgstr "Vai para a primeira linha do arquivo"
 
-#: src/global.c:572
+#: src/global.c:580
 msgid "Go to the last line of the file"
 msgstr "Vai para a última linha do arquivo"
 
-#: src/global.c:574
+#: src/global.c:582
 msgid "Go to the matching bracket"
 msgstr "Vai para o fechamento do parênteses/colchetes/chaves"
 
-#: src/global.c:576
+#: src/global.c:584
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "Rola uma linha acima sem o cursor"
 
-#: src/global.c:578
+#: src/global.c:586
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "Rola uma linha abaixo sem o cursor"
 
-#: src/global.c:581
+#: src/global.c:589
 msgid "Switch to the previous file buffer"
 msgstr "Troca para o buffer de arquivo anterior"
 
-#: src/global.c:582
+#: src/global.c:590
 msgid "Switch to the next file buffer"
 msgstr "Troca para o próximo buffer de arquivo"
 
-#: src/global.c:584
+#: src/global.c:592
 msgid "Insert the next keystroke verbatim"
 msgstr "Insere caractere(s) literalmente"
 
-#: src/global.c:585
+#: src/global.c:593
 msgid "Insert a tab at the cursor position"
 msgstr "Insere um caractere tabular na posição do cursor"
 
-#: src/global.c:586
+#: src/global.c:594
 msgid "Insert a newline at the cursor position"
 msgstr "Insere quebra de linha na posição do cursor"
 
-#: src/global.c:587
+#: src/global.c:595
 msgid "Delete the character under the cursor"
 msgstr "Apaga o caractere sob o cursor"
 
-#: src/global.c:589
+#: src/global.c:597
 msgid "Delete the character to the left of the cursor"
 msgstr "Apaga o caractere a esquerda do cursor"
 
-#: src/global.c:592
+#: src/global.c:600
 msgid "Cut backward from cursor to word start"
 msgstr "Recorta para trás do cursor até o início da palavra"
 
-#: src/global.c:594
+#: src/global.c:602
 msgid "Cut forward from cursor to next word start"
 msgstr "Recorta para frente do cursor até início da próxima palavra"
 
-#: src/global.c:596
+#: src/global.c:604
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Recorta do cursor até o fim da linha"
 
-#: src/global.c:599
+#: src/global.c:607
 msgid "Justify the entire file"
 msgstr "Justifica o arquivo inteiro"
 
-#: src/global.c:603
+#: src/global.c:611
 msgid "Count the number of words, lines, and characters"
 msgstr "Conta o número de palavras, linhas e caracteres"
 
-#: src/global.c:606
+#: src/global.c:614
 msgid "Refresh (redraw) the current screen"
 msgstr "Atualiza (re-desenha) a tela atual"
 
-#: src/global.c:608
+#: src/global.c:616
 msgid "Suspend the editor (if suspension is enabled)"
 msgstr "Suspende o editor (se a suspensão estiver habilitada)"
 
-#: src/global.c:610
+#: src/global.c:618
 msgid "Save file without prompting"
 msgstr "Salva o arquivo sem perguntar"
 
-#: src/global.c:611
+#: src/global.c:619
 msgid "Search next occurrence backward"
 msgstr "Pesquisa a ocorrência anterior"
 
-#: src/global.c:612
+#: src/global.c:620
 msgid "Search next occurrence forward"
 msgstr "Pesquisa a próxima ocorrência"
 
-#: src/global.c:614
+#: src/global.c:622
 msgid "Toggle the case sensitivity of the search"
 msgstr "Ativa sensibilidade de caixa na pesquisa"
 
-#: src/global.c:616
+#: src/global.c:624
 msgid "Reverse the direction of the search"
 msgstr "Inverte a direção da pesquisa"
 
-#: src/global.c:620
+#: src/global.c:628
 msgid "Toggle the use of regular expressions"
 msgstr "Ativa o uso de expressões regulares"
 
-#: src/global.c:624
+#: src/global.c:632
 msgid "Recall the previous search/replace string"
 msgstr "Lembra o último texto de pesquisa/substituição"
 
-#: src/global.c:626
+#: src/global.c:634
 msgid "Recall the next search/replace string"
 msgstr "Lembra o ultimo texto de pesquisa/substituição"
 
-#: src/global.c:629
+#: src/global.c:637
 msgid "Go to file browser"
 msgstr "Vai para o navegador de arquivo"
 
-#: src/global.c:632
+#: src/global.c:640
 msgid "Toggle the use of DOS format"
 msgstr "Ativa o uso do formato DOS"
 
-#: src/global.c:633
+#: src/global.c:641
 msgid "Toggle the use of Mac format"
 msgstr "Ativa o uso do formato Mac"
 
-#: src/global.c:634
+#: src/global.c:642
 msgid "Toggle appending"
 msgstr "Ativa ajuntamento"
 
-#: src/global.c:635
+#: src/global.c:643
 msgid "Toggle prepending"
 msgstr "Ativa pré-adicionamento"
 
-#: src/global.c:636
+#: src/global.c:644
 msgid "Toggle backing up of the original file"
 msgstr "Ativa cópia de segurança do arquivo original"
 
-#: src/global.c:637
+#: src/global.c:645
 msgid "Execute external command"
 msgstr "Executa um comando externo"
 
-#: src/global.c:639
+#: src/global.c:647
 msgid "Close buffer without saving it"
 msgstr "Fecha o buffer sem salvá-lo"
 
-#: src/global.c:641
+#: src/global.c:649
 msgid "Toggle the use of a new buffer"
 msgstr "Ativa o uso de um novo buffer"
 
-#: src/global.c:644
+#: src/global.c:652
 msgid "Exit from the file browser"
 msgstr "Sai do navegador de arquivos"
 
-#: src/global.c:645
+#: src/global.c:653
 msgid "Go to the first file in the list"
 msgstr "Vai para o primeiro arquivo na lista"
 
-#: src/global.c:646
+#: src/global.c:654
 msgid "Go to the last file in the list"
 msgstr "Vai para o último arquivo na lista"
 
-#: src/global.c:647
+#: src/global.c:655
 msgid "Go to the previous file in the list"
 msgstr "Vai para o prévio arquivo na lista"
 
-#: src/global.c:648
+#: src/global.c:656
 msgid "Go to the next file in the list"
 msgstr "Vai para o próximo arquivo na lista"
 
-#: src/global.c:649
+#: src/global.c:657
 msgid "Go to directory"
 msgstr "Vai para o diretório"
 
-#: src/global.c:652
+#: src/global.c:660
 msgid "Invoke the linter, if available"
 msgstr "Chama o lintador, se disponível"
 
-#: src/global.c:653
+#: src/global.c:661
 msgid "Go to previous linter msg"
 msgstr "Vai para a mensagem anterior do lintador"
 
-#: src/global.c:654
+#: src/global.c:662
 msgid "Go to next linter msg"
 msgstr "Vai para a próxima mensagem do lintador"
 
-#: src/global.c:656
+#: src/global.c:664
 msgid "Invoke formatter, if available"
 msgstr "Chama o formatador, se disponível"
 
 #. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:671
+#: src/global.c:679
 msgid "Get Help"
 msgstr "Ajuda"
 
-#: src/global.c:674 src/prompt.c:858
+#: src/global.c:682 src/prompt.c:855
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/global.c:687
+#: src/global.c:695
 msgid "Write Out"
 msgstr "Gravar"
 
-#: src/global.c:723
+#: src/global.c:731
 msgid "Go To Dir"
 msgstr "Ir p/ dir"
 
-#: src/global.c:738
+#: src/global.c:746
 msgid "Cut Text"
 msgstr "Recort txt"
 
-#: src/global.c:753
+#: src/global.c:761
 msgid "To Spell"
 msgstr "VerfOrtog"
 
-#: src/global.c:757
+#: src/global.c:765
 msgid "To Linter"
 msgstr "Lintar"
 
-#: src/global.c:760
+#: src/global.c:768
 msgid "Formatter"
 msgstr "Formatador"
 
-#: src/global.c:767
+#: src/global.c:775
 msgid "Case Sens"
 msgstr "Sens de caixa"
 
-#: src/global.c:772
+#: src/global.c:780
 msgid "Regexp"
 msgstr "Exp regular"
 
-#: src/global.c:777
+#: src/global.c:785
 msgid "Backwards"
 msgstr "[Contrário]"
 
-#: src/global.c:784
+#: src/global.c:792
 msgid "No Replace"
 msgstr "Sem substituição"
 
-#: src/global.c:792
+#: src/global.c:800
 msgid "Cur Pos"
 msgstr "Pos atual"
 
-#: src/global.c:807
+#: src/global.c:815
 msgid "First Line"
 msgstr "Prim linha"
 
-#: src/global.c:809
+#: src/global.c:817
 msgid "Last Line"
 msgstr "Últ linha"
 
 # Aplica parênteses no texto
-#: src/global.c:816
+#: src/global.c:824
 msgid "To Bracket"
 msgstr "Parênteses"
 
-#: src/global.c:819
+#: src/global.c:827
 msgid "Mark Text"
 msgstr "Marcar txt"
 
-#: src/global.c:822
+#: src/global.c:830
 msgid "Copy Text"
 msgstr "Copiar txt"
 
-#: src/global.c:825
+#: src/global.c:833
 msgid "Indent Text"
 msgstr "Alinhar txt"
 
-#: src/global.c:827
+#: src/global.c:835
 msgid "Unindent Text"
 msgstr "Desalinhar txt"
 
-#: src/global.c:830
+#: src/global.c:838
 msgid "Undo"
 msgstr "Desfazer"
 
-#: src/global.c:832
+#: src/global.c:840
 msgid "Redo"
 msgstr "Refazer"
 
-#: src/global.c:836 src/global.c:842
+#: src/global.c:844 src/global.c:850
 msgid "Back"
 msgstr "Voltar"
 
-#: src/global.c:838 src/global.c:844
+#: src/global.c:846 src/global.c:852
 msgid "Forward"
 msgstr "Avançar"
 
-#: src/global.c:849
+#: src/global.c:857
 msgid "Prev Word"
 msgstr "Palvr ant"
 
-#: src/global.c:851
+#: src/global.c:859
 msgid "Next Word"
 msgstr "Prx palvr"
 
-#: src/global.c:855
+#: src/global.c:863
 msgid "Home"
 msgstr "Local"
 
-#: src/global.c:857
+#: src/global.c:865
 msgid "End"
 msgstr "Fim"
 
-#: src/global.c:866
+#: src/global.c:874
 msgid "Beg of Par"
 msgstr "Ini de par"
 
-#: src/global.c:868
+#: src/global.c:876
 msgid "End of Par"
 msgstr "Fim de par"
 
-#: src/global.c:873
+#: src/global.c:881
 msgid "Scroll Up"
 msgstr "Rolar para cima"
 
-#: src/global.c:875
+#: src/global.c:883
 msgid "Scroll Down"
 msgstr "Rolar para baixo"
 
-#: src/global.c:880
+#: src/global.c:888
 msgid "Prev File"
 msgstr "Próximo arquivo"
 
-#: src/global.c:882
+#: src/global.c:890
 msgid "Next File"
 msgstr "Arquivo anterior"
 
-#: src/global.c:891
+#: src/global.c:899
 msgid "Verbatim"
 msgstr "Entrada literal"
 
-#: src/global.c:894
+#: src/global.c:902
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:896
+#: src/global.c:904
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:899
+#: src/global.c:907
 msgid "Delete"
 msgstr "Excluir"
 
-#: src/global.c:901
+#: src/global.c:909
 msgid "Backspace"
 msgstr "Tecla BACKSPACE"
 
 #. TRANSLATORS: The next two strings refer to cutting words.
-#: src/global.c:912
+#: src/global.c:920
 msgid "Cut Left"
 msgstr "Recort Esq"
 
-#: src/global.c:914
+#: src/global.c:922
 msgid "Cut Right"
 msgstr "Recort Dir"
 
-#: src/global.c:916
+#: src/global.c:924
 msgid "CutTillEnd"
 msgstr "RecortarAtéOFim"
 
-#: src/global.c:926
+#: src/global.c:934
 msgid "Word Count"
 msgstr "Contagem de palavras"
 
-#: src/global.c:933
+#: src/global.c:941
 msgid "Suspend"
 msgstr "Suspender"
 
-#: src/global.c:937
+#: src/global.c:945
+#, fuzzy
+msgid "Comment Lines"
+msgstr "Prox linha"
+
+#: src/global.c:949
 msgid "Save"
 msgstr "Salvar"
 
-#: src/global.c:940
+#: src/global.c:952
 msgid "Previous"
 msgstr "Anterior"
 
-#: src/global.c:942
+#: src/global.c:954
 msgid "Next"
 msgstr "Próxima"
 
-#: src/global.c:948
+#: src/global.c:960
 msgid "PrevHstory"
 msgstr "RegisAnt"
 
-#: src/global.c:951
+#: src/global.c:963
 msgid "NextHstory"
 msgstr "PróxRegis"
 
-#: src/global.c:955
+#: src/global.c:972
 msgid "Go To Text"
 msgstr "Ir para o próximo"
 
-#: src/global.c:959
+#: src/global.c:976
 msgid "DOS Format"
 msgstr "Formato DOS"
 
-#: src/global.c:961
+#: src/global.c:978
 msgid "Mac Format"
 msgstr "Formato Mac"
 
-#: src/global.c:969
+#: src/global.c:986
 msgid "Append"
 msgstr "Anexar"
 
-#: src/global.c:971
+#: src/global.c:988
 msgid "Prepend"
 msgstr "Pré-anexar"
 
-#: src/global.c:974
+#: src/global.c:991
 msgid "Backup File"
 msgstr "Arquivo reserva"
 
-#: src/global.c:981
+#: src/global.c:998
 msgid "Execute Command"
 msgstr "Executar comando"
 
-#: src/global.c:996
+#: src/global.c:1013
 msgid "To Files"
 msgstr "Para arquivos"
 
-#: src/global.c:1004
+#: src/global.c:1021
 msgid "First File"
 msgstr "Primeira linha"
 
-#: src/global.c:1006
+#: src/global.c:1023
 msgid "Last File"
 msgstr "Última linha"
 
-#: src/global.c:1010
+#: src/global.c:1027
 msgid "Discard buffer"
 msgstr "Descartar buffer"
 
+#: src/global.c:1038
+msgid "Left Column"
+msgstr ""
+
+#: src/global.c:1040
+msgid "Right Column"
+msgstr ""
+
 #. TRANSLATORS: Try to keep the next two strings at most 20 characters.
-#: src/global.c:1020
+#: src/global.c:1047
 msgid "Prev Lint Msg"
 msgstr "Msg Lint Ant"
 
-#: src/global.c:1022
+#: src/global.c:1049
 msgid "Next Lint Msg"
 msgstr "Próx Msg Lint"
 
 #. TRANSLATORS: The next seventeen strings are toggle descriptions;
 #. * they are best kept shorter than 40 characters, but may be longer.
-#: src/global.c:1285
+#: src/global.c:1316
 msgid "Help mode"
 msgstr "Modo ajuda"
 
-#: src/global.c:1287
+#: src/global.c:1318
 msgid "Constant cursor position display"
 msgstr "Mostra da posição do cursor constante"
 
-#: src/global.c:1289
+#: src/global.c:1320
 msgid "Use of one more line for editing"
 msgstr "Uso de mais de uma linha para edição"
 
-#: src/global.c:1291
+#: src/global.c:1322
 msgid "Smooth scrolling"
 msgstr "Rolagem suave"
 
-#: src/global.c:1293
+#: src/global.c:1324
 msgid "Soft wrapping of overlong lines"
 msgstr "Ajuste suave de linhas compridas"
 
-#: src/global.c:1295
+#: src/global.c:1326
 msgid "Whitespace display"
 msgstr "Mostra espaços vazios"
 
-#: src/global.c:1297
+#: src/global.c:1328
 msgid "Color syntax highlighting"
 msgstr "Marcação colorida de sintaxe"
 
-#: src/global.c:1299
+#: src/global.c:1330
 msgid "Smart home key"
 msgstr "Tecla HOME inteligente"
 
-#: src/global.c:1301
+#: src/global.c:1332
 msgid "Auto indent"
 msgstr "Recuo automática"
 
-#: src/global.c:1303
+#: src/global.c:1334
 msgid "Cut to end"
 msgstr "Recorta até o fim"
 
-#: src/global.c:1305
+#: src/global.c:1336
 msgid "Hard wrapping of overlong lines"
 msgstr "Ajuste rígido de linhas compridas"
 
-#: src/global.c:1307
+#: src/global.c:1338
 msgid "Conversion of typed tabs to spaces"
 msgstr "Conversão de tabulações para espaços"
 
-#: src/global.c:1309
+#: src/global.c:1340
 msgid "Backup files"
 msgstr "Reservar os arquivos"
 
-#: src/global.c:1311
+#: src/global.c:1342
 msgid "Reading file into separate buffer"
 msgstr "Lendo arquivo em um buffer separado"
 
-#: src/global.c:1313
+#: src/global.c:1344
 msgid "Mouse support"
 msgstr "Suporte ao mouse"
 
-#: src/global.c:1315
+#: src/global.c:1346
 msgid "No conversion from DOS/Mac format"
 msgstr "Sem conversões do formato DOS/Mac"
 
-#: src/global.c:1317
+#: src/global.c:1348
 msgid "Suspension"
 msgstr "Suspensão"
 
-#: src/help.c:209
+#: src/help.c:211
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1178,7 +1184,7 @@ msgstr ""
 "pesquisa. Pressionando Enter sem inserir nenhum texto executará a pesquisa "
 "anterior.  "
 
-#: src/help.c:218
+#: src/help.c:220
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1192,7 +1198,7 @@ msgstr ""
 " As seguintes teclas de função vão estar disponíveis no modo de pesquisa:\n"
 "\n"
 
-#: src/help.c:224
+#: src/help.c:226
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1212,7 +1218,7 @@ msgstr ""
 " As seguintes teclas de funções estão disponíveis no modo Ir Para Linha:\n"
 "\n"
 
-#: src/help.c:233
+#: src/help.c:235
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1235,7 +1241,7 @@ msgstr ""
 "irá ocorrer em um buffer separado (utilize Meta-< e > para alternar entre os "
 "bufferes de arquivo).  "
 
-#: src/help.c:242
+#: src/help.c:244
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1250,7 +1256,7 @@ msgstr ""
 "Arquivo:\n"
 "\n"
 
-#: src/help.c:248
+#: src/help.c:250
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1278,7 +1284,7 @@ msgstr ""
 " As seguintes teclas de funções estão disponíveis no modo Escrever Arquivo:\n"
 "\n"
 
-#: src/help.c:262
+#: src/help.c:264
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1302,7 +1308,7 @@ msgstr ""
 "\n"
 " As seguintes teclas de funções estão disponíveis no Navegador de Arquivos:\n"
 
-#: src/help.c:275
+#: src/help.c:277
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1326,7 +1332,7 @@ msgstr ""
 "o texto da pesquisa anterior.\n"
 "\n"
 
-#: src/help.c:284
+#: src/help.c:286
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1334,7 +1340,7 @@ msgstr ""
 " As seguintes teclas de função estão disponíveis no modo de Navegação de "
 "Pesquisa:\n"
 
-#: src/help.c:288
+#: src/help.c:290
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1357,7 +1363,7 @@ msgstr ""
 "Diretórios:\n"
 "\n"
 
-#: src/help.c:301
+#: src/help.c:303
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1382,7 +1388,7 @@ msgstr ""
 "Ortográfica:\n"
 "\n"
 
-#: src/help.c:316
+#: src/help.c:318
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1404,7 +1410,7 @@ msgstr ""
 "Comando:\n"
 "\n"
 
-#: src/help.c:329
+#: src/help.c:331
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1425,15 +1431,15 @@ msgstr ""
 "linha de status é a terceira de baixo para cima, mostrando mensagens "
 "importantes.  "
 
-#: src/help.c:339
+#: src/help.c:341
+#, fuzzy
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
-" The notation for shortcuts is as follows: Control-key sequences are notated "
-"with a caret (^) symbol and can be entered either by using the Control "
-"(Ctrl) key or pressing the Escape (Esc) key twice.  Escape-key sequences are "
-"notated with the Meta (M-) symbol and can be entered using either the Esc, "
-"Alt, or Meta key depending on your keyboard setup.  "
+" Shortcuts are written as follows: Control-key sequences are notated with a "
+"'^' and can be entered either by using the Ctrl key or pressing the Esc key "
+"twice.  Meta-key sequences are notated with 'M-' and can be entered using "
+"either the Alt, Cmd, or Esc key, depending on your keyboard setup.  "
 msgstr ""
 "As duas linhas de baixo mostram os atalhos mais comuns do editor.\n"
 "\n"
@@ -1462,19 +1468,19 @@ msgstr ""
 msgid "enable/disable"
 msgstr "habilitado/desabilitado"
 
-#: src/nano.c:559
+#: src/nano.c:560
 msgid "Key is invalid in view mode"
 msgstr "A tecla é inválida no modo de visualização"
 
-#: src/nano.c:565
+#: src/nano.c:566
 msgid "This function is disabled in restricted mode"
 msgstr "Esta função está desabilitada no modo restrito"
 
-#: src/nano.c:573
+#: src/nano.c:574
 msgid "Help is not available"
 msgstr "Ajuda não está disponível"
 
-#: src/nano.c:684
+#: src/nano.c:686
 #, c-format
 msgid ""
 "\n"
@@ -1483,7 +1489,7 @@ msgstr ""
 "\n"
 "Buffer escrito em %s\n"
 
-#: src/nano.c:686
+#: src/nano.c:688
 #, c-format
 msgid ""
 "\n"
@@ -1492,7 +1498,7 @@ msgstr ""
 "\n"
 "Buffer não foi escrito em %s: %s\n"
 
-#: src/nano.c:689
+#: src/nano.c:691
 #, c-format
 msgid ""
 "\n"
@@ -1757,17 +1763,22 @@ msgstr "Permite suspensão"
 msgid "Enable soft line wrapping"
 msgstr "Habilita ajuste suave de linhas compridas"
 
-#: src/nano.c:937
-#, c-format
-msgid " GNU nano, version %s\n"
+#: src/nano.c:940
+#, fuzzy, c-format
+msgid " nano, version %s\n"
 msgstr " GNU nano, versão %s\n"
 
-#: src/nano.c:940
+#: src/nano.c:943
+#, c-format
+msgid " (C) 2014..%s the contributors to nano\n"
+msgstr ""
+
+#: src/nano.c:945
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 
-#: src/nano.c:941
+#: src/nano.c:946
 #, c-format
 msgid ""
 "\n"
@@ -1776,68 +1787,82 @@ msgstr ""
 "\n"
 " Opções compiladas:"
 
-#: src/nano.c:1073
+#: src/nano.c:1081
 msgid "No file name"
 msgstr "Nenhum nome de arquivo"
 
-#: src/nano.c:1108
-msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
+#: src/nano.c:1115
+msgid "Save modified buffer?  (Answering \"No\" will DISCARD changes.) "
 msgstr ""
-"Salvar o buffer modificado (RESPONDER \"Não\" IRÁ DESTRUIR MODIFICAÇÕES) ?"
 
-#: src/nano.c:1168
+#: src/nano.c:1178
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "Não foi possível reabrir a entrada padrão do teclado, desculpe\n"
 
-#: src/nano.c:1192
+#: src/nano.c:1202
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "Lendo de stdin, ^C para abortar\n"
 
-#: src/nano.c:1256
+#: src/nano.c:1266
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Recebi SIGHUP ou SIGTERM\n"
 
-#: src/nano.c:1272
+#: src/nano.c:1282
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Utilize \"fg\" para retornar ao nano.\n"
 
-#: src/nano.c:1294
+#: src/nano.c:1304
 msgid "Suspension is not enabled"
 msgstr "Suspensão não está habilitada"
 
-#: src/nano.c:1448
+#: src/nano.c:1459
 msgid "enabled"
 msgstr "habilitado"
 
-#: src/nano.c:1448
+#: src/nano.c:1459
 msgid "disabled"
 msgstr "desabilitado"
 
-#: src/nano.c:1607 src/winio.c:1125
-msgid "Unknown Command"
-msgstr "Comando desconhecido"
+#: src/nano.c:1573
+msgid "Unbound key"
+msgstr ""
+
+#: src/nano.c:1577
+#, c-format
+msgid "Unbound key: M-%c"
+msgstr ""
+
+#: src/nano.c:1579
+#, c-format
+msgid "Unbound key: ^%c"
+msgstr ""
 
-#: src/nano.c:1720
+#: src/nano.c:1581
+#, c-format
+msgid "Unbound key: %c"
+msgstr ""
+
+#: src/nano.c:1745
 msgid "XON ignored, mumble mumble"
 msgstr "XON ignorado, mumble mumble."
 
-#: src/nano.c:1725
+#: src/nano.c:1750
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF ignorado, mumble mumble"
 
-#: src/nano.c:2139 src/rcfile.c:1334
+#: src/nano.c:2166 src/rcfile.c:1187
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Tamanho \"%s\" de tabulação é inválido"
 
-#: src/nano.c:2200 src/rcfile.c:1259
+#: src/nano.c:2227 src/rcfile.c:1128
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Pedido de tamanho \"%s\" inválido"
 
-#: src/nano.c:2247
+#: src/nano.c:2276
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr "Digite \"%s -h\" para uma lista de opções disponíveis.\n"
@@ -1845,115 +1870,119 @@ msgstr "Digite \"%s -h\" para uma lista de opções disponíveis.\n"
 #. TRANSLATORS: For the next three strings, if possible, specify
 #. * the single-byte shortcuts for both your language and English.
 #. * For example, in French: "OoYy" for "Oui".
-#: src/prompt.c:821
+#: src/prompt.c:818
 msgid "Yy"
 msgstr "SsYy"
 
-#: src/prompt.c:822
+#: src/prompt.c:819
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:823
+#: src/prompt.c:820
 msgid "Aa"
 msgstr "Tt"
 
-#: src/prompt.c:845
+#: src/prompt.c:842
 msgid "Yes"
 msgstr "Sim"
 
-#: src/prompt.c:850
+#: src/prompt.c:847
 msgid "All"
 msgstr "Todos"
 
-#: src/prompt.c:855
+#: src/prompt.c:852
 msgid "No"
 msgstr "Não"
 
-#: src/rcfile.c:142
+#: src/rcfile.c:144
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Erro no %s na linha %lu: "
 
-#: src/rcfile.c:201
+#: src/rcfile.c:203
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "Argumento \"%s\" possui indeterminado \""
 
-#: src/rcfile.c:228 src/rcfile.c:280 src/rcfile.c:732 src/rcfile.c:793
-#: src/rcfile.c:882 src/rcfile.c:933
+#: src/rcfile.c:231 src/rcfile.c:674 src/rcfile.c:725 src/rcfile.c:824
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Expressão regular deve começar e terminar com um caractere \""
 
-#: src/rcfile.c:254 src/search.c:62
+#: src/rcfile.c:257 src/search.c:61
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Expressão regular errônea \"%s\": %s"
 
-#: src/rcfile.c:274
+#: src/rcfile.c:279
 msgid "Missing syntax name"
 msgstr "Falta o nome da sintaxe"
 
-#: src/rcfile.c:345
+#: src/rcfile.c:288
+msgid "A syntax name must be quoted"
+msgstr ""
+
+#: src/rcfile.c:297
 msgid "The \"none\" syntax is reserved"
 msgstr "A sintaxe \"none\" é reservada"
 
-#: src/rcfile.c:352
-msgid "The \"default\" syntax must take no extensions"
+#: src/rcfile.c:327
+#, fuzzy
+msgid "The \"default\" syntax does not accept extensions"
 msgstr "A sintaxe padrão não deve conter extensões"
 
-#: src/rcfile.c:424
+#: src/rcfile.c:369
 msgid "Missing key name"
 msgstr "Falta o nome da chave"
 
-#: src/rcfile.c:433 src/rcfile.c:444
+#: src/rcfile.c:378 src/rcfile.c:389
 msgid "Key name is too short"
 msgstr "Nome da tecla é muito curta"
 
-#: src/rcfile.c:454
+#: src/rcfile.c:399
 msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr "Nome da tecla deve começar com \"^\", \"M\", or \"F\""
 
-#: src/rcfile.c:457
+#: src/rcfile.c:402
 #, c-format
 msgid "Key name %s is invalid"
 msgstr "O nome de chave \"%s\" é inválido"
 
-#: src/rcfile.c:466
+#: src/rcfile.c:411
 msgid "Must specify a function to bind the key to"
 msgstr "É preciso especificar uma função para o vínculo da tecla"
 
 #. TRANSLATORS: Do not translate the word "all".
-#: src/rcfile.c:476
+#: src/rcfile.c:421
 msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
 "É preciso especificar um menu (ou \"all\") para vincular/desvincular a tecla"
 
-#: src/rcfile.c:483
+#: src/rcfile.c:428
 #, c-format
 msgid "Cannot map name \"%s\" to a function"
 msgstr "Não foi possível mapear o nome \"%s\" a uma função"
 
-#: src/rcfile.c:490
+#: src/rcfile.c:435
 #, c-format
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "Não foi possível mapear o nome \"%s\" a um menu"
 
-#: src/rcfile.c:522
+#: src/rcfile.c:467
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr "Função \"%s\" não existe no menu \"%s\""
 
-#: src/rcfile.c:534
+#: src/rcfile.c:479
 #, c-format
 msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "Desculpe, a sequência \"%s\" ter seu vínculo redefinido"
 
-#: src/rcfile.c:631
+#: src/rcfile.c:576
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr "Erro ao expandir %s: %s"
 
-#: src/rcfile.c:674
+#: src/rcfile.c:616
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1968,65 +1997,50 @@ msgstr ""
 "\"magente\" (magenta) e \"black\" (preto), com o prefixo \n"
 "opcional \"bright\" (claro) para cores de primeiro plano."
 
-#: src/rcfile.c:696
-msgid "Cannot add a color command without a syntax command"
-msgstr "não é possível adicionar um comando de cor sem um comando de sintaxe"
+#: src/rcfile.c:637 src/rcfile.c:795 src/rcfile.c:858
+#, c-format
+msgid "A '%s' command requires a preceding 'syntax' command"
+msgstr ""
 
-#: src/rcfile.c:701
+#: src/rcfile.c:643
 msgid "Missing color name"
 msgstr "Falta o nome da cor"
 
-#: src/rcfile.c:711 src/rcfile.c:872
-msgid "Missing regex string"
-msgstr "Falta a expressão regular"
+#: src/rcfile.c:653 src/rcfile.c:807
+#, fuzzy, c-format
+msgid "Missing regex string after '%s' command"
+msgstr "Falta o comando de lintador"
 
-#: src/rcfile.c:787
+#: src/rcfile.c:719
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\" precisa de um \"end=\" correspondente"
 
-#: src/rcfile.c:839
+#: src/rcfile.c:768
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
 msgstr "Cor do fundo \"%s\" não pode ser clara"
 
-#: src/rcfile.c:867
-msgid "Cannot add a header regex without a syntax command"
-msgstr ""
-"Não é possível adicionar uma expressão regular de cabeçalho sem um comando "
-"de sintaxe"
-
-#: src/rcfile.c:922
-msgid "Cannot add a magic string regex without a syntax command"
-msgstr ""
-"Não é possível adicionar uma expressão regular de string mágica sem um "
-"comando de sintaxe"
-
-#: src/rcfile.c:927
-msgid "Missing magic string name"
-msgstr "Falta o nome de string mágica"
-
-#: src/rcfile.c:985
-msgid "Cannot add a linter without a syntax command"
-msgstr "Não é possível adicionar um lintador sem um comando de sintaxe"
+#: src/rcfile.c:802
+#, fuzzy, c-format
+msgid "The \"default\" syntax does not accept '%s' regexes"
+msgstr "A sintaxe padrão não deve conter extensões"
 
-#: src/rcfile.c:990
-msgid "Missing linter command"
+#: src/rcfile.c:863
+#, fuzzy, c-format
+msgid "Missing command after '%s'"
 msgstr "Falta o comando de lintador"
 
-#: src/rcfile.c:1011
-msgid "Cannot add formatter without a syntax command"
-msgstr "Não é possível adicionar formatador sem um comando de sintaxe"
-
-#: src/rcfile.c:1016
-msgid "Missing formatter command"
-msgstr "Falta o comando de formatador"
+#: src/rcfile.c:879
+#, fuzzy, c-format
+msgid "Argument of '%s' lacks closing \""
+msgstr "Argumento \"%s\" possui indeterminado \""
 
-#: src/rcfile.c:1046
+#: src/rcfile.c:910
 #, c-format
 msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr "Erro fatal: nenhuma tecla mapeada para a função \"%s\". Saindo.\n"
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:912
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
@@ -2034,63 +2048,63 @@ msgstr ""
 "Se necessário, use nano com a opção -I para ajustar suas configurações no "
 "nanorc.\n"
 
-#: src/rcfile.c:1109
+#: src/rcfile.c:971
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "Não foi possível localizar a sintaxe \"%s\" para estender"
 
-#: src/rcfile.c:1125 src/rcfile.c:1134 src/rcfile.c:1144
-#, c-format
-msgid "Command \"%s\" not allowed in included file"
-msgstr "Comando \"%s\" não é permitido no arquivo incluído"
-
-#: src/rcfile.c:1150 src/rcfile.c:1359
+#: src/rcfile.c:993 src/rcfile.c:1202
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Sintaxe \"%s\" não possui comandos de cor"
 
-#: src/rcfile.c:1180
+#: src/rcfile.c:1024
+#, c-format
+msgid "Command \"%s\" not allowed in included file"
+msgstr "Comando \"%s\" não é permitido no arquivo incluído"
+
+#: src/rcfile.c:1039
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Comando \"%s\" não compreendido"
 
-#: src/rcfile.c:1195
+#: src/rcfile.c:1051
 msgid "Missing option"
 msgstr "Falta opção"
 
-#: src/rcfile.c:1217
+#: src/rcfile.c:1065
+#, c-format
+msgid "Unknown option \"%s\""
+msgstr "Opção \"%s\" desconhecida"
+
+#: src/rcfile.c:1077
+#, c-format
+msgid "Cannot unset option \"%s\""
+msgstr "Não é possível desativar a opção \"%s\""
+
+#: src/rcfile.c:1089
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Opção \"%s\" requer um argumento"
 
-#: src/rcfile.c:1235
+#: src/rcfile.c:1105
 msgid "Option is not a valid multibyte string"
 msgstr "Opção não é uma string multibyte válida"
 
-#: src/rcfile.c:1272 src/rcfile.c:1300 src/rcfile.c:1309
+#: src/rcfile.c:1139 src/rcfile.c:1160 src/rcfile.c:1167
 msgid "Non-blank characters required"
 msgstr "Caracteres imprimíveis são necessário"
 
 # Tradução para single-column?
-#: src/rcfile.c:1282
+#: src/rcfile.c:1146
 msgid "Two single-column characters required"
 msgstr "Dois caracteres de coluna única são necessários"
 
-#: src/rcfile.c:1348
-#, c-format
-msgid "Cannot unset option \"%s\""
-msgstr "Não é possível desativar a opção \"%s\""
-
-#: src/rcfile.c:1354
-#, c-format
-msgid "Unknown option \"%s\""
-msgstr "Opção \"%s\" desconhecida"
-
-#: src/rcfile.c:1413
+#: src/rcfile.c:1258
 msgid "I can't find my home directory!  Wah!"
 msgstr "Não consigo localizar o meu diretório pessoal! Putz!"
 
-#: src/rcfile.c:1451
+#: src/rcfile.c:1295
 #, c-format
 msgid ""
 "\n"
@@ -2099,44 +2113,49 @@ msgstr ""
 "\n"
 "Pressione Enter para continuar a inicialização do nano.\n"
 
-#: src/search.c:96
+#: src/search.c:95
 #, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "\"%.*s%s\" não encontrado"
 
 #. TRANSLATORS: The next three strings are modifiers of the search prompt.
-#: src/search.c:176
+#: src/search.c:169
 msgid " [Case Sensitive]"
 msgstr " [Sensibilidade de caixa]"
 
-#: src/search.c:180
+#: src/search.c:173
 msgid " [Regexp]"
 msgstr " [Expressão regular]"
 
-#: src/search.c:184
+#: src/search.c:177
 msgid " [Backwards]"
 msgstr " [Retroceder]"
 
 #. TRANSLATORS: The next two strings are modifiers of the search prompt.
-#: src/search.c:189
+#: src/search.c:182
 msgid " (to replace) in selection"
 msgstr " (para substituir) na seleção"
 
-#: src/search.c:191
+#: src/search.c:184
 msgid " (to replace)"
 msgstr " (para substituir) na seleção"
 
+#: src/search.c:305
+#, fuzzy
+msgid "Searching..."
+msgstr "Pesquisa"
+
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:718
+#: src/search.c:693
 msgid "Replace this instance?"
 msgstr "Substituir esse termo?"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:883
+#: src/search.c:840
 msgid "Replace with"
 msgstr "Substituir por"
 
-#: src/search.c:924
+#: src/search.c:875
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
@@ -2144,297 +2163,401 @@ msgstr[0] "Substituiu-se %lu ocorrência"
 msgstr[1] "Substituiu-se %lu ocorrências"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:964
+#: src/search.c:914
 msgid "Enter line number, column number"
 msgstr "Insira o número da linha, número da coluna"
 
-#: src/search.c:991
+#: src/search.c:939
 msgid "Invalid line or column number"
 msgstr "Linha ou número de coluna inválido"
 
-#: src/search.c:1124
+#: src/search.c:1080
 msgid "Not a bracket"
 msgstr "Não é um parênteses"
 
-#: src/search.c:1191
+#: src/search.c:1146
 msgid "No matching bracket"
 msgstr "Nenhum parênteses encontrado"
 
-#: src/text.c:54
+#: src/text.c:53
 msgid "Mark Set"
 msgstr "Marcação feita"
 
-#: src/text.c:58
+#: src/text.c:57
 msgid "Mark Unset"
 msgstr "Marcação desativada"
 
-#: src/text.c:70
+#: src/text.c:69
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Erro ao chamar o \"%s\""
 
+#: src/text.c:468
+msgid "Commenting is not supported for this file type"
+msgstr ""
+
+#: src/text.c:484
+msgid "Cannot comment past end of file"
+msgstr ""
+
 # revisão: como traduzir undo buffer? 'desfazer' como um adjetivo?
-#: src/text.c:475
+#: src/text.c:677
 msgid "Nothing in undo buffer!"
 msgstr "Não há nada para desfazer!"
 
-#: src/text.c:481 src/text.c:634
-#, c-format
-msgid "Internal error: can't match line %d.  Please save your work."
-msgstr ""
-"Erro interno: não consegui casar a linha %d.  Por favor salve o seu trabalho."
-
 #. TRANSLATORS: Eight of the next nine strings describe actions
 #. * that are undone or redone.  It are all nouns, not verbs.
-#: src/text.c:495 src/text.c:524 src/text.c:645 src/text.c:686
+#: src/text.c:695 src/text.c:724 src/text.c:857 src/text.c:898
 msgid "text add"
 msgstr "adic txt"
 
-#: src/text.c:505 src/text.c:656
+#: src/text.c:705 src/text.c:868
 msgid "text delete"
 msgstr "remover txt"
 
-#: src/text.c:528 src/text.c:694
+#: src/text.c:728 src/text.c:907
 msgid "line join"
 msgstr "juntar linha"
 
-#: src/text.c:547 src/text.c:710
+#: src/text.c:747 src/text.c:923
 msgid "text cut"
 msgstr "recortar txt"
 
-#: src/text.c:552 src/text.c:714
+#: src/text.c:752 src/text.c:927
 msgid "text uncut"
 msgstr "colar txt"
 
-#: src/text.c:558 src/text.c:691
+#: src/text.c:758 src/text.c:903
 msgid "Internal error: line is missing.  Please save your work."
 msgstr "Erro interno: está faltando linha.  Por favor salve o seu trabalho."
 
-#: src/text.c:561 src/text.c:665
+#: src/text.c:762 src/text.c:877
 msgid "line break"
 msgstr "quebra de linha"
 
-#: src/text.c:569 src/text.c:725
+#: src/text.c:772 src/text.c:947
+msgid "comment"
+msgstr ""
+
+#: src/text.c:776 src/text.c:951
+msgid "uncomment"
+msgstr ""
+
+#: src/text.c:780 src/text.c:938
 msgid "text insert"
 msgstr "inserir txt"
 
-#: src/text.c:589 src/text.c:718
+#: src/text.c:800 src/text.c:931
 msgid "text replace"
 msgstr "substituir txt"
 
-#: src/text.c:596 src/text.c:732 src/text.c:1030 src/text.c:1174
+#: src/text.c:807 src/text.c:955 src/text.c:1267 src/text.c:1437
 msgid "Internal error: unknown type.  Please save your work."
 msgstr "Erro interno: tipo desconhecido.  Por favor salve o seu trabalho."
 
-#: src/text.c:601
+#: src/text.c:813
 #, c-format
 msgid "Undid action (%s)"
 msgstr "Ação desfeita (%s)"
 
-#: src/text.c:619
+#: src/text.c:832
 msgid "Nothing to re-do!"
 msgstr "Nada para refazer!"
 
-#: src/text.c:628
+#: src/text.c:841
 msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
 "Erro interno: não consegui configurar refazimento.  Por favor salve o seu "
 "trabalho."
 
-#: src/text.c:737
+#: src/text.c:961
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Ação repetida (%s)"
 
-#: src/text.c:827 src/text.c:2508 src/text.c:2944
+#: src/text.c:1051 src/text.c:2765 src/text.c:3198
 msgid "Could not create pipe"
 msgstr "Impossível criar o duto"
 
-#: src/text.c:853 src/text.c:2595 src/text.c:2750 src/text.c:2992
-#: src/text.c:3286
+#: src/text.c:1077 src/text.c:2852 src/text.c:3005 src/text.c:3246
+#: src/text.c:3540
 msgid "Could not fork"
 msgstr "Não foi possível bifurcar"
 
-#: src/text.c:1853
+#: src/text.c:2117
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "String de citação ruim %s: %s"
 
-#: src/text.c:2241
+#: src/text.c:2499
 msgid "Can now UnJustify!"
 msgstr "É possível DesJustificar!"
 
-#: src/text.c:2435
+#: src/text.c:2697
 msgid "Edit a replacement"
 msgstr "Editar uma substituição"
 
-#: src/text.c:2510
+#. TRANSLATORS: Shown after fixing misspellings in one word.
+#: src/text.c:2713
+#, fuzzy
+msgid "Next word..."
+msgstr "Prx palvr"
+
+#: src/text.c:2767
 msgid "Creating misspelled word list, please wait..."
 msgstr "Criando a lista de palavra com erros ortográficos, por favor espere..."
 
-#: src/text.c:2601 src/text.c:2999
+#: src/text.c:2858 src/text.c:3253
 msgid "Could not get size of pipe buffer"
 msgstr "Não foi possível descobrir o tamanho do buffer do duto"
 
-#: src/text.c:2652
+#: src/text.c:2907
 msgid "Error invoking \"spell\""
 msgstr "Erro ao chamar o \"spell\""
 
-#: src/text.c:2655
+#: src/text.c:2910
 msgid "Error invoking \"sort -f\""
 msgstr "Erro ao chamar o \"sort -f\""
 
-#: src/text.c:2658
+#: src/text.c:2913
 msgid "Error invoking \"uniq\""
 msgstr "Erro ao chamar o \"uniq\""
 
-#: src/text.c:2881
+#: src/text.c:3135
 msgid "Invoking spell checker, please wait"
 msgstr "Chamar pelo verificador ortográfico, se disponível"
 
-#: src/text.c:2897
+#: src/text.c:3151
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Verificação ortográfica falhou: %s"
 
-#: src/text.c:2899
+#: src/text.c:3153
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Verificação ortográfica falhou: %s: %s"
 
-#: src/text.c:2902
+#: src/text.c:3156
 msgid "Finished checking spelling"
 msgstr "Verificação ortográfica finalizada"
 
-#: src/text.c:2927
+#: src/text.c:3181
 msgid "No linter defined for this type of file!"
 msgstr "Nenhum lintador definido para este tipo de arquivo!"
 
-#: src/text.c:2932
+#: src/text.c:3186
 msgid "Save modified buffer before linting?"
 msgstr "Salvar o buffer modificado antes de lintar?"
 
-#: src/text.c:2949
+#: src/text.c:3203
 msgid "Invoking linter, please wait"
 msgstr "Chamando lintador, por favor espere"
 
-#: src/text.c:3105
+#: src/text.c:3358
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr "Obteve 0 linhas analisáveis a partir do comando: %s"
 
-#: src/text.c:3134
+#: src/text.c:3388
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
 "Essa mensagem é para o arquivo não-aberto %s, abri-lo em um novo buffer?"
 
-#: src/text.c:3153
+#: src/text.c:3407
 msgid "No more errors in unopened files, cancelling"
 msgstr "Sem mais erros em arquivos não abertos, cancelando"
 
-#: src/text.c:3192
+#: src/text.c:3446
 msgid "At last message"
 msgstr "Na última mensagem"
 
-#: src/text.c:3197
+#: src/text.c:3451
 msgid "At first message"
 msgstr "Na primeira mensagem"
 
-#: src/text.c:3237
+#: src/text.c:3491
 msgid "Finished"
 msgstr "Finalizado"
 
-#: src/text.c:3259
+#: src/text.c:3513
 msgid "Invoking formatter, please wait"
 msgstr "Chamando formatador, por favor espere"
 
-#: src/text.c:3314
+#: src/text.c:3568
 msgid "Finished formatting"
 msgstr "Formatação finalizada"
 
-#: src/text.c:3396
+#: src/text.c:3650
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sPalav: %lu  Linhs: %ld  Carac: %lu"
 
-#: src/text.c:3397
+#: src/text.c:3651
 msgid "In Selection:  "
 msgstr "Na seleção:  "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3411
+#: src/text.c:3665
 msgid "Verbatim Input"
 msgstr "Entrada literal"
 
-#: src/utils.c:391 src/utils.c:403
+#: src/utils.c:392 src/utils.c:404
 msgid "nano is out of memory!"
 msgstr "nano está sem memória!"
 
+#: src/utils.c:625
+#, c-format
+msgid "Internal error: can't match line %d.  Please save your work."
+msgstr ""
+"Erro interno: não consegui casar a linha %d.  Por favor salve o seu trabalho."
+
+#. TRANSLATORS: This refers to a sequence of escape codes
+#. * (from the keyboard) that nano does not know about.
+#: src/winio.c:1121
+msgid "Unknown sequence"
+msgstr ""
+
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
 #: src/winio.c:1427
 msgid "Unicode Input"
 msgstr "Entrada Unicode"
 
-#: src/winio.c:1991 src/winio.c:1995
-msgid "Modified"
-msgstr "Modificado"
-
-#: src/winio.c:1992
-msgid "View"
-msgstr "Olhar"
-
-#: src/winio.c:2006
+#: src/winio.c:1960
 msgid "DIR:"
 msgstr "DIR:"
 
-#: src/winio.c:2013
+#: src/winio.c:1968
 msgid "File:"
 msgstr "Arquivo:"
 
-#: src/winio.c:3141
+#: src/winio.c:1972 src/winio.c:1976
+msgid "Modified"
+msgstr "Modificado"
+
+#: src/winio.c:1974
+msgid "View"
+msgstr "Olhar"
+
+#: src/winio.c:3105
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "lin %ld/%ld (%d%%), col %lu/%lu (%d%%), carac %lu/%lu (%d%%)"
 
-#: src/winio.c:3271
+#: src/winio.c:3235
 msgid "The nano text editor"
 msgstr "O editor de texto nano"
 
-#: src/winio.c:3272
+#: src/winio.c:3236
 msgid "version"
 msgstr "versão"
 
-#: src/winio.c:3273
+#: src/winio.c:3237
 msgid "Brought to you by:"
 msgstr "Trazido para você por:"
 
-#: src/winio.c:3274
+#: src/winio.c:3238
 msgid "Special thanks to:"
 msgstr "Agradecimentos especiais para:"
 
-#: src/winio.c:3275
+#: src/winio.c:3239
 msgid "The Free Software Foundation"
 msgstr "A Fundação Software Livre"
 
-#: src/winio.c:3276
+#: src/winio.c:3240
 msgid "the many translators and the TP"
 msgstr "os vários tradutores e o TP"
 
-#: src/winio.c:3277
+#: src/winio.c:3241
 msgid "For ncurses:"
 msgstr "Para o ncurses:"
 
-#: src/winio.c:3278
+#: src/winio.c:3242
 msgid "and anyone else we forgot..."
 msgstr "e qualquer outro que nós esquecemos..."
 
-#: src/winio.c:3279
+#: src/winio.c:3243
 msgid "Thank you for using nano!"
 msgstr "Obrigado por usar o nano!"
 
+#~ msgid ""
+#~ "Read %lu line (Converted from DOS and Mac format - Warning: No write "
+#~ "permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from DOS and Mac format - Warning: No write "
+#~ "permission)"
+#~ msgstr[0] ""
+#~ "%lu linha lida (Convertida do formato DOS e Mac - Atenção: Sem permissão "
+#~ "de escrita)"
+#~ msgstr[1] ""
+#~ "%lu linhas lidas (Convertidas do formato DOS e Mac - Atenção: Sem "
+#~ "permissão de escrita)"
+
+#~ msgid ""
+#~ "Read %lu line (Converted from Mac format - Warning: No write permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from Mac format - Warning: No write permission)"
+#~ msgstr[0] ""
+#~ "%lu linha lida (Convertida do formato Mac - Atenção: Sem permissão de "
+#~ "escrita)"
+#~ msgstr[1] ""
+#~ "%lu linhas lidas (Convertidas do formato Mac - Atenção: Sem permissão de "
+#~ "escrita)"
+
+#~ msgid ""
+#~ "Read %lu line (Converted from DOS format - Warning: No write permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from DOS format - Warning: No write permission)"
+#~ msgstr[0] ""
+#~ "%lu linha lida (Convertida do formato DOS - Atenção: Sem permissão de "
+#~ "escrita)"
+#~ msgstr[1] ""
+#~ "%lu linhas lidas (Convertidas do formato DOS - Atenção: Sem permissão de "
+#~ "escrita)"
+
+#~ msgid "Read %lu line (Warning: No write permission)"
+#~ msgid_plural "Read %lu lines (Warning: No write permission)"
+#~ msgstr[0] "%lu linha lida (Atenção: Sem permissão de escrita)"
+#~ msgstr[1] "%lu linhas lidas (Atenção: sem permissão de escrita)"
+
+#~ msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
+#~ msgstr ""
+#~ "Salvar o buffer modificado (RESPONDER \"Não\" IRÁ DESTRUIR MODIFICAÇÕES) ?"
+
+#~ msgid "Unknown Command"
+#~ msgstr "Comando desconhecido"
+
+#~ msgid "Cannot add a color command without a syntax command"
+#~ msgstr ""
+#~ "não é possível adicionar um comando de cor sem um comando de sintaxe"
+
+#~ msgid "Missing regex string"
+#~ msgstr "Falta a expressão regular"
+
+#~ msgid "Cannot add a header regex without a syntax command"
+#~ msgstr ""
+#~ "Não é possível adicionar uma expressão regular de cabeçalho sem um "
+#~ "comando de sintaxe"
+
+#~ msgid "Cannot add a magic string regex without a syntax command"
+#~ msgstr ""
+#~ "Não é possível adicionar uma expressão regular de string mágica sem um "
+#~ "comando de sintaxe"
+
+#~ msgid "Missing magic string name"
+#~ msgstr "Falta o nome de string mágica"
+
+#~ msgid "Cannot add a linter without a syntax command"
+#~ msgstr "Não é possível adicionar um lintador sem um comando de sintaxe"
+
+#~ msgid "Cannot add formatter without a syntax command"
+#~ msgstr "Não é possível adicionar formatador sem um comando de sintaxe"
+
+#~ msgid "Missing formatter command"
+#~ msgstr "Falta o comando de formatador"
+
 #~ msgid "Cannot prepend or append to a symlink with --nofollow set"
 #~ msgstr ""
 #~ "Não foi possível adicionar uma ligação simbólica com a opção --nofollow"
diff --git a/po/ro.po b/po/ro.po
index 567670fd..e1c12587 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 2.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-25 16:41-0500\n"
+"POT-Creation-Date: 2016-06-17 15:41+0200\n"
 "PO-Revision-Date: 2016-02-12 21:48+0200\n"
 "Last-Translator: Mihai Cristescu <mihai.cristescu@archlinux.info>\n"
 "Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
@@ -23,164 +23,182 @@ msgstr ""
 "X-Poedit-Basepath: .\n"
 "X-Poedit-SearchPath-0: src\n"
 
+#: src/browser.c:144 src/browser.c:284 src/browser.c:334 src/files.c:996
+#: src/files.c:1003 src/files.c:1794 src/files.c:1919 src/files.c:1963
+#: src/files.c:1983 src/files.c:2099 src/files.c:3019 src/files.c:3242
+#: src/rcfile.c:540 src/rcfile.c:1280
+#, c-format
+msgid "Error reading %s: %s"
+msgstr "Eroare la citirea %s: %s"
+
 #. TRANSLATORS: This is a prompt.
-#: src/browser.c:220
+#: src/browser.c:247
 msgid "Go To Directory"
 msgstr "Mergi la director"
 
-#: src/browser.c:227 src/browser.c:738 src/files.c:1174 src/files.c:2340
-#: src/nano.c:1120 src/search.c:202 src/search.c:290 src/search.c:895
-#: src/search.c:970 src/text.c:2935 src/text.c:3142
+#: src/browser.c:254 src/browser.c:723 src/files.c:1126 src/files.c:2292
+#: src/nano.c:1128 src/search.c:195 src/search.c:297 src/search.c:851
+#: src/search.c:918 src/text.c:3189 src/text.c:3396
 msgid "Cancelled"
 msgstr "S-a renunțat"
 
-#: src/browser.c:253 src/browser.c:300
-#, c-format
-msgid "Can't go outside of %s in restricted mode"
+#. TRANSLATORS: This refers to the option --operatingdir,
+#. * not to --restricted.
+#: src/browser.c:274 src/browser.c:326
+#, fuzzy, c-format
+msgid "Can't go outside of %s in confined mode"
 msgstr "Nu pot merge în afara %s în modul restricționat"
 
-#: src/browser.c:264 src/browser.c:310 src/browser.c:326 src/files.c:1044
-#: src/files.c:1052 src/files.c:1844 src/files.c:1971 src/files.c:2016
-#: src/files.c:2037 src/files.c:2156 src/files.c:3062 src/files.c:3285
-#: src/rcfile.c:596 src/rcfile.c:1435
-#, c-format
-msgid "Error reading %s: %s"
-msgstr "Eroare la citirea %s: %s"
-
-#: src/browser.c:290
+#: src/browser.c:317
 msgid "Can't move up a directory"
 msgstr "Nu se poate schimba mai sus directorul"
 
 #. TRANSLATORS: Try to keep this at most 7 characters.
-#: src/browser.c:615 src/browser.c:623
+#: src/browser.c:590 src/browser.c:598
 msgid "(dir)"
 msgstr "(dir)"
 
 #. TRANSLATORS: Try to keep this at most 12 characters.
-#: src/browser.c:620
+#: src/browser.c:595
 msgid "(parent dir)"
 msgstr "(dir sup.)"
 
 #. TRANSLATORS: Try to keep this at most 7 characters.
 #. * If necessary, you can leave out the parentheses.
-#: src/browser.c:650
+#: src/browser.c:625
 msgid "(huge)"
 msgstr "(imens)"
 
 #. TRANSLATORS: This is the main search prompt.
-#: src/browser.c:727 src/search.c:173
+#: src/browser.c:712 src/search.c:166
 msgid "Search"
 msgstr "Caută"
 
-#: src/browser.c:777 src/search.c:466 src/search.c:536
-msgid "This is the only occurrence"
-msgstr "Aceasta este singura apariție"
-
-#: src/browser.c:793 src/search.c:364
+#: src/browser.c:754 src/search.c:368
 msgid "Search Wrapped"
 msgstr "Caută de la început"
 
-#: src/browser.c:843 src/search.c:517
+#: src/browser.c:764 src/search.c:509
+msgid "This is the only occurrence"
+msgstr "Aceasta este singura apariție"
+
+#: src/browser.c:812 src/search.c:473
 msgid "No current search pattern"
 msgstr "Nici un termen de căutare definit"
 
-#: src/files.c:50
+#: src/color.c:186
+#, fuzzy, c-format
+msgid "Unknown syntax name: %s"
+msgstr "Lipsește nume sintaxă"
+
+#: src/color.c:247
+#, c-format
+msgid "magic_load() failed: %s"
+msgstr ""
+
+#: src/color.c:251
+#, c-format
+msgid "magic_file(%s) failed: %s"
+msgstr ""
+
+#: src/files.c:47
 #, c-format
 msgid "Directory '%s' does not exist"
 msgstr "Directorul „%s” nu există"
 
-#: src/files.c:52
+#: src/files.c:49
 #, c-format
 msgid "Path '%s': %s"
 msgstr "Calea „%s”: %s"
 
-#: src/files.c:54
+#: src/files.c:51
 #, c-format
 msgid "Path '%s' is not a directory"
 msgstr "Calea „%s” nu este un director"
 
-#: src/files.c:57
+#: src/files.c:53
 #, c-format
 msgid "Path '%s' is not accessible"
 msgstr "Calea „%s” nu este accesibilă"
 
-#. TRANSLATORS: Try to keep this at most 76 characters.
-#: src/files.c:158
+#. TRANSLATORS: Keep the next ten messages at most 76 characters.
+#: src/files.c:148
 msgid ""
 "Warning: Modifying a file which is not locked, check directory permission?"
 msgstr ""
 "Avertizare: Modificare a unui fișier deblocat. Verificați permisiunile "
 "directorului?‎‬"
 
-#: src/files.c:197
+#: src/files.c:187
 msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
 msgstr ""
 "Nu s-a putut determina identitatea mea pentru fișierul blocat - getpwuid() a "
 "eșuat"
 
-#: src/files.c:206
+#: src/files.c:196
 #, c-format
 msgid "Couldn't determine hostname for lock file: %s"
 msgstr "Nu s-a putut determina numele gazdei pentru fișierul blocat: %s"
 
-#: src/files.c:227 src/files.c:238 src/files.c:275 src/files.c:285
+#: src/files.c:216 src/files.c:225 src/files.c:262 src/files.c:272
 #, c-format
 msgid "Error writing lock file %s: %s"
 msgstr "Eroare la scrierea fișierului de blocare %s: %s"
 
-#: src/files.c:305
+#: src/files.c:291
 #, c-format
 msgid "Error deleting lock file %s: %s"
 msgstr "Eroare la ștergerea fișierului de blocare %s: %s"
 
-#: src/files.c:341
+#: src/files.c:325
 #, c-format
 msgid "Error opening lock file %s: %s"
 msgstr "Eroare la deschiderea fișierului de blocare %s: %s"
 
-#: src/files.c:353
+#: src/files.c:337
 #, c-format
 msgid "Error reading lock file %s: Not enough data read"
 msgstr ""
 "Eroare la citirea fișierului de blocare %s: Nu s-au citit suficiente date"
 
 #. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
-#: src/files.c:371
+#: src/files.c:354
 #, c-format
 msgid "File %s is being edited (by %s with %s, PID %d); continue?"
 msgstr ""
 "Fișierul %s este în curs de editare (de %s cu %s, PID %d); Se continuă?"
 
-#: src/files.c:426
+#: src/files.c:430
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Nu se poate insera un fișier din afara %s"
 
-#: src/files.c:439 src/files.c:1038 src/rcfile.c:589 src/rcfile.c:1385
-#: src/rcfile.c:1426
+#: src/files.c:445 src/files.c:991 src/rcfile.c:533 src/rcfile.c:1230
+#: src/rcfile.c:1271
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "„%s” este un director"
 
-#: src/files.c:441
+#: src/files.c:447
 #, c-format
 msgid "\"%s\" is not a normal file"
 msgstr "„%s” nu este un fișier normal"
 
-#: src/files.c:566
+#: src/files.c:571
 msgid "No more open file buffers"
 msgstr "Nu mai sunt fișiere deschise"
 
-#: src/files.c:582
+#: src/files.c:586
 #, c-format
 msgid "Switched to %s"
 msgstr "S-a schimbat la %s"
 
-#: src/files.c:584 src/global.c:988 src/winio.c:2010
+#: src/files.c:588 src/global.c:1005 src/winio.c:1965
 msgid "New Buffer"
 msgstr "Spațiu nou"
 
-#: src/files.c:943
+#. TRANSLATORS: Keep the next four messages at most 76 characters.
+#: src/files.c:913
 #, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
@@ -188,25 +206,7 @@ msgstr[0] "S-a citit %lu rând (Convertită din formatul DOS și Mac)"
 msgstr[1] "S-au citit %lu rânduri (Convertite din formatul DOS și Mac)"
 msgstr[2] "S-au citit %lu de rânduri (Convertite din formatul DOS și Mac)"
 
-#: src/files.c:948
-#, c-format
-msgid ""
-"Read %lu line (Converted from DOS and Mac format - Warning: No write "
-"permission)"
-msgid_plural ""
-"Read %lu lines (Converted from DOS and Mac format - Warning: No write "
-"permission)"
-msgstr[0] ""
-"S-a citit %lu rând (Convertită din formatul DOS și Mac - Avertizare: fără "
-"permisiune la scriere)"
-msgstr[1] ""
-"S-au citit %lu rânduri (Convertite din formatul DOS și Mac - Avertizare: "
-"fără permisiune la scriere)"
-msgstr[2] ""
-"S-au citit %lu de rânduri (Convertite din formatul DOS și Mac - Avertizare: "
-"fără permisiune la scriere)"
-
-#: src/files.c:954
+#: src/files.c:919
 #, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
@@ -214,23 +214,7 @@ msgstr[0] "S-a citit %lu rând (Convertită din formatul Mac)"
 msgstr[1] "S-au citit %lu rânduri (Convertite din formatul Mac)"
 msgstr[2] "S-au citit %lu de rânduri (Convertite din formatul Mac)"
 
-#: src/files.c:958
-#, c-format
-msgid ""
-"Read %lu line (Converted from Mac format - Warning: No write permission)"
-msgid_plural ""
-"Read %lu lines (Converted from Mac format - Warning: No write permission)"
-msgstr[0] ""
-"S-a citit %lu rând (Convertită din formatul Mac - Avertizare: fără "
-"permisiune la scriere)"
-msgstr[1] ""
-"S-au citit %lu rânduri (Convertite din formatul Mac - Avertizare: fără "
-"permisiune la scriere)"
-msgstr[2] ""
-"S-au citit %lu de rânduri (Convertite din formatul Mac - Avertizare: fără "
-"permisiune la scriere)"
-
-#: src/files.c:964
+#: src/files.c:925
 #, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
@@ -238,23 +222,7 @@ msgstr[0] "S-a citit %lu rând (convertită din formatul DOS)"
 msgstr[1] "S-au citit %lu rânduri (convertite din formatul DOS)"
 msgstr[2] "S-au citit %lu de rânduri (convertite din formatul DOS)"
 
-#: src/files.c:968
-#, c-format
-msgid ""
-"Read %lu line (Converted from DOS format - Warning: No write permission)"
-msgid_plural ""
-"Read %lu lines (Converted from DOS format - Warning: No write permission)"
-msgstr[0] ""
-"S-a citit %lu rând (Convertită din formatul DOS - Avertizare: fără "
-"permisiune la scriere)"
-msgstr[1] ""
-"S-au citit %lu rânduri (Convertite din formatul DOS - Avertizare: fără "
-"permisiune la scriere)"
-msgstr[2] ""
-"S-au citit %lu de rânduri (Convertite din formatul DOS - Avertizare: fără "
-"permisiune la scriere)"
-
-#: src/files.c:974
+#: src/files.c:930
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
@@ -262,90 +230,83 @@ msgstr[0] "S-a citit %lu rând"
 msgstr[1] "S-au citit %lu rânduri"
 msgstr[2] "S-au citit %lu de rânduri"
 
-#: src/files.c:977
-#, c-format
-msgid "Read %lu line (Warning: No write permission)"
-msgid_plural "Read %lu lines (Warning: No write permission)"
-msgstr[0] "S-a citit %lu rând (Avertizare: fără permisiune la scriere)"
-msgstr[1] "S-au citit %lu rânduri (Avertizare: fără permisiune la scriere)"
-msgstr[2] "S-au citit %lu de rânduri (Avertizare: fără permisiune la scriere)"
-
-#: src/files.c:1019 src/files.c:1056
+#: src/files.c:974 src/files.c:1006
 msgid "Reading File"
 msgstr "Se citește fișierul"
 
-#: src/files.c:1025
+#: src/files.c:980
 msgid "New File"
 msgstr "Fișier nou"
 
-#: src/files.c:1028
-#, c-format
-msgid "\"%s\" not found"
+#: src/files.c:983
+#, fuzzy, c-format
+msgid "File \"%s\" not found"
 msgstr "„%s” nu a fost găsit"
 
-#: src/files.c:1039 src/rcfile.c:590 src/rcfile.c:1386 src/rcfile.c:1427
+#: src/files.c:992 src/rcfile.c:534 src/rcfile.c:1231 src/rcfile.c:1272
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "„%s” este un fișier dispozitiv"
 
-#: src/files.c:1133
+#: src/files.c:1083
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Comandă de executat într-un spațiu nou [din %s] "
 
-#: src/files.c:1135
+#: src/files.c:1085
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Comandă de executat [din %s] "
 
-#: src/files.c:1142
+#: src/files.c:1092
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Fișier de inserat într-un spațiu nou [din %s] "
 
-#: src/files.c:1144
+#: src/files.c:1094
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Fișier de inserat [din %s]"
 
-#: src/files.c:1389
+#: src/files.c:1338
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Tastă ilegală în afara modului multi-spațiu"
 
-#: src/files.c:1684
-msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+#: src/files.c:1632
+#, fuzzy
+msgid "Failed to write backup file; continue saving? (Say N if unsure.) "
 msgstr ""
 "Eșec la scrierea copiei de rezervă, se continuă salvarea? (Tastați N dacă "
 "sunteți nesigur) "
 
-#: src/files.c:1800
+#: src/files.c:1750
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Nu se poate scrie în afara %s"
 
-#: src/files.c:1885 src/files.c:1910 src/files.c:1928 src/files.c:1941
-#: src/files.c:1952 src/files.c:1981
+#: src/files.c:1833 src/files.c:1858 src/files.c:1876 src/files.c:1889
+#: src/files.c:1900 src/files.c:1928
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Eroare la scrierea copiei de rezervă %s: %s"
 
-#: src/files.c:1886 src/nano.c:690
+#: src/files.c:1834 src/nano.c:692
 msgid "Too many backup files?"
 msgstr "Prea multe copii de rezervă?"
 
-#: src/files.c:2026 src/text.c:2863 src/text.c:2875 src/text.c:3244
-#: src/text.c:3253
+#: src/files.c:1972 src/text.c:3117 src/text.c:3129 src/text.c:3498
+#: src/text.c:3507
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Eroare la scrierea fișierului temporar: %s"
 
-#: src/files.c:2049 src/files.c:2068 src/files.c:2080 src/files.c:2104
-#: src/files.c:2121 src/files.c:2131 src/files.c:2164 src/files.c:2171
+#: src/files.c:1994 src/files.c:2013 src/files.c:2023 src/files.c:2047
+#: src/files.c:2064 src/files.c:2074 src/files.c:2106 src/files.c:2113
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Eroare la scrierea %s: %s"
 
-#: src/files.c:2200
+#: src/files.c:2154
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
@@ -353,64 +314,68 @@ msgstr[0] "S-a scris %lu rând"
 msgstr[1] "S-au scris %lu rânduri"
 msgstr[2] "S-au scris %lu de rânduri"
 
-#: src/files.c:2299
+#: src/files.c:2249
 msgid " [DOS Format]"
 msgstr " [Format DOS]"
 
-#: src/files.c:2300
+#: src/files.c:2250
 msgid " [Mac Format]"
 msgstr " [Format Mac]"
 
-#: src/files.c:2302
+#: src/files.c:2252
 msgid " [Backup]"
 msgstr " [Copie de rezervă]"
 
-#: src/files.c:2309
+#: src/files.c:2259
 msgid "Prepend Selection to File"
 msgstr "Adaugă selecție la începutul fișierului"
 
-#: src/files.c:2310
+#: src/files.c:2260
 msgid "Append Selection to File"
 msgstr "Adaugă selecție la fișier"
 
-#: src/files.c:2311
+#: src/files.c:2261
 msgid "Write Selection to File"
 msgstr "Scrie selecție în fișier"
 
-#: src/files.c:2314
+#: src/files.c:2264
 msgid "File Name to Prepend to"
 msgstr "Numele fișierului la începutul căruia se adaugă"
 
-#: src/files.c:2315
+#: src/files.c:2265
 msgid "File Name to Append to"
 msgstr "Numele fișierului la sfârșitul căruia se adaugă"
 
-#: src/files.c:2316
+#: src/files.c:2266
 msgid "File Name to Write"
 msgstr "Numele fișierului pentru scriere"
 
-#: src/files.c:2349
-msgid "Save modified buffer anyway ? "
+#: src/files.c:2301
+#, fuzzy
+msgid "Save modified buffer anyway? "
 msgstr "Se salvează spațiul modificat înainte de analiza statică?"
 
-#: src/files.c:2457
-msgid "File exists, OVERWRITE ? "
-msgstr "Fișierul există, SE SUPRASCRIE ? "
-
-#: src/files.c:2466
-msgid "Save file under DIFFERENT NAME ? "
+#: src/files.c:2412
+#, fuzzy
+msgid "Save file under DIFFERENT NAME? "
 msgstr "Salvează fișierul cu un NUME DIFERIT? "
 
-#: src/files.c:2480
-msgid "File was modified since you opened it, continue saving ? "
+#: src/files.c:2420
+#, fuzzy, c-format
+msgid "File \"%s\" exists; OVERWRITE? "
+msgstr "Fișierul există, SE SUPRASCRIE ? "
+
+#: src/files.c:2441
+#, fuzzy
+msgid "File was modified since you opened it; continue saving? "
 msgstr ""
 "Fișierul a fost modificat de când l-ați deschis, se continuă salvarea? "
 
-#: src/files.c:2917
+#: src/files.c:2874
 msgid "(more)"
 msgstr "(mai mult)"
 
-#: src/files.c:3004
+#: src/files.c:2959
 #, c-format
 msgid ""
 "\n"
@@ -419,7 +384,7 @@ msgstr ""
 "\n"
 "Apăsați Enter pentru a continua\n"
 
-#: src/files.c:3020
+#: src/files.c:2975
 #, c-format
 msgid ""
 "Unable to create directory %s: %s\n"
@@ -429,7 +394,7 @@ msgstr ""
 "Este necesar pentru salvarea/încărcarea istoricului de salvări sau pozițiile "
 "cursorului.\n"
 
-#: src/files.c:3026
+#: src/files.c:2982
 #, c-format
 msgid ""
 "Path %s is not a directory and needs to be.\n"
@@ -439,7 +404,7 @@ msgstr ""
 "Nano nu va putea să încarce sau să salveze istoricul sau pozițiile "
 "cursorului.\n"
 
-#: src/files.c:3045
+#: src/files.c:3002
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I tried to move\n"
@@ -449,7 +414,7 @@ msgstr ""
 "mut\n"
 " în locația preferată (%s) dar am întâmpinat o eroare: %s"
 
-#: src/files.c:3049
+#: src/files.c:3006
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I moved\n"
@@ -460,725 +425,756 @@ msgstr ""
 " în locația preferată (%s)\n"
 "(vezi secțiunea FAQ nano despre această schimbare)"
 
-#: src/files.c:3132 src/files.c:3140 src/files.c:3164 src/files.c:3176
+#: src/files.c:3089 src/files.c:3097 src/files.c:3121 src/files.c:3133
 #, c-format
 msgid "Error writing %s: %s\n"
 msgstr "Eroare la scrierea %s: %s\n"
 
 #. TRANSLATORS: Try to keep the next fifteen strings at most 10 characters.
-#: src/global.c:480
+#: src/global.c:483
 msgid "Exit"
 msgstr "Ieșire"
 
-#: src/global.c:481
+#: src/global.c:484
 msgid "Close"
 msgstr "ÃŽnchide"
 
-#: src/global.c:482
+#: src/global.c:485
 msgid "Uncut Text"
 msgstr "Lipește"
 
-#: src/global.c:484
+#: src/global.c:487
 msgid "Unjustify"
 msgstr "Anul. alin."
 
-#: src/global.c:490
+#: src/global.c:493
 msgid "Read File"
 msgstr "Citire fiÈ™."
 
-#: src/global.c:491
+#: src/global.c:494
 msgid "Where Is"
 msgstr "Caută"
 
-#: src/global.c:492
+#: src/global.c:495
 msgid "Replace"
 msgstr "Înlocuiește"
 
-#: src/global.c:493
+#: src/global.c:496
 msgid "Go To Line"
 msgstr "Depl. rând"
 
-#: src/global.c:494
+#: src/global.c:497
 msgid "Prev Line"
 msgstr "Rândul anterior"
 
-#: src/global.c:495
+#: src/global.c:498
 msgid "Next Line"
 msgstr "Rândul următor"
 
-#: src/global.c:496
+#: src/global.c:499
 msgid "Prev Page"
 msgstr "Pagina anter."
 
-#: src/global.c:497
+#: src/global.c:500
 msgid "Next Page"
 msgstr "Pagina urm."
 
-#: src/global.c:499
+#: src/global.c:502
 msgid "Justify"
 msgstr "Aliniază"
 
-#: src/global.c:500
+#: src/global.c:503
 msgid "FullJstify"
 msgstr "Alin.compl"
 
-#: src/global.c:502
+#: src/global.c:505
 msgid "Refresh"
 msgstr "Reîmprospătează"
 
 #. TRANSLATORS: Try to keep this string at most 12 characters.
-#: src/global.c:505
+#: src/global.c:508
 msgid "WhereIs Next"
 msgstr "Căutarea urm."
 
 #. TRANSLATORS: The next long series of strings are shortcut descriptions;
 #. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:512
+#: src/global.c:515
 msgid "Justify the current paragraph"
 msgstr "Aliniază paragraful curent"
 
-#: src/global.c:514
+#: src/global.c:517
 msgid "Cancel the current function"
 msgstr "Anulează funcția curentă"
 
-#: src/global.c:515
+#: src/global.c:518
 msgid "Display this help text"
 msgstr "Afișează acest text de ajutor"
 
-#: src/global.c:518
+#: src/global.c:521
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Închide spațiul curent / Ieșire din nano"
 
-#: src/global.c:520
+#: src/global.c:523
 msgid "Exit from nano"
 msgstr "Ieșire din nano"
 
-#: src/global.c:524
+#: src/global.c:527
 msgid "Write the current file to disk"
 msgstr "Scrie fișierul curent pe disc"
 
-#: src/global.c:526
+#: src/global.c:529
 msgid "Insert another file into the current one"
 msgstr "Inserează alt fișier în fișierul curent"
 
-#: src/global.c:528
+#: src/global.c:531
 msgid "Search for a string or a regular expression"
 msgstr "Caută un text sau o expresie regulată"
 
-#: src/global.c:531
+#: src/global.c:533
 msgid "Search for a string"
 msgstr "Caută un text"
 
-#: src/global.c:533
+#: src/global.c:534
+msgid "Refresh the file list"
+msgstr ""
+
+#: src/global.c:535
+#, fuzzy
+msgid "Go to lefthand column"
+msgstr "Deplasează cursorul la rândul și coloana numărul"
+
+#: src/global.c:536
+#, fuzzy
+msgid "Go to righthand column"
+msgstr "Deplasează cursorul la rândul și coloana numărul"
+
+#: src/global.c:538
 msgid "Go one screenful up"
 msgstr "Deplasează cursorul în sus cu un ecran"
 
-#: src/global.c:534
+#: src/global.c:539
 msgid "Go one screenful down"
 msgstr "Deplasează cursorul în jos cu un ecran"
 
-#: src/global.c:536
+#: src/global.c:541
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Decupează rândul curent și îl stochează în memoria temporară"
 
-#: src/global.c:538
+#: src/global.c:543
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Lipește din memoria temporară în rândul curent"
 
-#: src/global.c:539
+#: src/global.c:544
 msgid "Display the position of the cursor"
 msgstr "Afișează poziția cursorului"
 
-#: src/global.c:541
+#: src/global.c:546
 msgid "Invoke the spell checker, if available"
 msgstr "Invocă corectorul ortografic, dacă este disponibil"
 
-#: src/global.c:543
+#: src/global.c:548
 msgid "Replace a string or a regular expression"
 msgstr "Înlocuiește un text sau o expresie regulată"
 
-#: src/global.c:544
+#: src/global.c:549
 msgid "Go to line and column number"
 msgstr "Deplasează cursorul la rândul și coloana numărul"
 
-#: src/global.c:546
+#: src/global.c:551
 msgid "Mark text starting from the cursor position"
 msgstr "Marchează începutul textului de la poziția cursorului"
 
-#: src/global.c:547
+#: src/global.c:552
 msgid "Repeat the last search"
 msgstr "Repetă ultima căutare"
 
-#: src/global.c:549
+#: src/global.c:554
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "Copiază rândul curent și îl stochează în memoria temporară"
 
-#: src/global.c:550
+#: src/global.c:555
 msgid "Indent the current line"
 msgstr "Mărește marginea liniei curente"
 
-#: src/global.c:551
+#: src/global.c:556
 msgid "Unindent the current line"
 msgstr "Micșorează marginea liniei curente"
 
-#: src/global.c:552
+#: src/global.c:558
+msgid "Comment/uncomment the current line or marked lines"
+msgstr ""
+
+#: src/global.c:560
 msgid "Undo the last operation"
 msgstr "Anulează ultima operație"
 
-#: src/global.c:553
+#: src/global.c:561
 msgid "Redo the last undone operation"
 msgstr "Repetă ultima operație anulată"
 
-#: src/global.c:555
+#: src/global.c:563
 msgid "Go back one character"
 msgstr "ÃŽnapoi cu un caracter"
 
-#: src/global.c:556
+#: src/global.c:564
 msgid "Go forward one character"
 msgstr "Avansează cu un caracter"
 
-#: src/global.c:558
+#: src/global.c:566
 msgid "Go back one word"
 msgstr "Înapoi cu un cuvânt"
 
-#: src/global.c:559
+#: src/global.c:567
 msgid "Go forward one word"
 msgstr "Avansează cu un cuvânt"
 
-#: src/global.c:561
+#: src/global.c:569
 msgid "Go to previous line"
 msgstr "Deplasează cursorul la rândul anterior"
 
-#: src/global.c:562
+#: src/global.c:570
 msgid "Go to next line"
 msgstr "Deplasează cursorul la rândul următor"
 
-#: src/global.c:563
+#: src/global.c:571
 msgid "Go to beginning of current line"
 msgstr "Deplasează cursorul la începutul liniei curente"
 
-#: src/global.c:564
+#: src/global.c:572
 msgid "Go to end of current line"
 msgstr "Deplasează cursorul la sfârșitul liniei curente"
 
-#: src/global.c:567
+#: src/global.c:575
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr ""
 "Deplasează cursorul la începutul paragrafului; apoi la începutul "
 "paragrafului anterior"
 
-#: src/global.c:569
+#: src/global.c:577
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr ""
 "Deplasează cursorul dincolo de sfârșitul paragrafului; apoi la sfârșitul "
 "paragrafului următor"
 
-#: src/global.c:571
+#: src/global.c:579
 msgid "Go to the first line of the file"
 msgstr "Deplasează cursorul la primul rând din fișier"
 
-#: src/global.c:572
+#: src/global.c:580
 msgid "Go to the last line of the file"
 msgstr "Deplasează cursorul la ultimul rând din fișier"
 
-#: src/global.c:574
+#: src/global.c:582
 msgid "Go to the matching bracket"
 msgstr "Deplasează cursorul la paranteza pereche"
 
-#: src/global.c:576
+#: src/global.c:584
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "Derulează în sus un rând fără a deplasa cursorul"
 
-#: src/global.c:578
+#: src/global.c:586
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "Derulează în jos un rând fără a deplasa cursorul"
 
-#: src/global.c:581
+#: src/global.c:589
 msgid "Switch to the previous file buffer"
 msgstr "Comută la spațiul fișier anterior"
 
-#: src/global.c:582
+#: src/global.c:590
 msgid "Switch to the next file buffer"
 msgstr "Comută la următorul spațiu fișier"
 
-#: src/global.c:584
+#: src/global.c:592
 msgid "Insert the next keystroke verbatim"
 msgstr "Inserează următoarea apăsare de tastă verbatim"
 
-#: src/global.c:585
+#: src/global.c:593
 msgid "Insert a tab at the cursor position"
 msgstr "Inserează un tab la poziția cursorului"
 
-#: src/global.c:586
+#: src/global.c:594
 msgid "Insert a newline at the cursor position"
 msgstr "Inserează un rând nou la poziția cursorului"
 
-#: src/global.c:587
+#: src/global.c:595
 msgid "Delete the character under the cursor"
 msgstr "Șterge caracterul de sub cursor"
 
-#: src/global.c:589
+#: src/global.c:597
 msgid "Delete the character to the left of the cursor"
 msgstr "Șterge caracterul de la stânga cursorului"
 
-#: src/global.c:592
+#: src/global.c:600
 msgid "Cut backward from cursor to word start"
 msgstr "Decupează înapoi de la cursor până la începutul cuvântului"
 
-#: src/global.c:594
+#: src/global.c:602
 msgid "Cut forward from cursor to next word start"
 msgstr "Decupează înainte de la cursor până la următorul început de cuvânt"
 
-#: src/global.c:596
+#: src/global.c:604
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Decupează de la cursor până la sfârșitul fișierului"
 
-#: src/global.c:599
+#: src/global.c:607
 msgid "Justify the entire file"
 msgstr "Aliniază întregul fișier"
 
-#: src/global.c:603
+#: src/global.c:611
 msgid "Count the number of words, lines, and characters"
 msgstr "Contorizează numărul cuvintelor, liniilor și caracterelor"
 
-#: src/global.c:606
+#: src/global.c:614
 msgid "Refresh (redraw) the current screen"
 msgstr "Reîmprospătează zona de ecran curentă"
 
-#: src/global.c:608
+#: src/global.c:616
 msgid "Suspend the editor (if suspension is enabled)"
 msgstr "Suspendă editorul (dacă suspendarea este activată)"
 
-#: src/global.c:610
+#: src/global.c:618
 msgid "Save file without prompting"
 msgstr "Salvează fișierul fără confirmare"
 
-#: src/global.c:611
+#: src/global.c:619
 msgid "Search next occurrence backward"
 msgstr "Caută următoarea apariție înapoi"
 
-#: src/global.c:612
+#: src/global.c:620
 msgid "Search next occurrence forward"
 msgstr "Caută următoarea apariție înainte"
 
-#: src/global.c:614
+#: src/global.c:622
 msgid "Toggle the case sensitivity of the search"
 msgstr "Comută sensibilitatea la majuscule a căutării"
 
-#: src/global.c:616
+#: src/global.c:624
 msgid "Reverse the direction of the search"
 msgstr "Inversează direcția căutării"
 
-#: src/global.c:620
+#: src/global.c:628
 msgid "Toggle the use of regular expressions"
 msgstr "Comută folosirea expresiilor regulate"
 
-#: src/global.c:624
+#: src/global.c:632
 msgid "Recall the previous search/replace string"
 msgstr "Reapelează șirul anterior caută/înlocuiește"
 
-#: src/global.c:626
+#: src/global.c:634
 msgid "Recall the next search/replace string"
 msgstr "Reapelează șirul următor caută/înlocuiește"
 
-#: src/global.c:629
+#: src/global.c:637
 msgid "Go to file browser"
 msgstr "Mergi la navigatorul de fișiere"
 
-#: src/global.c:632
+#: src/global.c:640
 msgid "Toggle the use of DOS format"
 msgstr "Comută folosirea formatului DOS"
 
-#: src/global.c:633
+#: src/global.c:641
 msgid "Toggle the use of Mac format"
 msgstr "Comuta folosirea formatului Mac"
 
-#: src/global.c:634
+#: src/global.c:642
 msgid "Toggle appending"
 msgstr "Comută adăugarea la sfârșit"
 
-#: src/global.c:635
+#: src/global.c:643
 msgid "Toggle prepending"
 msgstr "Comută adăugarea la început"
 
-#: src/global.c:636
+#: src/global.c:644
 msgid "Toggle backing up of the original file"
 msgstr "Comută realizarea copiei de siguranță a fișierului original"
 
-#: src/global.c:637
+#: src/global.c:645
 msgid "Execute external command"
 msgstr "Execută comandă externă"
 
-#: src/global.c:639
+#: src/global.c:647
 msgid "Close buffer without saving it"
 msgstr "Închide spațiul fără a-l salva"
 
-#: src/global.c:641
+#: src/global.c:649
 msgid "Toggle the use of a new buffer"
 msgstr "Comută folosirea unui spațiu nou"
 
-#: src/global.c:644
+#: src/global.c:652
 msgid "Exit from the file browser"
 msgstr "Ieși din navigatorul de fișiere"
 
-#: src/global.c:645
+#: src/global.c:653
 msgid "Go to the first file in the list"
 msgstr "Deplasează cursorul la primul fișier din listă"
 
-#: src/global.c:646
+#: src/global.c:654
 msgid "Go to the last file in the list"
 msgstr "Deplasează cursorul la ultimul fișier din listă"
 
-#: src/global.c:647
+#: src/global.c:655
 msgid "Go to the previous file in the list"
 msgstr "Deplasează cursorul la fișierul anterior din listă"
 
-#: src/global.c:648
+#: src/global.c:656
 msgid "Go to the next file in the list"
 msgstr "Deplasează cursorul la următorul fișier din listă"
 
-#: src/global.c:649
+#: src/global.c:657
 msgid "Go to directory"
 msgstr "Mergi la director"
 
-#: src/global.c:652
+#: src/global.c:660
 msgid "Invoke the linter, if available"
 msgstr "Apelează analiza statică, dacă este disponibilă"
 
-#: src/global.c:653
+#: src/global.c:661
 msgid "Go to previous linter msg"
 msgstr "Mergi la mesajul anterior al analizei statice"
 
-#: src/global.c:654
+#: src/global.c:662
 msgid "Go to next linter msg"
 msgstr "Mergi la mesajul următor al analizei statice"
 
-#: src/global.c:656
+#: src/global.c:664
 msgid "Invoke formatter, if available"
 msgstr "Apelează utilitarul de formatare, dacă este disponibil"
 
 #. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:671
+#: src/global.c:679
 msgid "Get Help"
 msgstr "Ajutor"
 
-#: src/global.c:674 src/prompt.c:858
+#: src/global.c:682 src/prompt.c:855
 msgid "Cancel"
 msgstr "Renunță"
 
-#: src/global.c:687
+#: src/global.c:695
 msgid "Write Out"
 msgstr "Salvează"
 
-#: src/global.c:723
+#: src/global.c:731
 msgid "Go To Dir"
 msgstr "Mergi la Director"
 
-#: src/global.c:738
+#: src/global.c:746
 msgid "Cut Text"
 msgstr "Decupează"
 
-#: src/global.c:753
+#: src/global.c:761
 msgid "To Spell"
 msgstr "Ortograf."
 
-#: src/global.c:757
+#: src/global.c:765
 msgid "To Linter"
 msgstr "Analiză statică"
 
-#: src/global.c:760
+#: src/global.c:768
 msgid "Formatter"
 msgstr "Formatare"
 
-#: src/global.c:767
+#: src/global.c:775
 msgid "Case Sens"
 msgstr "Sensibil Majusc."
 
-#: src/global.c:772
+#: src/global.c:780
 msgid "Regexp"
 msgstr "Regexp"
 
-#: src/global.c:777
+#: src/global.c:785
 msgid "Backwards"
 msgstr "ÃŽnapoi"
 
-#: src/global.c:784
+#: src/global.c:792
 msgid "No Replace"
 msgstr "Nicio înlocuire"
 
-#: src/global.c:792
+#: src/global.c:800
 msgid "Cur Pos"
 msgstr "Poz. curent."
 
-#: src/global.c:807
+#: src/global.c:815
 msgid "First Line"
 msgstr "Primul rând"
 
-#: src/global.c:809
+#: src/global.c:817
 msgid "Last Line"
 msgstr "Ultimul rând"
 
-#: src/global.c:816
+#: src/global.c:824
 msgid "To Bracket"
 msgstr "Paranteză"
 
-#: src/global.c:819
+#: src/global.c:827
 msgid "Mark Text"
 msgstr "Marchează text"
 
-#: src/global.c:822
+#: src/global.c:830
 msgid "Copy Text"
 msgstr "Copiază text"
 
-#: src/global.c:825
+#: src/global.c:833
 msgid "Indent Text"
 msgstr "Măreș. marg"
 
-#: src/global.c:827
+#: src/global.c:835
 msgid "Unindent Text"
 msgstr "MicÈ™. marg"
 
-#: src/global.c:830
+#: src/global.c:838
 msgid "Undo"
 msgstr "Anulează"
 
-#: src/global.c:832
+#: src/global.c:840
 msgid "Redo"
 msgstr "Repetă"
 
-#: src/global.c:836 src/global.c:842
+#: src/global.c:844 src/global.c:850
 msgid "Back"
 msgstr "ÃŽnapoi"
 
-#: src/global.c:838 src/global.c:844
+#: src/global.c:846 src/global.c:852
 msgid "Forward"
 msgstr "ÃŽnainte"
 
-#: src/global.c:849
+#: src/global.c:857
 msgid "Prev Word"
 msgstr "Cuvânt anterior"
 
-#: src/global.c:851
+#: src/global.c:859
 msgid "Next Word"
 msgstr "Cuvântul următor"
 
-#: src/global.c:855
+#: src/global.c:863
 msgid "Home"
 msgstr "Acasă"
 
-#: src/global.c:857
+#: src/global.c:865
 msgid "End"
 msgstr "Sfârșit"
 
-#: src/global.c:866
+#: src/global.c:874
 msgid "Beg of Par"
 msgstr "ÃŽnceput Par"
 
-#: src/global.c:868
+#: src/global.c:876
 msgid "End of Par"
 msgstr "Sfârșit Par"
 
-#: src/global.c:873
+#: src/global.c:881
 msgid "Scroll Up"
 msgstr "Derulează în sus"
 
-#: src/global.c:875
+#: src/global.c:883
 msgid "Scroll Down"
 msgstr "Derulează în jos"
 
-#: src/global.c:880
+#: src/global.c:888
 msgid "Prev File"
 msgstr "Fișierul anterior"
 
-#: src/global.c:882
+#: src/global.c:890
 msgid "Next File"
 msgstr "FiÈ™ urm"
 
-#: src/global.c:891
+#: src/global.c:899
 msgid "Verbatim"
 msgstr "Verbatim"
 
-#: src/global.c:894
+#: src/global.c:902
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:896
+#: src/global.c:904
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:899
+#: src/global.c:907
 msgid "Delete"
 msgstr "Șterge"
 
-#: src/global.c:901
+#: src/global.c:909
 msgid "Backspace"
 msgstr "Șterge înapoi"
 
 #. TRANSLATORS: The next two strings refer to cutting words.
-#: src/global.c:912
+#: src/global.c:920
 msgid "Cut Left"
 msgstr "Decupează Stânga"
 
-#: src/global.c:914
+#: src/global.c:922
 msgid "Cut Right"
 msgstr "Decupează dreapta"
 
-#: src/global.c:916
+#: src/global.c:924
 msgid "CutTillEnd"
 msgstr "Taie->Sfârșit"
 
-#: src/global.c:926
+#: src/global.c:934
 msgid "Word Count"
 msgstr "Contorizare cuvinte"
 
-#: src/global.c:933
+#: src/global.c:941
 msgid "Suspend"
 msgstr "Suspendă"
 
-#: src/global.c:937
+#: src/global.c:945
+#, fuzzy
+msgid "Comment Lines"
+msgstr "Rândul următor"
+
+#: src/global.c:949
 msgid "Save"
 msgstr "Salvează"
 
-#: src/global.c:940
+#: src/global.c:952
 msgid "Previous"
 msgstr "Precedent"
 
-#: src/global.c:942
+#: src/global.c:954
 msgid "Next"
 msgstr "Următor"
 
-#: src/global.c:948
+#: src/global.c:960
 msgid "PrevHstory"
 msgstr "Anterioara"
 
-#: src/global.c:951
+#: src/global.c:963
 msgid "NextHstory"
 msgstr "Următoarea"
 
-#: src/global.c:955
+#: src/global.c:972
 msgid "Go To Text"
 msgstr "Deplasează la text"
 
-#: src/global.c:959
+#: src/global.c:976
 msgid "DOS Format"
 msgstr "Format DOS"
 
-#: src/global.c:961
+#: src/global.c:978
 msgid "Mac Format"
 msgstr "Format Mac"
 
-#: src/global.c:969
+#: src/global.c:986
 msgid "Append"
 msgstr "Adaugă la sfârșit"
 
-#: src/global.c:971
+#: src/global.c:988
 msgid "Prepend"
 msgstr "Adaugă la început"
 
-#: src/global.c:974
+#: src/global.c:991
 msgid "Backup File"
 msgstr "Fișier copie de rezervă"
 
-#: src/global.c:981
+#: src/global.c:998
 msgid "Execute Command"
 msgstr "Execută comandă"
 
-#: src/global.c:996
+#: src/global.c:1013
 msgid "To Files"
 msgstr "La fișiere"
 
-#: src/global.c:1004
+#: src/global.c:1021
 msgid "First File"
 msgstr "Primul fișier"
 
-#: src/global.c:1006
+#: src/global.c:1023
 msgid "Last File"
 msgstr "Ultimul fișier"
 
-#: src/global.c:1010
+#: src/global.c:1027
 msgid "Discard buffer"
 msgstr "Renunță la spațiu"
 
+#: src/global.c:1038
+msgid "Left Column"
+msgstr ""
+
+#: src/global.c:1040
+msgid "Right Column"
+msgstr ""
+
 #. TRANSLATORS: Try to keep the next two strings at most 20 characters.
-#: src/global.c:1020
+#: src/global.c:1047
 msgid "Prev Lint Msg"
 msgstr "Analiză anter."
 
-#: src/global.c:1022
+#: src/global.c:1049
 msgid "Next Lint Msg"
 msgstr "Analiza urm."
 
 #. TRANSLATORS: The next seventeen strings are toggle descriptions;
 #. * they are best kept shorter than 40 characters, but may be longer.
-#: src/global.c:1285
+#: src/global.c:1316
 msgid "Help mode"
 msgstr "Bara de ajutor"
 
-#: src/global.c:1287
+#: src/global.c:1318
 msgid "Constant cursor position display"
 msgstr "Afișare continuă poziție cursor"
 
-#: src/global.c:1289
+#: src/global.c:1320
 msgid "Use of one more line for editing"
 msgstr "Folosirea unui rând suplimentar pentru editare"
 
-#: src/global.c:1291
+#: src/global.c:1322
 msgid "Smooth scrolling"
 msgstr "Derulare fină"
 
-#: src/global.c:1293
+#: src/global.c:1324
 msgid "Soft wrapping of overlong lines"
 msgstr "Rupere ușoară a liniilor lungi"
 
-#: src/global.c:1295
+#: src/global.c:1326
 msgid "Whitespace display"
 msgstr "Afișare spațiu-alb"
 
-#: src/global.c:1297
+#: src/global.c:1328
 msgid "Color syntax highlighting"
 msgstr "Evidențiere sintaxă color"
 
-#: src/global.c:1299
+#: src/global.c:1330
 msgid "Smart home key"
 msgstr "Tastă acasă inteligentă"
 
-#: src/global.c:1301
+#: src/global.c:1332
 msgid "Auto indent"
 msgstr "Auto identare"
 
-#: src/global.c:1303
+#: src/global.c:1334
 msgid "Cut to end"
 msgstr "Decupare până la sfârșit"
 
-#: src/global.c:1305
+#: src/global.c:1336
 msgid "Hard wrapping of overlong lines"
 msgstr "Rupere permanentă a liniilor lungi"
 
-#: src/global.c:1307
+#: src/global.c:1338
 msgid "Conversion of typed tabs to spaces"
 msgstr "Conversie a tab-urilor introduse în spații"
 
-#: src/global.c:1309
+#: src/global.c:1340
 msgid "Backup files"
 msgstr "Salvare fișiere copii de rezervă"
 
-#: src/global.c:1311
+#: src/global.c:1342
 msgid "Reading file into separate buffer"
 msgstr "Se citește fișierul într-un spațiu separat"
 
-#: src/global.c:1313
+#: src/global.c:1344
 msgid "Mouse support"
 msgstr "Funcționalitate maus"
 
-#: src/global.c:1315
+#: src/global.c:1346
 msgid "No conversion from DOS/Mac format"
 msgstr "Conversie din formatul DOS/Mac"
 
-#: src/global.c:1317
+#: src/global.c:1348
 msgid "Suspension"
 msgstr "Suspendare"
 
-#: src/help.c:209
+#: src/help.c:211
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1201,7 +1197,7 @@ msgstr ""
 "căutare. Apăsând Enter fără a introduce vreun text, se va executa căutarea "
 "cu textul căutat anterior. "
 
-#: src/help.c:218
+#: src/help.c:220
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1215,7 +1211,7 @@ msgstr ""
 " Următoarele taste de funcții sunt disponibile în modul de căutare:\n"
 "\n"
 
-#: src/help.c:224
+#: src/help.c:226
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1236,7 +1232,7 @@ msgstr ""
 "rândul:\n"
 "\n"
 
-#: src/help.c:233
+#: src/help.c:235
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1260,7 +1256,7 @@ msgstr ""
 "separat (folosiți Meta-< și Meta-> pentru a comuta între spațiile de "
 "fișiere). "
 
-#: src/help.c:242
+#: src/help.c:244
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1275,7 +1271,7 @@ msgstr ""
 "fișiere:\n"
 "\n"
 
-#: src/help.c:248
+#: src/help.c:250
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1303,7 +1299,7 @@ msgstr ""
 " Următoarele taste de funcții sunt disponibile în modul salvare de fișier:\n"
 "\n"
 
-#: src/help.c:262
+#: src/help.c:264
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1329,7 +1325,7 @@ msgstr ""
 "fișiere:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:277
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1354,7 +1350,7 @@ msgstr ""
 "textul căutat anterior.\n"
 "\n"
 
-#: src/help.c:284
+#: src/help.c:286
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1363,7 +1359,7 @@ msgstr ""
 "navigator:\n"
 "\n"
 
-#: src/help.c:288
+#: src/help.c:290
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1386,7 +1382,7 @@ msgstr ""
 "directorului:\n"
 "\n"
 
-#: src/help.c:301
+#: src/help.c:303
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1411,7 +1407,7 @@ msgstr ""
 "ortografic:\n"
 "\n"
 
-#: src/help.c:316
+#: src/help.c:318
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1432,7 +1428,7 @@ msgstr ""
 "externe:\n"
 "\n"
 
-#: src/help.c:329
+#: src/help.c:331
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1453,15 +1449,15 @@ msgstr ""
 "fișierul în curs de modificare. Rândul de stare este al treilea rând de jos, "
 "acesta afișează mesajele importante. "
 
-#: src/help.c:339
+#: src/help.c:341
+#, fuzzy
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
-" The notation for shortcuts is as follows: Control-key sequences are notated "
-"with a caret (^) symbol and can be entered either by using the Control "
-"(Ctrl) key or pressing the Escape (Esc) key twice.  Escape-key sequences are "
-"notated with the Meta (M-) symbol and can be entered using either the Esc, "
-"Alt, or Meta key depending on your keyboard setup.  "
+" Shortcuts are written as follows: Control-key sequences are notated with a "
+"'^' and can be entered either by using the Ctrl key or pressing the Esc key "
+"twice.  Meta-key sequences are notated with 'M-' and can be entered using "
+"either the Alt, Cmd, or Esc key, depending on your keyboard setup.  "
 msgstr ""
 "Ultimele două rânduri arată cele mai frecvente scurtături folosite în "
 "editor. \n"
@@ -1490,19 +1486,19 @@ msgstr ""
 msgid "enable/disable"
 msgstr "[activare | dezactivare]"
 
-#: src/nano.c:559
+#: src/nano.c:560
 msgid "Key is invalid in view mode"
 msgstr "Tastă nevalidă în modul vizualizare"
 
-#: src/nano.c:565
+#: src/nano.c:566
 msgid "This function is disabled in restricted mode"
 msgstr "Această funcție este dezactivată în modul restricționat"
 
-#: src/nano.c:573
+#: src/nano.c:574
 msgid "Help is not available"
 msgstr "Ajutorul nu este disponibil"
 
-#: src/nano.c:684
+#: src/nano.c:686
 #, c-format
 msgid ""
 "\n"
@@ -1511,7 +1507,7 @@ msgstr ""
 "\n"
 "Spațiu scris în %s\n"
 
-#: src/nano.c:686
+#: src/nano.c:688
 #, c-format
 msgid ""
 "\n"
@@ -1520,7 +1516,7 @@ msgstr ""
 "\n"
 "Spațiu nu s-a scris în %s: %s\n"
 
-#: src/nano.c:689
+#: src/nano.c:691
 #, c-format
 msgid ""
 "\n"
@@ -1782,17 +1778,22 @@ msgstr "Activează suspendarea"
 msgid "Enable soft line wrapping"
 msgstr "Activează ruperea ușoară a liniei"
 
-#: src/nano.c:937
-#, c-format
-msgid " GNU nano, version %s\n"
+#: src/nano.c:940
+#, fuzzy, c-format
+msgid " nano, version %s\n"
 msgstr " GNU nano, versiunea %s\n"
 
-#: src/nano.c:940
+#: src/nano.c:943
+#, c-format
+msgid " (C) 2014..%s the contributors to nano\n"
+msgstr ""
+
+#: src/nano.c:945
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 
-#: src/nano.c:941
+#: src/nano.c:946
 #, c-format
 msgid ""
 "\n"
@@ -1801,69 +1802,82 @@ msgstr ""
 "\n"
 " Opțiuni compilate:"
 
-#: src/nano.c:1073
+#: src/nano.c:1081
 msgid "No file name"
 msgstr "Nici un nume de fișier"
 
-#: src/nano.c:1108
-msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
+#: src/nano.c:1115
+msgid "Save modified buffer?  (Answering \"No\" will DISCARD changes.) "
 msgstr ""
-"Se salvează spațiul modificat? (prin răspunsul „Nu” se vor PIERDE "
-"modificările!) "
 
-#: src/nano.c:1168
+#: src/nano.c:1178
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "Nu s-a putut redeschide stdin din tastatură, ne pare rău\n"
 
-#: src/nano.c:1192
+#: src/nano.c:1202
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "Se citește din stdin, ^C pentru a abandona\n"
 
-#: src/nano.c:1256
+#: src/nano.c:1266
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Am recepționat SIGHUP sau SIGTERM\n"
 
-#: src/nano.c:1272
+#: src/nano.c:1282
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Folosiți „fg” pentru a reveni la nano.\n"
 
-#: src/nano.c:1294
+#: src/nano.c:1304
 msgid "Suspension is not enabled"
 msgstr "Suspendarea nu este activată"
 
-#: src/nano.c:1448
+#: src/nano.c:1459
 msgid "enabled"
 msgstr "activată"
 
-#: src/nano.c:1448
+#: src/nano.c:1459
 msgid "disabled"
 msgstr "dezactivată"
 
-#: src/nano.c:1607 src/winio.c:1125
-msgid "Unknown Command"
-msgstr "Comandă necunoscută"
+#: src/nano.c:1573
+msgid "Unbound key"
+msgstr ""
+
+#: src/nano.c:1577
+#, c-format
+msgid "Unbound key: M-%c"
+msgstr ""
+
+#: src/nano.c:1579
+#, c-format
+msgid "Unbound key: ^%c"
+msgstr ""
 
-#: src/nano.c:1720
+#: src/nano.c:1581
+#, c-format
+msgid "Unbound key: %c"
+msgstr ""
+
+#: src/nano.c:1745
 msgid "XON ignored, mumble mumble"
 msgstr "XON ignorat, mormăit mormăit"
 
-#: src/nano.c:1725
+#: src/nano.c:1750
 msgid "XOFF ignored, mumble mumble"
 msgstr "XON ignorat, mormăit mormăit"
 
-#: src/nano.c:2139 src/rcfile.c:1334
+#: src/nano.c:2166 src/rcfile.c:1187
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Mărimea tab solicitată „%s” este nevalidă"
 
-#: src/nano.c:2200 src/rcfile.c:1259
+#: src/nano.c:2227 src/rcfile.c:1128
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Mărimea de umplere solicitată „%s” este nevalidă"
 
-#: src/nano.c:2247
+#: src/nano.c:2276
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr "Tastați „%s -h” pentru o listă de opțiuni disponibile.\n"
@@ -1871,115 +1885,119 @@ msgstr "Tastați „%s -h” pentru o listă de opțiuni disponibile.\n"
 #. TRANSLATORS: For the next three strings, if possible, specify
 #. * the single-byte shortcuts for both your language and English.
 #. * For example, in French: "OoYy" for "Oui".
-#: src/prompt.c:821
+#: src/prompt.c:818
 msgid "Yy"
 msgstr "Yy"
 
-#: src/prompt.c:822
+#: src/prompt.c:819
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:823
+#: src/prompt.c:820
 msgid "Aa"
 msgstr "Aa"
 
-#: src/prompt.c:845
+#: src/prompt.c:842
 msgid "Yes"
 msgstr "Da"
 
-#: src/prompt.c:850
+#: src/prompt.c:847
 msgid "All"
 msgstr "Toate"
 
-#: src/prompt.c:855
+#: src/prompt.c:852
 msgid "No"
 msgstr "Nu"
 
-#: src/rcfile.c:142
+#: src/rcfile.c:144
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Eroare în %s la rândul %lu: "
 
-#: src/rcfile.c:201
+#: src/rcfile.c:203
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "Argumentul „%s” are un \" neterminat"
 
-#: src/rcfile.c:228 src/rcfile.c:280 src/rcfile.c:732 src/rcfile.c:793
-#: src/rcfile.c:882 src/rcfile.c:933
+#: src/rcfile.c:231 src/rcfile.c:674 src/rcfile.c:725 src/rcfile.c:824
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Șirurile regex trebuie să înceapă și să se termine cu caracterul \""
 
-#: src/rcfile.c:254 src/search.c:62
+#: src/rcfile.c:257 src/search.c:61
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Regex incorect „%s”: %s"
 
-#: src/rcfile.c:274
+#: src/rcfile.c:279
 msgid "Missing syntax name"
 msgstr "Lipsește nume sintaxă"
 
-#: src/rcfile.c:345
+#: src/rcfile.c:288
+msgid "A syntax name must be quoted"
+msgstr ""
+
+#: src/rcfile.c:297
 msgid "The \"none\" syntax is reserved"
 msgstr "Sintaxa „none” este rezervată"
 
-#: src/rcfile.c:352
-msgid "The \"default\" syntax must take no extensions"
+#: src/rcfile.c:327
+#, fuzzy
+msgid "The \"default\" syntax does not accept extensions"
 msgstr "Sintaxa „default” nu trebuie să aibă extensii"
 
-#: src/rcfile.c:424
+#: src/rcfile.c:369
 msgid "Missing key name"
 msgstr "Lipsește numele tastei"
 
-#: src/rcfile.c:433 src/rcfile.c:444
+#: src/rcfile.c:378 src/rcfile.c:389
 msgid "Key name is too short"
 msgstr "Numele tastei este prea scurt"
 
-#: src/rcfile.c:454
+#: src/rcfile.c:399
 msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr "Numele tastei trebuie să înceapă cu „^”, „M” sau „F”"
 
-#: src/rcfile.c:457
+#: src/rcfile.c:402
 #, c-format
 msgid "Key name %s is invalid"
 msgstr "Numele cheii %s este nevalid"
 
-#: src/rcfile.c:466
+#: src/rcfile.c:411
 msgid "Must specify a function to bind the key to"
 msgstr "Trebuie specificată o funcție la care se asociază tasta"
 
 #. TRANSLATORS: Do not translate the word "all".
-#: src/rcfile.c:476
+#: src/rcfile.c:421
 msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
 "Trebuie specificat un meniu (sau „all“) în care se asociază/anulează tasta"
 
-#: src/rcfile.c:483
+#: src/rcfile.c:428
 #, c-format
 msgid "Cannot map name \"%s\" to a function"
 msgstr "Imposibil de mapat numele „%s“ la o funcție"
 
-#: src/rcfile.c:490
+#: src/rcfile.c:435
 #, c-format
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "Imposibil de mapat numele „%s“ la un meniu"
 
-#: src/rcfile.c:522
+#: src/rcfile.c:467
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr "Funcția „%s“ nu există în meniul „%s“"
 
-#: src/rcfile.c:534
+#: src/rcfile.c:479
 #, c-format
 msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "Ne pare rău, tasta „%s“ nu poate fi reasociată"
 
-#: src/rcfile.c:631
+#: src/rcfile.c:576
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr "Eroare la extinderea %s: %s"
 
-#: src/rcfile.c:674
+#: src/rcfile.c:616
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1994,62 +2012,51 @@ msgstr ""
 "„negru“, cu prefixul opțional „bright“\n"
 "pentru culorile de fundal."
 
-#: src/rcfile.c:696
-msgid "Cannot add a color command without a syntax command"
-msgstr "Imposibil de adăugat o comandă de culoare fără o comandă de sintaxă"
+#: src/rcfile.c:637 src/rcfile.c:795 src/rcfile.c:858
+#, c-format
+msgid "A '%s' command requires a preceding 'syntax' command"
+msgstr ""
 
-#: src/rcfile.c:701
+#: src/rcfile.c:643
 msgid "Missing color name"
 msgstr "Lipsește numele culorii"
 
-#: src/rcfile.c:711 src/rcfile.c:872
-msgid "Missing regex string"
-msgstr "Lipsește șirul regex"
+#: src/rcfile.c:653 src/rcfile.c:807
+#, fuzzy, c-format
+msgid "Missing regex string after '%s' command"
+msgstr "Comanda de analiză statică lipsește"
 
-#: src/rcfile.c:787
+#: src/rcfile.c:719
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\" necesită un \"end=\" corespunzător"
 
-#: src/rcfile.c:839
+#: src/rcfile.c:768
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
 msgstr "Culoarea de fundal „%s“ nu poate fi bright"
 
-#: src/rcfile.c:867
-msgid "Cannot add a header regex without a syntax command"
-msgstr "Imposibil de adăugat un antet de regex fără o comandă de sintaxă"
-
-#: src/rcfile.c:922
-msgid "Cannot add a magic string regex without a syntax command"
-msgstr "Imposibil de adăugat un șir magic de regex fără o comandă de sintaxă"
-
-#: src/rcfile.c:927
-msgid "Missing magic string name"
-msgstr "Lipsește numele șiului magic"
-
-#: src/rcfile.c:985
-msgid "Cannot add a linter without a syntax command"
-msgstr "Imposibil de adăugat o analiză statică fără o comandă sintaxă"
+#: src/rcfile.c:802
+#, fuzzy, c-format
+msgid "The \"default\" syntax does not accept '%s' regexes"
+msgstr "Sintaxa „default” nu trebuie să aibă extensii"
 
-#: src/rcfile.c:990
-msgid "Missing linter command"
+#: src/rcfile.c:863
+#, fuzzy, c-format
+msgid "Missing command after '%s'"
 msgstr "Comanda de analiză statică lipsește"
 
-#: src/rcfile.c:1011
-msgid "Cannot add formatter without a syntax command"
-msgstr "Imposibil de adăugat utilitarul de formatare fără o comandă de sintaxă"
-
-#: src/rcfile.c:1016
-msgid "Missing formatter command"
-msgstr "Lipsește comanda utilitarului de formatare"
+#: src/rcfile.c:879
+#, fuzzy, c-format
+msgid "Argument of '%s' lacks closing \""
+msgstr "Argumentul „%s” are un \" neterminat"
 
-#: src/rcfile.c:1046
+#: src/rcfile.c:910
 #, c-format
 msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr ""
 "Eroare fatală: nu este asociată nici o tastă pentru funcția „%s”. Ieșire.\n"
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:912
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
@@ -2057,62 +2064,62 @@ msgstr ""
 "Dacă este nevoie, folosiți nano cu opțiunea -I pentru a ajusta setările "
 "voastre nanorc.\n"
 
-#: src/rcfile.c:1109
+#: src/rcfile.c:971
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "Nu s-a putut găsi sintaxa „%s” pentru extindere"
 
-#: src/rcfile.c:1125 src/rcfile.c:1134 src/rcfile.c:1144
-#, c-format
-msgid "Command \"%s\" not allowed in included file"
-msgstr "Comanda „%s” nu este permisă într-un fișier inclus"
-
-#: src/rcfile.c:1150 src/rcfile.c:1359
+#: src/rcfile.c:993 src/rcfile.c:1202
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Sintaxa „%s” nu are comenzi de colorare"
 
-#: src/rcfile.c:1180
+#: src/rcfile.c:1024
+#, c-format
+msgid "Command \"%s\" not allowed in included file"
+msgstr "Comanda „%s” nu este permisă într-un fișier inclus"
+
+#: src/rcfile.c:1039
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Comanda „%s” nu a fost înțeleasă"
 
-#: src/rcfile.c:1195
+#: src/rcfile.c:1051
 msgid "Missing option"
 msgstr "Lipsește opțiunea"
 
-#: src/rcfile.c:1217
+#: src/rcfile.c:1065
+#, c-format
+msgid "Unknown option \"%s\""
+msgstr "Opțiune „%s” necunoscută"
+
+#: src/rcfile.c:1077
+#, c-format
+msgid "Cannot unset option \"%s\""
+msgstr "Imposibil de dezactivat opțiunea „%s”"
+
+#: src/rcfile.c:1089
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Opțiunea „%s” necesită un argument"
 
-#: src/rcfile.c:1235
+#: src/rcfile.c:1105
 msgid "Option is not a valid multibyte string"
 msgstr "Opțiunea nu este un șir valid multioctet"
 
-#: src/rcfile.c:1272 src/rcfile.c:1300 src/rcfile.c:1309
+#: src/rcfile.c:1139 src/rcfile.c:1160 src/rcfile.c:1167
 msgid "Non-blank characters required"
 msgstr "Sunt necesare caractere care nu sunt goale"
 
-#: src/rcfile.c:1282
+#: src/rcfile.c:1146
 msgid "Two single-column characters required"
 msgstr "Sunt necesare două caractere (mono coloană)"
 
-#: src/rcfile.c:1348
-#, c-format
-msgid "Cannot unset option \"%s\""
-msgstr "Imposibil de dezactivat opțiunea „%s”"
-
-#: src/rcfile.c:1354
-#, c-format
-msgid "Unknown option \"%s\""
-msgstr "Opțiune „%s” necunoscută"
-
-#: src/rcfile.c:1413
+#: src/rcfile.c:1258
 msgid "I can't find my home directory!  Wah!"
 msgstr "Nu pot găsi directorul meu home!  Uau!"
 
-#: src/rcfile.c:1451
+#: src/rcfile.c:1295
 #, c-format
 msgid ""
 "\n"
@@ -2121,44 +2128,49 @@ msgstr ""
 "\n"
 "Apăsați Enter pentru a continua pornirea nano.\n"
 
-#: src/search.c:96
+#: src/search.c:95
 #, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "„%.*s%s” nu a fost găsit"
 
 #. TRANSLATORS: The next three strings are modifiers of the search prompt.
-#: src/search.c:176
+#: src/search.c:169
 msgid " [Case Sensitive]"
 msgstr " [Sensibil la majuscule]"
 
-#: src/search.c:180
+#: src/search.c:173
 msgid " [Regexp]"
 msgstr " [Regexp]"
 
-#: src/search.c:184
+#: src/search.c:177
 msgid " [Backwards]"
 msgstr " [ÃŽnapoi]"
 
 #. TRANSLATORS: The next two strings are modifiers of the search prompt.
-#: src/search.c:189
+#: src/search.c:182
 msgid " (to replace) in selection"
 msgstr " (de înlocuit) în selecție"
 
-#: src/search.c:191
+#: src/search.c:184
 msgid " (to replace)"
 msgstr " (de înlocuit)"
 
+#: src/search.c:305
+#, fuzzy
+msgid "Searching..."
+msgstr "Caută"
+
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:718
+#: src/search.c:693
 msgid "Replace this instance?"
 msgstr "Se înlocuiește această apariție?"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:883
+#: src/search.c:840
 msgid "Replace with"
 msgstr "Se înlocuiește cu"
 
-#: src/search.c:924
+#: src/search.c:875
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
@@ -2167,299 +2179,412 @@ msgstr[1] "S-au înlocuit %lu apariții"
 msgstr[2] "S-au înlocuit %lu de apariții"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:964
+#: src/search.c:914
 msgid "Enter line number, column number"
 msgstr "Introduceți numărul liniei, numărul coloanei"
 
-#: src/search.c:991
+#: src/search.c:939
 msgid "Invalid line or column number"
 msgstr "Număr de rând sau coloană nevalid"
 
-#: src/search.c:1124
+#: src/search.c:1080
 msgid "Not a bracket"
 msgstr "Nu este o paranteză"
 
-#: src/search.c:1191
+#: src/search.c:1146
 msgid "No matching bracket"
 msgstr "Nu am găsit o paranteză pereche"
 
-#: src/text.c:54
+#: src/text.c:53
 msgid "Mark Set"
 msgstr "Marcaj aplicat"
 
-#: src/text.c:58
+#: src/text.c:57
 msgid "Mark Unset"
 msgstr "Marcaj ridicat"
 
-#: src/text.c:70
+#: src/text.c:69
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Eroare la apelarea „%s”"
 
-#: src/text.c:475
-msgid "Nothing in undo buffer!"
-msgstr "Nici o operație de anulat!"
+#: src/text.c:468
+msgid "Commenting is not supported for this file type"
+msgstr ""
 
-#: src/text.c:481 src/text.c:634
-#, c-format
-msgid "Internal error: can't match line %d.  Please save your work."
+#: src/text.c:484
+msgid "Cannot comment past end of file"
 msgstr ""
-"Eroare internă: nu se poate găsi o potrivire pentru rândul %d. Vă rugăm să "
-"salvați fișierul."
+
+#: src/text.c:677
+msgid "Nothing in undo buffer!"
+msgstr "Nici o operație de anulat!"
 
 #. TRANSLATORS: Eight of the next nine strings describe actions
 #. * that are undone or redone.  It are all nouns, not verbs.
-#: src/text.c:495 src/text.c:524 src/text.c:645 src/text.c:686
+#: src/text.c:695 src/text.c:724 src/text.c:857 src/text.c:898
 msgid "text add"
 msgstr "adăugare de text"
 
-#: src/text.c:505 src/text.c:656
+#: src/text.c:705 src/text.c:868
 msgid "text delete"
 msgstr "ștergere de text"
 
-#: src/text.c:528 src/text.c:694
+#: src/text.c:728 src/text.c:907
 msgid "line join"
 msgstr "fuziune de rânduri"
 
-#: src/text.c:547 src/text.c:710
+#: src/text.c:747 src/text.c:923
 msgid "text cut"
 msgstr "decupare de text"
 
-#: src/text.c:552 src/text.c:714
+#: src/text.c:752 src/text.c:927
 msgid "text uncut"
 msgstr "lipire de text"
 
-#: src/text.c:558 src/text.c:691
+#: src/text.c:758 src/text.c:903
 msgid "Internal error: line is missing.  Please save your work."
 msgstr "Eroare internă: rândul lipsește. Vă rugăm să salvați fișierul."
 
-#: src/text.c:561 src/text.c:665
+#: src/text.c:762 src/text.c:877
 msgid "line break"
 msgstr "întrerupere rând"
 
-#: src/text.c:569 src/text.c:725
+#: src/text.c:772 src/text.c:947
+msgid "comment"
+msgstr ""
+
+#: src/text.c:776 src/text.c:951
+msgid "uncomment"
+msgstr ""
+
+#: src/text.c:780 src/text.c:938
 msgid "text insert"
 msgstr "inserare de text"
 
-#: src/text.c:589 src/text.c:718
+#: src/text.c:800 src/text.c:931
 msgid "text replace"
 msgstr "înlocuire de text"
 
-#: src/text.c:596 src/text.c:732 src/text.c:1030 src/text.c:1174
+#: src/text.c:807 src/text.c:955 src/text.c:1267 src/text.c:1437
 msgid "Internal error: unknown type.  Please save your work."
 msgstr "Eroare internă: tip necunoscut. Vă rugăm să salvați fișierul."
 
-#: src/text.c:601
+#: src/text.c:813
 #, c-format
 msgid "Undid action (%s)"
 msgstr "Acțiune anulată (%s)"
 
-#: src/text.c:619
+#: src/text.c:832
 msgid "Nothing to re-do!"
 msgstr "Nimic de refăcut!"
 
-#: src/text.c:628
+#: src/text.c:841
 msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
 "Eroare internă: nu se poate pregăti repetarea acțunilor. Vă rugăm să salvați "
 "fișierul."
 
-#: src/text.c:737
+#: src/text.c:961
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Acțiune refăcută (%s)"
 
-#: src/text.c:827 src/text.c:2508 src/text.c:2944
+#: src/text.c:1051 src/text.c:2765 src/text.c:3198
 msgid "Could not create pipe"
 msgstr "Nu am putut crea o țeavă"
 
-#: src/text.c:853 src/text.c:2595 src/text.c:2750 src/text.c:2992
-#: src/text.c:3286
+#: src/text.c:1077 src/text.c:2852 src/text.c:3005 src/text.c:3246
+#: src/text.c:3540
 msgid "Could not fork"
 msgstr "Nu am putut crea un proces nou"
 
-#: src/text.c:1853
+#: src/text.c:2117
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Șir greșit de citare %s: %s"
 
-#: src/text.c:2241
+#: src/text.c:2499
 msgid "Can now UnJustify!"
 msgstr "Acum este posibilă de-alinierea!"
 
-#: src/text.c:2435
+#: src/text.c:2697
 msgid "Edit a replacement"
 msgstr "Editează o înlocuire"
 
-#: src/text.c:2510
+#. TRANSLATORS: Shown after fixing misspellings in one word.
+#: src/text.c:2713
+#, fuzzy
+msgid "Next word..."
+msgstr "Cuvântul următor"
+
+#: src/text.c:2767
 msgid "Creating misspelled word list, please wait..."
 msgstr "Se creează lista cuvintelor ortografiate greșit, vă rog așteptați..."
 
-#: src/text.c:2601 src/text.c:2999
+#: src/text.c:2858 src/text.c:3253
 msgid "Could not get size of pipe buffer"
 msgstr "Nu am putut obține dimensiunea spațiului țeavă"
 
-#: src/text.c:2652
+#: src/text.c:2907
 msgid "Error invoking \"spell\""
 msgstr "Eroare la apelarea „spell”"
 
-#: src/text.c:2655
+#: src/text.c:2910
 msgid "Error invoking \"sort -f\""
 msgstr "Eroare la apelarea „sort -f”"
 
-#: src/text.c:2658
+#: src/text.c:2913
 msgid "Error invoking \"uniq\""
 msgstr "Eroare la apelarea „uniq”"
 
-#: src/text.c:2881
+#: src/text.c:3135
 msgid "Invoking spell checker, please wait"
 msgstr "Se apelează corectorul ortografic, vă rugăm așteptați"
 
-#: src/text.c:2897
+#: src/text.c:3151
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Corectarea ortografică a eșuat: %s"
 
-#: src/text.c:2899
+#: src/text.c:3153
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Verificarea ortografiei a eșuat: %s: %s"
 
-#: src/text.c:2902
+#: src/text.c:3156
 msgid "Finished checking spelling"
 msgstr "Verificarea ortografică s-a terminat"
 
-#: src/text.c:2927
+#: src/text.c:3181
 msgid "No linter defined for this type of file!"
 msgstr "Nu este definit nici un analizor static pentru acest tip de fișiere!"
 
-#: src/text.c:2932
+#: src/text.c:3186
 msgid "Save modified buffer before linting?"
 msgstr "Se salvează spațiul modificat înainte de analiza statică?"
 
-#: src/text.c:2949
+#: src/text.c:3203
 msgid "Invoking linter, please wait"
 msgstr "Se lansează analiza statică, vă rugăm așteptați"
 
-#: src/text.c:3105
+#: src/text.c:3358
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr "Comanda „%s” nu a produs niciun rând analizabil"
 
-#: src/text.c:3134
+#: src/text.c:3388
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
 "Acest mesaj este pentru fișierul nedeschis %s, se deschide într-un spațiu "
 "nou?"
 
-#: src/text.c:3153
+#: src/text.c:3407
 msgid "No more errors in unopened files, cancelling"
 msgstr "Nu mai sunt erori în fișierele nedeschise, se renunță"
 
-#: src/text.c:3192
+#: src/text.c:3446
 msgid "At last message"
 msgstr "Ultimul mesaj"
 
-#: src/text.c:3197
+#: src/text.c:3451
 msgid "At first message"
 msgstr "Primul mesaj"
 
-#: src/text.c:3237
+#: src/text.c:3491
 msgid "Finished"
 msgstr "Finalizat"
 
-#: src/text.c:3259
+#: src/text.c:3513
 msgid "Invoking formatter, please wait"
 msgstr "Se apelează utilitarul de formatare, vă rugăm așteptați"
 
-#: src/text.c:3314
+#: src/text.c:3568
 msgid "Finished formatting"
 msgstr "Formatarea s-a finalizat"
 
-#: src/text.c:3396
+#: src/text.c:3650
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sCuvinte: %lu  Linii: %ld  Caractere: %lu"
 
-#: src/text.c:3397
+#: src/text.c:3651
 msgid "In Selection:  "
 msgstr "În selecție:  "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3411
+#: src/text.c:3665
 msgid "Verbatim Input"
 msgstr "Intrare Verbatim"
 
-#: src/utils.c:391 src/utils.c:403
+#: src/utils.c:392 src/utils.c:404
 msgid "nano is out of memory!"
 msgstr "nano nu mai are memorie!"
 
+#: src/utils.c:625
+#, c-format
+msgid "Internal error: can't match line %d.  Please save your work."
+msgstr ""
+"Eroare internă: nu se poate găsi o potrivire pentru rândul %d. Vă rugăm să "
+"salvați fișierul."
+
+#. TRANSLATORS: This refers to a sequence of escape codes
+#. * (from the keyboard) that nano does not know about.
+#: src/winio.c:1121
+msgid "Unknown sequence"
+msgstr ""
+
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
 #: src/winio.c:1427
 msgid "Unicode Input"
 msgstr "Intrare Unicode"
 
-#: src/winio.c:1991 src/winio.c:1995
-msgid "Modified"
-msgstr "Modificat"
-
-#: src/winio.c:1992
-msgid "View"
-msgstr "Vedere"
-
-#: src/winio.c:2006
+#: src/winio.c:1960
 msgid "DIR:"
 msgstr "DIR:"
 
-#: src/winio.c:2013
+#: src/winio.c:1968
 msgid "File:"
 msgstr "Fișier:"
 
-#: src/winio.c:3141
+#: src/winio.c:1972 src/winio.c:1976
+msgid "Modified"
+msgstr "Modificat"
+
+#: src/winio.c:1974
+msgid "View"
+msgstr "Vedere"
+
+#: src/winio.c:3105
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr ""
 "rândul %ld/%ld (%d%%), coloana %lu/%lu (%d%%), caracterul %lu/%lu (%d%%)"
 
-#: src/winio.c:3271
+#: src/winio.c:3235
 msgid "The nano text editor"
 msgstr "Editorul de texte nano"
 
-#: src/winio.c:3272
+#: src/winio.c:3236
 msgid "version"
 msgstr "versiune"
 
-#: src/winio.c:3273
+#: src/winio.c:3237
 msgid "Brought to you by:"
 msgstr "Prezentat de:"
 
-#: src/winio.c:3274
+#: src/winio.c:3238
 msgid "Special thanks to:"
 msgstr "Mulțumiri speciale pentru:"
 
-#: src/winio.c:3275
+#: src/winio.c:3239
 msgid "The Free Software Foundation"
 msgstr "Fundația Free Software"
 
-#: src/winio.c:3276
+#: src/winio.c:3240
 msgid "the many translators and the TP"
 msgstr "traducătorilor cei mulți și pentru TP"
 
-#: src/winio.c:3277
+#: src/winio.c:3241
 msgid "For ncurses:"
 msgstr "Pentru ncurses:"
 
-#: src/winio.c:3278
+#: src/winio.c:3242
 msgid "and anyone else we forgot..."
 msgstr "și oricine altcineva a fost uitat..."
 
-#: src/winio.c:3279
+#: src/winio.c:3243
 msgid "Thank you for using nano!"
 msgstr "Vă mulțumim că folosiți nano!"
 
+#~ msgid ""
+#~ "Read %lu line (Converted from DOS and Mac format - Warning: No write "
+#~ "permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from DOS and Mac format - Warning: No write "
+#~ "permission)"
+#~ msgstr[0] ""
+#~ "S-a citit %lu rând (Convertită din formatul DOS și Mac - Avertizare: fără "
+#~ "permisiune la scriere)"
+#~ msgstr[1] ""
+#~ "S-au citit %lu rânduri (Convertite din formatul DOS și Mac - Avertizare: "
+#~ "fără permisiune la scriere)"
+#~ msgstr[2] ""
+#~ "S-au citit %lu de rânduri (Convertite din formatul DOS și Mac - "
+#~ "Avertizare: fără permisiune la scriere)"
+
+#~ msgid ""
+#~ "Read %lu line (Converted from Mac format - Warning: No write permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from Mac format - Warning: No write permission)"
+#~ msgstr[0] ""
+#~ "S-a citit %lu rând (Convertită din formatul Mac - Avertizare: fără "
+#~ "permisiune la scriere)"
+#~ msgstr[1] ""
+#~ "S-au citit %lu rânduri (Convertite din formatul Mac - Avertizare: fără "
+#~ "permisiune la scriere)"
+#~ msgstr[2] ""
+#~ "S-au citit %lu de rânduri (Convertite din formatul Mac - Avertizare: fără "
+#~ "permisiune la scriere)"
+
+#~ msgid ""
+#~ "Read %lu line (Converted from DOS format - Warning: No write permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from DOS format - Warning: No write permission)"
+#~ msgstr[0] ""
+#~ "S-a citit %lu rând (Convertită din formatul DOS - Avertizare: fără "
+#~ "permisiune la scriere)"
+#~ msgstr[1] ""
+#~ "S-au citit %lu rânduri (Convertite din formatul DOS - Avertizare: fără "
+#~ "permisiune la scriere)"
+#~ msgstr[2] ""
+#~ "S-au citit %lu de rânduri (Convertite din formatul DOS - Avertizare: fără "
+#~ "permisiune la scriere)"
+
+#~ msgid "Read %lu line (Warning: No write permission)"
+#~ msgid_plural "Read %lu lines (Warning: No write permission)"
+#~ msgstr[0] "S-a citit %lu rând (Avertizare: fără permisiune la scriere)"
+#~ msgstr[1] "S-au citit %lu rânduri (Avertizare: fără permisiune la scriere)"
+#~ msgstr[2] ""
+#~ "S-au citit %lu de rânduri (Avertizare: fără permisiune la scriere)"
+
+#~ msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
+#~ msgstr ""
+#~ "Se salvează spațiul modificat? (prin răspunsul „Nu” se vor PIERDE "
+#~ "modificările!) "
+
+#~ msgid "Unknown Command"
+#~ msgstr "Comandă necunoscută"
+
+#~ msgid "Cannot add a color command without a syntax command"
+#~ msgstr "Imposibil de adăugat o comandă de culoare fără o comandă de sintaxă"
+
+#~ msgid "Missing regex string"
+#~ msgstr "Lipsește șirul regex"
+
+#~ msgid "Cannot add a header regex without a syntax command"
+#~ msgstr "Imposibil de adăugat un antet de regex fără o comandă de sintaxă"
+
+#~ msgid "Cannot add a magic string regex without a syntax command"
+#~ msgstr ""
+#~ "Imposibil de adăugat un șir magic de regex fără o comandă de sintaxă"
+
+#~ msgid "Missing magic string name"
+#~ msgstr "Lipsește numele șiului magic"
+
+#~ msgid "Cannot add a linter without a syntax command"
+#~ msgstr "Imposibil de adăugat o analiză statică fără o comandă sintaxă"
+
+#~ msgid "Cannot add formatter without a syntax command"
+#~ msgstr ""
+#~ "Imposibil de adăugat utilitarul de formatare fără o comandă de sintaxă"
+
+#~ msgid "Missing formatter command"
+#~ msgstr "Lipsește comanda utilitarului de formatare"
+
 #~ msgid "Cannot prepend or append to a symlink with --nofollow set"
 #~ msgstr "Imposibil de adăugat la o legătură simbolică cu setarea --nofollow"
 
diff --git a/po/ru.po b/po/ru.po
index fd5d4d6a..62e49098 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 2.3.3pre2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-25 16:41-0500\n"
+"POT-Creation-Date: 2016-06-17 15:41+0200\n"
 "PO-Revision-Date: 2014-05-27 08:39+0200\n"
 "Last-Translator: Pavel Maryanov <acid@jack.kiev.ua>\n"
 "Language-Team: Russian <gnu@mx.ru>\n"
@@ -22,161 +22,179 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Poedit 1.6.5\n"
 
+#: src/browser.c:144 src/browser.c:284 src/browser.c:334 src/files.c:996
+#: src/files.c:1003 src/files.c:1794 src/files.c:1919 src/files.c:1963
+#: src/files.c:1983 src/files.c:2099 src/files.c:3019 src/files.c:3242
+#: src/rcfile.c:540 src/rcfile.c:1280
+#, c-format
+msgid "Error reading %s: %s"
+msgstr "Ошибка чтения %s: %s"
+
 #. TRANSLATORS: This is a prompt.
-#: src/browser.c:220
+#: src/browser.c:247
 msgid "Go To Directory"
 msgstr "К каталогу"
 
-#: src/browser.c:227 src/browser.c:738 src/files.c:1174 src/files.c:2340
-#: src/nano.c:1120 src/search.c:202 src/search.c:290 src/search.c:895
-#: src/search.c:970 src/text.c:2935 src/text.c:3142
+#: src/browser.c:254 src/browser.c:723 src/files.c:1126 src/files.c:2292
+#: src/nano.c:1128 src/search.c:195 src/search.c:297 src/search.c:851
+#: src/search.c:918 src/text.c:3189 src/text.c:3396
 msgid "Cancelled"
 msgstr "Отменено"
 
-#: src/browser.c:253 src/browser.c:300
-#, c-format
-msgid "Can't go outside of %s in restricted mode"
+#. TRANSLATORS: This refers to the option --operatingdir,
+#. * not to --restricted.
+#: src/browser.c:274 src/browser.c:326
+#, fuzzy, c-format
+msgid "Can't go outside of %s in confined mode"
 msgstr "Не удаётся выйти за границы %s в ограниченном режиме"
 
-#: src/browser.c:264 src/browser.c:310 src/browser.c:326 src/files.c:1044
-#: src/files.c:1052 src/files.c:1844 src/files.c:1971 src/files.c:2016
-#: src/files.c:2037 src/files.c:2156 src/files.c:3062 src/files.c:3285
-#: src/rcfile.c:596 src/rcfile.c:1435
-#, c-format
-msgid "Error reading %s: %s"
-msgstr "Ошибка чтения %s: %s"
-
-#: src/browser.c:290
+#: src/browser.c:317
 msgid "Can't move up a directory"
 msgstr "Не удаётся переместить каталог"
 
 #. TRANSLATORS: Try to keep this at most 7 characters.
-#: src/browser.c:615 src/browser.c:623
+#: src/browser.c:590 src/browser.c:598
 msgid "(dir)"
 msgstr "(каталог)"
 
 #. TRANSLATORS: Try to keep this at most 12 characters.
-#: src/browser.c:620
+#: src/browser.c:595
 msgid "(parent dir)"
 msgstr "(вверх)"
 
 #. TRANSLATORS: Try to keep this at most 7 characters.
 #. * If necessary, you can leave out the parentheses.
-#: src/browser.c:650
+#: src/browser.c:625
 msgid "(huge)"
 msgstr ""
 
 #. TRANSLATORS: This is the main search prompt.
-#: src/browser.c:727 src/search.c:173
+#: src/browser.c:712 src/search.c:166
 msgid "Search"
 msgstr "Поиск"
 
-#: src/browser.c:777 src/search.c:466 src/search.c:536
-msgid "This is the only occurrence"
-msgstr "Это единственное совпадение"
-
-#: src/browser.c:793 src/search.c:364
+#: src/browser.c:754 src/search.c:368
 msgid "Search Wrapped"
 msgstr "Поиск завёрнут"
 
-#: src/browser.c:843 src/search.c:517
+#: src/browser.c:764 src/search.c:509
+msgid "This is the only occurrence"
+msgstr "Это единственное совпадение"
+
+#: src/browser.c:812 src/search.c:473
 msgid "No current search pattern"
 msgstr "Нечего искать"
 
-#: src/files.c:50
+#: src/color.c:186
+#, fuzzy, c-format
+msgid "Unknown syntax name: %s"
+msgstr "Отсутствует название синтаксиса"
+
+#: src/color.c:247
+#, c-format
+msgid "magic_load() failed: %s"
+msgstr ""
+
+#: src/color.c:251
+#, c-format
+msgid "magic_file(%s) failed: %s"
+msgstr ""
+
+#: src/files.c:47
 #, c-format
 msgid "Directory '%s' does not exist"
 msgstr ""
 
-#: src/files.c:52
+#: src/files.c:49
 #, c-format
 msgid "Path '%s': %s"
 msgstr ""
 
-#: src/files.c:54
+#: src/files.c:51
 #, fuzzy, c-format
 msgid "Path '%s' is not a directory"
 msgstr "Файл «%s» является каталогом"
 
-#: src/files.c:57
+#: src/files.c:53
 #, c-format
 msgid "Path '%s' is not accessible"
 msgstr ""
 
-#. TRANSLATORS: Try to keep this at most 76 characters.
-#: src/files.c:158
+#. TRANSLATORS: Keep the next ten messages at most 76 characters.
+#: src/files.c:148
 msgid ""
 "Warning: Modifying a file which is not locked, check directory permission?"
 msgstr ""
 "Предупреждение: Изменяя не заблокированный файл, проверять доступ к каталогу?"
 
-#: src/files.c:197
+#: src/files.c:187
 msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
 msgstr ""
 "Не удалось получить мой идентификатор пользователя для файла блокировки "
 "(ошибка getpwuid())"
 
-#: src/files.c:206
+#: src/files.c:196
 #, c-format
 msgid "Couldn't determine hostname for lock file: %s"
 msgstr "Не удалось определить имя компьютера для файла блокировки: %s"
 
-#: src/files.c:227 src/files.c:238 src/files.c:275 src/files.c:285
+#: src/files.c:216 src/files.c:225 src/files.c:262 src/files.c:272
 #, c-format
 msgid "Error writing lock file %s: %s"
 msgstr "Ошибка записи файла блокировки %s: %s"
 
-#: src/files.c:305
+#: src/files.c:291
 #, c-format
 msgid "Error deleting lock file %s: %s"
 msgstr "Ошибка удаления файла блокировки %s: %s"
 
-#: src/files.c:341
+#: src/files.c:325
 #, c-format
 msgid "Error opening lock file %s: %s"
 msgstr "Ошибка открытия файла блокировки %s: %s"
 
-#: src/files.c:353
+#: src/files.c:337
 #, c-format
 msgid "Error reading lock file %s: Not enough data read"
 msgstr "Ошибка чтения файла блокировки %s: Недостаточно данных прочитано"
 
 #. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
-#: src/files.c:371
+#: src/files.c:354
 #, c-format
 msgid "File %s is being edited (by %s with %s, PID %d); continue?"
 msgstr ""
 
-#: src/files.c:426
+#: src/files.c:430
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Не удаётся вставить файл снаружи %s"
 
-#: src/files.c:439 src/files.c:1038 src/rcfile.c:589 src/rcfile.c:1385
-#: src/rcfile.c:1426
+#: src/files.c:445 src/files.c:991 src/rcfile.c:533 src/rcfile.c:1230
+#: src/rcfile.c:1271
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "Файл «%s» является каталогом"
 
-#: src/files.c:441
+#: src/files.c:447
 #, fuzzy, c-format
 msgid "\"%s\" is not a normal file"
 msgstr "Файл «%s» является файлом устройства"
 
-#: src/files.c:566
+#: src/files.c:571
 msgid "No more open file buffers"
 msgstr "Нет больше открытых файловых буферов"
 
-#: src/files.c:582
+#: src/files.c:586
 #, c-format
 msgid "Switched to %s"
 msgstr "Переключено в %s"
 
-#: src/files.c:584 src/global.c:988 src/winio.c:2010
+#: src/files.c:588 src/global.c:1005 src/winio.c:1965
 msgid "New Buffer"
 msgstr "Новый буфер"
 
-#: src/files.c:943
+#. TRANSLATORS: Keep the next four messages at most 76 characters.
+#: src/files.c:913
 #, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
@@ -184,25 +202,7 @@ msgstr[0] "Прочитана %lu строка (преобразовано из
 msgstr[1] "Прочитано %lu строки (преобразовано из формата Mac и DOS)"
 msgstr[2] "Прочитано %lu строк (преобразовано из формата Mac и DOS)"
 
-#: src/files.c:948
-#, c-format
-msgid ""
-"Read %lu line (Converted from DOS and Mac format - Warning: No write "
-"permission)"
-msgid_plural ""
-"Read %lu lines (Converted from DOS and Mac format - Warning: No write "
-"permission)"
-msgstr[0] ""
-"Прочитана %lu строка (преобразовано из формата Mac и DOS; предупреждение: "
-"нет доступа на запись)"
-msgstr[1] ""
-"Прочитано %lu строки (преобразовано из формата Mac и DOS; предупреждение: "
-"нет доступа на запись)"
-msgstr[2] ""
-"Прочитано %lu строк (преобразовано из формата Mac и DOS; предупреждение: нет "
-"доступа на запись)"
-
-#: src/files.c:954
+#: src/files.c:919
 #, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
@@ -210,23 +210,7 @@ msgstr[0] "Прочитана %lu строка (преобразовано из
 msgstr[1] "Прочитано %lu строки (преобразовано из формата Mac)"
 msgstr[2] "Прочитано %lu строк (преобразовано из формата Mac)"
 
-#: src/files.c:958
-#, c-format
-msgid ""
-"Read %lu line (Converted from Mac format - Warning: No write permission)"
-msgid_plural ""
-"Read %lu lines (Converted from Mac format - Warning: No write permission)"
-msgstr[0] ""
-"Прочитана %lu строка (преобразовано из формата Mac; предупреждение: нет "
-"доступа на запись)"
-msgstr[1] ""
-"Прочитано %lu строки (преобразовано из формата Mac; предупреждение: нет "
-"доступа на запись)"
-msgstr[2] ""
-"Прочитано %lu строк (преобразовано из формата Mac; предупреждение: нет "
-"доступа на запись)"
-
-#: src/files.c:964
+#: src/files.c:925
 #, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
@@ -234,23 +218,7 @@ msgstr[0] "Прочитана %lu строка (преобразовано из
 msgstr[1] "Прочитано %lu строки (преобразовано из формата DOS)"
 msgstr[2] "Прочитано %lu строк (преобразовано из формата DOS)"
 
-#: src/files.c:968
-#, c-format
-msgid ""
-"Read %lu line (Converted from DOS format - Warning: No write permission)"
-msgid_plural ""
-"Read %lu lines (Converted from DOS format - Warning: No write permission)"
-msgstr[0] ""
-"Прочитана %lu строка (преобразовано из формата DOS; предупреждение: нет "
-"доступа на запись)"
-msgstr[1] ""
-"Прочитано %lu строки (преобразовано из формата DOS; предупреждение: нет "
-"доступа на запись)"
-msgstr[2] ""
-"Прочитано %lu строк (преобразовано из формата DOS; предупреждение: нет "
-"доступа на запись)"
-
-#: src/files.c:974
+#: src/files.c:930
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
@@ -258,90 +226,83 @@ msgstr[0] "Прочитана %lu строка"
 msgstr[1] "Прочитано %lu строки"
 msgstr[2] "Прочитано %lu строк"
 
-#: src/files.c:977
-#, fuzzy, c-format
-msgid "Read %lu line (Warning: No write permission)"
-msgid_plural "Read %lu lines (Warning: No write permission)"
-msgstr[0] "Прочитана %lu строка (предупреждение: нет доступа на запись)"
-msgstr[1] "Прочитаны %lu строки (предупреждение: нет доступа на запись)"
-msgstr[2] "Прочитано %lu строк (предупреждение: нет доступа на запись)"
-
-#: src/files.c:1019 src/files.c:1056
+#: src/files.c:974 src/files.c:1006
 msgid "Reading File"
 msgstr "Чтение файла"
 
-#: src/files.c:1025
+#: src/files.c:980
 msgid "New File"
 msgstr "Новый файл"
 
-#: src/files.c:1028
-#, c-format
-msgid "\"%s\" not found"
+#: src/files.c:983
+#, fuzzy, c-format
+msgid "File \"%s\" not found"
 msgstr "Файл «%s» не найден"
 
-#: src/files.c:1039 src/rcfile.c:590 src/rcfile.c:1386 src/rcfile.c:1427
+#: src/files.c:992 src/rcfile.c:534 src/rcfile.c:1231 src/rcfile.c:1272
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "Файл «%s» является файлом устройства"
 
-#: src/files.c:1133
+#: src/files.c:1083
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Команда для выполнения в новом буфере [от %s] "
 
-#: src/files.c:1135
+#: src/files.c:1085
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Команда для выполнения [от %s] "
 
-#: src/files.c:1142
+#: src/files.c:1092
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Файл для вставки в новый буфер [от %s] "
 
-#: src/files.c:1144
+#: src/files.c:1094
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Файл для вставки [от %s] "
 
-#: src/files.c:1389
+#: src/files.c:1338
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Недопустимая клавиша в немногобуферном режиме"
 
-#: src/files.c:1684
-msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+#: src/files.c:1632
+#, fuzzy
+msgid "Failed to write backup file; continue saving? (Say N if unsure.) "
 msgstr ""
 "Не удалось записать файл резервной копии, продолжить сохранение? (Ответьте Н "
 "- если не уверены)"
 
-#: src/files.c:1800
+#: src/files.c:1750
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Не удаётся записать за пределами %s"
 
-#: src/files.c:1885 src/files.c:1910 src/files.c:1928 src/files.c:1941
-#: src/files.c:1952 src/files.c:1981
+#: src/files.c:1833 src/files.c:1858 src/files.c:1876 src/files.c:1889
+#: src/files.c:1900 src/files.c:1928
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Ошибка записи файла резервной копии %s: %s"
 
-#: src/files.c:1886 src/nano.c:690
+#: src/files.c:1834 src/nano.c:692
 msgid "Too many backup files?"
 msgstr "Слишком много резервных файлов?"
 
-#: src/files.c:2026 src/text.c:2863 src/text.c:2875 src/text.c:3244
-#: src/text.c:3253
+#: src/files.c:1972 src/text.c:3117 src/text.c:3129 src/text.c:3498
+#: src/text.c:3507
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Ошибка записи временного файла: %s"
 
-#: src/files.c:2049 src/files.c:2068 src/files.c:2080 src/files.c:2104
-#: src/files.c:2121 src/files.c:2131 src/files.c:2164 src/files.c:2171
+#: src/files.c:1994 src/files.c:2013 src/files.c:2023 src/files.c:2047
+#: src/files.c:2064 src/files.c:2074 src/files.c:2106 src/files.c:2113
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Ошибка записи %s: %s"
 
-#: src/files.c:2200
+#: src/files.c:2154
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
@@ -349,64 +310,67 @@ msgstr[0] "Записана %lu строка"
 msgstr[1] "Записано %lu строки"
 msgstr[2] "Записано %lu строк"
 
-#: src/files.c:2299
+#: src/files.c:2249
 msgid " [DOS Format]"
 msgstr " [формат DOS]"
 
-#: src/files.c:2300
+#: src/files.c:2250
 msgid " [Mac Format]"
 msgstr " [формат Mac]"
 
-#: src/files.c:2302
+#: src/files.c:2252
 msgid " [Backup]"
 msgstr " [Копия]"
 
-#: src/files.c:2309
+#: src/files.c:2259
 msgid "Prepend Selection to File"
 msgstr "Добавить выделенное в начало файла"
 
-#: src/files.c:2310
+#: src/files.c:2260
 msgid "Append Selection to File"
 msgstr "Добавить выделенное в конец файла"
 
-#: src/files.c:2311
+#: src/files.c:2261
 msgid "Write Selection to File"
 msgstr "Записать выделенное в файл"
 
-#: src/files.c:2314
+#: src/files.c:2264
 msgid "File Name to Prepend to"
 msgstr "Имя файла для добавления (в конец)"
 
-#: src/files.c:2315
+#: src/files.c:2265
 msgid "File Name to Append to"
 msgstr "Имя файла для добавления (в начало)"
 
-#: src/files.c:2316
+#: src/files.c:2266
 msgid "File Name to Write"
 msgstr "Имя файла для записи"
 
-#: src/files.c:2349
+#: src/files.c:2301
 #, fuzzy
-msgid "Save modified buffer anyway ? "
+msgid "Save modified buffer anyway? "
 msgstr "Сохранить измененный буфер перед проверкой?"
 
-#: src/files.c:2457
-msgid "File exists, OVERWRITE ? "
-msgstr "Файл существует. ПЕРЕЗАПИСАТЬ? "
-
-#: src/files.c:2466
-msgid "Save file under DIFFERENT NAME ? "
+#: src/files.c:2412
+#, fuzzy
+msgid "Save file under DIFFERENT NAME? "
 msgstr "Записать файл под ДРУГИМ ИМЕНЕМ?"
 
-#: src/files.c:2480
-msgid "File was modified since you opened it, continue saving ? "
+#: src/files.c:2420
+#, fuzzy, c-format
+msgid "File \"%s\" exists; OVERWRITE? "
+msgstr "Файл существует. ПЕРЕЗАПИСАТЬ? "
+
+#: src/files.c:2441
+#, fuzzy
+msgid "File was modified since you opened it; continue saving? "
 msgstr "Файл был изменён после открытия. Продолжить сохранение?"
 
-#: src/files.c:2917
+#: src/files.c:2874
 msgid "(more)"
 msgstr "(ещё)"
 
-#: src/files.c:3004
+#: src/files.c:2959
 #, c-format
 msgid ""
 "\n"
@@ -415,7 +379,7 @@ msgstr ""
 "\n"
 "Нажмите ВВОД для продолжения.\n"
 
-#: src/files.c:3020
+#: src/files.c:2975
 #, fuzzy, c-format
 msgid ""
 "Unable to create directory %s: %s\n"
@@ -424,7 +388,7 @@ msgstr ""
 "Не удалось создать каталог %s: %s\n"
 "Он требуется для сохранения/загрузки истории поиска или позиции курсора\n"
 
-#: src/files.c:3026
+#: src/files.c:2982
 #, fuzzy, c-format
 msgid ""
 "Path %s is not a directory and needs to be.\n"
@@ -433,7 +397,7 @@ msgstr ""
 "Путь %s - не является каталогом, но должен им быть.\n"
 "Nano не сможет загрузить или сохранить историю поиска или позицию курсора\n"
 
-#: src/files.c:3045
+#: src/files.c:3002
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I tried to move\n"
@@ -442,7 +406,7 @@ msgstr ""
 "Обнаружен старый файл истории nano (%s), который я попытался переместить\n"
 "на новое место (%s), но произошла ошибка: %s"
 
-#: src/files.c:3049
+#: src/files.c:3006
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I moved\n"
@@ -453,728 +417,759 @@ msgstr ""
 "на новое место (%s)\n"
 "(смотрите в nano FAQ об этом изменении)"
 
-#: src/files.c:3132 src/files.c:3140 src/files.c:3164 src/files.c:3176
+#: src/files.c:3089 src/files.c:3097 src/files.c:3121 src/files.c:3133
 #, fuzzy, c-format
 msgid "Error writing %s: %s\n"
 msgstr "Ошибка записи %s: %s"
 
 #. TRANSLATORS: Try to keep the next fifteen strings at most 10 characters.
-#: src/global.c:480
+#: src/global.c:483
 msgid "Exit"
 msgstr "Выход"
 
-#: src/global.c:481
+#: src/global.c:484
 msgid "Close"
 msgstr "Закрыть"
 
-#: src/global.c:482
+#: src/global.c:485
 msgid "Uncut Text"
 msgstr "Отмен. вырезку"
 
-#: src/global.c:484
+#: src/global.c:487
 msgid "Unjustify"
 msgstr "Отмен. растяж."
 
-#: src/global.c:490
+#: src/global.c:493
 msgid "Read File"
 msgstr "ЧитФайл"
 
-#: src/global.c:491
+#: src/global.c:494
 msgid "Where Is"
 msgstr "Поиск"
 
-#: src/global.c:492
+#: src/global.c:495
 msgid "Replace"
 msgstr "Замена"
 
-#: src/global.c:493
+#: src/global.c:496
 msgid "Go To Line"
 msgstr "К строке"
 
-#: src/global.c:494
+#: src/global.c:497
 msgid "Prev Line"
 msgstr "Пред. строка"
 
-#: src/global.c:495
+#: src/global.c:498
 msgid "Next Line"
 msgstr "След. строка"
 
-#: src/global.c:496
+#: src/global.c:499
 msgid "Prev Page"
 msgstr "ПредCтр"
 
-#: src/global.c:497
+#: src/global.c:500
 msgid "Next Page"
 msgstr "СледCтр"
 
-#: src/global.c:499
+#: src/global.c:502
 msgid "Justify"
 msgstr "Выровнять"
 
-#: src/global.c:500
+#: src/global.c:503
 msgid "FullJstify"
 msgstr "Выровнять"
 
-#: src/global.c:502
+#: src/global.c:505
 msgid "Refresh"
 msgstr "Обновить"
 
 #. TRANSLATORS: Try to keep this string at most 12 characters.
-#: src/global.c:505
+#: src/global.c:508
 msgid "WhereIs Next"
 msgstr "Найти далее"
 
 #. TRANSLATORS: The next long series of strings are shortcut descriptions;
 #. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:512
+#: src/global.c:515
 msgid "Justify the current paragraph"
 msgstr "Выровнять текущий абзац"
 
-#: src/global.c:514
+#: src/global.c:517
 msgid "Cancel the current function"
 msgstr "Отменить текущую функцию"
 
-#: src/global.c:515
+#: src/global.c:518
 msgid "Display this help text"
 msgstr "Показать эту справку"
 
-#: src/global.c:518
+#: src/global.c:521
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Закрыть текущий буфер / Выйти из nano"
 
-#: src/global.c:520
+#: src/global.c:523
 msgid "Exit from nano"
 msgstr "Выход из nano"
 
-#: src/global.c:524
+#: src/global.c:527
 msgid "Write the current file to disk"
 msgstr "Записать текущий файл на диск"
 
-#: src/global.c:526
+#: src/global.c:529
 msgid "Insert another file into the current one"
 msgstr "Вставить другой файл в текущий"
 
-#: src/global.c:528
+#: src/global.c:531
 msgid "Search for a string or a regular expression"
 msgstr "Искать текст или регулярное выражение"
 
-#: src/global.c:531
+#: src/global.c:533
 msgid "Search for a string"
 msgstr "Искать текст"
 
-#: src/global.c:533
+#: src/global.c:534
+msgid "Refresh the file list"
+msgstr ""
+
+#: src/global.c:535
+#, fuzzy
+msgid "Go to lefthand column"
+msgstr "Перейти на указанный номер строки и столбца"
+
+#: src/global.c:536
+#, fuzzy
+msgid "Go to righthand column"
+msgstr "Перейти на указанный номер строки и столбца"
+
+#: src/global.c:538
 msgid "Go one screenful up"
 msgstr "Перейти на экран вверх"
 
-#: src/global.c:534
+#: src/global.c:539
 msgid "Go one screenful down"
 msgstr "Перейти на экран вниз"
 
-#: src/global.c:536
+#: src/global.c:541
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Вырезать текущую строку и сохранить её в буфере обмена"
 
-#: src/global.c:538
+#: src/global.c:543
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Вставить содержимое буфера обмена в текущую строку"
 
-#: src/global.c:539
+#: src/global.c:544
 msgid "Display the position of the cursor"
 msgstr "Показать положение курсора"
 
-#: src/global.c:541
+#: src/global.c:546
 msgid "Invoke the spell checker, if available"
 msgstr "Проверить орфографию, если доступно"
 
-#: src/global.c:543
+#: src/global.c:548
 msgid "Replace a string or a regular expression"
 msgstr "Заменить текст или регулярное выражение"
 
-#: src/global.c:544
+#: src/global.c:549
 msgid "Go to line and column number"
 msgstr "Перейти на указанный номер строки и столбца"
 
-#: src/global.c:546
+#: src/global.c:551
 msgid "Mark text starting from the cursor position"
 msgstr "Отметить текст от текущей позиции курсора"
 
-#: src/global.c:547
+#: src/global.c:552
 msgid "Repeat the last search"
 msgstr "Повторить последний поиск"
 
-#: src/global.c:549
+#: src/global.c:554
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "Копировать текущую строку и сохранить ее в буфере обмена"
 
-#: src/global.c:550
+#: src/global.c:555
 msgid "Indent the current line"
 msgstr "Увеличить отступ строки"
 
-#: src/global.c:551
+#: src/global.c:556
 msgid "Unindent the current line"
 msgstr "Уменьшить отступ строки"
 
-#: src/global.c:552
+#: src/global.c:558
+msgid "Comment/uncomment the current line or marked lines"
+msgstr ""
+
+#: src/global.c:560
 msgid "Undo the last operation"
 msgstr "Отменить последнее действие"
 
-#: src/global.c:553
+#: src/global.c:561
 msgid "Redo the last undone operation"
 msgstr "Повторить последнее отменённое действие"
 
-#: src/global.c:555
+#: src/global.c:563
 msgid "Go back one character"
 msgstr "Назад на один символ"
 
-#: src/global.c:556
+#: src/global.c:564
 msgid "Go forward one character"
 msgstr "Вперёд на один символ"
 
-#: src/global.c:558
+#: src/global.c:566
 msgid "Go back one word"
 msgstr "Назад на одно слово"
 
-#: src/global.c:559
+#: src/global.c:567
 msgid "Go forward one word"
 msgstr "Вперёд на одно слово"
 
-#: src/global.c:561
+#: src/global.c:569
 msgid "Go to previous line"
 msgstr "На предыдущую строку"
 
-#: src/global.c:562
+#: src/global.c:570
 msgid "Go to next line"
 msgstr "На следующую строку"
 
-#: src/global.c:563
+#: src/global.c:571
 msgid "Go to beginning of current line"
 msgstr "На начало текущей строки"
 
-#: src/global.c:564
+#: src/global.c:572
 msgid "Go to end of current line"
 msgstr "В конец текущей строки"
 
-#: src/global.c:567
+#: src/global.c:575
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "На начало текущего абзаца; потом следующего абзаца"
 
-#: src/global.c:569
+#: src/global.c:577
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr "В конец текущего абзаца; потом следующего абзаца"
 
-#: src/global.c:571
+#: src/global.c:579
 msgid "Go to the first line of the file"
 msgstr "На первую строку файла"
 
-#: src/global.c:572
+#: src/global.c:580
 msgid "Go to the last line of the file"
 msgstr "На последнюю строку файла"
 
-#: src/global.c:574
+#: src/global.c:582
 msgid "Go to the matching bracket"
 msgstr "На соответствующую скобку"
 
-#: src/global.c:576
+#: src/global.c:584
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "Прокрутить одну строку вверх, не перемещая курсор"
 
-#: src/global.c:578
+#: src/global.c:586
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "Прокрутить одну строку вниз, не перемещая курсор"
 
-#: src/global.c:581
+#: src/global.c:589
 msgid "Switch to the previous file buffer"
 msgstr "Перейти в предыдущий буфер"
 
-#: src/global.c:582
+#: src/global.c:590
 msgid "Switch to the next file buffer"
 msgstr "Перейти в следующий буфер"
 
-#: src/global.c:584
+#: src/global.c:592
 msgid "Insert the next keystroke verbatim"
 msgstr "Вставить следующую комбинацию клавиш как есть"
 
-#: src/global.c:585
+#: src/global.c:593
 msgid "Insert a tab at the cursor position"
 msgstr "Вставить табуляцию в позиции курсора"
 
-#: src/global.c:586
+#: src/global.c:594
 msgid "Insert a newline at the cursor position"
 msgstr "Вставить строку в позиции курсора"
 
-#: src/global.c:587
+#: src/global.c:595
 msgid "Delete the character under the cursor"
 msgstr "Удалить символ под курсором"
 
-#: src/global.c:589
+#: src/global.c:597
 msgid "Delete the character to the left of the cursor"
 msgstr "Удалить символ слева от курсора"
 
-#: src/global.c:592
+#: src/global.c:600
 #, fuzzy
 msgid "Cut backward from cursor to word start"
 msgstr "Вырезать от курсора до конца строки"
 
-#: src/global.c:594
+#: src/global.c:602
 #, fuzzy
 msgid "Cut forward from cursor to next word start"
 msgstr "Вырезать от курсора до конца строки"
 
-#: src/global.c:596
+#: src/global.c:604
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Вырезать от позиции курсора до конца файла"
 
-#: src/global.c:599
+#: src/global.c:607
 msgid "Justify the entire file"
 msgstr "Выровнять по ширине текущий абзац"
 
-#: src/global.c:603
+#: src/global.c:611
 msgid "Count the number of words, lines, and characters"
 msgstr "Подсчитать количество слов, строк и символов"
 
-#: src/global.c:606
+#: src/global.c:614
 msgid "Refresh (redraw) the current screen"
 msgstr "Обновить текущий экран"
 
-#: src/global.c:608
+#: src/global.c:616
 #, fuzzy
 msgid "Suspend the editor (if suspension is enabled)"
 msgstr "Приостановить редактор (если включено)"
 
-#: src/global.c:610
+#: src/global.c:618
 msgid "Save file without prompting"
 msgstr ""
 
-#: src/global.c:611
+#: src/global.c:619
 msgid "Search next occurrence backward"
 msgstr ""
 
-#: src/global.c:612
+#: src/global.c:620
 msgid "Search next occurrence forward"
 msgstr ""
 
-#: src/global.c:614
+#: src/global.c:622
 msgid "Toggle the case sensitivity of the search"
 msgstr "Искать с учётом регистра"
 
-#: src/global.c:616
+#: src/global.c:624
 msgid "Reverse the direction of the search"
 msgstr "Изменить направление поиска"
 
-#: src/global.c:620
+#: src/global.c:628
 msgid "Toggle the use of regular expressions"
 msgstr "Использовать регулярные выражения"
 
-#: src/global.c:624
+#: src/global.c:632
 msgid "Recall the previous search/replace string"
 msgstr "Сбросить предыдущую строку поиска/замены"
 
-#: src/global.c:626
+#: src/global.c:634
 msgid "Recall the next search/replace string"
 msgstr "Сбросить следующую строку поиска/замены"
 
-#: src/global.c:629
+#: src/global.c:637
 msgid "Go to file browser"
 msgstr "Перейти в файловый браузер"
 
-#: src/global.c:632
+#: src/global.c:640
 msgid "Toggle the use of DOS format"
 msgstr "Использовать формат DOS"
 
-#: src/global.c:633
+#: src/global.c:641
 msgid "Toggle the use of Mac format"
 msgstr "Использовать формат Mac"
 
-#: src/global.c:634
+#: src/global.c:642
 msgid "Toggle appending"
 msgstr "Добавлять в конец"
 
-#: src/global.c:635
+#: src/global.c:643
 msgid "Toggle prepending"
 msgstr "Добавлять в начало"
 
-#: src/global.c:636
+#: src/global.c:644
 msgid "Toggle backing up of the original file"
 msgstr "Делать резервные копии оригинала"
 
-#: src/global.c:637
+#: src/global.c:645
 msgid "Execute external command"
 msgstr "Выполнить внешнюю команду"
 
-#: src/global.c:639
+#: src/global.c:647
 msgid "Close buffer without saving it"
 msgstr ""
 
-#: src/global.c:641
+#: src/global.c:649
 msgid "Toggle the use of a new buffer"
 msgstr "Использовать новый буфер"
 
-#: src/global.c:644
+#: src/global.c:652
 msgid "Exit from the file browser"
 msgstr "Выйти из файлового браузера"
 
-#: src/global.c:645
+#: src/global.c:653
 msgid "Go to the first file in the list"
 msgstr "Перейти к первому файлу в списке"
 
-#: src/global.c:646
+#: src/global.c:654
 msgid "Go to the last file in the list"
 msgstr "Перейти к последнему файлу в списке"
 
-#: src/global.c:647
+#: src/global.c:655
 msgid "Go to the previous file in the list"
 msgstr "Перейти к предыдущему файлу в списке"
 
-#: src/global.c:648
+#: src/global.c:656
 msgid "Go to the next file in the list"
 msgstr "Перейти к следующему файлу в списке"
 
-#: src/global.c:649
+#: src/global.c:657
 msgid "Go to directory"
 msgstr "Перейти к каталогу"
 
-#: src/global.c:652
+#: src/global.c:660
 msgid "Invoke the linter, if available"
 msgstr "Проверить синтаксис кода, если доступно"
 
-#: src/global.c:653
+#: src/global.c:661
 msgid "Go to previous linter msg"
 msgstr "На предыдущее сообщение"
 
-#: src/global.c:654
+#: src/global.c:662
 msgid "Go to next linter msg"
 msgstr "На следующее сообщение"
 
-#: src/global.c:656
+#: src/global.c:664
 #, fuzzy
 msgid "Invoke formatter, if available"
 msgstr "Проверить синтаксис кода, если доступно"
 
 #. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:671
+#: src/global.c:679
 msgid "Get Help"
 msgstr "Помощь"
 
-#: src/global.c:674 src/prompt.c:858
+#: src/global.c:682 src/prompt.c:855
 msgid "Cancel"
 msgstr "Отмена"
 
-#: src/global.c:687
+#: src/global.c:695
 msgid "Write Out"
 msgstr "Записать"
 
-#: src/global.c:723
+#: src/global.c:731
 msgid "Go To Dir"
 msgstr "Перейти к"
 
-#: src/global.c:738
+#: src/global.c:746
 msgid "Cut Text"
 msgstr "Вырезать"
 
-#: src/global.c:753
+#: src/global.c:761
 msgid "To Spell"
 msgstr "Словарь"
 
-#: src/global.c:757
+#: src/global.c:765
 msgid "To Linter"
 msgstr "Пров. синтак."
 
-#: src/global.c:760
+#: src/global.c:768
 #, fuzzy
 msgid "Formatter"
 msgstr "Формат DOS"
 
-#: src/global.c:767
+#: src/global.c:775
 msgid "Case Sens"
 msgstr "Уч.регистр"
 
-#: src/global.c:772
+#: src/global.c:780
 msgid "Regexp"
 msgstr "Рег.выраж."
 
-#: src/global.c:777
+#: src/global.c:785
 msgid "Backwards"
 msgstr "Назад"
 
-#: src/global.c:784
+#: src/global.c:792
 msgid "No Replace"
 msgstr "Не заменять"
 
-#: src/global.c:792
+#: src/global.c:800
 msgid "Cur Pos"
 msgstr "ТекПозиц"
 
-#: src/global.c:807
+#: src/global.c:815
 msgid "First Line"
 msgstr "ПервСтрока"
 
-#: src/global.c:809
+#: src/global.c:817
 msgid "Last Line"
 msgstr "ПослСтрока"
 
-#: src/global.c:816
+#: src/global.c:824
 msgid "To Bracket"
 msgstr "На скобку"
 
-#: src/global.c:819
+#: src/global.c:827
 msgid "Mark Text"
 msgstr "Отметить"
 
-#: src/global.c:822
+#: src/global.c:830
 msgid "Copy Text"
 msgstr "Копировать"
 
-#: src/global.c:825
+#: src/global.c:833
 msgid "Indent Text"
 msgstr "Отступ"
 
-#: src/global.c:827
+#: src/global.c:835
 msgid "Unindent Text"
 msgstr "ОтмОтступа"
 
-#: src/global.c:830
+#: src/global.c:838
 msgid "Undo"
 msgstr "Отмена"
 
-#: src/global.c:832
+#: src/global.c:840
 msgid "Redo"
 msgstr "Повтор"
 
-#: src/global.c:836 src/global.c:842
+#: src/global.c:844 src/global.c:850
 msgid "Back"
 msgstr "Назад"
 
-#: src/global.c:838 src/global.c:844
+#: src/global.c:846 src/global.c:852
 msgid "Forward"
 msgstr "Вперёд"
 
-#: src/global.c:849
+#: src/global.c:857
 msgid "Prev Word"
 msgstr "Пред. слово"
 
-#: src/global.c:851
+#: src/global.c:859
 msgid "Next Word"
 msgstr "След. слово"
 
-#: src/global.c:855
+#: src/global.c:863
 msgid "Home"
 msgstr "Начало"
 
-#: src/global.c:857
+#: src/global.c:865
 msgid "End"
 msgstr "Конец"
 
-#: src/global.c:866
+#: src/global.c:874
 msgid "Beg of Par"
 msgstr "НачПар"
 
-#: src/global.c:868
+#: src/global.c:876
 msgid "End of Par"
 msgstr "КонПар"
 
-#: src/global.c:873
+#: src/global.c:881
 msgid "Scroll Up"
 msgstr "Прокрутить вверх"
 
-#: src/global.c:875
+#: src/global.c:883
 msgid "Scroll Down"
 msgstr "Прокрутить вниз"
 
-#: src/global.c:880
+#: src/global.c:888
 msgid "Prev File"
 msgstr "Предыдущий файл"
 
-#: src/global.c:882
+#: src/global.c:890
 msgid "Next File"
 msgstr "Следующий файл"
 
-#: src/global.c:891
+#: src/global.c:899
 msgid "Verbatim"
 msgstr "Подробный"
 
-#: src/global.c:894
+#: src/global.c:902
 msgid "Tab"
 msgstr "Табуляция"
 
-#: src/global.c:896
+#: src/global.c:904
 msgid "Enter"
 msgstr "Ввод"
 
-#: src/global.c:899
+#: src/global.c:907
 msgid "Delete"
 msgstr "Удалить"
 
-#: src/global.c:901
+#: src/global.c:909
 msgid "Backspace"
 msgstr "Возврат каретки"
 
 #. TRANSLATORS: The next two strings refer to cutting words.
-#: src/global.c:912
+#: src/global.c:920
 #, fuzzy
 msgid "Cut Left"
 msgstr "Вырезать"
 
-#: src/global.c:914
+#: src/global.c:922
 msgid "Cut Right"
 msgstr ""
 
-#: src/global.c:916
+#: src/global.c:924
 msgid "CutTillEnd"
 msgstr "Обрез. до конца"
 
-#: src/global.c:926
+#: src/global.c:934
 msgid "Word Count"
 msgstr "Счётчик слов"
 
-#: src/global.c:933
+#: src/global.c:941
 msgid "Suspend"
 msgstr "Приостановка"
 
-#: src/global.c:937
+#: src/global.c:945
+#, fuzzy
+msgid "Comment Lines"
+msgstr "След. строка"
+
+#: src/global.c:949
 msgid "Save"
 msgstr ""
 
-#: src/global.c:940
+#: src/global.c:952
 msgid "Previous"
 msgstr ""
 
-#: src/global.c:942
+#: src/global.c:954
 #, fuzzy
 msgid "Next"
 msgstr "След. строка"
 
-#: src/global.c:948
+#: src/global.c:960
 msgid "PrevHstory"
 msgstr "ПредИстор"
 
-#: src/global.c:951
+#: src/global.c:963
 msgid "NextHstory"
 msgstr "СледИстор"
 
-#: src/global.c:955
+#: src/global.c:972
 msgid "Go To Text"
 msgstr "К строке"
 
-#: src/global.c:959
+#: src/global.c:976
 msgid "DOS Format"
 msgstr "Формат DOS"
 
-#: src/global.c:961
+#: src/global.c:978
 msgid "Mac Format"
 msgstr "Формат Mac"
 
-#: src/global.c:969
+#: src/global.c:986
 msgid "Append"
 msgstr "Доп. в начало"
 
-#: src/global.c:971
+#: src/global.c:988
 msgid "Prepend"
 msgstr "Доп. в конец"
 
-#: src/global.c:974
+#: src/global.c:991
 msgid "Backup File"
 msgstr "Резерв. копия"
 
-#: src/global.c:981
+#: src/global.c:998
 msgid "Execute Command"
 msgstr "Выполнить команду"
 
-#: src/global.c:996
+#: src/global.c:1013
 msgid "To Files"
 msgstr "К файлам"
 
-#: src/global.c:1004
+#: src/global.c:1021
 msgid "First File"
 msgstr "ПервыйФайл"
 
-#: src/global.c:1006
+#: src/global.c:1023
 msgid "Last File"
 msgstr "ПоследнФайл"
 
-#: src/global.c:1010
+#: src/global.c:1027
 msgid "Discard buffer"
 msgstr ""
 
+#: src/global.c:1038
+msgid "Left Column"
+msgstr ""
+
+#: src/global.c:1040
+msgid "Right Column"
+msgstr ""
+
 #. TRANSLATORS: Try to keep the next two strings at most 20 characters.
-#: src/global.c:1020
+#: src/global.c:1047
 msgid "Prev Lint Msg"
 msgstr "Пред. сообщ. пров."
 
-#: src/global.c:1022
+#: src/global.c:1049
 msgid "Next Lint Msg"
 msgstr "След. сообщ. пров."
 
 #. TRANSLATORS: The next seventeen strings are toggle descriptions;
 #. * they are best kept shorter than 40 characters, but may be longer.
-#: src/global.c:1285
+#: src/global.c:1316
 msgid "Help mode"
 msgstr "Режим справки"
 
-#: src/global.c:1287
+#: src/global.c:1318
 msgid "Constant cursor position display"
 msgstr "Отображение постоянного положения курсора"
 
-#: src/global.c:1289
+#: src/global.c:1320
 msgid "Use of one more line for editing"
 msgstr "Использование дополнительной строки для редактирования"
 
-#: src/global.c:1291
+#: src/global.c:1322
 msgid "Smooth scrolling"
 msgstr "Плавная прокрутка"
 
-#: src/global.c:1293
+#: src/global.c:1324
 msgid "Soft wrapping of overlong lines"
 msgstr "Мягкий перенос длинных строк"
 
-#: src/global.c:1295
+#: src/global.c:1326
 msgid "Whitespace display"
 msgstr "Отображение пробелов"
 
-#: src/global.c:1297
+#: src/global.c:1328
 msgid "Color syntax highlighting"
 msgstr "Подсветка синтаксиса"
 
-#: src/global.c:1299
+#: src/global.c:1330
 msgid "Smart home key"
 msgstr "Умная клавиша HOME"
 
-#: src/global.c:1301
+#: src/global.c:1332
 msgid "Auto indent"
 msgstr "Автоотступы"
 
-#: src/global.c:1303
+#: src/global.c:1334
 msgid "Cut to end"
 msgstr "Вырезать до конца"
 
-#: src/global.c:1305
+#: src/global.c:1336
 msgid "Hard wrapping of overlong lines"
 msgstr "Жесткий перенос длинных строк"
 
-#: src/global.c:1307
+#: src/global.c:1338
 msgid "Conversion of typed tabs to spaces"
 msgstr "Конвертация табуляций в пробелы"
 
-#: src/global.c:1309
+#: src/global.c:1340
 msgid "Backup files"
 msgstr "Резервные файлы"
 
-#: src/global.c:1311
+#: src/global.c:1342
 msgid "Reading file into separate buffer"
 msgstr ""
 
-#: src/global.c:1313
+#: src/global.c:1344
 msgid "Mouse support"
 msgstr "Поддержка мыши"
 
-#: src/global.c:1315
+#: src/global.c:1346
 msgid "No conversion from DOS/Mac format"
 msgstr "Без преобразования из формата DOS/Mac"
 
-#: src/global.c:1317
+#: src/global.c:1348
 msgid "Suspension"
 msgstr "Приостановка"
 
-#: src/help.c:209
+#: src/help.c:211
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1196,7 +1191,7 @@ msgstr ""
 "поиска. Если нажать клаишу ВВОД без редактирования текста, будет продолжен "
 "предыдущий поиск.  "
 
-#: src/help.c:218
+#: src/help.c:220
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1210,7 +1205,7 @@ msgstr ""
 " Следующие функциональные клавиши доступны в режиме поиска:\n"
 "\n"
 
-#: src/help.c:224
+#: src/help.c:226
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1230,7 +1225,7 @@ msgstr ""
 " Следующие функциональные клавиши доступны в режиме Перейти к строке:\n"
 "\n"
 
-#: src/help.c:233
+#: src/help.c:235
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1253,7 +1248,7 @@ msgstr ""
 "файла в отдельный буфер (используйте Meta-< and > для переключения между "
 "файловыми буферами).  "
 
-#: src/help.c:242
+#: src/help.c:244
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1267,7 +1262,7 @@ msgstr ""
 " Следующие функциональные клавиши доступны в режиме Вставка файла:\n"
 "\n"
 
-#: src/help.c:248
+#: src/help.c:250
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1294,7 +1289,7 @@ msgstr ""
 " Следующие клавиши доступны в режиме записи файла:\n"
 "\n"
 
-#: src/help.c:262
+#: src/help.c:264
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1319,7 +1314,7 @@ msgstr ""
 " Следующие функциональные клавиши доступны в просмотрщике файлов:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:277
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1345,7 +1340,7 @@ msgstr ""
 " Следующие функциональные клавиши доступны в режиме поиска:\n"
 "\n"
 
-#: src/help.c:284
+#: src/help.c:286
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1353,7 +1348,7 @@ msgstr ""
 " Следующие функциональные клавиши доступны в режиме Поиск просмотрщика:\n"
 "\n"
 
-#: src/help.c:288
+#: src/help.c:290
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1376,7 +1371,7 @@ msgstr ""
 "Просмотрщика:\n"
 "\n"
 
-#: src/help.c:301
+#: src/help.c:303
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1400,7 +1395,7 @@ msgstr ""
 " Следующие функциональные клавиши доступны в режиме проверки правописания:\n"
 "\n"
 
-#: src/help.c:316
+#: src/help.c:318
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1421,7 +1416,7 @@ msgstr ""
 " Следующие функциональные клавиши доступны в режиме Внешняя Команда:\n"
 "\n"
 
-#: src/help.c:329
+#: src/help.c:331
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1441,15 +1436,15 @@ msgstr ""
 "это главное окно редактирования, в котором отображен редактируемый файл. "
 "Строка состояния - 3 строка снизу - показывает разные важные сообщения.  "
 
-#: src/help.c:339
+#: src/help.c:341
+#, fuzzy
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
-" The notation for shortcuts is as follows: Control-key sequences are notated "
-"with a caret (^) symbol and can be entered either by using the Control "
-"(Ctrl) key or pressing the Escape (Esc) key twice.  Escape-key sequences are "
-"notated with the Meta (M-) symbol and can be entered using either the Esc, "
-"Alt, or Meta key depending on your keyboard setup.  "
+" Shortcuts are written as follows: Control-key sequences are notated with a "
+"'^' and can be entered either by using the Ctrl key or pressing the Esc key "
+"twice.  Meta-key sequences are notated with 'M-' and can be entered using "
+"either the Alt, Cmd, or Esc key, depending on your keyboard setup.  "
 msgstr ""
 "Две строки внизу показывают наиболее часто используемые комбинации клавиш.\n"
 "\n"
@@ -1477,21 +1472,21 @@ msgstr ""
 msgid "enable/disable"
 msgstr "разрешить/запретить"
 
-#: src/nano.c:559
+#: src/nano.c:560
 #, fuzzy
 msgid "Key is invalid in view mode"
 msgstr "Неверная клавиша в режиме просмотра"
 
-#: src/nano.c:565
+#: src/nano.c:566
 #, fuzzy
 msgid "This function is disabled in restricted mode"
 msgstr "Не удаётся выйти за границы %s в ограниченном режиме"
 
-#: src/nano.c:573
+#: src/nano.c:574
 msgid "Help is not available"
 msgstr ""
 
-#: src/nano.c:684
+#: src/nano.c:686
 #, c-format
 msgid ""
 "\n"
@@ -1500,7 +1495,7 @@ msgstr ""
 "\n"
 "Буфер записан в %s\n"
 
-#: src/nano.c:686
+#: src/nano.c:688
 #, c-format
 msgid ""
 "\n"
@@ -1509,7 +1504,7 @@ msgstr ""
 "\n"
 "Буфер не записан в %s: %s\n"
 
-#: src/nano.c:689
+#: src/nano.c:691
 #, c-format
 msgid ""
 "\n"
@@ -1772,17 +1767,22 @@ msgstr "Разрешить приостановку"
 msgid "Enable soft line wrapping"
 msgstr "Включить мягкий перенос строк"
 
-#: src/nano.c:937
-#, fuzzy, c-format
-msgid " GNU nano, version %s\n"
-msgstr " GNU nano версия %s (собрано %s, %s)\n"
-
 #: src/nano.c:940
 #, c-format
+msgid " nano, version %s\n"
+msgstr ""
+
+#: src/nano.c:943
+#, c-format
+msgid " (C) 2014..%s the contributors to nano\n"
+msgstr ""
+
+#: src/nano.c:945
+#, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr " Эл. почта: nano@nano-editor.org\tСайт: http://www.nano-editor.org/"
 
-#: src/nano.c:941
+#: src/nano.c:946
 #, c-format
 msgid ""
 "\n"
@@ -1791,67 +1791,82 @@ msgstr ""
 "\n"
 " Параметры сборки:"
 
-#: src/nano.c:1073
+#: src/nano.c:1081
 msgid "No file name"
 msgstr ""
 
-#: src/nano.c:1108
-msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
-msgstr "Сохранить изменённый буфер? (ИНАЧЕ ВСЕ ИЗМЕНЕНИЯ БУДУТ ПОТЕРЯНЫ)"
+#: src/nano.c:1115
+msgid "Save modified buffer?  (Answering \"No\" will DISCARD changes.) "
+msgstr ""
 
-#: src/nano.c:1168
+#: src/nano.c:1178
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "Не удалось повторно открыть стандартный ввод с клавиатуры\n"
 
-#: src/nano.c:1192
+#: src/nano.c:1202
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "Чтение из стандартного ввода. ^C для прерывания\n"
 
-#: src/nano.c:1256
+#: src/nano.c:1266
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Получен SIGHUP или SIGTERM\n"
 
-#: src/nano.c:1272
+#: src/nano.c:1282
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Используйте «fg» для возврата в nano\n"
 
-#: src/nano.c:1294
+#: src/nano.c:1304
 msgid "Suspension is not enabled"
 msgstr ""
 
-#: src/nano.c:1448
+#: src/nano.c:1459
 msgid "enabled"
 msgstr "включено"
 
-#: src/nano.c:1448
+#: src/nano.c:1459
 msgid "disabled"
 msgstr "отключено"
 
-#: src/nano.c:1607 src/winio.c:1125
-msgid "Unknown Command"
-msgstr "Неизвестная команда"
+#: src/nano.c:1573
+msgid "Unbound key"
+msgstr ""
 
-#: src/nano.c:1720
+#: src/nano.c:1577
+#, c-format
+msgid "Unbound key: M-%c"
+msgstr ""
+
+#: src/nano.c:1579
+#, c-format
+msgid "Unbound key: ^%c"
+msgstr ""
+
+#: src/nano.c:1581
+#, c-format
+msgid "Unbound key: %c"
+msgstr ""
+
+#: src/nano.c:1745
 msgid "XON ignored, mumble mumble"
 msgstr "XON проигнорирован, мр-бр-бр"
 
-#: src/nano.c:1725
+#: src/nano.c:1750
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF проигнорирован, мр-бр-бр"
 
-#: src/nano.c:2139 src/rcfile.c:1334
+#: src/nano.c:2166 src/rcfile.c:1187
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Запрошенный размер табуляции «%s» не подходит"
 
-#: src/nano.c:2200 src/rcfile.c:1259
+#: src/nano.c:2227 src/rcfile.c:1128
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Запрошенный размер заполнения «%s» не подходит"
 
-#: src/nano.c:2247
+#: src/nano.c:2276
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr "Введите «%s -h» для получения списка доступных опций.\n"
@@ -1859,117 +1874,121 @@ msgstr "Введите «%s -h» для получения списка дост
 #. TRANSLATORS: For the next three strings, if possible, specify
 #. * the single-byte shortcuts for both your language and English.
 #. * For example, in French: "OoYy" for "Oui".
-#: src/prompt.c:821
+#: src/prompt.c:818
 msgid "Yy"
 msgstr "YyДд"
 
-#: src/prompt.c:822
+#: src/prompt.c:819
 msgid "Nn"
 msgstr "NnНн"
 
-#: src/prompt.c:823
+#: src/prompt.c:820
 msgid "Aa"
 msgstr "AaВв"
 
-#: src/prompt.c:845
+#: src/prompt.c:842
 msgid "Yes"
 msgstr "Да"
 
-#: src/prompt.c:850
+#: src/prompt.c:847
 msgid "All"
 msgstr "Все"
 
-#: src/prompt.c:855
+#: src/prompt.c:852
 msgid "No"
 msgstr "Нет"
 
-#: src/rcfile.c:142
+#: src/rcfile.c:144
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Ошибка в позиции %s строки %lu: "
 
-#: src/rcfile.c:201
+#: src/rcfile.c:203
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "Аргумент «%s» имеет незакрытую \""
 
-#: src/rcfile.c:228 src/rcfile.c:280 src/rcfile.c:732 src/rcfile.c:793
-#: src/rcfile.c:882 src/rcfile.c:933
+#: src/rcfile.c:231 src/rcfile.c:674 src/rcfile.c:725 src/rcfile.c:824
 msgid "Regex strings must begin and end with a \" character"
 msgstr ""
 "Строки регулярных выражений должны начинаться и заканчиваться символом \""
 
-#: src/rcfile.c:254 src/search.c:62
+#: src/rcfile.c:257 src/search.c:61
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Плохое регулярное выражение «%s»: %s"
 
-#: src/rcfile.c:274
+#: src/rcfile.c:279
 msgid "Missing syntax name"
 msgstr "Отсутствует название синтаксиса"
 
-#: src/rcfile.c:345
+#: src/rcfile.c:288
+msgid "A syntax name must be quoted"
+msgstr ""
+
+#: src/rcfile.c:297
 msgid "The \"none\" syntax is reserved"
 msgstr "Синтаксис «none» зарезервирован"
 
-#: src/rcfile.c:352
-msgid "The \"default\" syntax must take no extensions"
+#: src/rcfile.c:327
+#, fuzzy
+msgid "The \"default\" syntax does not accept extensions"
 msgstr "Синтаксис «default» не должен иметь расширений"
 
-#: src/rcfile.c:424
+#: src/rcfile.c:369
 msgid "Missing key name"
 msgstr "Отсутствует название клавиши"
 
-#: src/rcfile.c:433 src/rcfile.c:444
+#: src/rcfile.c:378 src/rcfile.c:389
 msgid "Key name is too short"
 msgstr "Название ключа слишком короткое"
 
-#: src/rcfile.c:454
+#: src/rcfile.c:399
 msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr "Привязки клавиш должны начинаться с «^», «M» или «F»"
 
-#: src/rcfile.c:457
+#: src/rcfile.c:402
 #, fuzzy, c-format
 msgid "Key name %s is invalid"
 msgstr "Запрошенный размер табуляции «%s» не подходит"
 
-#: src/rcfile.c:466
+#: src/rcfile.c:411
 msgid "Must specify a function to bind the key to"
 msgstr "Укажите функцию, которой назначается клавиша"
 
 #. TRANSLATORS: Do not translate the word "all".
-#: src/rcfile.c:476
+#: src/rcfile.c:421
 msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
 "Вы должны указать имя меню (или «все») на которое нужно назначить/убрать "
 "назначение клавиши"
 
-#: src/rcfile.c:483
+#: src/rcfile.c:428
 #, c-format
 msgid "Cannot map name \"%s\" to a function"
 msgstr "Не удалось сопоставить имя «%s» к функции"
 
-#: src/rcfile.c:490
+#: src/rcfile.c:435
 #, c-format
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "Не удалось сопоставить имя «%s» к меню"
 
-#: src/rcfile.c:522
+#: src/rcfile.c:467
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr ""
 
-#: src/rcfile.c:534
+#: src/rcfile.c:479
 #, c-format
 msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "Привязка «%s» не может быть переназначена"
 
-#: src/rcfile.c:631
+#: src/rcfile.c:576
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr "Ошибка расширения %s: %s"
 
-#: src/rcfile.c:674
+#: src/rcfile.c:616
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1984,63 +2003,50 @@ msgstr ""
 "«black», с необязательным префиксом «bright»\n"
 "для цвета фона."
 
-#: src/rcfile.c:696
-msgid "Cannot add a color command without a syntax command"
-msgstr "Не удаётся добавить команду цвета без команды синтаксиса"
+#: src/rcfile.c:637 src/rcfile.c:795 src/rcfile.c:858
+#, c-format
+msgid "A '%s' command requires a preceding 'syntax' command"
+msgstr ""
 
-#: src/rcfile.c:701
+#: src/rcfile.c:643
 msgid "Missing color name"
 msgstr "Отсутствует название цвета"
 
-#: src/rcfile.c:711 src/rcfile.c:872
-msgid "Missing regex string"
-msgstr "Отсутствует регулярное выражение"
+#: src/rcfile.c:653 src/rcfile.c:807
+#, fuzzy, c-format
+msgid "Missing regex string after '%s' command"
+msgstr "Отсутствует команда анализатора синтаксиса"
 
-#: src/rcfile.c:787
+#: src/rcfile.c:719
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "«start=» требует соответствующего «end=»"
 
-#: src/rcfile.c:839
+#: src/rcfile.c:768
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
 msgstr "Цвет фона «%s» не может быть светлым"
 
-#: src/rcfile.c:867
-msgid "Cannot add a header regex without a syntax command"
-msgstr "Не удаётся добавить рег. выражение заголовка без команды синтаксиса"
-
-#: src/rcfile.c:922
-msgid "Cannot add a magic string regex without a syntax command"
-msgstr "Не удаётся добавить магическое рег. выражение без команды синтаксиса"
-
-#: src/rcfile.c:927
-msgid "Missing magic string name"
-msgstr "Отсутствует магическая строка"
-
-#: src/rcfile.c:985
-msgid "Cannot add a linter without a syntax command"
-msgstr "Не удаётся добавить анализатор синтаксиса без команды синтаксиса"
+#: src/rcfile.c:802
+#, fuzzy, c-format
+msgid "The \"default\" syntax does not accept '%s' regexes"
+msgstr "Синтаксис «default» не должен иметь расширений"
 
-#: src/rcfile.c:990
-msgid "Missing linter command"
+#: src/rcfile.c:863
+#, fuzzy, c-format
+msgid "Missing command after '%s'"
 msgstr "Отсутствует команда анализатора синтаксиса"
 
-#: src/rcfile.c:1011
-#, fuzzy
-msgid "Cannot add formatter without a syntax command"
-msgstr "Не удаётся добавить анализатор синтаксиса без команды синтаксиса"
-
-#: src/rcfile.c:1016
-#, fuzzy
-msgid "Missing formatter command"
-msgstr "Отсутствует команда анализатора синтаксиса"
+#: src/rcfile.c:879
+#, fuzzy, c-format
+msgid "Argument of '%s' lacks closing \""
+msgstr "Аргумент «%s» имеет незакрытую \""
 
-#: src/rcfile.c:1046
+#: src/rcfile.c:910
 #, c-format
 msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr "Критическая ошибка: для функции «%s» не назначены клавиши.  Выхожу.\n"
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:912
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
@@ -2048,62 +2054,62 @@ msgstr ""
 "Используйте nano с опцией -I, если требуется подстроить параметры вашего "
 "nanorc.\n"
 
-#: src/rcfile.c:1109
+#: src/rcfile.c:971
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "Не удалось сопоставить имя «%s» к расширению"
 
-#: src/rcfile.c:1125 src/rcfile.c:1134 src/rcfile.c:1144
-#, c-format
-msgid "Command \"%s\" not allowed in included file"
-msgstr "Команда «%s» не разрешена во включенном файле"
-
-#: src/rcfile.c:1150 src/rcfile.c:1359
+#: src/rcfile.c:993 src/rcfile.c:1202
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Синтаксис «%s» не имеет цветовых команд"
 
-#: src/rcfile.c:1180
+#: src/rcfile.c:1024
+#, c-format
+msgid "Command \"%s\" not allowed in included file"
+msgstr "Команда «%s» не разрешена во включенном файле"
+
+#: src/rcfile.c:1039
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Непонятная команда «%s»"
 
-#: src/rcfile.c:1195
+#: src/rcfile.c:1051
 msgid "Missing option"
 msgstr "Параметр отсутствует "
 
-#: src/rcfile.c:1217
+#: src/rcfile.c:1065
+#, c-format
+msgid "Unknown option \"%s\""
+msgstr "Неизвестная опция «%s»"
+
+#: src/rcfile.c:1077
+#, c-format
+msgid "Cannot unset option \"%s\""
+msgstr "Не удалось снять опцию «%s»"
+
+#: src/rcfile.c:1089
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Опция «%s» требует аргумент"
 
-#: src/rcfile.c:1235
+#: src/rcfile.c:1105
 msgid "Option is not a valid multibyte string"
 msgstr "Опция не правильная многобайтовая строка"
 
-#: src/rcfile.c:1272 src/rcfile.c:1300 src/rcfile.c:1309
+#: src/rcfile.c:1139 src/rcfile.c:1160 src/rcfile.c:1167
 msgid "Non-blank characters required"
 msgstr "Требуется не пустой символ"
 
-#: src/rcfile.c:1282
+#: src/rcfile.c:1146
 msgid "Two single-column characters required"
 msgstr "Требуется два однострочных символа"
 
-#: src/rcfile.c:1348
-#, c-format
-msgid "Cannot unset option \"%s\""
-msgstr "Не удалось снять опцию «%s»"
-
-#: src/rcfile.c:1354
-#, c-format
-msgid "Unknown option \"%s\""
-msgstr "Неизвестная опция «%s»"
-
-#: src/rcfile.c:1413
+#: src/rcfile.c:1258
 msgid "I can't find my home directory!  Wah!"
 msgstr "Не могу найти собственную домашнюю директорию! Йой!"
 
-#: src/rcfile.c:1451
+#: src/rcfile.c:1295
 #, c-format
 msgid ""
 "\n"
@@ -2112,44 +2118,49 @@ msgstr ""
 "\n"
 "Нажмите ВВОД для продолжения запуска nano.\n"
 
-#: src/search.c:96
+#: src/search.c:95
 #, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "«%.*s%s» не найден"
 
 #. TRANSLATORS: The next three strings are modifiers of the search prompt.
-#: src/search.c:176
+#: src/search.c:169
 msgid " [Case Sensitive]"
 msgstr " [С учётом регистра]"
 
-#: src/search.c:180
+#: src/search.c:173
 msgid " [Regexp]"
 msgstr " [РегВыр]"
 
-#: src/search.c:184
+#: src/search.c:177
 msgid " [Backwards]"
 msgstr " [Назад]"
 
 #. TRANSLATORS: The next two strings are modifiers of the search prompt.
-#: src/search.c:189
+#: src/search.c:182
 msgid " (to replace) in selection"
 msgstr " (что менять) в выделении"
 
-#: src/search.c:191
+#: src/search.c:184
 msgid " (to replace)"
 msgstr " (что менять)"
 
+#: src/search.c:305
+#, fuzzy
+msgid "Searching..."
+msgstr "Поиск"
+
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:718
+#: src/search.c:693
 msgid "Replace this instance?"
 msgstr "Заменить это вхождение?"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:883
+#: src/search.c:840
 msgid "Replace with"
 msgstr "Заменить на"
 
-#: src/search.c:924
+#: src/search.c:875
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
@@ -2158,300 +2169,378 @@ msgstr[1] "Замененные %lu вхождения"
 msgstr[2] "Заменено %lu вхождений"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:964
+#: src/search.c:914
 msgid "Enter line number, column number"
 msgstr "Введите номер строки и столбца"
 
-#: src/search.c:991
+#: src/search.c:939
 msgid "Invalid line or column number"
 msgstr "Неправильный номер строки или столбца"
 
-#: src/search.c:1124
+#: src/search.c:1080
 msgid "Not a bracket"
 msgstr "Не скобка"
 
-#: src/search.c:1191
+#: src/search.c:1146
 msgid "No matching bracket"
 msgstr "Нет соответствующей скобки"
 
-#: src/text.c:54
+#: src/text.c:53
 msgid "Mark Set"
 msgstr "Метка установлена"
 
-#: src/text.c:58
+#: src/text.c:57
 msgid "Mark Unset"
 msgstr "Метка снята"
 
-#: src/text.c:70
+#: src/text.c:69
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Ошибка выполнения «%s»"
 
-#: src/text.c:475
-msgid "Nothing in undo buffer!"
-msgstr "Буфер отмены действий пуст!"
+#: src/text.c:468
+msgid "Commenting is not supported for this file type"
+msgstr ""
 
-#: src/text.c:481 src/text.c:634
-#, c-format
-msgid "Internal error: can't match line %d.  Please save your work."
+#: src/text.c:484
+msgid "Cannot comment past end of file"
 msgstr ""
-"Внутренняя ошибка: не удаётся сопоставить строку %d. Сохраните свою работу."
+
+#: src/text.c:677
+msgid "Nothing in undo buffer!"
+msgstr "Буфер отмены действий пуст!"
 
 #. TRANSLATORS: Eight of the next nine strings describe actions
 #. * that are undone or redone.  It are all nouns, not verbs.
-#: src/text.c:495 src/text.c:524 src/text.c:645 src/text.c:686
+#: src/text.c:695 src/text.c:724 src/text.c:857 src/text.c:898
 msgid "text add"
 msgstr "добавление текста"
 
-#: src/text.c:505 src/text.c:656
+#: src/text.c:705 src/text.c:868
 msgid "text delete"
 msgstr "удаление текста"
 
-#: src/text.c:528 src/text.c:694
+#: src/text.c:728 src/text.c:907
 msgid "line join"
 msgstr "объединение строк"
 
-#: src/text.c:547 src/text.c:710
+#: src/text.c:747 src/text.c:923
 msgid "text cut"
 msgstr "обрезка текста"
 
-#: src/text.c:552 src/text.c:714
+#: src/text.c:752 src/text.c:927
 msgid "text uncut"
 msgstr "отмена обрезки текста"
 
-#: src/text.c:558 src/text.c:691
+#: src/text.c:758 src/text.c:903
 #, fuzzy
 msgid "Internal error: line is missing.  Please save your work."
 msgstr "Внутренняя ошибка: ошибка настройки повтора. Сохраните свою работу"
 
-#: src/text.c:561 src/text.c:665
+#: src/text.c:762 src/text.c:877
 msgid "line break"
 msgstr "новая строка"
 
-#: src/text.c:569 src/text.c:725
+#: src/text.c:772 src/text.c:947
+msgid "comment"
+msgstr ""
+
+#: src/text.c:776 src/text.c:951
+msgid "uncomment"
+msgstr ""
+
+#: src/text.c:780 src/text.c:938
 msgid "text insert"
 msgstr "вставка текста"
 
-#: src/text.c:589 src/text.c:718
+#: src/text.c:800 src/text.c:931
 msgid "text replace"
 msgstr "замена текста"
 
-#: src/text.c:596 src/text.c:732 src/text.c:1030 src/text.c:1174
+#: src/text.c:807 src/text.c:955 src/text.c:1267 src/text.c:1437
 msgid "Internal error: unknown type.  Please save your work."
 msgstr "Внутренняя ошибка: неизвестный тип. Сохраните свою работу"
 
-#: src/text.c:601
+#: src/text.c:813
 #, c-format
 msgid "Undid action (%s)"
 msgstr "Отменённое действие (%s)"
 
-#: src/text.c:619
+#: src/text.c:832
 msgid "Nothing to re-do!"
 msgstr "Нечего повторять!"
 
-#: src/text.c:628
+#: src/text.c:841
 msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
 "Внутренняя ошибка: ошибка настройки повторения изменения. Сохраните свою "
 "работу."
 
-#: src/text.c:737
+#: src/text.c:961
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Повторённое действие (%s)"
 
-#: src/text.c:827 src/text.c:2508 src/text.c:2944
+#: src/text.c:1051 src/text.c:2765 src/text.c:3198
 msgid "Could not create pipe"
 msgstr "Не удалось создать конвейер"
 
-#: src/text.c:853 src/text.c:2595 src/text.c:2750 src/text.c:2992
-#: src/text.c:3286
+#: src/text.c:1077 src/text.c:2852 src/text.c:3005 src/text.c:3246
+#: src/text.c:3540
 msgid "Could not fork"
 msgstr "Не удалось создать дочерний процесс"
 
-#: src/text.c:1853
+#: src/text.c:2117
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Недопустимая строка цитирования %s: %s"
 
-#: src/text.c:2241
+#: src/text.c:2499
 msgid "Can now UnJustify!"
 msgstr "Сейчас можно отменить выравнивание!"
 
-#: src/text.c:2435
+#: src/text.c:2697
 msgid "Edit a replacement"
 msgstr "Редактировать замену"
 
-#: src/text.c:2510
+#. TRANSLATORS: Shown after fixing misspellings in one word.
+#: src/text.c:2713
+#, fuzzy
+msgid "Next word..."
+msgstr "След. слово"
+
+#: src/text.c:2767
 msgid "Creating misspelled word list, please wait..."
 msgstr "Идёт создание списка ошибочных слов. Подождите..."
 
-#: src/text.c:2601 src/text.c:2999
+#: src/text.c:2858 src/text.c:3253
 msgid "Could not get size of pipe buffer"
 msgstr "Не удалось получить размер буфера конвейера"
 
-#: src/text.c:2652
+#: src/text.c:2907
 msgid "Error invoking \"spell\""
 msgstr "Ошибка выполнения «spell»"
 
-#: src/text.c:2655
+#: src/text.c:2910
 msgid "Error invoking \"sort -f\""
 msgstr "Ошибка выполнения «sort -f»"
 
-#: src/text.c:2658
+#: src/text.c:2913
 msgid "Error invoking \"uniq\""
 msgstr "Ошибка выполнения «uniq»"
 
-#: src/text.c:2881
+#: src/text.c:3135
 msgid "Invoking spell checker, please wait"
 msgstr "Запуск проверки орфографии, подождите"
 
-#: src/text.c:2897
+#: src/text.c:3151
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Проверка правописания не удалась: %s"
 
-#: src/text.c:2899
+#: src/text.c:3153
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Проверка правописания не удалась: %s: %s"
 
-#: src/text.c:2902
+#: src/text.c:3156
 msgid "Finished checking spelling"
 msgstr "Проверка правописания завершена"
 
-#: src/text.c:2927
+#: src/text.c:3181
 msgid "No linter defined for this type of file!"
 msgstr "Для данного типа файла не настроена программа проверки синтаксиса!"
 
-#: src/text.c:2932
+#: src/text.c:3186
 msgid "Save modified buffer before linting?"
 msgstr "Сохранить измененный буфер перед проверкой?"
 
-#: src/text.c:2949
+#: src/text.c:3203
 msgid "Invoking linter, please wait"
 msgstr "Запуск проверки, подождите"
 
-#: src/text.c:3105
+#: src/text.c:3358
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr "Получено 0 распознанных строк от комманды: %s"
 
-#: src/text.c:3134
+#: src/text.c:3388
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr "Это сообщение о не открытом файле %s, открыть его в новом буфере?"
 
-#: src/text.c:3153
+#: src/text.c:3407
 msgid "No more errors in unopened files, cancelling"
 msgstr ""
 
-#: src/text.c:3192
+#: src/text.c:3446
 msgid "At last message"
 msgstr "Последнее сообщение"
 
-#: src/text.c:3197
+#: src/text.c:3451
 msgid "At first message"
 msgstr "Первое сообщение"
 
-#: src/text.c:3237
+#: src/text.c:3491
 msgid "Finished"
 msgstr ""
 
-#: src/text.c:3259
+#: src/text.c:3513
 #, fuzzy
 msgid "Invoking formatter, please wait"
 msgstr "Запуск проверки, подождите"
 
-#: src/text.c:3314
+#: src/text.c:3568
 msgid "Finished formatting"
 msgstr ""
 
-#: src/text.c:3396
+#: src/text.c:3650
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sСлов: %lu  Строк: %ld  Символов: %lu"
 
-#: src/text.c:3397
+#: src/text.c:3651
 msgid "In Selection:  "
 msgstr "В выделении:  "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3411
+#: src/text.c:3665
 msgid "Verbatim Input"
 msgstr "Ввод «как есть»"
 
-#: src/utils.c:391 src/utils.c:403
+#: src/utils.c:392 src/utils.c:404
 msgid "nano is out of memory!"
 msgstr "Недостаточно памяти для nano!"
 
+#: src/utils.c:625
+#, c-format
+msgid "Internal error: can't match line %d.  Please save your work."
+msgstr ""
+"Внутренняя ошибка: не удаётся сопоставить строку %d. Сохраните свою работу."
+
+#. TRANSLATORS: This refers to a sequence of escape codes
+#. * (from the keyboard) that nano does not know about.
+#: src/winio.c:1121
+msgid "Unknown sequence"
+msgstr ""
+
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
 #: src/winio.c:1427
 msgid "Unicode Input"
 msgstr "Юникод код"
 
-#: src/winio.c:1991 src/winio.c:1995
-msgid "Modified"
-msgstr "Изменён"
-
-#: src/winio.c:1992
-msgid "View"
-msgstr "Смотр"
-
-#: src/winio.c:2006
+#: src/winio.c:1960
 msgid "DIR:"
 msgstr "Дир:"
 
-#: src/winio.c:2013
+#: src/winio.c:1968
 msgid "File:"
 msgstr "Файл:"
 
-#: src/winio.c:3141
+#: src/winio.c:1972 src/winio.c:1976
+msgid "Modified"
+msgstr "Изменён"
+
+#: src/winio.c:1974
+msgid "View"
+msgstr "Смотр"
+
+#: src/winio.c:3105
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "строка %ld/%ld (%d%%), столбец %lu/%lu (%d%%), символ %lu/%lu (%d%%)"
 
-#: src/winio.c:3271
+#: src/winio.c:3235
 msgid "The nano text editor"
 msgstr "Текстовый редактор nano"
 
-#: src/winio.c:3272
+#: src/winio.c:3236
 msgid "version"
 msgstr "версия"
 
-#: src/winio.c:3273
+#: src/winio.c:3237
 msgid "Brought to you by:"
 msgstr "Предоставлен вам:"
 
-#: src/winio.c:3274
+#: src/winio.c:3238
 msgid "Special thanks to:"
 msgstr "Особая благодарность:"
 
-#: src/winio.c:3275
+#: src/winio.c:3239
 msgid "The Free Software Foundation"
 msgstr ""
 "The Free Software Foundation (фонд свободного программного обеспечения)"
 
-#: src/winio.c:3276
+#: src/winio.c:3240
 msgid "the many translators and the TP"
 msgstr ""
 
-#: src/winio.c:3277
+#: src/winio.c:3241
 msgid "For ncurses:"
 msgstr "Для ncurses:"
 
-#: src/winio.c:3278
+#: src/winio.c:3242
 msgid "and anyone else we forgot..."
 msgstr ""
 "Дмитрию Рязанцеву за помощь в переводе и всем остальным, кого мы забыли "
 "упомянуть..."
 
-#: src/winio.c:3279
+#: src/winio.c:3243
 msgid "Thank you for using nano!"
 msgstr "Спасибо за то, что выбрали nano!"
 
+#~ msgid ""
+#~ "Read %lu line (Converted from DOS and Mac format - Warning: No write "
+#~ "permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from DOS and Mac format - Warning: No write "
+#~ "permission)"
+#~ msgstr[0] ""
+#~ "Прочитана %lu строка (преобразовано из формата Mac и DOS; предупреждение: "
+#~ "нет доступа на запись)"
+#~ msgstr[1] ""
+#~ "Прочитано %lu строки (преобразовано из формата Mac и DOS; предупреждение: "
+#~ "нет доступа на запись)"
+#~ msgstr[2] ""
+#~ "Прочитано %lu строк (преобразовано из формата Mac и DOS; предупреждение: "
+#~ "нет доступа на запись)"
+
+#~ msgid ""
+#~ "Read %lu line (Converted from Mac format - Warning: No write permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from Mac format - Warning: No write permission)"
+#~ msgstr[0] ""
+#~ "Прочитана %lu строка (преобразовано из формата Mac; предупреждение: нет "
+#~ "доступа на запись)"
+#~ msgstr[1] ""
+#~ "Прочитано %lu строки (преобразовано из формата Mac; предупреждение: нет "
+#~ "доступа на запись)"
+#~ msgstr[2] ""
+#~ "Прочитано %lu строк (преобразовано из формата Mac; предупреждение: нет "
+#~ "доступа на запись)"
+
+#~ msgid ""
+#~ "Read %lu line (Converted from DOS format - Warning: No write permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from DOS format - Warning: No write permission)"
+#~ msgstr[0] ""
+#~ "Прочитана %lu строка (преобразовано из формата DOS; предупреждение: нет "
+#~ "доступа на запись)"
+#~ msgstr[1] ""
+#~ "Прочитано %lu строки (преобразовано из формата DOS; предупреждение: нет "
+#~ "доступа на запись)"
+#~ msgstr[2] ""
+#~ "Прочитано %lu строк (преобразовано из формата DOS; предупреждение: нет "
+#~ "доступа на запись)"
+
+#~ msgid "Read %lu line ( Warning: No write permission)"
+#~ msgid_plural "Read %lu lines (Warning: No write permission)"
+#~ msgstr[0] "Прочитана %lu строка (предупреждение: нет доступа на запись)"
+#~ msgstr[1] "Прочитаны %lu строки (предупреждение: нет доступа на запись)"
+#~ msgstr[2] "Прочитано %lu строк (предупреждение: нет доступа на запись)"
+
 #~ msgid "Cannot prepend or append to a symlink with --nofollow set"
 #~ msgstr "Не удаётся дописать в начале или в конце с параметром --nofollow"
 
@@ -2467,9 +2556,37 @@ msgstr "Спасибо за то, что выбрали nano!"
 #~ msgid "Allow generic undo [EXPERIMENTAL]"
 #~ msgstr "Разрешить функцию отмены действий [ЭКСПЕРИМЕНТАЛЬНАЯ]"
 
+#~ msgid " GNU nano version %s (compiled %s, %s)\n"
+#~ msgstr " GNU nano версия %s (собрано %s, %s)\n"
+
 #~ msgid "Sorry, support for this function has been disabled"
 #~ msgstr "Поддержка этой функции была отключена"
 
+#~ msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
+#~ msgstr "Сохранить изменённый буфер? (ИНАЧЕ ВСЕ ИЗМЕНЕНИЯ БУДУТ ПОТЕРЯНЫ)"
+
+#~ msgid "Unknown Command"
+#~ msgstr "Неизвестная команда"
+
+#~ msgid "Cannot add a color command without a syntax command"
+#~ msgstr "Не удаётся добавить команду цвета без команды синтаксиса"
+
+#~ msgid "Missing regex string"
+#~ msgstr "Отсутствует регулярное выражение"
+
+#~ msgid "Cannot add a header regex without a syntax command"
+#~ msgstr "Не удаётся добавить рег. выражение заголовка без команды синтаксиса"
+
+#~ msgid "Cannot add a magic string regex without a syntax command"
+#~ msgstr ""
+#~ "Не удаётся добавить магическое рег. выражение без команды синтаксиса"
+
+#~ msgid "Missing magic string name"
+#~ msgstr "Отсутствует магическая строка"
+
+#~ msgid "Cannot add a linter without a syntax command"
+#~ msgstr "Не удаётся добавить анализатор синтаксиса без команды синтаксиса"
+
 #~ msgid "line wrap"
 #~ msgstr "перенос строки"
 
diff --git a/po/sl.po b/po/sl.po
index a7a39d61..d62d7dda 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 2.3.2pre4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-25 16:41-0500\n"
+"POT-Creation-Date: 2016-06-17 15:41+0200\n"
 "PO-Revision-Date: 2013-03-18 21:33+0100\n"
 "Last-Translator: Klemen Košir <klemen913@gmail.com>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
@@ -21,122 +21,139 @@ msgstr ""
 "%100==4 ? 3 : 0);\n"
 "X-Generator: Poedit 1.5.5\n"
 
+#: src/browser.c:144 src/browser.c:284 src/browser.c:334 src/files.c:996
+#: src/files.c:1003 src/files.c:1794 src/files.c:1919 src/files.c:1963
+#: src/files.c:1983 src/files.c:2099 src/files.c:3019 src/files.c:3242
+#: src/rcfile.c:540 src/rcfile.c:1280
+#, c-format
+msgid "Error reading %s: %s"
+msgstr "Napaka med branjem %s: %s"
+
 #. TRANSLATORS: This is a prompt.
-#: src/browser.c:220
+#: src/browser.c:247
 msgid "Go To Directory"
 msgstr "Pojdi v mapo"
 
-#: src/browser.c:227 src/browser.c:738 src/files.c:1174 src/files.c:2340
-#: src/nano.c:1120 src/search.c:202 src/search.c:290 src/search.c:895
-#: src/search.c:970 src/text.c:2935 src/text.c:3142
+#: src/browser.c:254 src/browser.c:723 src/files.c:1126 src/files.c:2292
+#: src/nano.c:1128 src/search.c:195 src/search.c:297 src/search.c:851
+#: src/search.c:918 src/text.c:3189 src/text.c:3396
 msgid "Cancelled"
 msgstr "Preklicano"
 
-#: src/browser.c:253 src/browser.c:300
-#, c-format
-msgid "Can't go outside of %s in restricted mode"
+#. TRANSLATORS: This refers to the option --operatingdir,
+#. * not to --restricted.
+#: src/browser.c:274 src/browser.c:326
+#, fuzzy, c-format
+msgid "Can't go outside of %s in confined mode"
 msgstr "V omejenem načinu ni mogoče zapustiti %s"
 
-#: src/browser.c:264 src/browser.c:310 src/browser.c:326 src/files.c:1044
-#: src/files.c:1052 src/files.c:1844 src/files.c:1971 src/files.c:2016
-#: src/files.c:2037 src/files.c:2156 src/files.c:3062 src/files.c:3285
-#: src/rcfile.c:596 src/rcfile.c:1435
-#, c-format
-msgid "Error reading %s: %s"
-msgstr "Napaka med branjem %s: %s"
-
-#: src/browser.c:290
+#: src/browser.c:317
 msgid "Can't move up a directory"
 msgstr "Mape ni mogoče premakniti višje"
 
 #. TRANSLATORS: Try to keep this at most 7 characters.
-#: src/browser.c:615 src/browser.c:623
+#: src/browser.c:590 src/browser.c:598
 msgid "(dir)"
 msgstr "(mapa)"
 
 #. TRANSLATORS: Try to keep this at most 12 characters.
-#: src/browser.c:620
+#: src/browser.c:595
 msgid "(parent dir)"
 msgstr "(nad. mapa)"
 
 #. TRANSLATORS: Try to keep this at most 7 characters.
 #. * If necessary, you can leave out the parentheses.
-#: src/browser.c:650
+#: src/browser.c:625
 msgid "(huge)"
 msgstr ""
 
 #. TRANSLATORS: This is the main search prompt.
-#: src/browser.c:727 src/search.c:173
+#: src/browser.c:712 src/search.c:166
 msgid "Search"
 msgstr "Iskanje"
 
-#: src/browser.c:777 src/search.c:466 src/search.c:536
-msgid "This is the only occurrence"
-msgstr "To je edina pojavitev niza"
-
-#: src/browser.c:793 src/search.c:364
+#: src/browser.c:754 src/search.c:368
 msgid "Search Wrapped"
 msgstr "Iskanje je ovito"
 
-#: src/browser.c:843 src/search.c:517
+#: src/browser.c:764 src/search.c:509
+msgid "This is the only occurrence"
+msgstr "To je edina pojavitev niza"
+
+#: src/browser.c:812 src/search.c:473
 msgid "No current search pattern"
 msgstr "Ni trenutnega vzorca iskanja"
 
-#: src/files.c:50
+#: src/color.c:186
+#, fuzzy, c-format
+msgid "Unknown syntax name: %s"
+msgstr "Manjka ime skladnje"
+
+#: src/color.c:247
+#, c-format
+msgid "magic_load() failed: %s"
+msgstr ""
+
+#: src/color.c:251
+#, c-format
+msgid "magic_file(%s) failed: %s"
+msgstr ""
+
+#: src/files.c:47
 #, c-format
 msgid "Directory '%s' does not exist"
 msgstr ""
 
-#: src/files.c:52
+#: src/files.c:49
 #, c-format
 msgid "Path '%s': %s"
 msgstr ""
 
-#: src/files.c:54
+#: src/files.c:51
 #, fuzzy, c-format
 msgid "Path '%s' is not a directory"
 msgstr "\"%s\" je mapa"
 
-#: src/files.c:57
+#: src/files.c:53
 #, c-format
 msgid "Path '%s' is not accessible"
 msgstr ""
 
-#. TRANSLATORS: Try to keep this at most 76 characters.
-#: src/files.c:158
+#. TRANSLATORS: Keep the next ten messages at most 76 characters.
+#: src/files.c:148
 msgid ""
 "Warning: Modifying a file which is not locked, check directory permission?"
 msgstr ""
 "Opozorilo: Spreminjati želite datoteko, ki ni zaklenjena. Prosimo, preverite "
 "dovoljenja mape."
 
-#: src/files.c:197
+#: src/files.c:187
 msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
 msgstr ""
 "Istovetnosti za zaklepno datoteko ni mogoče določiti. Funkcija getpwuid() je "
 "spodletela."
 
-#: src/files.c:206
+#: src/files.c:196
 #, fuzzy, c-format
 msgid "Couldn't determine hostname for lock file: %s"
 msgstr "Imena gostitelja zaklepne datoteke ni mogoče določiti: %s"
 
-#: src/files.c:227 src/files.c:238 src/files.c:275 src/files.c:285
+#: src/files.c:216 src/files.c:225 src/files.c:262 src/files.c:272
 #, c-format
 msgid "Error writing lock file %s: %s"
 msgstr "Med zapisovanjem zaklepne datoteke %s je prišlo do napake: %s"
 
-#: src/files.c:305
+#: src/files.c:291
 #, c-format
 msgid "Error deleting lock file %s: %s"
 msgstr "Med brisanjem zaklepne datoteke %s je prišlo do napake: %s"
 
-#: src/files.c:341
+#: src/files.c:325
 #, fuzzy, c-format
 msgid "Error opening lock file %s: %s"
 msgstr "Med odpiranjem zaklepne datoteke %s je prišlo do napake: %s"
 
-#: src/files.c:353
+#: src/files.c:337
 #, fuzzy, c-format
 msgid "Error reading lock file %s: Not enough data read"
 msgstr ""
@@ -144,41 +161,42 @@ msgstr ""
 "premalo podatkov."
 
 #. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
-#: src/files.c:371
+#: src/files.c:354
 #, c-format
 msgid "File %s is being edited (by %s with %s, PID %d); continue?"
 msgstr ""
 
-#: src/files.c:426
+#: src/files.c:430
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Ni mogoče vstaviti datoteke izven %s"
 
-#: src/files.c:439 src/files.c:1038 src/rcfile.c:589 src/rcfile.c:1385
-#: src/rcfile.c:1426
+#: src/files.c:445 src/files.c:991 src/rcfile.c:533 src/rcfile.c:1230
+#: src/rcfile.c:1271
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" je mapa"
 
-#: src/files.c:441
+#: src/files.c:447
 #, fuzzy, c-format
 msgid "\"%s\" is not a normal file"
 msgstr "\"%s\" je datoteka naprave"
 
-#: src/files.c:566
+#: src/files.c:571
 msgid "No more open file buffers"
 msgstr "Ni več medpomnilnikov odprtih datotek"
 
-#: src/files.c:582
+#: src/files.c:586
 #, c-format
 msgid "Switched to %s"
 msgstr "Preklopljeno na %s"
 
-#: src/files.c:584 src/global.c:988 src/winio.c:2010
+#: src/files.c:588 src/global.c:1005 src/winio.c:1965
 msgid "New Buffer"
 msgstr "Nov medpomnilnik"
 
-#: src/files.c:943
+#. TRANSLATORS: Keep the next four messages at most 76 characters.
+#: src/files.c:913
 #, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
@@ -187,28 +205,7 @@ msgstr[1] "Prebrana je %lu vrstica (pretvorjeno iz oblike DOS in Mac)"
 msgstr[2] "Prebrani sta %lu vrstici (pretvorjeno iz oblike DOS in Mac)"
 msgstr[3] "Prebrane so %lu vrstice (pretvorjeno iz oblike DOS in Mac)"
 
-#: src/files.c:948
-#, c-format
-msgid ""
-"Read %lu line (Converted from DOS and Mac format - Warning: No write "
-"permission)"
-msgid_plural ""
-"Read %lu lines (Converted from DOS and Mac format - Warning: No write "
-"permission)"
-msgstr[0] ""
-"Prebranih je %lu vrstic (pretvorjeno iz oblike DOS in Mac - Opozorilo: ni "
-"dovoljenj za pisanje)"
-msgstr[1] ""
-"Prebrana je %lu vrstica (pretvorjeno iz oblike DOS in Mac - Opozorilo: ni "
-"dovoljenj za pisanje)"
-msgstr[2] ""
-"Prebrani sta %lu vrstici (pretvorjeno iz oblike DOS in Mac - Opozorilo: ni "
-"dovoljenj za pisanje)"
-msgstr[3] ""
-"Prebrane so %lu vrstice (pretvorjeno iz oblike DOS in Mac - Opozorilo: ni "
-"dovoljenj za pisanje)"
-
-#: src/files.c:954
+#: src/files.c:919
 #, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
@@ -217,26 +214,7 @@ msgstr[1] "Prebrana je %lu vrstica (pretvorjeno iz oblike Mac)"
 msgstr[2] "Prebrani sta %lu vrstici (pretvorjeno iz oblike Mac)"
 msgstr[3] "Prebrane so %lu vrstice (pretvorjeno iz oblike Mac)"
 
-#: src/files.c:958
-#, c-format
-msgid ""
-"Read %lu line (Converted from Mac format - Warning: No write permission)"
-msgid_plural ""
-"Read %lu lines (Converted from Mac format - Warning: No write permission)"
-msgstr[0] ""
-"Prebranih je %lu vrstic (pretvorjeno iz oblike Mac - Opozorilo: ni dovoljenj "
-"za pisanje)"
-msgstr[1] ""
-"Prebrana je %lu vrstica (pretvorjeno iz oblike Mac - Opozorilo: ni dovoljenj "
-"za pisanje)"
-msgstr[2] ""
-"Prebrani sta %lu vrstici (pretvorjeno iz oblike Mac - Opozorilo: ni "
-"dovoljenj za pisanje)"
-msgstr[3] ""
-"Prebrane so %lu vrstice (pretvorjeno iz oblike Mac - Opozorilo: ni dovoljenj "
-"za pisanje)"
-
-#: src/files.c:964
+#: src/files.c:925
 #, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
@@ -245,26 +223,7 @@ msgstr[1] "Prebrana je %lu vrstica (Pretvorjeno iz oblike DOS)"
 msgstr[2] "Prebrani sta %lu vrstici (Pretvorjeno iz oblike DOS)"
 msgstr[3] "Prebrane so %lu vrstice (Pretvorjeno iz oblike DOS)"
 
-#: src/files.c:968
-#, c-format
-msgid ""
-"Read %lu line (Converted from DOS format - Warning: No write permission)"
-msgid_plural ""
-"Read %lu lines (Converted from DOS format - Warning: No write permission)"
-msgstr[0] ""
-"Prebranih je %lu vrstic (Pretvorjeno iz oblike DOS - Opozorilo: ni dovoljenj "
-"za pisanje)"
-msgstr[1] ""
-"Prebrana je %lu vrstica (Pretvorjeno iz oblike DOS - Opozorilo: ni dovoljenj "
-"za pisanje)"
-msgstr[2] ""
-"Prebrani sta %lu vrstici (Pretvorjeno iz oblike DOS - Opozorilo: ni "
-"dovoljenj za pisanje)"
-msgstr[3] ""
-"Prebrane so %lu vrstice (Pretvorjeno iz oblike DOS - Opozorilo: ni dovoljenj "
-"za pisanje)"
-
-#: src/files.c:974
+#: src/files.c:930
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
@@ -273,91 +232,83 @@ msgstr[1] "Prebrana je %lu vrstica"
 msgstr[2] "Prebrani sta %lu vrstici"
 msgstr[3] "Prebrane so %lu vrstice"
 
-#: src/files.c:977
-#, fuzzy, c-format
-msgid "Read %lu line (Warning: No write permission)"
-msgid_plural "Read %lu lines (Warning: No write permission)"
-msgstr[0] "Prebranih je %lu vrstic (opozorilo: ni dovoljenj za pisanje)"
-msgstr[1] "Prebrana je %lu vrstica (opozorilo: ni dovoljenj za pisanje)"
-msgstr[2] "Prebrani sta %lu vrstici (opozorilo: ni dovoljenj za pisanje)"
-msgstr[3] "Prebrane so %lu vrstice (opozorilo: ni dovoljenj za pisanje)"
-
-#: src/files.c:1019 src/files.c:1056
+#: src/files.c:974 src/files.c:1006
 msgid "Reading File"
 msgstr "Branje datoteke"
 
-#: src/files.c:1025
+#: src/files.c:980
 msgid "New File"
 msgstr "Nova datoteka"
 
-#: src/files.c:1028
-#, c-format
-msgid "\"%s\" not found"
+#: src/files.c:983
+#, fuzzy, c-format
+msgid "File \"%s\" not found"
 msgstr "\"%s\" ni mogoče najti"
 
-#: src/files.c:1039 src/rcfile.c:590 src/rcfile.c:1386 src/rcfile.c:1427
+#: src/files.c:992 src/rcfile.c:534 src/rcfile.c:1231 src/rcfile.c:1272
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" je datoteka naprave"
 
-#: src/files.c:1133
+#: src/files.c:1083
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Ukaz za izvedbo v novem medpomnilniku [iz %s] "
 
-#: src/files.c:1135
+#: src/files.c:1085
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Ukaz za izvedbo [iz %s] "
 
-#: src/files.c:1142
+#: src/files.c:1092
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Datoteka za vstavitev v nov medpomnilnik [iz %s] "
 
-#: src/files.c:1144
+#: src/files.c:1094
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Datoteka za vstavitev [iz %s] "
 
-#: src/files.c:1389
+#: src/files.c:1338
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Neveljavna tipka v ne-več-medpomnilniškem načinu"
 
-#: src/files.c:1684
-msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+#: src/files.c:1632
+#, fuzzy
+msgid "Failed to write backup file; continue saving? (Say N if unsure.) "
 msgstr ""
 "Varnostne datoteke ni mogoče zapisati. Ali želite datoteko vseeno shraniti? "
 "Če niste popolnoma prepričani, pritisnite N."
 
-#: src/files.c:1800
+#: src/files.c:1750
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Ni mogoče pisati zunaj %s"
 
-#: src/files.c:1885 src/files.c:1910 src/files.c:1928 src/files.c:1941
-#: src/files.c:1952 src/files.c:1981
+#: src/files.c:1833 src/files.c:1858 src/files.c:1876 src/files.c:1889
+#: src/files.c:1900 src/files.c:1928
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Napaka med pisanjem datoteke varnostne kopije %s: %s"
 
-#: src/files.c:1886 src/nano.c:690
+#: src/files.c:1834 src/nano.c:692
 msgid "Too many backup files?"
 msgstr "Ali je preveč varnostnih kopij datotek?"
 
-#: src/files.c:2026 src/text.c:2863 src/text.c:2875 src/text.c:3244
-#: src/text.c:3253
+#: src/files.c:1972 src/text.c:3117 src/text.c:3129 src/text.c:3498
+#: src/text.c:3507
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Napaka med pisanjem v začasno datoteko: %s"
 
-#: src/files.c:2049 src/files.c:2068 src/files.c:2080 src/files.c:2104
-#: src/files.c:2121 src/files.c:2131 src/files.c:2164 src/files.c:2171
+#: src/files.c:1994 src/files.c:2013 src/files.c:2023 src/files.c:2047
+#: src/files.c:2064 src/files.c:2074 src/files.c:2106 src/files.c:2113
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Napaka med pisanjem %s:%s"
 
-#: src/files.c:2200
+#: src/files.c:2154
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
@@ -366,64 +317,67 @@ msgstr[1] "Zapisana je %lu vrstica"
 msgstr[2] "Zapisani sta %lu vrstici"
 msgstr[3] "Zapisane so %lu vrstice"
 
-#: src/files.c:2299
+#: src/files.c:2249
 msgid " [DOS Format]"
 msgstr " [Oblika DOS]"
 
-#: src/files.c:2300
+#: src/files.c:2250
 msgid " [Mac Format]"
 msgstr " [Oblika Mac]"
 
-#: src/files.c:2302
+#: src/files.c:2252
 msgid " [Backup]"
 msgstr " [Varnostna kopija]"
 
-#: src/files.c:2309
+#: src/files.c:2259
 msgid "Prepend Selection to File"
 msgstr "Pripni izbiro pred datoteko"
 
-#: src/files.c:2310
+#: src/files.c:2260
 msgid "Append Selection to File"
 msgstr "Pripni izbiro datoteki"
 
-#: src/files.c:2311
+#: src/files.c:2261
 msgid "Write Selection to File"
 msgstr "Zapiši izbiro v datoteko"
 
-#: src/files.c:2314
+#: src/files.c:2264
 msgid "File Name to Prepend to"
 msgstr "Ime datoteke, ki naj bo pripeta na začetek"
 
-#: src/files.c:2315
+#: src/files.c:2265
 msgid "File Name to Append to"
 msgstr "Ime datoteke, ki naj bo pripeta"
 
-#: src/files.c:2316
+#: src/files.c:2266
 msgid "File Name to Write"
 msgstr "Ime datoteke za zapis"
 
-#: src/files.c:2349
-msgid "Save modified buffer anyway ? "
+#: src/files.c:2301
+msgid "Save modified buffer anyway? "
 msgstr ""
 
-#: src/files.c:2457
-msgid "File exists, OVERWRITE ? "
-msgstr "Datoteka že obstraja. Ali naj bo prepisana? "
-
-#: src/files.c:2466
-msgid "Save file under DIFFERENT NAME ? "
+#: src/files.c:2412
+#, fuzzy
+msgid "Save file under DIFFERENT NAME? "
 msgstr "Ali želite datoteko shraniti z DRUGIM imenom? "
 
-#: src/files.c:2480
-msgid "File was modified since you opened it, continue saving ? "
+#: src/files.c:2420
+#, fuzzy, c-format
+msgid "File \"%s\" exists; OVERWRITE? "
+msgstr "Datoteka že obstraja. Ali naj bo prepisana? "
+
+#: src/files.c:2441
+#, fuzzy
+msgid "File was modified since you opened it; continue saving? "
 msgstr ""
 "Datoteka je bila po odpiranju spremenjena. Ali jo želite vseeno shraniti? "
 
-#: src/files.c:2917
+#: src/files.c:2874
 msgid "(more)"
 msgstr "(več)"
 
-#: src/files.c:3004
+#: src/files.c:2959
 #, c-format
 msgid ""
 "\n"
@@ -432,7 +386,7 @@ msgstr ""
 "\n"
 "Za nadaljevanje pritisnite Enter\n"
 
-#: src/files.c:3020
+#: src/files.c:2975
 #, fuzzy, c-format
 msgid ""
 "Unable to create directory %s: %s\n"
@@ -442,7 +396,7 @@ msgstr ""
 "Mapa je namenjena shranjevanju in nalaganju zgodovine iskanja in položaja "
 "kazalke\n"
 
-#: src/files.c:3026
+#: src/files.c:2982
 #, fuzzy, c-format
 msgid ""
 "Path %s is not a directory and needs to be.\n"
@@ -452,7 +406,7 @@ msgstr ""
 "S programom Nano ne bo mogoče shranjevati in nalagati zgodovine iskanja in "
 "položaja kazalke\n"
 
-#: src/files.c:3045
+#: src/files.c:3002
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I tried to move\n"
@@ -461,7 +415,7 @@ msgstr ""
 "Zaznana je bila opuščena datoteka zgodovine (%s). Med premikanjem\n"
 "datoteke na prednostno mesto (%s) je prišlo do napake: %s"
 
-#: src/files.c:3049
+#: src/files.c:3006
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I moved\n"
@@ -472,748 +426,779 @@ msgstr ""
 "Premaknjena je na prednostno mesto (%s)\n"
 "Za več podrobnosti si poglejte pogosto zastavljena vprašanja."
 
-#: src/files.c:3132 src/files.c:3140 src/files.c:3164 src/files.c:3176
+#: src/files.c:3089 src/files.c:3097 src/files.c:3121 src/files.c:3133
 #, fuzzy, c-format
 msgid "Error writing %s: %s\n"
 msgstr "Napaka med pisanjem %s:%s"
 
 #. TRANSLATORS: Try to keep the next fifteen strings at most 10 characters.
-#: src/global.c:480
+#: src/global.c:483
 msgid "Exit"
 msgstr "Končaj"
 
-#: src/global.c:481
+#: src/global.c:484
 msgid "Close"
 msgstr "Zapri"
 
-#: src/global.c:482
+#: src/global.c:485
 #, fuzzy
 msgid "Uncut Text"
 msgstr "Odizr. be."
 
-#: src/global.c:484
+#: src/global.c:487
 #, fuzzy
 msgid "Unjustify"
 msgstr "Odporavnaj"
 
-#: src/global.c:490
+#: src/global.c:493
 msgid "Read File"
 msgstr "Odpri dat."
 
-#: src/global.c:491
+#: src/global.c:494
 msgid "Where Is"
 msgstr "Poišči"
 
-#: src/global.c:492
+#: src/global.c:495
 msgid "Replace"
 msgstr "Zamenjaj"
 
-#: src/global.c:493
+#: src/global.c:496
 msgid "Go To Line"
 msgstr "V vrstico"
 
-#: src/global.c:494
+#: src/global.c:497
 msgid "Prev Line"
 msgstr "Pred. vrs."
 
-#: src/global.c:495
+#: src/global.c:498
 msgid "Next Line"
 msgstr "Nasl. vrs."
 
-#: src/global.c:496
+#: src/global.c:499
 msgid "Prev Page"
 msgstr "Pred. str."
 
-#: src/global.c:497
+#: src/global.c:500
 msgid "Next Page"
 msgstr "Nasl. str."
 
-#: src/global.c:499
+#: src/global.c:502
 msgid "Justify"
 msgstr "Poravnaj"
 
-#: src/global.c:500
+#: src/global.c:503
 msgid "FullJstify"
 msgstr "Pop. por."
 
-#: src/global.c:502
+#: src/global.c:505
 msgid "Refresh"
 msgstr "Osveži"
 
 #. TRANSLATORS: Try to keep this string at most 12 characters.
-#: src/global.c:505
+#: src/global.c:508
 msgid "WhereIs Next"
 msgstr "Išči nas."
 
 #. TRANSLATORS: The next long series of strings are shortcut descriptions;
 #. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:512
+#: src/global.c:515
 msgid "Justify the current paragraph"
 msgstr "Poravnaj trenutni odstavek"
 
-#: src/global.c:514
+#: src/global.c:517
 msgid "Cancel the current function"
 msgstr "Prekliči trenutno funkcijo"
 
-#: src/global.c:515
+#: src/global.c:518
 msgid "Display this help text"
 msgstr "Pokaži to besedilo pomoči"
 
-#: src/global.c:518
+#: src/global.c:521
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Zapri trenutni medpomnilnik datoteke / Končaj nano"
 
-#: src/global.c:520
+#: src/global.c:523
 msgid "Exit from nano"
 msgstr "Končaj nano"
 
-#: src/global.c:524
+#: src/global.c:527
 msgid "Write the current file to disk"
 msgstr "Zapiši trenutno datoteko na disk"
 
-#: src/global.c:526
+#: src/global.c:529
 msgid "Insert another file into the current one"
 msgstr "Vstavi drugo datoteko v trenutno"
 
-#: src/global.c:528
+#: src/global.c:531
 msgid "Search for a string or a regular expression"
 msgstr "Poišči niz znakov ali logični izraz"
 
-#: src/global.c:531
+#: src/global.c:533
 #, fuzzy
 msgid "Search for a string"
 msgstr "Poišči niz znakov ali logični izraz"
 
-#: src/global.c:533
+#: src/global.c:534
+msgid "Refresh the file list"
+msgstr ""
+
+#: src/global.c:535
+#, fuzzy
+msgid "Go to lefthand column"
+msgstr "Pojdi v Å¡tevilko vrstice in stolpca"
+
+#: src/global.c:536
+#, fuzzy
+msgid "Go to righthand column"
+msgstr "Pojdi v Å¡tevilko vrstice in stolpca"
+
+#: src/global.c:538
 #, fuzzy
 msgid "Go one screenful up"
 msgstr "Pojdi na naslednji zaslon"
 
-#: src/global.c:534
+#: src/global.c:539
 #, fuzzy
 msgid "Go one screenful down"
 msgstr "Pojdi na naslednji zaslon"
 
-#: src/global.c:536
+#: src/global.c:541
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Izreži trenutno vrstico in jo shrani v medpomnil. izreza"
 
-#: src/global.c:538
+#: src/global.c:543
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Prilepi iz medpomnilnika izreza v trenutno vrstico"
 
-#: src/global.c:539
+#: src/global.c:544
 msgid "Display the position of the cursor"
 msgstr "Prikaži položaj kazalke"
 
-#: src/global.c:541
+#: src/global.c:546
 msgid "Invoke the spell checker, if available"
 msgstr "Vključi črkovalnik, če je na voljo"
 
-#: src/global.c:543
+#: src/global.c:548
 msgid "Replace a string or a regular expression"
 msgstr "Zamenjaj niz ali logični izraz"
 
-#: src/global.c:544
+#: src/global.c:549
 msgid "Go to line and column number"
 msgstr "Pojdi v Å¡tevilko vrstice in stolpca"
 
-#: src/global.c:546
+#: src/global.c:551
 #, fuzzy
 msgid "Mark text starting from the cursor position"
 msgstr "Označi besedilo na mestu kazalke"
 
-#: src/global.c:547
+#: src/global.c:552
 #, fuzzy
 msgid "Repeat the last search"
 msgstr "Ponovi zadnje iskanje"
 
-#: src/global.c:549
+#: src/global.c:554
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "Kopiraj trenutno vrstico in jo shrani v medpomni. izreza"
 
-#: src/global.c:550
+#: src/global.c:555
 msgid "Indent the current line"
 msgstr "Zamakni trenutno vrstico"
 
-#: src/global.c:551
+#: src/global.c:556
 msgid "Unindent the current line"
 msgstr "Odstrani zamik trenutne vrstice"
 
-#: src/global.c:552
+#: src/global.c:558
+msgid "Comment/uncomment the current line or marked lines"
+msgstr ""
+
+#: src/global.c:560
 msgid "Undo the last operation"
 msgstr "Razveljavi zadnje dejanje"
 
-#: src/global.c:553
+#: src/global.c:561
 msgid "Redo the last undone operation"
 msgstr "Uveljavi zadnje razveljavljeno dejanje"
 
-#: src/global.c:555
+#: src/global.c:563
 msgid "Go back one character"
 msgstr "Pojdi nazaj za en znak"
 
-#: src/global.c:556
+#: src/global.c:564
 msgid "Go forward one character"
 msgstr "Pojdi naprej za en znak"
 
-#: src/global.c:558
+#: src/global.c:566
 msgid "Go back one word"
 msgstr "Pojdi nazaj za eno besedo"
 
-#: src/global.c:559
+#: src/global.c:567
 msgid "Go forward one word"
 msgstr "Pojdi naprej za eno besedo"
 
-#: src/global.c:561
+#: src/global.c:569
 msgid "Go to previous line"
 msgstr "Pojdi v predhodno vrstico"
 
-#: src/global.c:562
+#: src/global.c:570
 msgid "Go to next line"
 msgstr "Pojdi v naslednjo vrstico"
 
-#: src/global.c:563
+#: src/global.c:571
 msgid "Go to beginning of current line"
 msgstr "Pojdi na začetek trenutne vrstice"
 
-#: src/global.c:564
+#: src/global.c:572
 msgid "Go to end of current line"
 msgstr "Pojdi na konec trenutne vrstice"
 
-#: src/global.c:567
+#: src/global.c:575
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "Pojdi na začetek odstavka; nato prejšnjega odstavka"
 
-#: src/global.c:569
+#: src/global.c:577
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr "Pojdi preko konca odstavka; nato naslednjega odstavka"
 
-#: src/global.c:571
+#: src/global.c:579
 msgid "Go to the first line of the file"
 msgstr "Pojdi v prvo vrstico datoteke"
 
-#: src/global.c:572
+#: src/global.c:580
 msgid "Go to the last line of the file"
 msgstr "Pojdi v zadnjo vrstico datoteke"
 
-#: src/global.c:574
+#: src/global.c:582
 msgid "Go to the matching bracket"
 msgstr "Pojdi do ujemajočega oklepaja"
 
-#: src/global.c:576
+#: src/global.c:584
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "Pomakni se navzgor za eno vrstico brez drsenja kazalke"
 
-#: src/global.c:578
+#: src/global.c:586
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "Pomakni se navzdol za eno vrstico brez drsenja kazalke"
 
-#: src/global.c:581
+#: src/global.c:589
 msgid "Switch to the previous file buffer"
 msgstr "Preklopi na prejšnji medpomnilnik datoteke"
 
-#: src/global.c:582
+#: src/global.c:590
 msgid "Switch to the next file buffer"
 msgstr "Preklopi na naslednji medpomnilnik datoteke"
 
-#: src/global.c:584
+#: src/global.c:592
 msgid "Insert the next keystroke verbatim"
 msgstr "Vstavi naslednji natančni pritisk tipk"
 
-#: src/global.c:585
+#: src/global.c:593
 msgid "Insert a tab at the cursor position"
 msgstr "Vstavi tabulator na položaju kazalke"
 
-#: src/global.c:586
+#: src/global.c:594
 msgid "Insert a newline at the cursor position"
 msgstr "Vstavi novo vrstico na položaju kazalke"
 
-#: src/global.c:587
+#: src/global.c:595
 msgid "Delete the character under the cursor"
 msgstr "Izbriši znak pod kazalko"
 
-#: src/global.c:589
+#: src/global.c:597
 msgid "Delete the character to the left of the cursor"
 msgstr "Izbriši znak levo od kazalke"
 
-#: src/global.c:592
+#: src/global.c:600
 #, fuzzy
 msgid "Cut backward from cursor to word start"
 msgstr "Izreži od kazalke do konca vrstice"
 
-#: src/global.c:594
+#: src/global.c:602
 #, fuzzy
 msgid "Cut forward from cursor to next word start"
 msgstr "Izreži od kazalke do konca vrstice"
 
-#: src/global.c:596
+#: src/global.c:604
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Izreži s položaja kazalke na konec datoteke"
 
-#: src/global.c:599
+#: src/global.c:607
 msgid "Justify the entire file"
 msgstr "Poravnaj celotno datoteko"
 
-#: src/global.c:603
+#: src/global.c:611
 msgid "Count the number of words, lines, and characters"
 msgstr "Preštej število besed, vrstic in znakov"
 
-#: src/global.c:606
+#: src/global.c:614
 msgid "Refresh (redraw) the current screen"
 msgstr "Osveži (ponovno nariši) trenutni zaslon"
 
-#: src/global.c:608
+#: src/global.c:616
 #, fuzzy
 msgid "Suspend the editor (if suspension is enabled)"
 msgstr "Daj urejevalnik v pripravljenost (če je omogočeno)"
 
-#: src/global.c:610
+#: src/global.c:618
 msgid "Save file without prompting"
 msgstr ""
 
-#: src/global.c:611
+#: src/global.c:619
 msgid "Search next occurrence backward"
 msgstr ""
 
-#: src/global.c:612
+#: src/global.c:620
 msgid "Search next occurrence forward"
 msgstr ""
 
-#: src/global.c:614
+#: src/global.c:622
 msgid "Toggle the case sensitivity of the search"
 msgstr "Preklopi ločevanje velikosti črk iskanja"
 
-#: src/global.c:616
+#: src/global.c:624
 msgid "Reverse the direction of the search"
 msgstr "Obrni smer iskanja"
 
-#: src/global.c:620
+#: src/global.c:628
 msgid "Toggle the use of regular expressions"
 msgstr "Preklopi uporabo logičnih izrazov"
 
-#: src/global.c:624
+#: src/global.c:632
 msgid "Recall the previous search/replace string"
 msgstr "Prikliči predhodni niz iskanja/zamenjave"
 
-#: src/global.c:626
+#: src/global.c:634
 msgid "Recall the next search/replace string"
 msgstr "Prikliči naslednji niz iskanja/zamenjave"
 
-#: src/global.c:629
+#: src/global.c:637
 msgid "Go to file browser"
 msgstr "Pojdi v brskalnik datotek"
 
-#: src/global.c:632
+#: src/global.c:640
 msgid "Toggle the use of DOS format"
 msgstr "Preklopi uporabo oblike DOS"
 
-#: src/global.c:633
+#: src/global.c:641
 msgid "Toggle the use of Mac format"
 msgstr "Preklopi uporabo oblike Mac"
 
-#: src/global.c:634
+#: src/global.c:642
 msgid "Toggle appending"
 msgstr "Preklopi pripenjanje"
 
-#: src/global.c:635
+#: src/global.c:643
 msgid "Toggle prepending"
 msgstr "Preklopi pripenjanje na začetek"
 
-#: src/global.c:636
+#: src/global.c:644
 msgid "Toggle backing up of the original file"
 msgstr "Preklopi ustvarjanje varnostne kopije izvirne datoteke"
 
-#: src/global.c:637
+#: src/global.c:645
 msgid "Execute external command"
 msgstr "Izvedi zunanji ukaz"
 
-#: src/global.c:639
+#: src/global.c:647
 msgid "Close buffer without saving it"
 msgstr ""
 
-#: src/global.c:641
+#: src/global.c:649
 msgid "Toggle the use of a new buffer"
 msgstr "Preklopi uporabo novega medpomnilnika"
 
-#: src/global.c:644
+#: src/global.c:652
 msgid "Exit from the file browser"
 msgstr "Končaj brskalnik datotek"
 
-#: src/global.c:645
+#: src/global.c:653
 msgid "Go to the first file in the list"
 msgstr "Pojdi k prvi datoteki na seznamu"
 
-#: src/global.c:646
+#: src/global.c:654
 msgid "Go to the last file in the list"
 msgstr "Pojdi k zadnji datoteki na seznamu"
 
-#: src/global.c:647
+#: src/global.c:655
 msgid "Go to the previous file in the list"
 msgstr "Pojdi k predhodni datoteki na seznamu"
 
-#: src/global.c:648
+#: src/global.c:656
 msgid "Go to the next file in the list"
 msgstr "Pojdi k naslednji datoteki na seznamu"
 
-#: src/global.c:649
+#: src/global.c:657
 msgid "Go to directory"
 msgstr "Pojdi v mapo"
 
-#: src/global.c:652
+#: src/global.c:660
 #, fuzzy
 msgid "Invoke the linter, if available"
 msgstr "Vključi črkovalnik, če je na voljo"
 
-#: src/global.c:653
+#: src/global.c:661
 #, fuzzy
 msgid "Go to previous linter msg"
 msgstr "Pojdi v predhodno vrstico"
 
-#: src/global.c:654
+#: src/global.c:662
 #, fuzzy
 msgid "Go to next linter msg"
 msgstr "Pojdi v naslednjo vrstico"
 
-#: src/global.c:656
+#: src/global.c:664
 #, fuzzy
 msgid "Invoke formatter, if available"
 msgstr "Vključi črkovalnik, če je na voljo"
 
 #. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:671
+#: src/global.c:679
 msgid "Get Help"
 msgstr "Pomoč"
 
-#: src/global.c:674 src/prompt.c:858
+#: src/global.c:682 src/prompt.c:855
 msgid "Cancel"
 msgstr "Prekliči"
 
-#: src/global.c:687
+#: src/global.c:695
 #, fuzzy
 msgid "Write Out"
 msgstr "Zapiši"
 
-#: src/global.c:723
+#: src/global.c:731
 msgid "Go To Dir"
 msgstr "Pojdi v mapo"
 
-#: src/global.c:738
+#: src/global.c:746
 msgid "Cut Text"
 msgstr "Izre. bes."
 
-#: src/global.c:753
+#: src/global.c:761
 msgid "To Spell"
 msgstr "ÄŒrkuj"
 
-#: src/global.c:757
+#: src/global.c:765
 #, fuzzy
 msgid "To Linter"
 msgstr "V vrstico"
 
-#: src/global.c:760
+#: src/global.c:768
 #, fuzzy
 msgid "Formatter"
 msgstr "oblika DOS"
 
-#: src/global.c:767
+#: src/global.c:775
 msgid "Case Sens"
 msgstr "Loč. črk"
 
-#: src/global.c:772
+#: src/global.c:780
 msgid "Regexp"
 msgstr "Log. izraz"
 
-#: src/global.c:777
+#: src/global.c:785
 msgid "Backwards"
 msgstr "Nazaj"
 
-#: src/global.c:784
+#: src/global.c:792
 msgid "No Replace"
 msgstr "Brez. zam."
 
-#: src/global.c:792
+#: src/global.c:800
 msgid "Cur Pos"
 msgstr "Položaj kaz."
 
-#: src/global.c:807
+#: src/global.c:815
 msgid "First Line"
 msgstr "Prva vrst."
 
-#: src/global.c:809
+#: src/global.c:817
 msgid "Last Line"
 msgstr "Zad. vrst."
 
-#: src/global.c:816
+#: src/global.c:824
 #, fuzzy
 msgid "To Bracket"
 msgstr "Ni oklepaj"
 
-#: src/global.c:819
+#: src/global.c:827
 msgid "Mark Text"
 msgstr "Ozna. bes."
 
-#: src/global.c:822
+#: src/global.c:830
 msgid "Copy Text"
 msgstr "Kopi. bes."
 
-#: src/global.c:825
+#: src/global.c:833
 msgid "Indent Text"
 msgstr "Zama. bes."
 
-#: src/global.c:827
+#: src/global.c:835
 msgid "Unindent Text"
 msgstr "Odzam. be."
 
-#: src/global.c:830
+#: src/global.c:838
 msgid "Undo"
 msgstr "Razveljavi"
 
-#: src/global.c:832
+#: src/global.c:840
 msgid "Redo"
 msgstr "Uveljavi"
 
-#: src/global.c:836 src/global.c:842
+#: src/global.c:844 src/global.c:850
 msgid "Back"
 msgstr "Nazaj"
 
-#: src/global.c:838 src/global.c:844
+#: src/global.c:846 src/global.c:852
 msgid "Forward"
 msgstr "Naprej"
 
-#: src/global.c:849
+#: src/global.c:857
 msgid "Prev Word"
 msgstr "Pred. bes."
 
-#: src/global.c:851
+#: src/global.c:859
 msgid "Next Word"
 msgstr "Nasl. bes."
 
-#: src/global.c:855
+#: src/global.c:863
 msgid "Home"
 msgstr "Domov"
 
-#: src/global.c:857
+#: src/global.c:865
 msgid "End"
 msgstr "Konec"
 
-#: src/global.c:866
+#: src/global.c:874
 msgid "Beg of Par"
 msgstr "Zač. odst."
 
-#: src/global.c:868
+#: src/global.c:876
 msgid "End of Par"
 msgstr "Kon. odst."
 
-#: src/global.c:873
+#: src/global.c:881
 msgid "Scroll Up"
 msgstr "Pomik gor"
 
-#: src/global.c:875
+#: src/global.c:883
 msgid "Scroll Down"
 msgstr "Pomik dol"
 
-#: src/global.c:880
+#: src/global.c:888
 #, fuzzy
 msgid "Prev File"
 msgstr "Predhodna datoteka"
 
-#: src/global.c:882
+#: src/global.c:890
 msgid "Next File"
 msgstr "Naslednja datoteka"
 
-#: src/global.c:891
+#: src/global.c:899
 #, fuzzy
 msgid "Verbatim"
 msgstr "Natančni vnos"
 
-#: src/global.c:894
+#: src/global.c:902
 msgid "Tab"
 msgstr "Tabulator"
 
-#: src/global.c:896
+#: src/global.c:904
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:899
+#: src/global.c:907
 msgid "Delete"
 msgstr "Delete"
 
-#: src/global.c:901
+#: src/global.c:909
 msgid "Backspace"
 msgstr "Vračalka"
 
 #. TRANSLATORS: The next two strings refer to cutting words.
-#: src/global.c:912
+#: src/global.c:920
 #, fuzzy
 msgid "Cut Left"
 msgstr "Izre. bes."
 
-#: src/global.c:914
+#: src/global.c:922
 msgid "Cut Right"
 msgstr ""
 
-#: src/global.c:916
+#: src/global.c:924
 msgid "CutTillEnd"
 msgstr "IzrezDoKonca"
 
-#: src/global.c:926
+#: src/global.c:934
 msgid "Word Count"
 msgstr "Å tetje besed"
 
-#: src/global.c:933
+#: src/global.c:941
 msgid "Suspend"
 msgstr "V priprav."
 
-#: src/global.c:937
+#: src/global.c:945
+#, fuzzy
+msgid "Comment Lines"
+msgstr "Nasl. vrs."
+
+#: src/global.c:949
 msgid "Save"
 msgstr ""
 
-#: src/global.c:940
+#: src/global.c:952
 #, fuzzy
 msgid "Previous"
 msgstr "Predhodna datoteka"
 
-#: src/global.c:942
+#: src/global.c:954
 #, fuzzy
 msgid "Next"
 msgstr "Nasl. str."
 
-#: src/global.c:948
+#: src/global.c:960
 msgid "PrevHstory"
 msgstr "Prej. Zgo."
 
-#: src/global.c:951
+#: src/global.c:963
 msgid "NextHstory"
 msgstr "Nasl. Zgo."
 
-#: src/global.c:955
+#: src/global.c:972
 msgid "Go To Text"
 msgstr "Nasl. bes."
 
-#: src/global.c:959
+#: src/global.c:976
 msgid "DOS Format"
 msgstr "oblika DOS"
 
-#: src/global.c:961
+#: src/global.c:978
 msgid "Mac Format"
 msgstr "oblika Mac"
 
-#: src/global.c:969
+#: src/global.c:986
 msgid "Append"
 msgstr "Pripni"
 
-#: src/global.c:971
+#: src/global.c:988
 msgid "Prepend"
 msgstr "Pripni na začet."
 
-#: src/global.c:974
+#: src/global.c:991
 msgid "Backup File"
 msgstr "Varnostna kopija"
 
-#: src/global.c:981
+#: src/global.c:998
 msgid "Execute Command"
 msgstr "Izvedi ukaz"
 
-#: src/global.c:996
+#: src/global.c:1013
 msgid "To Files"
 msgstr "Do datotek"
 
-#: src/global.c:1004
+#: src/global.c:1021
 msgid "First File"
 msgstr "Prva dat."
 
-#: src/global.c:1006
+#: src/global.c:1023
 msgid "Last File"
 msgstr "Zadnja dat."
 
-#: src/global.c:1010
+#: src/global.c:1027
 msgid "Discard buffer"
 msgstr ""
 
+#: src/global.c:1038
+msgid "Left Column"
+msgstr ""
+
+#: src/global.c:1040
+msgid "Right Column"
+msgstr ""
+
 #. TRANSLATORS: Try to keep the next two strings at most 20 characters.
-#: src/global.c:1020
+#: src/global.c:1047
 #, fuzzy
 msgid "Prev Lint Msg"
 msgstr "Pred. vrs."
 
-#: src/global.c:1022
+#: src/global.c:1049
 #, fuzzy
 msgid "Next Lint Msg"
 msgstr "Nasl. vrs."
 
 #. TRANSLATORS: The next seventeen strings are toggle descriptions;
 #. * they are best kept shorter than 40 characters, but may be longer.
-#: src/global.c:1285
+#: src/global.c:1316
 msgid "Help mode"
 msgstr "Način pomoči"
 
-#: src/global.c:1287
+#: src/global.c:1318
 msgid "Constant cursor position display"
 msgstr "Stalni prikaz položaja kazalke"
 
-#: src/global.c:1289
+#: src/global.c:1320
 msgid "Use of one more line for editing"
 msgstr "Uporaba ene vrstice več za urejanje"
 
-#: src/global.c:1291
+#: src/global.c:1322
 msgid "Smooth scrolling"
 msgstr "Gladko drsenje"
 
-#: src/global.c:1293
+#: src/global.c:1324
 #, fuzzy
 msgid "Soft wrapping of overlong lines"
 msgstr "Ne lomi dolgih vrstic"
 
-#: src/global.c:1295
+#: src/global.c:1326
 msgid "Whitespace display"
 msgstr "Prikaz presledkov"
 
-#: src/global.c:1297
+#: src/global.c:1328
 msgid "Color syntax highlighting"
 msgstr "Barvno poudarjanje skladnje"
 
-#: src/global.c:1299
+#: src/global.c:1330
 msgid "Smart home key"
 msgstr "Pametna tipka za Domov"
 
-#: src/global.c:1301
+#: src/global.c:1332
 msgid "Auto indent"
 msgstr "Samodejno zamikanje"
 
-#: src/global.c:1303
+#: src/global.c:1334
 msgid "Cut to end"
 msgstr "Izreži do konca"
 
-#: src/global.c:1305
+#: src/global.c:1336
 #, fuzzy
 msgid "Hard wrapping of overlong lines"
 msgstr "Ne lomi dolgih vrstic"
 
-#: src/global.c:1307
+#: src/global.c:1338
 msgid "Conversion of typed tabs to spaces"
 msgstr "Pretvarjanje tabulatorjev v presledne znake"
 
-#: src/global.c:1309
+#: src/global.c:1340
 msgid "Backup files"
 msgstr "Datoteke varnostnih kopij"
 
-#: src/global.c:1311
+#: src/global.c:1342
 msgid "Reading file into separate buffer"
 msgstr ""
 
-#: src/global.c:1313
+#: src/global.c:1344
 msgid "Mouse support"
 msgstr "Podpora za miško"
 
-#: src/global.c:1315
+#: src/global.c:1346
 msgid "No conversion from DOS/Mac format"
 msgstr "Ni pretvorbe iz oblike DOS/Mac"
 
-#: src/global.c:1317
+#: src/global.c:1348
 msgid "Suspension"
 msgstr "Stanje pripravljenosti"
 
-#: src/help.c:209
+#: src/help.c:211
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1233,7 +1218,7 @@ msgstr ""
 " Predhodni iskalni niz bo prikazan v oklepajih. Pritisk vnosne tipke brez "
 "predhodnega vnosa besedila, izvede predhodno iskanje.  "
 
-#: src/help.c:218
+#: src/help.c:220
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1247,7 +1232,7 @@ msgstr ""
 " V načinu Iskanja so na voljo naslednje funkcijske tipke:\n"
 "\n"
 
-#: src/help.c:224
+#: src/help.c:226
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1267,7 +1252,7 @@ msgstr ""
 "V načinu V vrstico so na voljo naslednje funkcijske tipke:\n"
 "\n"
 
-#: src/help.c:233
+#: src/help.c:235
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1290,7 +1275,7 @@ msgstr ""
 "medpomnilnik (za preklop med medpomnilniki datotek je na voljo bližnjica "
 "Meta-< in >).  "
 
-#: src/help.c:242
+#: src/help.c:244
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1305,7 +1290,7 @@ msgstr ""
 " V načinu vstavljanja datoteke so na voljo naslednje funkcijske tipke:\n"
 "\n"
 
-#: src/help.c:248
+#: src/help.c:250
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1332,7 +1317,7 @@ msgstr ""
 " V načinu zapisovanja so na voljo naslednje funkcijske tipke:\n"
 "\n"
 
-#: src/help.c:262
+#: src/help.c:264
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1355,7 +1340,7 @@ msgstr ""
 "  V načinu brskanja so na voljo naslednje funkcijske tipke:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:277
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1377,7 +1362,7 @@ msgstr ""
 "predhodnega vnosa besedila, izvede predhodno iskanje.\n"
 "\n"
 
-#: src/help.c:284
+#: src/help.c:286
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1385,7 +1370,7 @@ msgstr ""
 " V načinu iskanja v brskalniku so na voljo naslednje funkcijske tipke:\n"
 "\n"
 
-#: src/help.c:288
+#: src/help.c:290
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1408,7 +1393,7 @@ msgstr ""
 "funkcijske tipke:\n"
 "\n"
 
-#: src/help.c:301
+#: src/help.c:303
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1432,7 +1417,7 @@ msgstr ""
 " V načinu črkovanja so na voljo naslednje funkcijske tipke:\n"
 "\n"
 
-#: src/help.c:316
+#: src/help.c:318
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1452,7 +1437,7 @@ msgstr ""
 " V načinu izvajanja ukazov so na voljo naslednje funkcijske tipke:\n"
 "\n"
 
-#: src/help.c:329
+#: src/help.c:331
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1472,15 +1457,15 @@ msgstr ""
 "je osrednje okno urejevalnika z besedilom odprte datoteke. Vrstica stanja je "
 "tretja vrstica od spodaj navzgor, v kateri so izpisana pomembna sporočila."
 
-#: src/help.c:339
+#: src/help.c:341
+#, fuzzy
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
-" The notation for shortcuts is as follows: Control-key sequences are notated "
-"with a caret (^) symbol and can be entered either by using the Control "
-"(Ctrl) key or pressing the Escape (Esc) key twice.  Escape-key sequences are "
-"notated with the Meta (M-) symbol and can be entered using either the Esc, "
-"Alt, or Meta key depending on your keyboard setup.  "
+" Shortcuts are written as follows: Control-key sequences are notated with a "
+"'^' and can be entered either by using the Ctrl key or pressing the Esc key "
+"twice.  Meta-key sequences are notated with 'M-' and can be entered using "
+"either the Alt, Cmd, or Esc key, depending on your keyboard setup.  "
 msgstr ""
 "Spodnji dve vrstici prikazujeta najpogosteje uporabljene bližnjice.\n"
 "\n"
@@ -1508,21 +1493,21 @@ msgstr ""
 msgid "enable/disable"
 msgstr "omogoči/onemogoči"
 
-#: src/nano.c:559
+#: src/nano.c:560
 #, fuzzy
 msgid "Key is invalid in view mode"
 msgstr "Ključ je neveljaven v načinu pogleda"
 
-#: src/nano.c:565
+#: src/nano.c:566
 #, fuzzy
 msgid "This function is disabled in restricted mode"
 msgstr "V omejenem načinu ni mogoče zapustiti %s"
 
-#: src/nano.c:573
+#: src/nano.c:574
 msgid "Help is not available"
 msgstr ""
 
-#: src/nano.c:684
+#: src/nano.c:686
 #, c-format
 msgid ""
 "\n"
@@ -1531,7 +1516,7 @@ msgstr ""
 "\n"
 "Medpomnilnik je zapisan v %s\n"
 
-#: src/nano.c:686
+#: src/nano.c:688
 #, c-format
 msgid ""
 "\n"
@@ -1540,7 +1525,7 @@ msgstr ""
 "\n"
 "Medpomnilnik ni zapisan v %s: %s\n"
 
-#: src/nano.c:689
+#: src/nano.c:691
 #, c-format
 msgid ""
 "\n"
@@ -1805,18 +1790,23 @@ msgstr "Omogoči stanje pripravljenosti"
 msgid "Enable soft line wrapping"
 msgstr "Omogoči blage prelome vrstic"
 
-#: src/nano.c:937
-#, fuzzy, c-format
-msgid " GNU nano, version %s\n"
-msgstr " GNU nano različica %s (kodno prevedena %s, %s)\n"
-
 #: src/nano.c:940
 #, c-format
+msgid " nano, version %s\n"
+msgstr ""
+
+#: src/nano.c:943
+#, c-format
+msgid " (C) 2014..%s the contributors to nano\n"
+msgstr ""
+
+#: src/nano.c:945
+#, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr ""
 " Elektronska pošta: nano@nano-editor.org\tSplet: http://www.nano-editor.org/"
 
-#: src/nano.c:941
+#: src/nano.c:946
 #, c-format
 msgid ""
 "\n"
@@ -1825,69 +1815,82 @@ msgstr ""
 "\n"
 " Kodno prevedene možnosti:"
 
-#: src/nano.c:1073
+#: src/nano.c:1081
 msgid "No file name"
 msgstr ""
 
-#: src/nano.c:1108
-msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
+#: src/nano.c:1115
+msgid "Save modified buffer?  (Answering \"No\" will DISCARD changes.) "
 msgstr ""
-"Ali naj se spremembe datoteke shranijo (z odgovorom \"Ne\" bodo SPREMEMBE "
-"IZGUBLJENE)? "
 
-#: src/nano.c:1168
+#: src/nano.c:1178
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "Na žalost ni bilo mogoče ponovno odpreti stdin s tipkovnice\n"
 
-#: src/nano.c:1192
+#: src/nano.c:1202
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "Branje iz stdin, ^C za prekinitev\n"
 
-#: src/nano.c:1256
+#: src/nano.c:1266
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Prejet je bil SIGHUP ali SIGTERM\n"
 
-#: src/nano.c:1272
+#: src/nano.c:1282
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Za vrnitev v nano uporabite \"fg\".\n"
 
-#: src/nano.c:1294
+#: src/nano.c:1304
 msgid "Suspension is not enabled"
 msgstr ""
 
-#: src/nano.c:1448
+#: src/nano.c:1459
 msgid "enabled"
 msgstr "omogočeno"
 
-#: src/nano.c:1448
+#: src/nano.c:1459
 msgid "disabled"
 msgstr "onemogočeno"
 
-#: src/nano.c:1607 src/winio.c:1125
-msgid "Unknown Command"
-msgstr "Neznan ukaz"
+#: src/nano.c:1573
+msgid "Unbound key"
+msgstr ""
 
-#: src/nano.c:1720
+#: src/nano.c:1577
+#, c-format
+msgid "Unbound key: M-%c"
+msgstr ""
+
+#: src/nano.c:1579
+#, c-format
+msgid "Unbound key: ^%c"
+msgstr ""
+
+#: src/nano.c:1581
+#, c-format
+msgid "Unbound key: %c"
+msgstr ""
+
+#: src/nano.c:1745
 msgid "XON ignored, mumble mumble"
 msgstr "XON je prezrt, mumble mumble"
 
-#: src/nano.c:1725
+#: src/nano.c:1750
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF je prezrt, mumble mumble"
 
-#: src/nano.c:2139 src/rcfile.c:1334
+#: src/nano.c:2166 src/rcfile.c:1187
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Zahtevana velikost tabulatorja \"%s\" je neveljavna"
 
-#: src/nano.c:2200 src/rcfile.c:1259
+#: src/nano.c:2227 src/rcfile.c:1128
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Zahtevana velikost zapolnitve \"%s\" je neveljavna"
 
-#: src/nano.c:2247
+#: src/nano.c:2276
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr ""
@@ -1895,116 +1898,120 @@ msgstr ""
 #. TRANSLATORS: For the next three strings, if possible, specify
 #. * the single-byte shortcuts for both your language and English.
 #. * For example, in French: "OoYy" for "Oui".
-#: src/prompt.c:821
+#: src/prompt.c:818
 msgid "Yy"
 msgstr "DdYy"
 
-#: src/prompt.c:822
+#: src/prompt.c:819
 msgid "Nn"
 msgstr "NnNn"
 
-#: src/prompt.c:823
+#: src/prompt.c:820
 msgid "Aa"
 msgstr "VvAa"
 
-#: src/prompt.c:845
+#: src/prompt.c:842
 msgid "Yes"
 msgstr "Da"
 
-#: src/prompt.c:850
+#: src/prompt.c:847
 msgid "All"
 msgstr "Vse"
 
-#: src/prompt.c:855
+#: src/prompt.c:852
 msgid "No"
 msgstr "Ne"
 
-#: src/rcfile.c:142
+#: src/rcfile.c:144
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Napaka v %s v vrstici %lu: "
 
-#: src/rcfile.c:201
+#: src/rcfile.c:203
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "Argument '%s' ima neuničen \""
 
-#: src/rcfile.c:228 src/rcfile.c:280 src/rcfile.c:732 src/rcfile.c:793
-#: src/rcfile.c:882 src/rcfile.c:933
+#: src/rcfile.c:231 src/rcfile.c:674 src/rcfile.c:725 src/rcfile.c:824
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Nizi logičnega izraza se morajo začeti in končati z znakom \""
 
-#: src/rcfile.c:254 src/search.c:62
+#: src/rcfile.c:257 src/search.c:61
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Slab logični izraz \"%s\": %s"
 
-#: src/rcfile.c:274
+#: src/rcfile.c:279
 msgid "Missing syntax name"
 msgstr "Manjka ime skladnje"
 
-#: src/rcfile.c:345
+#: src/rcfile.c:288
+msgid "A syntax name must be quoted"
+msgstr ""
+
+#: src/rcfile.c:297
 msgid "The \"none\" syntax is reserved"
 msgstr "Skladnja \"none\" je pridržana"
 
-#: src/rcfile.c:352
-msgid "The \"default\" syntax must take no extensions"
+#: src/rcfile.c:327
+#, fuzzy
+msgid "The \"default\" syntax does not accept extensions"
 msgstr "Skladnja \"default\" ne sme prejeti nobene pripone"
 
-#: src/rcfile.c:424
+#: src/rcfile.c:369
 msgid "Missing key name"
 msgstr "Manjka ime tipke"
 
-#: src/rcfile.c:433 src/rcfile.c:444
+#: src/rcfile.c:378 src/rcfile.c:389
 msgid "Key name is too short"
 msgstr ""
 
-#: src/rcfile.c:454
+#: src/rcfile.c:399
 #, fuzzy
 msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr "Tipkovne bližnjice se morajo začeti s \"^\", \"M\", ali \"F\""
 
-#: src/rcfile.c:457
+#: src/rcfile.c:402
 #, fuzzy, c-format
 msgid "Key name %s is invalid"
 msgstr "Zahtevana velikost tabulatorja \"%s\" je neveljavna"
 
-#: src/rcfile.c:466
+#: src/rcfile.c:411
 #, fuzzy
 msgid "Must specify a function to bind the key to"
 msgstr "Treba je navesti funkcijo, ki se veže na tipko"
 
 #. TRANSLATORS: Do not translate the word "all".
-#: src/rcfile.c:476
+#: src/rcfile.c:421
 msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
 
-#: src/rcfile.c:483
+#: src/rcfile.c:428
 #, fuzzy, c-format
 msgid "Cannot map name \"%s\" to a function"
 msgstr "Ni mogoče preslikati imena \"%s\" k funkciji"
 
-#: src/rcfile.c:490
+#: src/rcfile.c:435
 #, fuzzy, c-format
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "Ni mogoče preslikati imena \"%s\" k meniju"
 
-#: src/rcfile.c:522
+#: src/rcfile.c:467
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr ""
 
-#: src/rcfile.c:534
+#: src/rcfile.c:479
 #, fuzzy, c-format
 msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "Na žalost je pritisk tipk \"%s\" neveljavna vezava"
 
-#: src/rcfile.c:631
+#: src/rcfile.c:576
 #, fuzzy, c-format
 msgid "Error expanding %s: %s"
 msgstr "Napaka med branjem %s: %s"
 
-#: src/rcfile.c:674
+#: src/rcfile.c:616
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -2019,64 +2026,50 @@ msgstr ""
 "\"black\", z neobvezno predpono \"bright\"\n"
 "za osprednje barve."
 
-#: src/rcfile.c:696
-msgid "Cannot add a color command without a syntax command"
-msgstr "Ni mogoče dodati ukaza barve brez ukaza skladnje"
+#: src/rcfile.c:637 src/rcfile.c:795 src/rcfile.c:858
+#, c-format
+msgid "A '%s' command requires a preceding 'syntax' command"
+msgstr ""
 
-#: src/rcfile.c:701
+#: src/rcfile.c:643
 msgid "Missing color name"
 msgstr "Manjka ime barve"
 
-#: src/rcfile.c:711 src/rcfile.c:872
-msgid "Missing regex string"
+#: src/rcfile.c:653 src/rcfile.c:807
+#, fuzzy, c-format
+msgid "Missing regex string after '%s' command"
 msgstr "Manjka niz logičnega izraza"
 
-#: src/rcfile.c:787
+#: src/rcfile.c:719
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\" potrebuje ustrezen \"end=\""
 
-#: src/rcfile.c:839
+#: src/rcfile.c:768
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
 msgstr "Barva ozadja \"%s\" ne more biti svetla"
 
-#: src/rcfile.c:867
-msgid "Cannot add a header regex without a syntax command"
-msgstr "Ni mogoče dodati logičnega izraza glave brez ukaza skladnje"
-
-#: src/rcfile.c:922
-msgid "Cannot add a magic string regex without a syntax command"
-msgstr "Ni mogoče dodati logičnega izraza čarobnega niza brez ukaza skladnje"
-
-#: src/rcfile.c:927
-msgid "Missing magic string name"
-msgstr "Manjka ime čarobnega niza"
-
-#: src/rcfile.c:985
-#, fuzzy
-msgid "Cannot add a linter without a syntax command"
-msgstr "Ni mogoče dodati logičnega izraza glave brez ukaza skladnje"
-
-#: src/rcfile.c:990
-#, fuzzy
-msgid "Missing linter command"
-msgstr "Manjka ime barve"
-
-#: src/rcfile.c:1011
-#, fuzzy
-msgid "Cannot add formatter without a syntax command"
-msgstr "Ni mogoče dodati ukaza barve brez ukaza skladnje"
+#: src/rcfile.c:802
+#, fuzzy, c-format
+msgid "The \"default\" syntax does not accept '%s' regexes"
+msgstr "Skladnja \"default\" ne sme prejeti nobene pripone"
 
-#: src/rcfile.c:1016
-msgid "Missing formatter command"
+#: src/rcfile.c:863
+#, c-format
+msgid "Missing command after '%s'"
 msgstr ""
 
-#: src/rcfile.c:1046
+#: src/rcfile.c:879
+#, fuzzy, c-format
+msgid "Argument of '%s' lacks closing \""
+msgstr "Argument '%s' ima neuničen \""
+
+#: src/rcfile.c:910
 #, fuzzy, c-format
 msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr "Usodna napaka: nobenih tipk ni preslikanih za funkcijo \"%s\""
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:912
 #, fuzzy, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
@@ -2084,63 +2077,63 @@ msgstr ""
 "Poteka končanje programa. Za prilagajanje nastavitev nanorc, uporabite ukaz "
 "nano z možnostjo -I.\n"
 
-#: src/rcfile.c:1109
+#: src/rcfile.c:971
 #, fuzzy, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "Ni mogoče preslikati imena \"%s\" k meniju"
 
-#: src/rcfile.c:1125 src/rcfile.c:1134 src/rcfile.c:1144
-#, c-format
-msgid "Command \"%s\" not allowed in included file"
-msgstr "Ukaz \"%s\" ni dovoljen v vključeni datoteki"
-
-#: src/rcfile.c:1150 src/rcfile.c:1359
+#: src/rcfile.c:993 src/rcfile.c:1202
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Skladnja \"%s\" nima ukazov barv"
 
-#: src/rcfile.c:1180
+#: src/rcfile.c:1024
+#, c-format
+msgid "Command \"%s\" not allowed in included file"
+msgstr "Ukaz \"%s\" ni dovoljen v vključeni datoteki"
+
+#: src/rcfile.c:1039
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Ukaz \"%s\" ni razumljiv"
 
-#: src/rcfile.c:1195
+#: src/rcfile.c:1051
 #, fuzzy
 msgid "Missing option"
 msgstr "Manjka ime barve"
 
-#: src/rcfile.c:1217
+#: src/rcfile.c:1065
+#, fuzzy, c-format
+msgid "Unknown option \"%s\""
+msgstr "Neznana zastavica \"%s\""
+
+#: src/rcfile.c:1077
+#, fuzzy, c-format
+msgid "Cannot unset option \"%s\""
+msgstr "Ni mogoče ponastaviti zastavice \"%s\""
+
+#: src/rcfile.c:1089
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Možnost \"%s\" zahteva argument"
 
-#: src/rcfile.c:1235
+#: src/rcfile.c:1105
 msgid "Option is not a valid multibyte string"
 msgstr "Možnost ni veljaven večbajtni niz"
 
-#: src/rcfile.c:1272 src/rcfile.c:1300 src/rcfile.c:1309
+#: src/rcfile.c:1139 src/rcfile.c:1160 src/rcfile.c:1167
 msgid "Non-blank characters required"
 msgstr "Zahtevani so ne-prazni znaki"
 
-#: src/rcfile.c:1282
+#: src/rcfile.c:1146
 msgid "Two single-column characters required"
 msgstr "Potrebna sta dva enostolpčna znaka"
 
-#: src/rcfile.c:1348
-#, fuzzy, c-format
-msgid "Cannot unset option \"%s\""
-msgstr "Ni mogoče ponastaviti zastavice \"%s\""
-
-#: src/rcfile.c:1354
-#, fuzzy, c-format
-msgid "Unknown option \"%s\""
-msgstr "Neznana zastavica \"%s\""
-
-#: src/rcfile.c:1413
+#: src/rcfile.c:1258
 msgid "I can't find my home directory!  Wah!"
 msgstr "Ni mogoče najti domače mape!"
 
-#: src/rcfile.c:1451
+#: src/rcfile.c:1295
 #, c-format
 msgid ""
 "\n"
@@ -2149,44 +2142,49 @@ msgstr ""
 "\n"
 "Za nadaljevanje uporabe programa nano pritisnite vnosno tipko.\n"
 
-#: src/search.c:96
+#: src/search.c:95
 #, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "\"%.*s%s\" ni mogoče najti"
 
 #. TRANSLATORS: The next three strings are modifiers of the search prompt.
-#: src/search.c:176
+#: src/search.c:169
 msgid " [Case Sensitive]"
 msgstr " [Case Sensitive]"
 
-#: src/search.c:180
+#: src/search.c:173
 msgid " [Regexp]"
 msgstr " [Regexp]"
 
-#: src/search.c:184
+#: src/search.c:177
 msgid " [Backwards]"
 msgstr " [Backwards]"
 
 #. TRANSLATORS: The next two strings are modifiers of the search prompt.
-#: src/search.c:189
+#: src/search.c:182
 msgid " (to replace) in selection"
 msgstr " (za zamenjavo) v izbor"
 
-#: src/search.c:191
+#: src/search.c:184
 msgid " (to replace)"
 msgstr " (za zamenjavo)"
 
+#: src/search.c:305
+#, fuzzy
+msgid "Searching..."
+msgstr "Iskanje"
+
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:718
+#: src/search.c:693
 msgid "Replace this instance?"
 msgstr "Ali naj se primerek zamenja?"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:883
+#: src/search.c:840
 msgid "Replace with"
 msgstr "Zamenjaj z"
 
-#: src/search.c:924
+#: src/search.c:875
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
@@ -2196,300 +2194,388 @@ msgstr[2] "Zamenjani sta %lu pojavitvi"
 msgstr[3] "Zamenjane so %lu pojavitve"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:964
+#: src/search.c:914
 msgid "Enter line number, column number"
 msgstr "Vnesite Å¡tevilko vrstice, Å¡tevilko stolpca"
 
-#: src/search.c:991
+#: src/search.c:939
 msgid "Invalid line or column number"
 msgstr "Neveljavna Å¡tevilka vrstice ali stolpca"
 
-#: src/search.c:1124
+#: src/search.c:1080
 msgid "Not a bracket"
 msgstr "Ni oklepaj"
 
-#: src/search.c:1191
+#: src/search.c:1146
 msgid "No matching bracket"
 msgstr "Ni ujemajočega oklepaja"
 
-#: src/text.c:54
+#: src/text.c:53
 msgid "Mark Set"
 msgstr "Označba je nastavljena"
 
-#: src/text.c:58
+#: src/text.c:57
 msgid "Mark Unset"
 msgstr "Označba je ponastavljena"
 
-#: src/text.c:70
+#: src/text.c:69
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Napaka pri priklicu \"%s\""
 
-#: src/text.c:475
+#: src/text.c:468
+msgid "Commenting is not supported for this file type"
+msgstr ""
+
+#: src/text.c:484
+msgid "Cannot comment past end of file"
+msgstr ""
+
+#: src/text.c:677
 msgid "Nothing in undo buffer!"
 msgstr "Ničesar ni v medpomnilniku razveljavitve!"
 
-#: src/text.c:481 src/text.c:634
-#, fuzzy, c-format
-msgid "Internal error: can't match line %d.  Please save your work."
-msgstr "Notranja napaka: ni mogoče primerjati vrstice %d. Shranite svoje delo."
-
 #. TRANSLATORS: Eight of the next nine strings describe actions
 #. * that are undone or redone.  It are all nouns, not verbs.
-#: src/text.c:495 src/text.c:524 src/text.c:645 src/text.c:686
+#: src/text.c:695 src/text.c:724 src/text.c:857 src/text.c:898
 msgid "text add"
 msgstr "dodaj besedilo"
 
-#: src/text.c:505 src/text.c:656
+#: src/text.c:705 src/text.c:868
 msgid "text delete"
 msgstr "izbriši besedilo"
 
-#: src/text.c:528 src/text.c:694
+#: src/text.c:728 src/text.c:907
 msgid "line join"
 msgstr "združi vrstici"
 
-#: src/text.c:547 src/text.c:710
+#: src/text.c:747 src/text.c:923
 msgid "text cut"
 msgstr "izreži besedilo"
 
-#: src/text.c:552 src/text.c:714
+#: src/text.c:752 src/text.c:927
 msgid "text uncut"
 msgstr "odizreži besedilo"
 
-#: src/text.c:558 src/text.c:691
+#: src/text.c:758 src/text.c:903
 #, fuzzy
 msgid "Internal error: line is missing.  Please save your work."
 msgstr ""
 "Notranja napaka: ni mogoče nastaviti preklica izreza. Shranite svoje delo."
 
-#: src/text.c:561 src/text.c:665
+#: src/text.c:762 src/text.c:877
 msgid "line break"
 msgstr "prekini vrstico"
 
-#: src/text.c:569 src/text.c:725
+#: src/text.c:772 src/text.c:947
+msgid "comment"
+msgstr ""
+
+#: src/text.c:776 src/text.c:951
+msgid "uncomment"
+msgstr ""
+
+#: src/text.c:780 src/text.c:938
 msgid "text insert"
 msgstr "vnesi besedilo"
 
-#: src/text.c:589 src/text.c:718
+#: src/text.c:800 src/text.c:931
 msgid "text replace"
 msgstr "zamenjaj besedilo"
 
-#: src/text.c:596 src/text.c:732 src/text.c:1030 src/text.c:1174
+#: src/text.c:807 src/text.c:955 src/text.c:1267 src/text.c:1437
 msgid "Internal error: unknown type.  Please save your work."
 msgstr "Notranja napaka: neznana vrsta. Shranite svoje delo."
 
-#: src/text.c:601
+#: src/text.c:813
 #, c-format
 msgid "Undid action (%s)"
 msgstr "Ponastavljeno dejanje (%s)"
 
-#: src/text.c:619
+#: src/text.c:832
 msgid "Nothing to re-do!"
 msgstr "Ničesar ni mogoče uveljaviti!"
 
-#: src/text.c:628
+#: src/text.c:841
 #, fuzzy
 msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
 "Notranja napaka: ni mogoče nastaviti preklica izreza. Shranite svoje delo."
 
-#: src/text.c:737
+#: src/text.c:961
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Uveljavljeno dejanje (%s)"
 
-#: src/text.c:827 src/text.c:2508 src/text.c:2944
+#: src/text.c:1051 src/text.c:2765 src/text.c:3198
 msgid "Could not create pipe"
 msgstr "Ni mogoče ustvariti cevi"
 
-#: src/text.c:853 src/text.c:2595 src/text.c:2750 src/text.c:2992
-#: src/text.c:3286
+#: src/text.c:1077 src/text.c:2852 src/text.c:3005 src/text.c:3246
+#: src/text.c:3540
 msgid "Could not fork"
 msgstr "Ni mogoče razvejiti"
 
-#: src/text.c:1853
+#: src/text.c:2117
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Slab niz navedka %s: %s"
 
-#: src/text.c:2241
+#: src/text.c:2499
 msgid "Can now UnJustify!"
 msgstr "Zdaj je mogoče preklicati poravnavo!"
 
-#: src/text.c:2435
+#: src/text.c:2697
 msgid "Edit a replacement"
 msgstr "Uredi zamenjavo"
 
-#: src/text.c:2510
+#. TRANSLATORS: Shown after fixing misspellings in one word.
+#: src/text.c:2713
+#, fuzzy
+msgid "Next word..."
+msgstr "Nasl. bes."
+
+#: src/text.c:2767
 msgid "Creating misspelled word list, please wait..."
 msgstr "Ustvarjanje napačno črkovanega seznama besed, počakajte ..."
 
-#: src/text.c:2601 src/text.c:2999
+#: src/text.c:2858 src/text.c:3253
 msgid "Could not get size of pipe buffer"
 msgstr "Ni mogoče pridobiti velikosti medpomnilnika cevi"
 
-#: src/text.c:2652
+#: src/text.c:2907
 msgid "Error invoking \"spell\""
 msgstr "Napaka pri priklicu \"spell\""
 
-#: src/text.c:2655
+#: src/text.c:2910
 msgid "Error invoking \"sort -f\""
 msgstr "Napaka pri priklicu \"sort -f\""
 
-#: src/text.c:2658
+#: src/text.c:2913
 msgid "Error invoking \"uniq\""
 msgstr "Napaka pri priklicu \"uniq\""
 
-#: src/text.c:2881
+#: src/text.c:3135
 #, fuzzy
 msgid "Invoking spell checker, please wait"
 msgstr "Vključi črkovalnik, če je na voljo"
 
-#: src/text.c:2897
+#: src/text.c:3151
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Preverjanje črkovanja je spodletelo: %s"
 
-#: src/text.c:2899
+#: src/text.c:3153
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Preverjanje črkovanja je spodletelo: %s: %s"
 
-#: src/text.c:2902
+#: src/text.c:3156
 msgid "Finished checking spelling"
 msgstr "Končano preverjanje črkovanja"
 
-#: src/text.c:2927
+#: src/text.c:3181
 #, fuzzy
 msgid "No linter defined for this type of file!"
 msgstr "Ne dodajaj novih vrstic na konec datotek"
 
-#: src/text.c:2932
+#: src/text.c:3186
 msgid "Save modified buffer before linting?"
 msgstr ""
 
-#: src/text.c:2949
+#: src/text.c:3203
 msgid "Invoking linter, please wait"
 msgstr ""
 
-#: src/text.c:3105
+#: src/text.c:3358
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr ""
 
-#: src/text.c:3134
+#: src/text.c:3388
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
 
-#: src/text.c:3153
+#: src/text.c:3407
 msgid "No more errors in unopened files, cancelling"
 msgstr ""
 
-#: src/text.c:3192
+#: src/text.c:3446
 #, fuzzy
 msgid "At last message"
 msgstr "Pokaži to sporočilo"
 
-#: src/text.c:3197
+#: src/text.c:3451
 #, fuzzy
 msgid "At first message"
 msgstr "Pokaži to sporočilo"
 
-#: src/text.c:3237
+#: src/text.c:3491
 msgid "Finished"
 msgstr ""
 
-#: src/text.c:3259
+#: src/text.c:3513
 msgid "Invoking formatter, please wait"
 msgstr ""
 
-#: src/text.c:3314
+#: src/text.c:3568
 msgid "Finished formatting"
 msgstr ""
 
-#: src/text.c:3396
+#: src/text.c:3650
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sBesede: %lu  Vrstice: %ld  Znaki: %lu"
 
-#: src/text.c:3397
+#: src/text.c:3651
 msgid "In Selection:  "
 msgstr "V izboru:  "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3411
+#: src/text.c:3665
 msgid "Verbatim Input"
 msgstr "Natančni vnos"
 
-#: src/utils.c:391 src/utils.c:403
+#: src/utils.c:392 src/utils.c:404
 msgid "nano is out of memory!"
 msgstr "Programu nano je zmanjkalo pomnilnika!"
 
+#: src/utils.c:625
+#, fuzzy, c-format
+msgid "Internal error: can't match line %d.  Please save your work."
+msgstr "Notranja napaka: ni mogoče primerjati vrstice %d. Shranite svoje delo."
+
+#. TRANSLATORS: This refers to a sequence of escape codes
+#. * (from the keyboard) that nano does not know about.
+#: src/winio.c:1121
+msgid "Unknown sequence"
+msgstr ""
+
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
 #: src/winio.c:1427
 msgid "Unicode Input"
 msgstr "Vnos Unikod"
 
-#: src/winio.c:1991 src/winio.c:1995
-msgid "Modified"
-msgstr "Spremenjeno"
-
-#: src/winio.c:1992
-msgid "View"
-msgstr "Pogled"
-
-#: src/winio.c:2006
+#: src/winio.c:1960
 msgid "DIR:"
 msgstr "MAPA:"
 
-#: src/winio.c:2013
+#: src/winio.c:1968
 msgid "File:"
 msgstr "Datoteka:"
 
-#: src/winio.c:3141
+#: src/winio.c:1972 src/winio.c:1976
+msgid "Modified"
+msgstr "Spremenjeno"
+
+#: src/winio.c:1974
+msgid "View"
+msgstr "Pogled"
+
+#: src/winio.c:3105
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "vrstica %ld/%ld (%d%%), stolpec %lu/%lu (%d%%), znak %lu/%lu (%d%%)"
 
-#: src/winio.c:3271
+#: src/winio.c:3235
 msgid "The nano text editor"
 msgstr "Urejevalnik besedil nano"
 
-#: src/winio.c:3272
+#: src/winio.c:3236
 msgid "version"
 msgstr "različica"
 
-#: src/winio.c:3273
+#: src/winio.c:3237
 msgid "Brought to you by:"
 msgstr "Zaslužni za izid programa:"
 
-#: src/winio.c:3274
+#: src/winio.c:3238
 msgid "Special thanks to:"
 msgstr "Posebna zahvala:"
 
-#: src/winio.c:3275
+#: src/winio.c:3239
 msgid "The Free Software Foundation"
 msgstr "The Free Software Foundation"
 
-#: src/winio.c:3276
+#: src/winio.c:3240
 msgid "the many translators and the TP"
 msgstr ""
 
-#: src/winio.c:3277
+#: src/winio.c:3241
 msgid "For ncurses:"
 msgstr "Za ncurses:"
 
-#: src/winio.c:3278
+#: src/winio.c:3242
 msgid "and anyone else we forgot..."
 msgstr "in vse, ki smo jih pozabili navesti ..."
 
-#: src/winio.c:3279
+#: src/winio.c:3243
 msgid "Thank you for using nano!"
 msgstr "Hvala, ker uporabljate nano!"
 
+#~ msgid ""
+#~ "Read %lu line (Converted from DOS and Mac format - Warning: No write "
+#~ "permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from DOS and Mac format - Warning: No write "
+#~ "permission)"
+#~ msgstr[0] ""
+#~ "Prebranih je %lu vrstic (pretvorjeno iz oblike DOS in Mac - Opozorilo: ni "
+#~ "dovoljenj za pisanje)"
+#~ msgstr[1] ""
+#~ "Prebrana je %lu vrstica (pretvorjeno iz oblike DOS in Mac - Opozorilo: ni "
+#~ "dovoljenj za pisanje)"
+#~ msgstr[2] ""
+#~ "Prebrani sta %lu vrstici (pretvorjeno iz oblike DOS in Mac - Opozorilo: "
+#~ "ni dovoljenj za pisanje)"
+#~ msgstr[3] ""
+#~ "Prebrane so %lu vrstice (pretvorjeno iz oblike DOS in Mac - Opozorilo: ni "
+#~ "dovoljenj za pisanje)"
+
+#~ msgid ""
+#~ "Read %lu line (Converted from Mac format - Warning: No write permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from Mac format - Warning: No write permission)"
+#~ msgstr[0] ""
+#~ "Prebranih je %lu vrstic (pretvorjeno iz oblike Mac - Opozorilo: ni "
+#~ "dovoljenj za pisanje)"
+#~ msgstr[1] ""
+#~ "Prebrana je %lu vrstica (pretvorjeno iz oblike Mac - Opozorilo: ni "
+#~ "dovoljenj za pisanje)"
+#~ msgstr[2] ""
+#~ "Prebrani sta %lu vrstici (pretvorjeno iz oblike Mac - Opozorilo: ni "
+#~ "dovoljenj za pisanje)"
+#~ msgstr[3] ""
+#~ "Prebrane so %lu vrstice (pretvorjeno iz oblike Mac - Opozorilo: ni "
+#~ "dovoljenj za pisanje)"
+
+#~ msgid ""
+#~ "Read %lu line (Converted from DOS format - Warning: No write permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from DOS format - Warning: No write permission)"
+#~ msgstr[0] ""
+#~ "Prebranih je %lu vrstic (Pretvorjeno iz oblike DOS - Opozorilo: ni "
+#~ "dovoljenj za pisanje)"
+#~ msgstr[1] ""
+#~ "Prebrana je %lu vrstica (Pretvorjeno iz oblike DOS - Opozorilo: ni "
+#~ "dovoljenj za pisanje)"
+#~ msgstr[2] ""
+#~ "Prebrani sta %lu vrstici (Pretvorjeno iz oblike DOS - Opozorilo: ni "
+#~ "dovoljenj za pisanje)"
+#~ msgstr[3] ""
+#~ "Prebrane so %lu vrstice (Pretvorjeno iz oblike DOS - Opozorilo: ni "
+#~ "dovoljenj za pisanje)"
+
+#~ msgid "Read %lu line ( Warning: No write permission)"
+#~ msgid_plural "Read %lu lines (Warning: No write permission)"
+#~ msgstr[0] "Prebranih je %lu vrstic (opozorilo: ni dovoljenj za pisanje)"
+#~ msgstr[1] "Prebrana je %lu vrstica (opozorilo: ni dovoljenj za pisanje)"
+#~ msgstr[2] "Prebrani sta %lu vrstici (opozorilo: ni dovoljenj za pisanje)"
+#~ msgstr[3] "Prebrane so %lu vrstice (opozorilo: ni dovoljenj za pisanje)"
+
 #~ msgid "Cannot prepend or append to a symlink with --nofollow set"
 #~ msgstr ""
 #~ "Ni mogoče pripeti na začetek ali pripeti k simbolni povezavi z --nofollow"
@@ -2524,12 +2610,36 @@ msgstr "Hvala, ker uporabljate nano!"
 #~ msgid "(ignored, for Pico compatibility)"
 #~ msgstr "(prezrto, za združljivost s programom Pico)"
 
+#~ msgid " GNU nano version %s (compiled %s, %s)\n"
+#~ msgstr " GNU nano različica %s (kodno prevedena %s, %s)\n"
+
 #~ msgid "Sorry, support for this function has been disabled"
 #~ msgstr "Žal je podpora za to funkcijo onemogočena"
 
+#~ msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
+#~ msgstr ""
+#~ "Ali naj se spremembe datoteke shranijo (z odgovorom \"Ne\" bodo SPREMEMBE "
+#~ "IZGUBLJENE)? "
+
+#~ msgid "Unknown Command"
+#~ msgstr "Neznan ukaz"
+
+#~ msgid "Cannot add a magic string regex without a syntax command"
+#~ msgstr ""
+#~ "Ni mogoče dodati logičnega izraza čarobnega niza brez ukaza skladnje"
+
+#~ msgid "Missing magic string name"
+#~ msgstr "Manjka ime čarobnega niza"
+
 #~ msgid "Must specify menu to bind key to (or \"all\")"
 #~ msgstr "Treba je navesti meni, ki se veže na tipko (ali \"all\")"
 
+#~ msgid "Cannot add a color command without a syntax command"
+#~ msgstr "Ni mogoče dodati ukaza barve brez ukaza skladnje"
+
+#~ msgid "Cannot add a header regex without a syntax command"
+#~ msgstr "Ni mogoče dodati logičnega izraza glave brez ukaza skladnje"
+
 #~ msgid "Missing flag"
 #~ msgstr "Manjka zastavica"
 
diff --git a/po/sr.po b/po/sr.po
index 8ff4b482..f69e97da 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -2,13 +2,13 @@
 # Copyright (C) 2015 Free Software Foundation, Inc.
 # This file is distributed under the same license as the nano package.
 # Danilo Segan <dsegan@gmx.net>, 2003.
-# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2013—2015.
+# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2013—2016.
 msgid ""
 msgstr ""
-"Project-Id-Version: nano-2.5.0\n"
+"Project-Id-Version: nano-2.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-25 16:41-0500\n"
-"PO-Revision-Date: 2015-12-26 22:49+0200\n"
+"POT-Creation-Date: 2016-06-17 15:41+0200\n"
+"PO-Revision-Date: 2016-03-05 10:10+0200\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <(nothing)>\n"
 "Language: sr\n"
@@ -18,162 +18,180 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#: src/browser.c:144 src/browser.c:284 src/browser.c:334 src/files.c:996
+#: src/files.c:1003 src/files.c:1794 src/files.c:1919 src/files.c:1963
+#: src/files.c:1983 src/files.c:2099 src/files.c:3019 src/files.c:3242
+#: src/rcfile.c:540 src/rcfile.c:1280
+#, c-format
+msgid "Error reading %s: %s"
+msgstr "Грешка при читању „%s“: %s"
+
 #. TRANSLATORS: This is a prompt.
-#: src/browser.c:220
+#: src/browser.c:247
 msgid "Go To Directory"
 msgstr "Иди у директоријум"
 
-#: src/browser.c:227 src/browser.c:738 src/files.c:1174 src/files.c:2340
-#: src/nano.c:1120 src/search.c:202 src/search.c:290 src/search.c:895
-#: src/search.c:970 src/text.c:2935 src/text.c:3142
+#: src/browser.c:254 src/browser.c:723 src/files.c:1126 src/files.c:2292
+#: src/nano.c:1128 src/search.c:195 src/search.c:297 src/search.c:851
+#: src/search.c:918 src/text.c:3189 src/text.c:3396
 msgid "Cancelled"
 msgstr "Отказано"
 
-#: src/browser.c:253 src/browser.c:300
-#, c-format
-msgid "Can't go outside of %s in restricted mode"
+#. TRANSLATORS: This refers to the option --operatingdir,
+#. * not to --restricted.
+#: src/browser.c:274 src/browser.c:326
+#, fuzzy, c-format
+msgid "Can't go outside of %s in confined mode"
 msgstr "Не могу да идем ван „%s“ у ограниченом режиму"
 
-#: src/browser.c:264 src/browser.c:310 src/browser.c:326 src/files.c:1044
-#: src/files.c:1052 src/files.c:1844 src/files.c:1971 src/files.c:2016
-#: src/files.c:2037 src/files.c:2156 src/files.c:3062 src/files.c:3285
-#: src/rcfile.c:596 src/rcfile.c:1435
-#, c-format
-msgid "Error reading %s: %s"
-msgstr "Грешка при читању „%s“: %s"
-
-#: src/browser.c:290
+#: src/browser.c:317
 msgid "Can't move up a directory"
 msgstr "Не могу да идем директоријум изнад"
 
 #. TRANSLATORS: Try to keep this at most 7 characters.
-#: src/browser.c:615 src/browser.c:623
+#: src/browser.c:590 src/browser.c:598
 msgid "(dir)"
 msgstr "(дир)"
 
 #. TRANSLATORS: Try to keep this at most 12 characters.
-#: src/browser.c:620
+#: src/browser.c:595
 msgid "(parent dir)"
 msgstr "(главни дир)"
 
 #. TRANSLATORS: Try to keep this at most 7 characters.
 #. * If necessary, you can leave out the parentheses.
-#: src/browser.c:650
+#: src/browser.c:625
 msgid "(huge)"
 msgstr "(велик)"
 
 #. TRANSLATORS: This is the main search prompt.
-#: src/browser.c:727 src/search.c:173
+#: src/browser.c:712 src/search.c:166
 msgid "Search"
 msgstr "Тражи"
 
-#: src/browser.c:777 src/search.c:466 src/search.c:536
-msgid "This is the only occurrence"
-msgstr "Ово је једина појава"
-
-#: src/browser.c:793 src/search.c:364
+#: src/browser.c:754 src/search.c:368
 msgid "Search Wrapped"
 msgstr "Тражи у круг"
 
-#: src/browser.c:843 src/search.c:517
+#: src/browser.c:764 src/search.c:509
+msgid "This is the only occurrence"
+msgstr "Ово је једина појава"
+
+#: src/browser.c:812 src/search.c:473
 msgid "No current search pattern"
 msgstr "Нема шаблона текуће претраге"
 
-#: src/files.c:50
+#: src/color.c:186
 #, fuzzy, c-format
+msgid "Unknown syntax name: %s"
+msgstr "Недостаје назив синтаксе"
+
+#: src/color.c:247
+#, c-format
+msgid "magic_load() failed: %s"
+msgstr ""
+
+#: src/color.c:251
+#, c-format
+msgid "magic_file(%s) failed: %s"
+msgstr ""
+
+#: src/files.c:47
+#, c-format
 msgid "Directory '%s' does not exist"
-msgstr "Грешка писања датотеке закључавања: Директоријум „%s“ не постоји"
+msgstr "Директоријум „%s“ не постоји"
 
-#: src/files.c:52
+#: src/files.c:49
 #, c-format
 msgid "Path '%s': %s"
-msgstr ""
+msgstr "Путања „%s“: %s"
 
-#: src/files.c:54
-#, fuzzy, c-format
+#: src/files.c:51
+#, c-format
 msgid "Path '%s' is not a directory"
-msgstr "„%s“ је директоријум"
+msgstr "Путања „%s“ није директоријум"
 
-#: src/files.c:57
+#: src/files.c:53
 #, c-format
 msgid "Path '%s' is not accessible"
-msgstr ""
+msgstr "Путањи „%s“ се не може приступати"
 
-#. TRANSLATORS: Try to keep this at most 76 characters.
-#: src/files.c:158
+#. TRANSLATORS: Keep the next ten messages at most 76 characters.
+#: src/files.c:148
 msgid ""
 "Warning: Modifying a file which is not locked, check directory permission?"
 msgstr ""
 "Упозорење: Мењам датотеку која није закључана, да проверим дозволе "
 "директоријума?"
 
-#: src/files.c:197
+#: src/files.c:187
 msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
 msgstr ""
 "Не могу да одредим мој идентет за датотеку закључавања (није успело "
 "„getpwuid()“)"
 
-#: src/files.c:206
+#: src/files.c:196
 #, c-format
 msgid "Couldn't determine hostname for lock file: %s"
 msgstr "Не могу да одредим назив домаћина за датотеку закључавања: %s"
 
-#: src/files.c:227 src/files.c:238 src/files.c:275 src/files.c:285
+#: src/files.c:216 src/files.c:225 src/files.c:262 src/files.c:272
 #, c-format
 msgid "Error writing lock file %s: %s"
 msgstr "Грешка записивања датотеке закључавања „%s“: %s"
 
-#: src/files.c:305
+#: src/files.c:291
 #, c-format
 msgid "Error deleting lock file %s: %s"
 msgstr "Грешка брисања датотеке закључавања „%s“: %s"
 
-#: src/files.c:341
+#: src/files.c:325
 #, c-format
 msgid "Error opening lock file %s: %s"
 msgstr "Грешка отварања датотеке закључавања „%s“: %s"
 
-#: src/files.c:353
+#: src/files.c:337
 #, c-format
 msgid "Error reading lock file %s: Not enough data read"
 msgstr "Грешка читања датотеке закључавања „%s“: Нема довољно података читања"
 
 #. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
-#: src/files.c:371
+#: src/files.c:354
 #, c-format
 msgid "File %s is being edited (by %s with %s, PID %d); continue?"
 msgstr "Датотека „%s“ је измењена (од стране %s са %s, ЛИБ %d); да наставим?"
 
-#: src/files.c:426
+#: src/files.c:430
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Не могу да уметнем датотеку изван %s"
 
-#: src/files.c:439 src/files.c:1038 src/rcfile.c:589 src/rcfile.c:1385
-#: src/rcfile.c:1426
+#: src/files.c:445 src/files.c:991 src/rcfile.c:533 src/rcfile.c:1230
+#: src/rcfile.c:1271
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "„%s“ је директоријум"
 
-#: src/files.c:441
+#: src/files.c:447
 #, c-format
 msgid "\"%s\" is not a normal file"
 msgstr "„%s“ није обична датотека"
 
-#: src/files.c:566
+#: src/files.c:571
 msgid "No more open file buffers"
 msgstr "Нема више међумеморије отворених датотека"
 
-#: src/files.c:582
+#: src/files.c:586
 #, c-format
 msgid "Switched to %s"
 msgstr "Прешао сам на %s"
 
-#: src/files.c:584 src/global.c:988 src/winio.c:2010
+#: src/files.c:588 src/global.c:1005 src/winio.c:1965
 msgid "New Buffer"
 msgstr "Нова међумеморија"
 
-#: src/files.c:943
+#. TRANSLATORS: Keep the next four messages at most 76 characters.
+#: src/files.c:913
 #, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
@@ -181,25 +199,7 @@ msgstr[0] "Учитах %lu ред (претворен из ДОС и Мекин
 msgstr[1] "Учитах %lu реда (претворених из ДОС и Мекинтош записа)"
 msgstr[2] "Учитах %lu редова (претворених из ДОС и Мекинтош записа)"
 
-#: src/files.c:948
-#, c-format
-msgid ""
-"Read %lu line (Converted from DOS and Mac format - Warning: No write "
-"permission)"
-msgid_plural ""
-"Read %lu lines (Converted from DOS and Mac format - Warning: No write "
-"permission)"
-msgstr[0] ""
-"Учитах %lu ред (претворен из ДОС и Мекинтош записа — упозорење: нема дозволе "
-"за писање)"
-msgstr[1] ""
-"Учитах %lu реда (претворених из ДОС и Мекинтош записа — упозорење: нема "
-"дозволе за писање)"
-msgstr[2] ""
-"Учитах %lu редова (претворених из ДОС и Мекинтош записа — упозорење: нема "
-"дозволе за писање)"
-
-#: src/files.c:954
+#: src/files.c:919
 #, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
@@ -207,23 +207,7 @@ msgstr[0] "Учитах %lu ред (претворен из Мекинтош з
 msgstr[1] "Учитах %lu реда (претворених из Мекинтош записа)"
 msgstr[2] "Учитах %lu редова (претворених из Мекинтош записа)"
 
-#: src/files.c:958
-#, c-format
-msgid ""
-"Read %lu line (Converted from Mac format - Warning: No write permission)"
-msgid_plural ""
-"Read %lu lines (Converted from Mac format - Warning: No write permission)"
-msgstr[0] ""
-"Учитах %lu ред (претворен из Мекинтош записа — упозорење: нема дозвола за "
-"писање)"
-msgstr[1] ""
-"Учитах %lu реда (претворених из Мекинтош записа — упозорење: нема дозвола за "
-"писање)"
-msgstr[2] ""
-"Учитах %lu редова (претворених из Мекинтош записа — упозорење: нема дозвола "
-"за писање)"
-
-#: src/files.c:964
+#: src/files.c:925
 #, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
@@ -231,22 +215,7 @@ msgstr[0] "Учитах %lu ред (претворен из ДОС записа)
 msgstr[1] "Учитах %lu реда (претворених из ДОС записа)"
 msgstr[2] "Учитах %lu редова (претворених из ДОС записа)"
 
-#: src/files.c:968
-#, c-format
-msgid ""
-"Read %lu line (Converted from DOS format - Warning: No write permission)"
-msgid_plural ""
-"Read %lu lines (Converted from DOS format - Warning: No write permission)"
-msgstr[0] ""
-"Учитах %lu ред (претворен из ДОС записа — упозорење: нема дозвола за писање)"
-msgstr[1] ""
-"Учитах %lu реда (претворених из ДОС записа — упозорење: нема дозвола за "
-"писање)"
-msgstr[2] ""
-"Учитах %lu редова (претворених из ДОС записа — упозорење: нема дозвола за "
-"писање)"
-
-#: src/files.c:974
+#: src/files.c:930
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
@@ -254,90 +223,83 @@ msgstr[0] "Учитах %lu ред"
 msgstr[1] "Учитах %lu реда"
 msgstr[2] "Учитах %lu редова"
 
-#: src/files.c:977
-#, c-format
-msgid "Read %lu line (Warning: No write permission)"
-msgid_plural "Read %lu lines (Warning: No write permission)"
-msgstr[0] "Учитах %lu ред (упозорење: нема дозвола за писање)"
-msgstr[1] "Учитах %lu реда (упозорење: нема дозвола за писање)"
-msgstr[2] "Учитах %lu редова (упозорење: нема дозвола за писање)"
-
-#: src/files.c:1019 src/files.c:1056
+#: src/files.c:974 src/files.c:1006
 msgid "Reading File"
 msgstr "Учитавам датотеку"
 
-#: src/files.c:1025
+#: src/files.c:980
 msgid "New File"
 msgstr "Нова датотека"
 
-#: src/files.c:1028
-#, c-format
-msgid "\"%s\" not found"
+#: src/files.c:983
+#, fuzzy, c-format
+msgid "File \"%s\" not found"
 msgstr "Нисам нашао „%s“"
 
-#: src/files.c:1039 src/rcfile.c:590 src/rcfile.c:1386 src/rcfile.c:1427
+#: src/files.c:992 src/rcfile.c:534 src/rcfile.c:1231 src/rcfile.c:1272
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "„%s“ је датотека уређаја"
 
-#: src/files.c:1133
+#: src/files.c:1083
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Наредба за извршавање у новој међумеморији [из „%s“] "
 
-#: src/files.c:1135
+#: src/files.c:1085
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Наредба за извршавање [из „%s“] "
 
-#: src/files.c:1142
+#: src/files.c:1092
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Датотека за унос у нову међумеморију [из „%s“] "
 
-#: src/files.c:1144
+#: src/files.c:1094
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Датотека за унос [из „%s“] "
 
-#: src/files.c:1389
+#: src/files.c:1338
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Недозвољен тастер у не-вишемеђумеморијском режиму"
 
-#: src/files.c:1684
-msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+#: src/files.c:1632
+#, fuzzy
+msgid "Failed to write backup file; continue saving? (Say N if unsure.) "
 msgstr ""
 "Нисам успео да запишем датотеку резерве, да наставим са чувањем? (Одговорите "
 "са N ако нисте сигурни)"
 
-#: src/files.c:1800
+#: src/files.c:1750
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Не могу да пишем ван %s"
 
-#: src/files.c:1885 src/files.c:1910 src/files.c:1928 src/files.c:1941
-#: src/files.c:1952 src/files.c:1981
+#: src/files.c:1833 src/files.c:1858 src/files.c:1876 src/files.c:1889
+#: src/files.c:1900 src/files.c:1928
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Грешка записивања датотеке резерве „%s“: %s"
 
-#: src/files.c:1886 src/nano.c:690
+#: src/files.c:1834 src/nano.c:692
 msgid "Too many backup files?"
 msgstr "Превише резервних датотека?"
 
-#: src/files.c:2026 src/text.c:2863 src/text.c:2875 src/text.c:3244
-#: src/text.c:3253
+#: src/files.c:1972 src/text.c:3117 src/text.c:3129 src/text.c:3498
+#: src/text.c:3507
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Грешка писања привремене датотеке: %s"
 
-#: src/files.c:2049 src/files.c:2068 src/files.c:2080 src/files.c:2104
-#: src/files.c:2121 src/files.c:2131 src/files.c:2164 src/files.c:2171
+#: src/files.c:1994 src/files.c:2013 src/files.c:2023 src/files.c:2047
+#: src/files.c:2064 src/files.c:2074 src/files.c:2106 src/files.c:2113
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Грешка приликом писања „%s“: %s"
 
-#: src/files.c:2200
+#: src/files.c:2154
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
@@ -345,64 +307,67 @@ msgstr[0] "Уписах %lu ред"
 msgstr[1] "Уписах %lu реда"
 msgstr[2] "Уписах %lu редова"
 
-#: src/files.c:2299
+#: src/files.c:2249
 msgid " [DOS Format]"
 msgstr " [ДОС запис]"
 
-#: src/files.c:2300
+#: src/files.c:2250
 msgid " [Mac Format]"
 msgstr " [Мек запис]"
 
-#: src/files.c:2302
+#: src/files.c:2252
 msgid " [Backup]"
 msgstr " [Резерва]"
 
-#: src/files.c:2309
+#: src/files.c:2259
 msgid "Prepend Selection to File"
 msgstr "Додаје избор на почетак датотеке"
 
-#: src/files.c:2310
+#: src/files.c:2260
 msgid "Append Selection to File"
 msgstr "Додаје избор на крај датотеке"
 
-#: src/files.c:2311
+#: src/files.c:2261
 msgid "Write Selection to File"
 msgstr "Уписује избор у датотеку"
 
-#: src/files.c:2314
+#: src/files.c:2264
 msgid "File Name to Prepend to"
 msgstr "Назив датотеке којој ће претходити"
 
-#: src/files.c:2315
+#: src/files.c:2265
 msgid "File Name to Append to"
 msgstr "Назив датотеке за којом ће следити"
 
-#: src/files.c:2316
+#: src/files.c:2266
 msgid "File Name to Write"
 msgstr "Назив датотеке у којој ће уписати"
 
-#: src/files.c:2349
+#: src/files.c:2301
 #, fuzzy
-msgid "Save modified buffer anyway ? "
-msgstr "Да сачувам измењену међумеморију пре чишћења?"
+msgid "Save modified buffer anyway? "
+msgstr "Да ипак сачувам измењену међумеморију ? "
 
-#: src/files.c:2457
-msgid "File exists, OVERWRITE ? "
-msgstr "Датотека постоји, да ПРЕСНИМИМ?"
-
-#: src/files.c:2466
-msgid "Save file under DIFFERENT NAME ? "
+#: src/files.c:2412
+#, fuzzy
+msgid "Save file under DIFFERENT NAME? "
 msgstr "Да сачувам датотеку под ДРУГАЧИЈИМ НАЗИВОМ ?"
 
-#: src/files.c:2480
-msgid "File was modified since you opened it, continue saving ? "
+#: src/files.c:2420
+#, fuzzy, c-format
+msgid "File \"%s\" exists; OVERWRITE? "
+msgstr "Датотека постоји, да ПРЕСНИМИМ?"
+
+#: src/files.c:2441
+#, fuzzy
+msgid "File was modified since you opened it; continue saving? "
 msgstr "Датотека је измењена од када сте је отворили, да наставим са чувањем ?"
 
-#: src/files.c:2917
+#: src/files.c:2874
 msgid "(more)"
 msgstr "(још)"
 
-#: src/files.c:3004
+#: src/files.c:2959
 #, c-format
 msgid ""
 "\n"
@@ -411,7 +376,7 @@ msgstr ""
 "\n"
 "Притисните Унеси да наставите\n"
 
-#: src/files.c:3020
+#: src/files.c:2975
 #, c-format
 msgid ""
 "Unable to create directory %s: %s\n"
@@ -420,7 +385,7 @@ msgstr ""
 "Не могу да направим директоријум „%s“: %s\n"
 "Потребан је за чување/учитавање историјата претраге или положаја курсора.\n"
 
-#: src/files.c:3026
+#: src/files.c:2982
 #, c-format
 msgid ""
 "Path %s is not a directory and needs to be.\n"
@@ -430,7 +395,7 @@ msgstr ""
 "Нано неће бити у могућности да учита или да сачува историјат претраге или "
 "положаје курсора.\n"
 
-#: src/files.c:3045
+#: src/files.c:3002
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I tried to move\n"
@@ -439,7 +404,7 @@ msgstr ""
 "Открио сам стару датотеку историјата наноа (%s) коју сам покушао да\n"
 "преместим на жељено место (%s) али сам наишао на грешку: %s"
 
-#: src/files.c:3049
+#: src/files.c:3006
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I moved\n"
@@ -450,722 +415,753 @@ msgstr ""
 "преместио на жељено место (%s)\n"
 "(погледајте нанова ЧПП о овој измени)"
 
-#: src/files.c:3132 src/files.c:3140 src/files.c:3164 src/files.c:3176
-#, fuzzy, c-format
+#: src/files.c:3089 src/files.c:3097 src/files.c:3121 src/files.c:3133
+#, c-format
 msgid "Error writing %s: %s\n"
-msgstr "Грешка приликом писања „%s“: %s"
+msgstr "Грешка писања „%s“: %s\n"
 
 #. TRANSLATORS: Try to keep the next fifteen strings at most 10 characters.
-#: src/global.c:480
+#: src/global.c:483
 msgid "Exit"
 msgstr "Изађи"
 
-#: src/global.c:481
+#: src/global.c:484
 msgid "Close"
 msgstr "Затвори"
 
-#: src/global.c:482
+#: src/global.c:485
 msgid "Uncut Text"
 msgstr "Не сеци текст"
 
-#: src/global.c:484
+#: src/global.c:487
 msgid "Unjustify"
 msgstr "Одравнај"
 
-#: src/global.c:490
+#: src/global.c:493
 msgid "Read File"
 msgstr "Читај датотеку"
 
-#: src/global.c:491
+#: src/global.c:494
 msgid "Where Is"
 msgstr "Где је"
 
-#: src/global.c:492
+#: src/global.c:495
 msgid "Replace"
 msgstr "Замени"
 
-#: src/global.c:493
+#: src/global.c:496
 msgid "Go To Line"
 msgstr "На ред"
 
-#: src/global.c:494
+#: src/global.c:497
 msgid "Prev Line"
 msgstr "Претходни ред"
 
-#: src/global.c:495
+#: src/global.c:498
 msgid "Next Line"
 msgstr "Следећи ред"
 
-#: src/global.c:496
+#: src/global.c:499
 msgid "Prev Page"
 msgstr "Претходна страна"
 
-#: src/global.c:497
+#: src/global.c:500
 msgid "Next Page"
 msgstr "Следећа страна"
 
-#: src/global.c:499
+#: src/global.c:502
 msgid "Justify"
 msgstr "Пораванај"
 
-#: src/global.c:500
+#: src/global.c:503
 msgid "FullJstify"
 msgstr "Пуно поравнање"
 
-#: src/global.c:502
+#: src/global.c:505
 msgid "Refresh"
 msgstr "Освежи"
 
 #. TRANSLATORS: Try to keep this string at most 12 characters.
-#: src/global.c:505
+#: src/global.c:508
 msgid "WhereIs Next"
 msgstr "Где је слдћи"
 
 #. TRANSLATORS: The next long series of strings are shortcut descriptions;
 #. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:512
+#: src/global.c:515
 msgid "Justify the current paragraph"
 msgstr "Поравнава текући пасус"
 
-#: src/global.c:514
+#: src/global.c:517
 msgid "Cancel the current function"
 msgstr "Отказује текућу операцију"
 
-#: src/global.c:515
+#: src/global.c:518
 msgid "Display this help text"
 msgstr "Приказује текст ове помоћи"
 
-#: src/global.c:518
+#: src/global.c:521
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Затвара међумеморију тренутне датотеке / излази из нана"
 
-#: src/global.c:520
+#: src/global.c:523
 msgid "Exit from nano"
 msgstr "Излази из нана"
 
-#: src/global.c:524
+#: src/global.c:527
 msgid "Write the current file to disk"
 msgstr "Уписује текућу датотеку на диск"
 
-#: src/global.c:526
+#: src/global.c:529
 msgid "Insert another file into the current one"
 msgstr "Умеће другу датотеку у текућу"
 
-#: src/global.c:528
+#: src/global.c:531
 msgid "Search for a string or a regular expression"
 msgstr "Тражи ниску или регуларни израз"
 
-#: src/global.c:531
+#: src/global.c:533
 msgid "Search for a string"
 msgstr "Тражи ниску"
 
-#: src/global.c:533
+#: src/global.c:534
+msgid "Refresh the file list"
+msgstr ""
+
+#: src/global.c:535
+#, fuzzy
+msgid "Go to lefthand column"
+msgstr "На ред и број ступца"
+
+#: src/global.c:536
+#, fuzzy
+msgid "Go to righthand column"
+msgstr "На ред и број ступца"
+
+#: src/global.c:538
 msgid "Go one screenful up"
 msgstr "На следећи екран"
 
-#: src/global.c:534
+#: src/global.c:539
 msgid "Go one screenful down"
 msgstr "На претходни екран"
 
-#: src/global.c:536
+#: src/global.c:541
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Исеца текући ред и смешта га у исечке"
 
-#: src/global.c:538
+#: src/global.c:543
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Убацује исечак у текући ред"
 
-#: src/global.c:539
+#: src/global.c:544
 msgid "Display the position of the cursor"
 msgstr "Приказује положај курзора"
 
-#: src/global.c:541
+#: src/global.c:546
 msgid "Invoke the spell checker, if available"
 msgstr "Покреће проверу правописа, ако је доступна"
 
-#: src/global.c:543
+#: src/global.c:548
 msgid "Replace a string or a regular expression"
 msgstr "Замењује ниску или регуларни израз"
 
-#: src/global.c:544
+#: src/global.c:549
 msgid "Go to line and column number"
 msgstr "На ред и број ступца"
 
-#: src/global.c:546
+#: src/global.c:551
 msgid "Mark text starting from the cursor position"
 msgstr "Означава текст почевши од положаја курзора"
 
-#: src/global.c:547
+#: src/global.c:552
 msgid "Repeat the last search"
 msgstr "Понавља последњу претрагу"
 
-#: src/global.c:549
+#: src/global.c:554
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "Исеца текући ред и смешта га у исечке"
 
-#: src/global.c:550
+#: src/global.c:555
 msgid "Indent the current line"
 msgstr "Увлачи текући ред"
 
-#: src/global.c:551
+#: src/global.c:556
 msgid "Unindent the current line"
 msgstr "Поништава увлачење текућег реда"
 
-#: src/global.c:552
+#: src/global.c:558
+msgid "Comment/uncomment the current line or marked lines"
+msgstr ""
+
+#: src/global.c:560
 msgid "Undo the last operation"
 msgstr "Поништава последњу радњу"
 
-#: src/global.c:553
+#: src/global.c:561
 msgid "Redo the last undone operation"
 msgstr "Враћа последњу поништену радњу"
 
-#: src/global.c:555
+#: src/global.c:563
 msgid "Go back one character"
 msgstr "Иде један знак уназад"
 
-#: src/global.c:556
+#: src/global.c:564
 msgid "Go forward one character"
 msgstr "Иде један знак унапред"
 
-#: src/global.c:558
+#: src/global.c:566
 msgid "Go back one word"
 msgstr "Иде једну реч уназад"
 
-#: src/global.c:559
+#: src/global.c:567
 msgid "Go forward one word"
 msgstr "Иде једну реч унапред"
 
-#: src/global.c:561
+#: src/global.c:569
 msgid "Go to previous line"
 msgstr "На претходни ред"
 
-#: src/global.c:562
+#: src/global.c:570
 msgid "Go to next line"
 msgstr "На следећи ред"
 
-#: src/global.c:563
+#: src/global.c:571
 msgid "Go to beginning of current line"
 msgstr "На почетак текућег реда"
 
-#: src/global.c:564
+#: src/global.c:572
 msgid "Go to end of current line"
 msgstr "На крај текућег реда"
 
-#: src/global.c:567
+#: src/global.c:575
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "На почетак пасуса; затим претходног пасуса"
 
-#: src/global.c:569
+#: src/global.c:577
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr "Иде одмах после краја пасуса; затим следећег пасуса"
 
-#: src/global.c:571
+#: src/global.c:579
 msgid "Go to the first line of the file"
 msgstr "Иде у први ред датотеке"
 
-#: src/global.c:572
+#: src/global.c:580
 msgid "Go to the last line of the file"
 msgstr "Иде у последњи ред датотеке"
 
-#: src/global.c:574
+#: src/global.c:582
 msgid "Go to the matching bracket"
 msgstr "На одговарајућу заграду"
 
-#: src/global.c:576
+#: src/global.c:584
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "Помера се један ред горе без померања курсора"
 
-#: src/global.c:578
+#: src/global.c:586
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "Помера се један ред доле без померања курсора"
 
-#: src/global.c:581
+#: src/global.c:589
 msgid "Switch to the previous file buffer"
 msgstr "Пребацује се на међумеморију претходне датотеке"
 
-#: src/global.c:582
+#: src/global.c:590
 msgid "Switch to the next file buffer"
 msgstr "Пребацује се на међумеморију следеће датотеке"
 
-#: src/global.c:584
+#: src/global.c:592
 msgid "Insert the next keystroke verbatim"
 msgstr "Умеће следећу дословност притиска тастера"
 
-#: src/global.c:585
+#: src/global.c:593
 msgid "Insert a tab at the cursor position"
 msgstr "Умеће табулатор на положај курсора"
 
-#: src/global.c:586
+#: src/global.c:594
 msgid "Insert a newline at the cursor position"
 msgstr "Умеће нови ред на положај курсора"
 
-#: src/global.c:587
+#: src/global.c:595
 msgid "Delete the character under the cursor"
 msgstr "Брише знак под курзором"
 
-#: src/global.c:589
+#: src/global.c:597
 msgid "Delete the character to the left of the cursor"
 msgstr "Брише знак лево од курзора"
 
-#: src/global.c:592
+#: src/global.c:600
 msgid "Cut backward from cursor to word start"
 msgstr "Исеца уназад од курзора до почетка реда"
 
-#: src/global.c:594
+#: src/global.c:602
 msgid "Cut forward from cursor to next word start"
 msgstr "Исеца унапред од курзора до почетка следеће речи"
 
-#: src/global.c:596
+#: src/global.c:604
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Одсеца од положаја курзора до краја датотеке"
 
-#: src/global.c:599
+#: src/global.c:607
 msgid "Justify the entire file"
 msgstr "Поравнава читаву датотеку"
 
-#: src/global.c:603
+#: src/global.c:611
 msgid "Count the number of words, lines, and characters"
 msgstr "Броји речи, редова, и знакова"
 
-#: src/global.c:606
+#: src/global.c:614
 msgid "Refresh (redraw) the current screen"
 msgstr "Освежава (поново исцртава) текући екран"
 
-#: src/global.c:608
+#: src/global.c:616
 msgid "Suspend the editor (if suspension is enabled)"
 msgstr "Обуставља уређивача (ако је обустављање укључено)"
 
-#: src/global.c:610
+#: src/global.c:618
 msgid "Save file without prompting"
 msgstr "Чува датотеку без постављања упита"
 
-#: src/global.c:611
+#: src/global.c:619
 msgid "Search next occurrence backward"
 msgstr "Тражи следеће појављивање уназад"
 
-#: src/global.c:612
+#: src/global.c:620
 msgid "Search next occurrence forward"
 msgstr "Тражи следеће појављивање унапред"
 
-#: src/global.c:614
+#: src/global.c:622
 msgid "Toggle the case sensitivity of the search"
 msgstr "Пребацује осетљивост величине слова у претрази"
 
-#: src/global.c:616
+#: src/global.c:624
 msgid "Reverse the direction of the search"
 msgstr "Заокреће правац претраге"
 
-#: src/global.c:620
+#: src/global.c:628
 msgid "Toggle the use of regular expressions"
 msgstr "Пребацује коришћење регуларних израза"
 
-#: src/global.c:624
+#: src/global.c:632
 msgid "Recall the previous search/replace string"
 msgstr "Опозива ниску претходне претраге и замене"
 
-#: src/global.c:626
+#: src/global.c:634
 msgid "Recall the next search/replace string"
 msgstr "Опозива ниску следеће претраге и замене"
 
-#: src/global.c:629
+#: src/global.c:637
 msgid "Go to file browser"
 msgstr "Иде у прегледач датотека"
 
-#: src/global.c:632
+#: src/global.c:640
 msgid "Toggle the use of DOS format"
 msgstr "Пребацује коришћење ДОС записа"
 
-#: src/global.c:633
+#: src/global.c:641
 msgid "Toggle the use of Mac format"
 msgstr "Пребацује коришћење Мекинтош записа"
 
-#: src/global.c:634
+#: src/global.c:642
 msgid "Toggle appending"
 msgstr "Пребацује додавање након"
 
-#: src/global.c:635
+#: src/global.c:643
 msgid "Toggle prepending"
 msgstr "Пребацује додавање пре"
 
-#: src/global.c:636
+#: src/global.c:644
 msgid "Toggle backing up of the original file"
 msgstr "Пребацује стварање резерве изворне датотеке"
 
-#: src/global.c:637
+#: src/global.c:645
 msgid "Execute external command"
 msgstr "Извршава спољну наредбу"
 
-#: src/global.c:639
+#: src/global.c:647
 msgid "Close buffer without saving it"
-msgstr ""
+msgstr "Затвара међумеморију без чувања"
 
-#: src/global.c:641
+#: src/global.c:649
 msgid "Toggle the use of a new buffer"
 msgstr "Пребацује коришћење нове међумеморије"
 
-#: src/global.c:644
+#: src/global.c:652
 msgid "Exit from the file browser"
 msgstr "Излази из прегледача датотека"
 
-#: src/global.c:645
+#: src/global.c:653
 msgid "Go to the first file in the list"
 msgstr "Иде у прву датотеку на списку"
 
-#: src/global.c:646
+#: src/global.c:654
 msgid "Go to the last file in the list"
 msgstr "Иде у последњу датотеку на списку"
 
-#: src/global.c:647
+#: src/global.c:655
 msgid "Go to the previous file in the list"
 msgstr "На претходну датотеку на списку"
 
-#: src/global.c:648
+#: src/global.c:656
 msgid "Go to the next file in the list"
 msgstr "Иде у следећу датотеку на списку"
 
-#: src/global.c:649
+#: src/global.c:657
 msgid "Go to directory"
 msgstr "Иде у директоријум"
 
-#: src/global.c:652
+#: src/global.c:660
 msgid "Invoke the linter, if available"
 msgstr "Покреће чистача, ако је доступан"
 
-#: src/global.c:653
+#: src/global.c:661
 msgid "Go to previous linter msg"
 msgstr "Иде на претходну поруку чистача"
 
-#: src/global.c:654
+#: src/global.c:662
 msgid "Go to next linter msg"
 msgstr "Иде на следећу поруку чистача"
 
-#: src/global.c:656
+#: src/global.c:664
 msgid "Invoke formatter, if available"
 msgstr "Покреће обликовача, ако је доступан"
 
 #. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:671
+#: src/global.c:679
 msgid "Get Help"
 msgstr "Добави помоћ"
 
-#: src/global.c:674 src/prompt.c:858
+#: src/global.c:682 src/prompt.c:855
 msgid "Cancel"
 msgstr "Откажи"
 
-#: src/global.c:687
+#: src/global.c:695
 msgid "Write Out"
 msgstr "Испиши"
 
-#: src/global.c:723
+#: src/global.c:731
 msgid "Go To Dir"
 msgstr "У директорјум"
 
-#: src/global.c:738
+#: src/global.c:746
 msgid "Cut Text"
 msgstr "Исеци текст"
 
-#: src/global.c:753
+#: src/global.c:761
 msgid "To Spell"
 msgstr "На проверу писања"
 
-#: src/global.c:757
+#: src/global.c:765
 msgid "To Linter"
 msgstr "На чишћење"
 
-#: src/global.c:760
+#: src/global.c:768
 msgid "Formatter"
 msgstr "Обликовач"
 
-#: src/global.c:767
+#: src/global.c:775
 msgid "Case Sens"
 msgstr "Вел. слова"
 
-#: src/global.c:772
+#: src/global.c:780
 msgid "Regexp"
 msgstr "Рег. израз"
 
-#: src/global.c:777
+#: src/global.c:785
 msgid "Backwards"
 msgstr "Уназад"
 
-#: src/global.c:784
+#: src/global.c:792
 msgid "No Replace"
 msgstr "Не мењај"
 
-#: src/global.c:792
+#: src/global.c:800
 msgid "Cur Pos"
 msgstr "Положај курзора"
 
-#: src/global.c:807
+#: src/global.c:815
 msgid "First Line"
 msgstr "Први ред"
 
-#: src/global.c:809
+#: src/global.c:817
 msgid "Last Line"
 msgstr "Последњи ред"
 
-#: src/global.c:816
+#: src/global.c:824
 msgid "To Bracket"
 msgstr "До заграде"
 
-#: src/global.c:819
+#: src/global.c:827
 msgid "Mark Text"
 msgstr "Означи текст"
 
-#: src/global.c:822
+#: src/global.c:830
 msgid "Copy Text"
 msgstr "Умножи текст"
 
-#: src/global.c:825
+#: src/global.c:833
 msgid "Indent Text"
 msgstr "Увуци текст"
 
-#: src/global.c:827
+#: src/global.c:835
 msgid "Unindent Text"
 msgstr "Поништи увлачење"
 
-#: src/global.c:830
+#: src/global.c:838
 msgid "Undo"
 msgstr "Опозови"
 
-#: src/global.c:832
+#: src/global.c:840
 msgid "Redo"
 msgstr "Поврати"
 
-#: src/global.c:836 src/global.c:842
+#: src/global.c:844 src/global.c:850
 msgid "Back"
 msgstr "Назад"
 
-#: src/global.c:838 src/global.c:844
+#: src/global.c:846 src/global.c:852
 msgid "Forward"
 msgstr "Напред"
 
-#: src/global.c:849
+#: src/global.c:857
 msgid "Prev Word"
 msgstr "Претходна реч"
 
-#: src/global.c:851
+#: src/global.c:859
 msgid "Next Word"
 msgstr "Следећа реч"
 
-#: src/global.c:855
+#: src/global.c:863
 msgid "Home"
 msgstr "Почетак"
 
-#: src/global.c:857
+#: src/global.c:865
 msgid "End"
 msgstr "Крај"
 
-#: src/global.c:866
+#: src/global.c:874
 msgid "Beg of Par"
 msgstr "Почeтaк пасуса"
 
-#: src/global.c:868
+#: src/global.c:876
 msgid "End of Par"
 msgstr "Крај пасуса"
 
-#: src/global.c:873
+#: src/global.c:881
 msgid "Scroll Up"
 msgstr "Помакни горе"
 
-#: src/global.c:875
+#: src/global.c:883
 msgid "Scroll Down"
 msgstr "Помакни доле"
 
-#: src/global.c:880
+#: src/global.c:888
 msgid "Prev File"
 msgstr "Претходна датотека"
 
-#: src/global.c:882
+#: src/global.c:890
 msgid "Next File"
 msgstr "Следећа датотека"
 
-#: src/global.c:891
+#: src/global.c:899
 msgid "Verbatim"
 msgstr "Вербатим"
 
-#: src/global.c:894
+#: src/global.c:902
 msgid "Tab"
 msgstr "Табулатор"
 
-#: src/global.c:896
+#: src/global.c:904
 msgid "Enter"
 msgstr "Унеси"
 
-#: src/global.c:899
+#: src/global.c:907
 msgid "Delete"
 msgstr "Обриши"
 
-#: src/global.c:901
+#: src/global.c:909
 msgid "Backspace"
 msgstr "Врати простор"
 
 #. TRANSLATORS: The next two strings refer to cutting words.
-#: src/global.c:912
+#: src/global.c:920
 msgid "Cut Left"
 msgstr "Исеци лево"
 
-#: src/global.c:914
+#: src/global.c:922
 msgid "Cut Right"
 msgstr "Исеци десно"
 
-#: src/global.c:916
+#: src/global.c:924
 msgid "CutTillEnd"
 msgstr "Исеци до краја"
 
-#: src/global.c:926
+#: src/global.c:934
 msgid "Word Count"
 msgstr "Изброј речи"
 
-#: src/global.c:933
+#: src/global.c:941
 msgid "Suspend"
 msgstr "Обустави"
 
-#: src/global.c:937
+#: src/global.c:945
+#, fuzzy
+msgid "Comment Lines"
+msgstr "Следећи ред"
+
+#: src/global.c:949
 msgid "Save"
 msgstr "Сачувај"
 
-#: src/global.c:940
+#: src/global.c:952
 msgid "Previous"
 msgstr "Претходно"
 
-#: src/global.c:942
+#: src/global.c:954
 msgid "Next"
 msgstr "Следеће"
 
-#: src/global.c:948
+#: src/global.c:960
 msgid "PrevHstory"
 msgstr "Прет. историјат"
 
-#: src/global.c:951
+#: src/global.c:963
 msgid "NextHstory"
 msgstr "След. историјат"
 
-#: src/global.c:955
+#: src/global.c:972
 msgid "Go To Text"
 msgstr "На текст"
 
-#: src/global.c:959
+#: src/global.c:976
 msgid "DOS Format"
 msgstr "ДОС запис"
 
-#: src/global.c:961
+#: src/global.c:978
 msgid "Mac Format"
 msgstr "Мекинтош запис"
 
-#: src/global.c:969
+#: src/global.c:986
 msgid "Append"
 msgstr "Додај позади"
 
-#: src/global.c:971
+#: src/global.c:988
 msgid "Prepend"
 msgstr "Додај напред"
 
-#: src/global.c:974
+#: src/global.c:991
 msgid "Backup File"
 msgstr "Направи резерву"
 
-#: src/global.c:981
+#: src/global.c:998
 msgid "Execute Command"
 msgstr "Изврши наредбу"
 
-#: src/global.c:996
+#: src/global.c:1013
 msgid "To Files"
 msgstr "У датотеке"
 
-#: src/global.c:1004
+#: src/global.c:1021
 msgid "First File"
 msgstr "Прва датотека"
 
-#: src/global.c:1006
+#: src/global.c:1023
 msgid "Last File"
 msgstr "Пследња датотека"
 
-#: src/global.c:1010
+#: src/global.c:1027
 msgid "Discard buffer"
+msgstr "Одбаци међумеморију"
+
+#: src/global.c:1038
+msgid "Left Column"
+msgstr ""
+
+#: src/global.c:1040
+msgid "Right Column"
 msgstr ""
 
 #. TRANSLATORS: Try to keep the next two strings at most 20 characters.
-#: src/global.c:1020
+#: src/global.c:1047
 msgid "Prev Lint Msg"
 msgstr "Пртх пор чистч"
 
-#: src/global.c:1022
+#: src/global.c:1049
 msgid "Next Lint Msg"
 msgstr "След пор чистч"
 
 #. TRANSLATORS: The next seventeen strings are toggle descriptions;
 #. * they are best kept shorter than 40 characters, but may be longer.
-#: src/global.c:1285
+#: src/global.c:1316
 msgid "Help mode"
 msgstr "Режим помоћи"
 
-#: src/global.c:1287
+#: src/global.c:1318
 msgid "Constant cursor position display"
 msgstr "Сталан приказ положаја курзора"
 
-#: src/global.c:1289
+#: src/global.c:1320
 msgid "Use of one more line for editing"
 msgstr "Користи још један ред за уређивање"
 
-#: src/global.c:1291
+#: src/global.c:1322
 msgid "Smooth scrolling"
 msgstr "Глатко клизање"
 
-#: src/global.c:1293
+#: src/global.c:1324
 msgid "Soft wrapping of overlong lines"
 msgstr "Слабо преламање превише дугих редова"
 
-#: src/global.c:1295
+#: src/global.c:1326
 msgid "Whitespace display"
 msgstr "Приказ празнина"
 
-#: src/global.c:1297
+#: src/global.c:1328
 msgid "Color syntax highlighting"
 msgstr "Истицање синтаксе у боји"
 
-#: src/global.c:1299
+#: src/global.c:1330
 msgid "Smart home key"
 msgstr "Паметни тастер „Почетак“"
 
-#: src/global.c:1301
+#: src/global.c:1332
 msgid "Auto indent"
 msgstr "Самоувлачење"
 
-#: src/global.c:1303
+#: src/global.c:1334
 msgid "Cut to end"
 msgstr "Исецање до краја"
 
-#: src/global.c:1305
+#: src/global.c:1336
 msgid "Hard wrapping of overlong lines"
 msgstr "Јако преламање превише дугих редова"
 
-#: src/global.c:1307
+#: src/global.c:1338
 msgid "Conversion of typed tabs to spaces"
 msgstr "Претварање укуцаних табулатора у размаке"
 
-#: src/global.c:1309
+#: src/global.c:1340
 msgid "Backup files"
 msgstr "Резервне датотеке"
 
-#: src/global.c:1311
+#: src/global.c:1342
 msgid "Reading file into separate buffer"
 msgstr "Читам датотеку у одвојену међумеморију"
 
-#: src/global.c:1313
+#: src/global.c:1344
 msgid "Mouse support"
 msgstr "Подршка за миша"
 
-#: src/global.c:1315
+#: src/global.c:1346
 msgid "No conversion from DOS/Mac format"
 msgstr "Без претварања из Мекинтош/ДОС записа"
 
-#: src/global.c:1317
+#: src/global.c:1348
 msgid "Suspension"
 msgstr "Обустави"
 
 # bug: there's "enter" and "Enter"
-#: src/help.c:209
+#: src/help.c:211
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1187,7 +1183,7 @@ msgstr ""
 "„Тражи:“. Притиском на Унеси без уноса неког текста ће обавити претходну "
 "претрагу."
 
-#: src/help.c:218
+#: src/help.c:220
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1201,7 +1197,7 @@ msgstr ""
 " Следећи тастери су доступни у режиму претраге:\n"
 "\n"
 
-#: src/help.c:224
+#: src/help.c:226
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1221,7 +1217,7 @@ msgstr ""
 " Следећи тастери су доступни у режиму одласка у ред:\n"
 "\n"
 
-#: src/help.c:233
+#: src/help.c:235
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1244,7 +1240,7 @@ msgstr ""
 "одвојеној међумеморији (користите Мета-< и > за пребацивање између "
 "међумеморија)."
 
-#: src/help.c:242
+#: src/help.c:244
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1258,7 +1254,7 @@ msgstr ""
 " Следећи тастери су доступни у режиму уметања датотеке:\n"
 "\n"
 
-#: src/help.c:248
+#: src/help.c:250
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1286,7 +1282,7 @@ msgstr ""
 " Следећи тастери су доступни у режиму уписа датотеке:\n"
 "\n"
 
-#: src/help.c:262
+#: src/help.c:264
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1311,7 +1307,7 @@ msgstr ""
 "\n"
 
 # bug: there's "enter" and "Enter"
-#: src/help.c:275
+#: src/help.c:277
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1335,7 +1331,7 @@ msgstr ""
 "претрагу.\n"
 "\n"
 
-#: src/help.c:284
+#: src/help.c:286
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1343,7 +1339,7 @@ msgstr ""
 " Следећи тастери су доступни у режиму претраге прегледача:\n"
 "\n"
 
-#: src/help.c:288
+#: src/help.c:290
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1365,7 +1361,7 @@ msgstr ""
 " Следећи тастери су доступни у режиму одласка у директоријум:\n"
 "\n"
 
-#: src/help.c:301
+#: src/help.c:303
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1388,7 +1384,7 @@ msgstr ""
 " Следећи тастери су доступни у режиму провере правописа:\n"
 "\n"
 
-#: src/help.c:316
+#: src/help.c:318
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1409,7 +1405,7 @@ msgstr ""
 " Следећи тастери су доступни у овом режиму:\n"
 "\n"
 
-#: src/help.c:329
+#: src/help.c:331
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1429,15 +1425,15 @@ msgstr ""
 "који приказује датотеку која се уређује. Ред са стањем је трећи ред одоздо и "
 "приказује важне поруке."
 
-#: src/help.c:339
+#: src/help.c:341
+#, fuzzy
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
-" The notation for shortcuts is as follows: Control-key sequences are notated "
-"with a caret (^) symbol and can be entered either by using the Control "
-"(Ctrl) key or pressing the Escape (Esc) key twice.  Escape-key sequences are "
-"notated with the Meta (M-) symbol and can be entered using either the Esc, "
-"Alt, or Meta key depending on your keyboard setup.  "
+" Shortcuts are written as follows: Control-key sequences are notated with a "
+"'^' and can be entered either by using the Ctrl key or pressing the Esc key "
+"twice.  Meta-key sequences are notated with 'M-' and can be entered using "
+"either the Alt, Cmd, or Esc key, depending on your keyboard setup.  "
 msgstr ""
 " Два доња реда приказују најчешће коришћене пречице у уређивачу.\n"
 "\n"
@@ -1465,19 +1461,19 @@ msgstr ""
 msgid "enable/disable"
 msgstr "— укључује/искључује"
 
-#: src/nano.c:559
+#: src/nano.c:560
 msgid "Key is invalid in view mode"
 msgstr "Тастер је неисправан у режиму прегледа"
 
-#: src/nano.c:565
+#: src/nano.c:566
 msgid "This function is disabled in restricted mode"
 msgstr "Ова функција је искључена у ограниченом режиму"
 
-#: src/nano.c:573
+#: src/nano.c:574
 msgid "Help is not available"
 msgstr "Помоћ није доступна"
 
-#: src/nano.c:684
+#: src/nano.c:686
 #, c-format
 msgid ""
 "\n"
@@ -1486,7 +1482,7 @@ msgstr ""
 "\n"
 "Међумеморија је уписана у %s\n"
 
-#: src/nano.c:686
+#: src/nano.c:688
 #, c-format
 msgid ""
 "\n"
@@ -1495,7 +1491,7 @@ msgstr ""
 "\n"
 "Међумеморија није уписана у %s:%s\n"
 
-#: src/nano.c:689
+#: src/nano.c:691
 #, c-format
 msgid ""
 "\n"
@@ -1757,17 +1753,22 @@ msgstr "Укључује обуставу"
 msgid "Enable soft line wrapping"
 msgstr "Укључује меко преламање редова"
 
-#: src/nano.c:937
-#, c-format
-msgid " GNU nano, version %s\n"
+#: src/nano.c:940
+#, fuzzy, c-format
+msgid " nano, version %s\n"
 msgstr " Гнуов нано, издање %s\n"
 
-#: src/nano.c:940
+#: src/nano.c:943
+#, c-format
+msgid " (C) 2014..%s the contributors to nano\n"
+msgstr ""
+
+#: src/nano.c:945
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr " Ел. пошта: nano@nano-editor.org\tВеб: http://www.nano-editor.org/"
 
-#: src/nano.c:941
+#: src/nano.c:946
 #, c-format
 msgid ""
 "\n"
@@ -1776,67 +1777,82 @@ msgstr ""
 "\n"
 " Уграђене опције:"
 
-#: src/nano.c:1073
+#: src/nano.c:1081
 msgid "No file name"
 msgstr "Нема назива датотеке"
 
-#: src/nano.c:1108
-msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
-msgstr "Да сачувам измењену међумеморију (ОДГОВОР „Не“ ЋЕ ОДБАЦИТИ ИЗМЕНЕ) ? "
+#: src/nano.c:1115
+msgid "Save modified buffer?  (Answering \"No\" will DISCARD changes.) "
+msgstr ""
 
-#: src/nano.c:1168
+#: src/nano.c:1178
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "Не могу поново да отворим стандардни улаз са тастатуре, извините\n"
 
-#: src/nano.c:1192
+#: src/nano.c:1202
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "Читам са стандардног улаза, ^C да прекинете\n"
 
-#: src/nano.c:1256
+#: src/nano.c:1266
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Примих SIGHUP или SIGTERM\n"
 
-#: src/nano.c:1272
+#: src/nano.c:1282
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Користите „fg“ да се вратите у нано.\n"
 
-#: src/nano.c:1294
+#: src/nano.c:1304
 msgid "Suspension is not enabled"
 msgstr "Обустава није укључена"
 
-#: src/nano.c:1448
+#: src/nano.c:1459
 msgid "enabled"
 msgstr "укључено"
 
-#: src/nano.c:1448
+#: src/nano.c:1459
 msgid "disabled"
 msgstr "искључено"
 
-#: src/nano.c:1607 src/winio.c:1125
-msgid "Unknown Command"
-msgstr "Непозната наредба"
+#: src/nano.c:1573
+msgid "Unbound key"
+msgstr ""
+
+#: src/nano.c:1577
+#, c-format
+msgid "Unbound key: M-%c"
+msgstr ""
+
+#: src/nano.c:1579
+#, c-format
+msgid "Unbound key: ^%c"
+msgstr ""
+
+#: src/nano.c:1581
+#, c-format
+msgid "Unbound key: %c"
+msgstr ""
 
-#: src/nano.c:1720
+#: src/nano.c:1745
 msgid "XON ignored, mumble mumble"
 msgstr "XON је занемарен, јао мени"
 
-#: src/nano.c:1725
+#: src/nano.c:1750
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF је занемарен, јао мени"
 
-#: src/nano.c:2139 src/rcfile.c:1334
+#: src/nano.c:2166 src/rcfile.c:1187
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Тражена величина табулатора %s је неисправна"
 
-#: src/nano.c:2200 src/rcfile.c:1259
+#: src/nano.c:2227 src/rcfile.c:1128
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Тражена величина попуне %s је неисправна"
 
-#: src/nano.c:2247
+#: src/nano.c:2276
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr "Укуцајте „%s -h“ за списак доступних опција.\n"
@@ -1844,114 +1860,118 @@ msgstr "Укуцајте „%s -h“ за списак доступних опц
 #. TRANSLATORS: For the next three strings, if possible, specify
 #. * the single-byte shortcuts for both your language and English.
 #. * For example, in French: "OoYy" for "Oui".
-#: src/prompt.c:821
+#: src/prompt.c:818
 msgid "Yy"
 msgstr "ДдDdYy"
 
-#: src/prompt.c:822
+#: src/prompt.c:819
 msgid "Nn"
 msgstr "НнNn"
 
-#: src/prompt.c:823
+#: src/prompt.c:820
 msgid "Aa"
 msgstr "АаАа"
 
-#: src/prompt.c:845
+#: src/prompt.c:842
 msgid "Yes"
 msgstr "Да"
 
-#: src/prompt.c:850
+#: src/prompt.c:847
 msgid "All"
 msgstr "Све"
 
-#: src/prompt.c:855
+#: src/prompt.c:852
 msgid "No"
 msgstr "Не"
 
-#: src/rcfile.c:142
+#: src/rcfile.c:144
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Грешка у %s у %lu. реду: "
 
-#: src/rcfile.c:201
+#: src/rcfile.c:203
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "Аргумент „%s“ садржи недовршени знак \""
 
-#: src/rcfile.c:228 src/rcfile.c:280 src/rcfile.c:732 src/rcfile.c:793
-#: src/rcfile.c:882 src/rcfile.c:933
+#: src/rcfile.c:231 src/rcfile.c:674 src/rcfile.c:725 src/rcfile.c:824
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Ниске регуларних израза морају почети и завршити се знаком \""
 
-#: src/rcfile.c:254 src/search.c:62
+#: src/rcfile.c:257 src/search.c:61
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Лош регуларни израз „%s“: %s"
 
-#: src/rcfile.c:274
+#: src/rcfile.c:279
 msgid "Missing syntax name"
 msgstr "Недостаје назив синтаксе"
 
-#: src/rcfile.c:345
+#: src/rcfile.c:288
+msgid "A syntax name must be quoted"
+msgstr ""
+
+#: src/rcfile.c:297
 msgid "The \"none\" syntax is reserved"
 msgstr "Синтакса „none“ је резервисана"
 
-#: src/rcfile.c:352
-msgid "The \"default\" syntax must take no extensions"
+#: src/rcfile.c:327
+#, fuzzy
+msgid "The \"default\" syntax does not accept extensions"
 msgstr "Синтакса „default“ не сме да садржи проширења"
 
-#: src/rcfile.c:424
+#: src/rcfile.c:369
 msgid "Missing key name"
 msgstr "Недостаје назив тастера"
 
-#: src/rcfile.c:433 src/rcfile.c:444
+#: src/rcfile.c:378 src/rcfile.c:389
 msgid "Key name is too short"
 msgstr "Назив тастера је прекратак"
 
-#: src/rcfile.c:454
+#: src/rcfile.c:399
 msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr "Назив тастера мора почети са ^, M, или F"
 
-#: src/rcfile.c:457
-#, fuzzy, c-format
+#: src/rcfile.c:402
+#, c-format
 msgid "Key name %s is invalid"
-msgstr "Тражена величина табулатора %s је неисправна"
+msgstr "Назив тастера „%s“ је неисправан"
 
-#: src/rcfile.c:466
+#: src/rcfile.c:411
 msgid "Must specify a function to bind the key to"
 msgstr "Морате навести функцију за коју свезати тастер"
 
 #. TRANSLATORS: Do not translate the word "all".
-#: src/rcfile.c:476
+#: src/rcfile.c:421
 msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr "Морате навести изборник (или „all“) у коме свезати/развезати тастер"
 
-#: src/rcfile.c:483
+#: src/rcfile.c:428
 #, c-format
 msgid "Cannot map name \"%s\" to a function"
 msgstr "Не могу да мапирам назив „%s“ ка функцији"
 
-#: src/rcfile.c:490
+#: src/rcfile.c:435
 #, c-format
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "Не могу да мапирам назив „%s“ ка изборнику"
 
-#: src/rcfile.c:522
+#: src/rcfile.c:467
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr "Функција „%s“ не постоји у изборнику „%s“"
 
-#: src/rcfile.c:534
+#: src/rcfile.c:479
 #, c-format
 msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "Извините, ниска тастера „%s“ не може бити поново свезана"
 
-#: src/rcfile.c:631
+#: src/rcfile.c:576
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr "Грешка ширења „%s“: %s"
 
-#: src/rcfile.c:674
+#: src/rcfile.c:616
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1967,61 +1987,50 @@ msgstr ""
 "„black“ (црна), са необавезним предметком „bright“ (светло)\n"
 "за боје позадине."
 
-#: src/rcfile.c:696
-msgid "Cannot add a color command without a syntax command"
-msgstr "Не могу да додам наредбу боје без наредбе синтаксе"
+#: src/rcfile.c:637 src/rcfile.c:795 src/rcfile.c:858
+#, c-format
+msgid "A '%s' command requires a preceding 'syntax' command"
+msgstr ""
 
-#: src/rcfile.c:701
+#: src/rcfile.c:643
 msgid "Missing color name"
 msgstr "Недостаје назив боје"
 
-#: src/rcfile.c:711 src/rcfile.c:872
-msgid "Missing regex string"
-msgstr "Недостаје ниска регуларног израза"
+#: src/rcfile.c:653 src/rcfile.c:807
+#, fuzzy, c-format
+msgid "Missing regex string after '%s' command"
+msgstr "Недостаје наредба чистача"
 
-#: src/rcfile.c:787
+#: src/rcfile.c:719
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "„start=“ захтева и одговарајући „end=“"
 
-#: src/rcfile.c:839
+#: src/rcfile.c:768
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
 msgstr "Боја позадине „%s“ не може бити светла"
 
-#: src/rcfile.c:867
-msgid "Cannot add a header regex without a syntax command"
-msgstr "Не могу да додам регуларни израз заглавља без наредбе синтаксе"
-
-#: src/rcfile.c:922
-msgid "Cannot add a magic string regex without a syntax command"
-msgstr "Не могу да додам регуларни израз чаробне ниске без наредбе синтаксе"
-
-#: src/rcfile.c:927
-msgid "Missing magic string name"
-msgstr "Недостаје назив чаробне ниске"
-
-#: src/rcfile.c:985
-msgid "Cannot add a linter without a syntax command"
-msgstr "Не могу да додам чистача без наредбе синтаксе"
+#: src/rcfile.c:802
+#, fuzzy, c-format
+msgid "The \"default\" syntax does not accept '%s' regexes"
+msgstr "Синтакса „default“ не сме да садржи проширења"
 
-#: src/rcfile.c:990
-msgid "Missing linter command"
+#: src/rcfile.c:863
+#, fuzzy, c-format
+msgid "Missing command after '%s'"
 msgstr "Недостаје наредба чистача"
 
-#: src/rcfile.c:1011
-msgid "Cannot add formatter without a syntax command"
-msgstr "Не могу да додам обликовача без наредбе синтаксе"
-
-#: src/rcfile.c:1016
-msgid "Missing formatter command"
-msgstr "Недостаје наредба обликовача"
+#: src/rcfile.c:879
+#, fuzzy, c-format
+msgid "Argument of '%s' lacks closing \""
+msgstr "Аргумент „%s“ садржи недовршени знак \""
 
-#: src/rcfile.c:1046
+#: src/rcfile.c:910
 #, c-format
 msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr "Кобна грешка: нема мапираних тастера за функцију „%s“.  Излазим.\n"
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:912
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
@@ -2029,62 +2038,62 @@ msgstr ""
 "Ако је потребно, користите нано са опцијом „-I“ да дотерате ваша подешавања "
 "нанорц-а\n"
 
-#: src/rcfile.c:1109
+#: src/rcfile.c:971
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "Не могу да нађем синтаксу „%s“ за ширење"
 
-#: src/rcfile.c:1125 src/rcfile.c:1134 src/rcfile.c:1144
-#, c-format
-msgid "Command \"%s\" not allowed in included file"
-msgstr "Наредба „%s“ није дозвољена у укљученој датотеци"
-
-#: src/rcfile.c:1150 src/rcfile.c:1359
+#: src/rcfile.c:993 src/rcfile.c:1202
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Синтакса „%s“ нема наредбе боје"
 
-#: src/rcfile.c:1180
+#: src/rcfile.c:1024
+#, c-format
+msgid "Command \"%s\" not allowed in included file"
+msgstr "Наредба „%s“ није дозвољена у укљученој датотеци"
+
+#: src/rcfile.c:1039
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Нисам разумео наредбу „%s“"
 
-#: src/rcfile.c:1195
+#: src/rcfile.c:1051
 msgid "Missing option"
 msgstr "Недостаје опција"
 
-#: src/rcfile.c:1217
+#: src/rcfile.c:1065
+#, c-format
+msgid "Unknown option \"%s\""
+msgstr "Непозната опција „%s“"
+
+#: src/rcfile.c:1077
+#, c-format
+msgid "Cannot unset option \"%s\""
+msgstr "Не могу да расподесим опцију „%s“"
+
+#: src/rcfile.c:1089
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Опција „%s“ захтева аргумент"
 
-#: src/rcfile.c:1235
+#: src/rcfile.c:1105
 msgid "Option is not a valid multibyte string"
 msgstr "Опција није исправна вишебитна ниска"
 
-#: src/rcfile.c:1272 src/rcfile.c:1300 src/rcfile.c:1309
+#: src/rcfile.c:1139 src/rcfile.c:1160 src/rcfile.c:1167
 msgid "Non-blank characters required"
 msgstr "Потребни су не-празни знаци"
 
-#: src/rcfile.c:1282
+#: src/rcfile.c:1146
 msgid "Two single-column characters required"
 msgstr "Потребна су два знака једног-ступца"
 
-#: src/rcfile.c:1348
-#, c-format
-msgid "Cannot unset option \"%s\""
-msgstr "Не могу да расподесим опцију „%s“"
-
-#: src/rcfile.c:1354
-#, c-format
-msgid "Unknown option \"%s\""
-msgstr "Непозната опција „%s“"
-
-#: src/rcfile.c:1413
+#: src/rcfile.c:1258
 msgid "I can't find my home directory!  Wah!"
 msgstr "Ја не могу да нађем мој лични директоријум! Бре, брате!"
 
-#: src/rcfile.c:1451
+#: src/rcfile.c:1295
 #, c-format
 msgid ""
 "\n"
@@ -2093,44 +2102,49 @@ msgstr ""
 "\n"
 "Притисните Унеси да наставите покретање наноа\n"
 
-#: src/search.c:96
+#: src/search.c:95
 #, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "Нисам нашао „%.*s%s“"
 
 #. TRANSLATORS: The next three strings are modifiers of the search prompt.
-#: src/search.c:176
+#: src/search.c:169
 msgid " [Case Sensitive]"
 msgstr " [разл. величину слова]"
 
-#: src/search.c:180
+#: src/search.c:173
 msgid " [Regexp]"
 msgstr " [рег. израз]"
 
-#: src/search.c:184
+#: src/search.c:177
 msgid " [Backwards]"
 msgstr " [уназад]"
 
 #. TRANSLATORS: The next two strings are modifiers of the search prompt.
-#: src/search.c:189
+#: src/search.c:182
 msgid " (to replace) in selection"
 msgstr " (за замену) у избору"
 
-#: src/search.c:191
+#: src/search.c:184
 msgid " (to replace)"
 msgstr " (за замену)"
 
+#: src/search.c:305
+#, fuzzy
+msgid "Searching..."
+msgstr "Тражи"
+
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:718
+#: src/search.c:693
 msgid "Replace this instance?"
 msgstr "Да заменим ову појаву?"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:883
+#: src/search.c:840
 msgid "Replace with"
 msgstr "Замени са"
 
-#: src/search.c:924
+#: src/search.c:875
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
@@ -2139,297 +2153,406 @@ msgstr[1] "Замених %lu појаве"
 msgstr[2] "Замених %lu појава"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:964
+#: src/search.c:914
 msgid "Enter line number, column number"
 msgstr "Унесите број реда, број ступца"
 
-#: src/search.c:991
+#: src/search.c:939
 msgid "Invalid line or column number"
 msgstr "Неисправан број реда или ступца"
 
-#: src/search.c:1124
+#: src/search.c:1080
 msgid "Not a bracket"
 msgstr "Није заграда"
 
-#: src/search.c:1191
+#: src/search.c:1146
 msgid "No matching bracket"
 msgstr "Нема одговарајуће заграде"
 
 # 48x48/emblems/emblem-marketing.icon.in.h:1
-#: src/text.c:54
+#: src/text.c:53
 msgid "Mark Set"
 msgstr "Постављена ознака"
 
-#: src/text.c:58
+#: src/text.c:57
 msgid "Mark Unset"
 msgstr "Поништена ознака"
 
-#: src/text.c:70
+#: src/text.c:69
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Грешка при покретању „%s“-а"
 
-#: src/text.c:475
-msgid "Nothing in undo buffer!"
-msgstr "Нема ничега у међумеморији поништавања!"
+#: src/text.c:468
+msgid "Commenting is not supported for this file type"
+msgstr ""
 
-#: src/text.c:481 src/text.c:634
-#, c-format
-msgid "Internal error: can't match line %d.  Please save your work."
+#: src/text.c:484
+msgid "Cannot comment past end of file"
 msgstr ""
-"Унутрашња грешка: не могу да поклопим %d. ред.  Молим сачувајте ваш рад."
+
+#: src/text.c:677
+msgid "Nothing in undo buffer!"
+msgstr "Нема ничега у међумеморији поништавања!"
 
 #. TRANSLATORS: Eight of the next nine strings describe actions
 #. * that are undone or redone.  It are all nouns, not verbs.
-#: src/text.c:495 src/text.c:524 src/text.c:645 src/text.c:686
+#: src/text.c:695 src/text.c:724 src/text.c:857 src/text.c:898
 msgid "text add"
 msgstr "додавање текста"
 
-#: src/text.c:505 src/text.c:656
+#: src/text.c:705 src/text.c:868
 msgid "text delete"
 msgstr "брисање текста"
 
-#: src/text.c:528 src/text.c:694
+#: src/text.c:728 src/text.c:907
 msgid "line join"
 msgstr "спој реда"
 
-#: src/text.c:547 src/text.c:710
+#: src/text.c:747 src/text.c:923
 msgid "text cut"
 msgstr "исецање текста"
 
-#: src/text.c:552 src/text.c:714
+#: src/text.c:752 src/text.c:927
 msgid "text uncut"
 msgstr "поништавање исецања текста"
 
-#: src/text.c:558 src/text.c:691
+#: src/text.c:758 src/text.c:903
 msgid "Internal error: line is missing.  Please save your work."
 msgstr "Унутрашња грешка: ред недостаје.  Молим сачувајте ваш рад."
 
-#: src/text.c:561 src/text.c:665
+#: src/text.c:762 src/text.c:877
 msgid "line break"
 msgstr "крај реда"
 
-#: src/text.c:569 src/text.c:725
+#: src/text.c:772 src/text.c:947
+msgid "comment"
+msgstr ""
+
+#: src/text.c:776 src/text.c:951
+msgid "uncomment"
+msgstr ""
+
+#: src/text.c:780 src/text.c:938
 msgid "text insert"
 msgstr "уметање текста"
 
-#: src/text.c:589 src/text.c:718
+#: src/text.c:800 src/text.c:931
 msgid "text replace"
 msgstr "замена текста"
 
-#: src/text.c:596 src/text.c:732 src/text.c:1030 src/text.c:1174
+#: src/text.c:807 src/text.c:955 src/text.c:1267 src/text.c:1437
 msgid "Internal error: unknown type.  Please save your work."
 msgstr "Унутрашња грешка: непозната врста.  Молим сачувајте ваш рад."
 
-#: src/text.c:601
+#: src/text.c:813
 #, c-format
 msgid "Undid action (%s)"
 msgstr "Радња поништавања обављеног (%s)"
 
-#: src/text.c:619
+#: src/text.c:832
 msgid "Nothing to re-do!"
 msgstr "Ничега за поновно обављање!"
 
-#: src/text.c:628
+#: src/text.c:841
 msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
 "Унутрашња грешка: не могу да поставим повраћај.  Молим сачувајте ваш рад."
 
-#: src/text.c:737
+#: src/text.c:961
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Радња поновног обављања (%s)"
 
-#: src/text.c:827 src/text.c:2508 src/text.c:2944
+#: src/text.c:1051 src/text.c:2765 src/text.c:3198
 msgid "Could not create pipe"
 msgstr "Не могу да направим спојку"
 
-#: src/text.c:853 src/text.c:2595 src/text.c:2750 src/text.c:2992
-#: src/text.c:3286
+#: src/text.c:1077 src/text.c:2852 src/text.c:3005 src/text.c:3246
+#: src/text.c:3540
 msgid "Could not fork"
 msgstr "Не могу да расцепим"
 
-#: src/text.c:1853
+#: src/text.c:2117
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Лоша ниска за цитирање %s: %s"
 
-#: src/text.c:2241
+#: src/text.c:2499
 msgid "Can now UnJustify!"
 msgstr "Сада могу да „одравнам“!"
 
-#: src/text.c:2435
+#: src/text.c:2697
 msgid "Edit a replacement"
 msgstr "Измените замену"
 
-#: src/text.c:2510
+#. TRANSLATORS: Shown after fixing misspellings in one word.
+#: src/text.c:2713
+#, fuzzy
+msgid "Next word..."
+msgstr "Следећа реч"
+
+#: src/text.c:2767
 msgid "Creating misspelled word list, please wait..."
 msgstr "Правим списак погрешно унетих речи, сачекајте..."
 
-#: src/text.c:2601 src/text.c:2999
+#: src/text.c:2858 src/text.c:3253
 msgid "Could not get size of pipe buffer"
 msgstr "Не могу да добавим величину међумеморије спојке"
 
-#: src/text.c:2652
+#: src/text.c:2907
 msgid "Error invoking \"spell\""
 msgstr "Грешка при покретању „spell“-а"
 
-#: src/text.c:2655
+#: src/text.c:2910
 msgid "Error invoking \"sort -f\""
 msgstr "Грешка при покретању „sort -f“-а"
 
-#: src/text.c:2658
+#: src/text.c:2913
 msgid "Error invoking \"uniq\""
 msgstr "Грешка при покретању „uniq“-а"
 
-#: src/text.c:2881
+#: src/text.c:3135
 msgid "Invoking spell checker, please wait"
 msgstr "Призивам проверу правописа, сачекајте мало"
 
-#: src/text.c:2897
+#: src/text.c:3151
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Провера правописа није успела: %s"
 
-#: src/text.c:2899
+#: src/text.c:3153
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Провера правописа није успела: %s: %s"
 
-#: src/text.c:2902
+#: src/text.c:3156
 msgid "Finished checking spelling"
 msgstr "Завршио сам проверу правописа"
 
-#: src/text.c:2927
+#: src/text.c:3181
 msgid "No linter defined for this type of file!"
 msgstr "Чистач није одређен за ову врсту датотеке!"
 
-#: src/text.c:2932
+#: src/text.c:3186
 msgid "Save modified buffer before linting?"
 msgstr "Да сачувам измењену међумеморију пре чишћења?"
 
-#: src/text.c:2949
+#: src/text.c:3203
 msgid "Invoking linter, please wait"
 msgstr "Призивам чистача, сачекајте мало"
 
-#: src/text.c:3105
+#: src/text.c:3358
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr "Добих 0 обрадивих редова од наредбе: %s"
 
-#: src/text.c:3134
+#: src/text.c:3388
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
 "Ова порука је за неотворену датотеку „%s“, да је отворим у новој "
 "међумеморији?"
 
-#: src/text.c:3153
+#: src/text.c:3407
 msgid "No more errors in unopened files, cancelling"
-msgstr ""
+msgstr "Нема више грешака у неотвореним датотекама, отказујем"
 
-#: src/text.c:3192
+#: src/text.c:3446
 msgid "At last message"
 msgstr "На последњу поруку"
 
-#: src/text.c:3197
+#: src/text.c:3451
 msgid "At first message"
 msgstr "На прву поруку"
 
-#: src/text.c:3237
+#: src/text.c:3491
 msgid "Finished"
 msgstr "Завршено"
 
-#: src/text.c:3259
+#: src/text.c:3513
 msgid "Invoking formatter, please wait"
 msgstr "Призивам обликовача, сачекајте мало"
 
-#: src/text.c:3314
+#: src/text.c:3568
 msgid "Finished formatting"
 msgstr "Обликовање је завршено"
 
-#: src/text.c:3396
+#: src/text.c:3650
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sРечи: %lu  Редова: %ld  Знакова: %lu"
 
-#: src/text.c:3397
+#: src/text.c:3651
 msgid "In Selection:  "
 msgstr "У избору:"
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3411
+#: src/text.c:3665
 msgid "Verbatim Input"
 msgstr "Улаз дословности"
 
-#: src/utils.c:391 src/utils.c:403
+#: src/utils.c:392 src/utils.c:404
 msgid "nano is out of memory!"
 msgstr "наноу је понестало меморије!"
 
+#: src/utils.c:625
+#, c-format
+msgid "Internal error: can't match line %d.  Please save your work."
+msgstr ""
+"Унутрашња грешка: не могу да поклопим %d. ред.  Молим сачувајте ваш рад."
+
+#. TRANSLATORS: This refers to a sequence of escape codes
+#. * (from the keyboard) that nano does not know about.
+#: src/winio.c:1121
+msgid "Unknown sequence"
+msgstr ""
+
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
 #: src/winio.c:1427
 msgid "Unicode Input"
 msgstr "Улаз Уникода"
 
-#: src/winio.c:1991 src/winio.c:1995
-msgid "Modified"
-msgstr "Измењено "
-
-#: src/winio.c:1992
-msgid "View"
-msgstr "Преглед "
-
-#: src/winio.c:2006
+#: src/winio.c:1960
 msgid "DIR:"
 msgstr "ДИР: "
 
-#: src/winio.c:2013
+#: src/winio.c:1968
 msgid "File:"
 msgstr "Датотека:"
 
-#: src/winio.c:3141
+#: src/winio.c:1972 src/winio.c:1976
+msgid "Modified"
+msgstr "Измењено "
+
+#: src/winio.c:1974
+msgid "View"
+msgstr "Преглед "
+
+#: src/winio.c:3105
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "ред %ld/%ld (%d%%), стубац %lu/%lu (%d%%), знак %lu/%lu (%d%%)"
 
-#: src/winio.c:3271
+#: src/winio.c:3235
 msgid "The nano text editor"
 msgstr "Уређивач текста нано"
 
-#: src/winio.c:3272
+#: src/winio.c:3236
 msgid "version"
 msgstr "издање "
 
-#: src/winio.c:3273
+#: src/winio.c:3237
 msgid "Brought to you by:"
 msgstr "Припремили:"
 
-#: src/winio.c:3274
+#: src/winio.c:3238
 msgid "Special thanks to:"
 msgstr "Посебно се захваљујемо:"
 
-#: src/winio.c:3275
+#: src/winio.c:3239
 msgid "The Free Software Foundation"
 msgstr "Задужбини слободног софтвера"
 
-#: src/winio.c:3276
+#: src/winio.c:3240
 msgid "the many translators and the TP"
 msgstr "многим преводиоцима и ТП-у"
 
-#: src/winio.c:3277
+#: src/winio.c:3241
 msgid "For ncurses:"
 msgstr "За ен-курсис:"
 
-#: src/winio.c:3278
+#: src/winio.c:3242
 msgid "and anyone else we forgot..."
 msgstr "и свима осталима које смо пропустили..."
 
-#: src/winio.c:3279
+#: src/winio.c:3243
 msgid "Thank you for using nano!"
 msgstr "Хвала вам што користите нано!"
 
+#~ msgid ""
+#~ "Read %lu line (Converted from DOS and Mac format - Warning: No write "
+#~ "permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from DOS and Mac format - Warning: No write "
+#~ "permission)"
+#~ msgstr[0] ""
+#~ "Учитах %lu ред (претворен из ДОС и Мекинтош записа — упозорење: нема "
+#~ "дозволе за писање)"
+#~ msgstr[1] ""
+#~ "Учитах %lu реда (претворених из ДОС и Мекинтош записа — упозорење: нема "
+#~ "дозволе за писање)"
+#~ msgstr[2] ""
+#~ "Учитах %lu редова (претворених из ДОС и Мекинтош записа — упозорење: нема "
+#~ "дозволе за писање)"
+
+#~ msgid ""
+#~ "Read %lu line (Converted from Mac format - Warning: No write permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from Mac format - Warning: No write permission)"
+#~ msgstr[0] ""
+#~ "Учитах %lu ред (претворен из Мекинтош записа — упозорење: нема дозвола за "
+#~ "писање)"
+#~ msgstr[1] ""
+#~ "Учитах %lu реда (претворених из Мекинтош записа — упозорење: нема дозвола "
+#~ "за писање)"
+#~ msgstr[2] ""
+#~ "Учитах %lu редова (претворених из Мекинтош записа — упозорење: нема "
+#~ "дозвола за писање)"
+
+#~ msgid ""
+#~ "Read %lu line (Converted from DOS format - Warning: No write permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from DOS format - Warning: No write permission)"
+#~ msgstr[0] ""
+#~ "Учитах %lu ред (претворен из ДОС записа — упозорење: нема дозвола за "
+#~ "писање)"
+#~ msgstr[1] ""
+#~ "Учитах %lu реда (претворених из ДОС записа — упозорење: нема дозвола за "
+#~ "писање)"
+#~ msgstr[2] ""
+#~ "Учитах %lu редова (претворених из ДОС записа — упозорење: нема дозвола за "
+#~ "писање)"
+
+#~ msgid "Read %lu line (Warning: No write permission)"
+#~ msgid_plural "Read %lu lines (Warning: No write permission)"
+#~ msgstr[0] "Учитах %lu ред (упозорење: нема дозвола за писање)"
+#~ msgstr[1] "Учитах %lu реда (упозорење: нема дозвола за писање)"
+#~ msgstr[2] "Учитах %lu редова (упозорење: нема дозвола за писање)"
+
+#~ msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
+#~ msgstr ""
+#~ "Да сачувам измењену међумеморију (ОДГОВОР „Не“ ЋЕ ОДБАЦИТИ ИЗМЕНЕ) ? "
+
+#~ msgid "Unknown Command"
+#~ msgstr "Непозната наредба"
+
+#~ msgid "Cannot add a color command without a syntax command"
+#~ msgstr "Не могу да додам наредбу боје без наредбе синтаксе"
+
+#~ msgid "Missing regex string"
+#~ msgstr "Недостаје ниска регуларног израза"
+
+#~ msgid "Cannot add a header regex without a syntax command"
+#~ msgstr "Не могу да додам регуларни израз заглавља без наредбе синтаксе"
+
+#~ msgid "Cannot add a magic string regex without a syntax command"
+#~ msgstr "Не могу да додам регуларни израз чаробне ниске без наредбе синтаксе"
+
+#~ msgid "Missing magic string name"
+#~ msgstr "Недостаје назив чаробне ниске"
+
+#~ msgid "Cannot add a linter without a syntax command"
+#~ msgstr "Не могу да додам чистача без наредбе синтаксе"
+
+#~ msgid "Cannot add formatter without a syntax command"
+#~ msgstr "Не могу да додам обликовача без наредбе синтаксе"
+
+#~ msgid "Missing formatter command"
+#~ msgstr "Недостаје наредба обликовача"
+
 #~ msgid "Cannot prepend or append to a symlink with --nofollow set"
 #~ msgstr ""
 #~ "Не могу да додам подешавање „--nofollow“ испред или иза симболичке везе"
diff --git a/po/sv.po b/po/sv.po
index 95464612..4742416d 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,17 +1,17 @@
 # Swedish messages for nano.
-# Copyright © 2014 Free Software Foundation, Inc.
+# Copyright © 2001 - 2016 Free Software Foundation, Inc.
 # This file is distributed under the same license as the nano package.
 # Christian Rose <menthos@menthos.com>, 2001, 2002, 2003, 2004.
 # Daniel Nylander <po@danielnylander.se>, 2006.
-# Josef Andersson <josef.andersson@fripost.org>, 2014.
 # Anders Jonsson <anders.jonsson@norsjovallen.se>, 2015.
+# Josef Andersson <josef.andersson@fripost.org>, 2014, 2016.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 2.4.2\n"
+"Project-Id-Version: nano 2.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-25 16:41-0500\n"
-"PO-Revision-Date: 2015-08-25 09:29+0100\n"
+"POT-Creation-Date: 2016-06-17 15:41+0200\n"
+"PO-Revision-Date: 2016-04-10 09:50+0200\n"
 "Last-Translator: Josef Andersson <josef.andersson@fripost.org>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
@@ -19,373 +19,348 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.7.5\n"
+"X-Generator: Poedit 1.8.7.1\n"
+
+#: src/browser.c:144 src/browser.c:284 src/browser.c:334 src/files.c:996
+#: src/files.c:1003 src/files.c:1794 src/files.c:1919 src/files.c:1963
+#: src/files.c:1983 src/files.c:2099 src/files.c:3019 src/files.c:3242
+#: src/rcfile.c:540 src/rcfile.c:1280
+#, c-format
+msgid "Error reading %s: %s"
+msgstr "Fel vid inläsning av %s: %s"
 
 #. TRANSLATORS: This is a prompt.
-#: src/browser.c:220
+#: src/browser.c:247
 msgid "Go To Directory"
 msgstr "GÃ¥ till katalog"
 
-#: src/browser.c:227 src/browser.c:738 src/files.c:1174 src/files.c:2340
-#: src/nano.c:1120 src/search.c:202 src/search.c:290 src/search.c:895
-#: src/search.c:970 src/text.c:2935 src/text.c:3142
+#: src/browser.c:254 src/browser.c:723 src/files.c:1126 src/files.c:2292
+#: src/nano.c:1128 src/search.c:195 src/search.c:297 src/search.c:851
+#: src/search.c:918 src/text.c:3189 src/text.c:3396
 msgid "Cancelled"
 msgstr "Avbruten"
 
-#: src/browser.c:253 src/browser.c:300
-#, c-format
-msgid "Can't go outside of %s in restricted mode"
+#. TRANSLATORS: This refers to the option --operatingdir,
+#. * not to --restricted.
+#: src/browser.c:274 src/browser.c:326
+#, fuzzy, c-format
+msgid "Can't go outside of %s in confined mode"
 msgstr "Kan inte gå utanför %s i begränsat läge"
 
-#: src/browser.c:264 src/browser.c:310 src/browser.c:326 src/files.c:1044
-#: src/files.c:1052 src/files.c:1844 src/files.c:1971 src/files.c:2016
-#: src/files.c:2037 src/files.c:2156 src/files.c:3062 src/files.c:3285
-#: src/rcfile.c:596 src/rcfile.c:1435
-#, c-format
-msgid "Error reading %s: %s"
-msgstr "Fel vid inläsning av %s: %s"
-
-#: src/browser.c:290
+#: src/browser.c:317
 msgid "Can't move up a directory"
 msgstr "Kan inte gå upp en katalog"
 
 #. TRANSLATORS: Try to keep this at most 7 characters.
-#: src/browser.c:615 src/browser.c:623
+#: src/browser.c:590 src/browser.c:598
 msgid "(dir)"
 msgstr "(kat)"
 
 #. TRANSLATORS: Try to keep this at most 12 characters.
-#: src/browser.c:620
+#: src/browser.c:595
 msgid "(parent dir)"
 msgstr "(föräldkat)"
 
 #. TRANSLATORS: Try to keep this at most 7 characters.
 #. * If necessary, you can leave out the parentheses.
-#: src/browser.c:650
+#: src/browser.c:625
 msgid "(huge)"
 msgstr "(enorm)"
 
 #. TRANSLATORS: This is the main search prompt.
-#: src/browser.c:727 src/search.c:173
+#: src/browser.c:712 src/search.c:166
 msgid "Search"
 msgstr "Sök"
 
-#: src/browser.c:777 src/search.c:466 src/search.c:536
-msgid "This is the only occurrence"
-msgstr "Detta är enda förekomsten"
-
-#: src/browser.c:793 src/search.c:364
+#: src/browser.c:754 src/search.c:368
 msgid "Search Wrapped"
 msgstr "Sökningen började om från början"
 
-#: src/browser.c:843 src/search.c:517
+#: src/browser.c:764 src/search.c:509
+msgid "This is the only occurrence"
+msgstr "Detta är enda förekomsten"
+
+#: src/browser.c:812 src/search.c:473
 msgid "No current search pattern"
 msgstr "Inget aktuellt sökmönster"
 
-#: src/files.c:50
+#: src/color.c:186
 #, fuzzy, c-format
+msgid "Unknown syntax name: %s"
+msgstr "Kopia av syntaxnamn %s"
+
+#: src/color.c:247
+#, c-format
+msgid "magic_load() failed: %s"
+msgstr ""
+
+#: src/color.c:251
+#, c-format
+msgid "magic_file(%s) failed: %s"
+msgstr ""
+
+#: src/files.c:47
+#, c-format
 msgid "Directory '%s' does not exist"
-msgstr "Fel vid skrivning av låsfil: Katalogen ”%s” finns inte"
+msgstr "Katalogen ”%s” finns inte"
 
-#: src/files.c:52
+#: src/files.c:49
 #, c-format
 msgid "Path '%s': %s"
-msgstr ""
+msgstr "Sökvägen '%s': %s"
 
-#: src/files.c:54
-#, fuzzy, c-format
+#: src/files.c:51
+#, c-format
 msgid "Path '%s' is not a directory"
-msgstr "\"%s\" är en katalog"
+msgstr "Sökvägen \"%s\" är inte en katalog"
 
-#: src/files.c:57
+#: src/files.c:53
 #, c-format
 msgid "Path '%s' is not accessible"
-msgstr ""
+msgstr "Sökvägen ”%s” är inte åtkomstbar"
 
-#. TRANSLATORS: Try to keep this at most 76 characters.
-#: src/files.c:158
+#. TRANSLATORS: Keep the next ten messages at most 76 characters.
+#: src/files.c:148
 msgid ""
 "Warning: Modifying a file which is not locked, check directory permission?"
 msgstr "Varning: Ändring av olåst fil, kontrollera katalogrättigheter?"
 
-#: src/files.c:197
+#: src/files.c:187
 msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
 msgstr ""
 "Kunde inte bestämma min identitet för låsfilen (getpwuid() misslyckades)"
 
-#: src/files.c:206
+#: src/files.c:196
 #, c-format
 msgid "Couldn't determine hostname for lock file: %s"
 msgstr "Kunde inte bestämma värdnamn för låsfilen: %s"
 
-#: src/files.c:227 src/files.c:238 src/files.c:275 src/files.c:285
+#: src/files.c:216 src/files.c:225 src/files.c:262 src/files.c:272
 #, c-format
 msgid "Error writing lock file %s: %s"
 msgstr "Fel vid skrivning av låsfilen %s: %s"
 
-#: src/files.c:305
+#: src/files.c:291
 #, c-format
 msgid "Error deleting lock file %s: %s"
 msgstr "Fel vid borttagning av låsfilen %s: %s"
 
-#: src/files.c:341
+#: src/files.c:325
 #, c-format
 msgid "Error opening lock file %s: %s"
 msgstr "Fel vid inläsning av låsfilen %s: %s"
 
-#: src/files.c:353
+#: src/files.c:337
 #, c-format
 msgid "Error reading lock file %s: Not enough data read"
 msgstr "Fel vid läsning av låsfilen %s: För lite data lästes"
 
 #. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
-#: src/files.c:371
+#: src/files.c:354
 #, c-format
 msgid "File %s is being edited (by %s with %s, PID %d); continue?"
 msgstr "Filen %s redigeras (av %s med %s, PID %d); fortsätt?"
 
-#: src/files.c:426
+#: src/files.c:430
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Kan inte infoga fil från utanför %s"
 
-#: src/files.c:439 src/files.c:1038 src/rcfile.c:589 src/rcfile.c:1385
-#: src/rcfile.c:1426
+#: src/files.c:445 src/files.c:991 src/rcfile.c:533 src/rcfile.c:1230
+#: src/rcfile.c:1271
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" är en katalog"
 
-#: src/files.c:441
-#, fuzzy, c-format
+#: src/files.c:447
+#, c-format
 msgid "\"%s\" is not a normal file"
-msgstr "\"%s\" är en enhetsfil"
+msgstr "\"%s\" är inte en normal fil"
 
-#: src/files.c:566
+#: src/files.c:571
 msgid "No more open file buffers"
 msgstr "Inga fler öppna filbuffertar"
 
-#: src/files.c:582
+#: src/files.c:586
 #, c-format
 msgid "Switched to %s"
 msgstr "Växlade till %s"
 
-#: src/files.c:584 src/global.c:988 src/winio.c:2010
+#: src/files.c:588 src/global.c:1005 src/winio.c:1965
 msgid "New Buffer"
 msgstr "Ny buffert"
 
-#: src/files.c:943
+#. TRANSLATORS: Keep the next four messages at most 76 characters.
+#: src/files.c:913
 #, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
 msgstr[0] "Läste %lu rad (konverterad från DOS- och Mac-format)"
 msgstr[1] "Läste %lu rader (konverterade från DOS- och Mac-format)"
 
-#: src/files.c:948
-#, c-format
-msgid ""
-"Read %lu line (Converted from DOS and Mac format - Warning: No write "
-"permission)"
-msgid_plural ""
-"Read %lu lines (Converted from DOS and Mac format - Warning: No write "
-"permission)"
-msgstr[0] ""
-"Läste %lu rad (konverterad från DOS- och Mac-format - Varning: Inga "
-"skrivrättigheter)"
-msgstr[1] ""
-"Läste %lu rader (konverterade från DOS- och Mac-format - Varning: Inga "
-"skrivrättigheter)"
-
-#: src/files.c:954
+#: src/files.c:919
 #, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
 msgstr[0] "Läste %lu rad (konverterad från Mac-format)"
 msgstr[1] "Läste %lu rader (konverterade från Mac-format)"
 
-#: src/files.c:958
-#, c-format
-msgid ""
-"Read %lu line (Converted from Mac format - Warning: No write permission)"
-msgid_plural ""
-"Read %lu lines (Converted from Mac format - Warning: No write permission)"
-msgstr[0] ""
-"Läste %lu rad (konverterad från Mac-format - Varning: Inga skrivrättigheter)"
-msgstr[1] ""
-"Läste %lu rader (konverterade från Mac-format - Varning: Inga "
-"skrivrättigheter)"
-
-#: src/files.c:964
+#: src/files.c:925
 #, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
 msgstr[0] "Läste %lu rad (konverterad från DOS-format)"
 msgstr[1] "Läste %lu rader (konverterade från DOS-format)"
 
-#: src/files.c:968
-#, c-format
-msgid ""
-"Read %lu line (Converted from DOS format - Warning: No write permission)"
-msgid_plural ""
-"Read %lu lines (Converted from DOS format - Warning: No write permission)"
-msgstr[0] ""
-"Läste %lu rad (konverterad från DOS-format - Varning: Inga skrivrättigheter)"
-msgstr[1] ""
-"Läste %lu rader (konverterade från DOS-format - Varning: Inga "
-"skrivrättigheter)"
-
-#: src/files.c:974
+#: src/files.c:930
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "Läste %lu rad"
 msgstr[1] "Läste %lu rader"
 
-#: src/files.c:977
-#, fuzzy, c-format
-msgid "Read %lu line (Warning: No write permission)"
-msgid_plural "Read %lu lines (Warning: No write permission)"
-msgstr[0] "Läste %lu rad (Varning: Inga skrivrättigheter)"
-msgstr[1] "Läste %lu rader (Varning: Inga skrivrättigheter)"
-
-#: src/files.c:1019 src/files.c:1056
+#: src/files.c:974 src/files.c:1006
 msgid "Reading File"
 msgstr "Läser filen"
 
-#: src/files.c:1025
+#: src/files.c:980
 msgid "New File"
 msgstr "Ny fil"
 
-#: src/files.c:1028
-#, c-format
-msgid "\"%s\" not found"
+#: src/files.c:983
+#, fuzzy, c-format
+msgid "File \"%s\" not found"
 msgstr "\"%s\" kunde inte hittas"
 
-#: src/files.c:1039 src/rcfile.c:590 src/rcfile.c:1386 src/rcfile.c:1427
+#: src/files.c:992 src/rcfile.c:534 src/rcfile.c:1231 src/rcfile.c:1272
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" är en enhetsfil"
 
-#: src/files.c:1133
+#: src/files.c:1083
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Kommando att köra i ny buffert [från %s] "
 
-#: src/files.c:1135
+#: src/files.c:1085
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Kommando att köra [från %s] "
 
-#: src/files.c:1142
+#: src/files.c:1092
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Fil att infoga i ny buffert [från %s] "
 
-#: src/files.c:1144
+#: src/files.c:1094
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Fil att infoga [från %s] "
 
-#: src/files.c:1389
+#: src/files.c:1338
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Tangenten ogiltig i icke-flerbuffertläget"
 
-#: src/files.c:1684
-msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+#: src/files.c:1632
+#, fuzzy
+msgid "Failed to write backup file; continue saving? (Say N if unsure.) "
 msgstr ""
 "Misslyckades med skrivning av säkerhetskopian, fortsätt spara? (N om osäker) "
 
-#: src/files.c:1800
+#: src/files.c:1750
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Kan inte skriva utanför %s"
 
-#: src/files.c:1885 src/files.c:1910 src/files.c:1928 src/files.c:1941
-#: src/files.c:1952 src/files.c:1981
+#: src/files.c:1833 src/files.c:1858 src/files.c:1876 src/files.c:1889
+#: src/files.c:1900 src/files.c:1928
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Fel vid skrivning av säkerhetskopian %s: %s"
 
-#: src/files.c:1886 src/nano.c:690
+#: src/files.c:1834 src/nano.c:692
 msgid "Too many backup files?"
 msgstr "För många säkerhetskopierade filer?"
 
-#: src/files.c:2026 src/text.c:2863 src/text.c:2875 src/text.c:3244
-#: src/text.c:3253
+#: src/files.c:1972 src/text.c:3117 src/text.c:3129 src/text.c:3498
+#: src/text.c:3507
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Fel vid skrivning av temporär fil: %s"
 
-#: src/files.c:2049 src/files.c:2068 src/files.c:2080 src/files.c:2104
-#: src/files.c:2121 src/files.c:2131 src/files.c:2164 src/files.c:2171
+#: src/files.c:1994 src/files.c:2013 src/files.c:2023 src/files.c:2047
+#: src/files.c:2064 src/files.c:2074 src/files.c:2106 src/files.c:2113
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Fel vid skrivning av %s: %s"
 
-#: src/files.c:2200
+#: src/files.c:2154
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "Skrev %lu rad"
 msgstr[1] "Skrev %lu rader"
 
-#: src/files.c:2299
+#: src/files.c:2249
 msgid " [DOS Format]"
 msgstr " [DOS-format]"
 
-#: src/files.c:2300
+#: src/files.c:2250
 msgid " [Mac Format]"
 msgstr " [Mac-format]"
 
-#: src/files.c:2302
+#: src/files.c:2252
 msgid " [Backup]"
 msgstr " [Säkerhetskopia]"
 
-#: src/files.c:2309
+#: src/files.c:2259
 msgid "Prepend Selection to File"
 msgstr "Infoga markering till fil"
 
-#: src/files.c:2310
+#: src/files.c:2260
 msgid "Append Selection to File"
 msgstr "Lägg till markering till fil"
 
-#: src/files.c:2311
+#: src/files.c:2261
 msgid "Write Selection to File"
 msgstr "Skriv markering till fil"
 
-#: src/files.c:2314
+#: src/files.c:2264
 msgid "File Name to Prepend to"
 msgstr "Filnamn att infoga i"
 
-#: src/files.c:2315
+#: src/files.c:2265
 msgid "File Name to Append to"
 msgstr "Filnamn att lägga till i"
 
-#: src/files.c:2316
+#: src/files.c:2266
 msgid "File Name to Write"
 msgstr "Filnamn att skriva"
 
-#: src/files.c:2349
+#: src/files.c:2301
 #, fuzzy
-msgid "Save modified buffer anyway ? "
-msgstr "Spara ändrad buffert före felkontroll?"
-
-#: src/files.c:2457
-msgid "File exists, OVERWRITE ? "
-msgstr "Filen existerar, SKRIVA ÖVER? "
+msgid "Save modified buffer anyway? "
+msgstr "Spara ändrad buffert ändå?"
 
-#: src/files.c:2466
-msgid "Save file under DIFFERENT NAME ? "
+#: src/files.c:2412
+msgid "Save file under DIFFERENT NAME? "
 msgstr "Spara filen med ANNAT NAMN? "
 
-#: src/files.c:2480
-msgid "File was modified since you opened it, continue saving ? "
+#: src/files.c:2420
+#, fuzzy, c-format
+msgid "File \"%s\" exists; OVERWRITE? "
+msgstr "Filen existerar, SKRIVA ÖVER? "
+
+#: src/files.c:2441
+#, fuzzy
+msgid "File was modified since you opened it; continue saving? "
 msgstr "Filen har ändrats sedan du öppnade den, fortsätt spara? "
 
-#: src/files.c:2917
+#: src/files.c:2874
 msgid "(more)"
 msgstr "(mer)"
 
-#: src/files.c:3004
+#: src/files.c:2959
 #, c-format
 msgid ""
 "\n"
@@ -394,7 +369,7 @@ msgstr ""
 "\n"
 "Tryck Retur för att fortsätta\n"
 
-#: src/files.c:3020
+#: src/files.c:2975
 #, c-format
 msgid ""
 "Unable to create directory %s: %s\n"
@@ -403,7 +378,7 @@ msgstr ""
 "Kunde inte skapa katalogen %s: %s\n"
 "Den krävs för skrivning/inläsning av sökhistorik eller markörpos.\n"
 
-#: src/files.c:3026
+#: src/files.c:2982
 #, c-format
 msgid ""
 "Path %s is not a directory and needs to be.\n"
@@ -412,7 +387,7 @@ msgstr ""
 "Sökvägen %s är inte en katalog som den måste vara.\n"
 "Nano kommer inte att kunna läsa in eller spara sökhistorik eller markörpos.\n"
 
-#: src/files.c:3045
+#: src/files.c:3002
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I tried to move\n"
@@ -421,7 +396,7 @@ msgstr ""
 "Upptäckte en gammal historikfil för nano (%s) som jag försökte flytta\n"
 "till (%s) men något gick fel: %s"
 
-#: src/files.c:3049
+#: src/files.c:3006
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I moved\n"
@@ -432,731 +407,756 @@ msgstr ""
 "till (%s)\n"
 "(se nanos FAQ för mer om denna ändring)"
 
-#: src/files.c:3132 src/files.c:3140 src/files.c:3164 src/files.c:3176
-#, fuzzy, c-format
+#: src/files.c:3089 src/files.c:3097 src/files.c:3121 src/files.c:3133
+#, c-format
 msgid "Error writing %s: %s\n"
-msgstr "Fel vid skrivning av %s: %s"
+msgstr "Fel vid skrivning av %s: %s\n"
 
 #. TRANSLATORS: Try to keep the next fifteen strings at most 10 characters.
-#: src/global.c:480
+#: src/global.c:483
 msgid "Exit"
 msgstr "Avsluta"
 
-#: src/global.c:481
+#: src/global.c:484
 msgid "Close"
 msgstr "Stäng"
 
-#: src/global.c:482
+#: src/global.c:485
 msgid "Uncut Text"
 msgstr "Ã…ngra klipp ut text"
 
-#: src/global.c:484
+#: src/global.c:487
 msgid "Unjustify"
 msgstr "Ojustera"
 
-#: src/global.c:490
+#: src/global.c:493
 msgid "Read File"
 msgstr "Läs fil"
 
-#: src/global.c:491
+#: src/global.c:494
 msgid "Where Is"
 msgstr "Var finns"
 
-#: src/global.c:492
+#: src/global.c:495
 msgid "Replace"
 msgstr "Ersätt"
 
-#: src/global.c:493
+#: src/global.c:496
 msgid "Go To Line"
 msgstr "GÃ¥ till rad"
 
-#: src/global.c:494
+#: src/global.c:497
 msgid "Prev Line"
 msgstr "Föreg rad"
 
-#: src/global.c:495
+#: src/global.c:498
 msgid "Next Line"
 msgstr "Nästa rad"
 
-#: src/global.c:496
+#: src/global.c:499
 msgid "Prev Page"
 msgstr "Föreg sid"
 
-#: src/global.c:497
+#: src/global.c:500
 msgid "Next Page"
 msgstr "Nästa sid"
 
-#: src/global.c:499
+#: src/global.c:502
 msgid "Justify"
 msgstr "Justera"
 
 # Osäker
-#: src/global.c:500
+#: src/global.c:503
 msgid "FullJstify"
 msgstr "Fulljstera"
 
-#: src/global.c:502
+#: src/global.c:505
 msgid "Refresh"
 msgstr "Uppdatera"
 
 #. TRANSLATORS: Try to keep this string at most 12 characters.
-#: src/global.c:505
+#: src/global.c:508
 msgid "WhereIs Next"
 msgstr "VarFinnsNäst"
 
 #. TRANSLATORS: The next long series of strings are shortcut descriptions;
 #. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:512
+#: src/global.c:515
 msgid "Justify the current paragraph"
 msgstr "Justera det aktuella stycket"
 
-#: src/global.c:514
+#: src/global.c:517
 msgid "Cancel the current function"
 msgstr "Avbryt den aktuella funktionen"
 
-#: src/global.c:515
+#: src/global.c:518
 msgid "Display this help text"
 msgstr "Visa denna hjälptext"
 
-#: src/global.c:518
+#: src/global.c:521
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Stäng aktuell filbuffert / Avsluta nano"
 
-#: src/global.c:520
+#: src/global.c:523
 msgid "Exit from nano"
 msgstr "Avsluta nano"
 
-#: src/global.c:524
+#: src/global.c:527
 msgid "Write the current file to disk"
 msgstr "Skriv den aktuella filen till disk"
 
-#: src/global.c:526
+#: src/global.c:529
 msgid "Insert another file into the current one"
 msgstr "Infoga ytterligare en fil i den nuvarande"
 
-#: src/global.c:528
+#: src/global.c:531
 msgid "Search for a string or a regular expression"
 msgstr "Sök efter en sträng eller ett reguljärt uttryck"
 
-#: src/global.c:531
+#: src/global.c:533
 msgid "Search for a string"
 msgstr "Sök efter en sträng"
 
-#: src/global.c:533
+#: src/global.c:534
+msgid "Refresh the file list"
+msgstr ""
+
+#: src/global.c:535
+#, fuzzy
+msgid "Go to lefthand column"
+msgstr "GÃ¥ till rad- och kolumnnummer"
+
+#: src/global.c:536
+#, fuzzy
+msgid "Go to righthand column"
+msgstr "GÃ¥ till rad- och kolumnnummer"
+
+#: src/global.c:538
 msgid "Go one screenful up"
 msgstr "Gå en hel skärm upp"
 
-#: src/global.c:534
+#: src/global.c:539
 msgid "Go one screenful down"
 msgstr "Gå en hel skärm ned"
 
-#: src/global.c:536
+#: src/global.c:541
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Klipp ut den aktuella raden och lagra den i urklippsbufferten"
 
-#: src/global.c:538
+#: src/global.c:543
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Klistra in från urklippsbufferten i aktuell rad"
 
-#: src/global.c:539
+#: src/global.c:544
 msgid "Display the position of the cursor"
 msgstr "Visa markörens position"
 
-#: src/global.c:541
+#: src/global.c:546
 msgid "Invoke the spell checker, if available"
 msgstr "Starta stavningskontrollen, om tillgänglig"
 
-#: src/global.c:543
+#: src/global.c:548
 msgid "Replace a string or a regular expression"
 msgstr "Ersätt en sträng eller ett reguljärt uttryck"
 
-#: src/global.c:544
+#: src/global.c:549
 msgid "Go to line and column number"
 msgstr "GÃ¥ till rad- och kolumnnummer"
 
-#: src/global.c:546
+#: src/global.c:551
 msgid "Mark text starting from the cursor position"
 msgstr "Markera text med början vid markörpositionen"
 
-#: src/global.c:547
+#: src/global.c:552
 msgid "Repeat the last search"
 msgstr "Upprepa senaste sökning"
 
-#: src/global.c:549
+#: src/global.c:554
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "Kopiera den aktuella raden och lagra den i urklippsbufferten"
 
-#: src/global.c:550
+#: src/global.c:555
 msgid "Indent the current line"
 msgstr "Dra in aktuell rad"
 
-#: src/global.c:551
+#: src/global.c:556
 msgid "Unindent the current line"
 msgstr "Ã…ngra indragning av aktuell rad"
 
-#: src/global.c:552
+#: src/global.c:558
+msgid "Comment/uncomment the current line or marked lines"
+msgstr ""
+
+#: src/global.c:560
 msgid "Undo the last operation"
 msgstr "Ångra senaste åtgärden"
 
-#: src/global.c:553
+#: src/global.c:561
 msgid "Redo the last undone operation"
 msgstr "Gör om den senaste ångraåtgärden"
 
-#: src/global.c:555
+#: src/global.c:563
 msgid "Go back one character"
 msgstr "Gå bakåt ett tecken"
 
-#: src/global.c:556
+#: src/global.c:564
 msgid "Go forward one character"
 msgstr "Gå framåt ett tecken"
 
-#: src/global.c:558
+#: src/global.c:566
 msgid "Go back one word"
 msgstr "Gå bakåt ett ord"
 
-#: src/global.c:559
+#: src/global.c:567
 msgid "Go forward one word"
 msgstr "Gå framåt ett ord"
 
-#: src/global.c:561
+#: src/global.c:569
 msgid "Go to previous line"
 msgstr "Gå till föregående rad"
 
-#: src/global.c:562
+#: src/global.c:570
 msgid "Go to next line"
 msgstr "Gå till nästa rad"
 
-#: src/global.c:563
+#: src/global.c:571
 msgid "Go to beginning of current line"
 msgstr "Gå till början på aktuell rad"
 
-#: src/global.c:564
+#: src/global.c:572
 msgid "Go to end of current line"
 msgstr "Gå till slutet på aktuell rad"
 
 # Biten efter ; är konstig
-#: src/global.c:567
+#: src/global.c:575
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "Gå till början på det aktuella stycket; sedan för föregående stycke"
 
 # Biten efter ; är konstig
-#: src/global.c:569
+#: src/global.c:577
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr "Gå till slutet på det aktuella stycket; sedan för nästa stycke"
 
-#: src/global.c:571
+#: src/global.c:579
 msgid "Go to the first line of the file"
 msgstr "Gå till filens första rad"
 
-#: src/global.c:572
+#: src/global.c:580
 msgid "Go to the last line of the file"
 msgstr "GÃ¥ till filens sista rad"
 
-#: src/global.c:574
+#: src/global.c:582
 msgid "Go to the matching bracket"
 msgstr "GÃ¥ till den matchande klammern"
 
-#: src/global.c:576
+#: src/global.c:584
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "Rulla upp en rad utan att rulla markören"
 
-#: src/global.c:578
+#: src/global.c:586
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "Rulla ned en rad utan att rulla markören"
 
-#: src/global.c:581
+#: src/global.c:589
 msgid "Switch to the previous file buffer"
 msgstr "Växla till föregående filbuffert"
 
-#: src/global.c:582
+#: src/global.c:590
 msgid "Switch to the next file buffer"
 msgstr "Växla till nästa filbuffert"
 
 # Osäker
-#: src/global.c:584
+#: src/global.c:592
 msgid "Insert the next keystroke verbatim"
 msgstr "Infoga nästa tecken ordagrant"
 
-#: src/global.c:585
+#: src/global.c:593
 msgid "Insert a tab at the cursor position"
 msgstr "Infoga ett tabulatortecken vid markörpositionen"
 
-#: src/global.c:586
+#: src/global.c:594
 msgid "Insert a newline at the cursor position"
 msgstr "Infoga ny rad-tecken vid markörpositionen"
 
-#: src/global.c:587
+#: src/global.c:595
 msgid "Delete the character under the cursor"
 msgstr "Ta bort tecknet under markören"
 
-#: src/global.c:589
+#: src/global.c:597
 msgid "Delete the character to the left of the cursor"
 msgstr "Ta bort tecknet till vänster om markören"
 
-#: src/global.c:592
-#, fuzzy
+#: src/global.c:600
 msgid "Cut backward from cursor to word start"
-msgstr "Klipp ut från markören till slutet på raden"
+msgstr "Klipp ut bakåt från markören till ordets början"
 
-#: src/global.c:594
-#, fuzzy
+#: src/global.c:602
 msgid "Cut forward from cursor to next word start"
-msgstr "Klipp ut från markören till slutet på raden"
+msgstr "Klipp ut framåt från markören till början på nästa ord"
 
-#: src/global.c:596
+#: src/global.c:604
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Klipp ut från markörens position till slutet av filen"
 
-#: src/global.c:599
+#: src/global.c:607
 msgid "Justify the entire file"
 msgstr "Justera hela filen"
 
-#: src/global.c:603
+#: src/global.c:611
 msgid "Count the number of words, lines, and characters"
 msgstr "Räkna antalet ord, rader och tecken"
 
-#: src/global.c:606
+#: src/global.c:614
 msgid "Refresh (redraw) the current screen"
 msgstr "Uppdatera (rita om) den aktuella skärmen"
 
-#: src/global.c:608
-#, fuzzy
+#: src/global.c:616
 msgid "Suspend the editor (if suspension is enabled)"
 msgstr "Försätt redigeraren i vänteläge (om vänteläge är aktiverat)"
 
-#: src/global.c:610
+#: src/global.c:618
 msgid "Save file without prompting"
-msgstr ""
+msgstr "Spara fil utan att fråga"
 
-#: src/global.c:611
-#, fuzzy
+#: src/global.c:619
 msgid "Search next occurrence backward"
-msgstr "Sök baklänges"
+msgstr "Sök nästa förekomst bakåt"
 
-#: src/global.c:612
+#: src/global.c:620
 msgid "Search next occurrence forward"
-msgstr ""
+msgstr "Sök nästa förekomst framåt"
 
-#: src/global.c:614
+#: src/global.c:622
 msgid "Toggle the case sensitivity of the search"
 msgstr "Växla skiftlägeskänslig sökning"
 
-#: src/global.c:616
+#: src/global.c:624
 msgid "Reverse the direction of the search"
 msgstr "Vänd riktning för sökningen"
 
-#: src/global.c:620
+#: src/global.c:628
 msgid "Toggle the use of regular expressions"
 msgstr "Växla användningen av reguljära uttryck"
 
-#: src/global.c:624
+#: src/global.c:632
 msgid "Recall the previous search/replace string"
 msgstr "Återkalla den föregående sök/ersätt-strängen"
 
-#: src/global.c:626
+#: src/global.c:634
 msgid "Recall the next search/replace string"
 msgstr "Återkalla nästa sök/ersätt-sträng"
 
-#: src/global.c:629
+#: src/global.c:637
 msgid "Go to file browser"
 msgstr "Gå till filbläddrare"
 
-#: src/global.c:632
+#: src/global.c:640
 msgid "Toggle the use of DOS format"
 msgstr "Växla användning av DOS-format"
 
-#: src/global.c:633
+#: src/global.c:641
 msgid "Toggle the use of Mac format"
 msgstr "Växla användning av Mac-format"
 
-#: src/global.c:634
+#: src/global.c:642
 msgid "Toggle appending"
 msgstr "Växla inmatning efter"
 
-#: src/global.c:635
+#: src/global.c:643
 msgid "Toggle prepending"
 msgstr "Växla inmatning före"
 
-#: src/global.c:636
+#: src/global.c:644
 msgid "Toggle backing up of the original file"
 msgstr "Växla säkerhetskopiering av originalfilen"
 
-#: src/global.c:637
+#: src/global.c:645
 msgid "Execute external command"
 msgstr "Kör externt kommando"
 
-#: src/global.c:639
+#: src/global.c:647
 msgid "Close buffer without saving it"
-msgstr ""
+msgstr "Stäng buffert utan att spara den"
 
-#: src/global.c:641
+#: src/global.c:649
 msgid "Toggle the use of a new buffer"
 msgstr "Växla användning av en ny buffert"
 
-#: src/global.c:644
+#: src/global.c:652
 msgid "Exit from the file browser"
 msgstr "Avsluta från filbläddraren"
 
-#: src/global.c:645
+#: src/global.c:653
 msgid "Go to the first file in the list"
 msgstr "Gå till första filen i listan"
 
-#: src/global.c:646
+#: src/global.c:654
 msgid "Go to the last file in the list"
 msgstr "GÃ¥ till sista filen i listan"
 
-#: src/global.c:647
+#: src/global.c:655
 msgid "Go to the previous file in the list"
 msgstr "Gå till föregående fil i listan"
 
-#: src/global.c:648
+#: src/global.c:656
 msgid "Go to the next file in the list"
 msgstr "Gå till nästa fil i listan"
 
-#: src/global.c:649
+#: src/global.c:657
 msgid "Go to directory"
 msgstr "GÃ¥ till katalog"
 
-#: src/global.c:652
+#: src/global.c:660
 msgid "Invoke the linter, if available"
 msgstr "Starta felkontrollen, om tillgänglig"
 
-#: src/global.c:653
+#: src/global.c:661
 msgid "Go to previous linter msg"
 msgstr "Gå till föregående felkontrmedd"
 
-#: src/global.c:654
+#: src/global.c:662
 msgid "Go to next linter msg"
 msgstr "Gå till nästa felkontrmedd"
 
-#: src/global.c:656
+#: src/global.c:664
 msgid "Invoke formatter, if available"
 msgstr "Starta formaterare, om tillgänglig"
 
 #. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:671
+#: src/global.c:679
 msgid "Get Help"
 msgstr "Få hjälp"
 
-#: src/global.c:674 src/prompt.c:858
+#: src/global.c:682 src/prompt.c:855
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: src/global.c:687
+#: src/global.c:695
 msgid "Write Out"
 msgstr "Skriv ut"
 
-#: src/global.c:723
+#: src/global.c:731
 msgid "Go To Dir"
 msgstr "GÃ¥ till katalog"
 
-#: src/global.c:738
+#: src/global.c:746
 msgid "Cut Text"
 msgstr "Klipp ut"
 
-#: src/global.c:753
+#: src/global.c:761
 msgid "To Spell"
 msgstr "Stavkontr."
 
-#: src/global.c:757
+#: src/global.c:765
 msgid "To Linter"
 msgstr "Till felkontrollsverktyg"
 
-#: src/global.c:760
+#: src/global.c:768
 msgid "Formatter"
 msgstr "Formaterare"
 
-#: src/global.c:767
+#: src/global.c:775
 msgid "Case Sens"
 msgstr "Skiftkänsl"
 
-#: src/global.c:772
+#: src/global.c:780
 msgid "Regexp"
 msgstr "Reguljärt uttr"
 
-#: src/global.c:777
+#: src/global.c:785
 msgid "Backwards"
 msgstr "Bakåt"
 
-#: src/global.c:784
+#: src/global.c:792
 msgid "No Replace"
 msgstr "Ingen ersättning"
 
-#: src/global.c:792
+#: src/global.c:800
 msgid "Cur Pos"
 msgstr "Akt. pos"
 
-#: src/global.c:807
+#: src/global.c:815
 msgid "First Line"
 msgstr "Första raden"
 
-#: src/global.c:809
+#: src/global.c:817
 msgid "Last Line"
 msgstr "Sista raden"
 
-#: src/global.c:816
+#: src/global.c:824
 msgid "To Bracket"
 msgstr "Till klammer"
 
-#: src/global.c:819
+#: src/global.c:827
 msgid "Mark Text"
 msgstr "Markera text"
 
-#: src/global.c:822
+#: src/global.c:830
 msgid "Copy Text"
 msgstr "Kopiera text"
 
-#: src/global.c:825
+#: src/global.c:833
 msgid "Indent Text"
 msgstr "Dra in text"
 
-#: src/global.c:827
+#: src/global.c:835
 msgid "Unindent Text"
 msgstr "Ã…ngra indragning av text"
 
-#: src/global.c:830
+#: src/global.c:838
 msgid "Undo"
 msgstr "Ã…ngra"
 
-#: src/global.c:832
+#: src/global.c:840
 msgid "Redo"
 msgstr "Gör om"
 
-#: src/global.c:836 src/global.c:842
+#: src/global.c:844 src/global.c:850
 msgid "Back"
 msgstr "Bakåt"
 
-#: src/global.c:838 src/global.c:844
+#: src/global.c:846 src/global.c:852
 msgid "Forward"
 msgstr "Framåt"
 
-#: src/global.c:849
+#: src/global.c:857
 msgid "Prev Word"
 msgstr "Föreg ord"
 
-#: src/global.c:851
+#: src/global.c:859
 msgid "Next Word"
 msgstr "Nästa ord"
 
-#: src/global.c:855
+#: src/global.c:863
 msgid "Home"
 msgstr "Hem"
 
-#: src/global.c:857
+#: src/global.c:865
 msgid "End"
 msgstr "Slut"
 
-#: src/global.c:866
+#: src/global.c:874
 msgid "Beg of Par"
 msgstr "Börj på sty"
 
-#: src/global.c:868
+#: src/global.c:876
 msgid "End of Par"
 msgstr "Slut på sty"
 
-#: src/global.c:873
+#: src/global.c:881
 msgid "Scroll Up"
 msgstr "Rulla upp"
 
-#: src/global.c:875
+#: src/global.c:883
 msgid "Scroll Down"
 msgstr "Rulla ned"
 
-#: src/global.c:880
+#: src/global.c:888
 msgid "Prev File"
 msgstr "Föregående fil"
 
-#: src/global.c:882
+#: src/global.c:890
 msgid "Next File"
 msgstr "Nästa fil"
 
-#: src/global.c:891
+#: src/global.c:899
 msgid "Verbatim"
 msgstr "Ordagrann"
 
-#: src/global.c:894
+#: src/global.c:902
 msgid "Tab"
 msgstr "Tabb"
 
-#: src/global.c:896
+#: src/global.c:904
 msgid "Enter"
 msgstr "Retur"
 
-#: src/global.c:899
+#: src/global.c:907
 msgid "Delete"
 msgstr "Ta bort"
 
-#: src/global.c:901
+#: src/global.c:909
 msgid "Backspace"
 msgstr "Backsteg"
 
 #. TRANSLATORS: The next two strings refer to cutting words.
-#: src/global.c:912
-#, fuzzy
+#: src/global.c:920
 msgid "Cut Left"
-msgstr "Klipp ut"
+msgstr "Klipp vänster"
 
-#: src/global.c:914
+#: src/global.c:922
 msgid "Cut Right"
-msgstr ""
+msgstr "Klipp höger"
 
-#: src/global.c:916
+#: src/global.c:924
 msgid "CutTillEnd"
 msgstr "KlippTillSlut"
 
-#: src/global.c:926
+#: src/global.c:934
 msgid "Word Count"
 msgstr "Antal ord"
 
-#: src/global.c:933
+#: src/global.c:941
 msgid "Suspend"
 msgstr "Vänteläge"
 
-#: src/global.c:937
+#: src/global.c:945
+#, fuzzy
+msgid "Comment Lines"
+msgstr "Nästa rad"
+
+#: src/global.c:949
 msgid "Save"
-msgstr ""
+msgstr "Spara"
 
-#: src/global.c:940
+#: src/global.c:952
 msgid "Previous"
-msgstr ""
+msgstr "Föregående"
 
-#: src/global.c:942
-#, fuzzy
+#: src/global.c:954
 msgid "Next"
-msgstr "Nästa rad"
+msgstr "Nästa"
 
-#: src/global.c:948
+#: src/global.c:960
 msgid "PrevHstory"
 msgstr "FöregHisto"
 
-#: src/global.c:951
+#: src/global.c:963
 msgid "NextHstory"
 msgstr "NästaHisto"
 
-#: src/global.c:955
+#: src/global.c:972
 msgid "Go To Text"
 msgstr "GÃ¥ till text"
 
-#: src/global.c:959
+#: src/global.c:976
 msgid "DOS Format"
 msgstr "DOS-format"
 
-#: src/global.c:961
+#: src/global.c:978
 msgid "Mac Format"
 msgstr "Mac-format"
 
-#: src/global.c:969
+#: src/global.c:986
 msgid "Append"
 msgstr "Lägg till"
 
-#: src/global.c:971
+#: src/global.c:988
 msgid "Prepend"
 msgstr "Infoga"
 
-#: src/global.c:974
+#: src/global.c:991
 msgid "Backup File"
 msgstr "Säkerhetskopiera fil"
 
-#: src/global.c:981
+#: src/global.c:998
 msgid "Execute Command"
 msgstr "Kör kommando"
 
-#: src/global.c:996
+#: src/global.c:1013
 msgid "To Files"
 msgstr "Till filer"
 
-#: src/global.c:1004
+#: src/global.c:1021
 msgid "First File"
 msgstr "Första filen"
 
-#: src/global.c:1006
+#: src/global.c:1023
 msgid "Last File"
 msgstr "Sista filen"
 
-#: src/global.c:1010
+#: src/global.c:1027
 msgid "Discard buffer"
+msgstr "Kasta buffert"
+
+#: src/global.c:1038
+msgid "Left Column"
+msgstr ""
+
+#: src/global.c:1040
+msgid "Right Column"
 msgstr ""
 
 #. TRANSLATORS: Try to keep the next two strings at most 20 characters.
-#: src/global.c:1020
+#: src/global.c:1047
 msgid "Prev Lint Msg"
 msgstr "Föreg felkontrolsmed"
 
-#: src/global.c:1022
+#: src/global.c:1049
 msgid "Next Lint Msg"
 msgstr "Nästa felkontrollsmed"
 
 #. TRANSLATORS: The next seventeen strings are toggle descriptions;
 #. * they are best kept shorter than 40 characters, but may be longer.
-#: src/global.c:1285
+#: src/global.c:1316
 msgid "Help mode"
 msgstr "Hjälpläge"
 
-#: src/global.c:1287
+#: src/global.c:1318
 msgid "Constant cursor position display"
 msgstr "Konstant visning av markörposition"
 
-#: src/global.c:1289
+#: src/global.c:1320
 msgid "Use of one more line for editing"
 msgstr "Användning av ytterligare en rad för redigering"
 
-#: src/global.c:1291
+#: src/global.c:1322
 msgid "Smooth scrolling"
 msgstr "Mjuk rullning"
 
-#: src/global.c:1293
+#: src/global.c:1324
 msgid "Soft wrapping of overlong lines"
 msgstr "Mjuk radbrytning av långa rader"
 
-#: src/global.c:1295
+#: src/global.c:1326
 msgid "Whitespace display"
 msgstr "Visning av blanktecken"
 
-#: src/global.c:1297
+#: src/global.c:1328
 msgid "Color syntax highlighting"
 msgstr "Färgmarkering av syntax"
 
-#: src/global.c:1299
+#: src/global.c:1330
 msgid "Smart home key"
 msgstr "Smart hemtangent"
 
-#: src/global.c:1301
+#: src/global.c:1332
 msgid "Auto indent"
 msgstr "Automatisk indragning"
 
-#: src/global.c:1303
+#: src/global.c:1334
 msgid "Cut to end"
 msgstr "Klipp ut till slutet"
 
-#: src/global.c:1305
+#: src/global.c:1336
 msgid "Hard wrapping of overlong lines"
 msgstr "Fast radbrytning av långa rader"
 
-#: src/global.c:1307
+#: src/global.c:1338
 msgid "Conversion of typed tabs to spaces"
 msgstr "Konvertering av inmatade tabulatorer till blanksteg"
 
-#: src/global.c:1309
+#: src/global.c:1340
 msgid "Backup files"
 msgstr "Säkerhetskopiera filer"
 
-#: src/global.c:1311
+#: src/global.c:1342
 msgid "Reading file into separate buffer"
 msgstr "Läser fil till separat buffert"
 
-#: src/global.c:1313
+#: src/global.c:1344
 msgid "Mouse support"
 msgstr "Musstöd"
 
-#: src/global.c:1315
+#: src/global.c:1346
 msgid "No conversion from DOS/Mac format"
 msgstr "Ingen konvertering från DOS/Mac-format"
 
-#: src/global.c:1317
+#: src/global.c:1348
 msgid "Suspension"
 msgstr "Vänteläge"
 
-#: src/help.c:209
+#: src/help.c:211
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1178,7 +1178,7 @@ msgstr ""
 "Att trycka Retur utan att ange någon text kommer att utföra den tidigare "
 "sökningen.  "
 
-#: src/help.c:218
+#: src/help.c:220
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1192,7 +1192,7 @@ msgstr ""
 " Följande funktionstangenter finns tillgängliga i sökläget:\n"
 "\n"
 
-#: src/help.c:224
+#: src/help.c:226
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1212,7 +1212,7 @@ msgstr ""
 " Följande funktionstangenter är tillgängliga i gå till rad-läge:\n"
 "\n"
 
-#: src/help.c:233
+#: src/help.c:235
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1235,7 +1235,7 @@ msgstr ""
 "att den läses in i en separat buffert (använd Meta-< och > för att växla "
 "mellan filbuffertar). "
 
-#: src/help.c:242
+#: src/help.c:244
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1249,7 +1249,7 @@ msgstr ""
 " Följande funktionstangenter är tillgängliga i infoga fil-läge:\n"
 "\n"
 
-#: src/help.c:248
+#: src/help.c:250
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1277,7 +1277,7 @@ msgstr ""
 " Följande funktionstangenter är tillgängliga i skriv fil-läge:\n"
 "\n"
 
-#: src/help.c:262
+#: src/help.c:264
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1301,7 +1301,7 @@ msgstr ""
 " Följande funktionstangenter är tillgängliga i filbläddraren:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:277
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1325,7 +1325,7 @@ msgstr ""
 "sökningen.\n"
 "\n"
 
-#: src/help.c:284
+#: src/help.c:286
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1333,7 +1333,7 @@ msgstr ""
 " Följande funktionstangenter är tillgängliga i sökläget:\n"
 "\n"
 
-#: src/help.c:288
+#: src/help.c:290
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1357,7 +1357,7 @@ msgstr ""
 "läge:\n"
 "\n"
 
-#: src/help.c:301
+#: src/help.c:303
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1381,7 +1381,7 @@ msgstr ""
 " Följande funktionstangenter är tillgängliga i stavningskontrolläget:\n"
 "\n"
 
-#: src/help.c:316
+#: src/help.c:318
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1401,7 +1401,7 @@ msgstr ""
 " Följande funktionstangenter är tillgängliga i läget kör kommando:\n"
 "\n"
 
-#: src/help.c:329
+#: src/help.c:331
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1421,15 +1421,15 @@ msgstr ""
 "visar filen som redigeras. Statusraden är tredje raden från nederkanten och "
 "visar viktiga meddelanden.  "
 
-#: src/help.c:339
+#: src/help.c:341
+#, fuzzy
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
-" The notation for shortcuts is as follows: Control-key sequences are notated "
-"with a caret (^) symbol and can be entered either by using the Control "
-"(Ctrl) key or pressing the Escape (Esc) key twice.  Escape-key sequences are "
-"notated with the Meta (M-) symbol and can be entered using either the Esc, "
-"Alt, or Meta key depending on your keyboard setup.  "
+" Shortcuts are written as follows: Control-key sequences are notated with a "
+"'^' and can be entered either by using the Ctrl key or pressing the Esc key "
+"twice.  Meta-key sequences are notated with 'M-' and can be entered using "
+"either the Alt, Cmd, or Esc key, depending on your keyboard setup.  "
 msgstr ""
 "De nedersta två raderna visar de vanligaste kortkommandona som används i "
 "textredigeraren.\n"
@@ -1458,21 +1458,19 @@ msgstr ""
 msgid "enable/disable"
 msgstr "aktivera/inaktivera"
 
-#: src/nano.c:559
-#, fuzzy
+#: src/nano.c:560
 msgid "Key is invalid in view mode"
 msgstr "Tangenten ogiltig i visningsläget"
 
-#: src/nano.c:565
-#, fuzzy
+#: src/nano.c:566
 msgid "This function is disabled in restricted mode"
-msgstr "Kan inte gå utanför %s i begränsat läge"
+msgstr "Funktionen är inaktiverad i begränsat läge"
 
-#: src/nano.c:573
+#: src/nano.c:574
 msgid "Help is not available"
-msgstr ""
+msgstr "Hjälp är inte tillgängligt"
 
-#: src/nano.c:684
+#: src/nano.c:686
 #, c-format
 msgid ""
 "\n"
@@ -1481,7 +1479,7 @@ msgstr ""
 "\n"
 "Bufferten skrevs till %s\n"
 
-#: src/nano.c:686
+#: src/nano.c:688
 #, c-format
 msgid ""
 "\n"
@@ -1490,7 +1488,7 @@ msgstr ""
 "\n"
 "Bufferten skrevs inte till %s: %s\n"
 
-#: src/nano.c:689
+#: src/nano.c:691
 #, c-format
 msgid ""
 "\n"
@@ -1661,9 +1659,8 @@ msgid "Fix Backspace/Delete confusion problem"
 msgstr "Fixa förvirringsproblemet med Backsteg/Delete"
 
 #: src/nano.c:888
-#, fuzzy
 msgid "Show this help text and exit"
-msgstr "Visa denna hjälptext"
+msgstr "Visa denna hjälptext och avsluta"
 
 #: src/nano.c:890
 msgid "Automatically indent new lines"
@@ -1730,9 +1727,8 @@ msgid "Auto save on exit, don't prompt"
 msgstr "Spara automatiskt vid avslut, fråga inte"
 
 #: src/nano.c:918
-#, fuzzy
 msgid "Save a file by default in Unix format"
-msgstr "Skriv fil i DOS-format"
+msgstr "Spara som standard en fil i Unix-format"
 
 #: src/nano.c:920
 msgid "View mode (read-only)"
@@ -1754,17 +1750,22 @@ msgstr "Använd vänteläge"
 msgid "Enable soft line wrapping"
 msgstr "Aktivera mjuk radbrytning"
 
-#: src/nano.c:937
-#, c-format
-msgid " GNU nano, version %s\n"
+#: src/nano.c:940
+#, fuzzy, c-format
+msgid " nano, version %s\n"
 msgstr " GNU nano, version %s\n"
 
-#: src/nano.c:940
+#: src/nano.c:943
+#, c-format
+msgid " (C) 2014..%s the contributors to nano\n"
+msgstr ""
+
+#: src/nano.c:945
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr " E-post: nano@nano-editor.org\tHemsida: http://www.nano-editor.org/"
 
-#: src/nano.c:941
+#: src/nano.c:946
 #, c-format
 msgid ""
 "\n"
@@ -1773,68 +1774,82 @@ msgstr ""
 "\n"
 " Kompileringsflaggor:"
 
-#: src/nano.c:1073
+#: src/nano.c:1081
 msgid "No file name"
 msgstr "Inget filnamn"
 
-#: src/nano.c:1108
-msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
+#: src/nano.c:1115
+msgid "Save modified buffer?  (Answering \"No\" will DISCARD changes.) "
 msgstr ""
-"Spara ändrad buffert (ATT SVARA \"Nej\" KOMMER ATT FÖRSTÖRA ÄNDRINGAR)? "
 
-#: src/nano.c:1168
+#: src/nano.c:1178
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "Kunde inte återöppna stdin från tangentbordet\n"
 
-#: src/nano.c:1192
+#: src/nano.c:1202
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "Läser från stdin, ^C för att avbryta\n"
 
-#: src/nano.c:1256
+#: src/nano.c:1266
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Mottog SIGHUP eller SIGTERM\n"
 
-#: src/nano.c:1272
+#: src/nano.c:1282
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Använd \"fg\" för att återvända till nano.\n"
 
-#: src/nano.c:1294
+#: src/nano.c:1304
 msgid "Suspension is not enabled"
-msgstr ""
+msgstr "Vänteläge är inte aktiverat"
 
-#: src/nano.c:1448
+#: src/nano.c:1459
 msgid "enabled"
 msgstr "aktiverad"
 
-#: src/nano.c:1448
+#: src/nano.c:1459
 msgid "disabled"
 msgstr "inaktiverad"
 
-#: src/nano.c:1607 src/winio.c:1125
-msgid "Unknown Command"
-msgstr "Okänt kommando"
+#: src/nano.c:1573
+msgid "Unbound key"
+msgstr ""
+
+#: src/nano.c:1577
+#, c-format
+msgid "Unbound key: M-%c"
+msgstr ""
+
+#: src/nano.c:1579
+#, c-format
+msgid "Unbound key: ^%c"
+msgstr ""
 
-#: src/nano.c:1720
+#: src/nano.c:1581
+#, c-format
+msgid "Unbound key: %c"
+msgstr ""
+
+#: src/nano.c:1745
 msgid "XON ignored, mumble mumble"
 msgstr "XON ignorerades, mummel mummel"
 
-#: src/nano.c:1725
+#: src/nano.c:1750
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF ignorerades, mummel mummel"
 
-#: src/nano.c:2139 src/rcfile.c:1334
+#: src/nano.c:2166 src/rcfile.c:1187
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Begärd tabulatorstorlek \"%s\" är ogiltig"
 
-#: src/nano.c:2200 src/rcfile.c:1259
+#: src/nano.c:2227 src/rcfile.c:1128
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Begärd fyllningsstorlek \"%s\" är ogiltig"
 
-#: src/nano.c:2247
+#: src/nano.c:2276
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr "Skriv ”%s -h” för en lista över tillgängliga flaggor.\n"
@@ -1842,114 +1857,118 @@ msgstr "Skriv ”%s -h” för en lista över tillgängliga flaggor.\n"
 #. TRANSLATORS: For the next three strings, if possible, specify
 #. * the single-byte shortcuts for both your language and English.
 #. * For example, in French: "OoYy" for "Oui".
-#: src/prompt.c:821
+#: src/prompt.c:818
 msgid "Yy"
 msgstr "JjYy"
 
-#: src/prompt.c:822
+#: src/prompt.c:819
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:823
+#: src/prompt.c:820
 msgid "Aa"
 msgstr "Aa"
 
-#: src/prompt.c:845
+#: src/prompt.c:842
 msgid "Yes"
 msgstr "Ja"
 
-#: src/prompt.c:850
+#: src/prompt.c:847
 msgid "All"
 msgstr "Alla"
 
-#: src/prompt.c:855
+#: src/prompt.c:852
 msgid "No"
 msgstr "Nej"
 
-#: src/rcfile.c:142
+#: src/rcfile.c:144
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Fel i %s på rad %lu: "
 
-#: src/rcfile.c:201
+#: src/rcfile.c:203
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "Argumentet \"%s\" har ett oavslutat \""
 
-#: src/rcfile.c:228 src/rcfile.c:280 src/rcfile.c:732 src/rcfile.c:793
-#: src/rcfile.c:882 src/rcfile.c:933
+#: src/rcfile.c:231 src/rcfile.c:674 src/rcfile.c:725 src/rcfile.c:824
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Strängar med reguljära uttryck måste börja och sluta med ett \"-tecken"
 
-#: src/rcfile.c:254 src/search.c:62
+#: src/rcfile.c:257 src/search.c:61
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Felaktigt reguljärt uttryck \"%s\": %s"
 
-#: src/rcfile.c:274
+#: src/rcfile.c:279
 msgid "Missing syntax name"
 msgstr "Syntaxnamn saknas"
 
-#: src/rcfile.c:345
+#: src/rcfile.c:288
+msgid "A syntax name must be quoted"
+msgstr ""
+
+#: src/rcfile.c:297
 msgid "The \"none\" syntax is reserved"
 msgstr "Syntaxen \"none\" är reserverad"
 
-#: src/rcfile.c:352
-msgid "The \"default\" syntax must take no extensions"
+#: src/rcfile.c:327
+#, fuzzy
+msgid "The \"default\" syntax does not accept extensions"
 msgstr "Syntaxen \"default\" får inte ta utökningar"
 
-#: src/rcfile.c:424
+#: src/rcfile.c:369
 msgid "Missing key name"
 msgstr "Saknar tangentnamn"
 
-#: src/rcfile.c:433 src/rcfile.c:444
+#: src/rcfile.c:378 src/rcfile.c:389
 msgid "Key name is too short"
 msgstr "Tangentnamnet är för kort"
 
-#: src/rcfile.c:454
+#: src/rcfile.c:399
 msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr "Tangentnamnet måste börja med ”^”, ”M” eller ”F”"
 
-#: src/rcfile.c:457
-#, fuzzy, c-format
+#: src/rcfile.c:402
+#, c-format
 msgid "Key name %s is invalid"
-msgstr "Begärd tabulatorstorlek \"%s\" är ogiltig"
+msgstr "Tangentnamnet \"%s\" är ogiltigt"
 
-#: src/rcfile.c:466
+#: src/rcfile.c:411
 msgid "Must specify a function to bind the key to"
 msgstr "MÃ¥ste ange en funktion att binda tangenten till"
 
 #. TRANSLATORS: Do not translate the word "all".
-#: src/rcfile.c:476
+#: src/rcfile.c:421
 msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr "Måste ange en meny (eller \"all\") för att ändra bindning för tangent"
 
-#: src/rcfile.c:483
+#: src/rcfile.c:428
 #, c-format
 msgid "Cannot map name \"%s\" to a function"
 msgstr "Kan inte mappa namnet ”%s” till en funktion"
 
-#: src/rcfile.c:490
+#: src/rcfile.c:435
 #, c-format
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "Kan inte mappa namnet ”%s” till en meny"
 
-#: src/rcfile.c:522
+#: src/rcfile.c:467
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr "Funktionen ”%s”  existerar inte i meny ”%s”"
 
-#: src/rcfile.c:534
+#: src/rcfile.c:479
 #, c-format
 msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "Tangentnedtryckningen ”%s” kan inte bindas om"
 
-#: src/rcfile.c:631
+#: src/rcfile.c:576
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr "Fel vid utökning av %s: %s"
 
-#: src/rcfile.c:674
+#: src/rcfile.c:616
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1964,65 +1983,51 @@ msgstr ""
 "\"cyan\", \"magenta\" och \"black\" (svart), med\n"
 "valfria prefixet \"bright\" (ljus) för förgrundsfärger."
 
-#: src/rcfile.c:696
-msgid "Cannot add a color command without a syntax command"
-msgstr "Kan inte lägga till ett färgkommando utan ett syntaxkommando"
+#: src/rcfile.c:637 src/rcfile.c:795 src/rcfile.c:858
+#, c-format
+msgid "A '%s' command requires a preceding 'syntax' command"
+msgstr ""
 
-#: src/rcfile.c:701
+#: src/rcfile.c:643
 msgid "Missing color name"
 msgstr "Färgnamn saknas"
 
-#: src/rcfile.c:711 src/rcfile.c:872
-msgid "Missing regex string"
-msgstr "Saknar sträng för reguljärt uttryck"
+#: src/rcfile.c:653 src/rcfile.c:807
+#, fuzzy, c-format
+msgid "Missing regex string after '%s' command"
+msgstr "Saknar kommando för felkontroll"
 
-#: src/rcfile.c:787
+#: src/rcfile.c:719
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\" kräver ett motsvarande \"end=\""
 
-#: src/rcfile.c:839
+#: src/rcfile.c:768
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
 msgstr "Bakgrundsfärgen \"%s\" kan inte vara ljus"
 
-#: src/rcfile.c:867
-msgid "Cannot add a header regex without a syntax command"
-msgstr ""
-"Kan inte lägga till ett reguljärt uttryck för huvud utan ett syntaxkommando"
-
-#: src/rcfile.c:922
-msgid "Cannot add a magic string regex without a syntax command"
-msgstr ""
-"Kan inte lägga till ett reguljärt uttryck för magisk sträng utan ett "
-"syntaxkommando"
-
-#: src/rcfile.c:927
-msgid "Missing magic string name"
-msgstr "Saknar namn på magisk sträng"
-
-#: src/rcfile.c:985
-msgid "Cannot add a linter without a syntax command"
-msgstr "Kan inte lägga till en felkontroll utan ett syntaxkommando"
+#: src/rcfile.c:802
+#, fuzzy, c-format
+msgid "The \"default\" syntax does not accept '%s' regexes"
+msgstr "Syntaxen \"default\" får inte ta utökningar"
 
-#: src/rcfile.c:990
-msgid "Missing linter command"
+#: src/rcfile.c:863
+#, fuzzy, c-format
+msgid "Missing command after '%s'"
 msgstr "Saknar kommando för felkontroll"
 
-#: src/rcfile.c:1011
-msgid "Cannot add formatter without a syntax command"
-msgstr "Kan inte lägga till formaterare utan ett syntaxkommando"
-
-#: src/rcfile.c:1016
-msgid "Missing formatter command"
-msgstr "Saknar kommando för formaterare"
+#: src/rcfile.c:879
+#, fuzzy, c-format
+msgid "Argument of '%s' lacks closing \""
+msgstr "Argumentet \"%s\" har ett oavslutat \""
 
-#: src/rcfile.c:1046
+#: src/rcfile.c:910
 #, c-format
 msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr ""
 "Allvarligt fel: Inga tangenter mappade för funktionen \"%s\". Avslutar.\n"
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:912
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
@@ -2030,62 +2035,62 @@ msgstr ""
 "Om det behövs, använd nano med flaggan -I för att justera dina nanorc-"
 "inställningar.\n"
 
-#: src/rcfile.c:1109
+#: src/rcfile.c:971
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "Kunde inte hitta syntax %s att utöka"
 
-#: src/rcfile.c:1125 src/rcfile.c:1134 src/rcfile.c:1144
-#, c-format
-msgid "Command \"%s\" not allowed in included file"
-msgstr "Kommandot \"%s\" tillåts inte i inkluderad fil"
-
-#: src/rcfile.c:1150 src/rcfile.c:1359
+#: src/rcfile.c:993 src/rcfile.c:1202
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Syntax \"%s\" har inga färgkommandon"
 
-#: src/rcfile.c:1180
+#: src/rcfile.c:1024
+#, c-format
+msgid "Command \"%s\" not allowed in included file"
+msgstr "Kommandot \"%s\" tillåts inte i inkluderad fil"
+
+#: src/rcfile.c:1039
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Förstår inte kommandot \"%s\""
 
-#: src/rcfile.c:1195
+#: src/rcfile.c:1051
 msgid "Missing option"
 msgstr "Saknad flagga"
 
-#: src/rcfile.c:1217
+#: src/rcfile.c:1065
+#, c-format
+msgid "Unknown option \"%s\""
+msgstr "Okänd flagga \"%s\""
+
+#: src/rcfile.c:1077
+#, c-format
+msgid "Cannot unset option \"%s\""
+msgstr "Kan inte bort flaggan \"%s\""
+
+#: src/rcfile.c:1089
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Flaggan \"%s\" kräver ett argument"
 
-#: src/rcfile.c:1235
+#: src/rcfile.c:1105
 msgid "Option is not a valid multibyte string"
 msgstr "Flagga är inte en giltig flerbytesträng"
 
-#: src/rcfile.c:1272 src/rcfile.c:1300 src/rcfile.c:1309
+#: src/rcfile.c:1139 src/rcfile.c:1160 src/rcfile.c:1167
 msgid "Non-blank characters required"
 msgstr "Icke-blanktecken krävs"
 
-#: src/rcfile.c:1282
+#: src/rcfile.c:1146
 msgid "Two single-column characters required"
 msgstr "Två enkel-kolumntecken krävs"
 
-#: src/rcfile.c:1348
-#, c-format
-msgid "Cannot unset option \"%s\""
-msgstr "Kan inte bort flaggan \"%s\""
-
-#: src/rcfile.c:1354
-#, c-format
-msgid "Unknown option \"%s\""
-msgstr "Okänd flagga \"%s\""
-
-#: src/rcfile.c:1413
+#: src/rcfile.c:1258
 msgid "I can't find my home directory!  Wah!"
 msgstr "Jag kan inte hitta min hemkatalog! Buhu!"
 
-#: src/rcfile.c:1451
+#: src/rcfile.c:1295
 #, c-format
 msgid ""
 "\n"
@@ -2094,44 +2099,49 @@ msgstr ""
 "\n"
 "Tryck Retur för att fortsätta starta nano.\n"
 
-#: src/search.c:96
+#: src/search.c:95
 #, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "\"%.*s%s\" kunde inte hittas"
 
 #. TRANSLATORS: The next three strings are modifiers of the search prompt.
-#: src/search.c:176
+#: src/search.c:169
 msgid " [Case Sensitive]"
 msgstr " [Skiftlägeskänslig]"
 
-#: src/search.c:180
+#: src/search.c:173
 msgid " [Regexp]"
 msgstr " [Reguljärt uttryck]"
 
-#: src/search.c:184
+#: src/search.c:177
 msgid " [Backwards]"
 msgstr " [Baklänges]"
 
 #. TRANSLATORS: The next two strings are modifiers of the search prompt.
-#: src/search.c:189
+#: src/search.c:182
 msgid " (to replace) in selection"
 msgstr " (att ersätta) i markering"
 
-#: src/search.c:191
+#: src/search.c:184
 msgid " (to replace)"
 msgstr " (att ersätta)"
 
+#: src/search.c:305
+#, fuzzy
+msgid "Searching..."
+msgstr "Sök"
+
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:718
+#: src/search.c:693
 msgid "Replace this instance?"
 msgstr "Ersätta denna förekomst?"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:883
+#: src/search.c:840
 msgid "Replace with"
 msgstr "Ersätt med"
 
-#: src/search.c:924
+#: src/search.c:875
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
@@ -2139,293 +2149,401 @@ msgstr[0] "Ersatte %lu förekomst"
 msgstr[1] "Ersatte %lu förekomster"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:964
+#: src/search.c:914
 msgid "Enter line number, column number"
 msgstr "Ange radnummer, kolumnnummer"
 
-#: src/search.c:991
+#: src/search.c:939
 msgid "Invalid line or column number"
 msgstr "Ogiltigt rad- eller kolumnnummer"
 
-#: src/search.c:1124
+#: src/search.c:1080
 msgid "Not a bracket"
 msgstr "Inte en klammer"
 
-#: src/search.c:1191
+#: src/search.c:1146
 msgid "No matching bracket"
 msgstr "Ingen matchande klammer"
 
-#: src/text.c:54
+#: src/text.c:53
 msgid "Mark Set"
 msgstr "Markering satt"
 
-#: src/text.c:58
+#: src/text.c:57
 msgid "Mark Unset"
 msgstr "Markera borttagen"
 
-#: src/text.c:70
+#: src/text.c:69
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Fel vid start av \"%s\""
 
-#: src/text.c:475
+#: src/text.c:468
+msgid "Commenting is not supported for this file type"
+msgstr ""
+
+#: src/text.c:484
+msgid "Cannot comment past end of file"
+msgstr ""
+
+#: src/text.c:677
 msgid "Nothing in undo buffer!"
 msgstr "Inget i ångra-bufferten!"
 
-#: src/text.c:481 src/text.c:634
-#, c-format
-msgid "Internal error: can't match line %d.  Please save your work."
-msgstr "Internt fel: Kan inte matcha raden %d. Spara ditt arbete."
-
 #. TRANSLATORS: Eight of the next nine strings describe actions
 #. * that are undone or redone.  It are all nouns, not verbs.
-#: src/text.c:495 src/text.c:524 src/text.c:645 src/text.c:686
+#: src/text.c:695 src/text.c:724 src/text.c:857 src/text.c:898
 msgid "text add"
 msgstr "lägg till text"
 
-#: src/text.c:505 src/text.c:656
+#: src/text.c:705 src/text.c:868
 msgid "text delete"
 msgstr "textborttagning"
 
-#: src/text.c:528 src/text.c:694
+#: src/text.c:728 src/text.c:907
 msgid "line join"
 msgstr "lägg ihop rad"
 
-#: src/text.c:547 src/text.c:710
+#: src/text.c:747 src/text.c:923
 msgid "text cut"
 msgstr "klipp ut text"
 
-#: src/text.c:552 src/text.c:714
+#: src/text.c:752 src/text.c:927
 msgid "text uncut"
 msgstr "Ã¥ngra klipp ut text"
 
-#: src/text.c:558 src/text.c:691
-#, fuzzy
+#: src/text.c:758 src/text.c:903
 msgid "Internal error: line is missing.  Please save your work."
-msgstr "Internt fel: Kan inte matcha raden %d. Spara ditt arbete."
+msgstr "Internt fel: Raden saknas. Spara ditt arbete."
 
-#: src/text.c:561 src/text.c:665
+#: src/text.c:762 src/text.c:877
 msgid "line break"
 msgstr "radbryt"
 
-#: src/text.c:569 src/text.c:725
+#: src/text.c:772 src/text.c:947
+msgid "comment"
+msgstr ""
+
+#: src/text.c:776 src/text.c:951
+msgid "uncomment"
+msgstr ""
+
+#: src/text.c:780 src/text.c:938
 msgid "text insert"
 msgstr "textinmatning"
 
-#: src/text.c:589 src/text.c:718
+#: src/text.c:800 src/text.c:931
 msgid "text replace"
 msgstr "textersättning"
 
-#: src/text.c:596 src/text.c:732 src/text.c:1030 src/text.c:1174
+#: src/text.c:807 src/text.c:955 src/text.c:1267 src/text.c:1437
 msgid "Internal error: unknown type.  Please save your work."
 msgstr "Internt fel: Okänd typ. Spara ditt arbete."
 
-#: src/text.c:601
+#: src/text.c:813
 #, c-format
 msgid "Undid action (%s)"
 msgstr "Ångrade åtgärd (%s)"
 
-#: src/text.c:619
+#: src/text.c:832
 msgid "Nothing to re-do!"
 msgstr "Inget att göra om!"
 
-#: src/text.c:628
+#: src/text.c:841
 msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr "Internt fel: Kan inte göra om. Spara ditt arbete."
 
-#: src/text.c:737
+#: src/text.c:961
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Gjorde om åtgärd (%s)"
 
-#: src/text.c:827 src/text.c:2508 src/text.c:2944
+#: src/text.c:1051 src/text.c:2765 src/text.c:3198
 msgid "Could not create pipe"
 msgstr "Kunde inte skapa rör"
 
-#: src/text.c:853 src/text.c:2595 src/text.c:2750 src/text.c:2992
-#: src/text.c:3286
+#: src/text.c:1077 src/text.c:2852 src/text.c:3005 src/text.c:3246
+#: src/text.c:3540
 msgid "Could not fork"
 msgstr "Kunde inte grena"
 
-#: src/text.c:1853
+#: src/text.c:2117
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Felaktig citeringssträng %s: %s"
 
-#: src/text.c:2241
+#: src/text.c:2499
 msgid "Can now UnJustify!"
 msgstr "Kan ojustera nu!"
 
-#: src/text.c:2435
+#: src/text.c:2697
 msgid "Edit a replacement"
 msgstr "Redigera en ersättning"
 
-#: src/text.c:2510
+#. TRANSLATORS: Shown after fixing misspellings in one word.
+#: src/text.c:2713
+#, fuzzy
+msgid "Next word..."
+msgstr "Nästa ord"
+
+#: src/text.c:2767
 msgid "Creating misspelled word list, please wait..."
 msgstr "Skapar lista över felstavade ord, var vänlig vänta…"
 
-#: src/text.c:2601 src/text.c:2999
+#: src/text.c:2858 src/text.c:3253
 msgid "Could not get size of pipe buffer"
 msgstr "Kunde inte få tag i rörbuffertens storlek"
 
-#: src/text.c:2652
+#: src/text.c:2907
 msgid "Error invoking \"spell\""
 msgstr "Fel vid start av \"spell\""
 
-#: src/text.c:2655
+#: src/text.c:2910
 msgid "Error invoking \"sort -f\""
 msgstr "Fel vid start av \"sort -f\""
 
-#: src/text.c:2658
+#: src/text.c:2913
 msgid "Error invoking \"uniq\""
 msgstr "Fel vid start av \"uniq\""
 
-#: src/text.c:2881
+#: src/text.c:3135
 msgid "Invoking spell checker, please wait"
 msgstr "Starta stavningskontrollen"
 
-#: src/text.c:2897
+#: src/text.c:3151
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Stavningskontrollen misslyckades: %s"
 
-#: src/text.c:2899
+#: src/text.c:3153
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Stavningskontrollen misslyckades: %s: %s"
 
-#: src/text.c:2902
+#: src/text.c:3156
 msgid "Finished checking spelling"
 msgstr "Stavningskontrollen slutfördes"
 
-#: src/text.c:2927
+#: src/text.c:3181
 msgid "No linter defined for this type of file!"
 msgstr "Ingen felkontroll definierad för denna typ av fil!"
 
-#: src/text.c:2932
+#: src/text.c:3186
 msgid "Save modified buffer before linting?"
 msgstr "Spara ändrad buffert före felkontroll?"
 
-#: src/text.c:2949
+#: src/text.c:3203
 msgid "Invoking linter, please wait"
 msgstr "Startar felkontroll, vänta."
 
-#: src/text.c:3105
+#: src/text.c:3358
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr "Fick 0 tolkningsbara rader från kommando: %s"
 
-#: src/text.c:3134
+#: src/text.c:3388
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr "Meddelandet är för oöppnade filen %s, öppna den i en ny buffer?"
 
-#: src/text.c:3153
+#: src/text.c:3407
 msgid "No more errors in unopened files, cancelling"
-msgstr ""
+msgstr "Inga fler fel i oöppnade filer, avbryter"
 
-#: src/text.c:3192
+#: src/text.c:3446
 msgid "At last message"
 msgstr "Vid sista meddelandet"
 
-#: src/text.c:3197
+#: src/text.c:3451
 msgid "At first message"
 msgstr "Vid första meddelandet"
 
-#: src/text.c:3237
+#: src/text.c:3491
 msgid "Finished"
 msgstr "Slutförd"
 
-#: src/text.c:3259
+#: src/text.c:3513
 msgid "Invoking formatter, please wait"
 msgstr "Startar formaterare, vänta"
 
-#: src/text.c:3314
+#: src/text.c:3568
 msgid "Finished formatting"
 msgstr "Formatering slutfördes"
 
-#: src/text.c:3396
+#: src/text.c:3650
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sOrd: %lu  Rader: %ld  Tecken: %lu"
 
-#: src/text.c:3397
+#: src/text.c:3651
 msgid "In Selection:  "
 msgstr "I markering:  "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3411
+#: src/text.c:3665
 msgid "Verbatim Input"
 msgstr "Ordagrann inmatning"
 
-#: src/utils.c:391 src/utils.c:403
+#: src/utils.c:392 src/utils.c:404
 msgid "nano is out of memory!"
 msgstr "nano har slut på minne!"
 
+#: src/utils.c:625
+#, c-format
+msgid "Internal error: can't match line %d.  Please save your work."
+msgstr "Internt fel: Kan inte matcha raden %d. Spara ditt arbete."
+
+#. TRANSLATORS: This refers to a sequence of escape codes
+#. * (from the keyboard) that nano does not know about.
+#: src/winio.c:1121
+msgid "Unknown sequence"
+msgstr ""
+
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
 #: src/winio.c:1427
 msgid "Unicode Input"
 msgstr "Unicode-inmatning"
 
-#: src/winio.c:1991 src/winio.c:1995
-msgid "Modified"
-msgstr "Ändrad"
-
-#: src/winio.c:1992
-msgid "View"
-msgstr "Visa"
-
-#: src/winio.c:2006
+#: src/winio.c:1960
 msgid "DIR:"
 msgstr "KAT:"
 
-#: src/winio.c:2013
+#: src/winio.c:1968
 msgid "File:"
 msgstr "Fil:"
 
-#: src/winio.c:3141
+#: src/winio.c:1972 src/winio.c:1976
+msgid "Modified"
+msgstr "Ändrad"
+
+#: src/winio.c:1974
+msgid "View"
+msgstr "Visa"
+
+#: src/winio.c:3105
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "rad %ld/%ld (%d%%), kolumn %lu/%lu (%d%%), tecken %lu/%lu (%d%%)"
 
-#: src/winio.c:3271
+#: src/winio.c:3235
 msgid "The nano text editor"
 msgstr "Textredigeraren nano"
 
-#: src/winio.c:3272
+#: src/winio.c:3236
 msgid "version"
 msgstr "version"
 
-#: src/winio.c:3273
+#: src/winio.c:3237
 msgid "Brought to you by:"
 msgstr "Presenteras av:"
 
-#: src/winio.c:3274
+#: src/winio.c:3238
 msgid "Special thanks to:"
 msgstr "Ytterligare tack till:"
 
-#: src/winio.c:3275
+#: src/winio.c:3239
 msgid "The Free Software Foundation"
 msgstr "Free Software Foundation"
 
-#: src/winio.c:3276
+#: src/winio.c:3240
 msgid "the many translators and the TP"
 msgstr "de många översättarna och TP"
 
-#: src/winio.c:3277
+#: src/winio.c:3241
 msgid "For ncurses:"
 msgstr "För ncurses:"
 
-#: src/winio.c:3278
+#: src/winio.c:3242
 msgid "and anyone else we forgot..."
 msgstr "och alla andra som vi har glömt…"
 
-#: src/winio.c:3279
+#: src/winio.c:3243
 msgid "Thank you for using nano!"
 msgstr "Tack för att du använder nano!"
 
+#~ msgid ""
+#~ "Read %lu line (Converted from DOS and Mac format - Warning: No write "
+#~ "permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from DOS and Mac format - Warning: No write "
+#~ "permission)"
+#~ msgstr[0] ""
+#~ "Läste %lu rad (konverterad från DOS- och Mac-format - Varning: Inga "
+#~ "skrivrättigheter)"
+#~ msgstr[1] ""
+#~ "Läste %lu rader (konverterade från DOS- och Mac-format - Varning: Inga "
+#~ "skrivrättigheter)"
+
+#~ msgid ""
+#~ "Read %lu line (Converted from Mac format - Warning: No write permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from Mac format - Warning: No write permission)"
+#~ msgstr[0] ""
+#~ "Läste %lu rad (konverterad från Mac-format - Varning: Inga "
+#~ "skrivrättigheter)"
+#~ msgstr[1] ""
+#~ "Läste %lu rader (konverterade från Mac-format - Varning: Inga "
+#~ "skrivrättigheter)"
+
+#~ msgid ""
+#~ "Read %lu line (Converted from DOS format - Warning: No write permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from DOS format - Warning: No write permission)"
+#~ msgstr[0] ""
+#~ "Läste %lu rad (konverterad från DOS-format - Varning: Inga "
+#~ "skrivrättigheter)"
+#~ msgstr[1] ""
+#~ "Läste %lu rader (konverterade från DOS-format - Varning: Inga "
+#~ "skrivrättigheter)"
+
+#~ msgid "Read %lu line (Warning: No write permission)"
+#~ msgid_plural "Read %lu lines (Warning: No write permission)"
+#~ msgstr[0] "Läste %lu rad (Varning: Ingen skrivrättighet)"
+#~ msgstr[1] "Läste %lu rader (Varning: Inga skrivrättigheter)"
+
+#~ msgid "File exists, OVERWRITE ? "
+#~ msgstr "Filen existerar, SKRIVA ÖVER? "
+
+#~ msgid "Save file under DIFFERENT NAME ? "
+#~ msgstr "Spara filen med ANNAT NAMN? "
+
+#~ msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
+#~ msgstr ""
+#~ "Spara ändrad buffert (ATT SVARA \"Nej\" KOMMER ATT FÖRSTÖRA ÄNDRINGAR)? "
+
+#~ msgid "Unknown Command"
+#~ msgstr "Okänt kommando"
+
+#~ msgid "Cannot add a color command without a syntax command"
+#~ msgstr "Kan inte lägga till ett färgkommando utan ett syntaxkommando"
+
+#~ msgid "Missing regex string"
+#~ msgstr "Saknar sträng för reguljärt uttryck"
+
+#~ msgid "Cannot add a header regex without a syntax command"
+#~ msgstr ""
+#~ "Kan inte lägga till ett reguljärt uttryck för huvud utan ett "
+#~ "syntaxkommando"
+
+#~ msgid "Cannot add a magic string regex without a syntax command"
+#~ msgstr ""
+#~ "Kan inte lägga till ett reguljärt uttryck för magisk sträng utan ett "
+#~ "syntaxkommando"
+
+#~ msgid "Missing magic string name"
+#~ msgstr "Saknar namn på magisk sträng"
+
+#~ msgid "Cannot add a linter without a syntax command"
+#~ msgstr "Kan inte lägga till en felkontroll utan ett syntaxkommando"
+
+#~ msgid "Cannot add formatter without a syntax command"
+#~ msgstr "Kan inte lägga till formaterare utan ett syntaxkommando"
+
+#~ msgid "Missing formatter command"
+#~ msgstr "Saknar kommando för formaterare"
+
 #~ msgid "Cannot prepend or append to a symlink with --nofollow set"
 #~ msgstr ""
 #~ "Kan inte infoga före eller lägga till efter i en symbolisk länk då --"
@@ -2528,9 +2646,6 @@ msgstr "Tack för att du använder nano!"
 #~ msgid "Set fill cols to (wrap lines at) #cols"
 #~ msgstr "Bryt rader efter antal tecken"
 
-#~ msgid "Duplicate syntax name %s"
-#~ msgstr "Kopia av syntaxnamn %s"
-
 #~ msgid "Refusing zero-length regex match"
 #~ msgstr "Vägrar matchning av reguljärt uttryck med noll-längd"
 
@@ -2586,12 +2701,6 @@ msgstr "Tack för att du använder nano!"
 #~ msgid "File exists, OVERWRITE?"
 #~ msgstr "Filen existerar, SKRIVA ÖVER?"
 
-#~ msgid "File exists, OVERWRITE? "
-#~ msgstr "Filen existerar, SKRIVA ÖVER? "
-
-#~ msgid "Save file under DIFFERENT NAME? "
-#~ msgstr "Spara filen med ANNAT NAMN? "
-
 #~ msgid "Save file under DIFFERENT NAME?"
 #~ msgstr "Spara filen med ANNAT NAMN?"
 
diff --git a/po/tr.po b/po/tr.po
index 7848c9ad..3bd17e76 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 1.2.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-25 16:41-0500\n"
+"POT-Creation-Date: 2016-06-17 15:41+0200\n"
 "PO-Revision-Date: 2003-08-17 18:08+0300\n"
 "Last-Translator: A. Murat EREN <meren@comu.edu.tr>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
@@ -18,356 +18,342 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: KBabel 1.0\n"
 
+#: src/browser.c:144 src/browser.c:284 src/browser.c:334 src/files.c:996
+#: src/files.c:1003 src/files.c:1794 src/files.c:1919 src/files.c:1963
+#: src/files.c:1983 src/files.c:2099 src/files.c:3019 src/files.c:3242
+#: src/rcfile.c:540 src/rcfile.c:1280
+#, fuzzy, c-format
+msgid "Error reading %s: %s"
+msgstr "Hatalı alıntı dizgesi %s: %s"
+
 #. TRANSLATORS: This is a prompt.
-#: src/browser.c:220
+#: src/browser.c:247
 #, fuzzy
 msgid "Go To Directory"
 msgstr "Dizine Git"
 
-#: src/browser.c:227 src/browser.c:738 src/files.c:1174 src/files.c:2340
-#: src/nano.c:1120 src/search.c:202 src/search.c:290 src/search.c:895
-#: src/search.c:970 src/text.c:2935 src/text.c:3142
+#: src/browser.c:254 src/browser.c:723 src/files.c:1126 src/files.c:2292
+#: src/nano.c:1128 src/search.c:195 src/search.c:297 src/search.c:851
+#: src/search.c:918 src/text.c:3189 src/text.c:3396
 msgid "Cancelled"
 msgstr "Ä°ptal edildi"
 
-#: src/browser.c:253 src/browser.c:300
-#, c-format
-msgid "Can't go outside of %s in restricted mode"
-msgstr "Kısıtlı kipte %s dışına çıkılamıyor"
-
-#: src/browser.c:264 src/browser.c:310 src/browser.c:326 src/files.c:1044
-#: src/files.c:1052 src/files.c:1844 src/files.c:1971 src/files.c:2016
-#: src/files.c:2037 src/files.c:2156 src/files.c:3062 src/files.c:3285
-#: src/rcfile.c:596 src/rcfile.c:1435
+#. TRANSLATORS: This refers to the option --operatingdir,
+#. * not to --restricted.
+#: src/browser.c:274 src/browser.c:326
 #, fuzzy, c-format
-msgid "Error reading %s: %s"
-msgstr "Hatalı alıntı dizgesi %s: %s"
+msgid "Can't go outside of %s in confined mode"
+msgstr "Kısıtlı kipte %s dışına çıkılamıyor"
 
-#: src/browser.c:290
+#: src/browser.c:317
 msgid "Can't move up a directory"
 msgstr "Bir üst dizine geçilemiyor"
 
 #. TRANSLATORS: Try to keep this at most 7 characters.
-#: src/browser.c:615 src/browser.c:623
+#: src/browser.c:590 src/browser.c:598
 msgid "(dir)"
 msgstr ""
 
 #. TRANSLATORS: Try to keep this at most 12 characters.
-#: src/browser.c:620
+#: src/browser.c:595
 msgid "(parent dir)"
 msgstr ""
 
 #. TRANSLATORS: Try to keep this at most 7 characters.
 #. * If necessary, you can leave out the parentheses.
-#: src/browser.c:650
+#: src/browser.c:625
 msgid "(huge)"
 msgstr ""
 
 #. TRANSLATORS: This is the main search prompt.
-#: src/browser.c:727 src/search.c:173
+#: src/browser.c:712 src/search.c:166
 msgid "Search"
 msgstr "Ara"
 
-#: src/browser.c:777 src/search.c:466 src/search.c:536
-msgid "This is the only occurrence"
-msgstr "Bu tek bulgu"
-
-#: src/browser.c:793 src/search.c:364
+#: src/browser.c:754 src/search.c:368
 msgid "Search Wrapped"
 msgstr "Arama Döngülendi"
 
-#: src/browser.c:843 src/search.c:517
+#: src/browser.c:764 src/search.c:509
+msgid "This is the only occurrence"
+msgstr "Bu tek bulgu"
+
+#: src/browser.c:812 src/search.c:473
 msgid "No current search pattern"
 msgstr ""
 
-#: src/files.c:50
+#: src/color.c:186
+#, fuzzy, c-format
+msgid "Unknown syntax name: %s"
+msgstr "Sözdizim ismi eksik"
+
+#: src/color.c:247
+#, c-format
+msgid "magic_load() failed: %s"
+msgstr ""
+
+#: src/color.c:251
+#, c-format
+msgid "magic_file(%s) failed: %s"
+msgstr ""
+
+#: src/files.c:47
 #, c-format
 msgid "Directory '%s' does not exist"
 msgstr ""
 
-#: src/files.c:52
+#: src/files.c:49
 #, c-format
 msgid "Path '%s': %s"
 msgstr ""
 
-#: src/files.c:54
+#: src/files.c:51
 #, fuzzy, c-format
 msgid "Path '%s' is not a directory"
 msgstr "\"%s\" bir dizin"
 
-#: src/files.c:57
+#: src/files.c:53
 #, c-format
 msgid "Path '%s' is not accessible"
 msgstr ""
 
-#. TRANSLATORS: Try to keep this at most 76 characters.
-#: src/files.c:158
+#. TRANSLATORS: Keep the next ten messages at most 76 characters.
+#: src/files.c:148
 msgid ""
 "Warning: Modifying a file which is not locked, check directory permission?"
 msgstr ""
 
-#: src/files.c:197
+#: src/files.c:187
 msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
 msgstr ""
 
-#: src/files.c:206
+#: src/files.c:196
 #, fuzzy, c-format
 msgid "Couldn't determine hostname for lock file: %s"
 msgstr "%o izinleri %s dosyasına uygulanamadı: %s"
 
-#: src/files.c:227 src/files.c:238 src/files.c:275 src/files.c:285
+#: src/files.c:216 src/files.c:225 src/files.c:262 src/files.c:272
 #, fuzzy, c-format
 msgid "Error writing lock file %s: %s"
 msgstr "%s'nin %d. satırında hata: "
 
-#: src/files.c:305
+#: src/files.c:291
 #, fuzzy, c-format
 msgid "Error deleting lock file %s: %s"
 msgstr "%s'nin %d. satırında hata: "
 
-#: src/files.c:341
+#: src/files.c:325
 #, fuzzy, c-format
 msgid "Error opening lock file %s: %s"
 msgstr "%s'nin %d. satırında hata: "
 
-#: src/files.c:353
+#: src/files.c:337
 #, c-format
 msgid "Error reading lock file %s: Not enough data read"
 msgstr ""
 
 #. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
-#: src/files.c:371
+#: src/files.c:354
 #, c-format
 msgid "File %s is being edited (by %s with %s, PID %d); continue?"
 msgstr ""
 
-#: src/files.c:426
+#: src/files.c:430
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Dosya %s dışından eklenemiyor"
 
-#: src/files.c:439 src/files.c:1038 src/rcfile.c:589 src/rcfile.c:1385
-#: src/rcfile.c:1426
+#: src/files.c:445 src/files.c:991 src/rcfile.c:533 src/rcfile.c:1230
+#: src/rcfile.c:1271
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" bir dizin"
 
-#: src/files.c:441
+#: src/files.c:447
 #, c-format
 msgid "\"%s\" is not a normal file"
 msgstr ""
 
-#: src/files.c:566
+#: src/files.c:571
 #, fuzzy
 msgid "No more open file buffers"
 msgstr "Başka açık dosya yok"
 
-#: src/files.c:582
+#: src/files.c:586
 #, c-format
 msgid "Switched to %s"
 msgstr "%s 'e geçildi"
 
-#: src/files.c:584 src/global.c:988 src/winio.c:2010
+#: src/files.c:588 src/global.c:1005 src/winio.c:1965
 msgid "New Buffer"
 msgstr "Yeni Arabellek"
 
-#: src/files.c:943
+#. TRANSLATORS: Keep the next four messages at most 76 characters.
+#: src/files.c:913
 #, fuzzy, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
 msgstr[0] "%d satır okundu (Mac biçiminden dönüştürüldü)"
 
-#: src/files.c:948
-#, fuzzy, c-format
-msgid ""
-"Read %lu line (Converted from DOS and Mac format - Warning: No write "
-"permission)"
-msgid_plural ""
-"Read %lu lines (Converted from DOS and Mac format - Warning: No write "
-"permission)"
-msgstr[0] "%d satır okundu (Mac biçiminden dönüştürüldü)"
-
-#: src/files.c:954
+#: src/files.c:919
 #, fuzzy, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
 msgstr[0] "%d satır okundu (Mac biçiminden dönüştürüldü)"
 
-#: src/files.c:958
-#, fuzzy, c-format
-msgid ""
-"Read %lu line (Converted from Mac format - Warning: No write permission)"
-msgid_plural ""
-"Read %lu lines (Converted from Mac format - Warning: No write permission)"
-msgstr[0] "%d satır okundu (Mac biçiminden dönüştürüldü)"
-
-#: src/files.c:964
+#: src/files.c:925
 #, fuzzy, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
 msgstr[0] "%d satır okundu (DOS biçiminden dönüştürüldü)"
 
-#: src/files.c:968
-#, fuzzy, c-format
-msgid ""
-"Read %lu line (Converted from DOS format - Warning: No write permission)"
-msgid_plural ""
-"Read %lu lines (Converted from DOS format - Warning: No write permission)"
-msgstr[0] "%d satır okundu (DOS biçiminden dönüştürüldü)"
-
-#: src/files.c:974
+#: src/files.c:930
 #, fuzzy, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "%d satır okundu"
 
-#: src/files.c:977
-#, c-format
-msgid "Read %lu line (Warning: No write permission)"
-msgid_plural "Read %lu lines (Warning: No write permission)"
-msgstr[0] ""
-
-#: src/files.c:1019 src/files.c:1056
+#: src/files.c:974 src/files.c:1006
 msgid "Reading File"
 msgstr "Dosya Okunuyor"
 
-#: src/files.c:1025
+#: src/files.c:980
 msgid "New File"
 msgstr "Yeni Dosya"
 
-#: src/files.c:1028
-#, c-format
-msgid "\"%s\" not found"
+#: src/files.c:983
+#, fuzzy, c-format
+msgid "File \"%s\" not found"
 msgstr "\"%s\" bulunamadı"
 
-#: src/files.c:1039 src/rcfile.c:590 src/rcfile.c:1386 src/rcfile.c:1427
+#: src/files.c:992 src/rcfile.c:534 src/rcfile.c:1231 src/rcfile.c:1272
 #, fuzzy, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" bir aygıt dosyası"
 
-#: src/files.c:1133
+#: src/files.c:1083
 #, fuzzy, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Yeni arabelleÄŸe eklenecek dosya [%s 'den]"
 
-#: src/files.c:1135
+#: src/files.c:1085
 #, fuzzy, c-format
 msgid "Command to execute [from %s] "
 msgstr "Çalıştırılacak komut"
 
-#: src/files.c:1142
+#: src/files.c:1092
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Yeni arabelleÄŸe eklenecek dosya [%s 'den]"
 
-#: src/files.c:1144
+#: src/files.c:1094
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Eklenecek dosya [%s tarafından] "
 
-#: src/files.c:1389
+#: src/files.c:1338
 #, fuzzy
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Anahtar çoklu olmayan arabellek kipinde geçersiz"
 
-#: src/files.c:1684
-msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+#: src/files.c:1632
+msgid "Failed to write backup file; continue saving? (Say N if unsure.) "
 msgstr ""
 
-#: src/files.c:1800
+#: src/files.c:1750
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "%s dışına yazılamıyor"
 
-#: src/files.c:1885 src/files.c:1910 src/files.c:1928 src/files.c:1941
-#: src/files.c:1952 src/files.c:1981
+#: src/files.c:1833 src/files.c:1858 src/files.c:1876 src/files.c:1889
+#: src/files.c:1900 src/files.c:1928
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr ""
 
-#: src/files.c:1886 src/nano.c:690
+#: src/files.c:1834 src/nano.c:692
 #, fuzzy
 msgid "Too many backup files?"
 msgstr ""
 "\n"
 "%s yazılmamış (çok fazla yedek dosyası?)\n"
 
-#: src/files.c:2026 src/text.c:2863 src/text.c:2875 src/text.c:3244
-#: src/text.c:3253
+#: src/files.c:1972 src/text.c:3117 src/text.c:3129 src/text.c:3498
+#: src/text.c:3507
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr ""
 
-#: src/files.c:2049 src/files.c:2068 src/files.c:2080 src/files.c:2104
-#: src/files.c:2121 src/files.c:2131 src/files.c:2164 src/files.c:2171
+#: src/files.c:1994 src/files.c:2013 src/files.c:2023 src/files.c:2047
+#: src/files.c:2064 src/files.c:2074 src/files.c:2106 src/files.c:2113
 #, fuzzy, c-format
 msgid "Error writing %s: %s"
 msgstr "Hatalı alıntı dizgesi %s: %s"
 
-#: src/files.c:2200
+#: src/files.c:2154
 #, fuzzy, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "%d satır yazıldı"
 
-#: src/files.c:2299
+#: src/files.c:2249
 msgid " [DOS Format]"
 msgstr " [DOS Biçimi]"
 
-#: src/files.c:2300
+#: src/files.c:2250
 msgid " [Mac Format]"
 msgstr " [Mac Biçimi]"
 
-#: src/files.c:2302
+#: src/files.c:2252
 msgid " [Backup]"
 msgstr " [Yedek]"
 
-#: src/files.c:2309
+#: src/files.c:2259
 msgid "Prepend Selection to File"
 msgstr "Seçimi Dosyanın Başına Ekle"
 
-#: src/files.c:2310
+#: src/files.c:2260
 msgid "Append Selection to File"
 msgstr "Seçimi Dosyanın Sonuna Ekle"
 
-#: src/files.c:2311
+#: src/files.c:2261
 msgid "Write Selection to File"
 msgstr "Seçimi Dosyaya Yaz"
 
-#: src/files.c:2314
+#: src/files.c:2264
 msgid "File Name to Prepend to"
 msgstr "Başına Eklenecek Dosya Adı"
 
-#: src/files.c:2315
+#: src/files.c:2265
 msgid "File Name to Append to"
 msgstr "Sonuna Eklenecek Dosya Adı"
 
-#: src/files.c:2316
+#: src/files.c:2266
 msgid "File Name to Write"
 msgstr "Yazılacak Dosya Adı"
 
-#: src/files.c:2349
-msgid "Save modified buffer anyway ? "
+#: src/files.c:2301
+msgid "Save modified buffer anyway? "
 msgstr ""
 
-#: src/files.c:2457
-#, fuzzy
-msgid "File exists, OVERWRITE ? "
-msgstr "Dosya var, ÃœSTÃœNE YAZILSIN MI?"
-
-#: src/files.c:2466
-msgid "Save file under DIFFERENT NAME ? "
+#: src/files.c:2412
+msgid "Save file under DIFFERENT NAME? "
 msgstr ""
 
-#: src/files.c:2480
-msgid "File was modified since you opened it, continue saving ? "
+#: src/files.c:2420
+#, fuzzy, c-format
+msgid "File \"%s\" exists; OVERWRITE? "
+msgstr "Dosya var, ÃœSTÃœNE YAZILSIN MI?"
+
+#: src/files.c:2441
+msgid "File was modified since you opened it; continue saving? "
 msgstr ""
 
-#: src/files.c:2917
+#: src/files.c:2874
 msgid "(more)"
 msgstr "(daha)"
 
-#: src/files.c:3004
+#: src/files.c:2959
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -376,28 +362,28 @@ msgstr ""
 "\n"
 "nano'yu başlatmaya devam etmek için Gir tuşuna basınız\n"
 
-#: src/files.c:3020
+#: src/files.c:2975
 #, c-format
 msgid ""
 "Unable to create directory %s: %s\n"
 "It is required for saving/loading search history or cursor positions.\n"
 msgstr ""
 
-#: src/files.c:3026
+#: src/files.c:2982
 #, c-format
 msgid ""
 "Path %s is not a directory and needs to be.\n"
 "Nano will be unable to load or save search history or cursor positions.\n"
 msgstr ""
 
-#: src/files.c:3045
+#: src/files.c:3002
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I tried to move\n"
 "to the preferred location (%s) but encountered an error: %s"
 msgstr ""
 
-#: src/files.c:3049
+#: src/files.c:3006
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I moved\n"
@@ -405,787 +391,815 @@ msgid ""
 "(see the nano FAQ about this change)"
 msgstr ""
 
-#: src/files.c:3132 src/files.c:3140 src/files.c:3164 src/files.c:3176
+#: src/files.c:3089 src/files.c:3097 src/files.c:3121 src/files.c:3133
 #, c-format
 msgid "Error writing %s: %s\n"
 msgstr ""
 
 #. TRANSLATORS: Try to keep the next fifteen strings at most 10 characters.
-#: src/global.c:480
+#: src/global.c:483
 msgid "Exit"
 msgstr "Çık"
 
-#: src/global.c:481
+#: src/global.c:484
 msgid "Close"
 msgstr "Kapat"
 
-#: src/global.c:482
+#: src/global.c:485
 #, fuzzy
 msgid "Uncut Text"
 msgstr "Kesmeyi Geri Al"
 
-#: src/global.c:484
+#: src/global.c:487
 #, fuzzy
 msgid "Unjustify"
 msgstr "Yaslamayı Geri Al"
 
-#: src/global.c:490
+#: src/global.c:493
 msgid "Read File"
 msgstr "Dosya Oku"
 
-#: src/global.c:491
+#: src/global.c:494
 msgid "Where Is"
 msgstr "Ara"
 
-#: src/global.c:492
+#: src/global.c:495
 msgid "Replace"
 msgstr "DeÄŸiÅŸtir"
 
-#: src/global.c:493
+#: src/global.c:496
 msgid "Go To Line"
 msgstr "Satıra Git"
 
-#: src/global.c:494
+#: src/global.c:497
 #, fuzzy
 msgid "Prev Line"
 msgstr "Önceki Sayfa"
 
-#: src/global.c:495
+#: src/global.c:498
 #, fuzzy
 msgid "Next Line"
 msgstr "Sonraki Dosya"
 
-#: src/global.c:496
+#: src/global.c:499
 msgid "Prev Page"
 msgstr "Önceki Sayfa"
 
-#: src/global.c:497
+#: src/global.c:500
 msgid "Next Page"
 msgstr "Sonraki Sayfa"
 
-#: src/global.c:499
+#: src/global.c:502
 msgid "Justify"
 msgstr "Yasla"
 
-#: src/global.c:500
+#: src/global.c:503
 #, fuzzy
 msgid "FullJstify"
 msgstr "Yasla"
 
-#: src/global.c:502
+#: src/global.c:505
 msgid "Refresh"
 msgstr "Tazele"
 
 #. TRANSLATORS: Try to keep this string at most 12 characters.
-#: src/global.c:505
+#: src/global.c:508
 #, fuzzy
 msgid "WhereIs Next"
 msgstr "Ara"
 
 #. TRANSLATORS: The next long series of strings are shortcut descriptions;
 #. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:512
+#: src/global.c:515
 msgid "Justify the current paragraph"
 msgstr "Şu anki paragrafı yasla"
 
-#: src/global.c:514
+#: src/global.c:517
 msgid "Cancel the current function"
 msgstr "Yürürlükteki fonksiyonu iptal et"
 
-#: src/global.c:515
+#: src/global.c:518
 msgid "Display this help text"
 msgstr ""
 
-#: src/global.c:518
+#: src/global.c:521
 #, fuzzy
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Yüklenmiş olan dosyayı kapat/nano'dan çık"
 
-#: src/global.c:520
+#: src/global.c:523
 msgid "Exit from nano"
 msgstr "nano'dan çık"
 
-#: src/global.c:524
+#: src/global.c:527
 msgid "Write the current file to disk"
 msgstr "Yürütülmekte olan dosyayı diske yaz"
 
-#: src/global.c:526
+#: src/global.c:529
 msgid "Insert another file into the current one"
 msgstr "Åžu anki dosyaya baÅŸka bir dosya ekle"
 
-#: src/global.c:528
+#: src/global.c:531
 #, fuzzy
 msgid "Search for a string or a regular expression"
 msgstr "Düzenli ifade kullan"
 
-#: src/global.c:531
+#: src/global.c:533
 msgid "Search for a string"
 msgstr ""
 
-#: src/global.c:533
+#: src/global.c:534
+msgid "Refresh the file list"
+msgstr ""
+
+#: src/global.c:535
+msgid "Go to lefthand column"
+msgstr ""
+
+#: src/global.c:536
+msgid "Go to righthand column"
+msgstr ""
+
+#: src/global.c:538
 msgid "Go one screenful up"
 msgstr ""
 
-#: src/global.c:534
+#: src/global.c:539
 msgid "Go one screenful down"
 msgstr ""
 
-#: src/global.c:536
+#: src/global.c:541
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Şu anki satırı kes ve kesim arabelleğinde sakla"
 
-#: src/global.c:538
+#: src/global.c:543
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Şu anki satıra kesim arabelleğini yapıştır"
 
-#: src/global.c:539
+#: src/global.c:544
 #, fuzzy
 msgid "Display the position of the cursor"
 msgstr "İmlecin pozisyonunu göster"
 
-#: src/global.c:541
+#: src/global.c:546
 msgid "Invoke the spell checker, if available"
 msgstr "Yazım denetleyicisini çağır (eğer mümkün ise)"
 
-#: src/global.c:543
+#: src/global.c:548
 #, fuzzy
 msgid "Replace a string or a regular expression"
 msgstr "Düzenli ifade kullan"
 
-#: src/global.c:544
+#: src/global.c:549
 #, fuzzy
 msgid "Go to line and column number"
 msgstr "Satır numarasına git"
 
-#: src/global.c:546
+#: src/global.c:551
 #, fuzzy
 msgid "Mark text starting from the cursor position"
 msgstr "İmleç hizasındaki metni işaretle"
 
-#: src/global.c:547
+#: src/global.c:552
 msgid "Repeat the last search"
 msgstr ""
 
-#: src/global.c:549
+#: src/global.c:554
 #, fuzzy
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "Şu anki satırı kes ve kesim arabelleğinde sakla"
 
-#: src/global.c:550
+#: src/global.c:555
 #, fuzzy
 msgid "Indent the current line"
 msgstr "Yürürlükteki dosyanın sonuna ekle"
 
-#: src/global.c:551
+#: src/global.c:556
 #, fuzzy
 msgid "Unindent the current line"
 msgstr "Yürürlükteki dosyanın sonuna ekle"
 
-#: src/global.c:552
+#: src/global.c:558
+msgid "Comment/uncomment the current line or marked lines"
+msgstr ""
+
+#: src/global.c:560
 msgid "Undo the last operation"
 msgstr ""
 
-#: src/global.c:553
+#: src/global.c:561
 msgid "Redo the last undone operation"
 msgstr ""
 
-#: src/global.c:555
+#: src/global.c:563
 #, fuzzy
 msgid "Go back one character"
 msgstr "Bir karakter geri gel"
 
-#: src/global.c:556
+#: src/global.c:564
 #, fuzzy
 msgid "Go forward one character"
 msgstr "Bir karakter ileri git"
 
-#: src/global.c:558
+#: src/global.c:566
 #, fuzzy
 msgid "Go back one word"
 msgstr "Bir kelime geriye git"
 
-#: src/global.c:559
+#: src/global.c:567
 #, fuzzy
 msgid "Go forward one word"
 msgstr "Bir kelime ileri git"
 
-#: src/global.c:561
+#: src/global.c:569
 #, fuzzy
 msgid "Go to previous line"
 msgstr "Önceki ekrana git"
 
-#: src/global.c:562
+#: src/global.c:570
 #, fuzzy
 msgid "Go to next line"
 msgstr "Bir satır aşağı in"
 
-#: src/global.c:563
+#: src/global.c:571
 #, fuzzy
 msgid "Go to beginning of current line"
 msgstr "Şu anki satırın başına git"
 
-#: src/global.c:564
+#: src/global.c:572
 #, fuzzy
 msgid "Go to end of current line"
 msgstr "Şu anki satırın sonuna git"
 
-#: src/global.c:567
+#: src/global.c:575
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr ""
 
-#: src/global.c:569
+#: src/global.c:577
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr ""
 
-#: src/global.c:571
+#: src/global.c:579
 msgid "Go to the first line of the file"
 msgstr "Dosyanın ilk satırına git"
 
-#: src/global.c:572
+#: src/global.c:580
 msgid "Go to the last line of the file"
 msgstr "Dosyanın son satırına git"
 
-#: src/global.c:574
+#: src/global.c:582
 #, fuzzy
 msgid "Go to the matching bracket"
 msgstr "Eşleşen ayraç yok"
 
-#: src/global.c:576
+#: src/global.c:584
 msgid "Scroll up one line without scrolling the cursor"
 msgstr ""
 
-#: src/global.c:578
+#: src/global.c:586
 msgid "Scroll down one line without scrolling the cursor"
 msgstr ""
 
-#: src/global.c:581
+#: src/global.c:589
 #, fuzzy
 msgid "Switch to the previous file buffer"
 msgstr "Önceki ekrana git"
 
-#: src/global.c:582
+#: src/global.c:590
 msgid "Switch to the next file buffer"
 msgstr ""
 
-#: src/global.c:584
+#: src/global.c:592
 msgid "Insert the next keystroke verbatim"
 msgstr ""
 
-#: src/global.c:585
+#: src/global.c:593
 #, fuzzy
 msgid "Insert a tab at the cursor position"
 msgstr "İmlecin olduğu yerden satır başı yap"
 
-#: src/global.c:586
+#: src/global.c:594
 #, fuzzy
 msgid "Insert a newline at the cursor position"
 msgstr "İmlecin olduğu yerden satır başı yap"
 
-#: src/global.c:587
+#: src/global.c:595
 msgid "Delete the character under the cursor"
 msgstr "İmlecin altındaki karakteri sil"
 
-#: src/global.c:589
+#: src/global.c:597
 msgid "Delete the character to the left of the cursor"
 msgstr "Ä°mlecin solundaki karakteri sil"
 
-#: src/global.c:592
+#: src/global.c:600
 msgid "Cut backward from cursor to word start"
 msgstr ""
 
-#: src/global.c:594
+#: src/global.c:602
 msgid "Cut forward from cursor to next word start"
 msgstr ""
 
-#: src/global.c:596
+#: src/global.c:604
 #, fuzzy
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Şu anki satıra kesim arabelleğini yapıştır"
 
-#: src/global.c:599
+#: src/global.c:607
 #, fuzzy
 msgid "Justify the entire file"
 msgstr "Şu anki paragrafı yasla"
 
-#: src/global.c:603
+#: src/global.c:611
 msgid "Count the number of words, lines, and characters"
 msgstr ""
 
-#: src/global.c:606
+#: src/global.c:614
 msgid "Refresh (redraw) the current screen"
 msgstr "Şu anki ekranı tazele (yeniden çiz)"
 
-#: src/global.c:608
+#: src/global.c:616
 msgid "Suspend the editor (if suspension is enabled)"
 msgstr ""
 
-#: src/global.c:610
+#: src/global.c:618
 msgid "Save file without prompting"
 msgstr ""
 
-#: src/global.c:611
+#: src/global.c:619
 #, fuzzy
 msgid "Search next occurrence backward"
 msgstr "Geriye doÄŸru ara"
 
-#: src/global.c:612
+#: src/global.c:620
 msgid "Search next occurrence forward"
 msgstr ""
 
-#: src/global.c:614
+#: src/global.c:622
 msgid "Toggle the case sensitivity of the search"
 msgstr ""
 
-#: src/global.c:616
+#: src/global.c:624
 #, fuzzy
 msgid "Reverse the direction of the search"
 msgstr "İmlecin pozisyonunu göster"
 
-#: src/global.c:620
+#: src/global.c:628
 #, fuzzy
 msgid "Toggle the use of regular expressions"
 msgstr "Düzenli ifade kullan"
 
-#: src/global.c:624
+#: src/global.c:632
 #, fuzzy
 msgid "Recall the previous search/replace string"
 msgstr "Önceki arama/değiştirme dizgisini düzenle"
 
-#: src/global.c:626
+#: src/global.c:634
 #, fuzzy
 msgid "Recall the next search/replace string"
 msgstr "Önceki arama/değiştirme dizgisini düzenle"
 
-#: src/global.c:629
+#: src/global.c:637
 msgid "Go to file browser"
 msgstr "Dosya tarayıcısına git"
 
-#: src/global.c:632
+#: src/global.c:640
 #, fuzzy
 msgid "Toggle the use of DOS format"
 msgstr "Dosyayı DOS biçiminde yaz"
 
-#: src/global.c:633
+#: src/global.c:641
 #, fuzzy
 msgid "Toggle the use of Mac format"
 msgstr "Dosyayı Mac biçiminde yaz"
 
-#: src/global.c:634
+#: src/global.c:642
 msgid "Toggle appending"
 msgstr ""
 
-#: src/global.c:635
+#: src/global.c:643
 msgid "Toggle prepending"
 msgstr ""
 
-#: src/global.c:636
+#: src/global.c:644
 msgid "Toggle backing up of the original file"
 msgstr ""
 
-#: src/global.c:637
+#: src/global.c:645
 msgid "Execute external command"
 msgstr "Harici komut çalıştır"
 
-#: src/global.c:639
+#: src/global.c:647
 msgid "Close buffer without saving it"
 msgstr ""
 
-#: src/global.c:641
+#: src/global.c:649
 #, fuzzy
 msgid "Toggle the use of a new buffer"
 msgstr "Yeni arabelleğe girişi aç/kapa"
 
-#: src/global.c:644
+#: src/global.c:652
 #, fuzzy
 msgid "Exit from the file browser"
 msgstr "Dosya tarayıcısına git"
 
-#: src/global.c:645
+#: src/global.c:653
 #, fuzzy
 msgid "Go to the first file in the list"
 msgstr "Dosyanın ilk satırına git"
 
-#: src/global.c:646
+#: src/global.c:654
 #, fuzzy
 msgid "Go to the last file in the list"
 msgstr "Dosyanın son satırına git"
 
-#: src/global.c:647
+#: src/global.c:655
 #, fuzzy
 msgid "Go to the previous file in the list"
 msgstr "Dosyanın ilk satırına git"
 
-#: src/global.c:648
+#: src/global.c:656
 #, fuzzy
 msgid "Go to the next file in the list"
 msgstr "Dosyanın son satırına git"
 
-#: src/global.c:649
+#: src/global.c:657
 msgid "Go to directory"
 msgstr "Dizine git"
 
-#: src/global.c:652
+#: src/global.c:660
 #, fuzzy
 msgid "Invoke the linter, if available"
 msgstr "Yazım denetleyicisini çağır (eğer mümkün ise)"
 
-#: src/global.c:653
+#: src/global.c:661
 #, fuzzy
 msgid "Go to previous linter msg"
 msgstr "Satır numarasına git"
 
-#: src/global.c:654
+#: src/global.c:662
 msgid "Go to next linter msg"
 msgstr ""
 
-#: src/global.c:656
+#: src/global.c:664
 #, fuzzy
 msgid "Invoke formatter, if available"
 msgstr "Yazım denetleyicisini çağır (eğer mümkün ise)"
 
 #. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:671
+#: src/global.c:679
 msgid "Get Help"
 msgstr "Yardım Al"
 
-#: src/global.c:674 src/prompt.c:858
+#: src/global.c:682 src/prompt.c:855
 msgid "Cancel"
 msgstr "Ä°ptal"
 
-#: src/global.c:687
+#: src/global.c:695
 #, fuzzy
 msgid "Write Out"
 msgstr "Yaz"
 
-#: src/global.c:723
+#: src/global.c:731
 msgid "Go To Dir"
 msgstr "Dizine Git"
 
-#: src/global.c:738
+#: src/global.c:746
 msgid "Cut Text"
 msgstr "Metni Kes"
 
-#: src/global.c:753
+#: src/global.c:761
 msgid "To Spell"
 msgstr "Denetime"
 
-#: src/global.c:757
+#: src/global.c:765
 #, fuzzy
 msgid "To Linter"
 msgstr "Satıra Git"
 
-#: src/global.c:760
+#: src/global.c:768
 #, fuzzy
 msgid "Formatter"
 msgstr "DOS Biçimi"
 
-#: src/global.c:767
+#: src/global.c:775
 msgid "Case Sens"
 msgstr "Harf Duyarlı"
 
-#: src/global.c:772
+#: src/global.c:780
 msgid "Regexp"
 msgstr "Düzenli İfade"
 
-#: src/global.c:777
+#: src/global.c:785
 #, fuzzy
 msgid "Backwards"
 msgstr " [Geriye DoÄŸru]"
 
-#: src/global.c:784
+#: src/global.c:792
 msgid "No Replace"
 msgstr "DeÄŸiÅŸtirme Yok"
 
-#: src/global.c:792
+#: src/global.c:800
 msgid "Cur Pos"
 msgstr "İmleç Pozisyonu"
 
-#: src/global.c:807
+#: src/global.c:815
 msgid "First Line"
 msgstr "İlk Satır"
 
-#: src/global.c:809
+#: src/global.c:817
 msgid "Last Line"
 msgstr "Son Satır"
 
-#: src/global.c:816
+#: src/global.c:824
 #, fuzzy
 msgid "To Bracket"
 msgstr "Ayraç değil"
 
-#: src/global.c:819
+#: src/global.c:827
 msgid "Mark Text"
 msgstr "Metni Ä°ÅŸaretle"
 
-#: src/global.c:822
+#: src/global.c:830
 #, fuzzy
 msgid "Copy Text"
 msgstr "Metni Kes"
 
-#: src/global.c:825
+#: src/global.c:833
 #, fuzzy
 msgid "Indent Text"
 msgstr "Metni Kes"
 
-#: src/global.c:827
+#: src/global.c:835
 msgid "Unindent Text"
 msgstr ""
 
-#: src/global.c:830
+#: src/global.c:838
 msgid "Undo"
 msgstr ""
 
-#: src/global.c:832
+#: src/global.c:840
 msgid "Redo"
 msgstr ""
 
-#: src/global.c:836 src/global.c:842
+#: src/global.c:844 src/global.c:850
 msgid "Back"
 msgstr "Geri"
 
-#: src/global.c:838 src/global.c:844
+#: src/global.c:846 src/global.c:852
 msgid "Forward"
 msgstr "Ä°leri"
 
-#: src/global.c:849
+#: src/global.c:857
 msgid "Prev Word"
 msgstr "Önceki Kelime"
 
-#: src/global.c:851
+#: src/global.c:859
 msgid "Next Word"
 msgstr "Sonraki Kelime"
 
-#: src/global.c:855
+#: src/global.c:863
 msgid "Home"
 msgstr "Ev"
 
-#: src/global.c:857
+#: src/global.c:865
 msgid "End"
 msgstr "Son"
 
-#: src/global.c:866
+#: src/global.c:874
 msgid "Beg of Par"
 msgstr ""
 
-#: src/global.c:868
+#: src/global.c:876
 msgid "End of Par"
 msgstr ""
 
-#: src/global.c:873
+#: src/global.c:881
 msgid "Scroll Up"
 msgstr ""
 
-#: src/global.c:875
+#: src/global.c:883
 msgid "Scroll Down"
 msgstr ""
 
-#: src/global.c:880
+#: src/global.c:888
 #, fuzzy
 msgid "Prev File"
 msgstr "Önceki Dosya"
 
-#: src/global.c:882
+#: src/global.c:890
 msgid "Next File"
 msgstr "Sonraki Dosya"
 
-#: src/global.c:891
+#: src/global.c:899
 msgid "Verbatim"
 msgstr ""
 
-#: src/global.c:894
+#: src/global.c:902
 msgid "Tab"
 msgstr "Sekme (TAB)"
 
-#: src/global.c:896
+#: src/global.c:904
 msgid "Enter"
 msgstr "Gir TuÅŸu (Enter)"
 
-#: src/global.c:899
+#: src/global.c:907
 msgid "Delete"
 msgstr "Sil"
 
-#: src/global.c:901
+#: src/global.c:909
 msgid "Backspace"
 msgstr "Geri tuÅŸu"
 
 #. TRANSLATORS: The next two strings refer to cutting words.
-#: src/global.c:912
+#: src/global.c:920
 #, fuzzy
 msgid "Cut Left"
 msgstr "Metni Kes"
 
-#: src/global.c:914
+#: src/global.c:922
 msgid "Cut Right"
 msgstr ""
 
-#: src/global.c:916
+#: src/global.c:924
 msgid "CutTillEnd"
 msgstr ""
 
-#: src/global.c:926
+#: src/global.c:934
 msgid "Word Count"
 msgstr ""
 
-#: src/global.c:933
+#: src/global.c:941
 msgid "Suspend"
 msgstr "Askıya Al"
 
-#: src/global.c:937
+#: src/global.c:945
+msgid "Comment Lines"
+msgstr ""
+
+#: src/global.c:949
 msgid "Save"
 msgstr ""
 
-#: src/global.c:940
+#: src/global.c:952
 #, fuzzy
 msgid "Previous"
 msgstr "Önceki Dosya"
 
-#: src/global.c:942
+#: src/global.c:954
 #, fuzzy
 msgid "Next"
 msgstr "Sonraki Sayfa"
 
-#: src/global.c:948
+#: src/global.c:960
 #, fuzzy
 msgid "PrevHstory"
 msgstr "Geçmiş"
 
-#: src/global.c:951
+#: src/global.c:963
 #, fuzzy
 msgid "NextHstory"
 msgstr "Geçmiş"
 
-#: src/global.c:955
+#: src/global.c:972
 #, fuzzy
 msgid "Go To Text"
 msgstr "Satıra Git"
 
-#: src/global.c:959
+#: src/global.c:976
 msgid "DOS Format"
 msgstr "DOS Biçimi"
 
-#: src/global.c:961
+#: src/global.c:978
 msgid "Mac Format"
 msgstr "Mac Biçimi"
 
-#: src/global.c:969
+#: src/global.c:986
 msgid "Append"
 msgstr "Sonuna Ekle"
 
-#: src/global.c:971
+#: src/global.c:988
 msgid "Prepend"
 msgstr "Başına Ekle"
 
-#: src/global.c:974
+#: src/global.c:991
 msgid "Backup File"
 msgstr "Yedek Dosyası"
 
-#: src/global.c:981
+#: src/global.c:998
 msgid "Execute Command"
 msgstr "Komut Çalıştır"
 
-#: src/global.c:996
+#: src/global.c:1013
 msgid "To Files"
 msgstr "Dosyalara"
 
-#: src/global.c:1004
+#: src/global.c:1021
 #, fuzzy
 msgid "First File"
 msgstr "İlk Satır"
 
-#: src/global.c:1006
+#: src/global.c:1023
 #, fuzzy
 msgid "Last File"
 msgstr "Son Satır"
 
-#: src/global.c:1010
+#: src/global.c:1027
 msgid "Discard buffer"
 msgstr ""
 
+#: src/global.c:1038
+msgid "Left Column"
+msgstr ""
+
+#: src/global.c:1040
+msgid "Right Column"
+msgstr ""
+
 #. TRANSLATORS: Try to keep the next two strings at most 20 characters.
-#: src/global.c:1020
+#: src/global.c:1047
 msgid "Prev Lint Msg"
 msgstr ""
 
-#: src/global.c:1022
+#: src/global.c:1049
 msgid "Next Lint Msg"
 msgstr ""
 
 #. TRANSLATORS: The next seventeen strings are toggle descriptions;
 #. * they are best kept shorter than 40 characters, but may be longer.
-#: src/global.c:1285
+#: src/global.c:1316
 msgid "Help mode"
 msgstr "Yardım Kipi"
 
-#: src/global.c:1287
+#: src/global.c:1318
 #, fuzzy
 msgid "Constant cursor position display"
 msgstr "Sabit imleç pozisyonu"
 
-#: src/global.c:1289
+#: src/global.c:1320
 msgid "Use of one more line for editing"
 msgstr ""
 
-#: src/global.c:1291
+#: src/global.c:1322
 msgid "Smooth scrolling"
 msgstr "Yumuşak kaydırma"
 
-#: src/global.c:1293
+#: src/global.c:1324
 #, fuzzy
 msgid "Soft wrapping of overlong lines"
 msgstr "Uzun satırları kaydırma"
 
-#: src/global.c:1295
+#: src/global.c:1326
 msgid "Whitespace display"
 msgstr ""
 
-#: src/global.c:1297
+#: src/global.c:1328
 msgid "Color syntax highlighting"
 msgstr "Renkli sözdizimi vurgusu"
 
-#: src/global.c:1299
+#: src/global.c:1330
 msgid "Smart home key"
 msgstr ""
 
-#: src/global.c:1301
+#: src/global.c:1332
 msgid "Auto indent"
 msgstr "Otomatik hizala"
 
-#: src/global.c:1303
+#: src/global.c:1334
 msgid "Cut to end"
 msgstr "Sonuna kes"
 
-#: src/global.c:1305
+#: src/global.c:1336
 #, fuzzy
 msgid "Hard wrapping of overlong lines"
 msgstr "Uzun satırları kaydırma"
 
-#: src/global.c:1307
+#: src/global.c:1338
 msgid "Conversion of typed tabs to spaces"
 msgstr ""
 
-#: src/global.c:1309
+#: src/global.c:1340
 #, fuzzy
 msgid "Backup files"
 msgstr "Yedek Dosyası"
 
-#: src/global.c:1311
+#: src/global.c:1342
 msgid "Reading file into separate buffer"
 msgstr ""
 
-#: src/global.c:1313
+#: src/global.c:1344
 msgid "Mouse support"
 msgstr "Fare DesteÄŸi"
 
-#: src/global.c:1315
+#: src/global.c:1346
 msgid "No conversion from DOS/Mac format"
 msgstr "DOS/Mac biçimi ile ilgili bir şey yok"
 
-#: src/global.c:1317
+#: src/global.c:1348
 #, fuzzy
 msgid "Suspension"
 msgstr "Askıya Al"
 
-#: src/help.c:209
+#: src/help.c:211
 #, fuzzy
 msgid ""
 "Search Command Help Text\n"
@@ -1212,7 +1226,7 @@ msgstr ""
 " Arama kipinde aşağıdaki anahtarlardan yararlanabilirsiniz:\n"
 "\n"
 
-#: src/help.c:218
+#: src/help.c:220
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1221,7 +1235,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:224
+#: src/help.c:226
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1241,7 +1255,7 @@ msgstr ""
 " Satıra Git kipinde aşağıdaki anahtarlardan yararlanabilirsiniz:\n"
 "\n"
 
-#: src/help.c:233
+#: src/help.c:235
 #, fuzzy
 msgid ""
 "Insert File Help Text\n"
@@ -1272,7 +1286,7 @@ msgstr ""
 " Dosya Ekle kipinde aşağıdaki anahtarlardan yararlanabilirsiniz:\n"
 "\n"
 
-#: src/help.c:242
+#: src/help.c:244
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1281,7 +1295,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:248
+#: src/help.c:250
 #, fuzzy
 msgid ""
 "Write File Help Text\n"
@@ -1311,7 +1325,7 @@ msgstr ""
 " Dosyayı Yaz kipinde aşağıdaki anahtarlardan yararlanabilirsiniz:\n"
 "\n"
 
-#: src/help.c:262
+#: src/help.c:264
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1336,7 +1350,7 @@ msgstr ""
 " Dosya Tarayıcısı kipinde aşağıdaki anahtarlardan yararlanabilirsiniz:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:277
 #, fuzzy
 msgid ""
 "Browser Search Command Help Text\n"
@@ -1364,13 +1378,13 @@ msgstr ""
 " Arama kipinde aşağıdaki anahtarlardan yararlanabilirsiniz:\n"
 "\n"
 
-#: src/help.c:284
+#: src/help.c:286
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
 msgstr ""
 
-#: src/help.c:288
+#: src/help.c:290
 #, fuzzy
 msgid ""
 "Browser Go To Directory Help Text\n"
@@ -1393,7 +1407,7 @@ msgstr ""
 " Tarayıcı Dizine Git kipinde aşağıdaki anahtarlardan yararlanabilirsiniz:\n"
 "\n"
 
-#: src/help.c:301
+#: src/help.c:303
 #, fuzzy
 msgid ""
 "Spell Check Help Text\n"
@@ -1417,7 +1431,7 @@ msgstr ""
 " Yazım Denetimi kipinde aşağıdaki anahtarlardan yararlanabilirsiniz:\n"
 "\n"
 
-#: src/help.c:316
+#: src/help.c:318
 #, fuzzy
 msgid ""
 "Execute Command Help Text\n"
@@ -1438,7 +1452,7 @@ msgstr ""
 " Harici Komut kipinde aşağıdaki anahtarlardan yararlanabilirsiniz:\n"
 "\n"
 
-#: src/help.c:329
+#: src/help.c:331
 #, fuzzy
 msgid ""
 "Main nano help text\n"
@@ -1469,15 +1483,14 @@ msgstr ""
 "kullanılabilir.  Alternatif tuşlar parantez içinde gösterilmişlerdir:\n"
 "\n"
 
-#: src/help.c:339
+#: src/help.c:341
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
-" The notation for shortcuts is as follows: Control-key sequences are notated "
-"with a caret (^) symbol and can be entered either by using the Control "
-"(Ctrl) key or pressing the Escape (Esc) key twice.  Escape-key sequences are "
-"notated with the Meta (M-) symbol and can be entered using either the Esc, "
-"Alt, or Meta key depending on your keyboard setup.  "
+" Shortcuts are written as follows: Control-key sequences are notated with a "
+"'^' and can be entered either by using the Ctrl key or pressing the Esc key "
+"twice.  Meta-key sequences are notated with 'M-' and can be entered using "
+"either the Alt, Cmd, or Esc key, depending on your keyboard setup.  "
 msgstr ""
 
 #: src/help.c:348
@@ -1493,21 +1506,21 @@ msgstr ""
 msgid "enable/disable"
 msgstr "etkin/etkisiz"
 
-#: src/nano.c:559
+#: src/nano.c:560
 #, fuzzy
 msgid "Key is invalid in view mode"
 msgstr "GÖSTER kipi için geçersiz anahtar"
 
-#: src/nano.c:565
+#: src/nano.c:566
 #, fuzzy
 msgid "This function is disabled in restricted mode"
 msgstr "Kısıtlı kipte %s dışına çıkılamıyor"
 
-#: src/nano.c:573
+#: src/nano.c:574
 msgid "Help is not available"
 msgstr ""
 
-#: src/nano.c:684
+#: src/nano.c:686
 #, c-format
 msgid ""
 "\n"
@@ -1516,7 +1529,7 @@ msgstr ""
 "\n"
 "Arabellek %s olarak yazıldı\n"
 
-#: src/nano.c:686
+#: src/nano.c:688
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -1525,7 +1538,7 @@ msgstr ""
 "\n"
 "Arabellek %s olarak yazıldı\n"
 
-#: src/nano.c:689
+#: src/nano.c:691
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -1809,17 +1822,22 @@ msgstr "Askıya almayı etkinleştir"
 msgid "Enable soft line wrapping"
 msgstr ""
 
-#: src/nano.c:937
+#: src/nano.c:940
 #, fuzzy, c-format
-msgid " GNU nano, version %s\n"
-msgstr " GNU nano sürüm numarası: %s (%s, %s tarihinde derlendi)\n"
+msgid " nano, version %s\n"
+msgstr "sürüm "
 
-#: src/nano.c:940
+#: src/nano.c:943
+#, c-format
+msgid " (C) 2014..%s the contributors to nano\n"
+msgstr ""
+
+#: src/nano.c:945
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr "E-Posta: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 
-#: src/nano.c:941
+#: src/nano.c:946
 #, c-format
 msgid ""
 "\n"
@@ -1828,71 +1846,84 @@ msgstr ""
 "\n"
 " Derleme seçenekleri:"
 
-#: src/nano.c:1073
+#: src/nano.c:1081
 msgid "No file name"
 msgstr ""
 
-#: src/nano.c:1108
-msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
+#: src/nano.c:1115
+msgid "Save modified buffer?  (Answering \"No\" will DISCARD changes.) "
 msgstr ""
-"Değiştirilmiş arabellek kaydedilsin mi (\"Hayır\" CEVABI TÜM DEĞİŞİKLİKLERİ "
-"YOK EDECEK) ? "
 
-#: src/nano.c:1168
+#: src/nano.c:1178
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr ""
 
-#: src/nano.c:1192
+#: src/nano.c:1202
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr ""
 
-#: src/nano.c:1256
+#: src/nano.c:1266
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "SIGHUP ya da SIGTERM sinyali alındı\n"
 
-#: src/nano.c:1272
+#: src/nano.c:1282
 #, fuzzy, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "nano'ya geri dönmek için \"fg\"'yi kullanın"
 
-#: src/nano.c:1294
+#: src/nano.c:1304
 msgid "Suspension is not enabled"
 msgstr ""
 
-#: src/nano.c:1448
+#: src/nano.c:1459
 msgid "enabled"
 msgstr "etkin"
 
-#: src/nano.c:1448
+#: src/nano.c:1459
 msgid "disabled"
 msgstr "etkisiz"
 
-#: src/nano.c:1607 src/winio.c:1125
-msgid "Unknown Command"
+#: src/nano.c:1573
+msgid "Unbound key"
+msgstr ""
+
+#: src/nano.c:1577
+#, c-format
+msgid "Unbound key: M-%c"
+msgstr ""
+
+#: src/nano.c:1579
+#, c-format
+msgid "Unbound key: ^%c"
+msgstr ""
+
+#: src/nano.c:1581
+#, c-format
+msgid "Unbound key: %c"
 msgstr ""
 
-#: src/nano.c:1720
+#: src/nano.c:1745
 #, fuzzy
 msgid "XON ignored, mumble mumble"
 msgstr "XON yoksayıldı."
 
-#: src/nano.c:1725
+#: src/nano.c:1750
 #, fuzzy
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF yoksayıldı."
 
-#: src/nano.c:2139 src/rcfile.c:1334
+#: src/nano.c:2166 src/rcfile.c:1187
 #, fuzzy, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "istenen Tab değeri %d geçerli değil"
 
-#: src/nano.c:2200 src/rcfile.c:1259
+#: src/nano.c:2227 src/rcfile.c:1128
 #, fuzzy, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "istenen doldurma değeri %d geçerli değil"
 
-#: src/nano.c:2247
+#: src/nano.c:2276
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr ""
@@ -1900,116 +1931,119 @@ msgstr ""
 #. TRANSLATORS: For the next three strings, if possible, specify
 #. * the single-byte shortcuts for both your language and English.
 #. * For example, in French: "OoYy" for "Oui".
-#: src/prompt.c:821
+#: src/prompt.c:818
 msgid "Yy"
 msgstr "Ee"
 
-#: src/prompt.c:822
+#: src/prompt.c:819
 msgid "Nn"
 msgstr "Hh"
 
-#: src/prompt.c:823
+#: src/prompt.c:820
 msgid "Aa"
 msgstr "Tt"
 
-#: src/prompt.c:845
+#: src/prompt.c:842
 msgid "Yes"
 msgstr "Evet"
 
-#: src/prompt.c:850
+#: src/prompt.c:847
 msgid "All"
 msgstr "Tümü"
 
-#: src/prompt.c:855
+#: src/prompt.c:852
 msgid "No"
 msgstr "Hayır"
 
-#: src/rcfile.c:142
+#: src/rcfile.c:144
 #, fuzzy, c-format
 msgid "Error in %s on line %lu: "
 msgstr "%s'nin %d. satırında hata: "
 
-#: src/rcfile.c:201
+#: src/rcfile.c:203
 #, fuzzy, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "%s argümanında sonlanmamış \" var"
 
-#: src/rcfile.c:228 src/rcfile.c:280 src/rcfile.c:732 src/rcfile.c:793
-#: src/rcfile.c:882 src/rcfile.c:933
+#: src/rcfile.c:231 src/rcfile.c:674 src/rcfile.c:725 src/rcfile.c:824
 #, fuzzy
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Düzenli ifade katarları, \" karakteri ile başlamalı ve bitmeli\n"
 
-#: src/rcfile.c:254 src/search.c:62
+#: src/rcfile.c:257 src/search.c:61
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "\"%s\" yanlış bir düzenli ifade: %s"
 
-#: src/rcfile.c:274
+#: src/rcfile.c:279
 msgid "Missing syntax name"
 msgstr "Sözdizim ismi eksik"
 
-#: src/rcfile.c:345
+#: src/rcfile.c:288
+msgid "A syntax name must be quoted"
+msgstr ""
+
+#: src/rcfile.c:297
 msgid "The \"none\" syntax is reserved"
 msgstr ""
 
-#: src/rcfile.c:352
-msgid "The \"default\" syntax must take no extensions"
+#: src/rcfile.c:327
+msgid "The \"default\" syntax does not accept extensions"
 msgstr ""
 
-#: src/rcfile.c:424
+#: src/rcfile.c:369
 #, fuzzy
 msgid "Missing key name"
 msgstr "Sözdizim ismi eksik"
 
-#: src/rcfile.c:433 src/rcfile.c:444
+#: src/rcfile.c:378 src/rcfile.c:389
 msgid "Key name is too short"
 msgstr ""
 
-#: src/rcfile.c:454
+#: src/rcfile.c:399
 msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr ""
 
-#: src/rcfile.c:457
+#: src/rcfile.c:402
 #, c-format
 msgid "Key name %s is invalid"
 msgstr ""
 
-#: src/rcfile.c:466
+#: src/rcfile.c:411
 msgid "Must specify a function to bind the key to"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the word "all".
-#: src/rcfile.c:476
+#: src/rcfile.c:421
 msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
 
-#: src/rcfile.c:483
+#: src/rcfile.c:428
 #, c-format
 msgid "Cannot map name \"%s\" to a function"
 msgstr ""
 
-#: src/rcfile.c:490
+#: src/rcfile.c:435
 #, c-format
 msgid "Cannot map name \"%s\" to a menu"
 msgstr ""
 
-#: src/rcfile.c:522
+#: src/rcfile.c:467
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr ""
 
-#: src/rcfile.c:534
+#: src/rcfile.c:479
 #, c-format
 msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr ""
 
-#: src/rcfile.c:631
+#: src/rcfile.c:576
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr ""
 
-#: src/rcfile.c:674
+#: src/rcfile.c:616
 #, fuzzy, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -2023,130 +2057,112 @@ msgstr ""
 "\"white\", \"yellow\", \"cyan\", \"magenta\" ve \n"
 "\"black\", seçimli \"bright\" ön eki ile.\n"
 
-#: src/rcfile.c:696
-#, fuzzy
-msgid "Cannot add a color command without a syntax command"
-msgstr "Sözdizimi satırı olmaksızın renk direktifi eklenemez"
+#: src/rcfile.c:637 src/rcfile.c:795 src/rcfile.c:858
+#, c-format
+msgid "A '%s' command requires a preceding 'syntax' command"
+msgstr ""
 
-#: src/rcfile.c:701
+#: src/rcfile.c:643
 msgid "Missing color name"
 msgstr "Renk ismi eksik"
 
-#: src/rcfile.c:711 src/rcfile.c:872
-msgid "Missing regex string"
+#: src/rcfile.c:653 src/rcfile.c:807
+#, c-format
+msgid "Missing regex string after '%s' command"
 msgstr ""
 
-#: src/rcfile.c:787
+#: src/rcfile.c:719
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\", \"end=\"e ihtiyaç duyar."
 
-#: src/rcfile.c:839
+#: src/rcfile.c:768
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
 msgstr ""
 
-#: src/rcfile.c:867
-#, fuzzy
-msgid "Cannot add a header regex without a syntax command"
-msgstr "Sözdizimi satırı olmaksızın renk direktifi eklenemez"
-
-#: src/rcfile.c:922
-#, fuzzy
-msgid "Cannot add a magic string regex without a syntax command"
-msgstr "Sözdizimi satırı olmaksızın renk direktifi eklenemez"
-
-#: src/rcfile.c:927
-#, fuzzy
-msgid "Missing magic string name"
-msgstr "Renk ismi eksik"
-
-#: src/rcfile.c:985
-#, fuzzy
-msgid "Cannot add a linter without a syntax command"
-msgstr "Sözdizimi satırı olmaksızın renk direktifi eklenemez"
-
-#: src/rcfile.c:990
-#, fuzzy
-msgid "Missing linter command"
-msgstr "Renk ismi eksik"
+#: src/rcfile.c:802
+#, c-format
+msgid "The \"default\" syntax does not accept '%s' regexes"
+msgstr ""
 
-#: src/rcfile.c:1011
-#, fuzzy
-msgid "Cannot add formatter without a syntax command"
-msgstr "Sözdizimi satırı olmaksızın renk direktifi eklenemez"
+#: src/rcfile.c:863
+#, c-format
+msgid "Missing command after '%s'"
+msgstr ""
 
-#: src/rcfile.c:1016
-msgid "Missing formatter command"
+#: src/rcfile.c:879
+#, c-format
+msgid "Argument of '%s' lacks closing \""
 msgstr ""
 
-#: src/rcfile.c:1046
+#: src/rcfile.c:910
 #, c-format
 msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr ""
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:912
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
 
-#: src/rcfile.c:1109
+#: src/rcfile.c:971
 #, fuzzy, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "%s başına ekleme için açılamıyor: %s"
 
-#: src/rcfile.c:1125 src/rcfile.c:1134 src/rcfile.c:1144
+#: src/rcfile.c:993 src/rcfile.c:1202
 #, c-format
-msgid "Command \"%s\" not allowed in included file"
+msgid "Syntax \"%s\" has no color commands"
 msgstr ""
 
-#: src/rcfile.c:1150 src/rcfile.c:1359
+#: src/rcfile.c:1024
 #, c-format
-msgid "Syntax \"%s\" has no color commands"
+msgid "Command \"%s\" not allowed in included file"
 msgstr ""
 
-#: src/rcfile.c:1180
+#: src/rcfile.c:1039
 #, fuzzy, c-format
 msgid "Command \"%s\" not understood"
 msgstr "%s komutu anlaşılamadı"
 
-#: src/rcfile.c:1195
+#: src/rcfile.c:1051
 #, fuzzy
 msgid "Missing option"
 msgstr "Renk ismi eksik"
 
-#: src/rcfile.c:1217
+#: src/rcfile.c:1065
+#, c-format
+msgid "Unknown option \"%s\""
+msgstr ""
+
+#: src/rcfile.c:1077
+#, fuzzy, c-format
+msgid "Cannot unset option \"%s\""
+msgstr "Üst pencere yeniden boyutlandırılamaz"
+
+#: src/rcfile.c:1089
 #, fuzzy, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "%s seçeneği bir bağımsız değişken gerektiriyor"
 
-#: src/rcfile.c:1235
+#: src/rcfile.c:1105
 msgid "Option is not a valid multibyte string"
 msgstr ""
 
-#: src/rcfile.c:1272 src/rcfile.c:1300 src/rcfile.c:1309
+#: src/rcfile.c:1139 src/rcfile.c:1160 src/rcfile.c:1167
 msgid "Non-blank characters required"
 msgstr ""
 
-#: src/rcfile.c:1282
+#: src/rcfile.c:1146
 msgid "Two single-column characters required"
 msgstr ""
 
-#: src/rcfile.c:1348
-#, fuzzy, c-format
-msgid "Cannot unset option \"%s\""
-msgstr "Üst pencere yeniden boyutlandırılamaz"
-
-#: src/rcfile.c:1354
-#, c-format
-msgid "Unknown option \"%s\""
-msgstr ""
-
-#: src/rcfile.c:1413
+#: src/rcfile.c:1258
 msgid "I can't find my home directory!  Wah!"
 msgstr "Ev dizinimi bulamıyorum!"
 
-#: src/rcfile.c:1451
+#: src/rcfile.c:1295
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2155,348 +2171,381 @@ msgstr ""
 "\n"
 "nano'yu başlatmaya devam etmek için Gir tuşuna basınız\n"
 
-#: src/search.c:96
+#: src/search.c:95
 #, fuzzy, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "\"%s\" bulunamadı"
 
 #. TRANSLATORS: The next three strings are modifiers of the search prompt.
-#: src/search.c:176
+#: src/search.c:169
 msgid " [Case Sensitive]"
 msgstr " [Büyük / Küçük Harfe Duyarlı]"
 
-#: src/search.c:180
+#: src/search.c:173
 msgid " [Regexp]"
 msgstr " [Düzenli İfade]"
 
-#: src/search.c:184
+#: src/search.c:177
 msgid " [Backwards]"
 msgstr " [Geriye DoÄŸru]"
 
 #. TRANSLATORS: The next two strings are modifiers of the search prompt.
-#: src/search.c:189
+#: src/search.c:182
 #, fuzzy
 msgid " (to replace) in selection"
 msgstr " (değiştirmek için)"
 
-#: src/search.c:191
+#: src/search.c:184
 msgid " (to replace)"
 msgstr " (değiştirmek için)"
 
+#: src/search.c:305
+#, fuzzy
+msgid "Searching..."
+msgstr "Ara"
+
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:718
+#: src/search.c:693
 msgid "Replace this instance?"
 msgstr "Bu bulgu deÄŸiÅŸtirilsin mi?"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:883
+#: src/search.c:840
 msgid "Replace with"
 msgstr "Ä°le deÄŸiÅŸtir"
 
-#: src/search.c:924
+#: src/search.c:875
 #, fuzzy, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
 msgstr[0] "%d değiştirme yapıldı"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:964
+#: src/search.c:914
 #, fuzzy
 msgid "Enter line number, column number"
 msgstr "Satır numarasını girin"
 
-#: src/search.c:991
+#: src/search.c:939
 msgid "Invalid line or column number"
 msgstr ""
 
-#: src/search.c:1124
+#: src/search.c:1080
 msgid "Not a bracket"
 msgstr "Ayraç değil"
 
-#: src/search.c:1191
+#: src/search.c:1146
 msgid "No matching bracket"
 msgstr "Eşleşen ayraç yok"
 
-#: src/text.c:54
+#: src/text.c:53
 msgid "Mark Set"
 msgstr "Ä°ÅŸaretle"
 
-#: src/text.c:58
+#: src/text.c:57
 #, fuzzy
 msgid "Mark Unset"
 msgstr "İşareti Kaldır"
 
-#: src/text.c:70
+#: src/text.c:69
 #, fuzzy, c-format
 msgid "Error invoking \"%s\""
 msgstr "\"spell\" çağırılırken hata"
 
-#: src/text.c:475
-msgid "Nothing in undo buffer!"
+#: src/text.c:468
+msgid "Commenting is not supported for this file type"
 msgstr ""
 
-#: src/text.c:481 src/text.c:634
-#, c-format
-msgid "Internal error: can't match line %d.  Please save your work."
+#: src/text.c:484
+msgid "Cannot comment past end of file"
+msgstr ""
+
+#: src/text.c:677
+msgid "Nothing in undo buffer!"
 msgstr ""
 
 #. TRANSLATORS: Eight of the next nine strings describe actions
 #. * that are undone or redone.  It are all nouns, not verbs.
-#: src/text.c:495 src/text.c:524 src/text.c:645 src/text.c:686
+#: src/text.c:695 src/text.c:724 src/text.c:857 src/text.c:898
 msgid "text add"
 msgstr ""
 
-#: src/text.c:505 src/text.c:656
+#: src/text.c:705 src/text.c:868
 #, fuzzy
 msgid "text delete"
 msgstr "Sonraki Dosya"
 
-#: src/text.c:528 src/text.c:694
+#: src/text.c:728 src/text.c:907
 msgid "line join"
 msgstr ""
 
-#: src/text.c:547 src/text.c:710
+#: src/text.c:747 src/text.c:923
 msgid "text cut"
 msgstr ""
 
-#: src/text.c:552 src/text.c:714
+#: src/text.c:752 src/text.c:927
 msgid "text uncut"
 msgstr ""
 
-#: src/text.c:558 src/text.c:691
+#: src/text.c:758 src/text.c:903
 msgid "Internal error: line is missing.  Please save your work."
 msgstr ""
 
-#: src/text.c:561 src/text.c:665
+#: src/text.c:762 src/text.c:877
 msgid "line break"
 msgstr ""
 
-#: src/text.c:569 src/text.c:725
+#: src/text.c:772 src/text.c:947
+msgid "comment"
+msgstr ""
+
+#: src/text.c:776 src/text.c:951
+msgid "uncomment"
+msgstr ""
+
+#: src/text.c:780 src/text.c:938
 #, fuzzy
 msgid "text insert"
 msgstr "Sonraki Dosya"
 
-#: src/text.c:589 src/text.c:718
+#: src/text.c:800 src/text.c:931
 #, fuzzy
 msgid "text replace"
 msgstr " (değiştirmek için)"
 
-#: src/text.c:596 src/text.c:732 src/text.c:1030 src/text.c:1174
+#: src/text.c:807 src/text.c:955 src/text.c:1267 src/text.c:1437
 msgid "Internal error: unknown type.  Please save your work."
 msgstr ""
 
-#: src/text.c:601
+#: src/text.c:813
 #, c-format
 msgid "Undid action (%s)"
 msgstr ""
 
-#: src/text.c:619
+#: src/text.c:832
 msgid "Nothing to re-do!"
 msgstr ""
 
-#: src/text.c:628
+#: src/text.c:841
 msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
 
-#: src/text.c:737
+#: src/text.c:961
 #, c-format
 msgid "Redid action (%s)"
 msgstr ""
 
-#: src/text.c:827 src/text.c:2508 src/text.c:2944
+#: src/text.c:1051 src/text.c:2765 src/text.c:3198
 msgid "Could not create pipe"
 msgstr "Boru yaratılamadı"
 
-#: src/text.c:853 src/text.c:2595 src/text.c:2750 src/text.c:2992
-#: src/text.c:3286
+#: src/text.c:1077 src/text.c:2852 src/text.c:3005 src/text.c:3246
+#: src/text.c:3540
 msgid "Could not fork"
 msgstr "Fork işlemi gerçekleştirilemedi"
 
-#: src/text.c:1853
+#: src/text.c:2117
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Hatalı alıntı dizgesi %s: %s"
 
-#: src/text.c:2241
+#: src/text.c:2499
 msgid "Can now UnJustify!"
 msgstr "Şmdi yaslamayı geri alabilirsiniz!"
 
-#: src/text.c:2435
+#: src/text.c:2697
 msgid "Edit a replacement"
 msgstr "Bir yerdeğiştirmeyi düzenle"
 
-#: src/text.c:2510
+#. TRANSLATORS: Shown after fixing misspellings in one word.
+#: src/text.c:2713
+#, fuzzy
+msgid "Next word..."
+msgstr "Sonraki Kelime"
+
+#: src/text.c:2767
 msgid "Creating misspelled word list, please wait..."
 msgstr "Yazım hatası içeren kelimeler listeleniyor, lütfen bekleyiniz"
 
-#: src/text.c:2601 src/text.c:2999
+#: src/text.c:2858 src/text.c:3253
 msgid "Could not get size of pipe buffer"
 msgstr "Boru arabelleğinin boyutu alınamıyor"
 
-#: src/text.c:2652
+#: src/text.c:2907
 msgid "Error invoking \"spell\""
 msgstr "\"spell\" çağırılırken hata"
 
-#: src/text.c:2655
+#: src/text.c:2910
 msgid "Error invoking \"sort -f\""
 msgstr "\"sort -f\" çağırılırken hata"
 
-#: src/text.c:2658
+#: src/text.c:2913
 msgid "Error invoking \"uniq\""
 msgstr "\"uniq\" çağırılırken hata"
 
-#: src/text.c:2881
+#: src/text.c:3135
 #, fuzzy
 msgid "Invoking spell checker, please wait"
 msgstr "Yazım denetleyicisini çağır (eğer mümkün ise)"
 
-#: src/text.c:2897
+#: src/text.c:3151
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Yazım kontrolü başarısız oldu: %s"
 
-#: src/text.c:2899
+#: src/text.c:3153
 #, fuzzy, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Yazım kontrolü başarısız oldu: %s"
 
-#: src/text.c:2902
+#: src/text.c:3156
 msgid "Finished checking spelling"
 msgstr "Yazım kontrolü bitti"
 
-#: src/text.c:2927
+#: src/text.c:3181
 msgid "No linter defined for this type of file!"
 msgstr ""
 
-#: src/text.c:2932
+#: src/text.c:3186
 msgid "Save modified buffer before linting?"
 msgstr ""
 
-#: src/text.c:2949
+#: src/text.c:3203
 msgid "Invoking linter, please wait"
 msgstr ""
 
-#: src/text.c:3105
+#: src/text.c:3358
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr ""
 
-#: src/text.c:3134
+#: src/text.c:3388
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
 
-#: src/text.c:3153
+#: src/text.c:3407
 msgid "No more errors in unopened files, cancelling"
 msgstr ""
 
-#: src/text.c:3192
+#: src/text.c:3446
 #, fuzzy
 msgid "At last message"
 msgstr "Bu mesajı gösterir"
 
-#: src/text.c:3197
+#: src/text.c:3451
 #, fuzzy
 msgid "At first message"
 msgstr "Bu mesajı gösterir"
 
-#: src/text.c:3237
+#: src/text.c:3491
 msgid "Finished"
 msgstr ""
 
-#: src/text.c:3259
+#: src/text.c:3513
 msgid "Invoking formatter, please wait"
 msgstr ""
 
-#: src/text.c:3314
+#: src/text.c:3568
 msgid "Finished formatting"
 msgstr ""
 
-#: src/text.c:3396
+#: src/text.c:3650
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr ""
 
-#: src/text.c:3397
+#: src/text.c:3651
 #, fuzzy
 msgid "In Selection:  "
 msgstr "Seçimi Dosyanın Sonuna Ekle"
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3411
+#: src/text.c:3665
 msgid "Verbatim Input"
 msgstr ""
 
-#: src/utils.c:391 src/utils.c:403
+#: src/utils.c:392 src/utils.c:404
 msgid "nano is out of memory!"
 msgstr "nano bellek dışı!"
 
+#: src/utils.c:625
+#, c-format
+msgid "Internal error: can't match line %d.  Please save your work."
+msgstr ""
+
+#. TRANSLATORS: This refers to a sequence of escape codes
+#. * (from the keyboard) that nano does not know about.
+#: src/winio.c:1121
+msgid "Unknown sequence"
+msgstr ""
+
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
 #: src/winio.c:1427
 msgid "Unicode Input"
 msgstr ""
 
-#: src/winio.c:1991 src/winio.c:1995
-#, fuzzy
-msgid "Modified"
-msgstr " DeÄŸiÅŸtirildi "
-
-#: src/winio.c:1992
-#, fuzzy
-msgid "View"
-msgstr " Göster "
-
-#: src/winio.c:2006
+#: src/winio.c:1960
 #, fuzzy
 msgid "DIR:"
 msgstr " DÄ°ZÄ°N: "
 
-#: src/winio.c:2013
+#: src/winio.c:1968
 #, fuzzy
 msgid "File:"
 msgstr "Dosya: "
 
-#: src/winio.c:3141
+#: src/winio.c:1972 src/winio.c:1976
+#, fuzzy
+msgid "Modified"
+msgstr " DeÄŸiÅŸtirildi "
+
+#: src/winio.c:1974
+#, fuzzy
+msgid "View"
+msgstr " Göster "
+
+#: src/winio.c:3105
 #, fuzzy, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "satır %ld/%ld (%d%%), sütun %lu/%lu (%d%%), karakter %lu/%ld (%d%%)"
 
-#: src/winio.c:3271
+#: src/winio.c:3235
 msgid "The nano text editor"
 msgstr "nano metin editörü"
 
-#: src/winio.c:3272
+#: src/winio.c:3236
 #, fuzzy
 msgid "version"
 msgstr "sürüm "
 
-#: src/winio.c:3273
+#: src/winio.c:3237
 msgid "Brought to you by:"
 msgstr "Size saÄŸlayan: "
 
-#: src/winio.c:3274
+#: src/winio.c:3238
 msgid "Special thanks to:"
 msgstr "Özel teşekkürler:"
 
-#: src/winio.c:3275
+#: src/winio.c:3239
 msgid "The Free Software Foundation"
 msgstr "The Free Software Foundation"
 
-#: src/winio.c:3276
+#: src/winio.c:3240
 msgid "the many translators and the TP"
 msgstr ""
 
-#: src/winio.c:3277
+#: src/winio.c:3241
 msgid "For ncurses:"
 msgstr "ncurses için:"
 
-#: src/winio.c:3278
+#: src/winio.c:3242
 msgid "and anyone else we forgot..."
 msgstr "ve unuttuÄŸumuz kiÅŸilere..."
 
-#: src/winio.c:3279
+#: src/winio.c:3243
 #, fuzzy
 msgid "Thank you for using nano!"
 msgstr "nano kullandığınız için teşekkürler!\n"
@@ -2689,6 +2738,9 @@ msgstr "nano kullandığınız için teşekkürler!\n"
 #~ msgid "(ignored, for Pico compatibility)"
 #~ msgstr "(Pico uyumluluğu için yoksayıldı)"
 
+#~ msgid " GNU nano version %s (compiled %s, %s)\n"
+#~ msgstr " GNU nano sürüm numarası: %s (%s, %s tarihinde derlendi)\n"
+
 #~ msgid "Sorry, support for this function has been disabled"
 #~ msgstr "Özür dileriz, bu işlev için destek etkisiz kılınmış"
 
@@ -2710,6 +2762,11 @@ msgstr "nano kullandığınız için teşekkürler!\n"
 #~ msgid "Spell checking failed: unable to write temp file!"
 #~ msgstr "Yazım kontrolü başarısız oldu: geçici dosyaya yazılamıyor!"
 
+#~ msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
+#~ msgstr ""
+#~ "Değiştirilmiş arabellek kaydedilsin mi (\"Hayır\" CEVABI TÜM "
+#~ "DEĞİŞİKLİKLERİ YOK EDECEK) ? "
+
 #~ msgid "Cannot move top win"
 #~ msgstr "Ãœst pencere hareket ettirilemez"
 
@@ -2769,6 +2826,9 @@ msgstr "nano kullandığınız için teşekkürler!\n"
 #~ msgid "Starting a new syntax type\n"
 #~ msgstr "Yeni bir sözdizim tipine başlanıyor\n"
 
+#~ msgid "Cannot add a color directive without a syntax line"
+#~ msgstr "Sözdizimi satırı olmaksızın renk direktifi eklenemez"
+
 #~ msgid "Starting a new colorstring for fg %d bg %d\n"
 #~ msgstr ""
 #~ "Yeni bir renkli yazıya %d ön plan rengi ve %d arka plan rengi ile "
diff --git a/po/uk.po b/po/uk.po
index 7a970a15..e72cd860 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 2.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-25 16:41-0500\n"
+"POT-Creation-Date: 2016-06-17 15:41+0200\n"
 "PO-Revision-Date: 2016-02-12 12:53+0200\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
@@ -20,121 +20,138 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Generator: Lokalize 1.5\n"
 
+#: src/browser.c:144 src/browser.c:284 src/browser.c:334 src/files.c:996
+#: src/files.c:1003 src/files.c:1794 src/files.c:1919 src/files.c:1963
+#: src/files.c:1983 src/files.c:2099 src/files.c:3019 src/files.c:3242
+#: src/rcfile.c:540 src/rcfile.c:1280
+#, c-format
+msgid "Error reading %s: %s"
+msgstr "Помилка під час спроби читання %s: %s"
+
 #. TRANSLATORS: This is a prompt.
-#: src/browser.c:220
+#: src/browser.c:247
 msgid "Go To Directory"
 msgstr "Перейти до каталогу"
 
-#: src/browser.c:227 src/browser.c:738 src/files.c:1174 src/files.c:2340
-#: src/nano.c:1120 src/search.c:202 src/search.c:290 src/search.c:895
-#: src/search.c:970 src/text.c:2935 src/text.c:3142
+#: src/browser.c:254 src/browser.c:723 src/files.c:1126 src/files.c:2292
+#: src/nano.c:1128 src/search.c:195 src/search.c:297 src/search.c:851
+#: src/search.c:918 src/text.c:3189 src/text.c:3396
 msgid "Cancelled"
 msgstr "Скасовано"
 
-#: src/browser.c:253 src/browser.c:300
-#, c-format
-msgid "Can't go outside of %s in restricted mode"
+#. TRANSLATORS: This refers to the option --operatingdir,
+#. * not to --restricted.
+#: src/browser.c:274 src/browser.c:326
+#, fuzzy, c-format
+msgid "Can't go outside of %s in confined mode"
 msgstr "Не можу піти поза %s в обмеженому режимі"
 
-#: src/browser.c:264 src/browser.c:310 src/browser.c:326 src/files.c:1044
-#: src/files.c:1052 src/files.c:1844 src/files.c:1971 src/files.c:2016
-#: src/files.c:2037 src/files.c:2156 src/files.c:3062 src/files.c:3285
-#: src/rcfile.c:596 src/rcfile.c:1435
-#, c-format
-msgid "Error reading %s: %s"
-msgstr "Помилка під час спроби читання %s: %s"
-
-#: src/browser.c:290
+#: src/browser.c:317
 msgid "Can't move up a directory"
 msgstr "Не можу перейти на каталог вище"
 
 #. TRANSLATORS: Try to keep this at most 7 characters.
-#: src/browser.c:615 src/browser.c:623
+#: src/browser.c:590 src/browser.c:598
 msgid "(dir)"
 msgstr "(кат)"
 
 #. TRANSLATORS: Try to keep this at most 12 characters.
-#: src/browser.c:620
+#: src/browser.c:595
 msgid "(parent dir)"
 msgstr "(батьк. кат.)"
 
 #. TRANSLATORS: Try to keep this at most 7 characters.
 #. * If necessary, you can leave out the parentheses.
-#: src/browser.c:650
+#: src/browser.c:625
 msgid "(huge)"
 msgstr "(вел.)"
 
 #. TRANSLATORS: This is the main search prompt.
-#: src/browser.c:727 src/search.c:173
+#: src/browser.c:712 src/search.c:166
 msgid "Search"
 msgstr "Пошук"
 
-#: src/browser.c:777 src/search.c:466 src/search.c:536
-msgid "This is the only occurrence"
-msgstr "Це єдиний збіг"
-
 # message
-#: src/browser.c:793 src/search.c:364
+#: src/browser.c:754 src/search.c:368
 msgid "Search Wrapped"
 msgstr "Дісталися кінця файла, почали спочатку"
 
-#: src/browser.c:843 src/search.c:517
+#: src/browser.c:764 src/search.c:509
+msgid "This is the only occurrence"
+msgstr "Це єдиний збіг"
+
+#: src/browser.c:812 src/search.c:473
 msgid "No current search pattern"
 msgstr "Немає поточного зразка для пошуку"
 
-#: src/files.c:50
+#: src/color.c:186
+#, fuzzy, c-format
+msgid "Unknown syntax name: %s"
+msgstr "Відсутня назва синтаксису"
+
+#: src/color.c:247
+#, c-format
+msgid "magic_load() failed: %s"
+msgstr ""
+
+#: src/color.c:251
+#, c-format
+msgid "magic_file(%s) failed: %s"
+msgstr ""
+
+#: src/files.c:47
 #, c-format
 msgid "Directory '%s' does not exist"
 msgstr "Каталогу «%s» не існує"
 
-#: src/files.c:52
+#: src/files.c:49
 #, c-format
 msgid "Path '%s': %s"
 msgstr "Шлях «%s»: %s"
 
-#: src/files.c:54
+#: src/files.c:51
 #, c-format
 msgid "Path '%s' is not a directory"
 msgstr "Шлях «%s» не є адресою каталогу"
 
-#: src/files.c:57
+#: src/files.c:53
 #, c-format
 msgid "Path '%s' is not accessible"
 msgstr "Шлях «%s» недоступний"
 
-#. TRANSLATORS: Try to keep this at most 76 characters.
-#: src/files.c:158
+#. TRANSLATORS: Keep the next ten messages at most 76 characters.
+#: src/files.c:148
 msgid ""
 "Warning: Modifying a file which is not locked, check directory permission?"
 msgstr ""
 "Попередження: вносимо зміни до файла, який не заблоковано, — перевірити "
 "права доступу до каталогу?"
 
-#: src/files.c:197
+#: src/files.c:187
 msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
 msgstr "Не вдалося визначити профіль для файла блокування (помилка getpwuid())"
 
-#: src/files.c:206
+#: src/files.c:196
 #, c-format
 msgid "Couldn't determine hostname for lock file: %s"
 msgstr "Не вдалося визначити назву вузла для файла блокування: %s"
 
-#: src/files.c:227 src/files.c:238 src/files.c:275 src/files.c:285
+#: src/files.c:216 src/files.c:225 src/files.c:262 src/files.c:272
 #, c-format
 msgid "Error writing lock file %s: %s"
 msgstr "Помилка під час спроби записати файл блокування %s: %s"
 
-#: src/files.c:305
+#: src/files.c:291
 #, c-format
 msgid "Error deleting lock file %s: %s"
 msgstr "Помилка під час спроби вилучити файл блокування %s: %s"
 
-#: src/files.c:341
+#: src/files.c:325
 #, c-format
 msgid "Error opening lock file %s: %s"
 msgstr "Помилка під час спроби відкрити файл блокування %s: %s"
 
-#: src/files.c:353
+#: src/files.c:337
 #, c-format
 msgid "Error reading lock file %s: Not enough data read"
 msgstr ""
@@ -142,43 +159,44 @@ msgstr ""
 "недостатньо даних"
 
 #. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
-#: src/files.c:371
+#: src/files.c:354
 #, c-format
 msgid "File %s is being edited (by %s with %s, PID %d); continue?"
 msgstr ""
 "Редагування файла %s вже виконується (%s за допомогою %s, PID %d); "
 "продовжити?"
 
-#: src/files.c:426
+#: src/files.c:430
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Не можу вставити файл поза %s"
 
-#: src/files.c:439 src/files.c:1038 src/rcfile.c:589 src/rcfile.c:1385
-#: src/rcfile.c:1426
+#: src/files.c:445 src/files.c:991 src/rcfile.c:533 src/rcfile.c:1230
+#: src/rcfile.c:1271
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "«%s» є каталогом"
 
-#: src/files.c:441
+#: src/files.c:447
 #, c-format
 msgid "\"%s\" is not a normal file"
 msgstr "«%s» не є звичайним файлом"
 
-#: src/files.c:566
+#: src/files.c:571
 msgid "No more open file buffers"
 msgstr "Більше немає відкритих файлових буферів"
 
-#: src/files.c:582
+#: src/files.c:586
 #, c-format
 msgid "Switched to %s"
 msgstr "Перемкнуто до %s"
 
-#: src/files.c:584 src/global.c:988 src/winio.c:2010
+#: src/files.c:588 src/global.c:1005 src/winio.c:1965
 msgid "New Buffer"
 msgstr "Новий Буфер"
 
-#: src/files.c:943
+#. TRANSLATORS: Keep the next four messages at most 76 characters.
+#: src/files.c:913
 #, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
@@ -186,25 +204,7 @@ msgstr[0] "Прочитано %lu рядок (перетворено з форм
 msgstr[1] "Прочитано %lu рядки (перетворено з формату DOS та Mac)"
 msgstr[2] "Прочитано %lu рядків (перетворено з формату DOS та Mac)"
 
-#: src/files.c:948
-#, c-format
-msgid ""
-"Read %lu line (Converted from DOS and Mac format - Warning: No write "
-"permission)"
-msgid_plural ""
-"Read %lu lines (Converted from DOS and Mac format - Warning: No write "
-"permission)"
-msgstr[0] ""
-"Прочитано %lu рядок (перетворено з формату Mac та DOS; попередження: немає "
-"доступу на запис)"
-msgstr[1] ""
-"Прочитано %lu рядка (перетворено з формату Mac та DOS; попередження: немає "
-"доступу на запис)"
-msgstr[2] ""
-"Прочитано %lu рядків (перетворено з формату Mac та DOS; попередження: немає "
-"доступу на запис)"
-
-#: src/files.c:954
+#: src/files.c:919
 #, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
@@ -212,23 +212,7 @@ msgstr[0] "Прочитано %lu рядок (перетворено з форм
 msgstr[1] "Прочитано %lu рядки (перетворено з формату Mac)"
 msgstr[2] "Прочитано %lu рядків (перетворено з формату Mac)"
 
-#: src/files.c:958
-#, c-format
-msgid ""
-"Read %lu line (Converted from Mac format - Warning: No write permission)"
-msgid_plural ""
-"Read %lu lines (Converted from Mac format - Warning: No write permission)"
-msgstr[0] ""
-"Прочитано %lu рядок (перетворено з формату Mac; попередження: немає доступу "
-"на запис)"
-msgstr[1] ""
-"Прочитано %lu рядка (перетворено з формату Mac; попередження: немає доступу "
-"на запис)"
-msgstr[2] ""
-"Прочитано %lu рядків (перетворено з формату Mac; попередження: немає доступу "
-"на запис)"
-
-#: src/files.c:964
+#: src/files.c:925
 #, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
@@ -236,23 +220,7 @@ msgstr[0] "Прочитано %lu рядок (перетворено з форм
 msgstr[1] "Прочитано %lu рядки (перетворено з формату DOS)"
 msgstr[2] "Прочитано %lu рядків (перетворено з формату DOS)"
 
-#: src/files.c:968
-#, c-format
-msgid ""
-"Read %lu line (Converted from DOS format - Warning: No write permission)"
-msgid_plural ""
-"Read %lu lines (Converted from DOS format - Warning: No write permission)"
-msgstr[0] ""
-"Прочитано %lu рядок (перетворено з формату DOS; попередження: немає доступу "
-"на запис)"
-msgstr[1] ""
-"Прочитано %lu рядка (перетворено з формату DOS; попередження: немає доступу "
-"на запис)"
-msgstr[2] ""
-"Прочитано %lu рядків (перетворено з формату DOS; попередження: немає доступу "
-"на запис)"
-
-#: src/files.c:974
+#: src/files.c:930
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
@@ -260,90 +228,83 @@ msgstr[0] "Прочитано %lu рядок"
 msgstr[1] "Прочитано %lu рядки"
 msgstr[2] "Прочитано %lu рядків"
 
-#: src/files.c:977
-#, c-format
-msgid "Read %lu line (Warning: No write permission)"
-msgid_plural "Read %lu lines (Warning: No write permission)"
-msgstr[0] "Прочитано %lu рядок (попередження: немає доступу на запис)"
-msgstr[1] "Прочитані %lu рядки (попередження: немає доступу на запис)"
-msgstr[2] "Прочитано %lu рядків (попередження: немає доступу на запис)"
-
-#: src/files.c:1019 src/files.c:1056
+#: src/files.c:974 src/files.c:1006
 msgid "Reading File"
 msgstr "Читаємо файл"
 
-#: src/files.c:1025
+#: src/files.c:980
 msgid "New File"
 msgstr "Новий файл"
 
-#: src/files.c:1028
-#, c-format
-msgid "\"%s\" not found"
+#: src/files.c:983
+#, fuzzy, c-format
+msgid "File \"%s\" not found"
 msgstr "\"%s\" не знайдено"
 
-#: src/files.c:1039 src/rcfile.c:590 src/rcfile.c:1386 src/rcfile.c:1427
+#: src/files.c:992 src/rcfile.c:534 src/rcfile.c:1231 src/rcfile.c:1272
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "«%s» є файлом пристрою"
 
-#: src/files.c:1133
+#: src/files.c:1083
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Команда, яку слід виконати у новому буфері [з %s] "
 
-#: src/files.c:1135
+#: src/files.c:1085
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Команда, яку слід виконати [з %s] "
 
-#: src/files.c:1142
+#: src/files.c:1092
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Файл до вставки (в новий буфер) [від %s] "
 
-#: src/files.c:1144
+#: src/files.c:1094
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Файл до вставки [від %s] "
 
-#: src/files.c:1389
+#: src/files.c:1338
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Клавіша недійсна у не мультибуферному режимі"
 
-#: src/files.c:1684
-msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+#: src/files.c:1632
+#, fuzzy
+msgid "Failed to write backup file; continue saving? (Say N if unsure.) "
 msgstr ""
 "Не вдалося записати дані до файла резервної копії, продовжити спробу "
 "зберегти дані? (Натисніть N, якщо не певні) "
 
-#: src/files.c:1800
+#: src/files.c:1750
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Не можу записати поза %s"
 
-#: src/files.c:1885 src/files.c:1910 src/files.c:1928 src/files.c:1941
-#: src/files.c:1952 src/files.c:1981
+#: src/files.c:1833 src/files.c:1858 src/files.c:1876 src/files.c:1889
+#: src/files.c:1900 src/files.c:1928
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Помилка під час спроби записати до файла резервної копії %s: %s"
 
-#: src/files.c:1886 src/nano.c:690
+#: src/files.c:1834 src/nano.c:692
 msgid "Too many backup files?"
 msgstr "Забагато файлів резервних копій?"
 
-#: src/files.c:2026 src/text.c:2863 src/text.c:2875 src/text.c:3244
-#: src/text.c:3253
+#: src/files.c:1972 src/text.c:3117 src/text.c:3129 src/text.c:3498
+#: src/text.c:3507
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Помилка під час спроби записати до тимчасового файла: %s"
 
-#: src/files.c:2049 src/files.c:2068 src/files.c:2080 src/files.c:2104
-#: src/files.c:2121 src/files.c:2131 src/files.c:2164 src/files.c:2171
+#: src/files.c:1994 src/files.c:2013 src/files.c:2023 src/files.c:2047
+#: src/files.c:2064 src/files.c:2074 src/files.c:2106 src/files.c:2113
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Помилка під час спроби записати %s: %s"
 
-#: src/files.c:2200
+#: src/files.c:2154
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
@@ -351,65 +312,69 @@ msgstr[0] "Записано %lu рядок"
 msgstr[1] "Записано %lu рядки"
 msgstr[2] "Записано %lu рядків"
 
-#: src/files.c:2299
+#: src/files.c:2249
 msgid " [DOS Format]"
 msgstr " [формат DOS]"
 
-#: src/files.c:2300
+#: src/files.c:2250
 msgid " [Mac Format]"
 msgstr " [формат Mac]"
 
-#: src/files.c:2302
+#: src/files.c:2252
 msgid " [Backup]"
 msgstr " [Резерв]"
 
-#: src/files.c:2309
+#: src/files.c:2259
 msgid "Prepend Selection to File"
 msgstr "Дописати позначене до файла на початку"
 
-#: src/files.c:2310
+#: src/files.c:2260
 msgid "Append Selection to File"
 msgstr "Дописати позначене до файла наприкінці"
 
-#: src/files.c:2311
+#: src/files.c:2261
 msgid "Write Selection to File"
 msgstr "Записати позначене до файла"
 
-#: src/files.c:2314
+#: src/files.c:2264
 msgid "File Name to Prepend to"
 msgstr "Назва файла для дописування"
 
-#: src/files.c:2315
+#: src/files.c:2265
 msgid "File Name to Append to"
 msgstr "Назва файла для дописування"
 
-#: src/files.c:2316
+#: src/files.c:2266
 msgid "File Name to Write"
 msgstr "Назва файла для записування"
 
-#: src/files.c:2349
-msgid "Save modified buffer anyway ? "
+#: src/files.c:2301
+#, fuzzy
+msgid "Save modified buffer anyway? "
 msgstr "Зберегти змінений буфер попри все? "
 
-#: src/files.c:2457
-msgid "File exists, OVERWRITE ? "
-msgstr "Файл існує, ПЕРЕЗАПИСАТИ? "
-
-#: src/files.c:2466
-msgid "Save file under DIFFERENT NAME ? "
+#: src/files.c:2412
+#, fuzzy
+msgid "Save file under DIFFERENT NAME? "
 msgstr "Зберегти файл з іншою назвою? "
 
-#: src/files.c:2480
-msgid "File was modified since you opened it, continue saving ? "
+#: src/files.c:2420
+#, fuzzy, c-format
+msgid "File \"%s\" exists; OVERWRITE? "
+msgstr "Файл існує, ПЕРЕЗАПИСАТИ? "
+
+#: src/files.c:2441
+#, fuzzy
+msgid "File was modified since you opened it; continue saving? "
 msgstr ""
 "З часу, коли було відкрито файл, до нього було внесено зміни. Продовжити "
 "спроби зберегти дані? "
 
-#: src/files.c:2917
+#: src/files.c:2874
 msgid "(more)"
 msgstr "(далі)"
 
-#: src/files.c:3004
+#: src/files.c:2959
 #, c-format
 msgid ""
 "\n"
@@ -418,7 +383,7 @@ msgstr ""
 "\n"
 "Натисніть Enter, щоб продовжити\n"
 
-#: src/files.c:3020
+#: src/files.c:2975
 #, c-format
 msgid ""
 "Unable to create directory %s: %s\n"
@@ -428,7 +393,7 @@ msgstr ""
 "Цей каталог потрібен для зберігання та завантаження журналу пошуку або даних "
 "щодо позиції курсора.\n"
 
-#: src/files.c:3026
+#: src/files.c:2982
 #, c-format
 msgid ""
 "Path %s is not a directory and needs to be.\n"
@@ -438,7 +403,7 @@ msgstr ""
 "Nano не зможе завантажувати або зберігати дані щодо журналу пошуку та "
 "позицій курсора.\n"
 
-#: src/files.c:3045
+#: src/files.c:3002
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I tried to move\n"
@@ -447,7 +412,7 @@ msgstr ""
 "Виявлено застарілий файл журналу (%s). Виконано спробу перенести\n"
 "його до бажаного місця (%s), втім, сталася помилка: %s"
 
-#: src/files.c:3049
+#: src/files.c:3006
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I moved\n"
@@ -458,721 +423,752 @@ msgstr ""
 "відповідного місця (%s)\n"
 "(див. «Поширені питання» щодо nano, щоб дізнатися більше про цю зміну)"
 
-#: src/files.c:3132 src/files.c:3140 src/files.c:3164 src/files.c:3176
+#: src/files.c:3089 src/files.c:3097 src/files.c:3121 src/files.c:3133
 #, c-format
 msgid "Error writing %s: %s\n"
 msgstr "Помилка під час спроби записати %s: %s\n"
 
 #. TRANSLATORS: Try to keep the next fifteen strings at most 10 characters.
-#: src/global.c:480
+#: src/global.c:483
 msgid "Exit"
 msgstr "Вихід"
 
-#: src/global.c:481
+#: src/global.c:484
 msgid "Close"
 msgstr "Закрити"
 
-#: src/global.c:482
+#: src/global.c:485
 msgid "Uncut Text"
 msgstr "СкасВиріз"
 
-#: src/global.c:484
+#: src/global.c:487
 msgid "Unjustify"
 msgstr "СкасВирівн"
 
-#: src/global.c:490
+#: src/global.c:493
 msgid "Read File"
 msgstr "Чит. файл"
 
-#: src/global.c:491
+#: src/global.c:494
 msgid "Where Is"
 msgstr "Пошук"
 
-#: src/global.c:492
+#: src/global.c:495
 msgid "Replace"
 msgstr "Заміна"
 
-#: src/global.c:493
+#: src/global.c:496
 msgid "Go To Line"
 msgstr "До Рядка"
 
-#: src/global.c:494
+#: src/global.c:497
 msgid "Prev Line"
 msgstr "ПопРядок"
 
-#: src/global.c:495
+#: src/global.c:498
 msgid "Next Line"
 msgstr "НастРядок"
 
-#: src/global.c:496
+#: src/global.c:499
 msgid "Prev Page"
 msgstr "Поп.Стор."
 
-#: src/global.c:497
+#: src/global.c:500
 msgid "Next Page"
 msgstr "Наст.Стор."
 
-#: src/global.c:499
+#: src/global.c:502
 msgid "Justify"
 msgstr "Вирівняти"
 
-#: src/global.c:500
+#: src/global.c:503
 msgid "FullJstify"
 msgstr "Вирівняти"
 
-#: src/global.c:502
+#: src/global.c:505
 msgid "Refresh"
 msgstr "Перемалювати"
 
 #. TRANSLATORS: Try to keep this string at most 12 characters.
-#: src/global.c:505
+#: src/global.c:508
 msgid "WhereIs Next"
 msgstr "Знайти далі"
 
 #. TRANSLATORS: The next long series of strings are shortcut descriptions;
 #. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:512
+#: src/global.c:515
 msgid "Justify the current paragraph"
 msgstr "Вирівняти поточний абзац"
 
-#: src/global.c:514
+#: src/global.c:517
 msgid "Cancel the current function"
 msgstr "Скасувати поточну функцію"
 
-#: src/global.c:515
+#: src/global.c:518
 msgid "Display this help text"
 msgstr "Показати цю довідку"
 
-#: src/global.c:518
+#: src/global.c:521
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Закрити буфер поточного файла  / Вийти з nano"
 
-#: src/global.c:520
+#: src/global.c:523
 msgid "Exit from nano"
 msgstr "Вихід з nano"
 
-#: src/global.c:524
+#: src/global.c:527
 msgid "Write the current file to disk"
 msgstr "Записати поточний файл на диск"
 
-#: src/global.c:526
+#: src/global.c:529
 msgid "Insert another file into the current one"
 msgstr "Вставити інший файл до поточного"
 
-#: src/global.c:528
+#: src/global.c:531
 msgid "Search for a string or a regular expression"
 msgstr "Шукати рядок або формальний вираз"
 
-#: src/global.c:531
+#: src/global.c:533
 msgid "Search for a string"
 msgstr "Шукати рядок"
 
-#: src/global.c:533
+#: src/global.c:534
+msgid "Refresh the file list"
+msgstr ""
+
+#: src/global.c:535
+#, fuzzy
+msgid "Go to lefthand column"
+msgstr "Йти до рядка та номеру стовпчика"
+
+#: src/global.c:536
+#, fuzzy
+msgid "Go to righthand column"
+msgstr "Йти до рядка та номеру стовпчика"
+
+#: src/global.c:538
 msgid "Go one screenful up"
 msgstr "На один екран вгору"
 
-#: src/global.c:534
+#: src/global.c:539
 msgid "Go one screenful down"
 msgstr "На один екран вниз"
 
-#: src/global.c:536
+#: src/global.c:541
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Вирізати поточний рядок та помістити його до \"кишені\""
 
-#: src/global.c:538
+#: src/global.c:543
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Скасувати вирізання та вставити зміст \"кишені\" до поточного рядка"
 
-#: src/global.c:539
+#: src/global.c:544
 msgid "Display the position of the cursor"
 msgstr "Показати розташування курсора"
 
-#: src/global.c:541
+#: src/global.c:546
 msgid "Invoke the spell checker, if available"
 msgstr "Викликати програму пошуку друкарських помилок (якщо є)"
 
-#: src/global.c:543
+#: src/global.c:548
 msgid "Replace a string or a regular expression"
 msgstr "Замінити рядок або формальний вираз"
 
-#: src/global.c:544
+#: src/global.c:549
 msgid "Go to line and column number"
 msgstr "Йти до рядка та номеру стовпчика"
 
-#: src/global.c:546
+#: src/global.c:551
 msgid "Mark text starting from the cursor position"
 msgstr "Позначити текст, починаючи з поточної позиції курсора"
 
-#: src/global.c:547
+#: src/global.c:552
 msgid "Repeat the last search"
 msgstr "Повторити останній пошук"
 
-#: src/global.c:549
+#: src/global.c:554
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "Скопіювати поточний рядок та зберегти його до \"кишені\""
 
-#: src/global.c:550
+#: src/global.c:555
 msgid "Indent the current line"
 msgstr "Додати відступ у поточному рядку"
 
-#: src/global.c:551
+#: src/global.c:556
 msgid "Unindent the current line"
 msgstr "Вилучити відступ для поточного рядка"
 
-#: src/global.c:552
+#: src/global.c:558
+msgid "Comment/uncomment the current line or marked lines"
+msgstr ""
+
+#: src/global.c:560
 msgid "Undo the last operation"
 msgstr "Скасувати останню дію"
 
-#: src/global.c:553
+#: src/global.c:561
 msgid "Redo the last undone operation"
 msgstr "Відновити останню скасовану дію"
 
-#: src/global.c:555
+#: src/global.c:563
 msgid "Go back one character"
 msgstr "Назад на один символ"
 
-#: src/global.c:556
+#: src/global.c:564
 msgid "Go forward one character"
 msgstr "Вперед на один символ"
 
-#: src/global.c:558
+#: src/global.c:566
 msgid "Go back one word"
 msgstr "Назад на одне слово"
 
-#: src/global.c:559
+#: src/global.c:567
 msgid "Go forward one word"
 msgstr "Вперед на одне слово"
 
-#: src/global.c:561
+#: src/global.c:569
 msgid "Go to previous line"
 msgstr "Повернутися до попереднього рядка"
 
-#: src/global.c:562
+#: src/global.c:570
 msgid "Go to next line"
 msgstr "Перейти до наступного рядка"
 
-#: src/global.c:563
+#: src/global.c:571
 msgid "Go to beginning of current line"
 msgstr "Перейти до початку рядка"
 
-#: src/global.c:564
+#: src/global.c:572
 msgid "Go to end of current line"
 msgstr "Перейти до кінця рядка"
 
-#: src/global.c:567
+#: src/global.c:575
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "На початок поточного абзацу; потім наступного абзацу"
 
-#: src/global.c:569
+#: src/global.c:577
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr "У кінець поточного абзацу; потім наступного абзацу"
 
-#: src/global.c:571
+#: src/global.c:579
 msgid "Go to the first line of the file"
 msgstr "Перейти до першого рядка файла"
 
-#: src/global.c:572
+#: src/global.c:580
 msgid "Go to the last line of the file"
 msgstr "Перейти до останнього рядка файла"
 
-#: src/global.c:574
+#: src/global.c:582
 msgid "Go to the matching bracket"
 msgstr "Перейти до відповідної дужки"
 
-#: src/global.c:576
+#: src/global.c:584
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "Гортати на один рядок вгору без переміщення курсора"
 
-#: src/global.c:578
+#: src/global.c:586
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "Гортати на один рядок вниз без переміщення курсора"
 
-#: src/global.c:581
+#: src/global.c:589
 msgid "Switch to the previous file buffer"
 msgstr "Перемкнутися на попередній файловий буфер"
 
-#: src/global.c:582
+#: src/global.c:590
 msgid "Switch to the next file buffer"
 msgstr "Перемкнутися на наступний файловий буфер"
 
-#: src/global.c:584
+#: src/global.c:592
 msgid "Insert the next keystroke verbatim"
 msgstr "Вставити наступну комбінацію клавіш як є"
 
-#: src/global.c:585
+#: src/global.c:593
 msgid "Insert a tab at the cursor position"
 msgstr "Вставити знак табуляції в місце розташування курсора"
 
-#: src/global.c:586
+#: src/global.c:594
 msgid "Insert a newline at the cursor position"
 msgstr "Вставити новий рядок у місці розташування курсора"
 
-#: src/global.c:587
+#: src/global.c:595
 msgid "Delete the character under the cursor"
 msgstr "Видалити літеру під курсором"
 
-#: src/global.c:589
+#: src/global.c:597
 msgid "Delete the character to the left of the cursor"
 msgstr "Видалити літеру зліва від курсора"
 
-#: src/global.c:592
+#: src/global.c:600
 msgid "Cut backward from cursor to word start"
 msgstr "Вирізати назад від курсора до початку слова"
 
-#: src/global.c:594
+#: src/global.c:602
 msgid "Cut forward from cursor to next word start"
 msgstr "Вирізати вперед від курсора до початку слова"
 
-#: src/global.c:596
+#: src/global.c:604
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Вирізати від позиції курсора до кінця файла"
 
-#: src/global.c:599
+#: src/global.c:607
 msgid "Justify the entire file"
 msgstr "Вирівняти цілий файл"
 
-#: src/global.c:603
+#: src/global.c:611
 msgid "Count the number of words, lines, and characters"
 msgstr "Підрахувати кількість слів, рядків та символів"
 
-#: src/global.c:606
+#: src/global.c:614
 msgid "Refresh (redraw) the current screen"
 msgstr "Перемалювати поточний екран"
 
-#: src/global.c:608
+#: src/global.c:616
 msgid "Suspend the editor (if suspension is enabled)"
 msgstr "Призупинити редактор (якщо увімкнено призупинення)"
 
-#: src/global.c:610
+#: src/global.c:618
 msgid "Save file without prompting"
 msgstr "Зберегти файл без запитань"
 
-#: src/global.c:611
+#: src/global.c:619
 msgid "Search next occurrence backward"
 msgstr "Шукати відповідник у напрямку до початку"
 
-#: src/global.c:612
+#: src/global.c:620
 msgid "Search next occurrence forward"
 msgstr "Шукати відповідник у напрямку до кінця"
 
-#: src/global.c:614
+#: src/global.c:622
 msgid "Toggle the case sensitivity of the search"
 msgstr "Увімкнути/вимкнути чутливість пошуку до регістру"
 
-#: src/global.c:616
+#: src/global.c:624
 msgid "Reverse the direction of the search"
 msgstr "Змінити напрямок пошуку на протилежний"
 
-#: src/global.c:620
+#: src/global.c:628
 msgid "Toggle the use of regular expressions"
 msgstr "Увімкнути/вимкнути використання формальних виразів"
 
-#: src/global.c:624
+#: src/global.c:632
 msgid "Recall the previous search/replace string"
 msgstr "Згадати попередній рядок пошуку/заміни"
 
-#: src/global.c:626
+#: src/global.c:634
 msgid "Recall the next search/replace string"
 msgstr "Згадати наступний рядок пошуку/заміни"
 
-#: src/global.c:629
+#: src/global.c:637
 msgid "Go to file browser"
 msgstr "До переглядача файлів"
 
-#: src/global.c:632
+#: src/global.c:640
 msgid "Toggle the use of DOS format"
 msgstr "Увімкнути/вимкнути використання формату DOS"
 
-#: src/global.c:633
+#: src/global.c:641
 msgid "Toggle the use of Mac format"
 msgstr "Увімкнути/вимкнути використання формату Mac"
 
-#: src/global.c:634
+#: src/global.c:642
 msgid "Toggle appending"
 msgstr "Увімкнути/вимкнути додавання до кінця"
 
-#: src/global.c:635
+#: src/global.c:643
 msgid "Toggle prepending"
 msgstr "Увімкнути/вимкнути додавання до початку"
 
-#: src/global.c:636
+#: src/global.c:644
 msgid "Toggle backing up of the original file"
 msgstr "Увімкнути/вимкнути резервне копіювання початкового файла"
 
-#: src/global.c:637
+#: src/global.c:645
 msgid "Execute external command"
 msgstr "Виконати зовнішню команду"
 
-#: src/global.c:639
+#: src/global.c:647
 msgid "Close buffer without saving it"
 msgstr "Закрити буфер без його збереження"
 
-#: src/global.c:641
+#: src/global.c:649
 msgid "Toggle the use of a new buffer"
 msgstr "Увімкнути/вимкнути використання нового буферу"
 
-#: src/global.c:644
+#: src/global.c:652
 msgid "Exit from the file browser"
 msgstr "Вийти з переглядача файлів"
 
-#: src/global.c:645
+#: src/global.c:653
 msgid "Go to the first file in the list"
 msgstr "Перейти до першого файла у списку"
 
-#: src/global.c:646
+#: src/global.c:654
 msgid "Go to the last file in the list"
 msgstr "Перейти до останнього файла у списку"
 
-#: src/global.c:647
+#: src/global.c:655
 msgid "Go to the previous file in the list"
 msgstr "Перейти до попереднього файла у списку"
 
-#: src/global.c:648
+#: src/global.c:656
 msgid "Go to the next file in the list"
 msgstr "Перейти до наступного файла у списку"
 
-#: src/global.c:649
+#: src/global.c:657
 msgid "Go to directory"
 msgstr "До каталогу"
 
-#: src/global.c:652
+#: src/global.c:660
 msgid "Invoke the linter, if available"
 msgstr "Викликати linter, якщо доступний"
 
-#: src/global.c:653
+#: src/global.c:661
 msgid "Go to previous linter msg"
 msgstr "До попереднього пов. linter"
 
-#: src/global.c:654
+#: src/global.c:662
 msgid "Go to next linter msg"
 msgstr "Перейти до наступного повідомлення linter"
 
-#: src/global.c:656
+#: src/global.c:664
 msgid "Invoke formatter, if available"
 msgstr "Викликати formatter, якщо доступний"
 
 #. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:671
+#: src/global.c:679
 msgid "Get Help"
 msgstr "Довідка"
 
-#: src/global.c:674 src/prompt.c:858
+#: src/global.c:682 src/prompt.c:855
 msgid "Cancel"
 msgstr "Скасувати"
 
-#: src/global.c:687
+#: src/global.c:695
 msgid "Write Out"
 msgstr "Виписати"
 
-#: src/global.c:723
+#: src/global.c:731
 msgid "Go To Dir"
 msgstr "До каталогу"
 
-#: src/global.c:738
+#: src/global.c:746
 msgid "Cut Text"
 msgstr "Вирізати"
 
-#: src/global.c:753
+#: src/global.c:761
 msgid "To Spell"
 msgstr "Правопис"
 
-#: src/global.c:757
+#: src/global.c:765
 msgid "To Linter"
 msgstr "До linter"
 
-#: src/global.c:760
+#: src/global.c:768
 msgid "Formatter"
 msgstr "Formatter"
 
-#: src/global.c:767
+#: src/global.c:775
 msgid "Case Sens"
 msgstr "РегЗалеж"
 
-#: src/global.c:772
+#: src/global.c:780
 msgid "Regexp"
 msgstr "ФормВир"
 
-#: src/global.c:777
+#: src/global.c:785
 msgid "Backwards"
 msgstr "Назад"
 
-#: src/global.c:784
+#: src/global.c:792
 msgid "No Replace"
 msgstr "Не Заміщати"
 
-#: src/global.c:792
+#: src/global.c:800
 msgid "Cur Pos"
 msgstr "Позиція"
 
-#: src/global.c:807
+#: src/global.c:815
 msgid "First Line"
 msgstr "Перший Рядок"
 
-#: src/global.c:809
+#: src/global.c:817
 msgid "Last Line"
 msgstr "Останній Рядок"
 
-#: src/global.c:816
+#: src/global.c:824
 msgid "To Bracket"
 msgstr "До дужки"
 
-#: src/global.c:819
+#: src/global.c:827
 msgid "Mark Text"
 msgstr "Помітити"
 
-#: src/global.c:822
+#: src/global.c:830
 msgid "Copy Text"
 msgstr "Скопіювати текст"
 
-#: src/global.c:825
+#: src/global.c:833
 msgid "Indent Text"
 msgstr "Відступ"
 
-#: src/global.c:827
+#: src/global.c:835
 msgid "Unindent Text"
 msgstr "СкасВідст"
 
-#: src/global.c:830
+#: src/global.c:838
 msgid "Undo"
 msgstr "Скасувати"
 
-#: src/global.c:832
+#: src/global.c:840
 msgid "Redo"
 msgstr "Повторити"
 
-#: src/global.c:836 src/global.c:842
+#: src/global.c:844 src/global.c:850
 msgid "Back"
 msgstr "Назад"
 
-#: src/global.c:838 src/global.c:844
+#: src/global.c:846 src/global.c:852
 msgid "Forward"
 msgstr "Вперед"
 
-#: src/global.c:849
+#: src/global.c:857
 msgid "Prev Word"
 msgstr "ПопСлово"
 
-#: src/global.c:851
+#: src/global.c:859
 msgid "Next Word"
 msgstr "НастСлово"
 
-#: src/global.c:855
+#: src/global.c:863
 msgid "Home"
 msgstr "Початок"
 
-#: src/global.c:857
+#: src/global.c:865
 msgid "End"
 msgstr "Кінець"
 
-#: src/global.c:866
+#: src/global.c:874
 msgid "Beg of Par"
 msgstr "Поч.абзацу"
 
-#: src/global.c:868
+#: src/global.c:876
 msgid "End of Par"
 msgstr "Кін.абзацу"
 
-#: src/global.c:873
+#: src/global.c:881
 msgid "Scroll Up"
 msgstr "Гортати вгору"
 
-#: src/global.c:875
+#: src/global.c:883
 msgid "Scroll Down"
 msgstr "Гортати вниз"
 
-#: src/global.c:880
+#: src/global.c:888
 msgid "Prev File"
 msgstr "Поп. файл"
 
-#: src/global.c:882
+#: src/global.c:890
 msgid "Next File"
 msgstr "Наступний файл"
 
-#: src/global.c:891
+#: src/global.c:899
 msgid "Verbatim"
 msgstr "Буквально"
 
-#: src/global.c:894
+#: src/global.c:902
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:896
+#: src/global.c:904
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:899
+#: src/global.c:907
 msgid "Delete"
 msgstr "Delete"
 
-#: src/global.c:901
+#: src/global.c:909
 msgid "Backspace"
 msgstr "Backspace"
 
 #. TRANSLATORS: The next two strings refer to cutting words.
-#: src/global.c:912
+#: src/global.c:920
 msgid "Cut Left"
 msgstr "Вирізати ліворуч"
 
-#: src/global.c:914
+#: src/global.c:922
 msgid "Cut Right"
 msgstr "Вирізати праворуч"
 
-#: src/global.c:916
+#: src/global.c:924
 msgid "CutTillEnd"
 msgstr "ВирДоКінця"
 
-#: src/global.c:926
+#: src/global.c:934
 msgid "Word Count"
 msgstr "Кількість слів"
 
-#: src/global.c:933
+#: src/global.c:941
 msgid "Suspend"
 msgstr "Призупинка -"
 
-#: src/global.c:937
+#: src/global.c:945
+#, fuzzy
+msgid "Comment Lines"
+msgstr "НастРядок"
+
+#: src/global.c:949
 msgid "Save"
 msgstr "Зберегти"
 
-#: src/global.c:940
+#: src/global.c:952
 msgid "Previous"
 msgstr "Назад"
 
-#: src/global.c:942
+#: src/global.c:954
 msgid "Next"
 msgstr "Далі"
 
-#: src/global.c:948
+#: src/global.c:960
 msgid "PrevHstory"
 msgstr "ПопЖурнал"
 
-#: src/global.c:951
+#: src/global.c:963
 msgid "NextHstory"
 msgstr "НастЖурнал"
 
-#: src/global.c:955
+#: src/global.c:972
 msgid "Go To Text"
 msgstr "До тексту"
 
-#: src/global.c:959
+#: src/global.c:976
 msgid "DOS Format"
 msgstr "формат DOS"
 
-#: src/global.c:961
+#: src/global.c:978
 msgid "Mac Format"
 msgstr "формат Mac"
 
-#: src/global.c:969
+#: src/global.c:986
 msgid "Append"
 msgstr "Додати"
 
-#: src/global.c:971
+#: src/global.c:988
 msgid "Prepend"
 msgstr "Додати(0)"
 
-#: src/global.c:974
+#: src/global.c:991
 msgid "Backup File"
 msgstr "Зробити резервну копію"
 
-#: src/global.c:981
+#: src/global.c:998
 msgid "Execute Command"
 msgstr "Виконати команду"
 
-#: src/global.c:996
+#: src/global.c:1013
 msgid "To Files"
 msgstr "До Файлів"
 
-#: src/global.c:1004
+#: src/global.c:1021
 msgid "First File"
 msgstr "Перший файл"
 
-#: src/global.c:1006
+#: src/global.c:1023
 msgid "Last File"
 msgstr "Ост. файл"
 
-#: src/global.c:1010
+#: src/global.c:1027
 msgid "Discard buffer"
 msgstr "Відкинути буфер"
 
+#: src/global.c:1038
+msgid "Left Column"
+msgstr ""
+
+#: src/global.c:1040
+msgid "Right Column"
+msgstr ""
+
 #. TRANSLATORS: Try to keep the next two strings at most 20 characters.
-#: src/global.c:1020
+#: src/global.c:1047
 msgid "Prev Lint Msg"
 msgstr "Поп. пов. lint"
 
-#: src/global.c:1022
+#: src/global.c:1049
 msgid "Next Lint Msg"
 msgstr "Наст. пов. lint"
 
 #. TRANSLATORS: The next seventeen strings are toggle descriptions;
 #. * they are best kept shorter than 40 characters, but may be longer.
-#: src/global.c:1285
+#: src/global.c:1316
 msgid "Help mode"
 msgstr "Режим довідки"
 
-#: src/global.c:1287
+#: src/global.c:1318
 msgid "Constant cursor position display"
 msgstr "Постійно показувати місце розташування курсора"
 
-#: src/global.c:1289
+#: src/global.c:1320
 msgid "Use of one more line for editing"
 msgstr "Використання додаткового рядка для редагування"
 
-#: src/global.c:1291
+#: src/global.c:1322
 msgid "Smooth scrolling"
 msgstr "Плавна прокрутка"
 
-#: src/global.c:1293
+#: src/global.c:1324
 msgid "Soft wrapping of overlong lines"
 msgstr "М’яке перенесення надто довгих рядків"
 
-#: src/global.c:1295
+#: src/global.c:1326
 msgid "Whitespace display"
 msgstr "Показ пробілів"
 
-#: src/global.c:1297
+#: src/global.c:1328
 msgid "Color syntax highlighting"
 msgstr "Підсвічування синтаксису кольором"
 
-#: src/global.c:1299
+#: src/global.c:1330
 msgid "Smart home key"
 msgstr "Розумна клавіша Home"
 
-#: src/global.c:1301
+#: src/global.c:1332
 msgid "Auto indent"
 msgstr "Автовідступ"
 
-#: src/global.c:1303
+#: src/global.c:1334
 msgid "Cut to end"
 msgstr "Вирізати до кінця"
 
-#: src/global.c:1305
+#: src/global.c:1336
 msgid "Hard wrapping of overlong lines"
 msgstr "Жорстке перенесення надзвичайно довгих рядків"
 
-#: src/global.c:1307
+#: src/global.c:1338
 msgid "Conversion of typed tabs to spaces"
 msgstr "Перетворення знаків табуляції на пробіли"
 
-#: src/global.c:1309
+#: src/global.c:1340
 msgid "Backup files"
 msgstr "Резервні копії"
 
-#: src/global.c:1311
+#: src/global.c:1342
 msgid "Reading file into separate buffer"
 msgstr "Читаємо файл до окремого буфера"
 
-#: src/global.c:1313
+#: src/global.c:1344
 msgid "Mouse support"
 msgstr "Підтримка миші"
 
-#: src/global.c:1315
+#: src/global.c:1346
 msgid "No conversion from DOS/Mac format"
 msgstr "Нема перетворювання із DOS/Mac формату"
 
-#: src/global.c:1317
+#: src/global.c:1348
 msgid "Suspension"
 msgstr "Призупинення"
 
-#: src/help.c:209
+#: src/help.c:211
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1194,7 +1190,7 @@ msgstr ""
 "пошуку. Якщо ви натиснете Enter не ввівши жодного тексту, буде здійснено "
 "пошук попереднього шуканого рядка.  "
 
-#: src/help.c:218
+#: src/help.c:220
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1208,7 +1204,7 @@ msgstr ""
 " У режимі пошуку доступні такі функціональні клавіші:\n"
 "\n"
 
-#: src/help.c:224
+#: src/help.c:226
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1228,7 +1224,7 @@ msgstr ""
 " У режимі До_рядка можна скористатися такими функціональними клавішами:\n"
 "\n"
 
-#: src/help.c:233
+#: src/help.c:235
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1249,7 +1245,7 @@ msgstr ""
 " Попередній рядок пошуку буде показано у дужках після запрошення 'Пошук:'. "
 "Натиснення Enter без редагування тексту продовжить попередній пошук.  "
 
-#: src/help.c:242
+#: src/help.c:244
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1264,7 +1260,7 @@ msgstr ""
 "клавішами:\n"
 "\n"
 
-#: src/help.c:248
+#: src/help.c:250
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1293,7 +1289,7 @@ msgstr ""
 "клавішами:\n"
 "\n"
 
-#: src/help.c:262
+#: src/help.c:264
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1319,7 +1315,7 @@ msgstr ""
 "клавішами:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:277
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1342,7 +1338,7 @@ msgstr ""
 "Натиснення Enter без редагування тексту продовжить попередній пошук.\n"
 "\n"
 
-#: src/help.c:284
+#: src/help.c:286
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1350,7 +1346,7 @@ msgstr ""
 " В режимі пошуку можна скористатися такими функціональними клавішами:\n"
 "\n"
 
-#: src/help.c:288
+#: src/help.c:290
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1373,7 +1369,7 @@ msgstr ""
 "клавішами:\n"
 "\n"
 
-#: src/help.c:301
+#: src/help.c:303
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1397,7 +1393,7 @@ msgstr ""
 "клавішами:\n"
 "\n"
 
-#: src/help.c:316
+#: src/help.c:318
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1418,7 +1414,7 @@ msgstr ""
 " Наступні функціональні клавіші доступні у режимі Зовнішня Команда:\n"
 "\n"
 
-#: src/help.c:329
+#: src/help.c:331
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1438,15 +1434,15 @@ msgstr ""
 "головне вікно редагування, у якому  показано редагований файл. Рядок стану — "
 "3 рядок знизу — містить різні важливі повідомлення.  "
 
-#: src/help.c:339
+#: src/help.c:341
+#, fuzzy
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
-" The notation for shortcuts is as follows: Control-key sequences are notated "
-"with a caret (^) symbol and can be entered either by using the Control "
-"(Ctrl) key or pressing the Escape (Esc) key twice.  Escape-key sequences are "
-"notated with the Meta (M-) symbol and can be entered using either the Esc, "
-"Alt, or Meta key depending on your keyboard setup.  "
+" Shortcuts are written as follows: Control-key sequences are notated with a "
+"'^' and can be entered either by using the Ctrl key or pressing the Esc key "
+"twice.  Meta-key sequences are notated with 'M-' and can be entered using "
+"either the Alt, Cmd, or Esc key, depending on your keyboard setup.  "
 msgstr ""
 "Два рядки знизу показують найчастіше використовувані комбінації клавіш.\n"
 "\n"
@@ -1474,19 +1470,19 @@ msgstr ""
 msgid "enable/disable"
 msgstr "дозволити/заборонити"
 
-#: src/nano.c:559
+#: src/nano.c:560
 msgid "Key is invalid in view mode"
 msgstr "Некоректна клавіша у режимі перегляду"
 
-#: src/nano.c:565
+#: src/nano.c:566
 msgid "This function is disabled in restricted mode"
 msgstr "Цю функцію вимкнено у обмеженому режимі"
 
-#: src/nano.c:573
+#: src/nano.c:574
 msgid "Help is not available"
 msgstr "Довідка недоступна"
 
-#: src/nano.c:684
+#: src/nano.c:686
 #, c-format
 msgid ""
 "\n"
@@ -1495,7 +1491,7 @@ msgstr ""
 "\n"
 "Буфер записано до %s\n"
 
-#: src/nano.c:686
+#: src/nano.c:688
 #, c-format
 msgid ""
 "\n"
@@ -1504,7 +1500,7 @@ msgstr ""
 "\n"
 "Буфер не записано до %s: %s\n"
 
-#: src/nano.c:689
+#: src/nano.c:691
 #, c-format
 msgid ""
 "\n"
@@ -1766,17 +1762,22 @@ msgstr "Дозволити призупинення"
 msgid "Enable soft line wrapping"
 msgstr "Увімкнути м’яке перенесення рядків"
 
-#: src/nano.c:937
-#, c-format
-msgid " GNU nano, version %s\n"
+#: src/nano.c:940
+#, fuzzy, c-format
+msgid " nano, version %s\n"
 msgstr " GNU nano версії %s\n"
 
-#: src/nano.c:940
+#: src/nano.c:943
+#, c-format
+msgid " (C) 2014..%s the contributors to nano\n"
+msgstr ""
+
+#: src/nano.c:945
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr " Ел. пошта: nano@nano-editor.org\tІнтернет: http://www.nano-editor.org"
 
-#: src/nano.c:941
+#: src/nano.c:946
 #, c-format
 msgid ""
 "\n"
@@ -1785,67 +1786,82 @@ msgstr ""
 "\n"
 " Зібрано з таким параметрами:"
 
-#: src/nano.c:1073
+#: src/nano.c:1081
 msgid "No file name"
 msgstr "Немає назви файла"
 
-#: src/nano.c:1108
-msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
-msgstr "Зберегти змінений буфер (Відповідь «Ні» СКАСУЄ ВСІ ЗМІНИ)? "
+#: src/nano.c:1115
+msgid "Save modified buffer?  (Answering \"No\" will DISCARD changes.) "
+msgstr ""
 
-#: src/nano.c:1168
+#: src/nano.c:1178
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "Не вдалося повторно відкрити стандартний ввід з клавіатури\n"
 
-#: src/nano.c:1192
+#: src/nano.c:1202
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "Читання зі стандартного вводу. ^C для переривання\n"
 
-#: src/nano.c:1256
+#: src/nano.c:1266
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Прийнято SIGHUP або SIGTERM\n"
 
-#: src/nano.c:1272
+#: src/nano.c:1282
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Використовуйте «fg» для повернення у nano\n"
 
-#: src/nano.c:1294
+#: src/nano.c:1304
 msgid "Suspension is not enabled"
 msgstr "Призупинення не увімкнено"
 
-#: src/nano.c:1448
+#: src/nano.c:1459
 msgid "enabled"
 msgstr "дозволено"
 
-#: src/nano.c:1448
+#: src/nano.c:1459
 msgid "disabled"
 msgstr "заборонено"
 
-#: src/nano.c:1607 src/winio.c:1125
-msgid "Unknown Command"
-msgstr "Невідома команда"
+#: src/nano.c:1573
+msgid "Unbound key"
+msgstr ""
+
+#: src/nano.c:1577
+#, c-format
+msgid "Unbound key: M-%c"
+msgstr ""
 
-#: src/nano.c:1720
+#: src/nano.c:1579
+#, c-format
+msgid "Unbound key: ^%c"
+msgstr ""
+
+#: src/nano.c:1581
+#, c-format
+msgid "Unbound key: %c"
+msgstr ""
+
+#: src/nano.c:1745
 msgid "XON ignored, mumble mumble"
 msgstr "XON проігноровано, мр-бр-бр"
 
-#: src/nano.c:1725
+#: src/nano.c:1750
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF проігноровано, мр-бр-бр"
 
-#: src/nano.c:2139 src/rcfile.c:1334
+#: src/nano.c:2166 src/rcfile.c:1187
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Запитаний розмір табуляції «%s» не підходить"
 
-#: src/nano.c:2200 src/rcfile.c:1259
+#: src/nano.c:2227 src/rcfile.c:1128
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Запитаний некоректний розмір заповнення \"%s\""
 
-#: src/nano.c:2247
+#: src/nano.c:2276
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr "Введіть команду «%s -h», щоб отримати список доступних параметрів.\n"
@@ -1853,117 +1869,121 @@ msgstr "Введіть команду «%s -h», щоб отримати спи
 #. TRANSLATORS: For the next three strings, if possible, specify
 #. * the single-byte shortcuts for both your language and English.
 #. * For example, in French: "OoYy" for "Oui".
-#: src/prompt.c:821
+#: src/prompt.c:818
 msgid "Yy"
 msgstr "YyТт"
 
-#: src/prompt.c:822
+#: src/prompt.c:819
 msgid "Nn"
 msgstr "NnНн"
 
-#: src/prompt.c:823
+#: src/prompt.c:820
 msgid "Aa"
 msgstr "AaВв"
 
-#: src/prompt.c:845
+#: src/prompt.c:842
 msgid "Yes"
 msgstr "Так"
 
-#: src/prompt.c:850
+#: src/prompt.c:847
 msgid "All"
 msgstr "Все"
 
-#: src/prompt.c:855
+#: src/prompt.c:852
 msgid "No"
 msgstr "Ні"
 
-#: src/rcfile.c:142
+#: src/rcfile.c:144
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Помилка в %s на рядку %lu: "
 
-#: src/rcfile.c:201
+#: src/rcfile.c:203
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "Аргумент %s має незакриту \""
 
-#: src/rcfile.c:228 src/rcfile.c:280 src/rcfile.c:732 src/rcfile.c:793
-#: src/rcfile.c:882 src/rcfile.c:933
+#: src/rcfile.c:231 src/rcfile.c:674 src/rcfile.c:725 src/rcfile.c:824
 msgid "Regex strings must begin and end with a \" character"
 msgstr ""
 "Рядки регулярних виразів повинні починатися та закінчуватися лапками (\")"
 
-#: src/rcfile.c:254 src/search.c:62
+#: src/rcfile.c:257 src/search.c:61
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Не вірний регулярний вираз \"%s\": %s"
 
-#: src/rcfile.c:274
+#: src/rcfile.c:279
 msgid "Missing syntax name"
 msgstr "Відсутня назва синтаксису"
 
-#: src/rcfile.c:345
+#: src/rcfile.c:288
+msgid "A syntax name must be quoted"
+msgstr ""
+
+#: src/rcfile.c:297
 msgid "The \"none\" syntax is reserved"
 msgstr "Синтаксис «none» зарезервовано"
 
-#: src/rcfile.c:352
-msgid "The \"default\" syntax must take no extensions"
+#: src/rcfile.c:327
+#, fuzzy
+msgid "The \"default\" syntax does not accept extensions"
 msgstr "Синтаксис \"default\" не може мати розширень"
 
-#: src/rcfile.c:424
+#: src/rcfile.c:369
 msgid "Missing key name"
 msgstr "Відсутня назва клавіші"
 
-#: src/rcfile.c:433 src/rcfile.c:444
+#: src/rcfile.c:378 src/rcfile.c:389
 msgid "Key name is too short"
 msgstr "Назва клавіші є надто короткою"
 
-#: src/rcfile.c:454
+#: src/rcfile.c:399
 msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr "Назва клавіші має починатися з «^», «M» або «F»"
 
-#: src/rcfile.c:457
+#: src/rcfile.c:402
 #, c-format
 msgid "Key name %s is invalid"
 msgstr "Назва ключа %s є некоректною"
 
-#: src/rcfile.c:466
+#: src/rcfile.c:411
 msgid "Must specify a function to bind the key to"
 msgstr "Для прив’язування клавіші слід вказати функцію"
 
 #. TRANSLATORS: Do not translate the word "all".
-#: src/rcfile.c:476
+#: src/rcfile.c:421
 msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
 "Слід вказати меню (або «all»), до якого слід прив’язати клавішу або "
 "відв’язати її"
 
-#: src/rcfile.c:483
+#: src/rcfile.c:428
 #, c-format
 msgid "Cannot map name \"%s\" to a function"
 msgstr "Не можна пов’язати назву «%s» з функцією"
 
-#: src/rcfile.c:490
+#: src/rcfile.c:435
 #, c-format
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "Неможливо пов’язати назву «%s» з меню"
 
-#: src/rcfile.c:522
+#: src/rcfile.c:467
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr "У меню «%2$s» немає пункту «%1$s»"
 
-#: src/rcfile.c:534
+#: src/rcfile.c:479
 #, c-format
 msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "Вибачте, призначення «%s» змінювати не можна"
 
-#: src/rcfile.c:631
+#: src/rcfile.c:576
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr "Помилка під час розгортання %s: %s"
 
-#: src/rcfile.c:674
+#: src/rcfile.c:616
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1978,62 +1998,50 @@ msgstr ""
 "«black», з необов’язковим  префіксом «bright»\n"
 "для кольору тла."
 
-#: src/rcfile.c:696
-msgid "Cannot add a color command without a syntax command"
-msgstr "Не вдається додати команду кольору без команди синтаксису"
+#: src/rcfile.c:637 src/rcfile.c:795 src/rcfile.c:858
+#, c-format
+msgid "A '%s' command requires a preceding 'syntax' command"
+msgstr ""
 
-#: src/rcfile.c:701
+#: src/rcfile.c:643
 msgid "Missing color name"
 msgstr "Відсутня назва кольору"
 
-#: src/rcfile.c:711 src/rcfile.c:872
-msgid "Missing regex string"
-msgstr "Не вказано регулярний вираз"
+#: src/rcfile.c:653 src/rcfile.c:807
+#, fuzzy, c-format
+msgid "Missing regex string after '%s' command"
+msgstr "Не вистачає програми linter"
 
-#: src/rcfile.c:787
+#: src/rcfile.c:719
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\" потребує відповідного \"end=\""
 
-#: src/rcfile.c:839
+#: src/rcfile.c:768
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
 msgstr "Колір тла \"%s\" не може бути світлим"
 
-#: src/rcfile.c:867
-msgid "Cannot add a header regex without a syntax command"
-msgstr "Не вдається додати рег. вираз заголовку без команди синтаксису"
-
-#: src/rcfile.c:922
-msgid "Cannot add a magic string regex without a syntax command"
-msgstr ""
-"Не вдалося додати формальний вираз контрольного рядка без команди синтаксису"
-
-#: src/rcfile.c:927
-msgid "Missing magic string name"
-msgstr "Не вистачає назви контрольного рядка"
-
-#: src/rcfile.c:985
-msgid "Cannot add a linter without a syntax command"
-msgstr "Не можна додавати linter без команди синтаксису"
+#: src/rcfile.c:802
+#, fuzzy, c-format
+msgid "The \"default\" syntax does not accept '%s' regexes"
+msgstr "Синтаксис \"default\" не може мати розширень"
 
-#: src/rcfile.c:990
-msgid "Missing linter command"
+#: src/rcfile.c:863
+#, fuzzy, c-format
+msgid "Missing command after '%s'"
 msgstr "Не вистачає програми linter"
 
-#: src/rcfile.c:1011
-msgid "Cannot add formatter without a syntax command"
-msgstr "Не можна додавати formatter без команди синтаксису"
-
-#: src/rcfile.c:1016
-msgid "Missing formatter command"
-msgstr "Не вистачає програми formatter"
+#: src/rcfile.c:879
+#, fuzzy, c-format
+msgid "Argument of '%s' lacks closing \""
+msgstr "Аргумент %s має незакриту \""
 
-#: src/rcfile.c:1046
+#: src/rcfile.c:910
 #, c-format
 msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr "Критична помилка: з функцією «%s» не пов’язано клавіш. Виходимо.\n"
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:912
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
@@ -2041,62 +2049,62 @@ msgstr ""
 "Якщо потрібно, скористайтеся nano з параметром -I, щоб скоригувати параметри "
 "у nanorc.\n"
 
-#: src/rcfile.c:1109
+#: src/rcfile.c:971
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "Не вдалося знайти синтаксичну конструкцію «%s» для розширення"
 
-#: src/rcfile.c:1125 src/rcfile.c:1134 src/rcfile.c:1144
-#, c-format
-msgid "Command \"%s\" not allowed in included file"
-msgstr "Команда \"%s\" не дозволена у включеному файлі"
-
-#: src/rcfile.c:1150 src/rcfile.c:1359
+#: src/rcfile.c:993 src/rcfile.c:1202
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Синтаксис \"%s\" не має колірних команд"
 
-#: src/rcfile.c:1180
+#: src/rcfile.c:1024
+#, c-format
+msgid "Command \"%s\" not allowed in included file"
+msgstr "Команда \"%s\" не дозволена у включеному файлі"
+
+#: src/rcfile.c:1039
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Не зрозуміла команда \"%s\""
 
-#: src/rcfile.c:1195
+#: src/rcfile.c:1051
 msgid "Missing option"
 msgstr "Пропущено параметр"
 
-#: src/rcfile.c:1217
+#: src/rcfile.c:1065
+#, c-format
+msgid "Unknown option \"%s\""
+msgstr "Невідомий параметр «%s»"
+
+#: src/rcfile.c:1077
+#, c-format
+msgid "Cannot unset option \"%s\""
+msgstr "Неможливо скасувати визначення параметра «%s»"
+
+#: src/rcfile.c:1089
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Опція \"%s\" вимагає аргумент"
 
-#: src/rcfile.c:1235
+#: src/rcfile.c:1105
 msgid "Option is not a valid multibyte string"
 msgstr "Опція не є припустимим багатобайтовим рядком"
 
-#: src/rcfile.c:1272 src/rcfile.c:1300 src/rcfile.c:1309
+#: src/rcfile.c:1139 src/rcfile.c:1160 src/rcfile.c:1167
 msgid "Non-blank characters required"
 msgstr "Вимагається непорожній символ"
 
-#: src/rcfile.c:1282
+#: src/rcfile.c:1146
 msgid "Two single-column characters required"
 msgstr "Вимагається два одинарних символи"
 
-#: src/rcfile.c:1348
-#, c-format
-msgid "Cannot unset option \"%s\""
-msgstr "Неможливо скасувати визначення параметра «%s»"
-
-#: src/rcfile.c:1354
-#, c-format
-msgid "Unknown option \"%s\""
-msgstr "Невідомий параметр «%s»"
-
-#: src/rcfile.c:1413
+#: src/rcfile.c:1258
 msgid "I can't find my home directory!  Wah!"
 msgstr "Я не можу знайти свою домівку! Жах!"
 
-#: src/rcfile.c:1451
+#: src/rcfile.c:1295
 #, c-format
 msgid ""
 "\n"
@@ -2105,44 +2113,49 @@ msgstr ""
 "\n"
 "Натисніть Enter, щоб продовжити завантаження nano.\n"
 
-#: src/search.c:96
+#: src/search.c:95
 #, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "\"%.*s%s\" не знайдено"
 
 #. TRANSLATORS: The next three strings are modifiers of the search prompt.
-#: src/search.c:176
+#: src/search.c:169
 msgid " [Case Sensitive]"
 msgstr " [РегЗалеж]"
 
-#: src/search.c:180
+#: src/search.c:173
 msgid " [Regexp]"
 msgstr " [ФормВир]"
 
-#: src/search.c:184
+#: src/search.c:177
 msgid " [Backwards]"
 msgstr " [Назад]"
 
 #. TRANSLATORS: The next two strings are modifiers of the search prompt.
-#: src/search.c:189
+#: src/search.c:182
 msgid " (to replace) in selection"
 msgstr " (що змінювати) у позначеному"
 
-#: src/search.c:191
+#: src/search.c:184
 msgid " (to replace)"
 msgstr " (до заміни)"
 
+#: src/search.c:305
+#, fuzzy
+msgid "Searching..."
+msgstr "Пошук"
+
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:718
+#: src/search.c:693
 msgid "Replace this instance?"
 msgstr "Замінити цей примірник?"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:883
+#: src/search.c:840
 msgid "Replace with"
 msgstr "Замінити на"
 
-#: src/search.c:924
+#: src/search.c:875
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
@@ -2151,299 +2164,409 @@ msgstr[1] "Замінено %lu збіги"
 msgstr[2] "Замінено %lu збігів"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:964
+#: src/search.c:914
 msgid "Enter line number, column number"
 msgstr "Введіть номер рядка, номер ряду"
 
-#: src/search.c:991
+#: src/search.c:939
 msgid "Invalid line or column number"
 msgstr "Неправильний номер рядка або стовпчика"
 
-#: src/search.c:1124
+#: src/search.c:1080
 msgid "Not a bracket"
 msgstr "Не дужка"
 
-#: src/search.c:1191
+#: src/search.c:1146
 msgid "No matching bracket"
 msgstr "Нема відповідної дужки"
 
-#: src/text.c:54
+#: src/text.c:53
 msgid "Mark Set"
 msgstr "Мітку встановлено"
 
-#: src/text.c:58
+#: src/text.c:57
 msgid "Mark Unset"
 msgstr "Мітку знято"
 
-#: src/text.c:70
+#: src/text.c:69
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Помилка виконання \"%s\""
 
-#: src/text.c:475
-msgid "Nothing in undo buffer!"
-msgstr "Буфер скасування дій порожній!"
+#: src/text.c:468
+msgid "Commenting is not supported for this file type"
+msgstr ""
 
-#: src/text.c:481 src/text.c:634
-#, c-format
-msgid "Internal error: can't match line %d.  Please save your work."
+#: src/text.c:484
+msgid "Cannot comment past end of file"
 msgstr ""
-"Внутрішня помилка: не вдалося встановити відповідність рядка %d. Збережіть "
-"результати вашої роботи."
+
+#: src/text.c:677
+msgid "Nothing in undo buffer!"
+msgstr "Буфер скасування дій порожній!"
 
 #. TRANSLATORS: Eight of the next nine strings describe actions
 #. * that are undone or redone.  It are all nouns, not verbs.
-#: src/text.c:495 src/text.c:524 src/text.c:645 src/text.c:686
+#: src/text.c:695 src/text.c:724 src/text.c:857 src/text.c:898
 msgid "text add"
 msgstr "додавання тексту"
 
-#: src/text.c:505 src/text.c:656
+#: src/text.c:705 src/text.c:868
 msgid "text delete"
 msgstr "вилучення тексту"
 
-#: src/text.c:528 src/text.c:694
+#: src/text.c:728 src/text.c:907
 msgid "line join"
 msgstr "об’єднання рядків"
 
-#: src/text.c:547 src/text.c:710
+#: src/text.c:747 src/text.c:923
 msgid "text cut"
 msgstr "обрізка тексту"
 
-#: src/text.c:552 src/text.c:714
+#: src/text.c:752 src/text.c:927
 msgid "text uncut"
 msgstr "скасування обрізки тексту"
 
-#: src/text.c:558 src/text.c:691
+#: src/text.c:758 src/text.c:903
 msgid "Internal error: line is missing.  Please save your work."
 msgstr ""
 "Внутрішня помилка: не вистачає рядка. Збережіть результати вашої роботи."
 
-#: src/text.c:561 src/text.c:665
+#: src/text.c:762 src/text.c:877
 msgid "line break"
 msgstr "розрив рядка"
 
-#: src/text.c:569 src/text.c:725
+#: src/text.c:772 src/text.c:947
+msgid "comment"
+msgstr ""
+
+#: src/text.c:776 src/text.c:951
+msgid "uncomment"
+msgstr ""
+
+#: src/text.c:780 src/text.c:938
 msgid "text insert"
 msgstr "вставка тексту"
 
-#: src/text.c:589 src/text.c:718
+#: src/text.c:800 src/text.c:931
 msgid "text replace"
 msgstr "заміна тексту"
 
-#: src/text.c:596 src/text.c:732 src/text.c:1030 src/text.c:1174
+#: src/text.c:807 src/text.c:955 src/text.c:1267 src/text.c:1437
 msgid "Internal error: unknown type.  Please save your work."
 msgstr "Внутрішня помилка: невідомий тип. Збережіть свою роботу"
 
-#: src/text.c:601
+#: src/text.c:813
 #, c-format
 msgid "Undid action (%s)"
 msgstr "Скасована дія (%s)"
 
-#: src/text.c:619
+#: src/text.c:832
 msgid "Nothing to re-do!"
 msgstr "Немає чого повторювати!"
 
-#: src/text.c:628
+#: src/text.c:841
 msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
 "Внутрішня помилка: не вдалося налаштувати повторення дії. Збережіть "
 "результати вашої роботи."
 
-#: src/text.c:737
+#: src/text.c:961
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Повторена дія (%s)"
 
-#: src/text.c:827 src/text.c:2508 src/text.c:2944
+#: src/text.c:1051 src/text.c:2765 src/text.c:3198
 msgid "Could not create pipe"
 msgstr "Не можу створити канал (pipe)"
 
-#: src/text.c:853 src/text.c:2595 src/text.c:2750 src/text.c:2992
-#: src/text.c:3286
+#: src/text.c:1077 src/text.c:2852 src/text.c:3005 src/text.c:3246
+#: src/text.c:3540
 msgid "Could not fork"
 msgstr "Не можу зробити fork()"
 
-#: src/text.c:1853
+#: src/text.c:2117
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Поганий рядок цитування %s: %s"
 
-#: src/text.c:2241
+#: src/text.c:2499
 msgid "Can now UnJustify!"
 msgstr "Можу зараз же СкасВирівнювання!"
 
-#: src/text.c:2435
+#: src/text.c:2697
 msgid "Edit a replacement"
 msgstr "Редагувати заміну"
 
-#: src/text.c:2510
+#. TRANSLATORS: Shown after fixing misspellings in one word.
+#: src/text.c:2713
+#, fuzzy
+msgid "Next word..."
+msgstr "НастСлово"
+
+#: src/text.c:2767
 msgid "Creating misspelled word list, please wait..."
 msgstr "Створюємо перелік орфографічних помилок, зачекайте..."
 
-#: src/text.c:2601 src/text.c:2999
+#: src/text.c:2858 src/text.c:3253
 msgid "Could not get size of pipe buffer"
 msgstr "Не можу отримати розмір буферу каналу"
 
-#: src/text.c:2652
+#: src/text.c:2907
 msgid "Error invoking \"spell\""
 msgstr "Помилка виконання \"spell\""
 
-#: src/text.c:2655
+#: src/text.c:2910
 msgid "Error invoking \"sort -f\""
 msgstr "Помилка виконання \"sort -f\""
 
-#: src/text.c:2658
+#: src/text.c:2913
 msgid "Error invoking \"uniq\""
 msgstr "Помилка виконання \"uniq\""
 
-#: src/text.c:2881
+#: src/text.c:3135
 msgid "Invoking spell checker, please wait"
 msgstr "Викликаємо програму для пошуку друкарських помилок, зачекайте"
 
-#: src/text.c:2897
+#: src/text.c:3151
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Перевірка орфографії не вдалася: %s"
 
-#: src/text.c:2899
+#: src/text.c:3153
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Не вдалось перевірити орфографію: %s: %s"
 
-#: src/text.c:2902
+#: src/text.c:3156
 msgid "Finished checking spelling"
 msgstr "Перевірку орфографії завершено"
 
-#: src/text.c:2927
+#: src/text.c:3181
 msgid "No linter defined for this type of file!"
 msgstr "Для цього типу файлів не визначено обробника!"
 
-#: src/text.c:2932
+#: src/text.c:3186
 msgid "Save modified buffer before linting?"
 msgstr "Зберегти змінений буфер перед обробкою?"
 
-#: src/text.c:2949
+#: src/text.c:3203
 msgid "Invoking linter, please wait"
 msgstr "Викликаємо linter, зачекайте"
 
-#: src/text.c:3105
+#: src/text.c:3358
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr "Від команди отримано 0 придатних рядків: %s"
 
-#: src/text.c:3134
+#: src/text.c:3388
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
 "Це повідомлення пов’язано із невідкритим файлом %s. Відкрити його у новому "
 "буфері?"
 
-#: src/text.c:3153
+#: src/text.c:3407
 msgid "No more errors in unopened files, cancelling"
 msgstr "У невідкритих файлах немає більше помилок, скасовуємо дію"
 
-#: src/text.c:3192
+#: src/text.c:3446
 msgid "At last message"
 msgstr "На останньому повідомленні"
 
-#: src/text.c:3197
+#: src/text.c:3451
 msgid "At first message"
 msgstr "На першому повідомленні"
 
-#: src/text.c:3237
+#: src/text.c:3491
 msgid "Finished"
 msgstr "Завершено"
 
-#: src/text.c:3259
+#: src/text.c:3513
 msgid "Invoking formatter, please wait"
 msgstr "Викликаємо formatter, зачекайте"
 
-#: src/text.c:3314
+#: src/text.c:3568
 msgid "Finished formatting"
 msgstr "Форматування завершено"
 
-#: src/text.c:3396
+#: src/text.c:3650
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sСлів: %lu Рядків: %ld  Символів: %lu"
 
-#: src/text.c:3397
+#: src/text.c:3651
 msgid "In Selection:  "
 msgstr "У позначеному:  "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3411
+#: src/text.c:3665
 msgid "Verbatim Input"
 msgstr "Буквальний ввід"
 
-#: src/utils.c:391 src/utils.c:403
+#: src/utils.c:392 src/utils.c:404
 msgid "nano is out of memory!"
 msgstr "не вистачає вільної пам'яті для nano!"
 
+#: src/utils.c:625
+#, c-format
+msgid "Internal error: can't match line %d.  Please save your work."
+msgstr ""
+"Внутрішня помилка: не вдалося встановити відповідність рядка %d. Збережіть "
+"результати вашої роботи."
+
+#. TRANSLATORS: This refers to a sequence of escape codes
+#. * (from the keyboard) that nano does not know about.
+#: src/winio.c:1121
+msgid "Unknown sequence"
+msgstr ""
+
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
 #: src/winio.c:1427
 msgid "Unicode Input"
 msgstr "Ввід юнікод"
 
-#: src/winio.c:1991 src/winio.c:1995
-msgid "Modified"
-msgstr "Змінено"
-
-#: src/winio.c:1992
-msgid "View"
-msgstr "Вигляд"
-
-#: src/winio.c:2006
+#: src/winio.c:1960
 msgid "DIR:"
 msgstr "Кат.:"
 
-#: src/winio.c:2013
+#: src/winio.c:1968
 msgid "File:"
 msgstr "Файл:"
 
-#: src/winio.c:3141
+#: src/winio.c:1972 src/winio.c:1976
+msgid "Modified"
+msgstr "Змінено"
+
+#: src/winio.c:1974
+msgid "View"
+msgstr "Вигляд"
+
+#: src/winio.c:3105
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "рядок %ld/%ld (%d%%), стовпчик %lu/%lu (%d%%), символ %lu/%lu (%d%%)"
 
-#: src/winio.c:3271
+#: src/winio.c:3235
 msgid "The nano text editor"
 msgstr "Текстовий редактор nano"
 
-#: src/winio.c:3272
+#: src/winio.c:3236
 msgid "version"
 msgstr "версія"
 
-#: src/winio.c:3273
+#: src/winio.c:3237
 msgid "Brought to you by:"
 msgstr "Створено для Вас:"
 
-#: src/winio.c:3274
+#: src/winio.c:3238
 msgid "Special thanks to:"
 msgstr "Особлива подяка:"
 
-#: src/winio.c:3275
+#: src/winio.c:3239
 msgid "The Free Software Foundation"
 msgstr "The Free Software Foundation (Фонд Вільного Програмного забезпечення)"
 
-#: src/winio.c:3276
+#: src/winio.c:3240
 msgid "the many translators and the TP"
 msgstr "багатьом перекладачам та TP"
 
-#: src/winio.c:3277
+#: src/winio.c:3241
 msgid "For ncurses:"
 msgstr "За ncurses:"
 
-#: src/winio.c:3278
+#: src/winio.c:3242
 msgid "and anyone else we forgot..."
 msgstr "та іншим, кого ми забули..."
 
-#: src/winio.c:3279
+#: src/winio.c:3243
 msgid "Thank you for using nano!"
 msgstr "Дякуємо за використання nano!"
 
+#~ msgid ""
+#~ "Read %lu line (Converted from DOS and Mac format - Warning: No write "
+#~ "permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from DOS and Mac format - Warning: No write "
+#~ "permission)"
+#~ msgstr[0] ""
+#~ "Прочитано %lu рядок (перетворено з формату Mac та DOS; попередження: "
+#~ "немає доступу на запис)"
+#~ msgstr[1] ""
+#~ "Прочитано %lu рядка (перетворено з формату Mac та DOS; попередження: "
+#~ "немає доступу на запис)"
+#~ msgstr[2] ""
+#~ "Прочитано %lu рядків (перетворено з формату Mac та DOS; попередження: "
+#~ "немає доступу на запис)"
+
+#~ msgid ""
+#~ "Read %lu line (Converted from Mac format - Warning: No write permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from Mac format - Warning: No write permission)"
+#~ msgstr[0] ""
+#~ "Прочитано %lu рядок (перетворено з формату Mac; попередження: немає "
+#~ "доступу на запис)"
+#~ msgstr[1] ""
+#~ "Прочитано %lu рядка (перетворено з формату Mac; попередження: немає "
+#~ "доступу на запис)"
+#~ msgstr[2] ""
+#~ "Прочитано %lu рядків (перетворено з формату Mac; попередження: немає "
+#~ "доступу на запис)"
+
+#~ msgid ""
+#~ "Read %lu line (Converted from DOS format - Warning: No write permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from DOS format - Warning: No write permission)"
+#~ msgstr[0] ""
+#~ "Прочитано %lu рядок (перетворено з формату DOS; попередження: немає "
+#~ "доступу на запис)"
+#~ msgstr[1] ""
+#~ "Прочитано %lu рядка (перетворено з формату DOS; попередження: немає "
+#~ "доступу на запис)"
+#~ msgstr[2] ""
+#~ "Прочитано %lu рядків (перетворено з формату DOS; попередження: немає "
+#~ "доступу на запис)"
+
+#~ msgid "Read %lu line (Warning: No write permission)"
+#~ msgid_plural "Read %lu lines (Warning: No write permission)"
+#~ msgstr[0] "Прочитано %lu рядок (попередження: немає доступу на запис)"
+#~ msgstr[1] "Прочитані %lu рядки (попередження: немає доступу на запис)"
+#~ msgstr[2] "Прочитано %lu рядків (попередження: немає доступу на запис)"
+
+#~ msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
+#~ msgstr "Зберегти змінений буфер (Відповідь «Ні» СКАСУЄ ВСІ ЗМІНИ)? "
+
+#~ msgid "Unknown Command"
+#~ msgstr "Невідома команда"
+
+#~ msgid "Cannot add a color command without a syntax command"
+#~ msgstr "Не вдається додати команду кольору без команди синтаксису"
+
+#~ msgid "Missing regex string"
+#~ msgstr "Не вказано регулярний вираз"
+
+#~ msgid "Cannot add a header regex without a syntax command"
+#~ msgstr "Не вдається додати рег. вираз заголовку без команди синтаксису"
+
+#~ msgid "Cannot add a magic string regex without a syntax command"
+#~ msgstr ""
+#~ "Не вдалося додати формальний вираз контрольного рядка без команди "
+#~ "синтаксису"
+
+#~ msgid "Missing magic string name"
+#~ msgstr "Не вистачає назви контрольного рядка"
+
+#~ msgid "Cannot add a linter without a syntax command"
+#~ msgstr "Не можна додавати linter без команди синтаксису"
+
+#~ msgid "Cannot add formatter without a syntax command"
+#~ msgstr "Не можна додавати formatter без команди синтаксису"
+
+#~ msgid "Missing formatter command"
+#~ msgstr "Не вистачає програми formatter"
+
 #~ msgid "Cannot prepend or append to a symlink with --nofollow set"
 #~ msgstr ""
 #~ "Не можна дописувати на початку або наприкінці символічного посилання, "
diff --git a/po/vi.po b/po/vi.po
index bc326413..19779fd1 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 2.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-25 16:41-0500\n"
+"POT-Creation-Date: 2016-06-17 15:41+0200\n"
 "PO-Revision-Date: 2016-02-13 07:55+0700\n"
 "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
 "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
@@ -22,358 +22,345 @@ msgstr ""
 "X-Language-Team-Website: <http://translationproject.org/team/vi.html>\n"
 "X-Generator: Gtranslator 2.91.7\n"
 
+#: src/browser.c:144 src/browser.c:284 src/browser.c:334 src/files.c:996
+#: src/files.c:1003 src/files.c:1794 src/files.c:1919 src/files.c:1963
+#: src/files.c:1983 src/files.c:2099 src/files.c:3019 src/files.c:3242
+#: src/rcfile.c:540 src/rcfile.c:1280
+#, c-format
+msgid "Error reading %s: %s"
+msgstr "Gặp lỗi khi đọc %s: %s"
+
 #. TRANSLATORS: This is a prompt.
-#: src/browser.c:220
+#: src/browser.c:247
 msgid "Go To Directory"
 msgstr "Đi tới thư mục"
 
-#: src/browser.c:227 src/browser.c:738 src/files.c:1174 src/files.c:2340
-#: src/nano.c:1120 src/search.c:202 src/search.c:290 src/search.c:895
-#: src/search.c:970 src/text.c:2935 src/text.c:3142
+#: src/browser.c:254 src/browser.c:723 src/files.c:1126 src/files.c:2292
+#: src/nano.c:1128 src/search.c:195 src/search.c:297 src/search.c:851
+#: src/search.c:918 src/text.c:3189 src/text.c:3396
 msgid "Cancelled"
 msgstr "Bị hủy bỏ"
 
-#: src/browser.c:253 src/browser.c:300
-#, c-format
-msgid "Can't go outside of %s in restricted mode"
+#. TRANSLATORS: This refers to the option --operatingdir,
+#. * not to --restricted.
+#: src/browser.c:274 src/browser.c:326
+#, fuzzy, c-format
+msgid "Can't go outside of %s in confined mode"
 msgstr "Không đi ra được bên ngoài của %s trong chế độ hạn chế"
 
-#: src/browser.c:264 src/browser.c:310 src/browser.c:326 src/files.c:1044
-#: src/files.c:1052 src/files.c:1844 src/files.c:1971 src/files.c:2016
-#: src/files.c:2037 src/files.c:2156 src/files.c:3062 src/files.c:3285
-#: src/rcfile.c:596 src/rcfile.c:1435
-#, c-format
-msgid "Error reading %s: %s"
-msgstr "Gặp lỗi khi đọc %s: %s"
-
-#: src/browser.c:290
+#: src/browser.c:317
 msgid "Can't move up a directory"
 msgstr "Không thể nhảy lên một thư mục"
 
 #. TRANSLATORS: Try to keep this at most 7 characters.
-#: src/browser.c:615 src/browser.c:623
+#: src/browser.c:590 src/browser.c:598
 msgid "(dir)"
 msgstr "(thmục)"
 
 #. TRANSLATORS: Try to keep this at most 12 characters.
-#: src/browser.c:620
+#: src/browser.c:595
 msgid "(parent dir)"
 msgstr "(thmục cha)"
 
 #. TRANSLATORS: Try to keep this at most 7 characters.
 #. * If necessary, you can leave out the parentheses.
-#: src/browser.c:650
+#: src/browser.c:625
 msgid "(huge)"
 msgstr "(lá»›n)"
 
 #. TRANSLATORS: This is the main search prompt.
-#: src/browser.c:727 src/search.c:173
+#: src/browser.c:712 src/search.c:166
 msgid "Search"
 msgstr "Tìm kiếm"
 
-#: src/browser.c:777 src/search.c:466 src/search.c:536
-msgid "This is the only occurrence"
-msgstr "Đây là lần xảy ra duy nhất"
-
-#: src/browser.c:793 src/search.c:364
+#: src/browser.c:754 src/search.c:368
 msgid "Search Wrapped"
 msgstr "Tìm Toàn bộ"
 
-#: src/browser.c:843 src/search.c:517
+#: src/browser.c:764 src/search.c:509
+msgid "This is the only occurrence"
+msgstr "Đây là lần xảy ra duy nhất"
+
+#: src/browser.c:812 src/search.c:473
 msgid "No current search pattern"
 msgstr "Không có mẫu tìm kiếm hiện tại"
 
-#: src/files.c:50
+#: src/color.c:186
+#, fuzzy, c-format
+msgid "Unknown syntax name: %s"
+msgstr "Thiếu tên cú pháp"
+
+#: src/color.c:247
+#, c-format
+msgid "magic_load() failed: %s"
+msgstr ""
+
+#: src/color.c:251
+#, c-format
+msgid "magic_file(%s) failed: %s"
+msgstr ""
+
+#: src/files.c:47
 #, c-format
 msgid "Directory '%s' does not exist"
 msgstr "Thư mục “%s” không tồn tại"
 
-#: src/files.c:52
+#: src/files.c:49
 #, c-format
 msgid "Path '%s': %s"
 msgstr "Đường dẫn “%s”: %s"
 
-#: src/files.c:54
+#: src/files.c:51
 #, c-format
 msgid "Path '%s' is not a directory"
 msgstr "Đường dẫn “%s” không phải là một thư mục"
 
-#: src/files.c:57
+#: src/files.c:53
 #, c-format
 msgid "Path '%s' is not accessible"
 msgstr "Đường dẫn “%s” không thể truy cập được"
 
-#. TRANSLATORS: Try to keep this at most 76 characters.
-#: src/files.c:158
+#. TRANSLATORS: Keep the next ten messages at most 76 characters.
+#: src/files.c:148
 msgid ""
 "Warning: Modifying a file which is not locked, check directory permission?"
 msgstr ""
 "Cảnh báo: Sửa một tập tin không được khóa, hãy kiểm tra quyền của thư mục?"
 
-#: src/files.c:197
+#: src/files.c:187
 msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
 msgstr ""
 "Không thể nhận ra định danh của tôi dành cho tập tin khóa (hàm getpwuid() "
 "gặp lỗi)"
 
-#: src/files.c:206
+#: src/files.c:196
 #, c-format
 msgid "Couldn't determine hostname for lock file: %s"
 msgstr "Không thể dò tìm tên máy cho tập tin khóa: %s"
 
-#: src/files.c:227 src/files.c:238 src/files.c:275 src/files.c:285
+#: src/files.c:216 src/files.c:225 src/files.c:262 src/files.c:272
 #, c-format
 msgid "Error writing lock file %s: %s"
 msgstr "Gặp lỗi khi ghi tập tin khóa %s: %s"
 
-#: src/files.c:305
+#: src/files.c:291
 #, c-format
 msgid "Error deleting lock file %s: %s"
 msgstr "Gặp lỗi khi xóa tập tin khóa %s: %s"
 
-#: src/files.c:341
+#: src/files.c:325
 #, c-format
 msgid "Error opening lock file %s: %s"
 msgstr "Gặp lỗi khi mở tập tin khóa %s: %s"
 
-#: src/files.c:353
+#: src/files.c:337
 #, c-format
 msgid "Error reading lock file %s: Not enough data read"
 msgstr "Gặp lỗi khi đọc tập tin khóa %s: Dữ liệu không đủ để đọc"
 
 #. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
-#: src/files.c:371
+#: src/files.c:354
 #, c-format
 msgid "File %s is being edited (by %s with %s, PID %d); continue?"
 msgstr "Tập tin %s đang được biên soạn (bởi %s bằng %s, PID %d); tiếp tục?"
 
-#: src/files.c:426
+#: src/files.c:430
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Không chèn được tập tin từ bên ngoài của %s"
 
-#: src/files.c:439 src/files.c:1038 src/rcfile.c:589 src/rcfile.c:1385
-#: src/rcfile.c:1426
+#: src/files.c:445 src/files.c:991 src/rcfile.c:533 src/rcfile.c:1230
+#: src/rcfile.c:1271
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "“%s” là một thư mục"
 
-#: src/files.c:441
+#: src/files.c:447
 #, c-format
 msgid "\"%s\" is not a normal file"
 msgstr "“%s” không phải là một tập tin thường"
 
-#: src/files.c:566
+#: src/files.c:571
 msgid "No more open file buffers"
 msgstr "Không còn bộ đệm mở tập tin nữa"
 
-#: src/files.c:582
+#: src/files.c:586
 #, c-format
 msgid "Switched to %s"
 msgstr "Đã chuyển tới %s"
 
-#: src/files.c:584 src/global.c:988 src/winio.c:2010
+#: src/files.c:588 src/global.c:1005 src/winio.c:1965
 msgid "New Buffer"
 msgstr "Bộ nhớ đệm mới"
 
-#: src/files.c:943
+#. TRANSLATORS: Keep the next four messages at most 76 characters.
+#: src/files.c:913
 #, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
 msgstr[0] "Đọc %lu dòng (Được chuyển đổi từ định dạng DOS và Mac)"
 
-#: src/files.c:948
-#, c-format
-msgid ""
-"Read %lu line (Converted from DOS and Mac format - Warning: No write "
-"permission)"
-msgid_plural ""
-"Read %lu lines (Converted from DOS and Mac format - Warning: No write "
-"permission)"
-msgstr[0] ""
-"Đọc %lu dòng (Đã chuyển đổi từ định dạng DOS và Mac — Cảnh báo: Không có "
-"quyền ghi)"
-
-#: src/files.c:954
+#: src/files.c:919
 #, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
 msgstr[0] "Đọc %lu dòng (Đã chuyển đổi từ định dạng Mac)"
 
-#: src/files.c:958
-#, c-format
-msgid ""
-"Read %lu line (Converted from Mac format - Warning: No write permission)"
-msgid_plural ""
-"Read %lu lines (Converted from Mac format - Warning: No write permission)"
-msgstr[0] ""
-"Đọc %lu dòng (Đã chuyển đổi từ định dạng Mac — Cảnh báo: không có quyền ghi)"
-
-#: src/files.c:964
+#: src/files.c:925
 #, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
 msgstr[0] "Đọc %lu dòng (Đã chuyển đổi từ định dạng DOS)"
 
-#: src/files.c:968
-#, c-format
-msgid ""
-"Read %lu line (Converted from DOS format - Warning: No write permission)"
-msgid_plural ""
-"Read %lu lines (Converted from DOS format - Warning: No write permission)"
-msgstr[0] ""
-"Đọc %lu dòng (Đã chuyển đổi từ định dạng DOS — Cảnh báo: không có quyền ghi)"
-
-#: src/files.c:974
+#: src/files.c:930
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "Đọc %lu dòng"
 
-#: src/files.c:977
-#, c-format
-msgid "Read %lu line (Warning: No write permission)"
-msgid_plural "Read %lu lines (Warning: No write permission)"
-msgstr[0] "Đọc %lu dòng (Cảnh báo: Không có quyền ghi)"
-
-#: src/files.c:1019 src/files.c:1056
+#: src/files.c:974 src/files.c:1006
 msgid "Reading File"
 msgstr "Đang đọc tập tin"
 
-#: src/files.c:1025
+#: src/files.c:980
 msgid "New File"
 msgstr "Tập tin mới"
 
-#: src/files.c:1028
-#, c-format
-msgid "\"%s\" not found"
+#: src/files.c:983
+#, fuzzy, c-format
+msgid "File \"%s\" not found"
 msgstr "Không tìm thấy “%s”"
 
-#: src/files.c:1039 src/rcfile.c:590 src/rcfile.c:1386 src/rcfile.c:1427
+#: src/files.c:992 src/rcfile.c:534 src/rcfile.c:1231 src/rcfile.c:1272
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "“%s” là một tập tin thiết bị"
 
-#: src/files.c:1133
+#: src/files.c:1083
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Câu lệnh để thực hiện trong bộ đệm mới [từ %s] "
 
-#: src/files.c:1135
+#: src/files.c:1085
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Câu lệnh để thực hiện [từ %s] "
 
-#: src/files.c:1142
+#: src/files.c:1092
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Tập tin để chèn vào bộ đệm mới [từ %s] "
 
-#: src/files.c:1144
+#: src/files.c:1094
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Tập tin để chèn [từ %s] "
 
-#: src/files.c:1389
+#: src/files.c:1338
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Phím không hợp lệ trong chế độ khác đa bộ đệm"
 
-#: src/files.c:1684
-msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+#: src/files.c:1632
+#, fuzzy
+msgid "Failed to write backup file; continue saving? (Say N if unsure.) "
 msgstr ""
 "Ghi tập tin sao lưu dự phòng gặp lỗi, tiếp tục ghi? (Gõ N hay K nếu không "
 "chắc chắn)"
 
-#: src/files.c:1800
+#: src/files.c:1750
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Không ghi được ra bên ngoài của %s"
 
-#: src/files.c:1885 src/files.c:1910 src/files.c:1928 src/files.c:1941
-#: src/files.c:1952 src/files.c:1981
+#: src/files.c:1833 src/files.c:1858 src/files.c:1876 src/files.c:1889
+#: src/files.c:1900 src/files.c:1928
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Gặp lỗi khi ghi tập tin sao lưu %s: %s"
 
-#: src/files.c:1886 src/nano.c:690
+#: src/files.c:1834 src/nano.c:692
 msgid "Too many backup files?"
 msgstr "Quá nhiều tập tin sao lưu dự phòng?"
 
-#: src/files.c:2026 src/text.c:2863 src/text.c:2875 src/text.c:3244
-#: src/text.c:3253
+#: src/files.c:1972 src/text.c:3117 src/text.c:3129 src/text.c:3498
+#: src/text.c:3507
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Gặp lỗi khi ghi tập tin tạm thời: %s"
 
-#: src/files.c:2049 src/files.c:2068 src/files.c:2080 src/files.c:2104
-#: src/files.c:2121 src/files.c:2131 src/files.c:2164 src/files.c:2171
+#: src/files.c:1994 src/files.c:2013 src/files.c:2023 src/files.c:2047
+#: src/files.c:2064 src/files.c:2074 src/files.c:2106 src/files.c:2113
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Gặp lỗi khi ghi %s: %s"
 
-#: src/files.c:2200
+#: src/files.c:2154
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "Đã ghi %lu dòng"
 
-#: src/files.c:2299
+#: src/files.c:2249
 msgid " [DOS Format]"
 msgstr " [Định dạng DOS]"
 
-#: src/files.c:2300
+#: src/files.c:2250
 msgid " [Mac Format]"
 msgstr " [Định dạng Mac]"
 
-#: src/files.c:2302
+#: src/files.c:2252
 msgid " [Backup]"
 msgstr " [Sao lưu dự phòng]"
 
-#: src/files.c:2309
+#: src/files.c:2259
 msgid "Prepend Selection to File"
 msgstr "Thêm lựa chọn vào trước Tập tin"
 
-#: src/files.c:2310
+#: src/files.c:2260
 msgid "Append Selection to File"
 msgstr "Thêm lựa chọn vào sau Tập tin"
 
-#: src/files.c:2311
+#: src/files.c:2261
 msgid "Write Selection to File"
 msgstr "Lưu lựa chọn vào một tập tin"
 
-#: src/files.c:2314
+#: src/files.c:2264
 msgid "File Name to Prepend to"
 msgstr "Tên tập tin để thêm vào trước"
 
-#: src/files.c:2315
+#: src/files.c:2265
 msgid "File Name to Append to"
 msgstr "Tên tập tin để thêm vào sau"
 
-#: src/files.c:2316
+#: src/files.c:2266
 msgid "File Name to Write"
 msgstr "Tên tập tin dùng để ghi vào"
 
-#: src/files.c:2349
-msgid "Save modified buffer anyway ? "
+#: src/files.c:2301
+#, fuzzy
+msgid "Save modified buffer anyway? "
 msgstr "Dù sao thì vẫn ghi lại bộ đệm đã sửa ? "
 
-#: src/files.c:2457
-msgid "File exists, OVERWRITE ? "
-msgstr "Tập tin đã có sẵn, GHI ĐÈ LÊN ? "
-
-#: src/files.c:2466
-msgid "Save file under DIFFERENT NAME ? "
+#: src/files.c:2412
+#, fuzzy
+msgid "Save file under DIFFERENT NAME? "
 msgstr "Ghi tập tin bằng TÊN MỚI ? "
 
-#: src/files.c:2480
-msgid "File was modified since you opened it, continue saving ? "
+#: src/files.c:2420
+#, fuzzy, c-format
+msgid "File \"%s\" exists; OVERWRITE? "
+msgstr "Tập tin đã có sẵn, GHI ĐÈ LÊN ? "
+
+#: src/files.c:2441
+#, fuzzy
+msgid "File was modified since you opened it; continue saving? "
 msgstr "Tập tin bị sửa đổi kể từ lần bạn mở cuối cùng, có tiếp tục lưu không? "
 
-#: src/files.c:2917
+#: src/files.c:2874
 msgid "(more)"
 msgstr "(còn nữa)"
 
-#: src/files.c:3004
+#: src/files.c:2959
 #, c-format
 msgid ""
 "\n"
@@ -382,7 +369,7 @@ msgstr ""
 "\n"
 "Hãy nhấn “Enter” để tiếp tục\n"
 
-#: src/files.c:3020
+#: src/files.c:2975
 #, c-format
 msgid ""
 "Unable to create directory %s: %s\n"
@@ -391,7 +378,7 @@ msgstr ""
 "Không thể tạo thư mục %s: %s\n"
 "Nó là yêu cầu cho tải/ghi lịch sử tìm kiếm hay vị trí của con trỏ.\n"
 
-#: src/files.c:3026
+#: src/files.c:2982
 #, c-format
 msgid ""
 "Path %s is not a directory and needs to be.\n"
@@ -400,7 +387,7 @@ msgstr ""
 "Đường dẫn “%s” không phải là thư mục và cần phải thế.\n"
 "Nano sẽ không thể tải hay ghi lịch sử tìm kiếm hay vị trí con trỏ chuột.\n"
 
-#: src/files.c:3045
+#: src/files.c:3002
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I tried to move\n"
@@ -409,7 +396,7 @@ msgstr ""
 "Tìm thấy tập tin lịch sử cũ của nano (%s) cái mà tôi đã thử di chuyển đến\n"
 "vị trí ưu tiên (%s) nhưng lại gặp một lỗi: %s"
 
-#: src/files.c:3049
+#: src/files.c:3006
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I moved\n"
@@ -420,722 +407,753 @@ msgstr ""
 "tới vị trí ưu tiên (%s)\n"
 "(xem FAQ của nano để có thông tin về thay đổi này)"
 
-#: src/files.c:3132 src/files.c:3140 src/files.c:3164 src/files.c:3176
+#: src/files.c:3089 src/files.c:3097 src/files.c:3121 src/files.c:3133
 #, c-format
 msgid "Error writing %s: %s\n"
 msgstr "Gặp lỗi khi ghi %s: %s\n"
 
 #. TRANSLATORS: Try to keep the next fifteen strings at most 10 characters.
-#: src/global.c:480
+#: src/global.c:483
 msgid "Exit"
 msgstr "Thoát"
 
-#: src/global.c:481
+#: src/global.c:484
 msgid "Close"
 msgstr "Đóng"
 
-#: src/global.c:482
+#: src/global.c:485
 msgid "Uncut Text"
 msgstr "Dán chữ"
 
-#: src/global.c:484
+#: src/global.c:487
 msgid "Unjustify"
 msgstr "BỏCănHàng"
 
-#: src/global.c:490
+#: src/global.c:493
 msgid "Read File"
 msgstr "Đọc T.tin"
 
-#: src/global.c:491
+#: src/global.c:494
 msgid "Where Is"
 msgstr "Tìm kiếm"
 
-#: src/global.c:492
+#: src/global.c:495
 msgid "Replace"
 msgstr "Thay thế"
 
-#: src/global.c:493
+#: src/global.c:496
 msgid "Go To Line"
 msgstr "Tới dòng"
 
-#: src/global.c:494
+#: src/global.c:497
 msgid "Prev Line"
 msgstr "Dòng trước"
 
-#: src/global.c:495
+#: src/global.c:498
 msgid "Next Line"
 msgstr "Dòng kế"
 
-#: src/global.c:496
+#: src/global.c:499
 msgid "Prev Page"
 msgstr "TrangTrÆ°á»›c"
 
-#: src/global.c:497
+#: src/global.c:500
 msgid "Next Page"
 msgstr "Trang kế"
 
-#: src/global.c:499
+#: src/global.c:502
 msgid "Justify"
 msgstr "Sắp hàng"
 
-#: src/global.c:500
+#: src/global.c:503
 msgid "FullJstify"
 msgstr "SắpHàngĐủ"
 
-#: src/global.c:502
+#: src/global.c:505
 msgid "Refresh"
 msgstr "Cập nhật"
 
 #. TRANSLATORS: Try to keep this string at most 12 characters.
-#: src/global.c:505
+#: src/global.c:508
 msgid "WhereIs Next"
 msgstr "Tiếp là đâu"
 
 #. TRANSLATORS: The next long series of strings are shortcut descriptions;
 #. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:512
+#: src/global.c:515
 msgid "Justify the current paragraph"
 msgstr "Sắp chữ đúng hàng cho đoạn văn hiện tại"
 
-#: src/global.c:514
+#: src/global.c:517
 msgid "Cancel the current function"
 msgstr "Hủy hàm hiện tại"
 
-#: src/global.c:515
+#: src/global.c:518
 msgid "Display this help text"
 msgstr "Hiển thị trợ giúp này"
 
-#: src/global.c:518
+#: src/global.c:521
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Đóng bộ đệm tập tin hiện tại / Thoát khỏi nano"
 
-#: src/global.c:520
+#: src/global.c:523
 msgid "Exit from nano"
 msgstr "Thoát khỏi nano"
 
-#: src/global.c:524
+#: src/global.c:527
 msgid "Write the current file to disk"
 msgstr "Ghi tập tin hiện tại lên đĩa"
 
-#: src/global.c:526
+#: src/global.c:529
 msgid "Insert another file into the current one"
 msgstr "Chèn tập tin khác vào tập tin hiện tại"
 
-#: src/global.c:528
+#: src/global.c:531
 msgid "Search for a string or a regular expression"
 msgstr "Tìm một chuỗi hay biểu thức chính quy"
 
-#: src/global.c:531
+#: src/global.c:533
 msgid "Search for a string"
 msgstr "Tìm một chuỗi nào đó"
 
-#: src/global.c:533
+#: src/global.c:534
+msgid "Refresh the file list"
+msgstr ""
+
+#: src/global.c:535
+#, fuzzy
+msgid "Go to lefthand column"
+msgstr "Chuyển tới dòng và cột có số thứ tự đưa ra"
+
+#: src/global.c:536
+#, fuzzy
+msgid "Go to righthand column"
+msgstr "Chuyển tới dòng và cột có số thứ tự đưa ra"
+
+#: src/global.c:538
 msgid "Go one screenful up"
 msgstr "Đi lên một màn hình"
 
-#: src/global.c:534
+#: src/global.c:539
 msgid "Go one screenful down"
 msgstr "Đi xuống một màn hình"
 
-#: src/global.c:536
+#: src/global.c:541
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Cắt dòng hiện tại và ghi nó vào bộ đệm cắt"
 
-#: src/global.c:538
+#: src/global.c:543
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Dán từ bộ đệm cắt vào dòng hiện tại"
 
-#: src/global.c:539
+#: src/global.c:544
 msgid "Display the position of the cursor"
 msgstr "Hiển thị vị trí con trỏ"
 
-#: src/global.c:541
+#: src/global.c:546
 msgid "Invoke the spell checker, if available"
 msgstr "Gọi trình kiểm tra chính tả, nếu có thể"
 
-#: src/global.c:543
+#: src/global.c:548
 msgid "Replace a string or a regular expression"
 msgstr "Thay thế một chuỗi hay biểu thức chính quy"
 
-#: src/global.c:544
+#: src/global.c:549
 msgid "Go to line and column number"
 msgstr "Chuyển tới dòng và cột có số thứ tự đưa ra"
 
-#: src/global.c:546
+#: src/global.c:551
 msgid "Mark text starting from the cursor position"
 msgstr "Đánh dấu văn bản bắt đầu tại vị trí con trỏ"
 
-#: src/global.c:547
+#: src/global.c:552
 msgid "Repeat the last search"
 msgstr "Lặp lại tìm kiếm cuối"
 
-#: src/global.c:549
+#: src/global.c:554
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "Sao chép dòng hiện tại và ghi nó vào bộ đệm cắt"
 
-#: src/global.c:550
+#: src/global.c:555
 msgid "Indent the current line"
 msgstr "Thụt lề dòng hiện tại"
 
-#: src/global.c:551
+#: src/global.c:556
 msgid "Unindent the current line"
 msgstr "Hủy thụt lề dòng hiện tại"
 
-#: src/global.c:552
+#: src/global.c:558
+msgid "Comment/uncomment the current line or marked lines"
+msgstr ""
+
+#: src/global.c:560
 msgid "Undo the last operation"
 msgstr "Hủy bước vừa mới làm"
 
-#: src/global.c:553
+#: src/global.c:561
 msgid "Redo the last undone operation"
 msgstr "Làm lại bước vừa mới được hủy"
 
-#: src/global.c:555
+#: src/global.c:563
 msgid "Go back one character"
 msgstr "Lùi lại một ký tự"
 
-#: src/global.c:556
+#: src/global.c:564
 msgid "Go forward one character"
 msgstr "Tiếp tới một ký tự"
 
-#: src/global.c:558
+#: src/global.c:566
 msgid "Go back one word"
 msgstr "Lùi lại một từ"
 
-#: src/global.c:559
+#: src/global.c:567
 msgid "Go forward one word"
 msgstr "Tiếp tới một từ"
 
-#: src/global.c:561
+#: src/global.c:569
 msgid "Go to previous line"
 msgstr "Về dòng trước"
 
-#: src/global.c:562
+#: src/global.c:570
 msgid "Go to next line"
 msgstr "Tới dòng kế"
 
-#: src/global.c:563
+#: src/global.c:571
 msgid "Go to beginning of current line"
 msgstr "Về đầu của dòng hiện tại"
 
-#: src/global.c:564
+#: src/global.c:572
 msgid "Go to end of current line"
 msgstr "Tới cuối của dòng hiện tại"
 
-#: src/global.c:567
+#: src/global.c:575
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "Về đầu của đoạn văn này; rồi về đầu của đoạn văn trước"
 
-#: src/global.c:569
+#: src/global.c:577
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr ""
 "Tới đúng sau cuối của đoạn văn này; rồi tới đúng sau cuối của đoạn văn sau"
 
-#: src/global.c:571
+#: src/global.c:579
 msgid "Go to the first line of the file"
 msgstr "Về dòng đầu của tập tin"
 
-#: src/global.c:572
+#: src/global.c:580
 msgid "Go to the last line of the file"
 msgstr "Tới dòng cuối của tập tin"
 
-#: src/global.c:574
+#: src/global.c:582
 msgid "Go to the matching bracket"
 msgstr "Tới dấu ngoặc tương ứng"
 
-#: src/global.c:576
+#: src/global.c:584
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "Đưa màn hình lên một dòng nhưng giữ nguyên vị trí con trỏ"
 
-#: src/global.c:578
+#: src/global.c:586
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "Đưa màn hình xuống một dòng nhưng giữ nguyên vị trí con trỏ"
 
-#: src/global.c:581
+#: src/global.c:589
 msgid "Switch to the previous file buffer"
 msgstr "Chuyển tới bộ đệm tập tin trước"
 
-#: src/global.c:582
+#: src/global.c:590
 msgid "Switch to the next file buffer"
 msgstr "Chuyển tới bộ đệm tập tin tiếp theo"
 
-#: src/global.c:584
+#: src/global.c:592
 msgid "Insert the next keystroke verbatim"
 msgstr "Chèn ký tự kế tiếp đúng nguyên văn"
 
-#: src/global.c:585
+#: src/global.c:593
 msgid "Insert a tab at the cursor position"
 msgstr "Chèn một ký tự tab tại vị trí con trỏ"
 
-#: src/global.c:586
+#: src/global.c:594
 msgid "Insert a newline at the cursor position"
 msgstr "Chèn một ký tự dòng mới tại vị trí con trỏ"
 
-#: src/global.c:587
+#: src/global.c:595
 msgid "Delete the character under the cursor"
 msgstr "Xóa ký tự nằm dưới con trỏ"
 
-#: src/global.c:589
+#: src/global.c:597
 msgid "Delete the character to the left of the cursor"
 msgstr "Xóa ký tự ở bên trái con trỏ"
 
-#: src/global.c:592
+#: src/global.c:600
 msgid "Cut backward from cursor to word start"
 msgstr "Cắt từ vị trí con trỏ ngược tới đầu từ"
 
-#: src/global.c:594
+#: src/global.c:602
 msgid "Cut forward from cursor to next word start"
 msgstr "Cắt từ vị trí con trỏ tới từ kế tiếp"
 
-#: src/global.c:596
+#: src/global.c:604
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Cắt từ vị trí con trỏ tới cuối tập tin"
 
-#: src/global.c:599
+#: src/global.c:607
 msgid "Justify the entire file"
 msgstr "Sắp chữ đúng hàng cho cả tập tin"
 
-#: src/global.c:603
+#: src/global.c:611
 msgid "Count the number of words, lines, and characters"
 msgstr "Đếm số từ, số dòng và số ký tự"
 
-#: src/global.c:606
+#: src/global.c:614
 msgid "Refresh (redraw) the current screen"
 msgstr "Cập nhật (vẽ lại) màn hình hiện tại"
 
-#: src/global.c:608
+#: src/global.c:616
 msgid "Suspend the editor (if suspension is enabled)"
 msgstr "Ngưng trình soạn thảo (nếu tính năng ngưng đã được bật)"
 
-#: src/global.c:610
+#: src/global.c:618
 msgid "Save file without prompting"
 msgstr "Lưu tập tin mà không cần hỏi"
 
-#: src/global.c:611
+#: src/global.c:619
 msgid "Search next occurrence backward"
 msgstr "Tìm chỗ khớp kế trước"
 
-#: src/global.c:612
+#: src/global.c:620
 msgid "Search next occurrence forward"
 msgstr "Tìm chỗ khớp phía trước"
 
-#: src/global.c:614
+#: src/global.c:622
 msgid "Toggle the case sensitivity of the search"
 msgstr "Bật/tắt phân biệt chữ HOA/thường khi tìm kiếm"
 
-#: src/global.c:616
+#: src/global.c:624
 msgid "Reverse the direction of the search"
 msgstr "Đảo ngược hướng tìm"
 
-#: src/global.c:620
+#: src/global.c:628
 msgid "Toggle the use of regular expressions"
 msgstr "Bật/tắt khả năng sử dụng biểu thức chính quy"
 
-#: src/global.c:624
+#: src/global.c:632
 msgid "Recall the previous search/replace string"
 msgstr "Xem lại chuỗi tìm kiếm/thay thế trước"
 
-#: src/global.c:626
+#: src/global.c:634
 msgid "Recall the next search/replace string"
 msgstr "Xem lại chuỗi tìm kiếm/thay thế kế"
 
-#: src/global.c:629
+#: src/global.c:637
 msgid "Go to file browser"
 msgstr "Đi tới trình duyệt tập tin"
 
-#: src/global.c:632
+#: src/global.c:640
 msgid "Toggle the use of DOS format"
 msgstr "Bật/tắt khả năng sử dụng định dạng DOS"
 
-#: src/global.c:633
+#: src/global.c:641
 msgid "Toggle the use of Mac format"
 msgstr "Bật/tắt khả năng sử dụng định dạng Mac"
 
-#: src/global.c:634
+#: src/global.c:642
 msgid "Toggle appending"
 msgstr "Bật/tắt khả năng phụ thêm"
 
-#: src/global.c:635
+#: src/global.c:643
 msgid "Toggle prepending"
 msgstr "Bật/tắt khả năng thêm vào trước"
 
-#: src/global.c:636
+#: src/global.c:644
 msgid "Toggle backing up of the original file"
 msgstr "Bật/tắt khả năng sao lưu tập tin gốc"
 
-#: src/global.c:637
+#: src/global.c:645
 msgid "Execute external command"
 msgstr "Thực hiện câu lệnh ngoại trú"
 
-#: src/global.c:639
+#: src/global.c:647
 msgid "Close buffer without saving it"
 msgstr "Đóng bộ đệm dữ liệu mà không ghi lại nó"
 
-#: src/global.c:641
+#: src/global.c:649
 msgid "Toggle the use of a new buffer"
 msgstr "Bật/tắt khả năng sử dụng bộ đệm mới"
 
-#: src/global.c:644
+#: src/global.c:652
 msgid "Exit from the file browser"
 msgstr "Thoát khỏi trình duyệt tập tin"
 
-#: src/global.c:645
+#: src/global.c:653
 msgid "Go to the first file in the list"
 msgstr "Chuyển tới dòng đầu tiên của danh sách"
 
-#: src/global.c:646
+#: src/global.c:654
 msgid "Go to the last file in the list"
 msgstr "Chuyển tới dòng cuối cùng của danh sách"
 
-#: src/global.c:647
+#: src/global.c:655
 msgid "Go to the previous file in the list"
 msgstr "Chuyển tới tập tin đằng trước trong danh sách"
 
-#: src/global.c:648
+#: src/global.c:656
 msgid "Go to the next file in the list"
 msgstr "Chuyển tới tập tin đằng sau trong danh sách"
 
-#: src/global.c:649
+#: src/global.c:657
 msgid "Go to directory"
 msgstr "Đi tới thư mục"
 
-#: src/global.c:652
+#: src/global.c:660
 msgid "Invoke the linter, if available"
 msgstr "Gọi phần mềm kiểm chuẩn, nếu có"
 
-#: src/global.c:653
+#: src/global.c:661
 msgid "Go to previous linter msg"
 msgstr "Đến lời nhắn kiểm chuẩn kế trước"
 
-#: src/global.c:654
+#: src/global.c:662
 msgid "Go to next linter msg"
 msgstr "Đến lời nhắn kiểm chuẩn kế"
 
-#: src/global.c:656
+#: src/global.c:664
 msgid "Invoke formatter, if available"
 msgstr "Gọi trình định dạng, nếu có thể"
 
 #. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:671
+#: src/global.c:679
 msgid "Get Help"
 msgstr "Trợ giúp"
 
-#: src/global.c:674 src/prompt.c:858
+#: src/global.c:682 src/prompt.c:855
 msgid "Cancel"
 msgstr "Hủy bỏ"
 
-#: src/global.c:687
+#: src/global.c:695
 msgid "Write Out"
 msgstr "Ghi lại"
 
-#: src/global.c:723
+#: src/global.c:731
 msgid "Go To Dir"
 msgstr "Tới ThMục"
 
-#: src/global.c:738
+#: src/global.c:746
 msgid "Cut Text"
 msgstr "Cắt chữ"
 
-#: src/global.c:753
+#: src/global.c:761
 msgid "To Spell"
 msgstr "Chính tả"
 
-#: src/global.c:757
+#: src/global.c:765
 msgid "To Linter"
 msgstr "KiểmChuẩn"
 
-#: src/global.c:760
+#: src/global.c:768
 msgid "Formatter"
 msgstr "Bđịnh dạng"
 
-#: src/global.c:767
+#: src/global.c:775
 msgid "Case Sens"
 msgstr "HOA/thường"
 
-#: src/global.c:772
+#: src/global.c:780
 msgid "Regexp"
 msgstr "BTCQ"
 
-#: src/global.c:777
+#: src/global.c:785
 msgid "Backwards"
 msgstr "Ngược lại"
 
-#: src/global.c:784
+#: src/global.c:792
 msgid "No Replace"
 msgstr "Không thay"
 
-#: src/global.c:792
+#: src/global.c:800
 msgid "Cur Pos"
 msgstr "Vị trí"
 
-#: src/global.c:807
+#: src/global.c:815
 msgid "First Line"
 msgstr "Dòng đầu"
 
-#: src/global.c:809
+#: src/global.c:817
 msgid "Last Line"
 msgstr "Dòng cuối"
 
-#: src/global.c:816
+#: src/global.c:824
 msgid "To Bracket"
 msgstr "Đặt Ngoặc"
 
-#: src/global.c:819
+#: src/global.c:827
 msgid "Mark Text"
 msgstr "Đdấu VBản"
 
-#: src/global.c:822
+#: src/global.c:830
 msgid "Copy Text"
 msgstr "Chép VBản"
 
-#: src/global.c:825
+#: src/global.c:833
 msgid "Indent Text"
 msgstr "Thụt VBản"
 
-#: src/global.c:827
+#: src/global.c:835
 msgid "Unindent Text"
 msgstr "Thôi thụt VBản"
 
-#: src/global.c:830
+#: src/global.c:838
 msgid "Undo"
 msgstr "Hủy bước"
 
-#: src/global.c:832
+#: src/global.c:840
 msgid "Redo"
 msgstr "Hoàn lại"
 
-#: src/global.c:836 src/global.c:842
+#: src/global.c:844 src/global.c:850
 msgid "Back"
 msgstr "Lùi"
 
-#: src/global.c:838 src/global.c:844
+#: src/global.c:846 src/global.c:852
 msgid "Forward"
 msgstr "Kế tiếp"
 
-#: src/global.c:849
+#: src/global.c:857
 msgid "Prev Word"
 msgstr "Từ trước"
 
-#: src/global.c:851
+#: src/global.c:859
 msgid "Next Word"
 msgstr "Từ kế"
 
-#: src/global.c:855
+#: src/global.c:863
 msgid "Home"
 msgstr "Nhà"
 
-#: src/global.c:857
+#: src/global.c:865
 msgid "End"
 msgstr "Cuối"
 
-#: src/global.c:866
+#: src/global.c:874
 msgid "Beg of Par"
 msgstr "Đầu đoạn"
 
-#: src/global.c:868
+#: src/global.c:876
 msgid "End of Par"
 msgstr "Cuối đoạn"
 
-#: src/global.c:873
+#: src/global.c:881
 msgid "Scroll Up"
 msgstr "Cuộn lên"
 
-#: src/global.c:875
+#: src/global.c:883
 msgid "Scroll Down"
 msgstr "Cuộn xuống"
 
-#: src/global.c:880
+#: src/global.c:888
 msgid "Prev File"
 msgstr "Tệp Trước"
 
-#: src/global.c:882
+#: src/global.c:890
 msgid "Next File"
 msgstr "Tệp Sau"
 
-#: src/global.c:891
+#: src/global.c:899
 msgid "Verbatim"
 msgstr "Đúng nguyên văn"
 
-#: src/global.c:894
+#: src/global.c:902
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:896
+#: src/global.c:904
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:899
+#: src/global.c:907
 msgid "Delete"
 msgstr "Xóa"
 
-#: src/global.c:901
+#: src/global.c:909
 msgid "Backspace"
 msgstr "Xóa lùi"
 
 #. TRANSLATORS: The next two strings refer to cutting words.
-#: src/global.c:912
+#: src/global.c:920
 msgid "Cut Left"
 msgstr "Cắt Trái"
 
-#: src/global.c:914
+#: src/global.c:922
 msgid "Cut Right"
 msgstr "Cắt Phải"
 
-#: src/global.c:916
+#: src/global.c:924
 msgid "CutTillEnd"
 msgstr "CắtĐếnCuối"
 
-#: src/global.c:926
+#: src/global.c:934
 msgid "Word Count"
 msgstr "Đếm từ"
 
-#: src/global.c:933
+#: src/global.c:941
 msgid "Suspend"
 msgstr "NgÆ°ng"
 
-#: src/global.c:937
+#: src/global.c:945
+#, fuzzy
+msgid "Comment Lines"
+msgstr "Dòng kế"
+
+#: src/global.c:949
 msgid "Save"
 msgstr "LÆ°u"
 
-#: src/global.c:940
+#: src/global.c:952
 msgid "Previous"
 msgstr "Kế trước"
 
-#: src/global.c:942
+#: src/global.c:954
 msgid "Next"
 msgstr "Kế tiếp"
 
-#: src/global.c:948
+#: src/global.c:960
 msgid "PrevHstory"
 msgstr "LịchSửTrước"
 
-#: src/global.c:951
+#: src/global.c:963
 msgid "NextHstory"
 msgstr "LịchSửKế"
 
-#: src/global.c:955
+#: src/global.c:972
 msgid "Go To Text"
 msgstr "Tới văn bản"
 
-#: src/global.c:959
+#: src/global.c:976
 msgid "DOS Format"
 msgstr "Định dạng DOS"
 
-#: src/global.c:961
+#: src/global.c:978
 msgid "Mac Format"
 msgstr "Định dạng Mac"
 
-#: src/global.c:969
+#: src/global.c:986
 msgid "Append"
 msgstr "Phụ thêm"
 
-#: src/global.c:971
+#: src/global.c:988
 msgid "Prepend"
 msgstr "Thêm vào trước"
 
-#: src/global.c:974
+#: src/global.c:991
 msgid "Backup File"
 msgstr "Tập tin Sao lưu dự phòng"
 
-#: src/global.c:981
+#: src/global.c:998
 msgid "Execute Command"
 msgstr "Thực hiện lệnh"
 
-#: src/global.c:996
+#: src/global.c:1013
 msgid "To Files"
 msgstr "Tới tập tin"
 
-#: src/global.c:1004
+#: src/global.c:1021
 msgid "First File"
 msgstr "Tệp đầu"
 
-#: src/global.c:1006
+#: src/global.c:1023
 msgid "Last File"
 msgstr "Tệp cuối"
 
-#: src/global.c:1010
+#: src/global.c:1027
 msgid "Discard buffer"
 msgstr "Loại bỏ bộ đệm"
 
+#: src/global.c:1038
+msgid "Left Column"
+msgstr ""
+
+#: src/global.c:1040
+msgid "Right Column"
+msgstr ""
+
 #. TRANSLATORS: Try to keep the next two strings at most 20 characters.
-#: src/global.c:1020
+#: src/global.c:1047
 msgid "Prev Lint Msg"
 msgstr "LNhắn Lint tr"
 
-#: src/global.c:1022
+#: src/global.c:1049
 msgid "Next Lint Msg"
 msgstr "LNhắn Lint sau"
 
 #. TRANSLATORS: The next seventeen strings are toggle descriptions;
 #. * they are best kept shorter than 40 characters, but may be longer.
-#: src/global.c:1285
+#: src/global.c:1316
 msgid "Help mode"
 msgstr "Chế độ Trợ giúp"
 
-#: src/global.c:1287
+#: src/global.c:1318
 msgid "Constant cursor position display"
 msgstr "Hiển thị ví trí cố định của con trỏ"
 
-#: src/global.c:1289
+#: src/global.c:1320
 msgid "Use of one more line for editing"
 msgstr "Sử dụng nhiều dòng hơn dành cho việc soạn thảo"
 
-#: src/global.c:1291
+#: src/global.c:1322
 msgid "Smooth scrolling"
 msgstr "Cuộn trơn mượt"
 
-#: src/global.c:1293
+#: src/global.c:1324
 msgid "Soft wrapping of overlong lines"
 msgstr "Ngắt mềm những dòng dài"
 
-#: src/global.c:1295
+#: src/global.c:1326
 msgid "Whitespace display"
 msgstr "Hiển thị khoảng trắng"
 
-#: src/global.c:1297
+#: src/global.c:1328
 msgid "Color syntax highlighting"
 msgstr "Tô sáng cú pháp"
 
-#: src/global.c:1299
+#: src/global.c:1330
 msgid "Smart home key"
 msgstr "Phím home khéo"
 
-#: src/global.c:1301
+#: src/global.c:1332
 msgid "Auto indent"
 msgstr "Tự thụt lề"
 
-#: src/global.c:1303
+#: src/global.c:1334
 msgid "Cut to end"
 msgstr "Cắt tới cuối"
 
-#: src/global.c:1305
+#: src/global.c:1336
 msgid "Hard wrapping of overlong lines"
 msgstr "Ngắt cứng những dòng dài"
 
-#: src/global.c:1307
+#: src/global.c:1338
 msgid "Conversion of typed tabs to spaces"
 msgstr "Chuyển các tab thành dấu cách"
 
-#: src/global.c:1309
+#: src/global.c:1340
 msgid "Backup files"
 msgstr "Tập tin sao lưu dự phòng"
 
-#: src/global.c:1311
+#: src/global.c:1342
 msgid "Reading file into separate buffer"
 msgstr "Đang đọc tập tin vào một bộ đệm khác"
 
-#: src/global.c:1313
+#: src/global.c:1344
 msgid "Mouse support"
 msgstr "Hỗ trợ chuột"
 
-#: src/global.c:1315
+#: src/global.c:1346
 msgid "No conversion from DOS/Mac format"
 msgstr "Không chuyển đổi từ định dạng DOS/Mac"
 
-#: src/global.c:1317
+#: src/global.c:1348
 msgid "Suspension"
 msgstr "Tạm dừng"
 
-#: src/help.c:209
+#: src/help.c:211
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1157,7 +1175,7 @@ msgstr ""
 "kiếm.  Không nhập văn bản nào và gõ Enter sẽ thực hiện tìm kiếm ngay trước "
 "này.  "
 
-#: src/help.c:218
+#: src/help.c:220
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1171,7 +1189,7 @@ msgstr ""
 " Những phím chức năng sau có trong chế độ Tìm kiếm:\n"
 "\n"
 
-#: src/help.c:224
+#: src/help.c:226
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1190,7 +1208,7 @@ msgstr ""
 " Có thể dùng các phím chức năng sau trong chế độ Tới dòng:\n"
 "\n"
 
-#: src/help.c:233
+#: src/help.c:235
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1213,7 +1231,7 @@ msgstr ""
 "việc nạp tập tin đó vào một bộ đệm riêng (sử dụng Meta-< và > để chuyển giữa "
 "các bộ đệm này).  "
 
-#: src/help.c:242
+#: src/help.c:244
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1227,7 +1245,7 @@ msgstr ""
 " Có những phím chức năng sau trong chế độ Chèn Tập tin:\n"
 "\n"
 
-#: src/help.c:248
+#: src/help.c:250
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1255,7 +1273,7 @@ msgstr ""
 " Có thể dùng các phím chức năng sau trong chế độ lưu Tập tin:\n"
 "\n"
 
-#: src/help.c:262
+#: src/help.c:264
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1279,7 +1297,7 @@ msgstr ""
 " Có thể dùng các phím chức năng sau trong trình duyệt:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:277
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1303,7 +1321,7 @@ msgstr ""
 "này.\n"
 "\n"
 
-#: src/help.c:284
+#: src/help.c:286
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1311,7 +1329,7 @@ msgstr ""
 "Có thể dùng các phím chức năng sau trong chế độ Tìm trong trình duyệt:\n"
 "\n"
 
-#: src/help.c:288
+#: src/help.c:290
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1334,7 +1352,7 @@ msgstr ""
 "mục:\n"
 "\n"
 
-#: src/help.c:301
+#: src/help.c:303
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1357,7 +1375,7 @@ msgstr ""
 " Có các chức năng sau trong chế độ Kiểm tra chính tả:\n"
 "\n"
 
-#: src/help.c:316
+#: src/help.c:318
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1377,7 +1395,7 @@ msgstr ""
 " Có thể dùng các phím sau trong chế độ Thực hiện Câu lệnh:\n"
 "\n"
 
-#: src/help.c:329
+#: src/help.c:331
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1397,15 +1415,15 @@ msgstr ""
 "đang soạn thảo.  Dòng trạng thái là dòng thứ ba từ dưới lên và hiển thị "
 "những thông báo quan trọng."
 
-#: src/help.c:339
+#: src/help.c:341
+#, fuzzy
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
-" The notation for shortcuts is as follows: Control-key sequences are notated "
-"with a caret (^) symbol and can be entered either by using the Control "
-"(Ctrl) key or pressing the Escape (Esc) key twice.  Escape-key sequences are "
-"notated with the Meta (M-) symbol and can be entered using either the Esc, "
-"Alt, or Meta key depending on your keyboard setup.  "
+" Shortcuts are written as follows: Control-key sequences are notated with a "
+"'^' and can be entered either by using the Ctrl key or pressing the Esc key "
+"twice.  Meta-key sequences are notated with 'M-' and can be entered using "
+"either the Alt, Cmd, or Esc key, depending on your keyboard setup.  "
 msgstr ""
 "Dưới cùng là hai dòng hiển thị những phím tắt thông dụng trong trình soạn "
 "thảo.\n"
@@ -1432,19 +1450,19 @@ msgstr ""
 msgid "enable/disable"
 msgstr "bật/tắt"
 
-#: src/nano.c:559
+#: src/nano.c:560
 msgid "Key is invalid in view mode"
 msgstr "Phím không hợp lệ trong chế độ xem"
 
-#: src/nano.c:565
+#: src/nano.c:566
 msgid "This function is disabled in restricted mode"
 msgstr "Chức năng này bị tắt trong chế độ hạn chế"
 
-#: src/nano.c:573
+#: src/nano.c:574
 msgid "Help is not available"
 msgstr "Phần trợ giúp không sẵn có"
 
-#: src/nano.c:684
+#: src/nano.c:686
 #, c-format
 msgid ""
 "\n"
@@ -1453,7 +1471,7 @@ msgstr ""
 "\n"
 "Bộ nhớ đệm ghi vào %s\n"
 
-#: src/nano.c:686
+#: src/nano.c:688
 #, c-format
 msgid ""
 "\n"
@@ -1462,7 +1480,7 @@ msgstr ""
 "\n"
 "Bộ nhớ đệm chưa được ghi vào %s: %s\n"
 
-#: src/nano.c:689
+#: src/nano.c:691
 #, c-format
 msgid ""
 "\n"
@@ -1724,19 +1742,24 @@ msgstr "Bật tạm ngưng"
 msgid "Enable soft line wrapping"
 msgstr "Bật ngắt dòng mềm"
 
-#: src/nano.c:937
-#, c-format
-msgid " GNU nano, version %s\n"
+#: src/nano.c:940
+#, fuzzy, c-format
+msgid " nano, version %s\n"
 msgstr " GNU nano, phiên bản %s\n"
 
-#: src/nano.c:940
+#: src/nano.c:943
+#, c-format
+msgid " (C) 2014..%s the contributors to nano\n"
+msgstr ""
+
+#: src/nano.c:945
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr ""
 " Địa chỉ thư: nano@nano-editor.org\tWeb: http://www.nano-editor.org/\n"
 " Thông báo lỗi dịch cho: http://translationproject.org/team/vi.html"
 
-#: src/nano.c:941
+#: src/nano.c:946
 #, c-format
 msgid ""
 "\n"
@@ -1745,68 +1768,82 @@ msgstr ""
 "\n"
 " Tùy chọn biên dịch:"
 
-#: src/nano.c:1073
+#: src/nano.c:1081
 msgid "No file name"
 msgstr "Không có tên tập tin"
 
-#: src/nano.c:1108
-msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
+#: src/nano.c:1115
+msgid "Save modified buffer?  (Answering \"No\" will DISCARD changes.) "
 msgstr ""
-"Ghi lại bộ đệm đã được sửa đổi (TRẢ LỜI “K” SẼ BỎ MỌI THAY ĐỔI) (C/K) ? "
 
-#: src/nano.c:1168
+#: src/nano.c:1178
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "Tiếc là không thể mở lại đầu vào tiêu chuẩn từ bàn phím\n"
 
-#: src/nano.c:1192
+#: src/nano.c:1202
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "Đang đọc từ đầu vào tiêu chuẩn, bấm ^C để hủy bỏ\n"
 
-#: src/nano.c:1256
+#: src/nano.c:1266
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Nhận được tín hiệu SIGHUP hoặc SIGTERM\n"
 
-#: src/nano.c:1272
+#: src/nano.c:1282
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Dùng “fg” để quay lại nano.\n"
 
-#: src/nano.c:1294
+#: src/nano.c:1304
 msgid "Suspension is not enabled"
 msgstr "Chế độ tạm dừng không được bật"
 
-#: src/nano.c:1448
+#: src/nano.c:1459
 msgid "enabled"
 msgstr "được bật"
 
-#: src/nano.c:1448
+#: src/nano.c:1459
 msgid "disabled"
 msgstr "bị tắt"
 
-#: src/nano.c:1607 src/winio.c:1125
-msgid "Unknown Command"
-msgstr "Lệnh không rõ"
+#: src/nano.c:1573
+msgid "Unbound key"
+msgstr ""
+
+#: src/nano.c:1577
+#, c-format
+msgid "Unbound key: M-%c"
+msgstr ""
+
+#: src/nano.c:1579
+#, c-format
+msgid "Unbound key: ^%c"
+msgstr ""
+
+#: src/nano.c:1581
+#, c-format
+msgid "Unbound key: %c"
+msgstr ""
 
-#: src/nano.c:1720
+#: src/nano.c:1745
 msgid "XON ignored, mumble mumble"
 msgstr "XON bị lờ đi."
 
-#: src/nano.c:1725
+#: src/nano.c:1750
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF bị lờ đi."
 
-#: src/nano.c:2139 src/rcfile.c:1334
+#: src/nano.c:2166 src/rcfile.c:1187
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Yêu cầu một kích thước tab “%s” không hợp lệ"
 
-#: src/nano.c:2200 src/rcfile.c:1259
+#: src/nano.c:2227 src/rcfile.c:1128
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Yêu cầu một kích thước tô đầy “%s” không hợp lệ"
 
-#: src/nano.c:2247
+#: src/nano.c:2276
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr "Gõ “%s -h” để biết danh sách các tùy chọn sẵn có.\n"
@@ -1814,115 +1851,119 @@ msgstr "Gõ “%s -h” để biết danh sách các tùy chọn sẵn có.\n"
 #. TRANSLATORS: For the next three strings, if possible, specify
 #. * the single-byte shortcuts for both your language and English.
 #. * For example, in French: "OoYy" for "Oui".
-#: src/prompt.c:821
+#: src/prompt.c:818
 msgid "Yy"
 msgstr "YyCc"
 
-#: src/prompt.c:822
+#: src/prompt.c:819
 msgid "Nn"
 msgstr "NnKk"
 
-#: src/prompt.c:823
+#: src/prompt.c:820
 msgid "Aa"
 msgstr "AaTt"
 
-#: src/prompt.c:845
+#: src/prompt.c:842
 msgid "Yes"
 msgstr "Có"
 
-#: src/prompt.c:850
+#: src/prompt.c:847
 msgid "All"
 msgstr "Tất cả"
 
-#: src/prompt.c:855
+#: src/prompt.c:852
 msgid "No"
 msgstr "Không"
 
-#: src/rcfile.c:142
+#: src/rcfile.c:144
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Có lỗi trong %s trên dòng %lu: "
 
-#: src/rcfile.c:201
+#: src/rcfile.c:203
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "Đối số “%s” chưa được \" kết thúc"
 
-#: src/rcfile.c:228 src/rcfile.c:280 src/rcfile.c:732 src/rcfile.c:793
-#: src/rcfile.c:882 src/rcfile.c:933
+#: src/rcfile.c:231 src/rcfile.c:674 src/rcfile.c:725 src/rcfile.c:824
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Biểu thức chính quy phải bắt đầu và kết thúc bởi một ký tự \""
 
-#: src/rcfile.c:254 src/search.c:62
+#: src/rcfile.c:257 src/search.c:61
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Biểu thức chính sai “%s”: %s"
 
-#: src/rcfile.c:274
+#: src/rcfile.c:279
 msgid "Missing syntax name"
 msgstr "Thiếu tên cú pháp"
 
-#: src/rcfile.c:345
+#: src/rcfile.c:288
+msgid "A syntax name must be quoted"
+msgstr ""
+
+#: src/rcfile.c:297
 msgid "The \"none\" syntax is reserved"
 msgstr "Cú pháp “none” là được để dành dùng trong tương lai"
 
-#: src/rcfile.c:352
-msgid "The \"default\" syntax must take no extensions"
+#: src/rcfile.c:327
+#, fuzzy
+msgid "The \"default\" syntax does not accept extensions"
 msgstr "Cú pháp “default” không chấp nhận phần mở rộng"
 
-#: src/rcfile.c:424
+#: src/rcfile.c:369
 msgid "Missing key name"
 msgstr "Thiếu tên phím"
 
-#: src/rcfile.c:433 src/rcfile.c:444
+#: src/rcfile.c:378 src/rcfile.c:389
 msgid "Key name is too short"
 msgstr "Tên phím quá ngắn"
 
-#: src/rcfile.c:454
+#: src/rcfile.c:399
 msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr "Tên phím phải bắt đầu với “^”, “M” hoặc “F”"
 
-#: src/rcfile.c:457
+#: src/rcfile.c:402
 #, c-format
 msgid "Key name %s is invalid"
 msgstr "Tên phím “%s” không hợp lệ"
 
-#: src/rcfile.c:466
+#: src/rcfile.c:411
 msgid "Must specify a function to bind the key to"
 msgstr "Phải ghi rõ hàm ràng buộc với tổ hợp phím"
 
 #. TRANSLATORS: Do not translate the word "all".
-#: src/rcfile.c:476
+#: src/rcfile.c:421
 msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
 "Phải chỉ định một trình đơn (hoặc \"all\") để mà ràng buộc hay không vào phím"
 
-#: src/rcfile.c:483
+#: src/rcfile.c:428
 #, c-format
 msgid "Cannot map name \"%s\" to a function"
 msgstr "Không thể ánh xạ tên “%s” đến một hàm"
 
-#: src/rcfile.c:490
+#: src/rcfile.c:435
 #, c-format
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "Không thể ánh xạ tên “%s” đến một trình đơn"
 
-#: src/rcfile.c:522
+#: src/rcfile.c:467
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr "Chức năng “%s” không tồn tại trong trình đơn “%s”"
 
-#: src/rcfile.c:534
+#: src/rcfile.c:479
 #, c-format
 msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "Tiếc là không cho phép dùng tổ hợp phím “%s”"
 
-#: src/rcfile.c:631
+#: src/rcfile.c:576
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr "Gặp lỗi khi khải triển %s: %s"
 
-#: src/rcfile.c:674
+#: src/rcfile.c:616
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1945,65 +1986,50 @@ msgstr ""
 " * bright\tsáng\n"
 "cho màu của văn bản."
 
-#: src/rcfile.c:696
-msgid "Cannot add a color command without a syntax command"
-msgstr "Không thêm được một chỉ thị màu mà không có dòng cú pháp"
+#: src/rcfile.c:637 src/rcfile.c:795 src/rcfile.c:858
+#, c-format
+msgid "A '%s' command requires a preceding 'syntax' command"
+msgstr ""
 
-#: src/rcfile.c:701
+#: src/rcfile.c:643
 msgid "Missing color name"
 msgstr "Thiếu tên màu"
 
-#: src/rcfile.c:711 src/rcfile.c:872
-msgid "Missing regex string"
-msgstr "Thiếu các chuỗi biểu thức chính quy"
+#: src/rcfile.c:653 src/rcfile.c:807
+#, fuzzy, c-format
+msgid "Missing regex string after '%s' command"
+msgstr "Thiếu lệnh kiểm chuẩn"
 
-#: src/rcfile.c:787
+#: src/rcfile.c:719
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "“start=” (bắt đầu) thì yêu cầu một phần “end=” (kết thúc) tương ứng"
 
-#: src/rcfile.c:839
+#: src/rcfile.c:768
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
 msgstr "Màu nền “%s” không thể là màu sáng (khó đọc)"
 
-#: src/rcfile.c:867
-msgid "Cannot add a header regex without a syntax command"
-msgstr ""
-"Không thêm được một biểu thức chính quy kiểu phần đầu mà không có câu lệnh "
-"cú pháp"
-
-#: src/rcfile.c:922
-msgid "Cannot add a magic string regex without a syntax command"
-msgstr ""
-"Không thêm được một biểu thức chính quy kiểu chuỗi mà không có câu lệnh cú "
-"pháp"
-
-#: src/rcfile.c:927
-msgid "Missing magic string name"
-msgstr "Thiếu tên chuỗi kỳ diệu"
-
-#: src/rcfile.c:985
-msgid "Cannot add a linter without a syntax command"
-msgstr "Không thêm được một bộ kiểm chuẩn mà không có câu lệnh cú pháp"
+#: src/rcfile.c:802
+#, fuzzy, c-format
+msgid "The \"default\" syntax does not accept '%s' regexes"
+msgstr "Cú pháp “default” không chấp nhận phần mở rộng"
 
-#: src/rcfile.c:990
-msgid "Missing linter command"
+#: src/rcfile.c:863
+#, fuzzy, c-format
+msgid "Missing command after '%s'"
 msgstr "Thiếu lệnh kiểm chuẩn"
 
-#: src/rcfile.c:1011
-msgid "Cannot add formatter without a syntax command"
-msgstr "Không thêm được một bộ định dạng mà không có câu lệnh cú pháp"
-
-#: src/rcfile.c:1016
-msgid "Missing formatter command"
-msgstr "Thiếu lệnh chương trình định dạng"
+#: src/rcfile.c:879
+#, fuzzy, c-format
+msgid "Argument of '%s' lacks closing \""
+msgstr "Đối số “%s” chưa được \" kết thúc"
 
-#: src/rcfile.c:1046
+#: src/rcfile.c:910
 #, c-format
 msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr "Lỗi nghiêm trọng: chưa ánh xạ phím với chức năng “%s”. Thoát ra.\n"
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:912
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
@@ -2011,62 +2037,62 @@ msgstr ""
 "Nếu cần, hãy sử dụng trình soạn thảo nano với tùy chọn “-I” để điều chỉnh "
 "cài đặt nanorc của bạn.\n"
 
-#: src/rcfile.c:1109
+#: src/rcfile.c:971
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "Không thể tìm thấy cú pháp “%s” để khai triển"
 
-#: src/rcfile.c:1125 src/rcfile.c:1134 src/rcfile.c:1144
-#, c-format
-msgid "Command \"%s\" not allowed in included file"
-msgstr "Lệnh “%s” không được phép trong tập tin đã bao gồm"
-
-#: src/rcfile.c:1150 src/rcfile.c:1359
+#: src/rcfile.c:993 src/rcfile.c:1202
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Cú pháp “%s” không có câu lệnh màu"
 
-#: src/rcfile.c:1180
+#: src/rcfile.c:1024
+#, c-format
+msgid "Command \"%s\" not allowed in included file"
+msgstr "Lệnh “%s” không được phép trong tập tin đã bao gồm"
+
+#: src/rcfile.c:1039
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Không hiểu câu lệnh “%s”"
 
-#: src/rcfile.c:1195
+#: src/rcfile.c:1051
 msgid "Missing option"
 msgstr "Thiếu tùy chọn"
 
-#: src/rcfile.c:1217
+#: src/rcfile.c:1065
+#, c-format
+msgid "Unknown option \"%s\""
+msgstr "Không hiểu tùy chọn “%s”"
+
+#: src/rcfile.c:1077
+#, c-format
+msgid "Cannot unset option \"%s\""
+msgstr "Không thể bỏ đặt tùy chọn “%s”"
+
+#: src/rcfile.c:1089
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Tùy chọn “%s” cần một tham số"
 
-#: src/rcfile.c:1235
+#: src/rcfile.c:1105
 msgid "Option is not a valid multibyte string"
 msgstr "Tùy chọn không phải là một chuỗi đa byte hợp lệ"
 
-#: src/rcfile.c:1272 src/rcfile.c:1300 src/rcfile.c:1309
+#: src/rcfile.c:1139 src/rcfile.c:1160 src/rcfile.c:1167
 msgid "Non-blank characters required"
 msgstr "Yêu cầu các ký tự không phải khoảng trắng"
 
-#: src/rcfile.c:1282
+#: src/rcfile.c:1146
 msgid "Two single-column characters required"
 msgstr "Yêu cầu hai ký tự một cột"
 
-#: src/rcfile.c:1348
-#, c-format
-msgid "Cannot unset option \"%s\""
-msgstr "Không thể bỏ đặt tùy chọn “%s”"
-
-#: src/rcfile.c:1354
-#, c-format
-msgid "Unknown option \"%s\""
-msgstr "Không hiểu tùy chọn “%s”"
-
-#: src/rcfile.c:1413
+#: src/rcfile.c:1258
 msgid "I can't find my home directory!  Wah!"
 msgstr "Tôi không thể tìm thấy thư mục cá nhân của mình!"
 
-#: src/rcfile.c:1451
+#: src/rcfile.c:1295
 #, c-format
 msgid ""
 "\n"
@@ -2075,338 +2101,436 @@ msgstr ""
 "\n"
 "Nhấn Enter để tiếp tục khởi chạy nano.\n"
 
-#: src/search.c:96
+#: src/search.c:95
 #, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "Không tìm thấy “%.*s%s”"
 
 #. TRANSLATORS: The next three strings are modifiers of the search prompt.
-#: src/search.c:176
+#: src/search.c:169
 msgid " [Case Sensitive]"
 msgstr " [Phân biệt HOA/thường]"
 
-#: src/search.c:180
+#: src/search.c:173
 msgid " [Regexp]"
 msgstr " [BTCQ]"
 
-#: src/search.c:184
+#: src/search.c:177
 msgid " [Backwards]"
 msgstr " [Ngược lại]"
 
 #. TRANSLATORS: The next two strings are modifiers of the search prompt.
-#: src/search.c:189
+#: src/search.c:182
 msgid " (to replace) in selection"
 msgstr " (thay thế) trong lựa chọn"
 
-#: src/search.c:191
+#: src/search.c:184
 msgid " (to replace)"
 msgstr " (thay thế)"
 
+#: src/search.c:305
+#, fuzzy
+msgid "Searching..."
+msgstr "Tìm kiếm"
+
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:718
+#: src/search.c:693
 msgid "Replace this instance?"
 msgstr "Thay thế minh dụ này?"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:883
+#: src/search.c:840
 msgid "Replace with"
 msgstr "Thay thế bằng"
 
-#: src/search.c:924
+#: src/search.c:875
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
 msgstr[0] "Đã thay thế %lu lần"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:964
+#: src/search.c:914
 msgid "Enter line number, column number"
 msgstr "Nhập số thứ tự dòng, cột"
 
-#: src/search.c:991
+#: src/search.c:939
 msgid "Invalid line or column number"
 msgstr "Sai số thứ tự dòng hoặc cột"
 
-#: src/search.c:1124
+#: src/search.c:1080
 msgid "Not a bracket"
 msgstr "Không phải ngoặc đơn"
 
-#: src/search.c:1191
+#: src/search.c:1146
 msgid "No matching bracket"
 msgstr "Không có ngoặc đơn tương ứng"
 
-#: src/text.c:54
+#: src/text.c:53
 msgid "Mark Set"
 msgstr "Đánh dấu văn bản"
 
-#: src/text.c:58
+#: src/text.c:57
 msgid "Mark Unset"
 msgstr "Hủy dấu văn bản"
 
-#: src/text.c:70
+#: src/text.c:69
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Lỗi gọi “%s”"
 
-#: src/text.c:475
+#: src/text.c:468
+msgid "Commenting is not supported for this file type"
+msgstr ""
+
+#: src/text.c:484
+msgid "Cannot comment past end of file"
+msgstr ""
+
+#: src/text.c:677
 msgid "Nothing in undo buffer!"
 msgstr "Không có gì trong vùng đệm hủy bước!"
 
-#: src/text.c:481 src/text.c:634
-#, c-format
-msgid "Internal error: can't match line %d.  Please save your work."
-msgstr "Lỗi nội bộ: không thể khớp dòng %d. Hãy lưu công việc của bạn lại."
-
 #. TRANSLATORS: Eight of the next nine strings describe actions
 #. * that are undone or redone.  It are all nouns, not verbs.
-#: src/text.c:495 src/text.c:524 src/text.c:645 src/text.c:686
+#: src/text.c:695 src/text.c:724 src/text.c:857 src/text.c:898
 msgid "text add"
 msgstr "thêm văn bản"
 
-#: src/text.c:505 src/text.c:656
+#: src/text.c:705 src/text.c:868
 msgid "text delete"
 msgstr "xóa văn bản"
 
-#: src/text.c:528 src/text.c:694
+#: src/text.c:728 src/text.c:907
 msgid "line join"
 msgstr "nối dòng"
 
-#: src/text.c:547 src/text.c:710
+#: src/text.c:747 src/text.c:923
 msgid "text cut"
 msgstr "văn bản cắt"
 
-#: src/text.c:552 src/text.c:714
+#: src/text.c:752 src/text.c:927
 msgid "text uncut"
 msgstr "văn bản dán"
 
-#: src/text.c:558 src/text.c:691
+#: src/text.c:758 src/text.c:903
 msgid "Internal error: line is missing.  Please save your work."
 msgstr "Lỗi nội bộ: thiếu dòng. Hãy lưu công việc của bạn."
 
-#: src/text.c:561 src/text.c:665
+#: src/text.c:762 src/text.c:877
 msgid "line break"
 msgstr "ngắt dòng"
 
-#: src/text.c:569 src/text.c:725
+#: src/text.c:772 src/text.c:947
+msgid "comment"
+msgstr ""
+
+#: src/text.c:776 src/text.c:951
+msgid "uncomment"
+msgstr ""
+
+#: src/text.c:780 src/text.c:938
 msgid "text insert"
 msgstr "chèn văn bản"
 
-#: src/text.c:589 src/text.c:718
+#: src/text.c:800 src/text.c:931
 msgid "text replace"
 msgstr "thay thế văn bản"
 
-#: src/text.c:596 src/text.c:732 src/text.c:1030 src/text.c:1174
+#: src/text.c:807 src/text.c:955 src/text.c:1267 src/text.c:1437
 msgid "Internal error: unknown type.  Please save your work."
 msgstr "Lỗi nội bộ: không biết kiểu gì. Hãy lưu công việc của bạn lại."
 
-#: src/text.c:601
+#: src/text.c:813
 #, c-format
 msgid "Undid action (%s)"
 msgstr "Bước được hủy (%s)"
 
-#: src/text.c:619
+#: src/text.c:832
 msgid "Nothing to re-do!"
 msgstr "Không có gì cần hoàn lại!"
 
-#: src/text.c:628
+#: src/text.c:841
 msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
 "Lỗi nội bộ: không thể cài đặt redo (hoàn lại). Hãy lưu công việc của bạn lại."
 
-#: src/text.c:737
+#: src/text.c:961
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Bước được hoàn lại (%s)"
 
-#: src/text.c:827 src/text.c:2508 src/text.c:2944
+#: src/text.c:1051 src/text.c:2765 src/text.c:3198
 msgid "Could not create pipe"
 msgstr "Không thể tạo đường ống"
 
-#: src/text.c:853 src/text.c:2595 src/text.c:2750 src/text.c:2992
-#: src/text.c:3286
+#: src/text.c:1077 src/text.c:2852 src/text.c:3005 src/text.c:3246
+#: src/text.c:3540
 msgid "Could not fork"
 msgstr "Không thể tạo tiến trình con"
 
-#: src/text.c:1853
+#: src/text.c:2117
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Chuỗi trích dẫn sai %s: %s"
 
-#: src/text.c:2241
+#: src/text.c:2499
 msgid "Can now UnJustify!"
 msgstr "Bây giờ có thể Bỏ sắp chữ!"
 
-#: src/text.c:2435
+#: src/text.c:2697
 msgid "Edit a replacement"
 msgstr "Sửa chuỗi thay thế"
 
-#: src/text.c:2510
+#. TRANSLATORS: Shown after fixing misspellings in one word.
+#: src/text.c:2713
+#, fuzzy
+msgid "Next word..."
+msgstr "Từ kế"
+
+#: src/text.c:2767
 msgid "Creating misspelled word list, please wait..."
 msgstr "Đang tạo danh sách từ sai chính tả, xin hãy chờ…"
 
-#: src/text.c:2601 src/text.c:2999
+#: src/text.c:2858 src/text.c:3253
 msgid "Could not get size of pipe buffer"
 msgstr "Không lấy được kích thước của bộ đệm đường ống"
 
-#: src/text.c:2652
+#: src/text.c:2907
 msgid "Error invoking \"spell\""
 msgstr "Gặp lỗi khi gọi “spell”"
 
-#: src/text.c:2655
+#: src/text.c:2910
 msgid "Error invoking \"sort -f\""
 msgstr "Gặp lỗi khi gọi “sort -f”"
 
-#: src/text.c:2658
+#: src/text.c:2913
 msgid "Error invoking \"uniq\""
 msgstr "Gặp lỗi khi gọi “uniq”"
 
-#: src/text.c:2881
+#: src/text.c:3135
 msgid "Invoking spell checker, please wait"
 msgstr "Gọi trình kiểm tra chính tả, vui lòng chờ"
 
-#: src/text.c:2897
+#: src/text.c:3151
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Kiểm tra chính tả không thành công: %s"
 
-#: src/text.c:2899
+#: src/text.c:3153
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Kiểm tra chính tả không thành công: %s: %s"
 
-#: src/text.c:2902
+#: src/text.c:3156
 msgid "Finished checking spelling"
 msgstr "Hoàn thành việc kiểm tra chính tả"
 
-#: src/text.c:2927
+#: src/text.c:3181
 msgid "No linter defined for this type of file!"
 msgstr "Không có kiểm chuẩn cho kiểu này của tập tin!"
 
-#: src/text.c:2932
+#: src/text.c:3186
 msgid "Save modified buffer before linting?"
 msgstr "Ghi lại bộ đệm đã sửa trước khi kiểm chuẩn?"
 
-#: src/text.c:2949
+#: src/text.c:3203
 msgid "Invoking linter, please wait"
 msgstr "Đang gọi bộ kiểm chuẩn, vui lòng chờ"
 
-#: src/text.c:3105
+#: src/text.c:3358
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr "Nhận được 0 dòng có thể phân tích từ lệnh: %s"
 
-#: src/text.c:3134
+#: src/text.c:3388
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
 "Lời nhắn này là dành cho tập tin %s chưa được mở, mở nó trong bộ đệm mới?"
 
-#: src/text.c:3153
+#: src/text.c:3407
 msgid "No more errors in unopened files, cancelling"
 msgstr "Không có thêm các lỗi trong các tập tin chưa được mở, nên hủy bỏ"
 
-#: src/text.c:3192
+#: src/text.c:3446
 msgid "At last message"
 msgstr "Tại thông báo cuối"
 
-#: src/text.c:3197
+#: src/text.c:3451
 msgid "At first message"
 msgstr "Tại thông báo đầu"
 
-#: src/text.c:3237
+#: src/text.c:3491
 msgid "Finished"
 msgstr "Đã xong"
 
-#: src/text.c:3259
+#: src/text.c:3513
 msgid "Invoking formatter, please wait"
 msgstr "Đang gọi bộ định dạng, vui lòng chờ"
 
-#: src/text.c:3314
+#: src/text.c:3568
 msgid "Finished formatting"
 msgstr "Hoàn tất định dạng"
 
-#: src/text.c:3396
+#: src/text.c:3650
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sTừ: %lu  Dòng: %ld  Ký tự: %lu"
 
-#: src/text.c:3397
+#: src/text.c:3651
 msgid "In Selection:  "
 msgstr "Trong lựa chọn:  "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3411
+#: src/text.c:3665
 msgid "Verbatim Input"
 msgstr "Dữ liệu nhập nguyên bản"
 
-#: src/utils.c:391 src/utils.c:403
+#: src/utils.c:392 src/utils.c:404
 msgid "nano is out of memory!"
 msgstr "nano làm hết bộ nhớ!"
 
+#: src/utils.c:625
+#, c-format
+msgid "Internal error: can't match line %d.  Please save your work."
+msgstr "Lỗi nội bộ: không thể khớp dòng %d. Hãy lưu công việc của bạn lại."
+
+#. TRANSLATORS: This refers to a sequence of escape codes
+#. * (from the keyboard) that nano does not know about.
+#: src/winio.c:1121
+msgid "Unknown sequence"
+msgstr ""
+
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
 #: src/winio.c:1427
 msgid "Unicode Input"
 msgstr "Dữ liệu nhập Unicode"
 
-#: src/winio.c:1991 src/winio.c:1995
-msgid "Modified"
-msgstr "Đã sửa đổi"
-
-#: src/winio.c:1992
-msgid "View"
-msgstr "Trình bày"
-
-#: src/winio.c:2006
+#: src/winio.c:1960
 msgid "DIR:"
 msgstr "TMỤC:"
 
-#: src/winio.c:2013
+#: src/winio.c:1968
 msgid "File:"
 msgstr "Tập tin:"
 
-#: src/winio.c:3141
+#: src/winio.c:1972 src/winio.c:1976
+msgid "Modified"
+msgstr "Đã sửa đổi"
+
+#: src/winio.c:1974
+msgid "View"
+msgstr "Trình bày"
+
+#: src/winio.c:3105
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "dòng %ld/%ld (%d%%), cột %lu/%lu (%d%%), ký tự %lu/%lu (%d%%)"
 
-#: src/winio.c:3271
+#: src/winio.c:3235
 msgid "The nano text editor"
 msgstr "Trình soạn thảo văn bản nano"
 
-#: src/winio.c:3272
+#: src/winio.c:3236
 msgid "version"
 msgstr "phiên bản"
 
-#: src/winio.c:3273
+#: src/winio.c:3237
 msgid "Brought to you by:"
 msgstr "Được đem tới bởi:"
 
-#: src/winio.c:3274
+#: src/winio.c:3238
 msgid "Special thanks to:"
 msgstr "Đặc biệt cảm ơn:"
 
-#: src/winio.c:3275
+#: src/winio.c:3239
 msgid "The Free Software Foundation"
 msgstr "Tổ chức Phần mềm Tự do (FSF)"
 
-#: src/winio.c:3276
+#: src/winio.c:3240
 msgid "the many translators and the TP"
 msgstr "nhiều người dịch thuật và TP"
 
-#: src/winio.c:3277
+#: src/winio.c:3241
 msgid "For ncurses:"
 msgstr "Dành cho ncurses:"
 
-#: src/winio.c:3278
+#: src/winio.c:3242
 msgid "and anyone else we forgot..."
 msgstr "và những người khác mà chúng tôi quên…"
 
-#: src/winio.c:3279
+#: src/winio.c:3243
 msgid "Thank you for using nano!"
 msgstr "Cảm ơn bạn đã dùng nano!"
 
+#~ msgid ""
+#~ "Read %lu line (Converted from DOS and Mac format - Warning: No write "
+#~ "permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from DOS and Mac format - Warning: No write "
+#~ "permission)"
+#~ msgstr[0] ""
+#~ "Đọc %lu dòng (Đã chuyển đổi từ định dạng DOS và Mac — Cảnh báo: Không có "
+#~ "quyền ghi)"
+
+#~ msgid ""
+#~ "Read %lu line (Converted from Mac format - Warning: No write permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from Mac format - Warning: No write permission)"
+#~ msgstr[0] ""
+#~ "Đọc %lu dòng (Đã chuyển đổi từ định dạng Mac — Cảnh báo: không có quyền "
+#~ "ghi)"
+
+#~ msgid ""
+#~ "Read %lu line (Converted from DOS format - Warning: No write permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from DOS format - Warning: No write permission)"
+#~ msgstr[0] ""
+#~ "Đọc %lu dòng (Đã chuyển đổi từ định dạng DOS — Cảnh báo: không có quyền "
+#~ "ghi)"
+
+#~ msgid "Read %lu line (Warning: No write permission)"
+#~ msgid_plural "Read %lu lines (Warning: No write permission)"
+#~ msgstr[0] "Đọc %lu dòng (Cảnh báo: Không có quyền ghi)"
+
+#~ msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
+#~ msgstr ""
+#~ "Ghi lại bộ đệm đã được sửa đổi (TRẢ LỜI “K” SẼ BỎ MỌI THAY ĐỔI) (C/K) ? "
+
+#~ msgid "Unknown Command"
+#~ msgstr "Lệnh không rõ"
+
+#~ msgid "Cannot add a color command without a syntax command"
+#~ msgstr "Không thêm được một chỉ thị màu mà không có dòng cú pháp"
+
+#~ msgid "Missing regex string"
+#~ msgstr "Thiếu các chuỗi biểu thức chính quy"
+
+#~ msgid "Cannot add a header regex without a syntax command"
+#~ msgstr ""
+#~ "Không thêm được một biểu thức chính quy kiểu phần đầu mà không có câu "
+#~ "lệnh cú pháp"
+
+#~ msgid "Cannot add a magic string regex without a syntax command"
+#~ msgstr ""
+#~ "Không thêm được một biểu thức chính quy kiểu chuỗi mà không có câu lệnh "
+#~ "cú pháp"
+
+#~ msgid "Missing magic string name"
+#~ msgstr "Thiếu tên chuỗi kỳ diệu"
+
+#~ msgid "Cannot add a linter without a syntax command"
+#~ msgstr "Không thêm được một bộ kiểm chuẩn mà không có câu lệnh cú pháp"
+
+#~ msgid "Cannot add formatter without a syntax command"
+#~ msgstr "Không thêm được một bộ định dạng mà không có câu lệnh cú pháp"
+
+#~ msgid "Missing formatter command"
+#~ msgstr "Thiếu lệnh chương trình định dạng"
+
 #~ msgid "Cannot prepend or append to a symlink with --nofollow set"
 #~ msgstr ""
 #~ "Không thể thêm vào trước hoặc thêm vào sau một liên kết mềm bằng tùy chọn "
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 61f8bd55..6de9d22d 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 2.4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-25 16:41-0500\n"
+"POT-Creation-Date: 2016-06-17 15:41+0200\n"
 "PO-Revision-Date: 2015-11-13 12:46+0800\n"
 "Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -18,349 +18,339 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: src/browser.c:144 src/browser.c:284 src/browser.c:334 src/files.c:996
+#: src/files.c:1003 src/files.c:1794 src/files.c:1919 src/files.c:1963
+#: src/files.c:1983 src/files.c:2099 src/files.c:3019 src/files.c:3242
+#: src/rcfile.c:540 src/rcfile.c:1280
+#, c-format
+msgid "Error reading %s: %s"
+msgstr "读取%s 出错：%s"
+
 #. TRANSLATORS: This is a prompt.
-#: src/browser.c:220
+#: src/browser.c:247
 msgid "Go To Directory"
 msgstr "跳至目录"
 
-#: src/browser.c:227 src/browser.c:738 src/files.c:1174 src/files.c:2340
-#: src/nano.c:1120 src/search.c:202 src/search.c:290 src/search.c:895
-#: src/search.c:970 src/text.c:2935 src/text.c:3142
+#: src/browser.c:254 src/browser.c:723 src/files.c:1126 src/files.c:2292
+#: src/nano.c:1128 src/search.c:195 src/search.c:297 src/search.c:851
+#: src/search.c:918 src/text.c:3189 src/text.c:3396
 msgid "Cancelled"
 msgstr "已取消"
 
-#: src/browser.c:253 src/browser.c:300
-#, c-format
-msgid "Can't go outside of %s in restricted mode"
+#. TRANSLATORS: This refers to the option --operatingdir,
+#. * not to --restricted.
+#: src/browser.c:274 src/browser.c:326
+#, fuzzy, c-format
+msgid "Can't go outside of %s in confined mode"
 msgstr "在限制模式中无法跳至%s 外部"
 
-#: src/browser.c:264 src/browser.c:310 src/browser.c:326 src/files.c:1044
-#: src/files.c:1052 src/files.c:1844 src/files.c:1971 src/files.c:2016
-#: src/files.c:2037 src/files.c:2156 src/files.c:3062 src/files.c:3285
-#: src/rcfile.c:596 src/rcfile.c:1435
-#, c-format
-msgid "Error reading %s: %s"
-msgstr "读取%s 出错：%s"
-
-#: src/browser.c:290
+#: src/browser.c:317
 msgid "Can't move up a directory"
 msgstr "无法上移一个目录"
 
 #. TRANSLATORS: Try to keep this at most 7 characters.
-#: src/browser.c:615 src/browser.c:623
+#: src/browser.c:590 src/browser.c:598
 msgid "(dir)"
 msgstr "(目录)"
 
 #. TRANSLATORS: Try to keep this at most 12 characters.
-#: src/browser.c:620
+#: src/browser.c:595
 msgid "(parent dir)"
 msgstr "(父目录)"
 
 #. TRANSLATORS: Try to keep this at most 7 characters.
 #. * If necessary, you can leave out the parentheses.
-#: src/browser.c:650
+#: src/browser.c:625
 msgid "(huge)"
 msgstr ""
 
 #. TRANSLATORS: This is the main search prompt.
-#: src/browser.c:727 src/search.c:173
+#: src/browser.c:712 src/search.c:166
 msgid "Search"
 msgstr "搜索"
 
-#: src/browser.c:777 src/search.c:466 src/search.c:536
-msgid "This is the only occurrence"
-msgstr "这是惟一出现之处"
-
-#: src/browser.c:793 src/search.c:364
+#: src/browser.c:754 src/search.c:368
 msgid "Search Wrapped"
 msgstr "已从头搜索"
 
-#: src/browser.c:843 src/search.c:517
+#: src/browser.c:764 src/search.c:509
+msgid "This is the only occurrence"
+msgstr "这是惟一出现之处"
+
+#: src/browser.c:812 src/search.c:473
 msgid "No current search pattern"
 msgstr "没有当前搜索模式"
 
-#: src/files.c:50
+#: src/color.c:186
+#, fuzzy, c-format
+msgid "Unknown syntax name: %s"
+msgstr "缺少语法名称"
+
+#: src/color.c:247
+#, c-format
+msgid "magic_load() failed: %s"
+msgstr ""
+
+#: src/color.c:251
+#, c-format
+msgid "magic_file(%s) failed: %s"
+msgstr ""
+
+#: src/files.c:47
 #, fuzzy, c-format
 msgid "Directory '%s' does not exist"
 msgstr "写入备份文件%s 出错：文件所有者不匹配"
 
-#: src/files.c:52
+#: src/files.c:49
 #, c-format
 msgid "Path '%s': %s"
 msgstr ""
 
-#: src/files.c:54
+#: src/files.c:51
 #, fuzzy, c-format
 msgid "Path '%s' is not a directory"
 msgstr "\"%s\" 是一个目录"
 
-#: src/files.c:57
+#: src/files.c:53
 #, c-format
 msgid "Path '%s' is not accessible"
 msgstr ""
 
-#. TRANSLATORS: Try to keep this at most 76 characters.
-#: src/files.c:158
+#. TRANSLATORS: Keep the next ten messages at most 76 characters.
+#: src/files.c:148
 msgid ""
 "Warning: Modifying a file which is not locked, check directory permission?"
 msgstr ""
 
-#: src/files.c:197
+#: src/files.c:187
 msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
 msgstr ""
 
-#: src/files.c:206
+#: src/files.c:196
 #, c-format
 msgid "Couldn't determine hostname for lock file: %s"
 msgstr ""
 
-#: src/files.c:227 src/files.c:238 src/files.c:275 src/files.c:285
+#: src/files.c:216 src/files.c:225 src/files.c:262 src/files.c:272
 #, fuzzy, c-format
 msgid "Error writing lock file %s: %s"
 msgstr "写入备份文件%s 出错：%s"
 
-#: src/files.c:305
+#: src/files.c:291
 #, fuzzy, c-format
 msgid "Error deleting lock file %s: %s"
 msgstr "写入备份文件%s 出错：%s"
 
-#: src/files.c:341
+#: src/files.c:325
 #, fuzzy, c-format
 msgid "Error opening lock file %s: %s"
 msgstr "写入备份文件%s 出错：%s"
 
-#: src/files.c:353
+#: src/files.c:337
 #, c-format
 msgid "Error reading lock file %s: Not enough data read"
 msgstr ""
 
 #. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
-#: src/files.c:371
+#: src/files.c:354
 #, c-format
 msgid "File %s is being edited (by %s with %s, PID %d); continue?"
 msgstr ""
 
-#: src/files.c:426
+#: src/files.c:430
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "无法插入%s 外部的文件"
 
-#: src/files.c:439 src/files.c:1038 src/rcfile.c:589 src/rcfile.c:1385
-#: src/rcfile.c:1426
+#: src/files.c:445 src/files.c:991 src/rcfile.c:533 src/rcfile.c:1230
+#: src/rcfile.c:1271
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" 是一个目录"
 
-#: src/files.c:441
+#: src/files.c:447
 #, fuzzy, c-format
 msgid "\"%s\" is not a normal file"
 msgstr "\"%s\" 是一个设备文件"
 
-#: src/files.c:566
+#: src/files.c:571
 msgid "No more open file buffers"
 msgstr "无多余文件缓冲区可启用"
 
-#: src/files.c:582
+#: src/files.c:586
 #, c-format
 msgid "Switched to %s"
 msgstr "切换至%s"
 
-#: src/files.c:584 src/global.c:988 src/winio.c:2010
+#: src/files.c:588 src/global.c:1005 src/winio.c:1965
 msgid "New Buffer"
 msgstr "新缓冲区"
 
-#: src/files.c:943
+#. TRANSLATORS: Keep the next four messages at most 76 characters.
+#: src/files.c:913
 #, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
 msgstr[0] "已读取%lu 行(转换自DOS 与Mac 格式)"
 
-#: src/files.c:948
-#, c-format
-msgid ""
-"Read %lu line (Converted from DOS and Mac format - Warning: No write "
-"permission)"
-msgid_plural ""
-"Read %lu lines (Converted from DOS and Mac format - Warning: No write "
-"permission)"
-msgstr[0] "已读取%lu 行(转换自DOS 与Mac 格式- 警告：无写入权限)"
-
-#: src/files.c:954
+#: src/files.c:919
 #, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
 msgstr[0] "已读取%lu 行 (转换自Mac 格式)"
 
-#: src/files.c:958
-#, c-format
-msgid ""
-"Read %lu line (Converted from Mac format - Warning: No write permission)"
-msgid_plural ""
-"Read %lu lines (Converted from Mac format - Warning: No write permission)"
-msgstr[0] "已读取%lu 行 (转换自Mac 格式- 警告：无写入权限)"
-
-#: src/files.c:964
+#: src/files.c:925
 #, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
 msgstr[0] "已读取%lu 行 (转换自DOS 格式)"
 
-#: src/files.c:968
-#, c-format
-msgid ""
-"Read %lu line (Converted from DOS format - Warning: No write permission)"
-msgid_plural ""
-"Read %lu lines (Converted from DOS format - Warning: No write permission)"
-msgstr[0] "已读取%lu 行 (转换自DOS 格式- 警告：无写入权限)"
-
-#: src/files.c:974
+#: src/files.c:930
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "已读取%lu 行"
 
-#: src/files.c:977
-#, fuzzy, c-format
-msgid "Read %lu line (Warning: No write permission)"
-msgid_plural "Read %lu lines (Warning: No write permission)"
-msgstr[0] "已读取%lu 行(警告：无写入权限)"
-
-#: src/files.c:1019 src/files.c:1056
+#: src/files.c:974 src/files.c:1006
 msgid "Reading File"
 msgstr "正在读取文件"
 
-#: src/files.c:1025
+#: src/files.c:980
 msgid "New File"
 msgstr "新文件"
 
-#: src/files.c:1028
-#, c-format
-msgid "\"%s\" not found"
+#: src/files.c:983
+#, fuzzy, c-format
+msgid "File \"%s\" not found"
 msgstr "找不到\"%s\""
 
-#: src/files.c:1039 src/rcfile.c:590 src/rcfile.c:1386 src/rcfile.c:1427
+#: src/files.c:992 src/rcfile.c:534 src/rcfile.c:1231 src/rcfile.c:1272
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" 是一个设备文件"
 
-#: src/files.c:1133
+#: src/files.c:1083
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "在新缓冲区中执行的命令 [从%s] "
 
-#: src/files.c:1135
+#: src/files.c:1085
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "执行的命令 [从%s] "
 
-#: src/files.c:1142
+#: src/files.c:1092
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "要插入新缓冲区的文件 [从%s] "
 
-#: src/files.c:1144
+#: src/files.c:1094
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "要插入的文件 [从%s] "
 
-#: src/files.c:1389
+#: src/files.c:1338
 msgid "Key invalid in non-multibuffer mode"
 msgstr "非多重缓冲区模式中此按键无效"
 
-#: src/files.c:1684
-msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+#: src/files.c:1632
+#, fuzzy
+msgid "Failed to write backup file; continue saving? (Say N if unsure.) "
 msgstr "写入备份文件失败，继续保存吗？(如果不确定请输入N)"
 
-#: src/files.c:1800
+#: src/files.c:1750
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "无法写入%s 外部"
 
-#: src/files.c:1885 src/files.c:1910 src/files.c:1928 src/files.c:1941
-#: src/files.c:1952 src/files.c:1981
+#: src/files.c:1833 src/files.c:1858 src/files.c:1876 src/files.c:1889
+#: src/files.c:1900 src/files.c:1928
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "写入备份文件%s 出错：%s"
 
-#: src/files.c:1886 src/nano.c:690
+#: src/files.c:1834 src/nano.c:692
 msgid "Too many backup files?"
 msgstr "太多备份文件？"
 
-#: src/files.c:2026 src/text.c:2863 src/text.c:2875 src/text.c:3244
-#: src/text.c:3253
+#: src/files.c:1972 src/text.c:3117 src/text.c:3129 src/text.c:3498
+#: src/text.c:3507
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "写入临时文件%s 出错"
 
-#: src/files.c:2049 src/files.c:2068 src/files.c:2080 src/files.c:2104
-#: src/files.c:2121 src/files.c:2131 src/files.c:2164 src/files.c:2171
+#: src/files.c:1994 src/files.c:2013 src/files.c:2023 src/files.c:2047
+#: src/files.c:2064 src/files.c:2074 src/files.c:2106 src/files.c:2113
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "写入%s 出错：%s"
 
-#: src/files.c:2200
+#: src/files.c:2154
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "已写入%lu 行"
 
-#: src/files.c:2299
+#: src/files.c:2249
 msgid " [DOS Format]"
 msgstr " [DOS 格式]"
 
-#: src/files.c:2300
+#: src/files.c:2250
 msgid " [Mac Format]"
 msgstr " [Mac 格式]"
 
-#: src/files.c:2302
+#: src/files.c:2252
 msgid " [Backup]"
 msgstr " [备份]"
 
-#: src/files.c:2309
+#: src/files.c:2259
 msgid "Prepend Selection to File"
 msgstr "前引选择部份于文件"
 
-#: src/files.c:2310
+#: src/files.c:2260
 msgid "Append Selection to File"
 msgstr "附加选择部份至文件"
 
-#: src/files.c:2311
+#: src/files.c:2261
 msgid "Write Selection to File"
 msgstr "写入选择部份至文件"
 
-#: src/files.c:2314
+#: src/files.c:2264
 msgid "File Name to Prepend to"
 msgstr "要前引于的文件名"
 
-#: src/files.c:2315
+#: src/files.c:2265
 msgid "File Name to Append to"
 msgstr "要附加至的文件名"
 
-#: src/files.c:2316
+#: src/files.c:2266
 msgid "File Name to Write"
 msgstr "要写入的文件名"
 
-#: src/files.c:2349
-msgid "Save modified buffer anyway ? "
+#: src/files.c:2301
+msgid "Save modified buffer anyway? "
 msgstr ""
 
-#: src/files.c:2457
-msgid "File exists, OVERWRITE ? "
-msgstr "文件已存在，要覆盖吗？"
-
-#: src/files.c:2466
-msgid "Save file under DIFFERENT NAME ? "
+#: src/files.c:2412
+#, fuzzy
+msgid "Save file under DIFFERENT NAME? "
 msgstr "以不同的名称存档？"
 
-#: src/files.c:2480
-msgid "File was modified since you opened it, continue saving ? "
+#: src/files.c:2420
+#, fuzzy, c-format
+msgid "File \"%s\" exists; OVERWRITE? "
+msgstr "文件已存在，要覆盖吗？"
+
+#: src/files.c:2441
+#, fuzzy
+msgid "File was modified since you opened it; continue saving? "
 msgstr "在您打开文件后文件已被改变，是否继续保存？"
 
-#: src/files.c:2917
+#: src/files.c:2874
 msgid "(more)"
 msgstr "(更多)"
 
-#: src/files.c:3004
+#: src/files.c:2959
 #, c-format
 msgid ""
 "\n"
@@ -369,7 +359,7 @@ msgstr ""
 "\n"
 "按下回车键继续\n"
 
-#: src/files.c:3020
+#: src/files.c:2975
 #, fuzzy, c-format
 msgid ""
 "Unable to create directory %s: %s\n"
@@ -378,7 +368,7 @@ msgstr ""
 "无法创建目录 %s：%s\n"
 "然而保存和载入搜索历史或光标位置需要它。\n"
 
-#: src/files.c:3026
+#: src/files.c:2982
 #, fuzzy, c-format
 msgid ""
 "Path %s is not a directory and needs to be.\n"
@@ -387,7 +377,7 @@ msgstr ""
 "路径%s 应为一个目录，但现在不是。\n"
 "Nano 将无法载入或保存搜索历史或光标位置\n"
 
-#: src/files.c:3045
+#: src/files.c:3002
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I tried to move\n"
@@ -396,7 +386,7 @@ msgstr ""
 "检测到了旧版的Nano 历史文件(%s)并试图移动到默认位置(%s)。\n"
 "此操作出现错误：%s"
 
-#: src/files.c:3049
+#: src/files.c:3006
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I moved\n"
@@ -406,747 +396,778 @@ msgstr ""
 "检测到了旧版的Nano 历史文件(%s)并已移动到默认位置(%s)。\n"
 "(关于这个变更请参阅Nano 常见问题解答)"
 
-#: src/files.c:3132 src/files.c:3140 src/files.c:3164 src/files.c:3176
+#: src/files.c:3089 src/files.c:3097 src/files.c:3121 src/files.c:3133
 #, fuzzy, c-format
 msgid "Error writing %s: %s\n"
 msgstr "写入%s 出错：%s"
 
 #. TRANSLATORS: Try to keep the next fifteen strings at most 10 characters.
-#: src/global.c:480
+#: src/global.c:483
 msgid "Exit"
 msgstr "离开"
 
-#: src/global.c:481
+#: src/global.c:484
 msgid "Close"
 msgstr "关闭"
 
-#: src/global.c:482
+#: src/global.c:485
 #, fuzzy
 msgid "Uncut Text"
 msgstr "还原剪切"
 
-#: src/global.c:484
+#: src/global.c:487
 #, fuzzy
 msgid "Unjustify"
 msgstr "还原对齐"
 
-#: src/global.c:490
+#: src/global.c:493
 msgid "Read File"
 msgstr "读档"
 
-#: src/global.c:491
+#: src/global.c:494
 msgid "Where Is"
 msgstr "搜索"
 
-#: src/global.c:492
+#: src/global.c:495
 msgid "Replace"
 msgstr "替换"
 
-#: src/global.c:493
+#: src/global.c:496
 msgid "Go To Line"
 msgstr "跳行"
 
-#: src/global.c:494
+#: src/global.c:497
 msgid "Prev Line"
 msgstr "上行"
 
-#: src/global.c:495
+#: src/global.c:498
 msgid "Next Line"
 msgstr "下行"
 
-#: src/global.c:496
+#: src/global.c:499
 msgid "Prev Page"
 msgstr "上页"
 
-#: src/global.c:497
+#: src/global.c:500
 msgid "Next Page"
 msgstr "下页"
 
-#: src/global.c:499
+#: src/global.c:502
 msgid "Justify"
 msgstr "对齐"
 
-#: src/global.c:500
+#: src/global.c:503
 msgid "FullJstify"
 msgstr "全部对齐"
 
-#: src/global.c:502
+#: src/global.c:505
 msgid "Refresh"
 msgstr "刷新"
 
 #. TRANSLATORS: Try to keep this string at most 12 characters.
-#: src/global.c:505
+#: src/global.c:508
 msgid "WhereIs Next"
 msgstr "何处是下一个"
 
 #. TRANSLATORS: The next long series of strings are shortcut descriptions;
 #. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:512
+#: src/global.c:515
 msgid "Justify the current paragraph"
 msgstr "对齐当前段落"
 
-#: src/global.c:514
+#: src/global.c:517
 msgid "Cancel the current function"
 msgstr "取消当前功能"
 
-#: src/global.c:515
+#: src/global.c:518
 msgid "Display this help text"
 msgstr "显示帮助"
 
-#: src/global.c:518
+#: src/global.c:521
 msgid "Close the current file buffer / Exit from nano"
 msgstr "关闭当前文件缓冲区 / 离开 nano"
 
-#: src/global.c:520
+#: src/global.c:523
 msgid "Exit from nano"
 msgstr "离开 nano"
 
-#: src/global.c:524
+#: src/global.c:527
 msgid "Write the current file to disk"
 msgstr "写入当前文件至磁盘"
 
-#: src/global.c:526
+#: src/global.c:529
 msgid "Insert another file into the current one"
 msgstr "插入其他文件至当前文件"
 
-#: src/global.c:528
+#: src/global.c:531
 msgid "Search for a string or a regular expression"
 msgstr "查找字符串或正则表示式"
 
-#: src/global.c:531
+#: src/global.c:533
 #, fuzzy
 msgid "Search for a string"
 msgstr "查找字符串或正则表示式"
 
-#: src/global.c:533
+#: src/global.c:534
+msgid "Refresh the file list"
+msgstr ""
+
+#: src/global.c:535
+#, fuzzy
+msgid "Go to lefthand column"
+msgstr "跳至指定行与列位置"
+
+#: src/global.c:536
+#, fuzzy
+msgid "Go to righthand column"
+msgstr "跳至指定行与列位置"
+
+#: src/global.c:538
 #, fuzzy
 msgid "Go one screenful up"
 msgstr "跳至后一屏"
 
-#: src/global.c:534
+#: src/global.c:539
 #, fuzzy
 msgid "Go one screenful down"
 msgstr "跳至后一屏"
 
-#: src/global.c:536
+#: src/global.c:541
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "剪切当前这行并存至剪贴板"
 
-#: src/global.c:538
+#: src/global.c:543
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "从剪贴板粘贴至当前行"
 
-#: src/global.c:539
+#: src/global.c:544
 msgid "Display the position of the cursor"
 msgstr "显示光标位置"
 
-#: src/global.c:541
+#: src/global.c:546
 msgid "Invoke the spell checker, if available"
 msgstr "尝试运行拼写检查"
 
-#: src/global.c:543
+#: src/global.c:548
 msgid "Replace a string or a regular expression"
 msgstr "替换字符串或正则表示式"
 
-#: src/global.c:544
+#: src/global.c:549
 msgid "Go to line and column number"
 msgstr "跳至指定行与列位置"
 
-#: src/global.c:546
+#: src/global.c:551
 #, fuzzy
 msgid "Mark text starting from the cursor position"
 msgstr "标记游标所在文字"
 
-#: src/global.c:547
+#: src/global.c:552
 #, fuzzy
 msgid "Repeat the last search"
 msgstr "重复上次搜索"
 
-#: src/global.c:549
+#: src/global.c:554
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "拷贝当前行至剪贴板"
 
-#: src/global.c:550
+#: src/global.c:555
 msgid "Indent the current line"
 msgstr "缩进当前行"
 
-#: src/global.c:551
+#: src/global.c:556
 msgid "Unindent the current line"
 msgstr "取消缩进当前行"
 
-#: src/global.c:552
+#: src/global.c:558
+msgid "Comment/uncomment the current line or marked lines"
+msgstr ""
+
+#: src/global.c:560
 msgid "Undo the last operation"
 msgstr "撤销上次操作"
 
-#: src/global.c:553
+#: src/global.c:561
 msgid "Redo the last undone operation"
 msgstr "重做撤销的操作"
 
-#: src/global.c:555
+#: src/global.c:563
 msgid "Go back one character"
 msgstr "向后跳一字符"
 
-#: src/global.c:556
+#: src/global.c:564
 msgid "Go forward one character"
 msgstr "向前跳一字符"
 
-#: src/global.c:558
+#: src/global.c:566
 msgid "Go back one word"
 msgstr "向后跳一个词"
 
-#: src/global.c:559
+#: src/global.c:567
 msgid "Go forward one word"
 msgstr "向前跳一个词"
 
-#: src/global.c:561
+#: src/global.c:569
 msgid "Go to previous line"
 msgstr "跳至前一行"
 
-#: src/global.c:562
+#: src/global.c:570
 msgid "Go to next line"
 msgstr "跳至后一行"
 
-#: src/global.c:563
+#: src/global.c:571
 msgid "Go to beginning of current line"
 msgstr "跳至当前行首"
 
-#: src/global.c:564
+#: src/global.c:572
 msgid "Go to end of current line"
 msgstr "跳至当前行尾"
 
-#: src/global.c:567
+#: src/global.c:575
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "跳至当前段落开头，如已在段落开头，则调至上一段落起始处"
 
-#: src/global.c:569
+#: src/global.c:577
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr "跳至当前段落结尾，如已在段落结尾，则调至下一段落结尾"
 
-#: src/global.c:571
+#: src/global.c:579
 msgid "Go to the first line of the file"
 msgstr "跳至文件第一行"
 
-#: src/global.c:572
+#: src/global.c:580
 msgid "Go to the last line of the file"
 msgstr "跳至文件最后一行"
 
-#: src/global.c:574
+#: src/global.c:582
 msgid "Go to the matching bracket"
 msgstr "移动至对应括号"
 
-#: src/global.c:576
+#: src/global.c:584
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "向上卷动一行但不卷动游标"
 
-#: src/global.c:578
+#: src/global.c:586
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "向下卷动一行但不卷动游标"
 
-#: src/global.c:581
+#: src/global.c:589
 msgid "Switch to the previous file buffer"
 msgstr "切换至上个文件缓冲区"
 
-#: src/global.c:582
+#: src/global.c:590
 msgid "Switch to the next file buffer"
 msgstr "切换至下个文件缓冲区"
 
-#: src/global.c:584
+#: src/global.c:592
 msgid "Insert the next keystroke verbatim"
 msgstr "插入下一按键原型"
 
-#: src/global.c:585
+#: src/global.c:593
 msgid "Insert a tab at the cursor position"
 msgstr "插入制表符于游标位置"
 
-#: src/global.c:586
+#: src/global.c:594
 msgid "Insert a newline at the cursor position"
 msgstr "插入新行于游标位置"
 
-#: src/global.c:587
+#: src/global.c:595
 msgid "Delete the character under the cursor"
 msgstr "删除游标之下的字符"
 
-#: src/global.c:589
+#: src/global.c:597
 msgid "Delete the character to the left of the cursor"
 msgstr "删除游标左侧的字符"
 
-#: src/global.c:592
+#: src/global.c:600
 #, fuzzy
 msgid "Cut backward from cursor to word start"
 msgstr "从游标剪切至行尾"
 
-#: src/global.c:594
+#: src/global.c:602
 #, fuzzy
 msgid "Cut forward from cursor to next word start"
 msgstr "从游标剪切至行尾"
 
-#: src/global.c:596
+#: src/global.c:604
 msgid "Cut from the cursor position to the end of the file"
 msgstr "从游标位置剪切至文件结尾"
 
-#: src/global.c:599
+#: src/global.c:607
 msgid "Justify the entire file"
 msgstr "对齐整个文件"
 
-#: src/global.c:603
+#: src/global.c:611
 msgid "Count the number of words, lines, and characters"
 msgstr "计算字数、行数与字符数"
 
-#: src/global.c:606
+#: src/global.c:614
 msgid "Refresh (redraw) the current screen"
 msgstr "重新显示当前画面"
 
-#: src/global.c:608
+#: src/global.c:616
 #, fuzzy
 msgid "Suspend the editor (if suspension is enabled)"
 msgstr "暂停编辑器(如果启用了暂停)"
 
-#: src/global.c:610
+#: src/global.c:618
 msgid "Save file without prompting"
 msgstr ""
 
-#: src/global.c:611
+#: src/global.c:619
 msgid "Search next occurrence backward"
 msgstr ""
 
-#: src/global.c:612
+#: src/global.c:620
 msgid "Search next occurrence forward"
 msgstr ""
 
-#: src/global.c:614
+#: src/global.c:622
 msgid "Toggle the case sensitivity of the search"
 msgstr "切换查找的区分大小写选项"
 
-#: src/global.c:616
+#: src/global.c:624
 msgid "Reverse the direction of the search"
 msgstr "反转搜索方向"
 
-#: src/global.c:620
+#: src/global.c:628
 msgid "Toggle the use of regular expressions"
 msgstr "切换使用正则表示式"
 
-#: src/global.c:624
+#: src/global.c:632
 msgid "Recall the previous search/replace string"
 msgstr "编辑前次搜索/替换字符串"
 
-#: src/global.c:626
+#: src/global.c:634
 msgid "Recall the next search/replace string"
 msgstr "编辑下次搜索/替换字符串"
 
-#: src/global.c:629
+#: src/global.c:637
 msgid "Go to file browser"
 msgstr "打开文件选单"
 
-#: src/global.c:632
+#: src/global.c:640
 msgid "Toggle the use of DOS format"
 msgstr "切换使用DOS 格式"
 
-#: src/global.c:633
+#: src/global.c:641
 msgid "Toggle the use of Mac format"
 msgstr "切换使用Mac 格式"
 
-#: src/global.c:634
+#: src/global.c:642
 msgid "Toggle appending"
 msgstr "切换追加"
 
-#: src/global.c:635
+#: src/global.c:643
 msgid "Toggle prepending"
 msgstr "切换前置插入"
 
-#: src/global.c:636
+#: src/global.c:644
 msgid "Toggle backing up of the original file"
 msgstr "切换储存既有文件的备份"
 
-#: src/global.c:637
+#: src/global.c:645
 msgid "Execute external command"
 msgstr "执行外部命令"
 
-#: src/global.c:639
+#: src/global.c:647
 msgid "Close buffer without saving it"
 msgstr ""
 
-#: src/global.c:641
+#: src/global.c:649
 msgid "Toggle the use of a new buffer"
 msgstr "切换使用新缓冲区"
 
-#: src/global.c:644
+#: src/global.c:652
 msgid "Exit from the file browser"
 msgstr "从文件选单离开"
 
-#: src/global.c:645
+#: src/global.c:653
 msgid "Go to the first file in the list"
 msgstr "跳至文件第一列"
 
-#: src/global.c:646
+#: src/global.c:654
 msgid "Go to the last file in the list"
 msgstr "跳至文件最后一列"
 
-#: src/global.c:647
+#: src/global.c:655
 msgid "Go to the previous file in the list"
 msgstr "跳至列表中的前一个文件"
 
-#: src/global.c:648
+#: src/global.c:656
 msgid "Go to the next file in the list"
 msgstr "跳至列表中的下一个文件"
 
-#: src/global.c:649
+#: src/global.c:657
 msgid "Go to directory"
 msgstr "跳至目录"
 
-#: src/global.c:652
+#: src/global.c:660
 #, fuzzy
 msgid "Invoke the linter, if available"
 msgstr "尝试运行拼写检查"
 
-#: src/global.c:653
+#: src/global.c:661
 #, fuzzy
 msgid "Go to previous linter msg"
 msgstr "跳至前一行"
 
-#: src/global.c:654
+#: src/global.c:662
 #, fuzzy
 msgid "Go to next linter msg"
 msgstr "跳至后一行"
 
-#: src/global.c:656
+#: src/global.c:664
 #, fuzzy
 msgid "Invoke formatter, if available"
 msgstr "尝试运行拼写检查"
 
 #. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:671
+#: src/global.c:679
 msgid "Get Help"
 msgstr "求助"
 
-#: src/global.c:674 src/prompt.c:858
+#: src/global.c:682 src/prompt.c:855
 msgid "Cancel"
 msgstr "取消"
 
-#: src/global.c:687
+#: src/global.c:695
 #, fuzzy
 msgid "Write Out"
 msgstr "写入"
 
-#: src/global.c:723
+#: src/global.c:731
 msgid "Go To Dir"
 msgstr "跳至目录"
 
-#: src/global.c:738
+#: src/global.c:746
 msgid "Cut Text"
 msgstr "剪切文字"
 
-#: src/global.c:753
+#: src/global.c:761
 msgid "To Spell"
 msgstr "拼写检查"
 
-#: src/global.c:757
+#: src/global.c:765
 #, fuzzy
 msgid "To Linter"
 msgstr "跳行"
 
-#: src/global.c:760
+#: src/global.c:768
 #, fuzzy
 msgid "Formatter"
 msgstr "DOS 格式"
 
-#: src/global.c:767
+#: src/global.c:775
 msgid "Case Sens"
 msgstr "区分大小写"
 
-#: src/global.c:772
+#: src/global.c:780
 msgid "Regexp"
 msgstr "正则表达式"
 
-#: src/global.c:777
+#: src/global.c:785
 msgid "Backwards"
 msgstr "向后搜索"
 
-#: src/global.c:784
+#: src/global.c:792
 msgid "No Replace"
 msgstr "不替换"
 
-#: src/global.c:792
+#: src/global.c:800
 msgid "Cur Pos"
 msgstr "游标位置"
 
-#: src/global.c:807
+#: src/global.c:815
 msgid "First Line"
 msgstr "首行"
 
-#: src/global.c:809
+#: src/global.c:817
 msgid "Last Line"
 msgstr "尾行"
 
-#: src/global.c:816
+#: src/global.c:824
 #, fuzzy
 msgid "To Bracket"
 msgstr "并非一个括号"
 
-#: src/global.c:819
+#: src/global.c:827
 msgid "Mark Text"
 msgstr "标记文字"
 
-#: src/global.c:822
+#: src/global.c:830
 msgid "Copy Text"
 msgstr "复制文字"
 
-#: src/global.c:825
+#: src/global.c:833
 msgid "Indent Text"
 msgstr "缩进文字"
 
-#: src/global.c:827
+#: src/global.c:835
 msgid "Unindent Text"
 msgstr "取消缩进"
 
-#: src/global.c:830
+#: src/global.c:838
 msgid "Undo"
 msgstr "撤销"
 
-#: src/global.c:832
+#: src/global.c:840
 msgid "Redo"
 msgstr "重做"
 
-#: src/global.c:836 src/global.c:842
+#: src/global.c:844 src/global.c:850
 msgid "Back"
 msgstr "向后"
 
-#: src/global.c:838 src/global.c:844
+#: src/global.c:846 src/global.c:852
 msgid "Forward"
 msgstr "向前"
 
-#: src/global.c:849
+#: src/global.c:857
 msgid "Prev Word"
 msgstr "前一个字"
 
-#: src/global.c:851
+#: src/global.c:859
 msgid "Next Word"
 msgstr "后一个字"
 
-#: src/global.c:855
+#: src/global.c:863
 msgid "Home"
 msgstr "顶端"
 
-#: src/global.c:857
+#: src/global.c:865
 msgid "End"
 msgstr "尾端"
 
-#: src/global.c:866
+#: src/global.c:874
 msgid "Beg of Par"
 msgstr "段落开头"
 
-#: src/global.c:868
+#: src/global.c:876
 msgid "End of Par"
 msgstr "段落结尾"
 
-#: src/global.c:873
+#: src/global.c:881
 msgid "Scroll Up"
 msgstr "向上卷动"
 
-#: src/global.c:875
+#: src/global.c:883
 msgid "Scroll Down"
 msgstr "向下卷动"
 
-#: src/global.c:880
+#: src/global.c:888
 #, fuzzy
 msgid "Prev File"
 msgstr "上个文件"
 
-#: src/global.c:882
+#: src/global.c:890
 msgid "Next File"
 msgstr "下个文件"
 
-#: src/global.c:891
+#: src/global.c:899
 #, fuzzy
 msgid "Verbatim"
 msgstr "原形输入"
 
-#: src/global.c:894
+#: src/global.c:902
 msgid "Tab"
 msgstr "制表符"
 
-#: src/global.c:896
+#: src/global.c:904
 msgid "Enter"
 msgstr "回车"
 
-#: src/global.c:899
+#: src/global.c:907
 msgid "Delete"
 msgstr "删除"
 
-#: src/global.c:901
+#: src/global.c:909
 msgid "Backspace"
 msgstr "退格"
 
 #. TRANSLATORS: The next two strings refer to cutting words.
-#: src/global.c:912
+#: src/global.c:920
 #, fuzzy
 msgid "Cut Left"
 msgstr "剪切文字"
 
-#: src/global.c:914
+#: src/global.c:922
 msgid "Cut Right"
 msgstr ""
 
-#: src/global.c:916
+#: src/global.c:924
 msgid "CutTillEnd"
 msgstr "删至末端"
 
-#: src/global.c:926
+#: src/global.c:934
 msgid "Word Count"
 msgstr "字数统计"
 
-#: src/global.c:933
+#: src/global.c:941
 msgid "Suspend"
 msgstr "暂停"
 
-#: src/global.c:937
+#: src/global.c:945
+#, fuzzy
+msgid "Comment Lines"
+msgstr "下行"
+
+#: src/global.c:949
 msgid "Save"
 msgstr ""
 
-#: src/global.c:940
+#: src/global.c:952
 msgid "Previous"
 msgstr ""
 
-#: src/global.c:942
+#: src/global.c:954
 #, fuzzy
 msgid "Next"
 msgstr "下行"
 
-#: src/global.c:948
+#: src/global.c:960
 msgid "PrevHstory"
 msgstr "前一记录"
 
-#: src/global.c:951
+#: src/global.c:963
 msgid "NextHstory"
 msgstr "后一记录"
 
-#: src/global.c:955
+#: src/global.c:972
 msgid "Go To Text"
 msgstr "跳至文字"
 
-#: src/global.c:959
+#: src/global.c:976
 msgid "DOS Format"
 msgstr "DOS 格式"
 
-#: src/global.c:961
+#: src/global.c:978
 msgid "Mac Format"
 msgstr "Mac 格式"
 
-#: src/global.c:969
+#: src/global.c:986
 msgid "Append"
 msgstr "附加"
 
-#: src/global.c:971
+#: src/global.c:988
 msgid "Prepend"
 msgstr "前引"
 
-#: src/global.c:974
+#: src/global.c:991
 msgid "Backup File"
 msgstr "备份文件"
 
-#: src/global.c:981
+#: src/global.c:998
 msgid "Execute Command"
 msgstr "执行命令"
 
-#: src/global.c:996
+#: src/global.c:1013
 msgid "To Files"
 msgstr "文件选单"
 
-#: src/global.c:1004
+#: src/global.c:1021
 msgid "First File"
 msgstr "首文件"
 
-#: src/global.c:1006
+#: src/global.c:1023
 msgid "Last File"
 msgstr "末文件"
 
-#: src/global.c:1010
+#: src/global.c:1027
 msgid "Discard buffer"
 msgstr ""
 
+#: src/global.c:1038
+msgid "Left Column"
+msgstr ""
+
+#: src/global.c:1040
+msgid "Right Column"
+msgstr ""
+
 #. TRANSLATORS: Try to keep the next two strings at most 20 characters.
-#: src/global.c:1020
+#: src/global.c:1047
 #, fuzzy
 msgid "Prev Lint Msg"
 msgstr "上行"
 
-#: src/global.c:1022
+#: src/global.c:1049
 #, fuzzy
 msgid "Next Lint Msg"
 msgstr "下行"
 
 #. TRANSLATORS: The next seventeen strings are toggle descriptions;
 #. * they are best kept shorter than 40 characters, but may be longer.
-#: src/global.c:1285
+#: src/global.c:1316
 msgid "Help mode"
 msgstr "辅助模式"
 
-#: src/global.c:1287
+#: src/global.c:1318
 msgid "Constant cursor position display"
 msgstr "持续显示游标位置"
 
-#: src/global.c:1289
+#: src/global.c:1320
 msgid "Use of one more line for editing"
 msgstr "编辑时使用多一行"
 
-#: src/global.c:1291
+#: src/global.c:1322
 msgid "Smooth scrolling"
 msgstr "平滑式卷动画面"
 
-#: src/global.c:1293
+#: src/global.c:1324
 #, fuzzy
 msgid "Soft wrapping of overlong lines"
 msgstr "不要自动换行"
 
-#: src/global.c:1295
+#: src/global.c:1326
 msgid "Whitespace display"
 msgstr "显示空格"
 
-#: src/global.c:1297
+#: src/global.c:1328
 msgid "Color syntax highlighting"
 msgstr "语法色彩高亮"
 
-#: src/global.c:1299
+#: src/global.c:1330
 msgid "Smart home key"
 msgstr "智能HOME 键"
 
-#: src/global.c:1301
+#: src/global.c:1332
 msgid "Auto indent"
 msgstr "自动缩进"
 
-#: src/global.c:1303
+#: src/global.c:1334
 msgid "Cut to end"
 msgstr "剪切至行尾"
 
-#: src/global.c:1305
+#: src/global.c:1336
 #, fuzzy
 msgid "Hard wrapping of overlong lines"
 msgstr "不要自动换行"
 
-#: src/global.c:1307
+#: src/global.c:1338
 msgid "Conversion of typed tabs to spaces"
 msgstr "已输入制表符至空白的转换"
 
-#: src/global.c:1309
+#: src/global.c:1340
 msgid "Backup files"
 msgstr "备份文件"
 
-#: src/global.c:1311
+#: src/global.c:1342
 msgid "Reading file into separate buffer"
 msgstr ""
 
-#: src/global.c:1313
+#: src/global.c:1344
 msgid "Mouse support"
 msgstr "鼠标支持"
 
-#: src/global.c:1315
+#: src/global.c:1346
 msgid "No conversion from DOS/Mac format"
 msgstr "不从 DOS/Mac 格式转换"
 
-#: src/global.c:1317
+#: src/global.c:1348
 msgid "Suspension"
 msgstr "暂停"
 
-#: src/help.c:209
+#: src/help.c:211
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1166,7 +1187,7 @@ msgstr ""
 "最近一次搜索的字符串将会显示在搜索提示符后的括号中。不输入任何文字而直接按下"
 "回车键则会重复使用最近一次的搜索条件。"
 
-#: src/help.c:218
+#: src/help.c:220
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1180,7 +1201,7 @@ msgstr ""
 " 以下的功能键可用于搜索模式：\n"
 "\n"
 
-#: src/help.c:224
+#: src/help.c:226
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1199,7 +1220,7 @@ msgstr ""
 " 以下的功能键可用于跳行模式：\n"
 "\n"
 
-#: src/help.c:233
+#: src/help.c:235
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1219,7 +1240,7 @@ msgstr ""
 "multibuffer、Meta-F 开关，或者 nanorc 文件来启动的话，所插入的文件 将会被载入"
 "另外的缓冲区中 (利用 Meta-< 和 > 在文件缓冲区间切换)。 "
 
-#: src/help.c:242
+#: src/help.c:244
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1233,7 +1254,7 @@ msgstr ""
 " 以下的功能键可用于插入文件模式：\n"
 "\n"
 
-#: src/help.c:248
+#: src/help.c:250
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1259,7 +1280,7 @@ msgstr ""
 " 以下的功能键可用于写入文件模式：\n"
 "\n"
 
-#: src/help.c:262
+#: src/help.c:264
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1281,7 +1302,7 @@ msgstr ""
 " 以下的功能键可用于文件选单：\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:277
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1303,7 +1324,7 @@ msgstr ""
 "按下回车键则会重复最近一次的搜索条件。\n"
 "\n"
 
-#: src/help.c:284
+#: src/help.c:286
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1311,7 +1332,7 @@ msgstr ""
 "在搜索模式可使用如下的功能键：\n"
 "\n"
 
-#: src/help.c:288
+#: src/help.c:290
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1332,7 +1353,7 @@ msgstr ""
 " 以下的功能键可用于跳至目录模式：\n"
 "\n"
 
-#: src/help.c:301
+#: src/help.c:303
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1354,7 +1375,7 @@ msgstr ""
 " 以下的功能键可用于拼写检查模式：\n"
 "\n"
 
-#: src/help.c:316
+#: src/help.c:318
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1373,7 +1394,7 @@ msgstr ""
 " 以下的功能键可用于执行命令模式：\n"
 "\n"
 
-#: src/help.c:329
+#: src/help.c:331
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1393,15 +1414,15 @@ msgstr ""
 "\n"
 " "
 
-#: src/help.c:339
+#: src/help.c:341
+#, fuzzy
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
-" The notation for shortcuts is as follows: Control-key sequences are notated "
-"with a caret (^) symbol and can be entered either by using the Control "
-"(Ctrl) key or pressing the Escape (Esc) key twice.  Escape-key sequences are "
-"notated with the Meta (M-) symbol and can be entered using either the Esc, "
-"Alt, or Meta key depending on your keyboard setup.  "
+" Shortcuts are written as follows: Control-key sequences are notated with a "
+"'^' and can be entered either by using the Ctrl key or pressing the Esc key "
+"twice.  Meta-key sequences are notated with 'M-' and can be entered using "
+"either the Alt, Cmd, or Esc key, depending on your keyboard setup.  "
 msgstr ""
 "快捷键的记号定义如下：控制键组(Control-key) 序列是以一个 \"帽子\" (caret, ^)"
 "符号来表示，它可以通过Ctrl键或是按两次Esc 键来输入。脱离键组(Escape-key) 序列"
@@ -1424,21 +1445,21 @@ msgstr ""
 msgid "enable/disable"
 msgstr "启用/关闭"
 
-#: src/nano.c:559
+#: src/nano.c:560
 #, fuzzy
 msgid "Key is invalid in view mode"
 msgstr "观看模式中此按键无效"
 
-#: src/nano.c:565
+#: src/nano.c:566
 #, fuzzy
 msgid "This function is disabled in restricted mode"
 msgstr "在限制模式中无法跳至%s 外部"
 
-#: src/nano.c:573
+#: src/nano.c:574
 msgid "Help is not available"
 msgstr ""
 
-#: src/nano.c:684
+#: src/nano.c:686
 #, c-format
 msgid ""
 "\n"
@@ -1447,7 +1468,7 @@ msgstr ""
 "\n"
 "缓冲内容已写入 %s\n"
 
-#: src/nano.c:686
+#: src/nano.c:688
 #, c-format
 msgid ""
 "\n"
@@ -1456,7 +1477,7 @@ msgstr ""
 "\n"
 "缓冲内容未写入至 %s：%s\n"
 
-#: src/nano.c:689
+#: src/nano.c:691
 #, c-format
 msgid ""
 "\n"
@@ -1721,17 +1742,22 @@ msgstr "启用暂停功能"
 msgid "Enable soft line wrapping"
 msgstr "启用软换行"
 
-#: src/nano.c:937
+#: src/nano.c:940
 #, fuzzy, c-format
-msgid " GNU nano, version %s\n"
+msgid " nano, version %s\n"
 msgstr " GNU nano 版本%s (编译于%s, %s)\n"
 
-#: src/nano.c:940
+#: src/nano.c:943
+#, c-format
+msgid " (C) 2014..%s the contributors to nano\n"
+msgstr ""
+
+#: src/nano.c:945
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr " 电子邮件: nano@nano-editor.org\t\t网页: http://www.nano-editor.org/"
 
-#: src/nano.c:941
+#: src/nano.c:946
 #, c-format
 msgid ""
 "\n"
@@ -1740,67 +1766,82 @@ msgstr ""
 "\n"
 " 编译选项："
 
-#: src/nano.c:1073
+#: src/nano.c:1081
 msgid "No file name"
 msgstr ""
 
-#: src/nano.c:1108
-msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
-msgstr "储存更动过的缓冲区吗(回答 \"No\" 会撤销修改)？"
+#: src/nano.c:1115
+msgid "Save modified buffer?  (Answering \"No\" will DISCARD changes.) "
+msgstr ""
 
-#: src/nano.c:1168
+#: src/nano.c:1178
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "对不起，无法从键盘设备重新打开标准输入\n"
 
-#: src/nano.c:1192
+#: src/nano.c:1202
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "正在从标准输入读入，可用 ^C 中断\n"
 
-#: src/nano.c:1256
+#: src/nano.c:1266
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "接收到SIGHUP 或SIGTERM\n"
 
-#: src/nano.c:1272
+#: src/nano.c:1282
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "使用\"fg\" 返回nano\n"
 
-#: src/nano.c:1294
+#: src/nano.c:1304
 msgid "Suspension is not enabled"
 msgstr ""
 
-#: src/nano.c:1448
+#: src/nano.c:1459
 msgid "enabled"
 msgstr "已启用"
 
-#: src/nano.c:1448
+#: src/nano.c:1459
 msgid "disabled"
 msgstr "已禁用"
 
-#: src/nano.c:1607 src/winio.c:1125
-msgid "Unknown Command"
-msgstr "未知命令"
+#: src/nano.c:1573
+msgid "Unbound key"
+msgstr ""
 
-#: src/nano.c:1720
+#: src/nano.c:1577
+#, c-format
+msgid "Unbound key: M-%c"
+msgstr ""
+
+#: src/nano.c:1579
+#, c-format
+msgid "Unbound key: ^%c"
+msgstr ""
+
+#: src/nano.c:1581
+#, c-format
+msgid "Unbound key: %c"
+msgstr ""
+
+#: src/nano.c:1745
 msgid "XON ignored, mumble mumble"
 msgstr "忽略XON，嗯嗯。"
 
-#: src/nano.c:1725
+#: src/nano.c:1750
 msgid "XOFF ignored, mumble mumble"
 msgstr "忽略XOFF，嗯嗯。"
 
-#: src/nano.c:2139 src/rcfile.c:1334
+#: src/nano.c:2166 src/rcfile.c:1187
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "所要求的制表符宽度%s 无效"
 
-#: src/nano.c:2200 src/rcfile.c:1259
+#: src/nano.c:2227 src/rcfile.c:1128
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "所要求的填满行数\"%s\" 无效"
 
-#: src/nano.c:2247
+#: src/nano.c:2276
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr ""
@@ -1808,116 +1849,120 @@ msgstr ""
 #. TRANSLATORS: For the next three strings, if possible, specify
 #. * the single-byte shortcuts for both your language and English.
 #. * For example, in French: "OoYy" for "Oui".
-#: src/prompt.c:821
+#: src/prompt.c:818
 msgid "Yy"
 msgstr "Yy"
 
-#: src/prompt.c:822
+#: src/prompt.c:819
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:823
+#: src/prompt.c:820
 msgid "Aa"
 msgstr "Aa"
 
-#: src/prompt.c:845
+#: src/prompt.c:842
 msgid "Yes"
 msgstr "是"
 
-#: src/prompt.c:850
+#: src/prompt.c:847
 msgid "All"
 msgstr "全部"
 
-#: src/prompt.c:855
+#: src/prompt.c:852
 msgid "No"
 msgstr "否"
 
-#: src/rcfile.c:142
+#: src/rcfile.c:144
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "在%s(第%lu 行)中发生错误："
 
-#: src/rcfile.c:201
+#: src/rcfile.c:203
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "参数%s 有未封闭的 \""
 
-#: src/rcfile.c:228 src/rcfile.c:280 src/rcfile.c:732 src/rcfile.c:793
-#: src/rcfile.c:882 src/rcfile.c:933
+#: src/rcfile.c:231 src/rcfile.c:674 src/rcfile.c:725 src/rcfile.c:824
 msgid "Regex strings must begin and end with a \" character"
 msgstr "正则表示式字符串必须以 \" 字符开始及结束"
 
-#: src/rcfile.c:254 src/search.c:62
+#: src/rcfile.c:257 src/search.c:61
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "非法的正则表示式 \"%s\": %s"
 
-#: src/rcfile.c:274
+#: src/rcfile.c:279
 msgid "Missing syntax name"
 msgstr "缺少语法名称"
 
-#: src/rcfile.c:345
+#: src/rcfile.c:288
+msgid "A syntax name must be quoted"
+msgstr ""
+
+#: src/rcfile.c:297
 msgid "The \"none\" syntax is reserved"
 msgstr "\"none\" 语法已被保留"
 
-#: src/rcfile.c:352
-msgid "The \"default\" syntax must take no extensions"
+#: src/rcfile.c:327
+#, fuzzy
+msgid "The \"default\" syntax does not accept extensions"
 msgstr "\"default\" 语法必须不含任何副文件名"
 
-#: src/rcfile.c:424
+#: src/rcfile.c:369
 msgid "Missing key name"
 msgstr "缺少键名称"
 
-#: src/rcfile.c:433 src/rcfile.c:444
+#: src/rcfile.c:378 src/rcfile.c:389
 msgid "Key name is too short"
 msgstr ""
 
-#: src/rcfile.c:454
+#: src/rcfile.c:399
 #, fuzzy
 msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr "键绑定必须以\"^\", \"M\" 或 \"F\" 开始"
 
-#: src/rcfile.c:457
+#: src/rcfile.c:402
 #, fuzzy, c-format
 msgid "Key name %s is invalid"
 msgstr "所要求的制表符宽度%s 无效"
 
-#: src/rcfile.c:466
+#: src/rcfile.c:411
 #, fuzzy
 msgid "Must specify a function to bind the key to"
 msgstr "必须指定键绑定到的函数"
 
 #. TRANSLATORS: Do not translate the word "all".
-#: src/rcfile.c:476
+#: src/rcfile.c:421
 msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
 
-#: src/rcfile.c:483
+#: src/rcfile.c:428
 #, fuzzy, c-format
 msgid "Cannot map name \"%s\" to a function"
 msgstr "无法映射名字\"%s\" 到一个函数"
 
-#: src/rcfile.c:490
+#: src/rcfile.c:435
 #, fuzzy, c-format
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "无法映射名字\"%s\" 到一个菜单"
 
-#: src/rcfile.c:522
+#: src/rcfile.c:467
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr ""
 
-#: src/rcfile.c:534
+#: src/rcfile.c:479
 #, fuzzy, c-format
 msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "对不起，键\"%s\" 属非法绑定"
 
-#: src/rcfile.c:631
+#: src/rcfile.c:576
 #, fuzzy, c-format
 msgid "Error expanding %s: %s"
 msgstr "读取%s 出错：%s"
 
-#: src/rcfile.c:674
+#: src/rcfile.c:616
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1932,126 +1977,112 @@ msgstr ""
 "\"black\"(黑)，选择性的前置字 \"bright\"(明亮) \n"
 "可用于前景色。"
 
-#: src/rcfile.c:696
-msgid "Cannot add a color command without a syntax command"
-msgstr "无法直接增加颜色而没有语法行"
+#: src/rcfile.c:637 src/rcfile.c:795 src/rcfile.c:858
+#, c-format
+msgid "A '%s' command requires a preceding 'syntax' command"
+msgstr ""
 
-#: src/rcfile.c:701
+#: src/rcfile.c:643
 msgid "Missing color name"
 msgstr "缺少颜色名称"
 
-#: src/rcfile.c:711 src/rcfile.c:872
-msgid "Missing regex string"
-msgstr "缺少正则表示式字符串"
+#: src/rcfile.c:653 src/rcfile.c:807
+#, fuzzy, c-format
+msgid "Missing regex string after '%s' command"
+msgstr "缺少颜色名称"
 
-#: src/rcfile.c:787
+#: src/rcfile.c:719
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\" 要求对应的\"end=\""
 
-#: src/rcfile.c:839
+#: src/rcfile.c:768
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
 msgstr "背景色%s 不可为明亮"
 
-#: src/rcfile.c:867
-msgid "Cannot add a header regex without a syntax command"
-msgstr "无法直接增加头部正则表达式而没有语法行"
-
-#: src/rcfile.c:922
-msgid "Cannot add a magic string regex without a syntax command"
-msgstr "无法在没有语法命令的情况下添加魔字符串"
-
-#: src/rcfile.c:927
-msgid "Missing magic string name"
-msgstr "缺少魔字符串名称"
-
-#: src/rcfile.c:985
-#, fuzzy
-msgid "Cannot add a linter without a syntax command"
-msgstr "无法直接增加头部正则表达式而没有语法行"
+#: src/rcfile.c:802
+#, fuzzy, c-format
+msgid "The \"default\" syntax does not accept '%s' regexes"
+msgstr "\"default\" 语法必须不含任何副文件名"
 
-#: src/rcfile.c:990
-#, fuzzy
-msgid "Missing linter command"
+#: src/rcfile.c:863
+#, fuzzy, c-format
+msgid "Missing command after '%s'"
 msgstr "缺少颜色名称"
 
-#: src/rcfile.c:1011
-#, fuzzy
-msgid "Cannot add formatter without a syntax command"
-msgstr "无法直接增加颜色而没有语法行"
-
-#: src/rcfile.c:1016
-msgid "Missing formatter command"
-msgstr ""
+#: src/rcfile.c:879
+#, fuzzy, c-format
+msgid "Argument of '%s' lacks closing \""
+msgstr "参数%s 有未封闭的 \""
 
-#: src/rcfile.c:1046
+#: src/rcfile.c:910
 #, fuzzy, c-format
 msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr "严重错误; 没有键映射到函数 \"%s\""
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:912
 #, fuzzy, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr "正在退出。如果您想调整您的nanorc 设置，请使用nano 的-I 选项。\n"
 
-#: src/rcfile.c:1109
+#: src/rcfile.c:971
 #, fuzzy, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "无法映射名字\"%s\" 到一个菜单"
 
-#: src/rcfile.c:1125 src/rcfile.c:1134 src/rcfile.c:1144
-#, c-format
-msgid "Command \"%s\" not allowed in included file"
-msgstr "命令\"%s\" 被禁止在包含文件中使用"
-
-#: src/rcfile.c:1150 src/rcfile.c:1359
+#: src/rcfile.c:993 src/rcfile.c:1202
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "语法\"%s\" 没有color 命令"
 
-#: src/rcfile.c:1180
+#: src/rcfile.c:1024
+#, c-format
+msgid "Command \"%s\" not allowed in included file"
+msgstr "命令\"%s\" 被禁止在包含文件中使用"
+
+#: src/rcfile.c:1039
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "无法识别\"%s\" 命令"
 
-#: src/rcfile.c:1195
+#: src/rcfile.c:1051
 #, fuzzy
 msgid "Missing option"
 msgstr "缺少颜色名称"
 
-#: src/rcfile.c:1217
+#: src/rcfile.c:1065
+#, fuzzy, c-format
+msgid "Unknown option \"%s\""
+msgstr "未知旗标 %s"
+
+#: src/rcfile.c:1077
+#, fuzzy, c-format
+msgid "Cannot unset option \"%s\""
+msgstr "无法解除旗标 %s 设定"
+
+#: src/rcfile.c:1089
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "选项%s 需要参数"
 
-#: src/rcfile.c:1235
+#: src/rcfile.c:1105
 msgid "Option is not a valid multibyte string"
 msgstr "选项并非正确的多字节字符串"
 
-#: src/rcfile.c:1272 src/rcfile.c:1300 src/rcfile.c:1309
+#: src/rcfile.c:1139 src/rcfile.c:1160 src/rcfile.c:1167
 msgid "Non-blank characters required"
 msgstr "需要非空格字符"
 
-#: src/rcfile.c:1282
+#: src/rcfile.c:1146
 msgid "Two single-column characters required"
 msgstr "需要两个单行字符"
 
-#: src/rcfile.c:1348
-#, fuzzy, c-format
-msgid "Cannot unset option \"%s\""
-msgstr "无法解除旗标 %s 设定"
-
-#: src/rcfile.c:1354
-#, fuzzy, c-format
-msgid "Unknown option \"%s\""
-msgstr "未知旗标 %s"
-
-#: src/rcfile.c:1413
+#: src/rcfile.c:1258
 msgid "I can't find my home directory!  Wah!"
 msgstr "我找不到我的家目录！哇！"
 
-#: src/rcfile.c:1451
+#: src/rcfile.c:1295
 #, c-format
 msgid ""
 "\n"
@@ -2060,342 +2091,399 @@ msgstr ""
 "\n"
 "按下回车键继续启动 nano\n"
 
-#: src/search.c:96
+#: src/search.c:95
 #, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "找不到 \"%.*s%s\""
 
 #. TRANSLATORS: The next three strings are modifiers of the search prompt.
-#: src/search.c:176
+#: src/search.c:169
 msgid " [Case Sensitive]"
 msgstr " [区分大小写]"
 
-#: src/search.c:180
+#: src/search.c:173
 msgid " [Regexp]"
 msgstr " [正则表示式]"
 
-#: src/search.c:184
+#: src/search.c:177
 msgid " [Backwards]"
 msgstr " [向后搜索]"
 
 #. TRANSLATORS: The next two strings are modifiers of the search prompt.
-#: src/search.c:189
+#: src/search.c:182
 msgid " (to replace) in selection"
 msgstr " 在标记中(替换)"
 
-#: src/search.c:191
+#: src/search.c:184
 msgid " (to replace)"
 msgstr " (替换)"
 
+#: src/search.c:305
+#, fuzzy
+msgid "Searching..."
+msgstr "搜索"
+
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:718
+#: src/search.c:693
 msgid "Replace this instance?"
 msgstr "替换这个？"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:883
+#: src/search.c:840
 msgid "Replace with"
 msgstr "替换为"
 
-#: src/search.c:924
+#: src/search.c:875
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
 msgstr[0] "已替换%lu 处"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:964
+#: src/search.c:914
 msgid "Enter line number, column number"
 msgstr "输入列号，行号"
 
-#: src/search.c:991
+#: src/search.c:939
 msgid "Invalid line or column number"
 msgstr "无效的列号或行号"
 
-#: src/search.c:1124
+#: src/search.c:1080
 msgid "Not a bracket"
 msgstr "并非一个括号"
 
-#: src/search.c:1191
+#: src/search.c:1146
 msgid "No matching bracket"
 msgstr "无对应括号"
 
-#: src/text.c:54
+#: src/text.c:53
 msgid "Mark Set"
 msgstr "标记设定"
 
-#: src/text.c:58
+#: src/text.c:57
 msgid "Mark Unset"
 msgstr "标记解除"
 
-#: src/text.c:70
+#: src/text.c:69
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "运行 \"%s\" 错误"
 
-#: src/text.c:475
+#: src/text.c:468
+msgid "Commenting is not supported for this file type"
+msgstr ""
+
+#: src/text.c:484
+msgid "Cannot comment past end of file"
+msgstr ""
+
+#: src/text.c:677
 msgid "Nothing in undo buffer!"
 msgstr "没有可撤销的操作！"
 
-#: src/text.c:481 src/text.c:634
-#, fuzzy, c-format
-msgid "Internal error: can't match line %d.  Please save your work."
-msgstr "内部错误：无法匹配行 %d。请保存您的工作"
-
 #. TRANSLATORS: Eight of the next nine strings describe actions
 #. * that are undone or redone.  It are all nouns, not verbs.
-#: src/text.c:495 src/text.c:524 src/text.c:645 src/text.c:686
+#: src/text.c:695 src/text.c:724 src/text.c:857 src/text.c:898
 msgid "text add"
 msgstr "文字增加"
 
-#: src/text.c:505 src/text.c:656
+#: src/text.c:705 src/text.c:868
 msgid "text delete"
 msgstr "文本删除"
 
-#: src/text.c:528 src/text.c:694
+#: src/text.c:728 src/text.c:907
 msgid "line join"
 msgstr "行合并"
 
-#: src/text.c:547 src/text.c:710
+#: src/text.c:747 src/text.c:923
 msgid "text cut"
 msgstr "文字剪切"
 
-#: src/text.c:552 src/text.c:714
+#: src/text.c:752 src/text.c:927
 msgid "text uncut"
 msgstr "取消剪切"
 
-#: src/text.c:558 src/text.c:691
+#: src/text.c:758 src/text.c:903
 #, fuzzy
 msgid "Internal error: line is missing.  Please save your work."
 msgstr "内部错误：重做设置失败。请保存您的工作"
 
-#: src/text.c:561 src/text.c:665
+#: src/text.c:762 src/text.c:877
 msgid "line break"
 msgstr "换行符"
 
-#: src/text.c:569 src/text.c:725
+#: src/text.c:772 src/text.c:947
+msgid "comment"
+msgstr ""
+
+#: src/text.c:776 src/text.c:951
+msgid "uncomment"
+msgstr ""
+
+#: src/text.c:780 src/text.c:938
 msgid "text insert"
 msgstr "文本插入"
 
-#: src/text.c:589 src/text.c:718
+#: src/text.c:800 src/text.c:931
 msgid "text replace"
 msgstr "文本替换"
 
-#: src/text.c:596 src/text.c:732 src/text.c:1030 src/text.c:1174
+#: src/text.c:807 src/text.c:955 src/text.c:1267 src/text.c:1437
 msgid "Internal error: unknown type.  Please save your work."
 msgstr "内部错误：未知类型。请保存您的工作。"
 
-#: src/text.c:601
+#: src/text.c:813
 #, c-format
 msgid "Undid action (%s)"
 msgstr "已撤销操作(%s)"
 
-#: src/text.c:619
+#: src/text.c:832
 msgid "Nothing to re-do!"
 msgstr "没有可重做的操作！"
 
-#: src/text.c:628
+#: src/text.c:841
 #, fuzzy
 msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr "内部错误：无法配置取消剪切。请保存您的工作"
 
-#: src/text.c:737
+#: src/text.c:961
 #, c-format
 msgid "Redid action (%s)"
 msgstr "已重做操作(%s)"
 
-#: src/text.c:827 src/text.c:2508 src/text.c:2944
+#: src/text.c:1051 src/text.c:2765 src/text.c:3198
 msgid "Could not create pipe"
 msgstr "无法建立管线功能"
 
-#: src/text.c:853 src/text.c:2595 src/text.c:2750 src/text.c:2992
-#: src/text.c:3286
+#: src/text.c:1077 src/text.c:2852 src/text.c:3005 src/text.c:3246
+#: src/text.c:3540
 msgid "Could not fork"
 msgstr "执行功能无效"
 
-#: src/text.c:1853
+#: src/text.c:2117
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "不良引用字符串%s：%s"
 
-#: src/text.c:2241
+#: src/text.c:2499
 msgid "Can now UnJustify!"
 msgstr "现在可以还原对齐！"
 
-#: src/text.c:2435
+#: src/text.c:2697
 msgid "Edit a replacement"
 msgstr "编辑替代文字"
 
-#: src/text.c:2510
+#. TRANSLATORS: Shown after fixing misspellings in one word.
+#: src/text.c:2713
+#, fuzzy
+msgid "Next word..."
+msgstr "后一个字"
+
+#: src/text.c:2767
 msgid "Creating misspelled word list, please wait..."
 msgstr "正在建立错字列表，请稍待..."
 
-#: src/text.c:2601 src/text.c:2999
+#: src/text.c:2858 src/text.c:3253
 msgid "Could not get size of pipe buffer"
 msgstr "无法得知管线缓冲区大小"
 
-#: src/text.c:2652
+#: src/text.c:2907
 msgid "Error invoking \"spell\""
 msgstr "运行 \"spell\" 错误"
 
-#: src/text.c:2655
+#: src/text.c:2910
 msgid "Error invoking \"sort -f\""
 msgstr "运行 \"sort -f\" 错误"
 
-#: src/text.c:2658
+#: src/text.c:2913
 msgid "Error invoking \"uniq\""
 msgstr "运行 \"uniq\" 错误"
 
-#: src/text.c:2881
+#: src/text.c:3135
 #, fuzzy
 msgid "Invoking spell checker, please wait"
 msgstr "尝试运行拼写检查"
 
-#: src/text.c:2897
+#: src/text.c:3151
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "拼写检查失败：%s"
 
-#: src/text.c:2899
+#: src/text.c:3153
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "拼写检查失败：%s：%s"
 
-#: src/text.c:2902
+#: src/text.c:3156
 msgid "Finished checking spelling"
 msgstr "拼写检查结束"
 
-#: src/text.c:2927
+#: src/text.c:3181
 #, fuzzy
 msgid "No linter defined for this type of file!"
 msgstr "不要将换行加到文件末端"
 
-#: src/text.c:2932
+#: src/text.c:3186
 msgid "Save modified buffer before linting?"
 msgstr ""
 
-#: src/text.c:2949
+#: src/text.c:3203
 msgid "Invoking linter, please wait"
 msgstr ""
 
-#: src/text.c:3105
+#: src/text.c:3358
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr ""
 
-#: src/text.c:3134
+#: src/text.c:3388
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
 
-#: src/text.c:3153
+#: src/text.c:3407
 msgid "No more errors in unopened files, cancelling"
 msgstr ""
 
-#: src/text.c:3192
+#: src/text.c:3446
 #, fuzzy
 msgid "At last message"
 msgstr "显示此信息"
 
-#: src/text.c:3197
+#: src/text.c:3451
 #, fuzzy
 msgid "At first message"
 msgstr "显示此信息"
 
-#: src/text.c:3237
+#: src/text.c:3491
 msgid "Finished"
 msgstr ""
 
-#: src/text.c:3259
+#: src/text.c:3513
 msgid "Invoking formatter, please wait"
 msgstr ""
 
-#: src/text.c:3314
+#: src/text.c:3568
 msgid "Finished formatting"
 msgstr ""
 
-#: src/text.c:3396
+#: src/text.c:3650
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%s字数: %lu  行数: %ld  字符数: %lu"
 
-#: src/text.c:3397
+#: src/text.c:3651
 msgid "In Selection:  "
 msgstr "于选择部份："
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3411
+#: src/text.c:3665
 msgid "Verbatim Input"
 msgstr "原形输入"
 
-#: src/utils.c:391 src/utils.c:403
+#: src/utils.c:392 src/utils.c:404
 msgid "nano is out of memory!"
 msgstr "nano 已耗尽内存！"
 
+#: src/utils.c:625
+#, fuzzy, c-format
+msgid "Internal error: can't match line %d.  Please save your work."
+msgstr "内部错误：无法匹配行 %d。请保存您的工作"
+
+#. TRANSLATORS: This refers to a sequence of escape codes
+#. * (from the keyboard) that nano does not know about.
+#: src/winio.c:1121
+msgid "Unknown sequence"
+msgstr ""
+
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
 #: src/winio.c:1427
 msgid "Unicode Input"
 msgstr "Unicode 输入"
 
-#: src/winio.c:1991 src/winio.c:1995
-msgid "Modified"
-msgstr "已更改"
-
-#: src/winio.c:1992
-msgid "View"
-msgstr "查看"
-
-#: src/winio.c:2006
+#: src/winio.c:1960
 msgid "DIR:"
 msgstr "目录："
 
-#: src/winio.c:2013
+#: src/winio.c:1968
 msgid "File:"
 msgstr "文件："
 
-#: src/winio.c:3141
+#: src/winio.c:1972 src/winio.c:1976
+msgid "Modified"
+msgstr "已更改"
+
+#: src/winio.c:1974
+msgid "View"
+msgstr "查看"
+
+#: src/winio.c:3105
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "行 %ld/%ld (%d%%)，列 %lu/%lu (%d%%)，字符 %lu/%lu (%d%%)"
 
-#: src/winio.c:3271
+#: src/winio.c:3235
 msgid "The nano text editor"
 msgstr "nano 文本编辑器"
 
-#: src/winio.c:3272
+#: src/winio.c:3236
 msgid "version"
 msgstr "版本"
 
-#: src/winio.c:3273
+#: src/winio.c:3237
 msgid "Brought to you by:"
 msgstr "来自于:"
 
-#: src/winio.c:3274
+#: src/winio.c:3238
 msgid "Special thanks to:"
 msgstr "特别感谢:"
 
-#: src/winio.c:3275
+#: src/winio.c:3239
 msgid "The Free Software Foundation"
 msgstr "自由软体基金会"
 
-#: src/winio.c:3276
+#: src/winio.c:3240
 msgid "the many translators and the TP"
 msgstr ""
 
-#: src/winio.c:3277
+#: src/winio.c:3241
 msgid "For ncurses:"
 msgstr "ncurses 部份:"
 
-#: src/winio.c:3278
+#: src/winio.c:3242
 msgid "and anyone else we forgot..."
 msgstr "以及其他我们不记得的人..."
 
-#: src/winio.c:3279
+#: src/winio.c:3243
 msgid "Thank you for using nano!"
 msgstr "谢谢您使用 nano！"
 
+#~ msgid ""
+#~ "Read %lu line (Converted from DOS and Mac format - Warning: No write "
+#~ "permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from DOS and Mac format - Warning: No write "
+#~ "permission)"
+#~ msgstr[0] "已读取%lu 行(转换自DOS 与Mac 格式- 警告：无写入权限)"
+
+#~ msgid ""
+#~ "Read %lu line (Converted from Mac format - Warning: No write permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from Mac format - Warning: No write permission)"
+#~ msgstr[0] "已读取%lu 行 (转换自Mac 格式- 警告：无写入权限)"
+
+#~ msgid ""
+#~ "Read %lu line (Converted from DOS format - Warning: No write permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from DOS format - Warning: No write permission)"
+#~ msgstr[0] "已读取%lu 行 (转换自DOS 格式- 警告：无写入权限)"
+
+#~ msgid "Read %lu line ( Warning: No write permission)"
+#~ msgid_plural "Read %lu lines (Warning: No write permission)"
+#~ msgstr[0] "已读取%lu 行(警告：无写入权限)"
+
 #~ msgid "Cannot prepend or append to a symlink with --nofollow set"
 #~ msgstr "--nofollow 设定下，无法前引或附加至符号连结档"
 
@@ -2405,6 +2493,37 @@ msgstr "谢谢您使用 nano！"
 #~ msgid "Sorry, support for this function has been disabled"
 #~ msgstr "对不起，此功能的支持以禁用"
 
+#~ msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
+#~ msgstr "储存更动过的缓冲区吗(回答 \"No\" 会撤销修改)？"
+
+#~ msgid "Unknown Command"
+#~ msgstr "未知命令"
+
+#~ msgid "Cannot add a color command without a syntax command"
+#~ msgstr "无法直接增加颜色而没有语法行"
+
+#~ msgid "Missing regex string"
+#~ msgstr "缺少正则表示式字符串"
+
+#~ msgid "Cannot add a header regex without a syntax command"
+#~ msgstr "无法直接增加头部正则表达式而没有语法行"
+
+#~ msgid "Cannot add a magic string regex without a syntax command"
+#~ msgstr "无法在没有语法命令的情况下添加魔字符串"
+
+#~ msgid "Missing magic string name"
+#~ msgstr "缺少魔字符串名称"
+
+#, fuzzy
+#~| msgid "Cannot add a header regex without a syntax command"
+#~ msgid "Cannot add a linter without a syntax command"
+#~ msgstr "无法直接增加头部正则表达式而没有语法行"
+
+#, fuzzy
+#~| msgid "Cannot add a color command without a syntax command"
+#~ msgid "Cannot add formatter without a syntax command"
+#~ msgstr "无法直接增加颜色而没有语法行"
+
 #, fuzzy
 #~| msgid "Internal error: can't setup uncut.  Please save your work."
 #~ msgid "Internal error: cannot set up uncut.  Please save your work."
diff --git a/po/zh_TW.po b/po/zh_TW.po
index ac3583f6..43bdacc6 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 2.3.2pre4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-25 16:41-0500\n"
+"POT-Creation-Date: 2016-06-17 15:41+0200\n"
 "PO-Revision-Date: 2013-06-24 23:29+0800\n"
 "Last-Translator: Wei-Lun Chao <bluebat@member.fsf.org>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -17,349 +17,339 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: src/browser.c:144 src/browser.c:284 src/browser.c:334 src/files.c:996
+#: src/files.c:1003 src/files.c:1794 src/files.c:1919 src/files.c:1963
+#: src/files.c:1983 src/files.c:2099 src/files.c:3019 src/files.c:3242
+#: src/rcfile.c:540 src/rcfile.c:1280
+#, c-format
+msgid "Error reading %s: %s"
+msgstr "讀取 %s 時發生錯誤: %s"
+
 #. TRANSLATORS: This is a prompt.
-#: src/browser.c:220
+#: src/browser.c:247
 msgid "Go To Directory"
 msgstr "跳至目錄"
 
-#: src/browser.c:227 src/browser.c:738 src/files.c:1174 src/files.c:2340
-#: src/nano.c:1120 src/search.c:202 src/search.c:290 src/search.c:895
-#: src/search.c:970 src/text.c:2935 src/text.c:3142
+#: src/browser.c:254 src/browser.c:723 src/files.c:1126 src/files.c:2292
+#: src/nano.c:1128 src/search.c:195 src/search.c:297 src/search.c:851
+#: src/search.c:918 src/text.c:3189 src/text.c:3396
 msgid "Cancelled"
 msgstr "已取消"
 
-#: src/browser.c:253 src/browser.c:300
-#, c-format
-msgid "Can't go outside of %s in restricted mode"
+#. TRANSLATORS: This refers to the option --operatingdir,
+#. * not to --restricted.
+#: src/browser.c:274 src/browser.c:326
+#, fuzzy, c-format
+msgid "Can't go outside of %s in confined mode"
 msgstr "在限制模式中無法至 %s 外部"
 
-#: src/browser.c:264 src/browser.c:310 src/browser.c:326 src/files.c:1044
-#: src/files.c:1052 src/files.c:1844 src/files.c:1971 src/files.c:2016
-#: src/files.c:2037 src/files.c:2156 src/files.c:3062 src/files.c:3285
-#: src/rcfile.c:596 src/rcfile.c:1435
-#, c-format
-msgid "Error reading %s: %s"
-msgstr "讀取 %s 時發生錯誤: %s"
-
-#: src/browser.c:290
+#: src/browser.c:317
 msgid "Can't move up a directory"
 msgstr "無法上移一個目錄"
 
 #. TRANSLATORS: Try to keep this at most 7 characters.
-#: src/browser.c:615 src/browser.c:623
+#: src/browser.c:590 src/browser.c:598
 msgid "(dir)"
 msgstr "(目錄)"
 
 #. TRANSLATORS: Try to keep this at most 12 characters.
-#: src/browser.c:620
+#: src/browser.c:595
 msgid "(parent dir)"
 msgstr "(上層目錄)"
 
 #. TRANSLATORS: Try to keep this at most 7 characters.
 #. * If necessary, you can leave out the parentheses.
-#: src/browser.c:650
+#: src/browser.c:625
 msgid "(huge)"
 msgstr ""
 
 #. TRANSLATORS: This is the main search prompt.
-#: src/browser.c:727 src/search.c:173
+#: src/browser.c:712 src/search.c:166
 msgid "Search"
 msgstr "搜尋"
 
-#: src/browser.c:777 src/search.c:466 src/search.c:536
-msgid "This is the only occurrence"
-msgstr "這是惟一出現之處"
-
-#: src/browser.c:793 src/search.c:364
+#: src/browser.c:754 src/search.c:368
 msgid "Search Wrapped"
 msgstr "已從頭搜尋"
 
-#: src/browser.c:843 src/search.c:517
+#: src/browser.c:764 src/search.c:509
+msgid "This is the only occurrence"
+msgstr "這是惟一出現之處"
+
+#: src/browser.c:812 src/search.c:473
 msgid "No current search pattern"
 msgstr "沒有符合目前搜尋形式者"
 
-#: src/files.c:50
+#: src/color.c:186
+#, fuzzy, c-format
+msgid "Unknown syntax name: %s"
+msgstr "缺少語法名稱"
+
+#: src/color.c:247
+#, c-format
+msgid "magic_load() failed: %s"
+msgstr ""
+
+#: src/color.c:251
+#, c-format
+msgid "magic_file(%s) failed: %s"
+msgstr ""
+
+#: src/files.c:47
 #, c-format
 msgid "Directory '%s' does not exist"
 msgstr ""
 
-#: src/files.c:52
+#: src/files.c:49
 #, c-format
 msgid "Path '%s': %s"
 msgstr ""
 
-#: src/files.c:54
+#: src/files.c:51
 #, fuzzy, c-format
 msgid "Path '%s' is not a directory"
 msgstr "\"%s\" 是一個目錄"
 
-#: src/files.c:57
+#: src/files.c:53
 #, c-format
 msgid "Path '%s' is not accessible"
 msgstr ""
 
-#. TRANSLATORS: Try to keep this at most 76 characters.
-#: src/files.c:158
+#. TRANSLATORS: Keep the next ten messages at most 76 characters.
+#: src/files.c:148
 msgid ""
 "Warning: Modifying a file which is not locked, check directory permission?"
 msgstr "警告：正在變更一個未鎖定的檔案，要檢查一下目錄權限嗎？"
 
-#: src/files.c:197
+#: src/files.c:187
 msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
 msgstr "無法確認我的身分以用於鎖定檔案 (getpwuid() 失敗)"
 
-#: src/files.c:206
+#: src/files.c:196
 #, fuzzy, c-format
 msgid "Couldn't determine hostname for lock file: %s"
 msgstr "無法確認主機名稱以用於鎖定檔案：%s"
 
-#: src/files.c:227 src/files.c:238 src/files.c:275 src/files.c:285
+#: src/files.c:216 src/files.c:225 src/files.c:262 src/files.c:272
 #, c-format
 msgid "Error writing lock file %s: %s"
 msgstr "寫入鎖定檔案 %s 時發生錯誤：%s"
 
-#: src/files.c:305
+#: src/files.c:291
 #, c-format
 msgid "Error deleting lock file %s: %s"
 msgstr "刪除鎖定檔案 %s 時發生錯誤：%s"
 
-#: src/files.c:341
+#: src/files.c:325
 #, fuzzy, c-format
 msgid "Error opening lock file %s: %s"
 msgstr "開啟鎖定檔案 %s 時發生錯誤：%s"
 
-#: src/files.c:353
+#: src/files.c:337
 #, fuzzy, c-format
 msgid "Error reading lock file %s: Not enough data read"
 msgstr "讀取鎖定檔案 %s 時發生錯誤：未讀取足夠的資料"
 
 #. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
-#: src/files.c:371
+#: src/files.c:354
 #, c-format
 msgid "File %s is being edited (by %s with %s, PID %d); continue?"
 msgstr ""
 
-#: src/files.c:426
+#: src/files.c:430
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "無法插入 %s 外部的檔案"
 
-#: src/files.c:439 src/files.c:1038 src/rcfile.c:589 src/rcfile.c:1385
-#: src/rcfile.c:1426
+#: src/files.c:445 src/files.c:991 src/rcfile.c:533 src/rcfile.c:1230
+#: src/rcfile.c:1271
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" 是一個目錄"
 
-#: src/files.c:441
+#: src/files.c:447
 #, fuzzy, c-format
 msgid "\"%s\" is not a normal file"
 msgstr "\"%s\" 是一個裝置檔案"
 
-#: src/files.c:566
+#: src/files.c:571
 msgid "No more open file buffers"
 msgstr "無多餘檔案緩衝區可開啟"
 
-#: src/files.c:582
+#: src/files.c:586
 #, c-format
 msgid "Switched to %s"
 msgstr "切換至 %s"
 
-#: src/files.c:584 src/global.c:988 src/winio.c:2010
+#: src/files.c:588 src/global.c:1005 src/winio.c:1965
 msgid "New Buffer"
 msgstr "新緩衝區"
 
-#: src/files.c:943
+#. TRANSLATORS: Keep the next four messages at most 76 characters.
+#: src/files.c:913
 #, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
 msgstr[0] "已讀取 %lu 列 (轉檔自 DOS 與 Mac 格式)"
 
-#: src/files.c:948
-#, c-format
-msgid ""
-"Read %lu line (Converted from DOS and Mac format - Warning: No write "
-"permission)"
-msgid_plural ""
-"Read %lu lines (Converted from DOS and Mac format - Warning: No write "
-"permission)"
-msgstr[0] "已讀取 %lu 列 (轉檔自 DOS 與 Mac 格式 - 警告：沒有寫入權限)"
-
-#: src/files.c:954
+#: src/files.c:919
 #, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
 msgstr[0] "已讀取 %lu 列 (轉檔自 Mac 格式)"
 
-#: src/files.c:958
-#, c-format
-msgid ""
-"Read %lu line (Converted from Mac format - Warning: No write permission)"
-msgid_plural ""
-"Read %lu lines (Converted from Mac format - Warning: No write permission)"
-msgstr[0] "已讀取 %lu 列 (轉檔自 Mac 格式 - 警告：沒有寫入權限)"
-
-#: src/files.c:964
+#: src/files.c:925
 #, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
 msgstr[0] "已讀取 %lu 列 (轉檔自 DOS 格式)"
 
-#: src/files.c:968
-#, c-format
-msgid ""
-"Read %lu line (Converted from DOS format - Warning: No write permission)"
-msgid_plural ""
-"Read %lu lines (Converted from DOS format - Warning: No write permission)"
-msgstr[0] "已讀取 %lu 列 (轉檔自 DOS 格式 - 警告：沒有寫入權限)"
-
-#: src/files.c:974
+#: src/files.c:930
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "已讀取 %lu 列"
 
-#: src/files.c:977
-#, fuzzy, c-format
-msgid "Read %lu line (Warning: No write permission)"
-msgid_plural "Read %lu lines (Warning: No write permission)"
-msgstr[0] "已讀取 %lu 列 (警告：沒有寫入權限)"
-
-#: src/files.c:1019 src/files.c:1056
+#: src/files.c:974 src/files.c:1006
 msgid "Reading File"
 msgstr "正在讀取檔案"
 
-#: src/files.c:1025
+#: src/files.c:980
 msgid "New File"
 msgstr "新檔案"
 
-#: src/files.c:1028
-#, c-format
-msgid "\"%s\" not found"
+#: src/files.c:983
+#, fuzzy, c-format
+msgid "File \"%s\" not found"
 msgstr "找不到 \"%s\""
 
-#: src/files.c:1039 src/rcfile.c:590 src/rcfile.c:1386 src/rcfile.c:1427
+#: src/files.c:992 src/rcfile.c:534 src/rcfile.c:1231 src/rcfile.c:1272
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" 是一個裝置檔案"
 
-#: src/files.c:1133
+#: src/files.c:1083
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "在新緩衝區中執行的命令 [從 %s] "
 
-#: src/files.c:1135
+#: src/files.c:1085
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "執行的命令 [從 %s] "
 
-#: src/files.c:1142
+#: src/files.c:1092
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "所要插入新緩衝區的檔案 [從 %s] "
 
-#: src/files.c:1144
+#: src/files.c:1094
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "所要插入的檔案 [從 %s] "
 
-#: src/files.c:1389
+#: src/files.c:1338
 msgid "Key invalid in non-multibuffer mode"
 msgstr "非多重緩衝區模式中此按鍵無效"
 
-#: src/files.c:1684
-msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+#: src/files.c:1632
+#, fuzzy
+msgid "Failed to write backup file; continue saving? (Say N if unsure.) "
 msgstr "寫入備份檔案時失敗，要繼續儲存？(如果不確定就以 N 表示) "
 
-#: src/files.c:1800
+#: src/files.c:1750
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "無法寫入 %s 外部"
 
-#: src/files.c:1885 src/files.c:1910 src/files.c:1928 src/files.c:1941
-#: src/files.c:1952 src/files.c:1981
+#: src/files.c:1833 src/files.c:1858 src/files.c:1876 src/files.c:1889
+#: src/files.c:1900 src/files.c:1928
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "寫入暫存檔案 %s 時發生錯誤：%s"
 
-#: src/files.c:1886 src/nano.c:690
+#: src/files.c:1834 src/nano.c:692
 msgid "Too many backup files?"
 msgstr "太多備份檔案？"
 
-#: src/files.c:2026 src/text.c:2863 src/text.c:2875 src/text.c:3244
-#: src/text.c:3253
+#: src/files.c:1972 src/text.c:3117 src/text.c:3129 src/text.c:3498
+#: src/text.c:3507
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "寫入暫存檔案 %s 時發生錯誤"
 
-#: src/files.c:2049 src/files.c:2068 src/files.c:2080 src/files.c:2104
-#: src/files.c:2121 src/files.c:2131 src/files.c:2164 src/files.c:2171
+#: src/files.c:1994 src/files.c:2013 src/files.c:2023 src/files.c:2047
+#: src/files.c:2064 src/files.c:2074 src/files.c:2106 src/files.c:2113
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "寫入 %s 時發生錯誤: %s"
 
-#: src/files.c:2200
+#: src/files.c:2154
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "已寫入 %lu 列"
 
-#: src/files.c:2299
+#: src/files.c:2249
 msgid " [DOS Format]"
 msgstr " [DOS 格式]"
 
-#: src/files.c:2300
+#: src/files.c:2250
 msgid " [Mac Format]"
 msgstr " [Mac 格式]"
 
-#: src/files.c:2302
+#: src/files.c:2252
 msgid " [Backup]"
 msgstr " [備份]"
 
-#: src/files.c:2309
+#: src/files.c:2259
 msgid "Prepend Selection to File"
 msgstr "前引選擇部分於檔案"
 
-#: src/files.c:2310
+#: src/files.c:2260
 msgid "Append Selection to File"
 msgstr "附加選擇部分至檔案"
 
-#: src/files.c:2311
+#: src/files.c:2261
 msgid "Write Selection to File"
 msgstr "寫入選擇部分至檔案"
 
-#: src/files.c:2314
+#: src/files.c:2264
 msgid "File Name to Prepend to"
 msgstr "要前引於的檔案名稱"
 
-#: src/files.c:2315
+#: src/files.c:2265
 msgid "File Name to Append to"
 msgstr "要附加至的檔案名稱"
 
-#: src/files.c:2316
+#: src/files.c:2266
 msgid "File Name to Write"
 msgstr "要寫入的檔案名稱"
 
-#: src/files.c:2349
-msgid "Save modified buffer anyway ? "
+#: src/files.c:2301
+msgid "Save modified buffer anyway? "
 msgstr ""
 
-#: src/files.c:2457
-msgid "File exists, OVERWRITE ? "
-msgstr "檔案已存在，要覆寫嗎？"
-
-#: src/files.c:2466
-msgid "Save file under DIFFERENT NAME ? "
+#: src/files.c:2412
+#, fuzzy
+msgid "Save file under DIFFERENT NAME? "
 msgstr "以不同的名稱存檔？"
 
-#: src/files.c:2480
-msgid "File was modified since you opened it, continue saving ? "
+#: src/files.c:2420
+#, fuzzy, c-format
+msgid "File \"%s\" exists; OVERWRITE? "
+msgstr "檔案已存在，要覆寫嗎？"
+
+#: src/files.c:2441
+#, fuzzy
+msgid "File was modified since you opened it; continue saving? "
 msgstr "檔案從您開啟它後已被修改，要繼續儲存？"
 
-#: src/files.c:2917
+#: src/files.c:2874
 msgid "(more)"
 msgstr "(更多)"
 
-#: src/files.c:3004
+#: src/files.c:2959
 #, c-format
 msgid ""
 "\n"
@@ -368,7 +358,7 @@ msgstr ""
 "\n"
 "按下輸入鍵以繼續\n"
 
-#: src/files.c:3020
+#: src/files.c:2975
 #, fuzzy, c-format
 msgid ""
 "Unable to create directory %s: %s\n"
@@ -377,7 +367,7 @@ msgstr ""
 "無法建立目錄 %s：%s\n"
 "對於儲存/載入搜尋歷史或游標位置而言，它是必要的\n"
 
-#: src/files.c:3026
+#: src/files.c:2982
 #, fuzzy, c-format
 msgid ""
 "Path %s is not a directory and needs to be.\n"
@@ -386,7 +376,7 @@ msgstr ""
 "路徑 %s 並非卻必須是個目錄。\n"
 "Nano 將無法載入或儲存搜尋或游標位置歷史\n"
 
-#: src/files.c:3045
+#: src/files.c:3002
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I tried to move\n"
@@ -395,7 +385,7 @@ msgstr ""
 "偵測到舊的 nano 歷史檔案 (%s)，我已嘗試將它移動\n"
 "到偏好的位置 (%s) 但是遇到了錯誤：%s"
 
-#: src/files.c:3049
+#: src/files.c:3006
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I moved\n"
@@ -406,748 +396,779 @@ msgstr ""
 "到偏好的位置 (%s)\n"
 "(參看關於這個變更的 nano FAQ)"
 
-#: src/files.c:3132 src/files.c:3140 src/files.c:3164 src/files.c:3176
+#: src/files.c:3089 src/files.c:3097 src/files.c:3121 src/files.c:3133
 #, fuzzy, c-format
 msgid "Error writing %s: %s\n"
 msgstr "寫入 %s 時發生錯誤: %s"
 
 #. TRANSLATORS: Try to keep the next fifteen strings at most 10 characters.
-#: src/global.c:480
+#: src/global.c:483
 msgid "Exit"
 msgstr "離開"
 
-#: src/global.c:481
+#: src/global.c:484
 msgid "Close"
 msgstr "關閉"
 
-#: src/global.c:482
+#: src/global.c:485
 #, fuzzy
 msgid "Uncut Text"
 msgstr "還原剪下文字"
 
-#: src/global.c:484
+#: src/global.c:487
 #, fuzzy
 msgid "Unjustify"
 msgstr "還原對齊"
 
-#: src/global.c:490
+#: src/global.c:493
 msgid "Read File"
 msgstr "讀檔"
 
-#: src/global.c:491
+#: src/global.c:494
 msgid "Where Is"
 msgstr "搜尋"
 
-#: src/global.c:492
+#: src/global.c:495
 msgid "Replace"
 msgstr "置換"
 
-#: src/global.c:493
+#: src/global.c:496
 msgid "Go To Line"
 msgstr "跳列"
 
-#: src/global.c:494
+#: src/global.c:497
 msgid "Prev Line"
 msgstr "上列"
 
-#: src/global.c:495
+#: src/global.c:498
 msgid "Next Line"
 msgstr "下列"
 
-#: src/global.c:496
+#: src/global.c:499
 msgid "Prev Page"
 msgstr "上頁"
 
-#: src/global.c:497
+#: src/global.c:500
 msgid "Next Page"
 msgstr "下頁"
 
-#: src/global.c:499
+#: src/global.c:502
 msgid "Justify"
 msgstr "對齊"
 
-#: src/global.c:500
+#: src/global.c:503
 msgid "FullJstify"
 msgstr "全部對齊"
 
-#: src/global.c:502
+#: src/global.c:505
 msgid "Refresh"
 msgstr "重新顯示"
 
 #. TRANSLATORS: Try to keep this string at most 12 characters.
-#: src/global.c:505
+#: src/global.c:508
 msgid "WhereIs Next"
 msgstr "下一個位置"
 
 #. TRANSLATORS: The next long series of strings are shortcut descriptions;
 #. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:512
+#: src/global.c:515
 msgid "Justify the current paragraph"
 msgstr "對齊目前段落"
 
-#: src/global.c:514
+#: src/global.c:517
 msgid "Cancel the current function"
 msgstr "取消目前功能"
 
-#: src/global.c:515
+#: src/global.c:518
 msgid "Display this help text"
 msgstr "顯示這份說明文字"
 
-#: src/global.c:518
+#: src/global.c:521
 msgid "Close the current file buffer / Exit from nano"
 msgstr "關閉目前檔案緩衝區 / 離開 nano"
 
-#: src/global.c:520
+#: src/global.c:523
 msgid "Exit from nano"
 msgstr "離開 nano"
 
-#: src/global.c:524
+#: src/global.c:527
 msgid "Write the current file to disk"
 msgstr "寫入目前檔案至磁碟"
 
-#: src/global.c:526
+#: src/global.c:529
 msgid "Insert another file into the current one"
 msgstr "插入它檔至目前檔案"
 
-#: src/global.c:528
+#: src/global.c:531
 msgid "Search for a string or a regular expression"
 msgstr "使用字串或正規表示式來搜尋"
 
-#: src/global.c:531
+#: src/global.c:533
 #, fuzzy
 msgid "Search for a string"
 msgstr "使用字串或正規表示式來搜尋"
 
-#: src/global.c:533
+#: src/global.c:534
+msgid "Refresh the file list"
+msgstr ""
+
+#: src/global.c:535
+#, fuzzy
+msgid "Go to lefthand column"
+msgstr "跳至指定列與行位置"
+
+#: src/global.c:536
+#, fuzzy
+msgid "Go to righthand column"
+msgstr "跳至指定列與行位置"
+
+#: src/global.c:538
 #, fuzzy
 msgid "Go one screenful up"
 msgstr "跳至後一畫面"
 
-#: src/global.c:534
+#: src/global.c:539
 #, fuzzy
 msgid "Go one screenful down"
 msgstr "跳至後一畫面"
 
-#: src/global.c:536
+#: src/global.c:541
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "剪下目前這列並存至剪貼簿"
 
-#: src/global.c:538
+#: src/global.c:543
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "從剪貼簿還原至目前這列"
 
-#: src/global.c:539
+#: src/global.c:544
 msgid "Display the position of the cursor"
 msgstr "顯示游標位置"
 
-#: src/global.c:541
+#: src/global.c:546
 msgid "Invoke the spell checker, if available"
 msgstr "嘗試呼叫拼字檢查"
 
-#: src/global.c:543
+#: src/global.c:548
 msgid "Replace a string or a regular expression"
 msgstr "置換字串或正規表示式"
 
-#: src/global.c:544
+#: src/global.c:549
 msgid "Go to line and column number"
 msgstr "跳至指定列與行位置"
 
-#: src/global.c:546
+#: src/global.c:551
 #, fuzzy
 msgid "Mark text starting from the cursor position"
 msgstr "標記游標所在文字"
 
-#: src/global.c:547
+#: src/global.c:552
 #, fuzzy
 msgid "Repeat the last search"
 msgstr "重覆上次搜尋"
 
-#: src/global.c:549
+#: src/global.c:554
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "剪下目前這列並存至剪貼簿"
 
-#: src/global.c:550
+#: src/global.c:555
 msgid "Indent the current line"
 msgstr "縮排目前這列"
 
-#: src/global.c:551
+#: src/global.c:556
 msgid "Unindent the current line"
 msgstr "取消目前這列的縮排"
 
-#: src/global.c:552
+#: src/global.c:558
+msgid "Comment/uncomment the current line or marked lines"
+msgstr ""
+
+#: src/global.c:560
 msgid "Undo the last operation"
 msgstr "復原上次的動作"
 
-#: src/global.c:553
+#: src/global.c:561
 msgid "Redo the last undone operation"
 msgstr "重做最後一筆已復原作業"
 
-#: src/global.c:555
+#: src/global.c:563
 msgid "Go back one character"
 msgstr "向後跳一字元"
 
-#: src/global.c:556
+#: src/global.c:564
 msgid "Go forward one character"
 msgstr "向前跳一字元"
 
-#: src/global.c:558
+#: src/global.c:566
 msgid "Go back one word"
 msgstr "向後跳一字詞"
 
-#: src/global.c:559
+#: src/global.c:567
 msgid "Go forward one word"
 msgstr "向前跳一字詞"
 
-#: src/global.c:561
+#: src/global.c:569
 msgid "Go to previous line"
 msgstr "跳至前一列"
 
-#: src/global.c:562
+#: src/global.c:570
 msgid "Go to next line"
 msgstr "跳至後一列"
 
-#: src/global.c:563
+#: src/global.c:571
 msgid "Go to beginning of current line"
 msgstr "跳至目前列首"
 
-#: src/global.c:564
+#: src/global.c:572
 msgid "Go to end of current line"
 msgstr "跳至目前列尾"
 
-#: src/global.c:567
+#: src/global.c:575
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "跳至目前段落開頭；然後是前一段落的開頭"
 
-#: src/global.c:569
+#: src/global.c:577
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr "跳至目前段落結尾；然後是後一段落的結尾"
 
-#: src/global.c:571
+#: src/global.c:579
 msgid "Go to the first line of the file"
 msgstr "跳至檔案第一列"
 
-#: src/global.c:572
+#: src/global.c:580
 msgid "Go to the last line of the file"
 msgstr "跳至檔案最後一列"
 
-#: src/global.c:574
+#: src/global.c:582
 msgid "Go to the matching bracket"
 msgstr "跳至對應的括號"
 
-#: src/global.c:576
+#: src/global.c:584
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "向上捲動一列但不捲動游標"
 
-#: src/global.c:578
+#: src/global.c:586
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "向下捲動一列但不捲動游標"
 
-#: src/global.c:581
+#: src/global.c:589
 msgid "Switch to the previous file buffer"
 msgstr "切換至上個檔案緩衝區"
 
-#: src/global.c:582
+#: src/global.c:590
 msgid "Switch to the next file buffer"
 msgstr "切換至下個檔案緩衝區"
 
-#: src/global.c:584
+#: src/global.c:592
 msgid "Insert the next keystroke verbatim"
 msgstr "插入下個按鍵的原形"
 
-#: src/global.c:585
+#: src/global.c:593
 msgid "Insert a tab at the cursor position"
 msgstr "插入跳格字元於游標位置"
 
-#: src/global.c:586
+#: src/global.c:594
 msgid "Insert a newline at the cursor position"
 msgstr "插入換列字元於游標位置"
 
-#: src/global.c:587
+#: src/global.c:595
 msgid "Delete the character under the cursor"
 msgstr "刪除游標之下的字元"
 
-#: src/global.c:589
+#: src/global.c:597
 msgid "Delete the character to the left of the cursor"
 msgstr "刪除游標左側的字元"
 
-#: src/global.c:592
+#: src/global.c:600
 #, fuzzy
 msgid "Cut backward from cursor to word start"
 msgstr "從游標剪下至列尾"
 
-#: src/global.c:594
+#: src/global.c:602
 #, fuzzy
 msgid "Cut forward from cursor to next word start"
 msgstr "從游標剪下至列尾"
 
-#: src/global.c:596
+#: src/global.c:604
 msgid "Cut from the cursor position to the end of the file"
 msgstr "從游標位置剪下至檔案結尾"
 
-#: src/global.c:599
+#: src/global.c:607
 msgid "Justify the entire file"
 msgstr "對齊整個檔案"
 
-#: src/global.c:603
+#: src/global.c:611
 msgid "Count the number of words, lines, and characters"
 msgstr "計算字數、列數與字元數"
 
-#: src/global.c:606
+#: src/global.c:614
 msgid "Refresh (redraw) the current screen"
 msgstr "重新顯示目前畫面"
 
-#: src/global.c:608
+#: src/global.c:616
 #, fuzzy
 msgid "Suspend the editor (if suspension is enabled)"
 msgstr "懸置編輯器 (如果懸置已啟用)"
 
-#: src/global.c:610
+#: src/global.c:618
 msgid "Save file without prompting"
 msgstr ""
 
-#: src/global.c:611
+#: src/global.c:619
 msgid "Search next occurrence backward"
 msgstr ""
 
-#: src/global.c:612
+#: src/global.c:620
 msgid "Search next occurrence forward"
 msgstr ""
 
-#: src/global.c:614
+#: src/global.c:622
 msgid "Toggle the case sensitivity of the search"
 msgstr "切換搜尋的大小寫符合"
 
-#: src/global.c:616
+#: src/global.c:624
 msgid "Reverse the direction of the search"
 msgstr "倒轉搜尋方向"
 
-#: src/global.c:620
+#: src/global.c:628
 msgid "Toggle the use of regular expressions"
 msgstr "切換使用正規表示式"
 
-#: src/global.c:624
+#: src/global.c:632
 msgid "Recall the previous search/replace string"
 msgstr "重用上次搜尋/置換字串"
 
-#: src/global.c:626
+#: src/global.c:634
 msgid "Recall the next search/replace string"
 msgstr "重用下次搜尋/置換字串"
 
-#: src/global.c:629
+#: src/global.c:637
 msgid "Go to file browser"
 msgstr "呼叫檔案選單"
 
-#: src/global.c:632
+#: src/global.c:640
 msgid "Toggle the use of DOS format"
 msgstr "切換使用 DOS 格式"
 
-#: src/global.c:633
+#: src/global.c:641
 msgid "Toggle the use of Mac format"
 msgstr "切換使用 Mac 格式"
 
-#: src/global.c:634
+#: src/global.c:642
 msgid "Toggle appending"
 msgstr "切換附加"
 
-#: src/global.c:635
+#: src/global.c:643
 msgid "Toggle prepending"
 msgstr "切換前置"
 
-#: src/global.c:636
+#: src/global.c:644
 msgid "Toggle backing up of the original file"
 msgstr "切換備份既有檔案"
 
-#: src/global.c:637
+#: src/global.c:645
 msgid "Execute external command"
 msgstr "執行外部命令"
 
-#: src/global.c:639
+#: src/global.c:647
 msgid "Close buffer without saving it"
 msgstr ""
 
-#: src/global.c:641
+#: src/global.c:649
 msgid "Toggle the use of a new buffer"
 msgstr "切換使用新緩衝區"
 
-#: src/global.c:644
+#: src/global.c:652
 msgid "Exit from the file browser"
 msgstr "從檔案選單離開"
 
-#: src/global.c:645
+#: src/global.c:653
 msgid "Go to the first file in the list"
 msgstr "跳至列表中的第一個檔案"
 
-#: src/global.c:646
+#: src/global.c:654
 msgid "Go to the last file in the list"
 msgstr "跳至列表中的最後一個檔案"
 
-#: src/global.c:647
+#: src/global.c:655
 msgid "Go to the previous file in the list"
 msgstr "跳至列表中的上一個檔案"
 
-#: src/global.c:648
+#: src/global.c:656
 msgid "Go to the next file in the list"
 msgstr "跳至列表中的下一個檔案"
 
-#: src/global.c:649
+#: src/global.c:657
 msgid "Go to directory"
 msgstr "跳至目錄"
 
-#: src/global.c:652
+#: src/global.c:660
 #, fuzzy
 msgid "Invoke the linter, if available"
 msgstr "嘗試呼叫拼字檢查"
 
-#: src/global.c:653
+#: src/global.c:661
 #, fuzzy
 msgid "Go to previous linter msg"
 msgstr "跳至前一列"
 
-#: src/global.c:654
+#: src/global.c:662
 #, fuzzy
 msgid "Go to next linter msg"
 msgstr "跳至後一列"
 
-#: src/global.c:656
+#: src/global.c:664
 #, fuzzy
 msgid "Invoke formatter, if available"
 msgstr "嘗試呼叫拼字檢查"
 
 #. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:671
+#: src/global.c:679
 msgid "Get Help"
 msgstr "求助"
 
-#: src/global.c:674 src/prompt.c:858
+#: src/global.c:682 src/prompt.c:855
 msgid "Cancel"
 msgstr "取消"
 
-#: src/global.c:687
+#: src/global.c:695
 #, fuzzy
 msgid "Write Out"
 msgstr "寫入"
 
-#: src/global.c:723
+#: src/global.c:731
 msgid "Go To Dir"
 msgstr "跳至目錄"
 
-#: src/global.c:738
+#: src/global.c:746
 msgid "Cut Text"
 msgstr "剪下文字"
 
-#: src/global.c:753
+#: src/global.c:761
 msgid "To Spell"
 msgstr "拼字檢查"
 
-#: src/global.c:757
+#: src/global.c:765
 #, fuzzy
 msgid "To Linter"
 msgstr "跳列"
 
-#: src/global.c:760
+#: src/global.c:768
 #, fuzzy
 msgid "Formatter"
 msgstr "DOS 格式"
 
-#: src/global.c:767
+#: src/global.c:775
 msgid "Case Sens"
 msgstr "依大小寫"
 
-#: src/global.c:772
+#: src/global.c:780
 msgid "Regexp"
 msgstr "正規表示式"
 
-#: src/global.c:777
+#: src/global.c:785
 msgid "Backwards"
 msgstr "向後搜尋"
 
-#: src/global.c:784
+#: src/global.c:792
 msgid "No Replace"
 msgstr "不置換"
 
-#: src/global.c:792
+#: src/global.c:800
 msgid "Cur Pos"
 msgstr "游標位置"
 
-#: src/global.c:807
+#: src/global.c:815
 msgid "First Line"
 msgstr "首列"
 
-#: src/global.c:809
+#: src/global.c:817
 msgid "Last Line"
 msgstr "尾列"
 
-#: src/global.c:816
+#: src/global.c:824
 #, fuzzy
 msgid "To Bracket"
 msgstr "並非一個括號"
 
-#: src/global.c:819
+#: src/global.c:827
 msgid "Mark Text"
 msgstr "標記文字"
 
-#: src/global.c:822
+#: src/global.c:830
 msgid "Copy Text"
 msgstr "複製文字"
 
-#: src/global.c:825
+#: src/global.c:833
 msgid "Indent Text"
 msgstr "縮排文字"
 
-#: src/global.c:827
+#: src/global.c:835
 msgid "Unindent Text"
 msgstr "取消縮排文字"
 
-#: src/global.c:830
+#: src/global.c:838
 msgid "Undo"
 msgstr "復原"
 
-#: src/global.c:832
+#: src/global.c:840
 msgid "Redo"
 msgstr "重做"
 
-#: src/global.c:836 src/global.c:842
+#: src/global.c:844 src/global.c:850
 msgid "Back"
 msgstr "向後"
 
-#: src/global.c:838 src/global.c:844
+#: src/global.c:846 src/global.c:852
 msgid "Forward"
 msgstr "向前"
 
-#: src/global.c:849
+#: src/global.c:857
 msgid "Prev Word"
 msgstr "前一個字"
 
-#: src/global.c:851
+#: src/global.c:859
 msgid "Next Word"
 msgstr "後一個字"
 
-#: src/global.c:855
+#: src/global.c:863
 msgid "Home"
 msgstr "頂端"
 
-#: src/global.c:857
+#: src/global.c:865
 msgid "End"
 msgstr "尾端"
 
-#: src/global.c:866
+#: src/global.c:874
 msgid "Beg of Par"
 msgstr "段落開頭"
 
-#: src/global.c:868
+#: src/global.c:876
 msgid "End of Par"
 msgstr "段落結尾"
 
-#: src/global.c:873
+#: src/global.c:881
 msgid "Scroll Up"
 msgstr "向上捲動"
 
-#: src/global.c:875
+#: src/global.c:883
 msgid "Scroll Down"
 msgstr "向下捲動"
 
-#: src/global.c:880
+#: src/global.c:888
 #, fuzzy
 msgid "Prev File"
 msgstr "上個檔案"
 
-#: src/global.c:882
+#: src/global.c:890
 msgid "Next File"
 msgstr "下個檔案"
 
-#: src/global.c:891
+#: src/global.c:899
 #, fuzzy
 msgid "Verbatim"
 msgstr "原形輸入"
 
-#: src/global.c:894
+#: src/global.c:902
 msgid "Tab"
 msgstr "跳格鍵"
 
-#: src/global.c:896
+#: src/global.c:904
 msgid "Enter"
 msgstr "輸入鍵"
 
-#: src/global.c:899
+#: src/global.c:907
 msgid "Delete"
 msgstr "刪除鍵"
 
-#: src/global.c:901
+#: src/global.c:909
 msgid "Backspace"
 msgstr "退格鍵"
 
 #. TRANSLATORS: The next two strings refer to cutting words.
-#: src/global.c:912
+#: src/global.c:920
 #, fuzzy
 msgid "Cut Left"
 msgstr "剪下文字"
 
-#: src/global.c:914
+#: src/global.c:922
 msgid "Cut Right"
 msgstr ""
 
-#: src/global.c:916
+#: src/global.c:924
 msgid "CutTillEnd"
 msgstr "刪至末端"
 
-#: src/global.c:926
+#: src/global.c:934
 msgid "Word Count"
 msgstr "計算字數"
 
-#: src/global.c:933
+#: src/global.c:941
 msgid "Suspend"
 msgstr "懸置"
 
-#: src/global.c:937
+#: src/global.c:945
+#, fuzzy
+msgid "Comment Lines"
+msgstr "下列"
+
+#: src/global.c:949
 msgid "Save"
 msgstr ""
 
-#: src/global.c:940
+#: src/global.c:952
 #, fuzzy
 msgid "Previous"
 msgstr "上個檔案"
 
-#: src/global.c:942
+#: src/global.c:954
 #, fuzzy
 msgid "Next"
 msgstr "下頁"
 
-#: src/global.c:948
+#: src/global.c:960
 msgid "PrevHstory"
 msgstr "上一筆記錄"
 
-#: src/global.c:951
+#: src/global.c:963
 msgid "NextHstory"
 msgstr "下一筆記錄"
 
-#: src/global.c:955
+#: src/global.c:972
 msgid "Go To Text"
 msgstr "跳至文字"
 
-#: src/global.c:959
+#: src/global.c:976
 msgid "DOS Format"
 msgstr "DOS 格式"
 
-#: src/global.c:961
+#: src/global.c:978
 msgid "Mac Format"
 msgstr "Mac 格式"
 
-#: src/global.c:969
+#: src/global.c:986
 msgid "Append"
 msgstr "附加"
 
-#: src/global.c:971
+#: src/global.c:988
 msgid "Prepend"
 msgstr "前引"
 
-#: src/global.c:974
+#: src/global.c:991
 msgid "Backup File"
 msgstr "備份檔案"
 
-#: src/global.c:981
+#: src/global.c:998
 msgid "Execute Command"
 msgstr "執行命令"
 
-#: src/global.c:996
+#: src/global.c:1013
 msgid "To Files"
 msgstr "檔案選單"
 
-#: src/global.c:1004
+#: src/global.c:1021
 msgid "First File"
 msgstr "第一個檔案"
 
-#: src/global.c:1006
+#: src/global.c:1023
 msgid "Last File"
 msgstr "最後的檔案"
 
-#: src/global.c:1010
+#: src/global.c:1027
 msgid "Discard buffer"
 msgstr ""
 
+#: src/global.c:1038
+msgid "Left Column"
+msgstr ""
+
+#: src/global.c:1040
+msgid "Right Column"
+msgstr ""
+
 #. TRANSLATORS: Try to keep the next two strings at most 20 characters.
-#: src/global.c:1020
+#: src/global.c:1047
 #, fuzzy
 msgid "Prev Lint Msg"
 msgstr "上列"
 
-#: src/global.c:1022
+#: src/global.c:1049
 #, fuzzy
 msgid "Next Lint Msg"
 msgstr "下列"
 
 #. TRANSLATORS: The next seventeen strings are toggle descriptions;
 #. * they are best kept shorter than 40 characters, but may be longer.
-#: src/global.c:1285
+#: src/global.c:1316
 msgid "Help mode"
 msgstr "輔助模式"
 
-#: src/global.c:1287
+#: src/global.c:1318
 msgid "Constant cursor position display"
 msgstr "持續顯示游標位置"
 
-#: src/global.c:1289
+#: src/global.c:1320
 msgid "Use of one more line for editing"
 msgstr "編輯時多使用一列"
 
-#: src/global.c:1291
+#: src/global.c:1322
 msgid "Smooth scrolling"
 msgstr "平滑式捲動畫面"
 
-#: src/global.c:1293
+#: src/global.c:1324
 #, fuzzy
 msgid "Soft wrapping of overlong lines"
 msgstr "不要自動換列"
 
-#: src/global.c:1295
+#: src/global.c:1326
 msgid "Whitespace display"
 msgstr "顯示空格"
 
-#: src/global.c:1297
+#: src/global.c:1328
 msgid "Color syntax highlighting"
 msgstr "語法色彩標示"
 
-#: src/global.c:1299
+#: src/global.c:1330
 msgid "Smart home key"
 msgstr "智慧型 HOME 按鍵"
 
-#: src/global.c:1301
+#: src/global.c:1332
 msgid "Auto indent"
 msgstr "自動縮排"
 
-#: src/global.c:1303
+#: src/global.c:1334
 msgid "Cut to end"
 msgstr "剪下至列尾"
 
-#: src/global.c:1305
+#: src/global.c:1336
 #, fuzzy
 msgid "Hard wrapping of overlong lines"
 msgstr "不要自動換列"
 
-#: src/global.c:1307
+#: src/global.c:1338
 msgid "Conversion of typed tabs to spaces"
 msgstr "已輸入跳格符號至空白的轉換"
 
-#: src/global.c:1309
+#: src/global.c:1340
 msgid "Backup files"
 msgstr "備份檔案"
 
-#: src/global.c:1311
+#: src/global.c:1342
 msgid "Reading file into separate buffer"
 msgstr ""
 
-#: src/global.c:1313
+#: src/global.c:1344
 msgid "Mouse support"
 msgstr "滑鼠支援"
 
-#: src/global.c:1315
+#: src/global.c:1346
 msgid "No conversion from DOS/Mac format"
 msgstr "不從 DOS/Mac 格式轉檔"
 
-#: src/global.c:1317
+#: src/global.c:1348
 msgid "Suspension"
 msgstr "懸置"
 
-#: src/help.c:209
+#: src/help.c:211
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1167,7 +1188,7 @@ msgstr ""
 " 前次搜尋的字串將會顯示在 搜尋: 提示符號後面的括號中。不輸入任何文字 而直接按"
 "下輸入鍵則會履行前次的搜尋。"
 
-#: src/help.c:218
+#: src/help.c:220
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1181,7 +1202,7 @@ msgstr ""
 " 以下的功能鍵可用於搜尋模式:\n"
 "\n"
 
-#: src/help.c:224
+#: src/help.c:226
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1200,7 +1221,7 @@ msgstr ""
 " 以下的功能鍵可用於跳列模式: \n"
 "\n"
 
-#: src/help.c:233
+#: src/help.c:235
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1220,7 +1241,7 @@ msgstr ""
 "multibuffer、Meta-F 開關，或者 nanorc 檔案來啟動的話，所插入的檔案 將會被載入"
 "另外的緩衝區中 (利用 Meta-< 和 > 在檔案緩衝區間切換)。 "
 
-#: src/help.c:242
+#: src/help.c:244
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1234,7 +1255,7 @@ msgstr ""
 " 以下的功能鍵可用於插入檔案模式:\n"
 "\n"
 
-#: src/help.c:248
+#: src/help.c:250
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1260,7 +1281,7 @@ msgstr ""
 " 以下的功能鍵可用於寫入檔案模式: \n"
 "\n"
 
-#: src/help.c:262
+#: src/help.c:264
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1282,7 +1303,7 @@ msgstr ""
 " 以下的功能鍵可用於檔案選單: \n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:277
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1304,7 +1325,7 @@ msgstr ""
 "下輸入鍵則會履行前次的搜尋。\n"
 "\n"
 
-#: src/help.c:284
+#: src/help.c:286
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1312,7 +1333,7 @@ msgstr ""
 " 下列功能鍵可用於瀏覽器搜尋模式：\n"
 "\n"
 
-#: src/help.c:288
+#: src/help.c:290
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1334,7 +1355,7 @@ msgstr ""
 " 以下的功能鍵可用於跳至目錄模式: \n"
 "\n"
 
-#: src/help.c:301
+#: src/help.c:303
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1356,7 +1377,7 @@ msgstr ""
 " 以下的功能鍵可用於拼字檢查模式: \n"
 "\n"
 
-#: src/help.c:316
+#: src/help.c:318
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1375,7 +1396,7 @@ msgstr ""
 " 以下的功能鍵可用於執行命令模式: \n"
 "\n"
 
-#: src/help.c:329
+#: src/help.c:331
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1395,15 +1416,15 @@ msgstr ""
 "\n"
 " "
 
-#: src/help.c:339
+#: src/help.c:341
+#, fuzzy
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
-" The notation for shortcuts is as follows: Control-key sequences are notated "
-"with a caret (^) symbol and can be entered either by using the Control "
-"(Ctrl) key or pressing the Escape (Esc) key twice.  Escape-key sequences are "
-"notated with the Meta (M-) symbol and can be entered using either the Esc, "
-"Alt, or Meta key depending on your keyboard setup.  "
+" Shortcuts are written as follows: Control-key sequences are notated with a "
+"'^' and can be entered either by using the Ctrl key or pressing the Esc key "
+"twice.  Meta-key sequences are notated with 'M-' and can be entered using "
+"either the Alt, Cmd, or Esc key, depending on your keyboard setup.  "
 msgstr ""
 "底部的兩列顯示編輯器中最常用 到的快捷鍵。\n"
 "快捷鍵的記號定義如下：控制鍵組 (Control-key) 序列是以一個 \"帽子\" (caret, "
@@ -1427,21 +1448,21 @@ msgstr ""
 msgid "enable/disable"
 msgstr "開啟/關閉"
 
-#: src/nano.c:559
+#: src/nano.c:560
 #, fuzzy
 msgid "Key is invalid in view mode"
 msgstr "觀看模式中此按鍵無效"
 
-#: src/nano.c:565
+#: src/nano.c:566
 #, fuzzy
 msgid "This function is disabled in restricted mode"
 msgstr "在限制模式中無法至 %s 外部"
 
-#: src/nano.c:573
+#: src/nano.c:574
 msgid "Help is not available"
 msgstr ""
 
-#: src/nano.c:684
+#: src/nano.c:686
 #, c-format
 msgid ""
 "\n"
@@ -1450,7 +1471,7 @@ msgstr ""
 "\n"
 "緩衝區已寫入 %s\n"
 
-#: src/nano.c:686
+#: src/nano.c:688
 #, c-format
 msgid ""
 "\n"
@@ -1459,7 +1480,7 @@ msgstr ""
 "\n"
 "緩衝區未寫入至 %s: %s\n"
 
-#: src/nano.c:689
+#: src/nano.c:691
 #, c-format
 msgid ""
 "\n"
@@ -1724,17 +1745,22 @@ msgstr "開啟懸置功能"
 msgid "Enable soft line wrapping"
 msgstr "開啟長列換列"
 
-#: src/nano.c:937
-#, fuzzy, c-format
-msgid " GNU nano, version %s\n"
-msgstr " GNU nano 版本 %s (編譯於 %s, %s)\n"
-
 #: src/nano.c:940
 #, c-format
+msgid " nano, version %s\n"
+msgstr ""
+
+#: src/nano.c:943
+#, c-format
+msgid " (C) 2014..%s the contributors to nano\n"
+msgstr ""
+
+#: src/nano.c:945
+#, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr " 電子郵件: nano@nano-editor.org\t\t網頁: http://www.nano-editor.org/"
 
-#: src/nano.c:941
+#: src/nano.c:946
 #, c-format
 msgid ""
 "\n"
@@ -1743,67 +1769,82 @@ msgstr ""
 "\n"
 " 編譯選項:"
 
-#: src/nano.c:1073
+#: src/nano.c:1081
 msgid "No file name"
 msgstr ""
 
-#: src/nano.c:1108
-msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
-msgstr "儲存更動過的緩衝區嗎 (回答 \"No\" 會撤銷修改)？"
+#: src/nano.c:1115
+msgid "Save modified buffer?  (Answering \"No\" will DISCARD changes.) "
+msgstr ""
 
-#: src/nano.c:1168
+#: src/nano.c:1178
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "無法重新開啟來自鍵盤的標準輸入，抱歉\n"
 
-#: src/nano.c:1192
+#: src/nano.c:1202
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "讀取自標準輸入，^C 以放棄\n"
 
-#: src/nano.c:1256
+#: src/nano.c:1266
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "接收到 SIGHUP 或 SIGTERM\n"
 
-#: src/nano.c:1272
+#: src/nano.c:1282
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "利用 \"fg\" 來回到 nano。\n"
 
-#: src/nano.c:1294
+#: src/nano.c:1304
 msgid "Suspension is not enabled"
 msgstr ""
 
-#: src/nano.c:1448
+#: src/nano.c:1459
 msgid "enabled"
 msgstr "é–‹å•Ÿ"
 
-#: src/nano.c:1448
+#: src/nano.c:1459
 msgid "disabled"
 msgstr "關閉"
 
-#: src/nano.c:1607 src/winio.c:1125
-msgid "Unknown Command"
-msgstr "不明的命令"
+#: src/nano.c:1573
+msgid "Unbound key"
+msgstr ""
+
+#: src/nano.c:1577
+#, c-format
+msgid "Unbound key: M-%c"
+msgstr ""
+
+#: src/nano.c:1579
+#, c-format
+msgid "Unbound key: ^%c"
+msgstr ""
+
+#: src/nano.c:1581
+#, c-format
+msgid "Unbound key: %c"
+msgstr ""
 
-#: src/nano.c:1720
+#: src/nano.c:1745
 msgid "XON ignored, mumble mumble"
 msgstr "忽略 XON，嗯嗯。"
 
-#: src/nano.c:1725
+#: src/nano.c:1750
 msgid "XOFF ignored, mumble mumble"
 msgstr "忽略 XOFF，嗯嗯。"
 
-#: src/nano.c:2139 src/rcfile.c:1334
+#: src/nano.c:2166 src/rcfile.c:1187
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "所要求的跳格寬度 \"%s\" 無效"
 
-#: src/nano.c:2200 src/rcfile.c:1259
+#: src/nano.c:2227 src/rcfile.c:1128
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "所要求的填滿行數 \"%s\" 無效"
 
-#: src/nano.c:2247
+#: src/nano.c:2276
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr ""
@@ -1811,116 +1852,120 @@ msgstr ""
 #. TRANSLATORS: For the next three strings, if possible, specify
 #. * the single-byte shortcuts for both your language and English.
 #. * For example, in French: "OoYy" for "Oui".
-#: src/prompt.c:821
+#: src/prompt.c:818
 msgid "Yy"
 msgstr "Yy"
 
-#: src/prompt.c:822
+#: src/prompt.c:819
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:823
+#: src/prompt.c:820
 msgid "Aa"
 msgstr "Aa"
 
-#: src/prompt.c:845
+#: src/prompt.c:842
 msgid "Yes"
 msgstr "是"
 
-#: src/prompt.c:850
+#: src/prompt.c:847
 msgid "All"
 msgstr "全部"
 
-#: src/prompt.c:855
+#: src/prompt.c:852
 msgid "No"
 msgstr "否"
 
-#: src/rcfile.c:142
+#: src/rcfile.c:144
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "在 %s (位於第 %lu 列) 中發生錯誤: "
 
-#: src/rcfile.c:201
+#: src/rcfile.c:203
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "引數 '%s' 有未封閉的 \""
 
-#: src/rcfile.c:228 src/rcfile.c:280 src/rcfile.c:732 src/rcfile.c:793
-#: src/rcfile.c:882 src/rcfile.c:933
+#: src/rcfile.c:231 src/rcfile.c:674 src/rcfile.c:725 src/rcfile.c:824
 msgid "Regex strings must begin and end with a \" character"
 msgstr "正規表示式字串必須以 \" 字元開始及結束"
 
-#: src/rcfile.c:254 src/search.c:62
+#: src/rcfile.c:257 src/search.c:61
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "不良的正規表示式 \"%s\": %s"
 
-#: src/rcfile.c:274
+#: src/rcfile.c:279
 msgid "Missing syntax name"
 msgstr "缺少語法名稱"
 
-#: src/rcfile.c:345
+#: src/rcfile.c:288
+msgid "A syntax name must be quoted"
+msgstr ""
+
+#: src/rcfile.c:297
 msgid "The \"none\" syntax is reserved"
 msgstr "\"none\" 語法已被保留"
 
-#: src/rcfile.c:352
-msgid "The \"default\" syntax must take no extensions"
+#: src/rcfile.c:327
+#, fuzzy
+msgid "The \"default\" syntax does not accept extensions"
 msgstr "\"default\" 語法必須不含任何副檔名"
 
-#: src/rcfile.c:424
+#: src/rcfile.c:369
 msgid "Missing key name"
 msgstr "缺少語法名稱"
 
-#: src/rcfile.c:433 src/rcfile.c:444
+#: src/rcfile.c:378 src/rcfile.c:389
 msgid "Key name is too short"
 msgstr ""
 
-#: src/rcfile.c:454
+#: src/rcfile.c:399
 #, fuzzy
 msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr "按鍵繫結必須以 \"^\", \"M\", 或 \"F\" 開始"
 
-#: src/rcfile.c:457
+#: src/rcfile.c:402
 #, fuzzy, c-format
 msgid "Key name %s is invalid"
 msgstr "所要求的跳格寬度 \"%s\" 無效"
 
-#: src/rcfile.c:466
+#: src/rcfile.c:411
 #, fuzzy
 msgid "Must specify a function to bind the key to"
 msgstr "必須指定按鍵所繫結的功能"
 
 #. TRANSLATORS: Do not translate the word "all".
-#: src/rcfile.c:476
+#: src/rcfile.c:421
 msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
 
-#: src/rcfile.c:483
+#: src/rcfile.c:428
 #, fuzzy, c-format
 msgid "Cannot map name \"%s\" to a function"
 msgstr "無法映射名稱「%s」到某一功能"
 
-#: src/rcfile.c:490
+#: src/rcfile.c:435
 #, fuzzy, c-format
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "無法映射名稱「%s」到某一選單"
 
-#: src/rcfile.c:522
+#: src/rcfile.c:467
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr ""
 
-#: src/rcfile.c:534
+#: src/rcfile.c:479
 #, fuzzy, c-format
 msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "抱歉，按鍵字串「%s」是不合法的繫結"
 
-#: src/rcfile.c:631
+#: src/rcfile.c:576
 #, fuzzy, c-format
 msgid "Error expanding %s: %s"
 msgstr "讀取 %s 時發生錯誤: %s"
 
-#: src/rcfile.c:674
+#: src/rcfile.c:616
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1935,126 +1980,112 @@ msgstr ""
 "\"black\"(黑)，加上選擇性的前置字 \"bright\"(明亮) \n"
 "可用於前景色。"
 
-#: src/rcfile.c:696
-msgid "Cannot add a color command without a syntax command"
-msgstr "無法增加顏色命令而沒有語法命令"
+#: src/rcfile.c:637 src/rcfile.c:795 src/rcfile.c:858
+#, c-format
+msgid "A '%s' command requires a preceding 'syntax' command"
+msgstr ""
 
-#: src/rcfile.c:701
+#: src/rcfile.c:643
 msgid "Missing color name"
 msgstr "缺少顏色名稱"
 
-#: src/rcfile.c:711 src/rcfile.c:872
-msgid "Missing regex string"
+#: src/rcfile.c:653 src/rcfile.c:807
+#, fuzzy, c-format
+msgid "Missing regex string after '%s' command"
 msgstr "缺少正規表示式字串"
 
-#: src/rcfile.c:787
+#: src/rcfile.c:719
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\" 要求對應的 \"end=\""
 
-#: src/rcfile.c:839
+#: src/rcfile.c:768
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
 msgstr "背景色 \"%s\" 不可為明亮"
 
-#: src/rcfile.c:867
-msgid "Cannot add a header regex without a syntax command"
-msgstr "無法增加標頭正規表示式而沒有語法命令"
-
-#: src/rcfile.c:922
-msgid "Cannot add a magic string regex without a syntax command"
-msgstr "無法增加魔法正規表示式而沒有語法命令"
-
-#: src/rcfile.c:927
-msgid "Missing magic string name"
-msgstr "缺少魔法字串名稱"
-
-#: src/rcfile.c:985
-#, fuzzy
-msgid "Cannot add a linter without a syntax command"
-msgstr "無法增加標頭正規表示式而沒有語法命令"
-
-#: src/rcfile.c:990
-#, fuzzy
-msgid "Missing linter command"
-msgstr "缺少顏色名稱"
-
-#: src/rcfile.c:1011
-#, fuzzy
-msgid "Cannot add formatter without a syntax command"
-msgstr "無法增加顏色命令而沒有語法命令"
+#: src/rcfile.c:802
+#, fuzzy, c-format
+msgid "The \"default\" syntax does not accept '%s' regexes"
+msgstr "\"default\" 語法必須不含任何副檔名"
 
-#: src/rcfile.c:1016
-msgid "Missing formatter command"
+#: src/rcfile.c:863
+#, c-format
+msgid "Missing command after '%s'"
 msgstr ""
 
-#: src/rcfile.c:1046
+#: src/rcfile.c:879
+#, fuzzy, c-format
+msgid "Argument of '%s' lacks closing \""
+msgstr "引數 '%s' 有未封閉的 \""
+
+#: src/rcfile.c:910
 #, fuzzy, c-format
 msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr "嚴重錯誤：沒有按鍵映射至功能「%s」"
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:912
 #, fuzzy, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr "離開中。 如果需要調整您的 nanorc 設定值，請使用 nano 與 -I 選項\n"
 
-#: src/rcfile.c:1109
+#: src/rcfile.c:971
 #, fuzzy, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "無法映射名稱「%s」到某一選單"
 
-#: src/rcfile.c:1125 src/rcfile.c:1134 src/rcfile.c:1144
-#, c-format
-msgid "Command \"%s\" not allowed in included file"
-msgstr "命令「%s」在包含的檔案中不允許"
-
-#: src/rcfile.c:1150 src/rcfile.c:1359
+#: src/rcfile.c:993 src/rcfile.c:1202
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "語法「%s」沒有任何顏色命令"
 
-#: src/rcfile.c:1180
+#: src/rcfile.c:1024
+#, c-format
+msgid "Command \"%s\" not allowed in included file"
+msgstr "命令「%s」在包含的檔案中不允許"
+
+#: src/rcfile.c:1039
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "無法辨識 \"%s\" 命令"
 
-#: src/rcfile.c:1195
+#: src/rcfile.c:1051
 #, fuzzy
 msgid "Missing option"
 msgstr "缺少顏色名稱"
 
-#: src/rcfile.c:1217
+#: src/rcfile.c:1065
+#, fuzzy, c-format
+msgid "Unknown option \"%s\""
+msgstr "旗標 \"%s\" 無法辨識"
+
+#: src/rcfile.c:1077
+#, fuzzy, c-format
+msgid "Cannot unset option \"%s\""
+msgstr "無法解除旗標 \"%s\" 設定"
+
+#: src/rcfile.c:1089
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "選項 \"%s\" 要求引數"
 
-#: src/rcfile.c:1235
+#: src/rcfile.c:1105
 msgid "Option is not a valid multibyte string"
 msgstr "選項並非正確的多位元字串"
 
-#: src/rcfile.c:1272 src/rcfile.c:1300 src/rcfile.c:1309
+#: src/rcfile.c:1139 src/rcfile.c:1160 src/rcfile.c:1167
 msgid "Non-blank characters required"
 msgstr "需要非空格字元"
 
-#: src/rcfile.c:1282
+#: src/rcfile.c:1146
 msgid "Two single-column characters required"
 msgstr "需要兩個單行字元"
 
-#: src/rcfile.c:1348
-#, fuzzy, c-format
-msgid "Cannot unset option \"%s\""
-msgstr "無法解除旗標 \"%s\" 設定"
-
-#: src/rcfile.c:1354
-#, fuzzy, c-format
-msgid "Unknown option \"%s\""
-msgstr "旗標 \"%s\" 無法辨識"
-
-#: src/rcfile.c:1413
+#: src/rcfile.c:1258
 msgid "I can't find my home directory!  Wah!"
 msgstr "我找不到我的家目錄！哇！"
 
-#: src/rcfile.c:1451
+#: src/rcfile.c:1295
 #, c-format
 msgid ""
 "\n"
@@ -2063,342 +2094,399 @@ msgstr ""
 "\n"
 "按下輸入鍵以繼續啟動 nano。\n"
 
-#: src/search.c:96
+#: src/search.c:95
 #, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "找不到 \"%.*s%s\""
 
 #. TRANSLATORS: The next three strings are modifiers of the search prompt.
-#: src/search.c:176
+#: src/search.c:169
 msgid " [Case Sensitive]"
 msgstr " [符合大小寫]"
 
-#: src/search.c:180
+#: src/search.c:173
 msgid " [Regexp]"
 msgstr " [正規表示式]"
 
-#: src/search.c:184
+#: src/search.c:177
 msgid " [Backwards]"
 msgstr " [向後搜尋]"
 
 #. TRANSLATORS: The next two strings are modifiers of the search prompt.
-#: src/search.c:189
+#: src/search.c:182
 msgid " (to replace) in selection"
 msgstr " 在標記中(置換)"
 
-#: src/search.c:191
+#: src/search.c:184
 msgid " (to replace)"
 msgstr " (置換)"
 
+#: src/search.c:305
+#, fuzzy
+msgid "Searching..."
+msgstr "搜尋"
+
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:718
+#: src/search.c:693
 msgid "Replace this instance?"
 msgstr "置換這個？"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:883
+#: src/search.c:840
 msgid "Replace with"
 msgstr "以此置換"
 
-#: src/search.c:924
+#: src/search.c:875
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
 msgstr[0] "已置換 %lu 處"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:964
+#: src/search.c:914
 msgid "Enter line number, column number"
 msgstr "輸入列號，行號"
 
-#: src/search.c:991
+#: src/search.c:939
 msgid "Invalid line or column number"
 msgstr "無效的列號或行號"
 
-#: src/search.c:1124
+#: src/search.c:1080
 msgid "Not a bracket"
 msgstr "並非一個括號"
 
-#: src/search.c:1191
+#: src/search.c:1146
 msgid "No matching bracket"
 msgstr "無對應括號"
 
-#: src/text.c:54
+#: src/text.c:53
 msgid "Mark Set"
 msgstr "標記設定"
 
-#: src/text.c:58
+#: src/text.c:57
 msgid "Mark Unset"
 msgstr "標記解除"
 
-#: src/text.c:70
+#: src/text.c:69
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "呼叫 \"%s\" 錯誤"
 
-#: src/text.c:475
+#: src/text.c:468
+msgid "Commenting is not supported for this file type"
+msgstr ""
+
+#: src/text.c:484
+msgid "Cannot comment past end of file"
+msgstr ""
+
+#: src/text.c:677
 msgid "Nothing in undo buffer!"
 msgstr "復原緩衝區中沒有任何東西！"
 
-#: src/text.c:481 src/text.c:634
-#, fuzzy, c-format
-msgid "Internal error: can't match line %d.  Please save your work."
-msgstr "內部錯誤：無法匹配第 %d 列。 請儲存您的工作"
-
 #. TRANSLATORS: Eight of the next nine strings describe actions
 #. * that are undone or redone.  It are all nouns, not verbs.
-#: src/text.c:495 src/text.c:524 src/text.c:645 src/text.c:686
+#: src/text.c:695 src/text.c:724 src/text.c:857 src/text.c:898
 msgid "text add"
 msgstr "文字加入"
 
-#: src/text.c:505 src/text.c:656
+#: src/text.c:705 src/text.c:868
 msgid "text delete"
 msgstr "文字刪除"
 
-#: src/text.c:528 src/text.c:694
+#: src/text.c:728 src/text.c:907
 msgid "line join"
 msgstr "列聯結"
 
-#: src/text.c:547 src/text.c:710
+#: src/text.c:747 src/text.c:923
 msgid "text cut"
 msgstr "文字剪下"
 
-#: src/text.c:552 src/text.c:714
+#: src/text.c:752 src/text.c:927
 msgid "text uncut"
 msgstr "文字取消剪下"
 
-#: src/text.c:558 src/text.c:691
+#: src/text.c:758 src/text.c:903
 #, fuzzy
 msgid "Internal error: line is missing.  Please save your work."
 msgstr "內部錯誤：無法設定取消剪下。 請儲存您的工作。"
 
-#: src/text.c:561 src/text.c:665
+#: src/text.c:762 src/text.c:877
 msgid "line break"
 msgstr "分列符號"
 
-#: src/text.c:569 src/text.c:725
+#: src/text.c:772 src/text.c:947
+msgid "comment"
+msgstr ""
+
+#: src/text.c:776 src/text.c:951
+msgid "uncomment"
+msgstr ""
+
+#: src/text.c:780 src/text.c:938
 msgid "text insert"
 msgstr "文字插入"
 
-#: src/text.c:589 src/text.c:718
+#: src/text.c:800 src/text.c:931
 msgid "text replace"
 msgstr "文字置換"
 
-#: src/text.c:596 src/text.c:732 src/text.c:1030 src/text.c:1174
+#: src/text.c:807 src/text.c:955 src/text.c:1267 src/text.c:1437
 msgid "Internal error: unknown type.  Please save your work."
 msgstr "內部錯誤：不明型態。 請儲存您的工作。"
 
-#: src/text.c:601
+#: src/text.c:813
 #, c-format
 msgid "Undid action (%s)"
 msgstr "已復原動作 (%s)"
 
-#: src/text.c:619
+#: src/text.c:832
 msgid "Nothing to re-do!"
 msgstr "沒有任何東西可重做！"
 
-#: src/text.c:628
+#: src/text.c:841
 #, fuzzy
 msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr "內部錯誤：無法設定取消剪下。 請儲存您的工作。"
 
-#: src/text.c:737
+#: src/text.c:961
 #, c-format
 msgid "Redid action (%s)"
 msgstr "已重做動作 (%s)"
 
-#: src/text.c:827 src/text.c:2508 src/text.c:2944
+#: src/text.c:1051 src/text.c:2765 src/text.c:3198
 msgid "Could not create pipe"
 msgstr "無法建立管線功能"
 
-#: src/text.c:853 src/text.c:2595 src/text.c:2750 src/text.c:2992
-#: src/text.c:3286
+#: src/text.c:1077 src/text.c:2852 src/text.c:3005 src/text.c:3246
+#: src/text.c:3540
 msgid "Could not fork"
 msgstr "執行功能無效"
 
-#: src/text.c:1853
+#: src/text.c:2117
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "不良引用字串 %s: %s"
 
-#: src/text.c:2241
+#: src/text.c:2499
 msgid "Can now UnJustify!"
 msgstr "現在可以還原對齊！"
 
-#: src/text.c:2435
+#: src/text.c:2697
 msgid "Edit a replacement"
 msgstr "編輯替代文字"
 
-#: src/text.c:2510
+#. TRANSLATORS: Shown after fixing misspellings in one word.
+#: src/text.c:2713
+#, fuzzy
+msgid "Next word..."
+msgstr "後一個字"
+
+#: src/text.c:2767
 msgid "Creating misspelled word list, please wait..."
 msgstr "正在建立錯字列表，請稍待…"
 
-#: src/text.c:2601 src/text.c:2999
+#: src/text.c:2858 src/text.c:3253
 msgid "Could not get size of pipe buffer"
 msgstr "無法得知管線緩衝區大小"
 
-#: src/text.c:2652
+#: src/text.c:2907
 msgid "Error invoking \"spell\""
 msgstr "呼叫 \"spell\" 錯誤"
 
-#: src/text.c:2655
+#: src/text.c:2910
 msgid "Error invoking \"sort -f\""
 msgstr "呼叫 \"sort -f\" 錯誤"
 
-#: src/text.c:2658
+#: src/text.c:2913
 msgid "Error invoking \"uniq\""
 msgstr "呼叫 \"uniq\" 錯誤"
 
-#: src/text.c:2881
+#: src/text.c:3135
 #, fuzzy
 msgid "Invoking spell checker, please wait"
 msgstr "嘗試呼叫拼字檢查"
 
-#: src/text.c:2897
+#: src/text.c:3151
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "拼字檢查失敗: %s"
 
-#: src/text.c:2899
+#: src/text.c:3153
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "拼字檢查失敗: %s: %s"
 
-#: src/text.c:2902
+#: src/text.c:3156
 msgid "Finished checking spelling"
 msgstr "拼字檢查結束"
 
-#: src/text.c:2927
+#: src/text.c:3181
 #, fuzzy
 msgid "No linter defined for this type of file!"
 msgstr "不要將換列加到檔案末端"
 
-#: src/text.c:2932
+#: src/text.c:3186
 msgid "Save modified buffer before linting?"
 msgstr ""
 
-#: src/text.c:2949
+#: src/text.c:3203
 msgid "Invoking linter, please wait"
 msgstr ""
 
-#: src/text.c:3105
+#: src/text.c:3358
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr ""
 
-#: src/text.c:3134
+#: src/text.c:3388
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
 
-#: src/text.c:3153
+#: src/text.c:3407
 msgid "No more errors in unopened files, cancelling"
 msgstr ""
 
-#: src/text.c:3192
+#: src/text.c:3446
 #, fuzzy
 msgid "At last message"
 msgstr "顯示此訊息"
 
-#: src/text.c:3197
+#: src/text.c:3451
 #, fuzzy
 msgid "At first message"
 msgstr "顯示此訊息"
 
-#: src/text.c:3237
+#: src/text.c:3491
 msgid "Finished"
 msgstr ""
 
-#: src/text.c:3259
+#: src/text.c:3513
 msgid "Invoking formatter, please wait"
 msgstr ""
 
-#: src/text.c:3314
+#: src/text.c:3568
 msgid "Finished formatting"
 msgstr ""
 
-#: src/text.c:3396
+#: src/text.c:3650
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%s字數: %lu  列數: %ld  字元數: %lu"
 
-#: src/text.c:3397
+#: src/text.c:3651
 msgid "In Selection:  "
 msgstr "於選擇部分: "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3411
+#: src/text.c:3665
 msgid "Verbatim Input"
 msgstr "原形輸入"
 
-#: src/utils.c:391 src/utils.c:403
+#: src/utils.c:392 src/utils.c:404
 msgid "nano is out of memory!"
 msgstr "nano 已耗盡記憶體！"
 
+#: src/utils.c:625
+#, fuzzy, c-format
+msgid "Internal error: can't match line %d.  Please save your work."
+msgstr "內部錯誤：無法匹配第 %d 列。 請儲存您的工作"
+
+#. TRANSLATORS: This refers to a sequence of escape codes
+#. * (from the keyboard) that nano does not know about.
+#: src/winio.c:1121
+msgid "Unknown sequence"
+msgstr ""
+
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
 #: src/winio.c:1427
 msgid "Unicode Input"
 msgstr "萬國碼輸入"
 
-#: src/winio.c:1991 src/winio.c:1995
-msgid "Modified"
-msgstr "已更動"
-
-#: src/winio.c:1992
-msgid "View"
-msgstr "觀看"
-
-#: src/winio.c:2006
+#: src/winio.c:1960
 msgid "DIR:"
 msgstr "目錄:"
 
-#: src/winio.c:2013
+#: src/winio.c:1968
 msgid "File:"
 msgstr "檔案:"
 
-#: src/winio.c:3141
+#: src/winio.c:1972 src/winio.c:1976
+msgid "Modified"
+msgstr "已更動"
+
+#: src/winio.c:1974
+msgid "View"
+msgstr "觀看"
+
+#: src/winio.c:3105
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "列 %ld/%ld (%d%%), 行 %lu/%lu (%d%%), 字元 %lu/%lu (%d%%)"
 
-#: src/winio.c:3271
+#: src/winio.c:3235
 msgid "The nano text editor"
 msgstr "nano 文字編輯器"
 
-#: src/winio.c:3272
+#: src/winio.c:3236
 msgid "version"
 msgstr "版本"
 
-#: src/winio.c:3273
+#: src/winio.c:3237
 msgid "Brought to you by:"
 msgstr "來自於:"
 
-#: src/winio.c:3274
+#: src/winio.c:3238
 msgid "Special thanks to:"
 msgstr "特別感謝:"
 
-#: src/winio.c:3275
+#: src/winio.c:3239
 msgid "The Free Software Foundation"
 msgstr "自由軟體基金會"
 
-#: src/winio.c:3276
+#: src/winio.c:3240
 msgid "the many translators and the TP"
 msgstr ""
 
-#: src/winio.c:3277
+#: src/winio.c:3241
 msgid "For ncurses:"
 msgstr "ncurses 部分:"
 
-#: src/winio.c:3278
+#: src/winio.c:3242
 msgid "and anyone else we forgot..."
 msgstr "以及其他我們不記得的人…"
 
-#: src/winio.c:3279
+#: src/winio.c:3243
 msgid "Thank you for using nano!"
 msgstr "謝謝您使用 nano﹗"
 
+#~ msgid ""
+#~ "Read %lu line (Converted from DOS and Mac format - Warning: No write "
+#~ "permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from DOS and Mac format - Warning: No write "
+#~ "permission)"
+#~ msgstr[0] "已讀取 %lu 列 (轉檔自 DOS 與 Mac 格式 - 警告：沒有寫入權限)"
+
+#~ msgid ""
+#~ "Read %lu line (Converted from Mac format - Warning: No write permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from Mac format - Warning: No write permission)"
+#~ msgstr[0] "已讀取 %lu 列 (轉檔自 Mac 格式 - 警告：沒有寫入權限)"
+
+#~ msgid ""
+#~ "Read %lu line (Converted from DOS format - Warning: No write permission)"
+#~ msgid_plural ""
+#~ "Read %lu lines (Converted from DOS format - Warning: No write permission)"
+#~ msgstr[0] "已讀取 %lu 列 (轉檔自 DOS 格式 - 警告：沒有寫入權限)"
+
+#~ msgid "Read %lu line ( Warning: No write permission)"
+#~ msgid_plural "Read %lu lines (Warning: No write permission)"
+#~ msgstr[0] "已讀取 %lu 列 (警告：沒有寫入權限)"
+
 #~ msgid "Cannot prepend or append to a symlink with --nofollow set"
 #~ msgstr "--nofollow 設定下，無法前引或附加至符號連結檔"
 
@@ -2432,12 +2520,33 @@ msgstr "謝謝您使用 nano﹗"
 #~ msgid "(ignored, for Pico compatibility)"
 #~ msgstr "(忽略，為了與 Pico 相容)"
 
+#~ msgid " GNU nano version %s (compiled %s, %s)\n"
+#~ msgstr " GNU nano 版本 %s (編譯於 %s, %s)\n"
+
 #~ msgid "Sorry, support for this function has been disabled"
 #~ msgstr "抱歉，已經關閉此功能的支援"
 
+#~ msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
+#~ msgstr "儲存更動過的緩衝區嗎 (回答 \"No\" 會撤銷修改)？"
+
+#~ msgid "Unknown Command"
+#~ msgstr "不明的命令"
+
+#~ msgid "Cannot add a magic string regex without a syntax command"
+#~ msgstr "無法增加魔法正規表示式而沒有語法命令"
+
+#~ msgid "Missing magic string name"
+#~ msgstr "缺少魔法字串名稱"
+
 #~ msgid "Must specify menu to bind key to (or \"all\")"
 #~ msgstr "必須指定按鍵所繫結的選單 (或是 \"all\")"
 
+#~ msgid "Cannot add a color command without a syntax command"
+#~ msgstr "無法增加顏色命令而沒有語法命令"
+
+#~ msgid "Cannot add a header regex without a syntax command"
+#~ msgstr "無法增加標頭正規表示式而沒有語法命令"
+
 #~ msgid "Missing flag"
 #~ msgstr "缺少旗標"
 
-- 
GitLab