69 files changed, 37869 insertions, 27044 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 10db548..72b5a8a 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,28 @@
+2014-05-28  Benno Schulenberg  <bensberg@justemail.net>
+	* de.po, eo.po, nl.po: Updates for German, Dutch, and Esperanto.
+
+2014-05-27  Benno Schulenberg  <bensberg@justemail.net>
+	* de.po, nl.po, ru.po: Updates for Russian, Dutch, and German.
+
+2014-05-25  Benno Schulenberg  <bensberg@justemail.net>
+	* it.po, uk.po: Updates from the TP for Ukrainian and Italian.
+
+2014-05-22  Benno Schulenberg  <bensberg@justemail.net>
+	* de.po, uk.po: Updates from the TP for German and Ukrainian.
+
+2014-05-16  Benno Schulenberg  <bensberg@justemail.net>
+	* eo.po, fi.po, fr.po, nl.po, vi.po: Updates from the TP for
+	Vietnamese, Finnish, Dutch, French, and Esperanto.
+
+2014-05-13  Benno Schulenberg  <bensberg@justemail.net>
+	* nano.pot, *.po: Regenerated the POT file and refreshed the PO's.
+
+2014-03-22  Benno Schulenberg  <bensberg@justemail.net>
+	* nano.pot: Regenerated the POT file.
+	* cs.po, es.po, it.po, nb.po, sr.po, zh_TW: Updates from the TP
+	for Czech, Spanish, Italian, Norwegian, Serbian, and Chinese.
+	* LINGUAS: Removed rw (Kinyarwanda) -- it was just fragments.
+
 2007-12-09  Jordi Mallach  <jordi@gnu.org>
 
 	* LINGUAS: Add zh_CN.
@@ -973,4 +998,4 @@
 	* es.po: Updated.
 
 
-$Id: ChangeLog 4195 2007-12-09 17:12:03Z jordi $
+$Id: ChangeLog 4926 2014-05-28 20:27:37Z bens $
diff --git a/po/LINGUAS b/po/LINGUAS
index 319e869..25a1cd7 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -1,2 +1,2 @@
 # List of available languages.
-bg ca cs da de es eu fi fr ga gl hu id it ms nb nl nn pl pt_BR ro ru rw sr sv tr uk vi zh_CN zh_TW
+bg ca cs da de eo es eu fi fr ga gl hu id it ja ms nb nl nn pl pt_BR ro ru sl sr sv tr uk vi zh_CN zh_TW 
diff --git a/po/bg.gmo b/po/bg.gmo
index 633c741..a895637 100644
--- a/po/bg.gmo
+++ b/po/bg.gmo
diff --git a/po/bg.po b/po/bg.po
index 24087de..20e6b53 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -1,126 +1,148 @@
 # Bulgarian translation of nano.
 # Copyright (C) 2005 Free Software Foundation, Inc.
 # This file is distributed under the same license as the nano package.
-# Yavor Doganov <yavor@doganov.org>, 2005.
-# Anton Zinoviev <zinoviev@debian.org>, 2005,2006
-#
-# This file should be sent to translation@iro.umontreal.ca with the
-# following subject line: TP-Robot nano-VERSION.bg.po
 #
+# Yavor Doganov <yavor@doganov.org>, 2005.
+# Anton Zinoviev <zinoviev@debian.org>, 2005, 2006
 msgid ""
 msgstr ""
 "Project-Id-Version: nano 1.9.99pre0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-22 06:34-0500\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\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"
+"Language: bg\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"
 
-#: src/browser.c:220
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:203
 msgid "Go To Directory"
 msgstr "Отиване в директория"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:860 src/files.c:2048
-#: src/nano.c:1060 src/search.c:220 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Отменено"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:246 src/browser.c:293
 #, c-format
 msgid "Can't go outside of %s in restricted mode"
 msgstr "Не може да се излезе от %s в ограничен режим"
 
-#: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:722
-#: src/files.c:731 src/files.c:1540 src/files.c:1659 src/files.c:1711
-#: src/files.c:1732 src/files.c:1855 src/files.c:2691 src/rcfile.c:568
-#: src/rcfile.c:1204
+#: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
+#: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
+#: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Грешка при четене на %s: %s"
 
-#: src/browser.c:303
+#: src/browser.c:283
 msgid "Can't move up a directory"
 msgstr "Не може да се премине в горната директория"
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:665 src/browser.c:674
+#: src/browser.c:626 src/browser.c:635
 msgid "(dir)"
 msgstr "(дир)"
 
 # TODO: по-добър превод
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:632
 msgid "(parent dir)"
 msgstr "(родит.дир.)"
 
-#: src/browser.c:801 src/search.c:185
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "Търсене"
 
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:805 src/search.c:189
-msgid " [Case Sensitive]"
-msgstr " [Зачитане на малки/големи]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:811 src/search.c:195
-msgid " [Regexp]"
-msgstr " [Рег.израз]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:817 src/search.c:201
-msgid " [Backwards]"
-msgstr " [Назад]"
-
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "Търсене отначало"
 
-#: src/browser.c:1006 src/browser.c:1039 src/search.c:514 src/search.c:517
-#: src/search.c:574 src/search.c:577
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "Това е единственото съвпадение"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr "Няма въведен низ за търсене"
 
-#: src/files.c:125
+#: src/files.c:139
+msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
+msgstr ""
+
+#: src/files.c:145
+#, fuzzy, c-format
+msgid "Couldn't determine hostname for lock file: %s"
+msgstr "Неуспех при създаването на временен файл: %s"
+
+#: src/files.c:165 src/files.c:175 src/files.c:212 src/files.c:222
+#, fuzzy, c-format
+msgid "Error writing lock file %s: %s"
+msgstr "Грешка при записа на временен файл: %s"
+
+#: src/files.c:237
+#, fuzzy, c-format
+msgid "Error deleting lock file %s: %s"
+msgstr "Грешка при записа на временен файл: %s"
+
+#: src/files.c:272
+#, fuzzy, c-format
+msgid "Error opening lock file %s: %s"
+msgstr "Грешка при четене на %s: %s"
+
+#: src/files.c:282
+#, 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:297
+#, c-format
+msgid "File %s is being edited (by %s with %s, PID %d); continue?"
+msgstr ""
+
+#: src/files.c:308
+#, c-format
+msgid "Error writing lock file: Directory '%s' doesn't exist"
+msgstr ""
+
+#: src/files.c:339
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Не може да се вмъкне файл извън %s"
 
-#: src/files.c:234
+#: src/files.c:467
 msgid "No more open file buffers"
 msgstr "Няма повече буфери за отваряне на файлове"
 
-#: src/files.c:250
+#: src/files.c:484
 #, c-format
 msgid "Switched to %s"
 msgstr "Превключено на %s"
 
-#: src/files.c:251 src/global.c:469 src/winio.c:2168
+#: src/files.c:485 src/global.c:953 src/winio.c:2161
 msgid "New Buffer"
 msgstr "Нов буфер"
 
-#: src/files.c:633
+#: src/files.c:874
 #, 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:638
+#: src/files.c:879
 #, fuzzy, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
@@ -131,14 +153,14 @@ msgid_plural ""
 msgstr[0] "Прочетен %lu ред (конвертиран от DOS и Mac формат)"
 msgstr[1] "Прочетени %lu реда (конвертирани от DOS и Mac формат)"
 
-#: src/files.c:644
+#: src/files.c:885
 #, 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:648
+#: src/files.c:889
 #, fuzzy, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
@@ -147,14 +169,14 @@ msgid_plural ""
 msgstr[0] "Прочетен %lu ред (конвертиран от Mac формат)"
 msgstr[1] "Прочетени %lu реда (конвертирани от Mac формат)"
 
-#: src/files.c:654
+#: src/files.c:895
 #, 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:658
+#: src/files.c:899
 #, fuzzy, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
@@ -163,490 +185,445 @@ msgid_plural ""
 msgstr[0] "Прочетен %lu ред (конвертиран от DOS формат)"
 msgstr[1] "Прочетени %lu реда (конвертирани от DOS формат)"
 
-#: src/files.c:664
+#: src/files.c:905
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "Прочетен %lu ред"
 msgstr[1] "Прочетени %lu реда"
 
-#: src/files.c:667
+#: src/files.c:908
 #, 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:700 src/files.c:736
+#: src/files.c:943 src/files.c:980
 msgid "Reading File"
 msgstr "Четене на файл"
 
-#: src/files.c:706
+#: src/files.c:950
 msgid "New File"
 msgstr "Нов файл"
 
-#: src/files.c:709
+#: src/files.c:953
 #, c-format
 msgid "\"%s\" not found"
 msgstr "„%s“ не е намерен"
 
-#: src/files.c:717 src/rcfile.c:559 src/rcfile.c:1154 src/rcfile.c:1195
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "„%s“ е директория"
 
-#: src/files.c:718 src/rcfile.c:560 src/rcfile.c:1155 src/rcfile.c:1196
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "„%s“ е файл за устройство"
 
-#: src/files.c:817
+#: src/files.c:1060
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Команда за изпълнение в нов буфер [от %s] "
 
-#: src/files.c:819
+#: src/files.c:1062
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Команда за изпълнение [от %s] "
 
-#: src/files.c:825
+#: src/files.c:1069
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Файл за вмъкване в новия буфер [от %s] "
 
-#: src/files.c:827
+#: src/files.c:1071
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Файл за вмъкване [от %s] "
 
-#: src/files.c:1077
+#: src/files.c:1320
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Клавишът е недопустим в режим без буфери"
 
-#: src/files.c:1486
+#: src/files.c:1622
+msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+msgstr ""
+
+#: src/files.c:1746
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Не може да се запише извън %s"
 
-#: src/files.c:1501
+#: src/files.c:1761
 msgid "Cannot prepend or append to a symlink with --nofollow set"
 msgstr "Не може да се добавя нищо към символна връзка, настроена с --nofollow"
 
-#: src/files.c:1581 src/files.c:1603 src/files.c:1621 src/files.c:1632
-#: src/files.c:1640 src/files.c:1667
+#: src/files.c:1843 src/files.c:1868 src/files.c:1886 src/files.c:1899
+#: src/files.c:1910 src/files.c:1939
 #, fuzzy, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Грешка при записа на временен файл: %s"
 
-#: src/files.c:1582 src/nano.c:701
+#: src/files.c:1844 src/nano.c:719
 msgid "Too many backup files?"
 msgstr "Твърде много резервни копия?"
 
-#: src/files.c:1687 src/files.c:1744 src/files.c:1763 src/files.c:1775
-#: src/files.c:1799 src/files.c:1817 src/files.c:1827 src/files.c:1863
-#: src/files.c:1868 src/files.c:2764 src/files.c:2773
+#: src/files.c:1959 src/files.c:2016 src/files.c:2035 src/files.c:2047
+#: src/files.c:2071 src/files.c:2089 src/files.c:2099 src/files.c:2135
+#: src/files.c:2140 src/files.c:3101 src/files.c:3110 src/files.c:3133
+#: src/files.c:3145
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Грешка при запис на %s: %s"
 
-#: src/files.c:1721 src/text.c:2929 src/text.c:2941
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Грешка при записа на временен файл: %s"
 
-#: src/files.c:1900
+#: src/files.c:2173
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "Запазен е %lu ред"
 msgstr[1] "Запазени са %lu реда"
 
-#: src/files.c:2004
+#: src/files.c:2278
 msgid " [DOS Format]"
 msgstr " [DOS формат]"
 
-#: src/files.c:2005
+#: src/files.c:2279
 msgid " [Mac Format]"
 msgstr " [Mac формат]"
 
-#: src/files.c:2007
+#: src/files.c:2281
 msgid " [Backup]"
 msgstr " [Резервно копие]"
 
-#: src/files.c:2015
+#: src/files.c:2289
 msgid "Prepend Selection to File"
 msgstr "Прикрепяне на избрания текст в началото на файл"
 
-#: src/files.c:2016
+#: src/files.c:2290
 msgid "Append Selection to File"
 msgstr "Прикрепяне на избрания текст в края на файл"
 
-#: src/files.c:2017
+#: src/files.c:2291
 msgid "Write Selection to File"
 msgstr "Запазване на избрания текст във файл"
 
-#: src/files.c:2020
+#: src/files.c:2294
 msgid "File Name to Prepend to"
 msgstr "Име на файла за прикрепяне в началото му"
 
-#: src/files.c:2021
+#: src/files.c:2295
 msgid "File Name to Append to"
 msgstr "Име на файла за прикрепяне в края му"
 
-#: src/files.c:2022
+#: src/files.c:2296
 msgid "File Name to Write"
 msgstr "Име на файл за запазване"
 
-#: src/files.c:2153
+#: src/files.c:2427
 msgid "File exists, OVERWRITE ? "
 msgstr "Файлът съществува, ПРЕЗАПИСВАНЕ? "
 
-#: src/files.c:2162
+#: src/files.c:2436
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "Запазване под РАЗЛИЧНО ИМЕ? "
 
-#: src/files.c:2173
+#: src/files.c:2450
 msgid "File was modified since you opened it, continue saving ? "
 msgstr ""
 
-#: src/files.c:2611
+#: src/files.c:2882
 msgid "(more)"
 msgstr "(повече)"
 
-#: src/files.c:2694 src/rcfile.c:1220
-#, c-format
+#: src/files.c:2974
+#, fuzzy, c-format
 msgid ""
 "\n"
-"Press Enter to continue starting nano.\n"
+"Press Enter to continue\n"
 msgstr ""
 "\n"
 "Натиснете „Enter“, за да продължи стартирането на nano\n"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:415 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Отмяна"
-
-#: src/global.c:416
-msgid "Replace"
-msgstr "Замяна"
+#: src/files.c:2989
+#, c-format
+msgid ""
+"Unable to create directory %s: %s\n"
+"It is required for saving/loading search history or cursor positions.\n"
+msgstr ""
 
-#: src/global.c:417
-msgid "No Replace"
-msgstr "Без замяна"
+#: src/files.c:2995
+#, 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/global.c:420
-msgid "Case Sens"
-msgstr "Зач. м/г"
+#: src/files.c:3012
+#, 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/global.c:421
-msgid "Backwards"
-msgstr "Назад"
+#: src/files.c:3016
+#, 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 ""
 
-#: src/global.c:425
-msgid "Regexp"
-msgstr "Рег.израз"
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
+#: src/global.c:477
+msgid "Exit"
+msgstr "Изход"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:451
-msgid "PrevHstory"
-msgstr "ПредИстор."
+#: src/global.c:478
+msgid "Close"
+msgstr "Затваряне"
 
-#: src/global.c:452
-msgid "NextHstory"
-msgstr "СледИстор."
+#: src/global.c:479
+#, fuzzy
+msgid "Uncut Text"
+msgstr "Поставяне"
 
-#: src/global.c:453
-msgid "Go To Text"
-msgstr "Отиване на текст"
+#: src/global.c:481
+#, fuzzy
+msgid "Unjustify"
+msgstr "Изкл.подр."
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:455
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:485
 msgid "WhereIs Next"
 msgstr "КъдеEследв."
 
-#: src/global.c:457
-msgid "First File"
-msgstr "Първи файл"
-
-#: src/global.c:458
-msgid "Last File"
-msgstr "Посл. файл"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:460
-msgid "To Files"
-msgstr "Към файловете"
-
-#: src/global.c:462
-msgid "DOS Format"
-msgstr "DOS формат"
-
-#: src/global.c:463
-msgid "Mac Format"
-msgstr "Mac формат"
-
-#: src/global.c:464
-msgid "Append"
-msgstr "Добавяне в края"
-
-#: src/global.c:465
-msgid "Prepend"
-msgstr "Добавяне в нач."
-
-#: src/global.c:466
-msgid "Backup File"
-msgstr "Резервно копие"
-
-#: src/global.c:467
-msgid "Execute Command"
-msgstr "Изпълнение на команда"
-
-#: src/global.c:471
-msgid "Go To Dir"
-msgstr "Отиване в директория"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:480
-msgid "Get Help"
-msgstr "Помощ"
-
-#: src/global.c:481
-msgid "Exit"
-msgstr "Изход"
-
-#: src/global.c:482
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:492
 msgid "Where Is"
 msgstr "Търсене"
 
-#: src/global.c:483
-msgid "Prev Page"
-msgstr "ПредСтр"
-
-#: src/global.c:484
-msgid "Next Page"
-msgstr "СледвСтр"
-
-#: src/global.c:485
-msgid "First Line"
-msgstr "Първи ред"
+#: src/global.c:493
+msgid "Replace"
+msgstr "Замяна"
 
-#: src/global.c:486
-msgid "Last Line"
-msgstr "Посл. ред"
+#: src/global.c:494
+msgid "Go To Line"
+msgstr "Отив. ред"
 
-#: src/global.c:487
-#, fuzzy
-msgid "Suspend"
-msgstr "Временно спиране"
+#: src/global.c:495
+msgid "Prev Line"
+msgstr "Предишен ред"
 
-#: src/global.c:489
-msgid "Beg of Par"
-msgstr "Нач. абзац"
+#: src/global.c:496
+msgid "Next Line"
+msgstr "Следващ ред"
 
-#: src/global.c:490
-msgid "End of Par"
-msgstr "Край абзац"
+#: src/global.c:497
+msgid "Read File"
+msgstr "Отваряне"
 
-#: src/global.c:491
+#: src/global.c:499
 msgid "FullJstify"
 msgstr "Пълно подравн."
 
-#: src/global.c:493
+#: src/global.c:501
 msgid "Refresh"
 msgstr "Опресняване"
 
-#: src/global.c:495
-msgid "Insert File"
-msgstr "Вмъкване на файл"
-
-#: src/global.c:497
-msgid "Go To Line"
-msgstr "Отив. ред"
-
-#: src/global.c:500
+#. 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:507
 msgid "Justify the current paragraph"
 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:505
+#: src/global.c:509
 msgid "Cancel the current function"
 msgstr "Отмяна на текущата функция"
 
-#: src/global.c:506
+#: src/global.c:510
 msgid "Display this help text"
 msgstr "Извежда тази помощна информация"
 
-#: src/global.c:509
+#: src/global.c:513
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Затваряне на текущия файлов буфер/Изход от nano"
 
-#: src/global.c:511
+#: src/global.c:515
 msgid "Exit from nano"
 msgstr "Изход от nano"
 
-#: src/global.c:515
+#: src/global.c:519
 msgid "Write the current file to disk"
 msgstr "Запазване на текущия файл на диска"
 
-#: src/global.c:517
+#: src/global.c:521
 msgid "Insert another file into the current one"
 msgstr "Вмъкване на друг файл в текущия"
 
-#: src/global.c:519
+#: src/global.c:523
 msgid "Search for a string or a regular expression"
 msgstr "Търсене на низ или регулярен израз"
 
-#: src/global.c:520
+#: src/global.c:526
 #, fuzzy
-msgid "Go to previous screen"
-msgstr "Отиване на предишния екран"
+msgid "Search for a string"
+msgstr "Търсене на низ или регулярен израз"
 
-#: src/global.c:521
-#, fuzzy
-msgid "Go to next screen"
-msgstr "Отиване на следващия екран"
+#: src/global.c:528
+msgid "Go one screenful up"
+msgstr ""
 
-#: src/global.c:523
+#: src/global.c:529
+msgid "Go one screenful down"
+msgstr ""
+
+#: src/global.c:531
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Отрязване на текущия ред и съхраняване в буфера за обмен"
 
-#: src/global.c:525
+#: src/global.c:533
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Отрязване от буфера за обмен и поставяне в текущия ред"
 
-#: src/global.c:527
+#: src/global.c:534
 msgid "Display the position of the cursor"
 msgstr "Показване на положението на курсора"
 
-#: src/global.c:529
+#: src/global.c:536
 msgid "Invoke the spell checker, if available"
 msgstr "Извикване на програмата за проверка на правописа"
 
-#: src/global.c:531
+#: src/global.c:538
 msgid "Replace a string or a regular expression"
 msgstr "Замяна на низ или регулярен израз"
 
-#: src/global.c:532
+#: src/global.c:539
 msgid "Go to line and column number"
 msgstr "Отиване на посочен ред и стълб"
 
-#: src/global.c:534
-msgid "Mark text at the cursor position"
+#: src/global.c:541
+#, fuzzy
+msgid "Mark text starting from the cursor position"
 msgstr "Маркиране на текст в позицията на курсора"
 
-#: src/global.c:535
-msgid "Repeat last search"
+#: src/global.c:542
+#, fuzzy
+msgid "Repeat the last search"
 msgstr "Повтаряне на последното търсене"
 
-#: src/global.c:537
+#: src/global.c:544
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "Отрязване на текущия ред и съхраняване в буфера за обмен"
 
-#: src/global.c:538
+#: src/global.c:545
 msgid "Indent the current line"
 msgstr "Отстъп вдясно на текущия ред"
 
-#: src/global.c:539
+#: src/global.c:546
 msgid "Unindent the current line"
 msgstr "Маха отстъпа на текущия ред"
 
-#: src/global.c:540
+#: src/global.c:547
 msgid "Undo the last operation"
 msgstr ""
 
-#: src/global.c:541
+#: src/global.c:548
 msgid "Redo the last undone operation"
 msgstr ""
 
-#: src/global.c:543
+#: src/global.c:550
 #, fuzzy
 msgid "Go forward one character"
 msgstr "Отиване един символ напред"
 
-#: src/global.c:544
+#: src/global.c:551
 #, fuzzy
 msgid "Go back one character"
 msgstr "Отиване един символ назад"
 
-#: src/global.c:546
+#: src/global.c:553
 #, fuzzy
 msgid "Go forward one word"
 msgstr "Отиване напред с една дума"
 
-#: src/global.c:547
+#: src/global.c:554
 #, fuzzy
 msgid "Go back one word"
 msgstr "Отиване назад с една дума"
 
-#: src/global.c:549
+#: src/global.c:556
 #, fuzzy
 msgid "Go to previous line"
 msgstr "Отиване на предишния ред"
 
-#: src/global.c:550
+#: src/global.c:557
 #, fuzzy
 msgid "Go to next line"
 msgstr "Отиване на следващия ред"
 
-#: src/global.c:551
+#: src/global.c:558
 #, fuzzy
 msgid "Go to beginning of current line"
 msgstr "Отиване в началото на текущия ред"
 
-#: src/global.c:552
+#: src/global.c:559
 #, fuzzy
 msgid "Go to end of current line"
 msgstr "Отиване в края на текущия ред"
 
-#: src/global.c:555
+#: src/global.c:562
 #, fuzzy
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "Отиване в началото на текущия абзац"
 
-#: src/global.c:557
+#: src/global.c:564
 #, fuzzy
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr "Отиване в края на текущия абзац"
 
-#: src/global.c:560
+#: src/global.c:566
 #, fuzzy
 msgid "Go to the first line of the file"
 msgstr "Отиване в началото на файла"
 
-#: src/global.c:562
+#: src/global.c:567
 #, fuzzy
 msgid "Go to the last line of the file"
 msgstr "Отиване в края на файла"
 
-#: src/global.c:564
+#: src/global.c:569
 #, fuzzy
 msgid "Go to the matching bracket"
 msgstr "Отиване при съответната скоба"
 
-#: src/global.c:566
+#: src/global.c:571
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "Превърта нагоре с един ред без да мести курсора"
 
-#: src/global.c:568
+#: src/global.c:573
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "Превърта надолу с един ред без да мести курсора"
 
-#: src/global.c:572
+#: src/global.c:576
 msgid "Switch to the previous file buffer"
 msgstr "Превключване на предишния файлов буфер"
 
-#: src/global.c:574
+#: src/global.c:577
 msgid "Switch to the next file buffer"
 msgstr "Превключване на следващия файлов буфер"
 
-#: src/global.c:577
+#: src/global.c:579
 msgid "Insert the next keystroke verbatim"
 msgstr "Вмъкване на следващия клавиш дословно"
 
-#: src/global.c:579
+#: src/global.c:580
 msgid "Insert a tab at the cursor position"
 msgstr "Вмъкване на символ за табулация при курсора"
 
@@ -654,333 +631,451 @@ msgstr "Вмъкване на символ за табулация при кур
 msgid "Insert a newline at the cursor position"
 msgstr "Вмъкване на символ за нов ред при курсора"
 
-#: src/global.c:583
+#: src/global.c:582
 msgid "Delete the character under the cursor"
 msgstr "Изтриване на символа под курсора"
 
-#: src/global.c:585
+#: src/global.c:584
 msgid "Delete the character to the left of the cursor"
 msgstr "Изтриване на символа вляво от курсора"
 
-#: src/global.c:588
+#: src/global.c:587
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Отрязване от позицията на курсора до края на файла"
 
-#: src/global.c:591
+#: src/global.c:590
 msgid "Justify the entire file"
 msgstr "Подравняване на целия файл"
 
-#: src/global.c:595
+#: src/global.c:594
 msgid "Count the number of words, lines, and characters"
 msgstr "Преброяване на думите, редовете и знаците във файла"
 
-#: src/global.c:598
+#: src/global.c:597
 msgid "Refresh (redraw) the current screen"
 msgstr "Опресняване на текущия екран"
 
-#: src/global.c:600
+#: src/global.c:599
 msgid "Suspend the editor (if suspend is enabled)"
 msgstr ""
 
-#: src/global.c:603
+#: src/global.c:602
 msgid "Toggle the case sensitivity of the search"
 msgstr "Зачитане малки/големи букви при търсене (вкл/изкл)"
 
-#: src/global.c:605
+#: src/global.c:604
 msgid "Reverse the direction of the search"
 msgstr "Обратна посока на търсене"
 
-#: src/global.c:609
+#: src/global.c:608
 msgid "Toggle the use of regular expressions"
 msgstr "Използване на регулярни изрази (вкл/изкл)"
 
-#: src/global.c:613
+#: src/global.c:612
 msgid "Recall the previous search/replace string"
 msgstr "Връща предишния низ за търсене/замяна"
 
-#: src/global.c:615
+#: src/global.c:614
 msgid "Recall the next search/replace string"
 msgstr "Връща следващия низ за търсене/замяна"
 
-#: src/global.c:618
+#: src/global.c:617
 msgid "Go to file browser"
 msgstr "Отиване във файлов браузър"
 
-#: src/global.c:621
+#: src/global.c:620
 msgid "Toggle the use of DOS format"
 msgstr "Запазване на файла в DOS формат (вкл/изкл)"
 
-#: src/global.c:622
+#: src/global.c:621
 msgid "Toggle the use of Mac format"
 msgstr "Запазване на файла в Mac формат (вкл/изкл)"
 
-#: src/global.c:624
+#: src/global.c:622
 msgid "Toggle appending"
 msgstr "Вмъкване в края на файла (вкл/изкл)"
 
-#: src/global.c:625
+#: src/global.c:623
 msgid "Toggle prepending"
 msgstr "Вмъкване в началото на файла (вкл/изкл)"
 
-#: src/global.c:628
+#: src/global.c:624
 msgid "Toggle backing up of the original file"
 msgstr "Резервно копира съществуващи файлове (вкл/изкл)"
 
-#: src/global.c:629
+#: src/global.c:625
 msgid "Execute external command"
 msgstr "Изпълнение на външна команда"
 
-#: src/global.c:633
+#: src/global.c:628
 msgid "Toggle the use of a new buffer"
 msgstr "Използване на нов буфер (вкл/изкл)"
 
-#: src/global.c:636
+#: src/global.c:631
 msgid "Exit from the file browser"
 msgstr "Изход от файловия браузър"
 
-#: src/global.c:638
+#: src/global.c:632
 msgid "Go to the first file in the list"
 msgstr "Отиване при първия файл от списъка"
 
-#: src/global.c:640
+#: src/global.c:633
 msgid "Go to the last file in the list"
 msgstr "Отиване при последния файл от списъка"
 
-#: src/global.c:641
+#: src/global.c:634
+#, fuzzy
+msgid "Go to the previous file in the list"
+msgstr "Отиване при първия файл от списъка"
+
+#: src/global.c:635
 #, fuzzy
 msgid "Go to the next file in the list"
 msgstr "Отиване при последния файл от списъка"
 
+#: src/global.c:636
+msgid "Go to directory"
+msgstr "Отиване в директория"
+
+#: src/global.c:639
+#, fuzzy
+msgid "Invoke the linter, if available"
+msgstr "Извикване на програмата за проверка на правописа"
+
+#: src/global.c:640
+#, fuzzy
+msgid "Go to previous linter msg"
+msgstr "Отиване на предишния ред"
+
+#: src/global.c:641
+#, fuzzy
+msgid "Go to next linter msg"
+msgstr "Отиване на следващия ред"
+
 #: src/global.c:642
 #, fuzzy
-msgid "Go to the previous file in the list"
-msgstr "Отиване при първия файл от списъка"
+msgid "Invoke formatter, if available"
+msgstr "Извикване на програмата за проверка на правописа"
 
-#: src/global.c:643
-msgid "Go to directory"
-msgstr "Отиване в директория"
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:662
+msgid "Get Help"
+msgstr "Помощ"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:670
-msgid "Close"
-msgstr "Затваряне"
+#: src/global.c:665 src/prompt.c:1084
+msgid "Cancel"
+msgstr "Отмяна"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:679
-msgid "WriteOut"
+#: src/global.c:678
+#, fuzzy
+msgid "Write Out"
 msgstr "Запазване"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:704
+msgid "Go To Dir"
+msgstr "Отиване в директория"
+
+#: src/global.c:719
+msgid "Cut Text"
+msgstr "Отрязване"
+
+#: src/global.c:728
 msgid "Justify"
 msgstr "Подравн."
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:696
-msgid "Read File"
-msgstr "Отваряне"
+#: src/global.c:733
+msgid "To Spell"
+msgstr "Правопис"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:713
-msgid "Cut Text"
-msgstr "Отрязване"
+#: src/global.c:738
+#, fuzzy
+msgid "To Linter"
+msgstr "Отив. ред"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:718
-msgid "UnJustify"
-msgstr "Изкл.подр."
+#: src/global.c:740
+#, fuzzy
+msgid "Formatter"
+msgstr "DOS формат"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:723
-msgid "UnCut Text"
-msgstr "Поставяне"
+#: src/global.c:745
+msgid "Case Sens"
+msgstr "Зач. м/г"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:728 src/global.c:755
+#: src/global.c:750
+msgid "Regexp"
+msgstr "Рег.израз"
+
+#: src/global.c:755
+msgid "Backwards"
+msgstr "Назад"
+
+#: src/global.c:762
+msgid "No Replace"
+msgstr "Без замяна"
+
+#: src/global.c:770
 msgid "Cur Pos"
 msgstr "Поз.курсор"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:737
-msgid "To Spell"
-msgstr "Правопис"
+#: src/global.c:780
+msgid "Prev Page"
+msgstr "ПредСтр"
+
+#: src/global.c:782
+msgid "Next Page"
+msgstr "СледвСтр"
+
+#: src/global.c:785
+msgid "First Line"
+msgstr "Първи ред"
 
-#: src/global.c:771
+#: src/global.c:787
+msgid "Last Line"
+msgstr "Посл. ред"
+
+#: src/global.c:794
+#, fuzzy
+msgid "To Bracket"
+msgstr "Не е скоба"
+
+#: src/global.c:797
 msgid "Mark Text"
 msgstr "Избор на текст"
 
-#: src/global.c:777
+#: src/global.c:800
 msgid "Copy Text"
 msgstr "Копиране"
 
-#: src/global.c:780
+#: src/global.c:803
 msgid "Indent Text"
 msgstr "Отстъп"
 
-#: src/global.c:783
+#: src/global.c:805
 msgid "Unindent Text"
 msgstr "Без отстъп"
 
-#: src/global.c:787
+#: src/global.c:808
 msgid "Undo"
 msgstr ""
 
-#: src/global.c:790
+#: src/global.c:810
 msgid "Redo"
 msgstr ""
 
-#: src/global.c:796 src/global.c:800
-msgid "Forward"
-msgstr "Напред"
-
-#: src/global.c:806 src/global.c:810
+#: src/global.c:814 src/global.c:820
 msgid "Back"
 msgstr "Назад"
 
-#: src/global.c:817
-msgid "Next Word"
-msgstr "Следваща дума"
+#: src/global.c:816 src/global.c:822
+msgid "Forward"
+msgstr "Напред"
 
-#: src/global.c:820
+#: src/global.c:827
 msgid "Prev Word"
 msgstr "Предишна дума"
 
-#: src/global.c:824
-msgid "Prev Line"
-msgstr "Предишен ред"
-
-#: src/global.c:827
-msgid "Next Line"
-msgstr "Следващ ред"
+#: src/global.c:829
+msgid "Next Word"
+msgstr "Следваща дума"
 
-#: src/global.c:830
+#: src/global.c:833
 msgid "Home"
 msgstr "Home"
 
-#: src/global.c:833
+#: src/global.c:835
 msgid "End"
 msgstr "End"
 
-#: src/global.c:845
-msgid "Find Other Bracket"
-msgstr "Намиране на другата скоба"
+#: src/global.c:844
+msgid "Beg of Par"
+msgstr "Нач. абзац"
 
-#: src/global.c:848
+#: src/global.c:846
+msgid "End of Par"
+msgstr "Край абзац"
+
+#: src/global.c:851
 msgid "Scroll Up"
 msgstr "Превъртане нагоре"
 
-#: src/global.c:851
+#: src/global.c:853
 msgid "Scroll Down"
 msgstr "Превъртане надолу"
 
-#: src/global.c:856
-msgid "Previous File"
+#: src/global.c:858
+#, fuzzy
+msgid "Prev File"
 msgstr "Предишен файл"
 
-#: src/global.c:858
+#: src/global.c:860
 msgid "Next File"
 msgstr "Следващ файл"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:862 src/text.c:3045
-msgid "Verbatim Input"
+#: src/global.c:869
+#, fuzzy
+msgid "Verbatim"
 msgstr "Дословен вход"
 
-#: src/global.c:867
+#: src/global.c:872
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:870
+#: src/global.c:874
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:873
+#: src/global.c:876
 msgid "Delete"
 msgstr "Delete"
 
-#: src/global.c:876
+#: src/global.c:878
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/global.c:893
+#: src/global.c:888
 msgid "CutTillEnd"
 msgstr "Отр. до края"
 
-#: src/global.c:906
+#: src/global.c:898
 msgid "Word Count"
 msgstr "Брой на думи"
 
-#: src/global.c:1367
+#: src/global.c:905
+#, fuzzy
+msgid "Suspend"
+msgstr "Временно спиране"
+
+#: src/global.c:910
+msgid "PrevHstory"
+msgstr "ПредИстор."
+
+#: src/global.c:913
+msgid "NextHstory"
+msgstr "СледИстор."
+
+#: src/global.c:917
+msgid "Go To Text"
+msgstr "Отиване на текст"
+
+#: src/global.c:928
+msgid "DOS Format"
+msgstr "DOS формат"
+
+#: src/global.c:931
+msgid "Mac Format"
+msgstr "Mac формат"
+
+#: src/global.c:934
+msgid "Append"
+msgstr "Добавяне в края"
+
+#: src/global.c:936
+msgid "Prepend"
+msgstr "Добавяне в нач."
+
+#: src/global.c:939
+msgid "Backup File"
+msgstr "Резервно копие"
+
+#: src/global.c:946
+msgid "Execute Command"
+msgstr "Изпълнение на команда"
+
+#: src/global.c:961
+msgid "To Files"
+msgstr "Към файловете"
+
+#: src/global.c:964
+msgid "First File"
+msgstr "Първи файл"
+
+#: src/global.c:966
+msgid "Last File"
+msgstr "Посл. файл"
+
+#: src/global.c:977
+#, fuzzy
+msgid "Prev Lint Msg"
+msgstr "Предишен ред"
+
+#: src/global.c:979
+#, 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:1227
 msgid "Help mode"
 msgstr "Режим на помощ"
 
-#: src/global.c:1369
+#: src/global.c:1229
 msgid "Constant cursor position display"
 msgstr "Постоянно показване на позицията на курсора"
 
-#: src/global.c:1371
+#: src/global.c:1231
 msgid "Use of one more line for editing"
 msgstr "Използване на още един ред за редактиране"
 
-#: src/global.c:1373
+#: src/global.c:1233
 msgid "Smooth scrolling"
 msgstr "Плавно превъртане"
 
-#: src/global.c:1375
+#: src/global.c:1235
+#, fuzzy
+msgid "Soft wrapping of overlong lines"
+msgstr "Без пренасяне на дългите редове"
+
+#: src/global.c:1237
 msgid "Whitespace display"
 msgstr "Показване на интервали"
 
-#: src/global.c:1377
+#: src/global.c:1239
 msgid "Color syntax highlighting"
 msgstr "Синтактично осветяване"
 
-#: src/global.c:1379
+#: src/global.c:1241
 msgid "Smart home key"
 msgstr "Интелигентен клавиш „Home“"
 
-#: src/global.c:1381
+#: src/global.c:1243
 msgid "Auto indent"
 msgstr "Автоматичен отстъп"
 
-#: src/global.c:1383
+#: src/global.c:1245
 msgid "Cut to end"
 msgstr "Отрязване до края"
 
-#: src/global.c:1385
-msgid "Long line wrapping"
-msgstr "Автоматично пренасяне"
+#: src/global.c:1247
+#, fuzzy
+msgid "Hard wrapping of overlong lines"
+msgstr "Без пренасяне на дългите редове"
 
-#: src/global.c:1387
+#: src/global.c:1249
 msgid "Conversion of typed tabs to spaces"
 msgstr "Превръщане на табулации в интервали"
 
-#: src/global.c:1389
+#: src/global.c:1251
 msgid "Backup files"
 msgstr "Запазване на резервни копия"
 
-#: src/global.c:1391
+#: src/global.c:1253
 msgid "Multiple file buffers"
 msgstr "Много файлови буфери"
 
-#: src/global.c:1393
+#: src/global.c:1255
 msgid "Mouse support"
 msgstr "Поддръжка на мишка"
 
-#: src/global.c:1395
+#: src/global.c:1257
 msgid "No conversion from DOS/Mac format"
 msgstr "Без конвертиране от DOS/Mac формат"
 
-#: src/global.c:1397
+#: src/global.c:1259
 msgid "Suspension"
 msgstr "Временно спиране"
 
-#: src/global.c:1399
-#, fuzzy
-msgid "Soft line wrapping"
-msgstr "Автоматично пренасяне"
-
-#: src/help.c:236
+#: src/help.c:205
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1002,7 +1097,7 @@ msgstr ""
 "търсене. Ако натиснете „Enter“, без да въвеждате текст, ще се извърши "
 "предишнто търсене.  "
 
-#: src/help.c:245
+#: src/help.c:214
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1016,7 +1111,7 @@ msgstr ""
 " Следните клавиши за достъпни в режим „Търсене“:\n"
 "\n"
 
-#: src/help.c:251
+#: src/help.c:220
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1036,7 +1131,7 @@ msgstr ""
 " Следните клавишни комбинации са налични в режим „Отиване на ред“:\n"
 "\n"
 
-#: src/help.c:260
+#: src/help.c:229
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1058,7 +1153,7 @@ msgstr ""
 "за вмъкване ще се зареди в отделен буфер. Използвайте Meta-< и >, за да "
 "превключвате между буферите.  "
 
-#: src/help.c:269
+#: src/help.c:238
 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"
@@ -1072,7 +1167,7 @@ msgstr ""
 " Следните клавишни комбинации са налични в режим „Вмъкване на файл“:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:244
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1098,7 +1193,7 @@ msgstr ""
 " Следните клавишни комбинации са налични в режим „Запазване на файл“:\n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:258
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1122,7 +1217,7 @@ msgstr ""
 " Следните клавишни комбинации са налични във файловия браузър:\n"
 "\n"
 
-#: src/help.c:302
+#: src/help.c:271
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1146,7 +1241,7 @@ msgstr ""
 "предишното търсене.\n"
 "\n"
 
-#: src/help.c:311
+#: src/help.c:280
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1154,7 +1249,7 @@ msgstr ""
 "Следните функционални клавиши са достъпни в режим „Търсене“:\n"
 "\n"
 
-#: src/help.c:315
+#: src/help.c:284
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1177,7 +1272,7 @@ msgstr ""
 "браузъра:\n"
 "\n"
 
-#: src/help.c:328
+#: src/help.c:297
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1201,7 +1296,7 @@ msgstr ""
 " Може да се използват следните допълнителни функционални клавиши:\n"
 "\n"
 
-#: src/help.c:343
+#: src/help.c:312
 #, fuzzy
 msgid ""
 "Execute Command Help Text\n"
@@ -1222,7 +1317,7 @@ msgstr ""
 " Може да се използват следните функционални клавиши:\n"
 "\n"
 
-#: src/help.c:356
+#: src/help.c:325
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1242,7 +1337,7 @@ msgstr ""
 "редактора, показващ редактирания файл. Лентата за състоянието е третият ред "
 "от долу нагоре и е предназначен за важни съобщения.  "
 
-#: src/help.c:366
+#: src/help.c:335
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1261,7 +1356,7 @@ msgstr ""
 "да бъдат въвеждани с клавишите „Esc“, „Alt“ или „Meta“ в зависимост от "
 "настройките на клавиатурата.   "
 
-#: src/help.c:375
+#: src/help.c:344
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1275,15 +1370,15 @@ msgstr ""
 "алтернативните са показани в скоби:\n"
 "\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:376 src/help.c:448
 msgid "enable/disable"
 msgstr "(вкл/изкл)"
 
-#: src/nano.c:587
+#: src/nano.c:601
 msgid "Key invalid in view mode"
 msgstr "Непозволен клавиш в режим на преглед"
 
-#: src/nano.c:695
+#: src/nano.c:713
 #, c-format
 msgid ""
 "\n"
@@ -1292,7 +1387,7 @@ msgstr ""
 "\n"
 "Буферът е записан в %s\n"
 
-#: src/nano.c:697
+#: src/nano.c:715
 #, c-format
 msgid ""
 "\n"
@@ -1301,7 +1396,7 @@ msgstr ""
 "\n"
 "Буферът не е записан в %s: %s\n"
 
-#: src/nano.c:700
+#: src/nano.c:718
 #, c-format
 msgid ""
 "\n"
@@ -1310,11 +1405,11 @@ msgstr ""
 "\n"
 "Буферът не е записан: %s\n"
 
-#: src/nano.c:723
+#: src/nano.c:743
 msgid "Window size is too small for nano...\n"
 msgstr "Размерът на прозореца е твърде малък за nano...\n"
 
-#: src/nano.c:816
+#: src/nano.c:836
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
@@ -1323,253 +1418,263 @@ msgstr ""
 "Използване: nano [ОПЦИИ] [[+РЕД,СТЪЛБ]] ФАЙЛ]...\n"
 "\n"
 
-#: src/nano.c:819
+#: src/nano.c:839
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Опция\t\tДълга опция\t\tЗначение\n"
 
-#: src/nano.c:821
+#: src/nano.c:841
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Опция\t\tЗначение\n"
 
-#: src/nano.c:824
-msgid "Show this message"
-msgstr "Показва тази справка"
-
-#: src/nano.c:825
+#: src/nano.c:844
 msgid "+LINE,COLUMN"
 msgstr "+РЕД,СТЪЛБ"
 
-#: src/nano.c:826
+#. TRANSLATORS: The next forty or so strings are option descriptions
+#. * for the --help output.  Try to keep them at most 40 characters.
+#: src/nano.c:847
 msgid "Start at line LINE, column COLUMN"
 msgstr "Започва от ред РЕД, стълб СТЪЛБ"
 
-#: src/nano.c:828
+#: src/nano.c:849
 msgid "Enable smart home key"
 msgstr "С интелигентен клавиш „Home“"
 
-#: src/nano.c:829
+#: src/nano.c:850
 msgid "Save backups of existing files"
 msgstr "Резервно копира съществуващи файлове"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "-C <dir>"
 msgstr "-C <дир>"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<дир>"
 
-#: src/nano.c:831
+#: src/nano.c:852
 msgid "Directory for saving unique backup files"
 msgstr "Директория за резервните копия"
 
-#: src/nano.c:834
+#: src/nano.c:855
 msgid "Use bold instead of reverse video text"
 msgstr "Удебелен шрифт вместо инверсно видео"
 
-#: src/nano.c:837
+#: src/nano.c:858
 msgid "Convert typed tabs to spaces"
 msgstr "Прави въведените табулации на интервали"
 
-#: src/nano.c:840
+#: src/nano.c:861
 msgid "Enable multiple file buffers"
 msgstr "Позволява много файлови буфери"
 
-#: src/nano.c:845
+#: src/nano.c:865
+msgid "Use (vim-style) lock files"
+msgstr ""
+
+#: src/nano.c:869
 msgid "Log & read search/replace string history"
 msgstr "Запазва/чете историята на търсене/замяна"
 
-#: src/nano.c:848
+#: src/nano.c:873
 msgid "Don't look at nanorc files"
 msgstr "Пренебрегва конфиг. файлове nanorc"
 
-#: src/nano.c:851
+#: src/nano.c:876
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Коригира объркване от цифровия клав.блок"
 
-#: src/nano.c:853
+#: src/nano.c:878
 msgid "Don't add newlines to the ends of files"
 msgstr "Без знак за нов ред в края на файловете"
 
-#: src/nano.c:856
+#: src/nano.c:881
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Без преобразуване от DOS/Mac формат"
 
-#: src/nano.c:858
+#: src/nano.c:883
 msgid "Use one more line for editing"
 msgstr "Използване още един ред за редактиране"
 
-#: src/nano.c:860
+#: src/nano.c:886
+#, fuzzy
+msgid "Log & read location of cursor position"
+msgstr "Вмъкване на символ за табулация при курсора"
+
+#: src/nano.c:889
 msgid "-Q <str>"
 msgstr "-Q <низ>"
 
-#: src/nano.c:860
+#: src/nano.c:889
 msgid "--quotestr=<str>"
 msgstr "--quotestr=<низ>"
 
-#: src/nano.c:861
+#: src/nano.c:890
 msgid "Quoting string"
 msgstr "Низ за цитиране"
 
-#: src/nano.c:863
+#: src/nano.c:892
 msgid "Restricted mode"
 msgstr "Ограничен режим"
 
-#: src/nano.c:866
+#: src/nano.c:895
 msgid "Scroll by line instead of half-screen"
 msgstr ""
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "-T <#cols>"
 msgstr "-T <#стълбове>"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#стълбове>"
 
-#: src/nano.c:869
+#: src/nano.c:898
 msgid "Set width of a tab to #cols columns"
 msgstr "Широчината на табулацията - #стълбове"
 
-#: src/nano.c:871
+#: src/nano.c:900
 msgid "Do quick statusbar blanking"
 msgstr "Бързо изключване на лентата за състояние"
 
-#: src/nano.c:874
+#: src/nano.c:903
 msgid "Print version information and exit"
 msgstr "Показва версията и излиза"
 
-#: src/nano.c:877
+#: src/nano.c:906
 msgid "Detect word boundaries more accurately"
 msgstr "Открива прецизно междусловните граници"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "-Y <str>"
 msgstr "-Y <низ>"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "--syntax=<str>"
 msgstr "--syntax=<низ>"
 
-#: src/nano.c:881
+#: src/nano.c:910
 msgid "Syntax definition to use for coloring"
 msgstr "Посочва синтаксис за оцветяване"
 
-#: src/nano.c:883
+#: src/nano.c:912
 msgid "Constantly show cursor position"
 msgstr "Постоянно показва позицията на курсора"
 
-#: src/nano.c:885
+#: src/nano.c:914
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Коригира объркване на „Backspace/Delete“"
 
-#: src/nano.c:888
+#: src/nano.c:915
+#, fuzzy
+msgid "Show this help text"
+msgstr "Извежда тази помощна информация"
+
+#: src/nano.c:918
 msgid "Automatically indent new lines"
 msgstr "Автоматичен отстъп при нови редове"
 
-#: src/nano.c:889
+#: src/nano.c:919
 msgid "Cut from cursor to end of line"
 msgstr "Отрязване от курсора до края на реда"
 
-#: src/nano.c:892
+#: src/nano.c:922
 msgid "Don't follow symbolic links, overwrite"
 msgstr "Не следва символните връзки, замества ги"
 
-#: src/nano.c:894
+#: src/nano.c:924
 msgid "Enable the use of the mouse"
 msgstr "С използване на мишка"
 
-#: src/nano.c:897
+#: src/nano.c:926
+msgid "Do not read the file (only write it)"
+msgstr ""
+
+#: src/nano.c:928
 msgid "-o <dir>"
 msgstr "-o <дир>"
 
-#: src/nano.c:897
+#: src/nano.c:928
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<дир>"
 
-#: src/nano.c:898
+#: src/nano.c:929
 msgid "Set operating directory"
 msgstr "Работна директория"
 
-#: src/nano.c:901
+#: src/nano.c:932
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Запазва клавишите „XON“(^Q) и „XOFF“(^S)"
 
-#: src/nano.c:903
+#: src/nano.c:935
 msgid "Silently ignore startup issues like rc file errors"
 msgstr ""
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "-r <#cols>"
 msgstr "-r <#стълбове>"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "--fill=<#cols>"
 msgstr "--fill=<#стълбове>"
 
-#: src/nano.c:906
-msgid "Set wrapping point at column #cols"
+#: src/nano.c:939
+#, fuzzy
+msgid "Set hard-wrapping point at column #cols"
 msgstr "Пренася редовете при ширина #стълбове"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "-s <prog>"
 msgstr "-s <прог>"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "--speller=<prog>"
 msgstr "--speller=<прог>"
 
-#: src/nano.c:910
+#: src/nano.c:943
 msgid "Enable alternate speller"
 msgstr "Алтернативен правописен коректор"
 
-#: src/nano.c:913
+#: src/nano.c:946
 msgid "Auto save on exit, don't prompt"
 msgstr "При изход запазва файла без питане"
 
-#: src/nano.c:915
-msgid "Allow generic undo [EXPERIMENTAL]"
-msgstr ""
-
-#: src/nano.c:918
+#: src/nano.c:947
 msgid "View mode (read-only)"
 msgstr "Режим на преглед (само за четене)"
 
-#: src/nano.c:920
-msgid "Don't wrap long lines"
+#: src/nano.c:949
+#, fuzzy
+msgid "Don't hard-wrap long lines"
 msgstr "Без пренасяне на дългите редове"
 
-#: src/nano.c:922
+#: src/nano.c:951
 msgid "Don't show the two help lines"
 msgstr "Без двата последни реда с помощ"
 
-#: src/nano.c:923
+#: src/nano.c:952
 msgid "Enable suspension"
 msgstr "Позволява временно спиране"
 
-#: src/nano.c:924
+#: src/nano.c:954
 #, fuzzy
 msgid "Enable soft line wrapping"
 msgstr "Автоматично пренасяне"
 
-#: src/nano.c:928
-msgid "(ignored, for Pico compatibility)"
-msgstr "(не се използват,за съвместимост с Pico)"
-
-#: src/nano.c:938
-#, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
+#: src/nano.c:963
+#, fuzzy, c-format
+msgid " GNU nano, version %s\n"
 msgstr " GNU nano, версия %s (компилиран в %s часа на %s)\n"
 
-#: src/nano.c:943
+#: src/nano.c:966
 #, 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:944
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1578,156 +1683,180 @@ msgstr ""
 "\n"
 " Компилирани опции:"
 
-#: src/nano.c:1022
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr "За съжаление поддръжката за тази функция е изключена"
 
-#: src/nano.c:1044
+#: src/nano.c:1125
+msgid "No file name"
+msgstr ""
+
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr ""
 "Запазване на променения буфер? (ПРИ ОТГОВОР „Не“ ПРОМЕНИТЕ ЩЕ СЕ ЗАГУБЯТ)"
 
-#: src/nano.c:1088
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr ""
 
-#: src/nano.c:1114
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr ""
 
-#: src/nano.c:1182
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Получи се SIGHUP или SIGTERM\n"
 
-#: src/nano.c:1204
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Използвайте „fg“, за да се върнете в nano.\n"
 
-#: src/nano.c:1386
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "активирано"
 
-#: src/nano.c:1387
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "деактивирано"
 
-#: src/nano.c:1548 src/winio.c:1256
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr "Неизвестна команда"
 
-#: src/nano.c:1674
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "„XON“ е пренебрегнат, мън-мън."
 
-#: src/nano.c:1679
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "„XOFF“ е пренебрегнат, мън-мън."
 
-#: src/nano.c:2209 src/rcfile.c:1100
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Поисканият размер на табулация „%s“ е неправилен"
 
-#: src/nano.c:2268 src/rcfile.c:1025
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Поисканият размер „%s“ за максимална дължина на редове е неправилен"
 
+#: src/nano.c:2415
+#, c-format
+msgid "Type '%s -h' for a list of available options.\n"
+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:1259
+#: src/prompt.c:1055
 msgid "Yy"
 msgstr "YyДд"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1056
 msgid "Nn"
 msgstr "NnНн"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1057
 msgid "Aa"
 msgstr "AaВв"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1071
 msgid "Yes"
 msgstr "Да"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1076
 msgid "All"
 msgstr "Всички"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1081
 msgid "No"
 msgstr "Не"
 
-#: src/rcfile.c:130
+#: src/rcfile.c:137
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Грешка в %s на ред %lu: "
 
-#: src/rcfile.c:185
+#: src/rcfile.c:196
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "Аргументът „%s“ има незатворенa \""
 
-#: src/rcfile.c:212 src/rcfile.c:264 src/rcfile.c:711 src/rcfile.c:768
-#: src/rcfile.c:821
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
 msgstr ""
 "Низовете за регулярни изрази трябва да започват и завършват със символа \""
 
-#: src/rcfile.c:238 src/search.c:62
+#: src/rcfile.c:249 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Неправилен регулярен израз \"%s\": %s"
 
-#: src/rcfile.c:258
+#: src/rcfile.c:269
 msgid "Missing syntax name"
 msgstr "Липсва името на синтаксиса"
 
-#: src/rcfile.c:316
+#: src/rcfile.c:340
 msgid "The \"none\" syntax is reserved"
 msgstr "Синтаксисът „none“ е запазен"
 
-#: src/rcfile.c:323
+#: src/rcfile.c:347
 msgid "The \"default\" syntax must take no extensions"
 msgstr "Синтаксисът „default“ не приема разширения"
 
-#: src/rcfile.c:386 src/rcfile.c:483
+#: src/rcfile.c:433
 #, fuzzy
 msgid "Missing key name"
 msgstr "Липсва името на синтаксиса"
 
-#: src/rcfile.c:398 src/rcfile.c:499
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
+#: src/rcfile.c:442 src/rcfile.c:453
+msgid "Key name is too short"
+msgstr ""
+
+#: src/rcfile.c:463
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr ""
 
-#: src/rcfile.c:407
-msgid "Must specify function to bind key to"
+#: src/rcfile.c:472
+msgid "Must specify a function to bind the key to"
 msgstr ""
 
-#: src/rcfile.c:418 src/rcfile.c:510
-msgid "Must specify menu to bind key to (or \"all\")"
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:482
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
 
-#: src/rcfile.c:426
+#: src/rcfile.c:489
 #, c-format
-msgid "Could not map name \"%s\" to a function"
+msgid "Cannot map name \"%s\" to a function"
 msgstr ""
 
-#: src/rcfile.c:432 src/rcfile.c:517
-#, fuzzy, c-format
-msgid "Could not map name \"%s\" to a menu"
-msgstr "Неуспех при извикване на „%s“"
+#: src/rcfile.c:496
+#, c-format
+msgid "Cannot map name \"%s\" to a menu"
+msgstr ""
 
-#: src/rcfile.c:454
+#: src/rcfile.c:528
 #, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
+msgid "Function '%s' does not exist in menu '%s'"
 msgstr ""
 
-#: src/rcfile.c:625
+#: src/rcfile.c:543
+#, c-format
+msgid "Sorry, keystroke \"%s\" may not be rebound"
+msgstr ""
+
+#: src/rcfile.c:629
+#, fuzzy, c-format
+msgid "Error expanding %s: %s"
+msgstr "Грешка при четене на %s: %s"
+
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1742,135 +1871,196 @@ msgstr ""
 "„black“, с възможна представка „bright“\n"
 "за цветове на преден план."
 
-#: src/rcfile.c:647
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
 msgstr "Не може да бъде добавена команда за цвят без синтактична команда"
 
-#: src/rcfile.c:652
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "Липсва името на цвета"
 
-#: src/rcfile.c:672
-#, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr "Цветът за фон „%s“ не може да бъде ярък"
-
-#: src/rcfile.c:690 src/rcfile.c:809
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr "Липсва низът за регулярния израз"
 
-#: src/rcfile.c:762
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "„start=“ изисква съответстващ „end=“"
 
-#: src/rcfile.c:804
+#: src/rcfile.c:837
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr "Цветът за фон „%s“ не може да бъде ярък"
+
+#: src/rcfile.c:865
 #, fuzzy
 msgid "Cannot add a header regex without a syntax command"
 msgstr "Не може да бъде добавена команда за цвят без синтактична команда"
 
-#: src/rcfile.c:874
+#: src/rcfile.c:921
+#, fuzzy
+msgid "Cannot add a magic string regex without a syntax command"
+msgstr "Не може да бъде добавена команда за цвят без синтактична команда"
+
+#: src/rcfile.c:926
+#, 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:1010
+#, fuzzy
+msgid "Cannot add formatter without a syntax command"
+msgstr "Не може да бъде добавена команда за цвят без синтактична команда"
+
+#: src/rcfile.c:1015
+msgid "Missing formatter command"
+msgstr ""
+
+#: src/rcfile.c:1045
 #, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
+msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr ""
 
-#: src/rcfile.c:876
+#: src/rcfile.c:1047
+#, c-format
 msgid ""
-"Exiting.  Please use nano with the -I option if needed to adjust your nanorc "
-"settings\n"
+"If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
 
-#: src/rcfile.c:926 src/rcfile.c:935 src/rcfile.c:945
+#: src/rcfile.c:1108
+#, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr ""
+
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Командата „%s“ не е позволена във вмъкван файл"
 
-#: src/rcfile.c:951 src/rcfile.c:1128
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Синтаксисът „%s“ няма команди за цветове"
 
-#: src/rcfile.c:966
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Командата „%s“ е неизвестна"
 
-#: src/rcfile.c:972
-msgid "Missing flag"
-msgstr "Липсващ флаг"
+#: src/rcfile.c:1186
+#, fuzzy
+msgid "Missing option"
+msgstr "Липсва името на цвета"
 
-#: src/rcfile.c:994
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Опцията „%s“ изисква аргумент"
 
-#: src/rcfile.c:1012
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr "Опцията не е правилен многобайтов низ"
 
-#: src/rcfile.c:1038 src/rcfile.c:1066 src/rcfile.c:1075
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr "Необходими са символи, които не са празни"
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr "Необходими са два символа с нормална ширина"
 
-#: src/rcfile.c:1114
-#, c-format
-msgid "Cannot unset flag \"%s\""
+#: src/rcfile.c:1339
+#, fuzzy, c-format
+msgid "Cannot unset option \"%s\""
 msgstr "Не може да се отмени флаг „%s“"
 
-#: src/rcfile.c:1123
-#, c-format
-msgid "Unknown flag \"%s\""
+#: src/rcfile.c:1345
+#, fuzzy, c-format
+msgid "Unknown option \"%s\""
 msgstr "Неизвестен флаг „%s“"
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr "Не може да бъде намерена домашната директория! Ах!"
 
+#: src/rcfile.c:1442
+#, c-format
+msgid ""
+"\n"
+"Press Enter to continue starting nano.\n"
+msgstr ""
+"\n"
+"Натиснете „Enter“, за да продължи стартирането на nano\n"
+
 #: src/search.c:96
 #, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "„%.*s%s“ не е намерен"
 
-#: src/search.c:205
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/search.c:184
+msgid " [Case Sensitive]"
+msgstr " [Зачитане на малки/големи]"
+
+#: src/search.c:188
+msgid " [Regexp]"
+msgstr " [Рег.израз]"
+
+#: src/search.c:192
+msgid " [Backwards]"
+msgstr " [Назад]"
+
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:197
 msgid " (to replace) in selection"
 msgstr " (за замяна) в избрания текст"
 
-#: src/search.c:207
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (за замяна)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "Замяна на това съвпадение?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:945
 msgid "Replace with"
 msgstr "Замяна с"
 
-#: src/search.c:1004
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
 msgstr[0] "Заменено е %lu съвпадение"
 msgstr[1] "Заменени са %lu съвпадения"
 
-#: src/search.c:1034
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr "Въведете номер на ред и стълб"
 
-#: src/search.c:1061
+#: src/search.c:1054
 #, fuzzy
 msgid "Invalid line or column number"
 msgstr "Въведете номер на ред и стълб"
 
-#: src/search.c:1214
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "Не е скоба"
 
-#: src/search.c:1281
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "Няма съвпадаща скоба"
 
@@ -1882,227 +2072,306 @@ msgstr "Уставено е маркиране"
 msgid "Mark Unset"
 msgstr "Отменено е маркирането"
 
-#: src/text.c:443
+#: src/text.c:439
 msgid "Nothing in undo buffer!"
 msgstr ""
 
-#: src/text.c:455 src/text.c:593
+#: src/text.c:445 src/text.c:590
 #, c-format
-msgid "Internal error: can't match line %d.  Please save your work"
+msgid "Internal error: can't match line %d.  Please save your work."
 msgstr ""
 
-#: src/text.c:466 src/text.c:603
+#: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
 msgstr ""
 
-#: src/text.c:475 src/text.c:613
+#: src/text.c:467 src/text.c:612
 #, fuzzy
 msgid "text delete"
 msgstr "Следващ файл"
 
-#: src/text.c:489 src/text.c:628
-#, fuzzy
-msgid "line wrap"
-msgstr "Автоматично пренасяне"
-
-#: src/text.c:503 src/text.c:636
+#: src/text.c:491 src/text.c:641
 msgid "line join"
 msgstr ""
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:505 src/text.c:657
 msgid "text cut"
 msgstr ""
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:510 src/text.c:661
 msgid "text uncut"
 msgstr ""
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:515 src/text.c:623
 msgid "line break"
 msgstr ""
 
-#: src/text.c:532 src/text.c:665
+#: src/text.c:528 src/text.c:672
 #, fuzzy
 msgid "text insert"
 msgstr "Следващ ред"
 
-#: src/text.c:550 src/text.c:659
+#: src/text.c:549 src/text.c:665
 #, fuzzy
 msgid "text replace"
 msgstr " (за замяна)"
 
-#: src/text.c:557 src/text.c:671
-msgid "Internal error: unknown type.  Please save your work"
+#: src/text.c:556 src/text.c:679 src/text.c:983
+msgid "Internal error: unknown type.  Please save your work."
 msgstr ""
 
-#: src/text.c:563
+#: src/text.c:561
 #, c-format
 msgid "Undid action (%s)"
 msgstr ""
 
-#: src/text.c:578
+#: src/text.c:580
 msgid "Nothing to re-do!"
 msgstr ""
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
+#: src/text.c:584
+msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
 
-#: src/text.c:676
+#: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr ""
 
-#: src/text.c:766
-msgid "Could not pipe"
-msgstr "Неуспех при pipe"
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
+msgid "Could not create pipe"
+msgstr "Неуспех при създаването на pipe"
 
-#: src/text.c:793 src/text.c:2636 src/text.c:2788
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "Неуспех при fork"
 
-#: src/text.c:941
-msgid "Internal error: can't setup uncut.  Please save your work."
-msgstr ""
-
-#: src/text.c:950
-msgid "Internal error: unknown type.  Please save your work."
+#: src/text.c:969
+msgid "Internal error: cannot set up uncut.  Please save your work."
 msgstr ""
 
-#: src/text.c:1870
+#: src/text.c:1806
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Неправилен низ за цитиране %s: %s"
 
-#: src/text.c:2267
+#: src/text.c:2207
 msgid "Can now UnJustify!"
 msgstr "Сега може да се отмени подравняването!"
 
-#: src/text.c:2462
+#: src/text.c:2404
 msgid "Edit a replacement"
 msgstr "Редактиране на замяна"
 
-#: src/text.c:2548
-msgid "Could not create pipe"
-msgstr "Неуспех при създаването на pipe"
-
-#: src/text.c:2550
+#: src/text.c:2492
 msgid "Creating misspelled word list, please wait..."
 msgstr "Създаване на списък със сгрешени думи, изчакайте..."
 
-#: src/text.c:2642
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
 msgstr "Не може да се определи размера на буфера на pipe"
 
-#: src/text.c:2693
+#: src/text.c:2635
 msgid "Error invoking \"spell\""
 msgstr "Грешка при извикване на „spell“"
 
-#: src/text.c:2696
+#: src/text.c:2638
 msgid "Error invoking \"sort -f\""
 msgstr "Грешка при извикване на „sort -f“"
 
-#: src/text.c:2699
+#: src/text.c:2641
 msgid "Error invoking \"uniq\""
 msgstr "Грешка при извикване на „uniq“"
 
-#: src/text.c:2756 src/text.c:2965
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "Проверката на правописа завърши"
 
-#: src/text.c:2815
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Грешка при извикване на „%s“"
 
-#: src/text.c:2960
+#: src/text.c:2885
+#, fuzzy
+msgid "Invoking spell checker, please wait"
+msgstr "Извикване на програмата за проверка на правописа"
+
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Неуспех при проверката на правописа: %s"
 
-#: src/text.c:2962
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Неуспех при проверката на правописа: %s: %s"
 
-#: src/text.c:3030
+#: src/text.c:2937
+#, fuzzy
+msgid "No linter defined for this type of file!"
+msgstr "Без знак за нов ред в края на файловете"
+
+#: src/text.c:2947
+msgid "Save modified buffer before linting?"
+msgstr ""
+
+#: src/text.c:2969
+msgid "Invoking linter, please wait"
+msgstr ""
+
+#: src/text.c:3125
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr ""
+
+#: src/text.c:3159
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr ""
+
+#: src/text.c:3205
+#, fuzzy
+msgid "At last message"
+msgstr "Показва тази справка"
+
+#: src/text.c:3210
+#, fuzzy
+msgid "At first message"
+msgstr "Показва тази справка"
+
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr ""
+
+#: src/text.c:3275
+msgid "Finished"
+msgstr ""
+
+#: src/text.c:3280
+msgid "Invoking formatter, please wait"
+msgstr ""
+
+#: src/text.c:3360
+msgid "Finished formatting"
+msgstr ""
+
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sДуми: %lu  Редове: %ld  Знаци: %lu"
 
-#: src/text.c:3031
+#: src/text.c:3439
 msgid "In Selection:  "
 msgstr "В избрания текст: "
 
-#: src/utils.c:405 src/utils.c:417
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3453
+msgid "Verbatim Input"
+msgstr "Дословен вход"
+
+#: src/utils.c:410 src/utils.c:422
 msgid "nano is out of memory!"
 msgstr "nano е в недостиг на памет!"
 
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
-#: src/winio.c:1557
+#: src/winio.c:1583
 msgid "Unicode Input"
 msgstr "Вход уникод"
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2142 src/winio.c:2146
 msgid "Modified"
 msgstr "Променен"
 
-#: src/winio.c:2150
+#: src/winio.c:2143
 msgid "View"
 msgstr "Преглед"
 
-#: src/winio.c:2164
+#: src/winio.c:2157
 msgid "DIR:"
 msgstr "ДИР:"
 
-#: src/winio.c:2171
+#: src/winio.c:2164
 msgid "File:"
 msgstr "Файл:"
 
-#: src/winio.c:3360
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2261
+msgid ""
+"Warning: Modifying a file which is not locked, check directory permission?"
+msgstr ""
+
+#: src/winio.c:3377
 #, 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:3492
+#: src/winio.c:3507
 msgid "The nano text editor"
 msgstr "Текстов редактор nano"
 
-#: src/winio.c:3493
+#: src/winio.c:3508
 msgid "version"
 msgstr "версия"
 
-#: src/winio.c:3494
+#: src/winio.c:3509
 msgid "Brought to you by:"
 msgstr "Създадено от:"
 
-#: src/winio.c:3495
+#: src/winio.c:3510
 msgid "Special thanks to:"
 msgstr "Специални благодарности на:"
 
-#: src/winio.c:3496
+#: src/winio.c:3511
 msgid "The Free Software Foundation"
 msgstr "Фондация „Свободен софтуер“"
 
-#: src/winio.c:3497
+#: src/winio.c:3512
+msgid "the many translators and the TP"
+msgstr ""
+
+#: src/winio.c:3513
 msgid "For ncurses:"
 msgstr "За ncurses:"
 
-#: src/winio.c:3498
+#: src/winio.c:3514
 msgid "and anyone else we forgot..."
 msgstr "и всички останали, които сме забравили..."
 
-#: src/winio.c:3499
+#: src/winio.c:3515
 msgid "Thank you for using nano!"
 msgstr "Благодарим, че използвате nano!"
 
+#~ msgid "Move to the previous screen"
+#~ msgstr "Отиване на предишния екран"
+
+#~ msgid "Move to the next screen"
+#~ msgstr "Отиване на следващия екран"
+
+#~ msgid "Find Other Bracket"
+#~ msgstr "Намиране на другата скоба"
+
+#~ msgid "Insert File"
+#~ msgstr "Вмъкване на файл"
+
 #~ msgid "Space"
 #~ msgstr "Space"
 
+#~ msgid "(ignored, for Pico compatibility)"
+#~ msgstr "(не се използват,за съвместимост с Pico)"
+
+#~ msgid "Missing flag"
+#~ msgstr "Липсващ флаг"
+
 #~ msgid "Come on, be reasonable"
 #~ msgstr "Хайде, бъдете разумни"
 
+#~ msgid "Could not pipe"
+#~ msgstr "Неуспех при pipe"
+
 #~ msgid "Indent marked text"
 #~ msgstr "Отстъп на маркирания текст"
 
@@ -2173,9 +2442,6 @@ msgstr "Благодарим, че използвате nano!"
 #~ msgid "Duplicate syntax name %s"
 #~ msgstr "Дублирано име на синтаксис %s"
 
-#~ msgid "Could not create temp file: %s"
-#~ msgstr "Неуспех при създаването на временен файл: %s"
-
 #~ msgid "Find other bracket"
 #~ msgstr "Намиране на друга скоба"
 
@@ -2184,3 +2450,6 @@ msgstr "Благодарим, че използвате nano!"
 
 #~ msgid "Word Count in Selection"
 #~ msgstr "Брой думи в избрания текст"
+
+#~ msgid "Could not invoke \"%s\""
+#~ msgstr "Неуспех при извикване на „%s“"
diff --git a/po/ca.gmo b/po/ca.gmo
index 6cff23c..9a6b1f1 100644
--- a/po/ca.gmo
+++ b/po/ca.gmo
diff --git a/po/ca.po b/po/ca.po
index ce39359..d38c5fb 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -1,122 +1,154 @@
 # Catalan messages for the GNU nano editor.
-# Copyright © 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
+# Copyright © 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009, 2014, 2015 Free Software Foundation, Inc.
 # This file is distributed under the same licence as the nano package.
-# Jordi Mallach <jordi@gnu.org>, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009.
-# Miquel Vidal <miquel@sindominio.net>, 2001.
 #
+# Miquel Vidal <miquel@sindominio.net>, 2001.
+# Jordi Mallach <jordi@gnu.org>, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009, 2014, 2015.
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 2.1.11pre1\n"
+"Project-Id-Version: nano 2.3.99pre4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-22 06:34-0500\n"
-"PO-Revision-Date: 2009-09-19 13:28+0200\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
+"PO-Revision-Date: 2015-03-19 09:50+0100\n"
 "Last-Translator: Jordi Mallach <jordi@gnu.org>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
+"Language: ca\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"
 
-#: src/browser.c:220
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:203
 msgid "Go To Directory"
 msgstr "Vés a un directori"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:860 src/files.c:2048
-#: src/nano.c:1060 src/search.c:220 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Cancel·lat"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:246 src/browser.c:293
 #, c-format
 msgid "Can't go outside of %s in restricted mode"
 msgstr "No es pot anar fora de %s en mode restringit"
 
-#: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:722
-#: src/files.c:731 src/files.c:1540 src/files.c:1659 src/files.c:1711
-#: src/files.c:1732 src/files.c:1855 src/files.c:2691 src/rcfile.c:568
-#: src/rcfile.c:1204
+#: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
+#: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
+#: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "S'ha produït un error en llegir %s: %s"
 
-#: src/browser.c:303
+#: src/browser.c:283
 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:665 src/browser.c:674
+#: src/browser.c:626 src/browser.c:635
 msgid "(dir)"
 msgstr "(dir)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:632
 msgid "(parent dir)"
 msgstr "(directori pare)"
 
-#: src/browser.c:801 src/search.c:185
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "Cerca"
 
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:805 src/search.c:189
-msgid " [Case Sensitive]"
-msgstr " [Maj/Min]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:811 src/search.c:195
-msgid " [Regexp]"
-msgstr " [ExpReg]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:817 src/search.c:201
-msgid " [Backwards]"
-msgstr " [Cap Enrere]"
-
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "Recerca recomençada"
 
-#: src/browser.c:1006 src/browser.c:1039 src/search.c:514 src/search.c:517
-#: src/search.c:574 src/search.c:577
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "Aquesta és la única coincidència"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr "No hi ha cap patró de recerca actual"
 
-#: src/files.c:125
+#: src/files.c:139
+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:145
+#, 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:165 src/files.c:175 src/files.c:212 src/files.c:222
+#, 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:237
+#, 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:272
+#, 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:282
+#, c-format
+msgid "Error reading lock file %s: Not enough data read"
+msgstr ""
+"S'ha produït un error en llegir el fitxer de blocatge %s: No s'han llegit "
+"prous dades"
+
+#. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
+#: src/files.c:297
+#, 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:308
+#, c-format
+msgid "Error writing lock file: Directory '%s' doesn't exist"
+msgstr ""
+"S'ha produït un error en escriure el fitxer de blocatge: el directori «%s» "
+"no existeix"
+
+#: src/files.c:339
 #, 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:234
+#: src/files.c:467
 msgid "No more open file buffers"
 msgstr "No hi ha més búfers de fitxer oberts"
 
-#: src/files.c:250
+#: src/files.c:484
 #, c-format
 msgid "Switched to %s"
 msgstr "S'ha canviat a %s"
 
-#: src/files.c:251 src/global.c:469 src/winio.c:2168
+#: src/files.c:485 src/global.c:953 src/winio.c:2161
 msgid "New Buffer"
 msgstr "Nou búfer"
 
-#: src/files.c:633
+#: src/files.c:874
 #, 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:638
+#: src/files.c:879
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
@@ -131,14 +163,14 @@ 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:644
+#: src/files.c:885
 #, 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:648
+#: src/files.c:889
 #, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
@@ -151,14 +183,14 @@ msgstr[1] ""
 "%lu línies llegides (convertides des del format Mac - Avís: no hi ha permís "
 "d'escriptura)"
 
-#: src/files.c:654
+#: src/files.c:895
 #, 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:658
+#: src/files.c:899
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
@@ -171,478 +203,443 @@ msgstr[1] ""
 "%lu línies llegides (convertides des del format DOS - Avís: no hi ha permís "
 "d'escriptura)"
 
-#: src/files.c:664
+#: src/files.c:905
 #, 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:667
+#: src/files.c:908
 #, c-format
 msgid "Read %lu line ( Warning: No write permission)"
 msgid_plural "Read %lu lines (Warning: No write permission)"
-msgstr[0] ""
-msgstr[1] ""
+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:700 src/files.c:736
+#: src/files.c:943 src/files.c:980
 msgid "Reading File"
 msgstr "S'està llegint el fitxer"
 
-#: src/files.c:706
+#: src/files.c:950
 msgid "New File"
 msgstr "Nou fitxer"
 
-#: src/files.c:709
+#: src/files.c:953
 #, c-format
 msgid "\"%s\" not found"
 msgstr "«%s» no trobat"
 
-#: src/files.c:717 src/rcfile.c:559 src/rcfile.c:1154 src/rcfile.c:1195
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "«%s» és un directori"
 
-#: src/files.c:718 src/rcfile.c:560 src/rcfile.c:1155 src/rcfile.c:1196
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "«%s» és un fitxer de dispositiu"
 
-#: src/files.c:817
+#: src/files.c:1060
 #, 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:819
+#: src/files.c:1062
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Ordre a executar [des de %s] "
 
-#: src/files.c:825
+#: src/files.c:1069
 #, 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:827
+#: src/files.c:1071
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Fitxer a inserir [des de %s] "
 
-#: src/files.c:1077
+#: src/files.c:1320
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Tecla il·legal en mode no-multibuffer"
 
-#: src/files.c:1486
+#: src/files.c:1622
+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:1746
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "No es pot escriure fora de %s"
 
-#: src/files.c:1501
+#: src/files.c:1761
 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 establert"
 
-#: src/files.c:1581 src/files.c:1603 src/files.c:1621 src/files.c:1632
-#: src/files.c:1640 src/files.c:1667
+#: src/files.c:1843 src/files.c:1868 src/files.c:1886 src/files.c:1899
+#: src/files.c:1910 src/files.c:1939
 #, 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:1582 src/nano.c:701
+#: src/files.c:1844 src/nano.c:719
 msgid "Too many backup files?"
 msgstr "Massa fitxers de còpia de seguretat?"
 
-#: src/files.c:1687 src/files.c:1744 src/files.c:1763 src/files.c:1775
-#: src/files.c:1799 src/files.c:1817 src/files.c:1827 src/files.c:1863
-#: src/files.c:1868 src/files.c:2764 src/files.c:2773
+#: src/files.c:1959 src/files.c:2016 src/files.c:2035 src/files.c:2047
+#: src/files.c:2071 src/files.c:2089 src/files.c:2099 src/files.c:2135
+#: src/files.c:2140 src/files.c:3101 src/files.c:3110 src/files.c:3133
+#: src/files.c:3145
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "S'ha produït un error en escriure %s: %s"
 
-#: src/files.c:1721 src/text.c:2929 src/text.c:2941
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "S'ha produït un error en escriure un fitxer temporal: %s"
 
-#: src/files.c:1900
+#: src/files.c:2173
 #, 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:2004
+#: src/files.c:2278
 msgid " [DOS Format]"
 msgstr " [Format DOS]"
 
-#: src/files.c:2005
+#: src/files.c:2279
 msgid " [Mac Format]"
 msgstr " [Format Mac]"
 
-#: src/files.c:2007
+#: src/files.c:2281
 msgid " [Backup]"
 msgstr " [Còpia de seguretat]"
 
-#: src/files.c:2015
+#: src/files.c:2289
 msgid "Prepend Selection to File"
 msgstr "Avantposa sel·lecció a un fitxer"
 
-#: src/files.c:2016
+#: src/files.c:2290
 msgid "Append Selection to File"
 msgstr "Afegeix la sel·lecció a un fitxer"
 
-#: src/files.c:2017
+#: src/files.c:2291
 msgid "Write Selection to File"
 msgstr "Escriu la sel·lecció a un fitxer"
 
-#: src/files.c:2020
+#: src/files.c:2294
 msgid "File Name to Prepend to"
 msgstr "Nom del fitxer en el qual avantposar"
 
-#: src/files.c:2021
+#: src/files.c:2295
 msgid "File Name to Append to"
 msgstr "Nom del fitxer en el qual afegir"
 
-#: src/files.c:2022
+#: src/files.c:2296
 msgid "File Name to Write"
 msgstr "Nom del fitxer a escriure"
 
-#: src/files.c:2153
+#: src/files.c:2427
 msgid "File exists, OVERWRITE ? "
 msgstr "El fitxer existeix, el voleu SOBREESCRIURE? "
 
-#: src/files.c:2162
+#: src/files.c:2436
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "Voleu desar el fitxer sota un NOM DIFERENT? "
 
-#: src/files.c:2173
+#: src/files.c:2450
 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:2611
+#: src/files.c:2882
 msgid "(more)"
 msgstr "(més)"
 
-#: src/files.c:2694 src/rcfile.c:1220
+#: src/files.c:2974
 #, c-format
 msgid ""
 "\n"
-"Press Enter to continue starting nano.\n"
+"Press Enter to continue\n"
 msgstr ""
 "\n"
-"Premeu Intro per a continuar carregant nano.\n"
+"Premeu Intro per a continuar\n"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:415 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Cancel·la"
-
-#: src/global.c:416
-msgid "Replace"
-msgstr "Reemplaça"
+#: src/files.c:2989
+#, c-format
+msgid ""
+"Unable to create directory %s: %s\n"
+"It is required for saving/loading search history or cursor positions.\n"
+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/global.c:417
-msgid "No Replace"
-msgstr "No reemplaces"
+#: src/files.c:2995
+#, 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 ""
+"El camí %s no és un directori i ho ha de ser.\n"
+"Nano no podrà carregar o desar l'historial de cerca o la posició del "
+"cursor.\n"
 
-#: src/global.c:420
-msgid "Case Sens"
-msgstr "Maj/Min"
+#: src/files.c:3012
+#, 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 ""
+"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/global.c:421
-msgid "Backwards"
-msgstr "Cap Enrere"
+#: src/files.c:3016
+#, 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 ""
+"S'ha detectat un fitxer d'historial antic (%s) que s'ha mogut\n"
+"al lloc aconsellat (%s)\n"
+"(Vegeu les PMF del nano per a obtenir més informació sobre aquest canvi)"
 
-#: src/global.c:425
-msgid "Regexp"
-msgstr "Expreg"
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
+#: src/global.c:477
+msgid "Exit"
+msgstr "Surt"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:451
-msgid "PrevHstory"
-msgstr "HistPrèv"
+#: src/global.c:478
+msgid "Close"
+msgstr "Tanca"
 
-#: src/global.c:452
-msgid "NextHstory"
-msgstr "HistSeg"
+#: src/global.c:479
+msgid "Uncut Text"
+msgstr "Destalla el text"
 
-#: src/global.c:453
-msgid "Go To Text"
-msgstr "Vés al text"
+#: src/global.c:481
+msgid "Unjustify"
+msgstr "Desjustifica"
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:455
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:485
 msgid "WhereIs Next"
 msgstr "On és la següent"
 
-#: src/global.c:457
-msgid "First File"
-msgstr "Primer fitxer"
-
-#: src/global.c:458
-msgid "Last File"
-msgstr "Últim fitxer"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:460
-msgid "To Files"
-msgstr "A fitxers"
-
-#: src/global.c:462
-msgid "DOS Format"
-msgstr "Format DOS"
-
-#: src/global.c:463
-msgid "Mac Format"
-msgstr "Format Mac"
-
-#: src/global.c:464
-msgid "Append"
-msgstr "Afegeix"
-
-#: src/global.c:465
-msgid "Prepend"
-msgstr "Avantposa"
-
-#: src/global.c:466
-msgid "Backup File"
-msgstr "Fes còpia de seguretat"
-
-#: src/global.c:467
-msgid "Execute Command"
-msgstr "Executa una ordre"
-
-#: src/global.c:471
-msgid "Go To Dir"
-msgstr "Vés a directori"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:480
-msgid "Get Help"
-msgstr "Ajuda"
-
-#: src/global.c:481
-msgid "Exit"
-msgstr "Surt"
-
-#: src/global.c:482
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:492
 msgid "Where Is"
 msgstr "Cerca"
 
-#: src/global.c:483
-msgid "Prev Page"
-msgstr "Pàg Ant"
-
-#: src/global.c:484
-msgid "Next Page"
-msgstr "Pàg Seg"
-
-#: src/global.c:485
-msgid "First Line"
-msgstr "Primera línia"
+#: src/global.c:493
+msgid "Replace"
+msgstr "Reemplaça"
 
-#: src/global.c:486
-msgid "Last Line"
-msgstr "Última línia"
+#: src/global.c:494
+msgid "Go To Line"
+msgstr "Vés a línia"
 
-#: src/global.c:487
-msgid "Suspend"
-msgstr "Suspèn"
+#: src/global.c:495
+msgid "Prev Line"
+msgstr "Ant Línia"
 
-#: src/global.c:489
-msgid "Beg of Par"
-msgstr "Princ de par"
+#: src/global.c:496
+msgid "Next Line"
+msgstr "Seg Línia"
 
-#: src/global.c:490
-msgid "End of Par"
-msgstr "Final de par"
+#: src/global.c:497
+msgid "Read File"
+msgstr "Llegeix"
 
-#: src/global.c:491
+#: src/global.c:499
 msgid "FullJstify"
 msgstr "JustCompl"
 
-#: src/global.c:493
+#: src/global.c:501
 msgid "Refresh"
 msgstr "Refresca"
 
-#: src/global.c:495
-msgid "Insert File"
-msgstr "Insereix un fitxer"
-
-#: src/global.c:497
-msgid "Go To Line"
-msgstr "Vés a línia"
-
-#: src/global.c:500
+#. 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:507
 msgid "Justify the current paragraph"
 msgstr "Justifica el paràgraf actual"
 
-#. 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:505
+#: src/global.c:509
 msgid "Cancel the current function"
 msgstr "Cancel·la la funció actual"
 
-#: src/global.c:506
+#: src/global.c:510
 msgid "Display this help text"
 msgstr "Mostra aquest text d'ajuda"
 
-#: src/global.c:509
+#: src/global.c:513
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Tanca el búfer de fitxer actual / Surt del nano"
 
-#: src/global.c:511
+#: src/global.c:515
 msgid "Exit from nano"
 msgstr "Surt del nano"
 
-#: src/global.c:515
+#: src/global.c:519
 msgid "Write the current file to disk"
 msgstr "Escriu el fitxer actual al disc"
 
-#: src/global.c:517
+#: src/global.c:521
 msgid "Insert another file into the current one"
 msgstr "Insereix un altre fitxer dins de l'actual"
 
-#: src/global.c:519
+#: src/global.c:523
 msgid "Search for a string or a regular expression"
 msgstr "Cerca una cadena o expressió regular"
 
-#: src/global.c:520
-msgid "Go to previous screen"
-msgstr "Vés a la pàgina anterior"
+#: src/global.c:526
+msgid "Search for a string"
+msgstr "Cerca una cadena"
 
-#: src/global.c:521
-msgid "Go to next screen"
-msgstr "Vés a la pàgina següent"
+#: src/global.c:528
+msgid "Go one screenful up"
+msgstr "Vés a la pantalla anterior"
 
-#: src/global.c:523
+#: src/global.c:529
+msgid "Go one screenful down"
+msgstr "Vés a la pantalla següent"
+
+#: src/global.c:531
 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:525
+#: src/global.c:533
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Enganxa el cutbuffer a la línia actual"
 
-#: src/global.c:527
+#: src/global.c:534
 msgid "Display the position of the cursor"
 msgstr "Mostra la posició del cursor"
 
-#: src/global.c:529
+#: src/global.c:536
 msgid "Invoke the spell checker, if available"
 msgstr "Invoca el corrector ortogràfic, si està disponible"
 
-#: src/global.c:531
+#: src/global.c:538
 msgid "Replace a string or a regular expression"
 msgstr "Reemplaça una cadena o una expressió regular"
 
-#: src/global.c:532
+#: src/global.c:539
 msgid "Go to line and column number"
 msgstr "Vés a un número de línia i columna"
 
-#: src/global.c:534
-msgid "Mark text at the cursor position"
-msgstr "Marca text a la posició del cursor"
+#: src/global.c:541
+msgid "Mark text starting from the cursor position"
+msgstr "Marca text començant des de la posició del cursor"
 
-#: src/global.c:535
-msgid "Repeat last search"
+#: src/global.c:542
+msgid "Repeat the last search"
 msgstr "Repeteix l'última recerca"
 
-#: src/global.c:537
+#: src/global.c:544
 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:538
+#: src/global.c:545
 msgid "Indent the current line"
 msgstr "Ajusta el fitxer actual"
 
-#: src/global.c:539
+#: src/global.c:546
 msgid "Unindent the current line"
 msgstr "Desajusta el fitxer actual"
 
-#: src/global.c:540
+#: src/global.c:547
 msgid "Undo the last operation"
 msgstr "Desfés l'última operació"
 
-#: src/global.c:541
+#: src/global.c:548
 msgid "Redo the last undone operation"
 msgstr "Refés l'última operació"
 
-#: src/global.c:543
+#: src/global.c:550
 msgid "Go forward one character"
 msgstr "Vés endavant un caràcter"
 
-#: src/global.c:544
+#: src/global.c:551
 msgid "Go back one character"
 msgstr "Vés enrere un caràcter"
 
-#: src/global.c:546
+#: src/global.c:553
 msgid "Go forward one word"
 msgstr "Vés endavant una paraula"
 
-#: src/global.c:547
+#: src/global.c:554
 msgid "Go back one word"
 msgstr "Vés enrere una paraula"
 
-#: src/global.c:549
+#: src/global.c:556
 msgid "Go to previous line"
 msgstr "Vés a la línia anterior"
 
-#: src/global.c:550
+#: src/global.c:557
 msgid "Go to next line"
 msgstr "Vés a la línia següent"
 
-#: src/global.c:551
+#: src/global.c:558
 msgid "Go to beginning of current line"
 msgstr "Vés al principi de la línia actual"
 
-#: src/global.c:552
+#: src/global.c:559
 msgid "Go to end of current line"
 msgstr "Vés al final de la línia actual"
 
-#: src/global.c:555
+#: src/global.c:562
 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:557
+#: src/global.c:564
 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:560
+#: src/global.c:566
 msgid "Go to the first line of the file"
 msgstr "Vés a la primera línia del fitxer"
 
-#: src/global.c:562
+#: src/global.c:567
 msgid "Go to the last line of the file"
 msgstr "Vés a l'última línia del fitxer"
 
-#: src/global.c:564
+#: src/global.c:569
 msgid "Go to the matching bracket"
 msgstr "Vés a la clau corresponent"
 
-#: src/global.c:566
+#: src/global.c:571
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "Desplaça amunt una línia sense desplaçar el cursor"
 
-#: src/global.c:568
+#: src/global.c:573
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "Desplaça avall una línia sense desplaçar el cursor"
 
-#: src/global.c:572
+#: src/global.c:576
 msgid "Switch to the previous file buffer"
 msgstr "Canvia a l'anterior búfer de fitxer"
 
-#: src/global.c:574
+#: src/global.c:577
 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:577
+#: src/global.c:579
 msgid "Insert the next keystroke verbatim"
 msgstr "Insereix la següent premuda de tecla textualment"
 
-#: src/global.c:579
+#: src/global.c:580
 msgid "Insert a tab at the cursor position"
 msgstr "Insereix una tabulació a la posició del cursor"
 
@@ -650,332 +647,434 @@ msgstr "Insereix una tabulació a la posició del cursor"
 msgid "Insert a newline at the cursor position"
 msgstr "Insereix una línia nova a la posició del cursor"
 
-#: src/global.c:583
+#: src/global.c:582
 msgid "Delete the character under the cursor"
 msgstr "Suprimeix el caràcter sota el cursor"
 
-#: src/global.c:585
+#: src/global.c:584
 msgid "Delete the character to the left of the cursor"
 msgstr "Suprimeix el caràcter a l'esquerra del cursor"
 
-#: src/global.c:588
+#: src/global.c:587
 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:591
+#: src/global.c:590
 msgid "Justify the entire file"
 msgstr "Justifica el fitxer sencer"
 
-#: src/global.c:595
+#: src/global.c:594
 msgid "Count the number of words, lines, and characters"
 msgstr "Compta el nombre de paraules, línies i caràcters"
 
-#: src/global.c:598
+#: src/global.c:597
 msgid "Refresh (redraw) the current screen"
 msgstr "Redibuixa la pantalla actual"
 
-#: src/global.c:600
+#: src/global.c:599
 msgid "Suspend the editor (if suspend is enabled)"
 msgstr "Suspèn l'editor (si la suspensió és habilitada)"
 
-#: src/global.c:603
+#: src/global.c:602
 msgid "Toggle the case sensitivity of the search"
 msgstr "Commuta la sensibilitat a majúscules de la cerca"
 
-#: src/global.c:605
+#: src/global.c:604
 msgid "Reverse the direction of the search"
 msgstr "Inverteix la direcció de la cerca"
 
-#: src/global.c:609
+#: src/global.c:608
 msgid "Toggle the use of regular expressions"
 msgstr "Commuta l'ús d'expressions regulars"
 
-#: src/global.c:613
+#: src/global.c:612
 msgid "Recall the previous search/replace string"
 msgstr "Recupera la cadena de cerca/reemplaça anterior"
 
-#: src/global.c:615
+#: src/global.c:614
 msgid "Recall the next search/replace string"
 msgstr "Recupera la cadena de cerca/reemplaça següent"
 
-#: src/global.c:618
+#: src/global.c:617
 msgid "Go to file browser"
 msgstr "Vés al navegador de fitxers"
 
-#: src/global.c:621
+#: src/global.c:620
 msgid "Toggle the use of DOS format"
 msgstr "Commuta l'ús del format DOS"
 
-#: src/global.c:622
+#: src/global.c:621
 msgid "Toggle the use of Mac format"
 msgstr "Commuta l'ús del format Mac"
 
-#: src/global.c:624
+#: src/global.c:622
 msgid "Toggle appending"
 msgstr "Commuta l'afegiment"
 
-#: src/global.c:625
+#: src/global.c:623
 msgid "Toggle prepending"
 msgstr "Commuta l'avantposat"
 
-#: src/global.c:628
+#: src/global.c:624
 msgid "Toggle backing up of the original file"
 msgstr "Commuta la creació d'una còpia de seguretat del fitxer original"
 
-#: src/global.c:629
+#: src/global.c:625
 msgid "Execute external command"
 msgstr "Executa una ordre externa"
 
-#: src/global.c:633
+#: src/global.c:628
 msgid "Toggle the use of a new buffer"
 msgstr "Commuta l'ús d'un búfer nou"
 
-#: src/global.c:636
+#: src/global.c:631
 msgid "Exit from the file browser"
 msgstr "Surt del navegador de fitxers"
 
-#: src/global.c:638
+#: src/global.c:632
 msgid "Go to the first file in the list"
 msgstr "Vés al primer fitxer de la llista"
 
-#: src/global.c:640
+#: src/global.c:633
 msgid "Go to the last file in the list"
 msgstr "Vés a l'últim fitxer de la llista"
 
-#: src/global.c:641
-#, fuzzy
-msgid "Go to the next file in the list"
-msgstr "Vés a l'últim fitxer de la llista"
-
-#: src/global.c:642
-#, fuzzy
+#: src/global.c:634
 msgid "Go to the previous file in the list"
-msgstr "Vés al primer fitxer de la llista"
+msgstr "Vés al fitxer previ de la llista"
+
+#: src/global.c:635
+msgid "Go to the next file in the list"
+msgstr "Vés al fitxer següent de la llista"
 
-#: src/global.c:643
+#: src/global.c:636
 msgid "Go to directory"
 msgstr "Vés al directori"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:670
-msgid "Close"
-msgstr "Tanca"
+#: src/global.c:639
+msgid "Invoke the linter, if available"
+msgstr "Invoca l'analitzador sintàctic, si està disponible"
+
+#: src/global.c:640
+msgid "Go to previous linter msg"
+msgstr "Vés al missatge anterior de l'analitzador"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:679
-msgid "WriteOut"
+#: src/global.c:641
+msgid "Go to next linter msg"
+msgstr "Vés al missatge següent de l'analitzador"
+
+#: src/global.c:642
+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:662
+msgid "Get Help"
+msgstr "Ajuda"
+
+#: src/global.c:665 src/prompt.c:1084
+msgid "Cancel"
+msgstr "Cancel·la"
+
+#: src/global.c:678
+msgid "Write Out"
 msgstr "Desa"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:704
+msgid "Go To Dir"
+msgstr "Vés a directori"
+
+#: src/global.c:719
+msgid "Cut Text"
+msgstr "Retalla"
+
+#: src/global.c:728
 msgid "Justify"
 msgstr "Justifica"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:696
-msgid "Read File"
-msgstr "Llegeix"
+#: src/global.c:733
+msgid "To Spell"
+msgstr "Ortografia"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:713
-msgid "Cut Text"
-msgstr "Retalla"
+#: src/global.c:738
+msgid "To Linter"
+msgstr "Analitzador"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:718
-msgid "UnJustify"
-msgstr "Desjustifica"
+#: src/global.c:740
+msgid "Formatter"
+msgstr "Formatador"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:723
-msgid "UnCut Text"
-msgstr "Destalla el text"
+#: src/global.c:745
+msgid "Case Sens"
+msgstr "Maj/Min"
+
+#: src/global.c:750
+msgid "Regexp"
+msgstr "Expreg"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:728 src/global.c:755
+#: src/global.c:755
+msgid "Backwards"
+msgstr "Cap Enrere"
+
+#: src/global.c:762
+msgid "No Replace"
+msgstr "No reemplaces"
+
+#: src/global.c:770
 msgid "Cur Pos"
 msgstr "Pos Act"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:737
-msgid "To Spell"
-msgstr "Ortografia"
+#: src/global.c:780
+msgid "Prev Page"
+msgstr "Pàg Ant"
 
-#: src/global.c:771
+#: src/global.c:782
+msgid "Next Page"
+msgstr "Pàg Seg"
+
+#: src/global.c:785
+msgid "First Line"
+msgstr "Primera línia"
+
+#: src/global.c:787
+msgid "Last Line"
+msgstr "Última línia"
+
+#: src/global.c:794
+msgid "To Bracket"
+msgstr "Vés a la clau"
+
+#: src/global.c:797
 msgid "Mark Text"
 msgstr "Marca text"
 
-#: src/global.c:777
+#: src/global.c:800
 msgid "Copy Text"
 msgstr "Copia text"
 
-#: src/global.c:780
+#: src/global.c:803
 msgid "Indent Text"
 msgstr "Sagna text"
 
-#: src/global.c:783
+#: src/global.c:805
 msgid "Unindent Text"
 msgstr "Desagna text"
 
-#: src/global.c:787
+#: src/global.c:808
 msgid "Undo"
 msgstr "Desfés"
 
-#: src/global.c:790
+#: src/global.c:810
 msgid "Redo"
 msgstr "Refés"
 
-#: src/global.c:796 src/global.c:800
-msgid "Forward"
-msgstr "Endavant"
-
-#: src/global.c:806 src/global.c:810
+#: src/global.c:814 src/global.c:820
 msgid "Back"
 msgstr "Enrere"
 
-#: src/global.c:817
-msgid "Next Word"
-msgstr "Paraula següent"
+#: src/global.c:816 src/global.c:822
+msgid "Forward"
+msgstr "Endavant"
 
-#: src/global.c:820
+#: src/global.c:827
 msgid "Prev Word"
 msgstr "Paraula anterior"
 
-#: src/global.c:824
-msgid "Prev Line"
-msgstr "Ant Línia"
-
-#: src/global.c:827
-msgid "Next Line"
-msgstr "Seg Línia"
+#: src/global.c:829
+msgid "Next Word"
+msgstr "Paraula següent"
 
-#: src/global.c:830
+#: src/global.c:833
 msgid "Home"
 msgstr "Inici"
 
-#: src/global.c:833
+#: src/global.c:835
 msgid "End"
 msgstr "Fi"
 
-#: src/global.c:845
-msgid "Find Other Bracket"
-msgstr "Troba la clau corresponent"
+#: src/global.c:844
+msgid "Beg of Par"
+msgstr "Princ de par"
+
+#: src/global.c:846
+msgid "End of Par"
+msgstr "Final de par"
 
-#: src/global.c:848
+#: src/global.c:851
 msgid "Scroll Up"
 msgstr "Desplaça amunt"
 
-#: src/global.c:851
+#: src/global.c:853
 msgid "Scroll Down"
 msgstr "Desplaça avall"
 
-#: src/global.c:856
-msgid "Previous File"
-msgstr "Anterior fitxer"
-
 #: src/global.c:858
+msgid "Prev File"
+msgstr "Fitxer anterior"
+
+#: src/global.c:860
 msgid "Next File"
-msgstr "Següent fitxer"
+msgstr "Fitxer següent"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:862 src/text.c:3045
-msgid "Verbatim Input"
-msgstr "Entrada textual"
+#: src/global.c:869
+msgid "Verbatim"
+msgstr "Textual"
 
-#: src/global.c:867
+#: src/global.c:872
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:870
+#: src/global.c:874
 msgid "Enter"
 msgstr "Retorn"
 
-#: src/global.c:873
+#: src/global.c:876
 msgid "Delete"
 msgstr "Suprimeix"
 
-#: src/global.c:876
+#: src/global.c:878
 msgid "Backspace"
 msgstr "Retrocés"
 
-#: src/global.c:893
+#: src/global.c:888
 msgid "CutTillEnd"
 msgstr "RetallaFinsFinal"
 
-#: src/global.c:906
+#: src/global.c:898
 msgid "Word Count"
 msgstr "Compte de paraules"
 
-#: src/global.c:1367
+#: src/global.c:905
+msgid "Suspend"
+msgstr "Suspèn"
+
+#: src/global.c:910
+msgid "PrevHstory"
+msgstr "HistPrèv"
+
+#: src/global.c:913
+msgid "NextHstory"
+msgstr "HistSeg"
+
+#: src/global.c:917
+msgid "Go To Text"
+msgstr "Vés al text"
+
+#: src/global.c:928
+msgid "DOS Format"
+msgstr "Format DOS"
+
+#: src/global.c:931
+msgid "Mac Format"
+msgstr "Format Mac"
+
+#: src/global.c:934
+msgid "Append"
+msgstr "Afegeix"
+
+#: src/global.c:936
+msgid "Prepend"
+msgstr "Avantposa"
+
+#: src/global.c:939
+msgid "Backup File"
+msgstr "Fes còpia de seguretat"
+
+#: src/global.c:946
+msgid "Execute Command"
+msgstr "Executa una ordre"
+
+#: src/global.c:961
+msgid "To Files"
+msgstr "A fitxers"
+
+#: src/global.c:964
+msgid "First File"
+msgstr "Primer fitxer"
+
+#: src/global.c:966
+msgid "Last File"
+msgstr "Últim fitxer"
+
+#: src/global.c:977
+msgid "Prev Lint Msg"
+msgstr "Miss lint ant"
+
+#: src/global.c:979
+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:1227
 msgid "Help mode"
 msgstr "Mode ajuda"
 
-#: src/global.c:1369
+#: src/global.c:1229
 msgid "Constant cursor position display"
 msgstr "Visualització constant de la posició del cursor"
 
-#: src/global.c:1371
+#: src/global.c:1231
 msgid "Use of one more line for editing"
 msgstr "Utilitza una línia més per a editar"
 
-#: src/global.c:1373
+#: src/global.c:1233
 msgid "Smooth scrolling"
 msgstr "Desplaçament suau"
 
-#: src/global.c:1375
+#: src/global.c:1235
+msgid "Soft wrapping of overlong lines"
+msgstr "Ajusta suaument les línies llargues"
+
+#: src/global.c:1237
 msgid "Whitespace display"
 msgstr "Mostra l'espai en blanc"
 
-#: src/global.c:1377
+#: src/global.c:1239
 msgid "Color syntax highlighting"
 msgstr "Resaltat de sintaxi en color"
 
-#: src/global.c:1379
+#: src/global.c:1241
 msgid "Smart home key"
 msgstr "Tecla «Inici» intel·ligent"
 
-#: src/global.c:1381
+#: src/global.c:1243
 msgid "Auto indent"
 msgstr "Sagna automàticament"
 
-#: src/global.c:1383
+#: src/global.c:1245
 msgid "Cut to end"
 msgstr "Retalla fins al final"
 
-#: src/global.c:1385
-msgid "Long line wrapping"
-msgstr "Ajustament de línies llargues"
+#: src/global.c:1247
+msgid "Hard wrapping of overlong lines"
+msgstr "Ajusta completament les línies llargues"
 
-#: src/global.c:1387
+#: src/global.c:1249
 msgid "Conversion of typed tabs to spaces"
 msgstr "Conversió de les tabulacions introduïdes a espais"
 
-#: src/global.c:1389
+#: src/global.c:1251
 msgid "Backup files"
 msgstr "Fitxers de còpia de seguretat"
 
-#: src/global.c:1391
+#: src/global.c:1253
 msgid "Multiple file buffers"
 msgstr "Múltiples búfers de fitxers"
 
-#: src/global.c:1393
+#: src/global.c:1255
 msgid "Mouse support"
 msgstr "Suport per a ratolí"
 
-#: src/global.c:1395
+#: src/global.c:1257
 msgid "No conversion from DOS/Mac format"
 msgstr "Sense conversió des del format DOS/Mac"
 
-#: src/global.c:1397
+#: src/global.c:1259
 msgid "Suspension"
 msgstr "Suspensió"
 
-#: src/global.c:1399
-msgid "Soft line wrapping"
-msgstr "Ajustament de línies suau"
-
-#: src/help.c:236
+#: src/help.c:205
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -998,7 +1097,7 @@ msgstr ""
 "l'indicatiu de recerca. Prémer Retorn sense introduir cap text durà a terme "
 "l'anterior recerca. "
 
-#: src/help.c:245
+#: src/help.c:214
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1012,7 +1111,7 @@ msgstr ""
 " Les següents tecles de funció estan disponibles en el mode Cerca:\n"
 "\n"
 
-#: src/help.c:251
+#: src/help.c:220
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1032,7 +1131,7 @@ msgstr ""
 " Les següents tecles de funció estan disponibles en el mode anar a línia:\n"
 "\n"
 
-#: src/help.c:260
+#: src/help.c:229
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1054,7 +1153,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:269
+#: src/help.c:238
 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"
@@ -1069,7 +1168,7 @@ msgstr ""
 "fitxer:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:244
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1097,7 +1196,7 @@ msgstr ""
 " Les següents tecles de funció estan disponibles en el mode desa el fitxer:\n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:258
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1123,7 +1222,7 @@ msgstr ""
 "fitxers:\n"
 "\n"
 
-#: src/help.c:302
+#: src/help.c:271
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1148,7 +1247,7 @@ msgstr ""
 "l'anterior recerca.\n"
 "\n"
 
-#: src/help.c:311
+#: src/help.c:280
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1157,7 +1256,7 @@ msgstr ""
 "navegador:\n"
 "\n"
 
-#: src/help.c:315
+#: src/help.c:284
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1180,7 +1279,7 @@ msgstr ""
 "«anar a un directori»:\n"
 "\n"
 
-#: src/help.c:328
+#: src/help.c:297
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1205,7 +1304,7 @@ msgstr ""
 "d'ortografia:\n"
 "\n"
 
-#: src/help.c:343
+#: src/help.c:312
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1225,7 +1324,7 @@ msgstr ""
 " Les següents tecles de funció estan disponibles al mode Executa una ordre:\n"
 "\n"
 
-#: src/help.c:356
+#: src/help.c:325
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1246,7 +1345,7 @@ msgstr ""
 "inferior i mostra missatges importants. Les últimes dues línies mostren les "
 "dreceres més utilitzades a l'editor."
 
-#: src/help.c:366
+#: src/help.c:335
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1265,7 +1364,7 @@ msgstr ""
 "s'hi pot accedir mitjançant les tecles Esc, Alt o Meta, tot depenent de la "
 "configuració del vostre teclat. "
 
-#: src/help.c:375
+#: src/help.c:344
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1279,15 +1378,15 @@ msgstr ""
 "alternatives estan representades entre parèntesi:\n"
 "\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:376 src/help.c:448
 msgid "enable/disable"
 msgstr "habilita/inhabilita"
 
-#: src/nano.c:587
+#: src/nano.c:601
 msgid "Key invalid in view mode"
 msgstr "La tecla és il·legal al mode visualització"
 
-#: src/nano.c:695
+#: src/nano.c:713
 #, c-format
 msgid ""
 "\n"
@@ -1296,7 +1395,7 @@ msgstr ""
 "\n"
 "S'ha escrit el búfer en %s\n"
 
-#: src/nano.c:697
+#: src/nano.c:715
 #, c-format
 msgid ""
 "\n"
@@ -1305,7 +1404,7 @@ msgstr ""
 "\n"
 "No s'ha escrit el búfer a %s: %s\n"
 
-#: src/nano.c:700
+#: src/nano.c:718
 #, c-format
 msgid ""
 "\n"
@@ -1314,263 +1413,268 @@ msgstr ""
 "\n"
 "No s'ha escrit el búfer: %s\n"
 
-#: src/nano.c:723
+#: src/nano.c:743
 msgid "Window size is too small for nano...\n"
-msgstr "La mida de la terminal és massa petita per a nano...\n"
+msgstr "La mida del terminal és massa petita per al nano...\n"
 
-#: src/nano.c:816
+#: src/nano.c:836
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
 "\n"
 msgstr "Forma d'ús: nano [OPCIONS] [[+LÍNIA,COLUMNA] FITXER]...\n"
 
-#: src/nano.c:819
+#: src/nano.c:839
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Opció\t\tOpció llarga GNU\tSignificat\n"
 
-#: src/nano.c:821
+#: src/nano.c:841
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Opció\t\tSignificat\n"
 
-#: src/nano.c:824
-msgid "Show this message"
-msgstr "Mostra aquest missatge"
-
-#: src/nano.c:825
+#: src/nano.c:844
 msgid "+LINE,COLUMN"
 msgstr "+LÍNIA,COLUMNA"
 
-#: src/nano.c:826
+#. TRANSLATORS: The next forty or so strings are option descriptions
+#. * for the --help output.  Try to keep them at most 40 characters.
+#: src/nano.c:847
 msgid "Start at line LINE, column COLUMN"
 msgstr "Comença en la línia número LÍNIA, columna COLUMNA"
 
-#: src/nano.c:828
+#: src/nano.c:849
 msgid "Enable smart home key"
 msgstr "Habilita la tecla «inici» intel·ligent"
 
-#: src/nano.c:829
+#: src/nano.c:850
 msgid "Save backups of existing files"
 msgstr "Fes còpies de seguretat dels fitxers existents"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "-C <dir>"
 msgstr "-C <dir>"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<dir>"
 
-#: src/nano.c:831
+#: src/nano.c:852
 msgid "Directory for saving unique backup files"
 msgstr "Directori on desar els fitxers de còpia de seguretat únics"
 
-#: src/nano.c:834
+#: src/nano.c:855
 msgid "Use bold instead of reverse video text"
 msgstr "Utilitza negreta en comptes de text amb els colors invertits"
 
-#: src/nano.c:837
+#: src/nano.c:858
 msgid "Convert typed tabs to spaces"
 msgstr "Converteix les tabulacions introduïdes a espais"
 
-#: src/nano.c:840
+#: src/nano.c:861
 msgid "Enable multiple file buffers"
 msgstr "Habilita múltiples búfers de fitxers"
 
-#: src/nano.c:845
+#: src/nano.c:865
+msgid "Use (vim-style) lock files"
+msgstr "Empra fitxers de blocatge (a l'estil del Vim)"
+
+#: src/nano.c:869
 msgid "Log & read search/replace string history"
 msgstr "Registra i llegeix la història de cerca/reemplaça"
 
-#: src/nano.c:848
+#: src/nano.c:873
 msgid "Don't look at nanorc files"
 msgstr "No faces servir els fitxers nanorc"
 
-#: src/nano.c:851
+#: src/nano.c:876
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Arregla el problema de confusió del teclat numèric"
 
-#: src/nano.c:853
+#: src/nano.c:878
 msgid "Don't add newlines to the ends of files"
 msgstr "No afegeixes retorns de carro al final dels fitxers"
 
-#: src/nano.c:856
+#: src/nano.c:881
 msgid "Don't convert files from DOS/Mac format"
 msgstr "No converteixes des del format DOS/Mac"
 
-#: src/nano.c:858
+#: src/nano.c:883
 msgid "Use one more line for editing"
 msgstr "Utilitza una línia més per a editar"
 
-#: src/nano.c:860
+#: src/nano.c:886
+msgid "Log & read location of cursor position"
+msgstr "Emmagatzema i llegeix la posició del cursor"
+
+#: src/nano.c:889
 msgid "-Q <str>"
 msgstr "-Q <str>"
 
-#: src/nano.c:860
+#: src/nano.c:889
 msgid "--quotestr=<str>"
 msgstr "--quotestr=<cad>"
 
-#: src/nano.c:861
+#: src/nano.c:890
 msgid "Quoting string"
 msgstr "Marcador de cita"
 
-#: src/nano.c:863
+#: src/nano.c:892
 msgid "Restricted mode"
 msgstr "Mode restringit"
 
-#: src/nano.c:866
+#: src/nano.c:895
 msgid "Scroll by line instead of half-screen"
 msgstr "Desplaça't per línies en lloc de mitges pantalles"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "-T <#cols>"
 msgstr "-T <#cols>"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#cols>"
 
-#: src/nano.c:869
+#: src/nano.c:898
 msgid "Set width of a tab to #cols columns"
 msgstr "Estableix l'amplada de tab a #cols columnes"
 
-#: src/nano.c:871
+#: src/nano.c:900
 msgid "Do quick statusbar blanking"
 msgstr "Neteja la barra d'estat ràpidament"
 
-#: src/nano.c:874
+#: src/nano.c:903
 msgid "Print version information and exit"
 msgstr "Imprimeix informació sobre la versió i surt"
 
-#: src/nano.c:877
+#: src/nano.c:906
 msgid "Detect word boundaries more accurately"
 msgstr "Detecta els límits entre paraules amb més detall"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "-Y <str>"
 msgstr "-Y <cad>"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "--syntax=<str>"
 msgstr "--syntax=<cad>"
 
-#: src/nano.c:881
+#: src/nano.c:910
 msgid "Syntax definition to use for coloring"
 msgstr "Definició de sintaxi a utilitzar per a colorejar"
 
-#: src/nano.c:883
+#: src/nano.c:912
 msgid "Constantly show cursor position"
 msgstr "Mostra contínuament la posició del cursor"
 
-#: src/nano.c:885
+#: src/nano.c:914
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Arregla el problema de confusió entre Esborra/Suprimeix"
 
-#: src/nano.c:888
+#: src/nano.c:915
+msgid "Show this help text"
+msgstr "Mostra aquest text d'ajuda"
+
+#: src/nano.c:918
 msgid "Automatically indent new lines"
 msgstr "Sagna automàticament noves línies"
 
-#: src/nano.c:889
+#: src/nano.c:919
 msgid "Cut from cursor to end of line"
 msgstr "Retalla des del cursor al final de línia"
 
-#: src/nano.c:892
+#: src/nano.c:922
 msgid "Don't follow symbolic links, overwrite"
 msgstr "No segueixes enllaços simbòlics, sobreescriu-los"
 
-#: src/nano.c:894
+#: src/nano.c:924
 msgid "Enable the use of the mouse"
 msgstr "Habilita l'ús del ratolí"
 
-#: src/nano.c:897
+#: src/nano.c:926
+msgid "Do not read the file (only write it)"
+msgstr "No llegeixes el fitxer (només escriu sobre ell)"
+
+#: src/nano.c:928
 msgid "-o <dir>"
 msgstr "-o <dir>"
 
-#: src/nano.c:897
+#: src/nano.c:928
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<dir>"
 
-#: src/nano.c:898
+#: src/nano.c:929
 msgid "Set operating directory"
 msgstr "Estableix directori d'operació"
 
-#: src/nano.c:901
+#: src/nano.c:932
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Preserva les tecles XON (^Q) i XOFF (^S)"
 
-#: src/nano.c:903
+#: src/nano.c:935
 msgid "Silently ignore startup issues like rc file errors"
 msgstr "Omet silenciosament problemes d'inici com errors al fitxer rc"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "-r <#cols>"
 msgstr "-r <#cols>"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "--fill=<#cols>"
 msgstr "--fill=<#cols>"
 
-#: src/nano.c:906
-msgid "Set wrapping point at column #cols"
+#: src/nano.c:939
+msgid "Set hard-wrapping point at column #cols"
 msgstr "Estableix el punt d'ajustament a la columna #cols"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "-s <prog>"
 msgstr "-s <prog>"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "--speller=<prog>"
 msgstr "--speller=<prog>"
 
-#: src/nano.c:910
+#: src/nano.c:943
 msgid "Enable alternate speller"
 msgstr "Habilita un corrector alternatiu"
 
-#: src/nano.c:913
+#: src/nano.c:946
 msgid "Auto save on exit, don't prompt"
 msgstr "Desa automàticament en sortir, no preguntes"
 
-#: src/nano.c:915
-msgid "Allow generic undo [EXPERIMENTAL]"
-msgstr "Permet el desfer genèric [EXPERIMENTAL]"
-
-#: src/nano.c:918
+#: src/nano.c:947
 msgid "View mode (read-only)"
 msgstr "Mode de visualització (només lectura)"
 
-#: src/nano.c:920
-msgid "Don't wrap long lines"
+#: src/nano.c:949
+msgid "Don't hard-wrap long lines"
 msgstr "No ajustes les línies llargues"
 
-#: src/nano.c:922
+#: src/nano.c:951
 msgid "Don't show the two help lines"
 msgstr "No mostres les dues línies d'ajuda"
 
-#: src/nano.c:923
+#: src/nano.c:952
 msgid "Enable suspension"
 msgstr "Habilita la suspensió"
 
-#: src/nano.c:924
-#, fuzzy
+#: src/nano.c:954
 msgid "Enable soft line wrapping"
-msgstr "Habilita l¡ajustament suau de línies"
-
-#: src/nano.c:928
-msgid "(ignored, for Pico compatibility)"
-msgstr "(ignorades, per a compatibilitat amb Pico)"
+msgstr "Habilita l'ajustament suau de línies"
 
-#: src/nano.c:938
+#: src/nano.c:963
 #, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
-msgstr " GNU nano versió %s (compilat %s, %s)\n"
+msgid " GNU nano, version %s\n"
+msgstr " GNU nano, versió %s\n"
 
-#: src/nano.c:943
+#: src/nano.c:966
 #, 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:944
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1579,154 +1683,179 @@ msgstr ""
 "\n"
 " Opcions compilades:"
 
-#: src/nano.c:1022
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr "El suport per a aquesta funció està inhabilitat"
 
-#: src/nano.c:1044
+#: src/nano.c:1125
+msgid "No file name"
+msgstr "Cap nom de fitxer"
+
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "Voleu desar el búfer modificat (RESPONDRE «No» DESTRUIRÀ ELS CANVIS) ?"
 
-#: src/nano.c:1088
+#: src/nano.c:1189
 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:1114
+#: src/nano.c:1213
 #, 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:1182
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "S'ha rebut SIGHUP o SIGTERM\n"
 
-#: src/nano.c:1204
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
-msgstr "Utilitzeu «fg» per a tornar a nano.\n"
+msgstr "Empreu «fg» per a tornar al nano.\n"
 
-#: src/nano.c:1386
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "habilitat"
 
-#: src/nano.c:1387
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "inhabilitat"
 
-#: src/nano.c:1548 src/winio.c:1256
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr "L'ordre és desconeguda"
 
-#: src/nano.c:1674
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "XON ignorat, blah, blah"
 
-#: src/nano.c:1679
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF ignorat, blah, blah"
 
-#: src/nano.c:2209 src/rcfile.c:1100
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "La mida de tabulador demanada «%s» és invàlida"
 
-#: src/nano.c:2268 src/rcfile.c:1025
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "La mida de plenat demanada «%s» és invàlida"
 
+#: src/nano.c:2415
+#, 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"
+
 #. 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:1259
+#: src/prompt.c:1055
 msgid "Yy"
 msgstr "SsYy"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1056
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1057
 msgid "Aa"
 msgstr "TtAa"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1071
 msgid "Yes"
 msgstr "Sí"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1076
 msgid "All"
 msgstr "Totes"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1081
 msgid "No"
 msgstr "No"
 
-#: src/rcfile.c:130
+#: src/rcfile.c:137
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Error en %s en la línia %lu: "
 
-#: src/rcfile.c:185
+#: src/rcfile.c:196
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "L'argument «%s» té una «\"» no terminada"
 
-#: src/rcfile.c:212 src/rcfile.c:264 src/rcfile.c:711 src/rcfile.c:768
-#: src/rcfile.c:821
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 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:238 src/search.c:62
+#: src/rcfile.c:249 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "L'expreg «%s» és invàlida: %s"
 
-#: src/rcfile.c:258
+#: src/rcfile.c:269
 msgid "Missing syntax name"
 msgstr "Manca el nom de la sintaxi"
 
-#: src/rcfile.c:316
+#: src/rcfile.c:340
 msgid "The \"none\" syntax is reserved"
 msgstr "La sintaxi «none» és reservada"
 
-#: src/rcfile.c:323
+#: src/rcfile.c:347
 msgid "The \"default\" syntax must take no extensions"
 msgstr "La sintaxi «default» no admet extensions"
 
-#: src/rcfile.c:386 src/rcfile.c:483
+#: src/rcfile.c:433
 msgid "Missing key name"
 msgstr "Manca el nom de la clau"
 
-#: src/rcfile.c:398 src/rcfile.c:499
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
-msgstr "les assignacions de tecles han de començar amb «^», «M» o «F»"
+#: src/rcfile.c:442 src/rcfile.c:453
+msgid "Key name is too short"
+msgstr "El nom de la tecla és massa curt"
+
+#: src/rcfile.c:463
+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:407
-msgid "Must specify function to bind key to"
+#: src/rcfile.c:472
+msgid "Must specify a function to bind the key to"
 msgstr "Heu d'especificar una funció a la qual assignar la tecla"
 
-#: src/rcfile.c:418 src/rcfile.c:510
-msgid "Must specify menu to bind key to (or \"all\")"
-msgstr "Heu d'especificar un menú al qual assignar la tecla (o «all»)"
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:482
+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:426
+#: src/rcfile.c:489
 #, c-format
-msgid "Could not map name \"%s\" to a function"
-msgstr "No s'ha pogut assignar «%s» a una funció"
+msgid "Cannot map name \"%s\" to a function"
+msgstr "No es pot assignar el nom «%s» a una funció"
 
-#: src/rcfile.c:432 src/rcfile.c:517
+#: src/rcfile.c:496
 #, c-format
-msgid "Could not map name \"%s\" to a menu"
-msgstr "No s'ha pogut assignar el nom «%s» a un menú"
+msgid "Cannot map name \"%s\" to a menu"
+msgstr "No es pot assignar el nom «%s» a un menú"
 
-#: src/rcfile.c:454
+#: src/rcfile.c:528
 #, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
-msgstr "La combinació «%s» és una assignació il·legal"
+msgid "Function '%s' does not exist in menu '%s'"
+msgstr "La funció «%s» no existeix al menú «%s»"
 
-#: src/rcfile.c:625
+#: src/rcfile.c:543
+#, c-format
+msgid "Sorry, keystroke \"%s\" may not be rebound"
+msgstr "La combinació «%s» no es pot reassignar"
+
+#: src/rcfile.c:629
+#, c-format
+msgid "Error expanding %s: %s"
+msgstr "S'ha produït un error en expandir %s: %s"
+
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1741,135 +1870,193 @@ msgstr ""
 "«black», amb el prefix opcional «bright»\n"
 "per als colors de primer pla."
 
-#: src/rcfile.c:647
+#: src/rcfile.c:694
 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:652
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "Manca el nom del color"
 
-#: src/rcfile.c:672
-#, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr "El color de fons «%s» no pot ser brillant"
-
-#: src/rcfile.c:690 src/rcfile.c:809
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr "Manca la cadena d'expreg"
 
-#: src/rcfile.c:762
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "«start=» requereix el seu «end=» corresponent"
 
-#: src/rcfile.c:804
+#: src/rcfile.c:837
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr "El color de fons «%s» no pot ser brillant"
+
+#: src/rcfile.c:865
 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:874
+#: src/rcfile.c:921
+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:926
+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:990
+msgid "Missing linter command"
+msgstr "Manca l'ordre de l'analitzador"
+
+#: src/rcfile.c:1010
+msgid "Cannot add formatter without a syntax command"
+msgstr "No es pot afegir un formatador sense una ordre de sintaxi"
+
+#: src/rcfile.c:1015
+msgid "Missing formatter command"
+msgstr "Manca l'ordre del formatador"
+
+#: src/rcfile.c:1045
 #, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
-msgstr "Error fatal: no hi ha lletres asignades per a la funció «%s»"
+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:876
+#: src/rcfile.c:1047
+#, c-format
 msgid ""
-"Exiting.  Please use nano with the -I option if needed to adjust your nanorc "
-"settings\n"
+"If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
-"S'està sortint. Useu nano amb l'opció -I si heu d'ajustar les vostres "
-"preferències\n"
+"Si és necessari, empreu el nano amb l'opció -I  per a ajustar les vostres "
+"preferències.\n"
+
+#: src/rcfile.c:1108
+#, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "No s'ha trobat la sintaxi «%s» a estendre"
 
-#: src/rcfile.c:926 src/rcfile.c:935 src/rcfile.c:945
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, 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:951 src/rcfile.c:1128
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "La sintaxi «%s» no té ordres de colors"
 
-#: src/rcfile.c:966
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "No es pot entendre l'ordre «%s»"
 
-#: src/rcfile.c:972
-msgid "Missing flag"
-msgstr "Manca el senyalador"
+#: src/rcfile.c:1186
+msgid "Missing option"
+msgstr "Manca l'opció"
 
-#: src/rcfile.c:994
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "L'opció «%s» requereix un argument"
 
-#: src/rcfile.c:1012
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr "L'opció no és una cadena d'octets múltiples vàlida"
 
-#: src/rcfile.c:1038 src/rcfile.c:1066 src/rcfile.c:1075
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr "Es requereixen caràcters que no siguen d'espaiat"
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr "Es necessiten dos caràcters d'una columna"
 
-#: src/rcfile.c:1114
+#: src/rcfile.c:1339
 #, c-format
-msgid "Cannot unset flag \"%s\""
-msgstr "No es pot llevar el senyalador «%s»"
+msgid "Cannot unset option \"%s\""
+msgstr "No es pot desestablir l'opció «%s»"
 
-#: src/rcfile.c:1123
+#: src/rcfile.c:1345
 #, c-format
-msgid "Unknown flag \"%s\""
-msgstr "El senyalador «%s» és desconegut"
+msgid "Unknown option \"%s\""
+msgstr "L'opció «%s» és desconeguda"
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
-msgstr "No s'ha pogut trobar el directori d'usuari! Wah!"
+msgstr "No s'ha pogut trobar el directori d'usuari! Ai!"
+
+#: src/rcfile.c:1442
+#, c-format
+msgid ""
+"\n"
+"Press Enter to continue starting nano.\n"
+msgstr ""
+"\n"
+"Premeu Intro per a continuar carregant el nano.\n"
 
 #: src/search.c:96
 #, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "«%.*s%s» no trobat"
 
-#: src/search.c:205
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/search.c:184
+msgid " [Case Sensitive]"
+msgstr " [Maj/Min]"
+
+#: src/search.c:188
+msgid " [Regexp]"
+msgstr " [ExpReg]"
+
+#: src/search.c:192
+msgid " [Backwards]"
+msgstr " [Cap Enrere]"
+
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:197
 msgid " (to replace) in selection"
 msgstr " (a reemplaçar) dins de la selecció"
 
-#: src/search.c:207
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (a reemplaçar)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "Voleu reemplaçar aquesta instància?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:945
 msgid "Replace with"
 msgstr "Reemplaça amb"
 
-#: src/search.c:1004
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
 msgstr[0] "S'ha reemplaçat %lu coincidència"
 msgstr[1] "S'han reemplaçat %lu coincidències"
 
-#: src/search.c:1034
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr "Introduïu el número de línia, número de columna"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
 msgstr "El número de línia o columna és invàlid"
 
-#: src/search.c:1214
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "No és una clau"
 
-#: src/search.c:1281
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "No hi ha clau corresponent"
 
@@ -1881,221 +2068,322 @@ msgstr "Marca establida"
 msgid "Mark Unset"
 msgstr "Marca esborrada"
 
-#: src/text.c:443
+#: src/text.c:439
 msgid "Nothing in undo buffer!"
 msgstr "No hi ha res al búfer de desfer."
 
-#: src/text.c:455 src/text.c:593
+#: src/text.c:445 src/text.c:590
 #, c-format
-msgid "Internal error: can't match line %d.  Please save your work"
+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"
+"treball."
 
-#: src/text.c:466 src/text.c:603
+#: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
 msgstr "afegiment de text"
 
-#: src/text.c:475 src/text.c:613
+#: src/text.c:467 src/text.c:612
 msgid "text delete"
 msgstr "supressió de text"
 
-#: src/text.c:489 src/text.c:628
-msgid "line wrap"
-msgstr "ajustament de línies llargues"
-
-#: src/text.c:503 src/text.c:636
+#: src/text.c:491 src/text.c:641
 msgid "line join"
 msgstr "unió de línia"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:505 src/text.c:657
 msgid "text cut"
 msgstr "tall de text"
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:510 src/text.c:661
 msgid "text uncut"
 msgstr "enganxada de text"
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:515 src/text.c:623
 msgid "line break"
 msgstr "trencat de línia"
 
-#: src/text.c:532 src/text.c:665
+#: src/text.c:528 src/text.c:672
 msgid "text insert"
 msgstr "inserció de text"
 
-#: src/text.c:550 src/text.c:659
+#: src/text.c:549 src/text.c:665
 msgid "text replace"
 msgstr "reemplaçament de text"
 
-#: src/text.c:557 src/text.c:671
-msgid "Internal error: unknown type.  Please save your work"
-msgstr "Error intern: tipus desconegut. Deseu el vostre treball"
+#: src/text.c:556 src/text.c:679 src/text.c:983
+msgid "Internal error: unknown type.  Please save your work."
+msgstr "Error intern: tipus desconegut. Deseu el vostre treball."
 
-#: src/text.c:563
+#: src/text.c:561
 #, c-format
 msgid "Undid action (%s)"
 msgstr "S'ha desfet l'acció (%s)"
 
-#: src/text.c:578
+#: src/text.c:580
 msgid "Nothing to re-do!"
 msgstr "No hi ha res a refer."
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
-msgstr ""
-"Error intern: la configuració del refer ha fallat. Deseu el vostre treball"
+#: src/text.c:584
+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:676
+#: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr "S'ha refet l'acció (%s)"
 
-#: src/text.c:766
-msgid "Could not pipe"
-msgstr "No s'ha pogut canalitzar"
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
+msgid "Could not create pipe"
+msgstr "No s'ha pogut crear un conducte"
 
-#: src/text.c:793 src/text.c:2636 src/text.c:2788
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "No s'ha pogut iniciar un altre procés"
 
-#: src/text.c:941
-msgid "Internal error: can't setup uncut.  Please save your work."
+#: src/text.c:969
+msgid "Internal error: cannot set up uncut.  Please save your work."
 msgstr ""
 "Error intern: no es pot configurar l'enganxada. Deseu el vostre treball."
 
-#: src/text.c:950
-msgid "Internal error: unknown type.  Please save your work."
-msgstr "Error intern: tipus desconegut. Deseu el vostre treball."
-
-#: src/text.c:1870
+#: src/text.c:1806
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "El marcador de cita %s és erroni: %s"
 
-#: src/text.c:2267
+#: src/text.c:2207
 msgid "Can now UnJustify!"
 msgstr "Ara podeu desjustificar!"
 
-#: src/text.c:2462
+#: src/text.c:2404
 msgid "Edit a replacement"
 msgstr "Edita un reemplaçament"
 
-#: src/text.c:2548
-msgid "Could not create pipe"
-msgstr "No s'ha pogut crear un conducte"
-
-#: src/text.c:2550
+#: src/text.c:2492
 msgid "Creating misspelled word list, please wait..."
 msgstr "S'està creant una llista de paraules incorrectes, espereu..."
 
-#: src/text.c:2642
+#: src/text.c:2584 src/text.c:3022
 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:2693
+#: src/text.c:2635
 msgid "Error invoking \"spell\""
 msgstr "S'ha produït un error en iniciar «spell»"
 
-#: src/text.c:2696
+#: src/text.c:2638
 msgid "Error invoking \"sort -f\""
 msgstr "S'ha produït un error en iniciar «sort -f»"
 
-#: src/text.c:2699
+#: src/text.c:2641
 msgid "Error invoking \"uniq\""
 msgstr "S'ha produït un error en iniciar «uniq»"
 
-#: src/text.c:2756 src/text.c:2965
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "Revisió d'ortografia finalitzada"
 
-#: src/text.c:2815
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "S'ha produït un error en iniciar executar «%s»"
 
-#: src/text.c:2960
+#: src/text.c:2885
+msgid "Invoking spell checker, please wait"
+msgstr "S'està invocant el corrector ortogràfic, espereu"
+
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "La comprovació d'ortografia ha fallat: %s"
 
-#: src/text.c:2962
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "La comprovació d'ortografia ha fallat: %s: %s"
 
-#: src/text.c:3030
+#: src/text.c:2937
+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:2947
+msgid "Save modified buffer before linting?"
+msgstr "Voleu desar el búfer abans d'analitzar-ho?"
+
+#: src/text.c:2969
+msgid "Invoking linter, please wait"
+msgstr "S'esta invocant l'analitzador, espereu"
+
+#: src/text.c:3125
+#, 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:3159
+#, 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:3205
+msgid "At last message"
+msgstr "A l'últim missatge"
+
+#: src/text.c:3210
+msgid "At first message"
+msgstr "Al primer missatge"
+
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr "Error: no s'ha definit un formatador"
+
+#: src/text.c:3275
+msgid "Finished"
+msgstr "Finalitzat"
+
+#: src/text.c:3280
+msgid "Invoking formatter, please wait"
+msgstr "S'esta invocant el formatador, espereu"
+
+#: src/text.c:3360
+msgid "Finished formatting"
+msgstr "Ha finalitzat el format"
+
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sParaules: %lu  Línies: %ld  Caràcters: %lu"
 
-#: src/text.c:3031
+#: src/text.c:3439
 msgid "In Selection:  "
 msgstr "A la selecció:  "
 
-#: src/utils.c:405 src/utils.c:417
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3453
+msgid "Verbatim Input"
+msgstr "Entrada textual"
+
+#: src/utils.c:410 src/utils.c:422
 msgid "nano is out of memory!"
 msgstr "nano s'ha quedat sense memòria!"
 
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
-#: src/winio.c:1557
+#: src/winio.c:1583
 msgid "Unicode Input"
 msgstr "Entrada d'Unicode"
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2142 src/winio.c:2146
 msgid "Modified"
 msgstr "Modificat"
 
-#: src/winio.c:2150
+#: src/winio.c:2143
 msgid "View"
 msgstr "Visualitza"
 
-#: src/winio.c:2164
+#: src/winio.c:2157
 msgid "DIR:"
 msgstr "DIR:"
 
-#: src/winio.c:2171
+#: src/winio.c:2164
 msgid "File:"
 msgstr "Fitxer:"
 
-#: src/winio.c:3360
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2261
+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/winio.c:3377
 #, 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:3492
+#: src/winio.c:3507
 msgid "The nano text editor"
 msgstr "L'editor de text GNU nano"
 
-#: src/winio.c:3493
+#: src/winio.c:3508
 msgid "version"
 msgstr "versió"
 
-#: src/winio.c:3494
+#: src/winio.c:3509
 msgid "Brought to you by:"
 msgstr "Per cortesia de:"
 
-#: src/winio.c:3495
+#: src/winio.c:3510
 msgid "Special thanks to:"
 msgstr "Agraïments especials per a:"
 
-#: src/winio.c:3496
+#: src/winio.c:3511
 msgid "The Free Software Foundation"
 msgstr "La Fundació per al Software Lliure (FSF)"
 
-#: src/winio.c:3497
+#: src/winio.c:3512
+msgid "the many translators and the TP"
+msgstr "els molts traductors i el TP"
+
+#: src/winio.c:3513
 msgid "For ncurses:"
 msgstr "Per ncurses:"
 
-#: src/winio.c:3498
+#: src/winio.c:3514
 msgid "and anyone else we forgot..."
 msgstr "i per qualsevol dels qui ens hem oblidat esmentar..."
 
-#: src/winio.c:3499
+#: src/winio.c:3515
 msgid "Thank you for using nano!"
 msgstr "Gràcies per fer servir nano!"
 
+#~ msgid "Internal error: can't match line %ld.  Please save your work."
+#~ msgstr ""
+#~ "Error intern: no hi ha coincidència per a la línia %ld. Deseu el vostre "
+#~ "treball."
+
+#~ msgid "line wrap"
+#~ msgstr "ajustament de línies llargues"
+
+#~ msgid "Insert File"
+#~ msgstr "Insereix un fitxer"
+
+#~ msgid "Go to previous screen"
+#~ msgstr "Vés a la pàgina anterior"
+
+#~ msgid "Find Other Bracket"
+#~ msgstr "Troba la clau corresponent"
+
+#~ msgid "Long line wrapping"
+#~ msgstr "Ajustament de línies llargues"
+
+#~ msgid "Soft line wrapping"
+#~ msgstr "Ajustament de línies suau"
+
+#~ msgid "Allow generic undo [EXPERIMENTAL]"
+#~ msgstr "Permet el desfer genèric [EXPERIMENTAL]"
+
+#~ msgid "(ignored, for Pico compatibility)"
+#~ msgstr "(ignorades, per a compatibilitat amb Pico)"
+
+#~ msgid "Must specify menu to bind key to (or \"all\")"
+#~ msgstr "Heu d'especificar un menú al qual assignar la tecla (o «all»)"
+
+#~ msgid "Missing flag"
+#~ msgstr "Manca el senyalador"
+
+#~ msgid "Internal error: unknown type.  Please save your work"
+#~ msgstr "Error intern: tipus desconegut. Deseu el vostre treball"
+
+#~ msgid "Internal error: Redo setup failed.  Please save your work"
+#~ msgstr ""
+#~ "Error intern: la configuració del refer ha fallat. Deseu el vostre treball"
+
+#~ msgid "Could not pipe"
+#~ msgstr "No s'ha pogut canalitzar"
+
 #~ msgid "line split"
 #~ msgstr "trencament de línia"
 
@@ -2175,9 +2463,6 @@ msgstr "Gràcies per fer servir nano!"
 #~ msgid "Duplicate syntax name %s"
 #~ msgstr "El nom de la sintaxi %s és duplicat"
 
-#~ msgid "Could not create temp file: %s"
-#~ msgstr "No s'ha pogut crear un fitxer temporal: %s"
-
 #~ msgid "Find other bracket"
 #~ msgstr "Troba la clau corresponent"
 
@@ -2247,8 +2532,8 @@ msgstr "Gràcies per fer servir nano!"
 
 #~ msgid "Could not set owner %d/group %d on backup %s: %s"
 #~ msgstr ""
-#~ "No s'ha pogut establir el propietari %d/grup %d en la còpia de seguretat %"
-#~ "s: %s"
+#~ "No s'ha pogut establir el propietari %d/grup %d en la còpia de seguretat "
+#~ "%s: %s"
 
 #~ msgid "Could not set access/modification time on backup %s: %s"
 #~ msgstr ""
diff --git a/po/cs.gmo b/po/cs.gmo
index 5ae0be4..79141cd 100644
--- a/po/cs.gmo
+++ b/po/cs.gmo
diff --git a/po/cs.po b/po/cs.po
index 81f7b5b..ed6fd27 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,116 +1,141 @@
-# Czech translation for nano
+# Czech translation for nano.
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the nano package.
 #
-# Pavel Fric <pavelfric@seznam.cz>, 2010.
 # Václav Haisman <V.Haisman@sh.cvut.cz>, 2000, 2001.
+# Pavel Fric <pavelfric@seznam.cz>, 2010, 2012, 2013, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 2.2.4pre2\n"
+"Project-Id-Version: nano 2.3.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-22 06:34-0500\n"
-"PO-Revision-Date: 2010-10-19 22:11+0100\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
+"PO-Revision-Date: 2014-07-19 16:10+0200\n"
 "Last-Translator: Pavel Fric <pavelfric@seznam.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Lokalize 1.0\n"
+"X-Generator: Lokalize 1.5\n"
 
-#: src/browser.c:220
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:203
 msgid "Go To Directory"
 msgstr "Jít do adresáře"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:860 src/files.c:2048
-#: src/nano.c:1060 src/search.c:220 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Zrušeno"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:246 src/browser.c:293
 #, c-format
 msgid "Can't go outside of %s in restricted mode"
 msgstr "V omezeném režimu nelze jít mimo %s"
 
-#: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:722
-#: src/files.c:731 src/files.c:1540 src/files.c:1659 src/files.c:1711
-#: src/files.c:1732 src/files.c:1855 src/files.c:2691 src/rcfile.c:568
-#: src/rcfile.c:1204
+#: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
+#: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
+#: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Chyba při čtení: %s: %s"
 
-#: src/browser.c:303
+#: src/browser.c:283
 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:665 src/browser.c:674
+#: src/browser.c:626 src/browser.c:635
 msgid "(dir)"
 msgstr "(adresář)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:632
 msgid "(parent dir)"
 msgstr "(rodičovský adresář)"
 
-#: src/browser.c:801 src/search.c:185
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "Hledat"
 
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:805 src/search.c:189
-msgid " [Case Sensitive]"
-msgstr " [Rozlišovat velikost písmen]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:811 src/search.c:195
-msgid " [Regexp]"
-msgstr " [regulární výraz]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:817 src/search.c:201
-msgid " [Backwards]"
-msgstr " [Zpět]"
-
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "Hledání dokončeno"
 
-#: src/browser.c:1006 src/browser.c:1039 src/search.c:514 src/search.c:517
-#: src/search.c:574 src/search.c:577
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "Toto je jediný výskyt"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr "Žádný současný vzor hledání"
 
-#: src/files.c:125
+#: src/files.c:139
+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:145
+#, 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:165 src/files.c:175 src/files.c:212 src/files.c:222
+#, c-format
+msgid "Error writing lock file %s: %s"
+msgstr "Chyba při zápisu souboru lock %s: %s"
+
+#: src/files.c:237
+#, c-format
+msgid "Error deleting lock file %s: %s"
+msgstr "Chyba při mazání souboru lock %s: %s"
+
+#: src/files.c:272
+#, c-format
+msgid "Error opening lock file %s: %s"
+msgstr "Chyba při otevírání souboru lock %s: %s"
+
+#: src/files.c:282
+#, 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:297
+#, c-format
+msgid "File %s is being edited (by %s with %s, PID %d); continue?"
+msgstr ""
+
+#: src/files.c:308
+#, c-format
+msgid "Error writing lock file: Directory '%s' doesn't exist"
+msgstr "Chyba při zápisu souboru lock: Adresář '%s' neexistuje"
+
+#: src/files.c:339
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Nelze vložit soubor z vně %s"
 
-#: src/files.c:234
+#: src/files.c:467
 msgid "No more open file buffers"
 msgstr "Žádné další otevřené souborové vyrovnávací paměti"
 
-#: src/files.c:250
+#: src/files.c:484
 #, c-format
 msgid "Switched to %s"
 msgstr "Přepnuto na %s"
 
-#: src/files.c:251 src/global.c:469 src/winio.c:2168
+#: src/files.c:485 src/global.c:953 src/winio.c:2161
 msgid "New Buffer"
 msgstr "Nová vyrovnávací paměť"
 
-#: src/files.c:633
+#: src/files.c:874
 #, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
@@ -118,7 +143,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:638
+#: src/files.c:879
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
@@ -136,7 +161,7 @@ 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:644
+#: src/files.c:885
 #, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
@@ -144,7 +169,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:648
+#: src/files.c:889
 #, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
@@ -160,7 +185,7 @@ 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:654
+#: src/files.c:895
 #, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
@@ -168,7 +193,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:658
+#: src/files.c:899
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
@@ -184,7 +209,7 @@ 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:664
+#: src/files.c:905
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
@@ -192,7 +217,7 @@ msgstr[0] "Přečten jeden řádek"
 msgstr[1] "Přečteny %lu řádky"
 msgstr[2] "Přečteno %lu řádků"
 
-#: src/files.c:667
+#: src/files.c:908
 #, c-format
 msgid "Read %lu line ( Warning: No write permission)"
 msgid_plural "Read %lu lines (Warning: No write permission)"
@@ -200,87 +225,95 @@ 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:700 src/files.c:736
+#: src/files.c:943 src/files.c:980
 msgid "Reading File"
 msgstr "Čte se soubor"
 
-#: src/files.c:706
+#: src/files.c:950
 msgid "New File"
 msgstr "Nový soubor"
 
-#: src/files.c:709
+#: src/files.c:953
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" nenalezen"
 
-#: src/files.c:717 src/rcfile.c:559 src/rcfile.c:1154 src/rcfile.c:1195
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "„%s“ je adresář"
 
-#: src/files.c:718 src/rcfile.c:560 src/rcfile.c:1155 src/rcfile.c:1196
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" je soubor zařízení"
 
-#: src/files.c:817
+#: src/files.c:1060
 #, 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:819
+#: src/files.c:1062
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Příkaz k provedení [z %s] "
 
-#: src/files.c:825
+#: src/files.c:1069
 #, 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:827
+#: src/files.c:1071
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Soubor k vložení [z %s] "
 
-#: src/files.c:1077
+#: src/files.c:1320
 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:1486
+#: src/files.c:1622
+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:1746
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Nelze zapsat vně %s"
 
-#: src/files.c:1501
+#: src/files.c:1761
 msgid "Cannot prepend or append to a symlink with --nofollow set"
 msgstr ""
-"Nelze připojit dopředu nebo dozadu k symbolickému odkazu, když je nastaveno "
-"--nofollow"
+"Nelze připojit na začátek nebo připojit na konec k symbolickému odkazu, když "
+"je nastaveno --nofollow"
 
-#: src/files.c:1581 src/files.c:1603 src/files.c:1621 src/files.c:1632
-#: src/files.c:1640 src/files.c:1667
+#: src/files.c:1843 src/files.c:1868 src/files.c:1886 src/files.c:1899
+#: src/files.c:1910 src/files.c:1939
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Chyba při zápisu zálohovacího souboru %s: %s"
 
-#: src/files.c:1582 src/nano.c:701
+#: src/files.c:1844 src/nano.c:719
 msgid "Too many backup files?"
 msgstr "Příliš mnoho zálohovacích souborů?"
 
-#: src/files.c:1687 src/files.c:1744 src/files.c:1763 src/files.c:1775
-#: src/files.c:1799 src/files.c:1817 src/files.c:1827 src/files.c:1863
-#: src/files.c:1868 src/files.c:2764 src/files.c:2773
+#: src/files.c:1959 src/files.c:2016 src/files.c:2035 src/files.c:2047
+#: src/files.c:2071 src/files.c:2089 src/files.c:2099 src/files.c:2135
+#: src/files.c:2140 src/files.c:3101 src/files.c:3110 src/files.c:3133
+#: src/files.c:3145
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Chyba při zápisu %s: %s"
 
-#: src/files.c:1721 src/text.c:2929 src/text.c:2941
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Chyba při zápisu dočasného souboru s: %s"
 
-#: src/files.c:1900
+#: src/files.c:2173
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
@@ -288,706 +321,770 @@ msgstr[0] "Zapsán jeden řádek"
 msgstr[1] "Zapsány %lu řádky"
 msgstr[2] "Zapsáno %lu řádků"
 
-#: src/files.c:2004
+#: src/files.c:2278
 msgid " [DOS Format]"
 msgstr " [Formát DOS]"
 
-#: src/files.c:2005
+#: src/files.c:2279
 msgid " [Mac Format]"
 msgstr " [Formát Mac]"
 
-#: src/files.c:2007
+#: src/files.c:2281
 msgid " [Backup]"
 msgstr " [Záloha]"
 
-#: src/files.c:2015
+#: src/files.c:2289
 msgid "Prepend Selection to File"
-msgstr "Připojit výběr k souboru dopředu"
+msgstr "Připojit výběr na začátek souboru"
 
-#: src/files.c:2016
+#: src/files.c:2290
 msgid "Append Selection to File"
-msgstr "Připojit výběr k souboru"
+msgstr "Připojit výběr na konec souboru"
 
-#: src/files.c:2017
+#: src/files.c:2291
 msgid "Write Selection to File"
 msgstr "Zapsat výběr do souboru"
 
-#: src/files.c:2020
+#: src/files.c:2294
 msgid "File Name to Prepend to"
-msgstr "Název souboru k připojení dopředu"
+msgstr "Název souboru, na jehož začátek provést připojení"
 
-#: src/files.c:2021
+#: src/files.c:2295
 msgid "File Name to Append to"
-msgstr "Název souboru k připojení"
+msgstr "Název souboru, na jehož konec provést připojení"
 
-#: src/files.c:2022
+#: src/files.c:2296
 msgid "File Name to Write"
 msgstr "Název souboru k zapsání"
 
-#: src/files.c:2153
+#: src/files.c:2427
 msgid "File exists, OVERWRITE ? "
 msgstr "Soubor existuje. PŘEPSAT?"
 
-#: src/files.c:2162
+#: src/files.c:2436
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "Uložit soubor pod JINÝM NÁZVEM? "
 
-#: src/files.c:2173
+#: src/files.c:2450
 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:2611
+#: src/files.c:2882
 msgid "(more)"
 msgstr "(více)"
 
-#: src/files.c:2694 src/rcfile.c:1220
+#: src/files.c:2974
 #, c-format
 msgid ""
 "\n"
-"Press Enter to continue starting nano.\n"
+"Press Enter to continue\n"
 msgstr ""
 "\n"
-"Stiskněte klávesu Enter pro pokračování ve spouštění programu nano.\n"
-
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:415 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Zrušit"
+"Stiskněte klávesu Enter pro pokračování \n"
 
-#: src/global.c:416
-msgid "Replace"
-msgstr "Nahradit"
+#: src/files.c:2989
+#, c-format
+msgid ""
+"Unable to create directory %s: %s\n"
+"It is required for saving/loading search history or cursor positions.\n"
+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/global.c:417
-msgid "No Replace"
-msgstr "Žádné nahrazení"
+#: src/files.c:2995
+#, 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 ""
+"Cesta %s není adresářem, a je třeba, aby byla.\n"
+"Nano nebude schopen nahrát nebo uložit historii hledání nebo poloh "
+"ukazatele.\n"
 
-#: src/global.c:420
-msgid "Case Sens"
-msgstr "VELKÁ PÍSMENA/malá písmena"
+#: src/files.c:3012
+#, 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 ""
+"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/global.c:421
-msgid "Backwards"
-msgstr "Zpět"
+#: src/files.c:3016
+#, 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 ""
+"Zjištěn zděděný soubor s historií nano (%s). Byl přesunut\n"
+"do upřednostňovaného umístění (%s)\n"
+"(viz FAQ pro nano k této změně)"
 
-#: src/global.c:425
-msgid "Regexp"
-msgstr "Regulární výraz"
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
+#: src/global.c:477
+msgid "Exit"
+msgstr "Ukončit"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:451
-msgid "PrevHstory"
-msgstr "Předchozí historie"
+#: src/global.c:478
+msgid "Close"
+msgstr "Zavřít"
 
-#: src/global.c:452
-msgid "NextHstory"
-msgstr "Další historie"
+#: src/global.c:479
+msgid "Uncut Text"
+msgstr "Vložit text"
 
-#: src/global.c:453
-msgid "Go To Text"
-msgstr "Jít na text"
+#: src/global.c:481
+msgid "Unjustify"
+msgstr "Zrušit zarovnání"
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:455
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:485
 msgid "WhereIs Next"
-msgstr "Kde je další"
-
-#: src/global.c:457
-msgid "First File"
-msgstr "První soubor"
-
-#: src/global.c:458
-msgid "Last File"
-msgstr "Poslední soubor"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:460
-msgid "To Files"
-msgstr "Jít na soubory"
-
-#: src/global.c:462
-msgid "DOS Format"
-msgstr "Formát DOS"
-
-#: src/global.c:463
-msgid "Mac Format"
-msgstr "Formát Mac"
-
-#: src/global.c:464
-msgid "Append"
-msgstr "Připojit"
-
-#: src/global.c:465
-msgid "Prepend"
-msgstr "Připojit dopředu"
-
-#: src/global.c:466
-msgid "Backup File"
-msgstr "Soubor se zálohou"
+msgstr "Hledat další"
 
-#: src/global.c:467
-msgid "Execute Command"
-msgstr "Provést příkaz"
-
-#: src/global.c:471
-msgid "Go To Dir"
-msgstr "Jít do adresáře"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:480
-msgid "Get Help"
-msgstr "Získat nápovědu"
-
-#: src/global.c:481
-msgid "Exit"
-msgstr "Ukončit"
-
-#: src/global.c:482
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:492
 msgid "Where Is"
-msgstr "Kde je"
-
-#: src/global.c:483
-msgid "Prev Page"
-msgstr "Předchozí strana"
-
-#: src/global.c:484
-msgid "Next Page"
-msgstr "Další strana"
+msgstr "Hledat"
 
-#: src/global.c:485
-msgid "First Line"
-msgstr "První řádek"
+#: src/global.c:493
+msgid "Replace"
+msgstr "Nahradit"
 
-#: src/global.c:486
-msgid "Last Line"
-msgstr "Poslední řádek"
+#: src/global.c:494
+msgid "Go To Line"
+msgstr "Přejít na řádek"
 
-#: src/global.c:487
-msgid "Suspend"
-msgstr "Odložit (na pozadí)"
+#: src/global.c:495
+msgid "Prev Line"
+msgstr "Předchozí řádek"
 
-#: src/global.c:489
-msgid "Beg of Par"
-msgstr "Začátek odstavce"
+#: src/global.c:496
+msgid "Next Line"
+msgstr "Další řádek"
 
-#: src/global.c:490
-msgid "End of Par"
-msgstr "Konec odstavce"
+#: src/global.c:497
+msgid "Read File"
+msgstr "Otevřít soubor"
 
-#: src/global.c:491
+#: src/global.c:499
 msgid "FullJstify"
 msgstr "Plné zarovnání"
 
-#: src/global.c:493
+#: src/global.c:501
 msgid "Refresh"
 msgstr "Obnovit"
 
-#: src/global.c:495
-msgid "Insert File"
-msgstr "Vložit soubor"
-
-#: src/global.c:497
-msgid "Go To Line"
-msgstr "Přejít na řádek"
-
-#: src/global.c:500
+#. 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:507
 msgid "Justify the current paragraph"
 msgstr "Zarovnat nynější odstavec"
 
-#. 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:505
+#: src/global.c:509
 msgid "Cancel the current function"
 msgstr "Zrušit současnou funkci"
 
-#: src/global.c:506
+#: src/global.c:510
 msgid "Display this help text"
 msgstr "Zobrazit tento text s nápovědou"
 
-#: src/global.c:509
+#: src/global.c:513
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Zavřít nynější souborovou vyrovnávací paměť/Ukončit nano"
 
-#: src/global.c:511
+#: src/global.c:515
 msgid "Exit from nano"
 msgstr "Ukončit nano"
 
-#: src/global.c:515
+#: src/global.c:519
 msgid "Write the current file to disk"
 msgstr "Zapsat nynější soubor na disk"
 
-#: src/global.c:517
+#: src/global.c:521
 msgid "Insert another file into the current one"
 msgstr "Vložit další soubor do nynějšího"
 
-#: src/global.c:519
+#: src/global.c:523
 msgid "Search for a string or a regular expression"
 msgstr "Hledat řetězec nebo regulární výraz"
 
-#: src/global.c:520
-msgid "Go to previous screen"
-msgstr "Jít na předchozí obrazovku"
+#: src/global.c:526
+msgid "Search for a string"
+msgstr "Hledat řetězec"
 
-#: src/global.c:521
-msgid "Go to next screen"
-msgstr "Jít na další obrazovku"
+#: src/global.c:528
+msgid "Go one screenful up"
+msgstr "Jít o jednu obrazovku nahoru"
 
-#: src/global.c:523
+#: src/global.c:529
+msgid "Go one screenful down"
+msgstr "Jít o jednu obrazovku dolů"
+
+#: src/global.c:531
 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:525
+#: src/global.c:533
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Vložit ze schránky do nynějšího řádku"
 
-#: src/global.c:527
+#: src/global.c:534
 msgid "Display the position of the cursor"
-msgstr "Zobrazit polohu ukazovátka"
+msgstr "Zobrazit polohu ukazatele"
 
-#: src/global.c:529
+#: src/global.c:536
 msgid "Invoke the spell checker, if available"
-msgstr "Vyvolat ověření pravopisu (je-li dostupné)"
+msgstr "Vyvolat ověřování pravopisu (je-li dostupné)"
 
-#: src/global.c:531
+#: src/global.c:538
 msgid "Replace a string or a regular expression"
 msgstr "Nahradit řetězec nebo regulární výraz"
 
-#: src/global.c:532
+#: src/global.c:539
 msgid "Go to line and column number"
 msgstr "Jít na určitý řádek a sloupec"
 
-#: src/global.c:534
-msgid "Mark text at the cursor position"
-msgstr "Označit text v poloze ukazovátka"
+#: src/global.c:541
+msgid "Mark text starting from the cursor position"
+msgstr "Označit text počínaje od polohy ukazatele"
 
-#: src/global.c:535
-msgid "Repeat last search"
+#: src/global.c:542
+msgid "Repeat the last search"
 msgstr "Opakovat poslední hledání"
 
-#: src/global.c:537
+#: src/global.c:544
 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:538
+#: src/global.c:545
 msgid "Indent the current line"
 msgstr "Odsadit nynější řádek"
 
-#: src/global.c:539
+#: src/global.c:546
 msgid "Unindent the current line"
 msgstr "Zrušit odsazení nynějšího řádku"
 
-#: src/global.c:540
+#: src/global.c:547
 msgid "Undo the last operation"
 msgstr "Zrušit poslední operaci"
 
-#: src/global.c:541
+#: src/global.c:548
 msgid "Redo the last undone operation"
 msgstr "Zopakovat poslední zrušenou operaci"
 
-#: src/global.c:543
+#: src/global.c:550
 msgid "Go forward one character"
 msgstr "Jít o jeden znak vpřed"
 
-#: src/global.c:544
+#: src/global.c:551
 msgid "Go back one character"
 msgstr "Jít o jeden znak zpět"
 
-#: src/global.c:546
+#: src/global.c:553
 msgid "Go forward one word"
 msgstr "Jít o jedno slovo vpřed"
 
-#: src/global.c:547
+#: src/global.c:554
 msgid "Go back one word"
 msgstr "Jít o jedno slovo zpět"
 
-#: src/global.c:549
+#: src/global.c:556
 msgid "Go to previous line"
 msgstr "Jít na předchozí řádek"
 
-#: src/global.c:550
+#: src/global.c:557
 msgid "Go to next line"
 msgstr "Jít na další řádek"
 
-#: src/global.c:551
+#: src/global.c:558
 msgid "Go to beginning of current line"
 msgstr "Jít na začátek nynějšího řádku"
 
-#: src/global.c:552
+#: src/global.c:559
 msgid "Go to end of current line"
 msgstr "Jít na konec nynějšího řádku"
 
-#: src/global.c:555
+#: src/global.c:562
 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:557
+#: src/global.c:564
 msgid "Go just beyond end of paragraph; then of next paragraph"
-msgstr "Jít za koneck odstavce; potom dalšího odstavce"
+msgstr "Jít za konec odstavce; potom dalšího odstavce"
 
-#: src/global.c:560
+#: src/global.c:566
 msgid "Go to the first line of the file"
 msgstr "Jít na první řádek souboru"
 
-#: src/global.c:562
+#: src/global.c:567
 msgid "Go to the last line of the file"
 msgstr "Jít na poslední řádek souboru"
 
-#: src/global.c:564
+#: src/global.c:569
 msgid "Go to the matching bracket"
 msgstr "Jít na odpovídající závorky"
 
-#: src/global.c:566
+#: src/global.c:571
 msgid "Scroll up one line without scrolling the cursor"
-msgstr "Posunout obraz o jeden řádek nahoru, aniž by se pohnulo ukazovátko"
+msgstr "Posunout obraz o jeden řádek nahoru, aniž by se pohnul ukazatel"
 
-#: src/global.c:568
+#: src/global.c:573
 msgid "Scroll down one line without scrolling the cursor"
-msgstr "Posunout obraz o jeden řádek dolů, aniž by se pohnulo ukazovátko"
+msgstr "Posunout obraz o jeden řádek dolů, aniž by se pohnul ukazatel"
 
-#: src/global.c:572
+#: src/global.c:576
 msgid "Switch to the previous file buffer"
 msgstr "Přepnout na předchozí souborovou vyrovnávací paměť"
 
-#: src/global.c:574
+#: src/global.c:577
 msgid "Switch to the next file buffer"
 msgstr "Přepnout na další souborovou vyrovnávací paměť"
 
-#: src/global.c:577
+#: src/global.c:579
 msgid "Insert the next keystroke verbatim"
-msgstr "Vložit další znak přímo (doslovně, nevykládaný)"
+msgstr "Vložit další znak přímo (takový jaký je)"
 
-#: src/global.c:579
+#: src/global.c:580
 msgid "Insert a tab at the cursor position"
-msgstr "Vložit zarážku v poloze ukazovátka"
+msgstr "Vložit zarážku v poloze ukazatele"
 
 #: src/global.c:581
 msgid "Insert a newline at the cursor position"
-msgstr "Vložit zalomení řádku v poloze ukazovátka"
+msgstr "Vložit zalomení řádku v poloze ukazatele"
 
-#: src/global.c:583
+#: src/global.c:582
 msgid "Delete the character under the cursor"
-msgstr "Smazat znak v poloze ukazovátka"
+msgstr "Smazat znak v poloze ukazatele"
 
-#: src/global.c:585
+#: src/global.c:584
 msgid "Delete the character to the left of the cursor"
-msgstr "Smazat znak nalevo od polohy ukazovátka"
+msgstr "Smazat znak nalevo od polohy ukazatele"
 
-#: src/global.c:588
+#: src/global.c:587
 msgid "Cut from the cursor position to the end of the file"
-msgstr "Vyjmout od polohy ukazovátka po konec souboru"
+msgstr "Vyjmout od polohy ukazatele po konec souboru"
 
-#: src/global.c:591
+#: src/global.c:590
 msgid "Justify the entire file"
 msgstr "Zarovnat celý soubor"
 
-#: src/global.c:595
+#: src/global.c:594
 msgid "Count the number of words, lines, and characters"
 msgstr "Spočítat počet slov, řádků a znaků"
 
-#: src/global.c:598
+#: src/global.c:597
 msgid "Refresh (redraw) the current screen"
 msgstr "Obnovit (překreslit) současnou obrazovku"
 
-#: src/global.c:600
+#: src/global.c:599
 msgid "Suspend the editor (if suspend is enabled)"
-msgstr "Odložit editor na pozadí (je-li povolen \"suspend\")"
+msgstr ""
+"Odložit editor na pozadí (máte-li oprávnění, je-li povolen \"suspend\")"
 
-#: src/global.c:603
+#: src/global.c:602
 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:605
+#: src/global.c:604
 msgid "Reverse the direction of the search"
 msgstr "Obrátit směr hledání"
 
-#: src/global.c:609
+#: src/global.c:608
 msgid "Toggle the use of regular expressions"
 msgstr "Přepnout používání regulárních výrazů"
 
-#: src/global.c:613
+#: src/global.c:612
 msgid "Recall the previous search/replace string"
-msgstr "Vybavit předchozí řetězec hledání/nahrazení"
+msgstr "Vyvolat předchozí řetězec hledání/nahrazení"
 
-#: src/global.c:615
+#: src/global.c:614
 msgid "Recall the next search/replace string"
-msgstr "Vybavit další řetězec hledání/nahrazení"
+msgstr "Vyvolat další řetězec hledání/nahrazení"
 
-#: src/global.c:618
+#: src/global.c:617
 msgid "Go to file browser"
 msgstr "Jít do prohlížeče souborů"
 
-#: src/global.c:621
+#: src/global.c:620
 msgid "Toggle the use of DOS format"
 msgstr "Přepnout zápis ve formátu DOS"
 
-#: src/global.c:622
+#: src/global.c:621
 msgid "Toggle the use of Mac format"
 msgstr "Přepnout zápis ve formátu Mac"
 
-#: src/global.c:624
+#: src/global.c:622
 msgid "Toggle appending"
-msgstr "Přepnout připojování"
+msgstr "Přepnout připojování na konec souboru"
 
-#: src/global.c:625
+#: src/global.c:623
 msgid "Toggle prepending"
-msgstr "Přepnout připojování dopředu"
+msgstr "Přepnout připojování na začátek souboru"
 
-#: src/global.c:628
+#: src/global.c:624
 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:629
+#: src/global.c:625
 msgid "Execute external command"
 msgstr "Provést vnější příkaz"
 
-#: src/global.c:633
+#: src/global.c:628
 msgid "Toggle the use of a new buffer"
 msgstr "Přepnout používání nové vyrovnávací paměti"
 
-#: src/global.c:636
+#: src/global.c:631
 msgid "Exit from the file browser"
 msgstr "Ukončit prohlížeč souborů"
 
-#: src/global.c:638
+#: src/global.c:632
 msgid "Go to the first file in the list"
 msgstr "Jít na první řádek v seznamu"
 
-#: src/global.c:640
+#: src/global.c:633
 msgid "Go to the last file in the list"
 msgstr "Jít na poslední řádek v seznamu"
 
-#: src/global.c:641
-msgid "Go to the next file in the list"
-msgstr "Jít na další řádek v seznamu"
-
-#: src/global.c:642
+#: src/global.c:634
 msgid "Go to the previous file in the list"
 msgstr "Jít na předchozí řádek v seznamu"
 
-#: src/global.c:643
+#: src/global.c:635
+msgid "Go to the next file in the list"
+msgstr "Jít na další řádek v seznamu"
+
+#: src/global.c:636
 msgid "Go to directory"
 msgstr "Jít do adresáře"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:670
-msgid "Close"
-msgstr "Zavřít"
+#: src/global.c:639
+msgid "Invoke the linter, if available"
+msgstr "Vyvolat statický rozbor (je-li dostupný)"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:679
-msgid "WriteOut"
-msgstr "Uložit"
+#: src/global.c:640
+msgid "Go to previous linter msg"
+msgstr "Jít na předchozí zprávu statického rozboru"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
-msgid "Justify"
-msgstr "Zarovnat"
+#: src/global.c:641
+msgid "Go to next linter msg"
+msgstr "Jít na další zprávu statického rozboru"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:696
-msgid "Read File"
-msgstr "Otevřít soubor"
+#: src/global.c:642
+#, fuzzy
+msgid "Invoke formatter, if available"
+msgstr "Vyvolat statický rozbor (je-li dostupný)"
+
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:662
+msgid "Get Help"
+msgstr "Nápověda"
+
+#: src/global.c:665 src/prompt.c:1084
+msgid "Cancel"
+msgstr "Zrušit"
+
+#: src/global.c:678
+msgid "Write Out"
+msgstr "Zapsat"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:713
+#: src/global.c:704
+msgid "Go To Dir"
+msgstr "Jít do adresáře"
+
+#: src/global.c:719
 msgid "Cut Text"
 msgstr "Vyjmout text"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:718
-msgid "UnJustify"
-msgstr "Zrušit zarovnání"
+#: src/global.c:728
+msgid "Justify"
+msgstr "Zarovnat"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:723
-msgid "UnCut Text"
-msgstr "Zrušit vyjmutí textu"
+#: src/global.c:733
+msgid "To Spell"
+msgstr "Pravopis"
+
+#: src/global.c:738
+msgid "To Linter"
+msgstr "Statický rozbor"
+
+#: src/global.c:740
+#, fuzzy
+msgid "Formatter"
+msgstr "Formát DOS"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:728 src/global.c:755
+#: src/global.c:745
+msgid "Case Sens"
+msgstr "VELKÁ PÍSMENA/malá písmena"
+
+#: src/global.c:750
+msgid "Regexp"
+msgstr "Regulární výraz"
+
+#: src/global.c:755
+msgid "Backwards"
+msgstr "Zpět"
+
+#: src/global.c:762
+msgid "No Replace"
+msgstr "Žádné nahrazení"
+
+#: src/global.c:770
 msgid "Cur Pos"
-msgstr "Poloha ukazovátka"
+msgstr "Ukazatel"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:737
-msgid "To Spell"
-msgstr "Pravopis"
+#: src/global.c:780
+msgid "Prev Page"
+msgstr "Předchozí strana"
+
+#: src/global.c:782
+msgid "Next Page"
+msgstr "Další strana"
+
+#: src/global.c:785
+msgid "First Line"
+msgstr "První řádek"
+
+#: src/global.c:787
+msgid "Last Line"
+msgstr "Poslední řádek"
 
-#: src/global.c:771
+#: src/global.c:794
+msgid "To Bracket"
+msgstr "K závorce"
+
+#: src/global.c:797
 msgid "Mark Text"
 msgstr "Označit text"
 
-#: src/global.c:777
+#: src/global.c:800
 msgid "Copy Text"
 msgstr "Kopírovat text"
 
-#: src/global.c:780
+#: src/global.c:803
 msgid "Indent Text"
 msgstr "Odsadit text"
 
-#: src/global.c:783
+#: src/global.c:805
 msgid "Unindent Text"
 msgstr "Zrušit odsazení textu"
 
-#: src/global.c:787
+#: src/global.c:808
 msgid "Undo"
 msgstr "Zpět"
 
-#: src/global.c:790
+#: src/global.c:810
 msgid "Redo"
 msgstr "Znovu"
 
-#: src/global.c:796 src/global.c:800
-msgid "Forward"
-msgstr "Vpřed"
-
-#: src/global.c:806 src/global.c:810
+#: src/global.c:814 src/global.c:820
 msgid "Back"
 msgstr "Zpět"
 
-#: src/global.c:817
-msgid "Next Word"
-msgstr "Další slovo"
+#: src/global.c:816 src/global.c:822
+msgid "Forward"
+msgstr "Vpřed"
 
-#: src/global.c:820
+#: src/global.c:827
 msgid "Prev Word"
 msgstr "Předchozí slovo"
 
-#: src/global.c:824
-msgid "Prev Line"
-msgstr "Předchozí řádek"
-
-#: src/global.c:827
-msgid "Next Line"
-msgstr "Další řádek"
+#: src/global.c:829
+msgid "Next Word"
+msgstr "Další slovo"
 
-#: src/global.c:830
+#: src/global.c:833
 msgid "Home"
-msgstr "Poloha 1"
+msgstr "Začátek"
 
-#: src/global.c:833
+#: src/global.c:835
 msgid "End"
 msgstr "Konec"
 
-#: src/global.c:845
-msgid "Find Other Bracket"
-msgstr "Najít jiné závorky"
+#: src/global.c:844
+msgid "Beg of Par"
+msgstr "Začátek odstavce"
+
+#: src/global.c:846
+msgid "End of Par"
+msgstr "Konec odstavce"
 
-#: src/global.c:848
+#: src/global.c:851
 msgid "Scroll Up"
 msgstr "Posunout obraz nahoru"
 
-#: src/global.c:851
+#: src/global.c:853
 msgid "Scroll Down"
 msgstr "Posunout obraz dolů"
 
-#: src/global.c:856
-msgid "Previous File"
+#: src/global.c:858
+msgid "Prev File"
 msgstr "Předchozí soubor"
 
-#: src/global.c:858
+#: src/global.c:860
 msgid "Next File"
 msgstr "Další soubor"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:862 src/text.c:3045
-msgid "Verbatim Input"
+#: src/global.c:869
+msgid "Verbatim"
 msgstr "Přímé zadání"
 
-#: src/global.c:867
+#: src/global.c:872
 msgid "Tab"
 msgstr "Zarážka"
 
-#: src/global.c:870
+#: src/global.c:874
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:873
+#: src/global.c:876
 msgid "Delete"
 msgstr "Delete (smazat následující znak)"
 
-#: src/global.c:876
+#: src/global.c:878
 msgid "Backspace"
 msgstr "Backspace (smazat předcházející znak)"
 
-#: src/global.c:893
+#: src/global.c:888
 msgid "CutTillEnd"
 msgstr "Vyjmout až po konec"
 
-#: src/global.c:906
+#: src/global.c:898
 msgid "Word Count"
 msgstr "Počet slov"
 
-#: src/global.c:1367
+#: src/global.c:905
+msgid "Suspend"
+msgstr "Odložit na pozadí"
+
+#: src/global.c:910
+msgid "PrevHstory"
+msgstr "Předchozí historie"
+
+#: src/global.c:913
+msgid "NextHstory"
+msgstr "Další historie"
+
+#: src/global.c:917
+msgid "Go To Text"
+msgstr "Jít na text"
+
+#: src/global.c:928
+msgid "DOS Format"
+msgstr "Formát DOS"
+
+#: src/global.c:931
+msgid "Mac Format"
+msgstr "Formát Mac"
+
+#: src/global.c:934
+msgid "Append"
+msgstr "Připojit na konec"
+
+#: src/global.c:936
+msgid "Prepend"
+msgstr "Připojit na začátek"
+
+#: src/global.c:939
+msgid "Backup File"
+msgstr "Soubor se zálohou"
+
+#: src/global.c:946
+msgid "Execute Command"
+msgstr "Provést příkaz"
+
+#: src/global.c:961
+msgid "To Files"
+msgstr "Jít na soubory"
+
+#: src/global.c:964
+msgid "First File"
+msgstr "První soubor"
+
+#: src/global.c:966
+msgid "Last File"
+msgstr "Poslední soubor"
+
+#: src/global.c:977
+msgid "Prev Lint Msg"
+msgstr "Předchozí rozbor"
+
+#: src/global.c:979
+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:1227
 msgid "Help mode"
 msgstr "Režim s nápovědou"
 
-#: src/global.c:1369
+#: src/global.c:1229
 msgid "Constant cursor position display"
-msgstr "Ukazovat stálou polohu ukazovátka"
+msgstr "Ukazovat stálou polohu ukazatele"
 
-#: src/global.c:1371
+#: src/global.c:1231
 msgid "Use of one more line for editing"
 msgstr "Používání ještě jednoho řádku k úpravám"
 
-#: src/global.c:1373
+#: src/global.c:1233
 msgid "Smooth scrolling"
 msgstr "Plynulé posunování obrazu"
 
-#: src/global.c:1375
+#: src/global.c:1235
+msgid "Soft wrapping of overlong lines"
+msgstr "Plynulé zalamování dlouhých řádků"
+
+#: src/global.c:1237
 msgid "Whitespace display"
-msgstr "Zobrazování prázdného místa"
+msgstr "Zobrazování bílých znaků"
 
-#: src/global.c:1377
+#: src/global.c:1239
 msgid "Color syntax highlighting"
 msgstr "Barevné zvýrazňování skladby"
 
-#: src/global.c:1379
+#: src/global.c:1241
 msgid "Smart home key"
-msgstr "Chytrá klávesa pro Polohu 1"
+msgstr "Chytrá klávesa pro začátek dokumentu (Poloha 1)"
 
-#: src/global.c:1381
+#: src/global.c:1243
 msgid "Auto indent"
 msgstr "Automaticky odsadit"
 
-#: src/global.c:1383
+#: src/global.c:1245
 msgid "Cut to end"
 msgstr "Vyjmout po konec"
 
-#: src/global.c:1385
-msgid "Long line wrapping"
-msgstr "Zalamování dlouhých řádků"
+#: src/global.c:1247
+msgid "Hard wrapping of overlong lines"
+msgstr "Tvrdé zalamování dlouhých řádků"
 
-#: src/global.c:1387
+#: src/global.c:1249
 msgid "Conversion of typed tabs to spaces"
 msgstr "Převod zadaných zarážek na mezery"
 
-#: src/global.c:1389
+#: src/global.c:1251
 msgid "Backup files"
 msgstr "Zálohovací soubory"
 
-#: src/global.c:1391
+#: src/global.c:1253
 msgid "Multiple file buffers"
 msgstr "Více souborových vyrovnávacích pamětí"
 
-#: src/global.c:1393
+#: src/global.c:1255
 msgid "Mouse support"
 msgstr "Podpora pro myš"
 
-#: src/global.c:1395
+#: src/global.c:1257
 msgid "No conversion from DOS/Mac format"
 msgstr "Žádný převod z formátů DOS/Mac"
 
-#: src/global.c:1397
+#: src/global.c:1259
 msgid "Suspension"
-msgstr "Odklad na pozadí"
-
-#: src/global.c:1399
-msgid "Soft line wrapping"
-msgstr "Plynulé zalamování dlouhých řádků"
+msgstr "Odložit na pozadí"
 
-#: src/help.c:236
+#: src/help.c:205
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -999,7 +1096,7 @@ msgid ""
 "prompt.  Hitting Enter without entering any text will perform the previous "
 "search.  "
 msgstr ""
-"Text s nápovědou pro příkaz ke hledání\n"
+"Nápověda pro příkaz Hledat\n"
 "\n"
 " Zadejte slova nebo znaky, podle kterých chcete hledat, a stiskněte klávesu "
 "Enter.  Pokud je pro vámi zadaný text nalezena shoda, obrazovka se posune k "
@@ -1009,7 +1106,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:245
+#: src/help.c:214
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1023,7 +1120,7 @@ msgstr ""
 " Následující funkční klávesy jsou dostupné v režimu Hledání:\n"
 "\n"
 
-#: src/help.c:251
+#: src/help.c:220
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1034,7 +1131,7 @@ msgid ""
 " The following function keys are available in Go To Line mode:\n"
 "\n"
 msgstr ""
-"Text s nápovědou pro „Přejít na řádek“\n"
+"Nápověda pro Přejít na řádek\n"
 "\n"
 " zadejte číslo řádku, na který si přejete přejít, a stiskněte klávesu Enter. "
 "Pokud je v textu menší počet řádků, než jaký jste udal, nano provede skok na "
@@ -1043,7 +1140,7 @@ msgstr ""
 " Následující funkční klávesy jsou dostupné v režimu Přejít na řádek:\n"
 "\n"
 
-#: src/help.c:260
+#: src/help.c:229
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1055,10 +1152,10 @@ 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 ""
-"Text s nápovědou pro Vložit soubor\n"
+"Nápověda pro Vložit soubor\n"
 "\n"
 " Zadejte název souboru, který se má vložit do nynější souborové vyrovnávací "
-"paměti v současné poloze ukazovátka.\n"
+"paměti v současné poloze ukazatele.\n"
 "\n"
 " Pokud jste nano sestavil s podporou pro více souborových vyrovnávacích "
 "pamětí, a povolil tuto funkci více souborových vyrovnávacích pamětí volbou "
@@ -1067,7 +1164,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:269
+#: src/help.c:238
 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"
@@ -1082,7 +1179,7 @@ msgstr ""
 " Následující funkční klávesy jsou dostupné v režimu Vložit soubor:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:244
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1097,12 +1194,12 @@ msgid ""
 " The following function keys are available in Write File mode:\n"
 "\n"
 msgstr ""
-"Text s nápovědou pro „Zapsat soubor“\n"
+"Nápověda pro Zapsat soubor\n"
 "\n"
 " Zadejte název, pod kterým si přejete uložit současný soubor, a stiskněte "
 "klávesu Enter.\n"
 "\n"
-" Pokud jste označil text, bude vám položena otázka, zda chete zapsat pouze "
+" Pokud jste označil text, bude vám položena otázka, zda chcete zapsat pouze "
 "vybranou část textu do odděleného souboru. Abyste zmenšil nebezpečí, že by "
 "došlo k přepsání nynějšího souboru jeho částí, není v tomto režimu nynější "
 "souborový název veden jako výchozí.\n"
@@ -1110,7 +1207,7 @@ msgstr ""
 " Následující funkční klávesy jsou dostupné v režimu Zapsat soubor:\n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:258
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1123,7 +1220,7 @@ msgid ""
 " The following function keys are available in the file browser:\n"
 "\n"
 msgstr ""
-"Text s nápovědou pro „Prohlížeč souborů\"\n"
+"Nápověda pro Prohlížeč souborů\n"
 "\n"
 " Prohlížeč souborů se používá pro názorné procházení uspořádání adresářů, "
 "aby se vybral soubor pro čtení nebo zápis. Můžete použít klávesy šipek nebo "
@@ -1135,7 +1232,7 @@ msgstr ""
 " Následující funkční klávesy jsou dostupné v prohlížeči souborů:\n"
 "\n"
 
-#: src/help.c:302
+#: src/help.c:271
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1148,7 +1245,7 @@ msgid ""
 "search.\n"
 "\n"
 msgstr ""
-"Text s nápovědou pro příkaz k \"Hledání v prohlížeči souborů\"\n"
+"Nápověda pro příkaz Hledat v prohlížeči souborů\"\n"
 "\n"
 " Zadejte slova nebo znaky, které byste chtěl vyhledat, a potom stiskněte "
 "klávesu Enter. Pokud dojde k nalezení textu shodného s textem, který jste "
@@ -1159,16 +1256,16 @@ msgstr ""
 "provedení předchozího požadavku na hledání.\n"
 "\n"
 
-#: src/help.c:311
+#: src/help.c:280
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
 msgstr ""
-" Následující funkční klávesy jsou dostupné v režimu \"Hledání v prohlížeči "
-"souborů\":\n"
+" Následující funkční klávesy jsou dostupné v režimu hledání v prohlížeči "
+"souborů:\n"
 "\n"
 
-#: src/help.c:315
+#: src/help.c:284
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1180,7 +1277,7 @@ msgid ""
 " The following function keys are available in Browser Go To Directory mode:\n"
 "\n"
 msgstr ""
-"Text s nápovědou pro \"Jít do adresáře\" v prohlížeči souborů\n"
+"Nápověda pro Jít do adresáře v prohlížeči souborů\n"
 "\n"
 " Zadejte název adresáře, který byste chtěl procházet.\n"
 "\n"
@@ -1192,7 +1289,7 @@ msgstr ""
 "prohlížeči souborů:\n"
 "\n"
 
-#: src/help.c:328
+#: src/help.c:297
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1205,7 +1302,7 @@ msgid ""
 " The following function keys are available in Spell Check mode:\n"
 "\n"
 msgstr ""
-"Text s nápovědou pro \"Ověřování pravopisu\"\n"
+"Nápověda pro ověřování pravopisu\n"
 "\n"
 " Ověřování pravopisu ověřuje pravopis celého textu v současném souboru. "
 "Narazí-li se na neznámé slovo, je zvýrazněno a náhradu lze upravovat. Budete "
@@ -1216,7 +1313,7 @@ msgstr ""
 "\":\n"
 "\n"
 
-#: src/help.c:343
+#: src/help.c:312
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1227,17 +1324,17 @@ msgid ""
 " The following function keys are available in Execute Command mode:\n"
 "\n"
 msgstr ""
-"Text s nápovědou pro \"Provést příkaz\"\n"
+"Nápověda pro Provést příkaz\n"
 "\n"
 " Tento režim vám umožňuje vložit výstup vnějšího příkazu, který byl proveden "
 "v shellu, do současné vyrovnávací paměti (nebo do nové vyrovnávací paměti v "
 "režimu více souborových vyrovnávacích pamětí). Pokud potřebujete další "
-"prázdnou vyrovnávací paměť, nezadavejte žádný příkaz.\n"
+"prázdnou vyrovnávací paměť, nezadávejte žádný příkaz.\n"
 "\n"
 " Následující funkční klávesy jsou dostupné v režimu \"Provést příkaz\":\n"
 "\n"
 
-#: src/help.c:356
+#: src/help.c:325
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1256,7 +1353,7 @@ 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:366
+#: src/help.c:335
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1275,7 +1372,7 @@ msgstr ""
 "buď pomocí klávesy Esc, Alt, nebo Meta v závislosti na nastavení vaší "
 "klávesnice.  "
 
-#: src/help.c:375
+#: src/help.c:344
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1289,15 +1386,15 @@ msgstr ""
 "uváděny v závorkách:\n"
 "\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:376 src/help.c:448
 msgid "enable/disable"
 msgstr "Zapnout/Vypnout"
 
-#: src/nano.c:587
+#: src/nano.c:601
 msgid "Key invalid in view mode"
 msgstr "Klávesa nepřípustná v režimu pouze pro čtení"
 
-#: src/nano.c:695
+#: src/nano.c:713
 #, c-format
 msgid ""
 "\n"
@@ -1306,7 +1403,7 @@ msgstr ""
 "\n"
 "Vyrovnávací paměť zapsána do %s\n"
 
-#: src/nano.c:697
+#: src/nano.c:715
 #, c-format
 msgid ""
 "\n"
@@ -1315,7 +1412,7 @@ msgstr ""
 "\n"
 "Vyrovnávací paměť nezapsána do %s: %s\n"
 
-#: src/nano.c:700
+#: src/nano.c:718
 #, c-format
 msgid ""
 "\n"
@@ -1324,11 +1421,11 @@ msgstr ""
 "\n"
 "Vyrovnávací paměť nezapsána: %s\n"
 
-#: src/nano.c:723
+#: src/nano.c:743
 msgid "Window size is too small for nano...\n"
 msgstr "Velikost okna je pro nano příliš malá...\n"
 
-#: src/nano.c:816
+#: src/nano.c:836
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
@@ -1337,253 +1434,259 @@ msgstr ""
 "Použití: nano [VOLBY] [[+ŘÁDEK,SLOUPEC] SOUBOR]...\n"
 "\n"
 
-#: src/nano.c:819
+#: src/nano.c:839
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Volba\t\tdlouhá volba GNU\t\tVýznam\n"
 
-#: src/nano.c:821
+#: src/nano.c:841
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Volba\t\tVýznam\n"
 
-#: src/nano.c:824
-msgid "Show this message"
-msgstr "Ukázat tuto zprávu"
-
-#: src/nano.c:825
+#: src/nano.c:844
 msgid "+LINE,COLUMN"
 msgstr "+ŘÁDEK,SLOUPEC"
 
-#: src/nano.c:826
+#. TRANSLATORS: The next forty or so strings are option descriptions
+#. * for the --help output.  Try to keep them at most 40 characters.
+#: src/nano.c:847
 msgid "Start at line LINE, column COLUMN"
 msgstr "Začít na řádku ŘÁDEK,sloupec SLOUPEC"
 
-#: src/nano.c:828
+#: src/nano.c:849
 msgid "Enable smart home key"
-msgstr "Povolit chytrou klávesu Poloha 1"
+msgstr "Povolit chytrou klávesu pro začátek dokumentu (Poloha 1)"
 
-#: src/nano.c:829
+#: src/nano.c:850
 msgid "Save backups of existing files"
 msgstr "Uložit zálohy stávajících souborů"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "-C <dir>"
 msgstr "-C <adresář>"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<adresář>"
 
-#: src/nano.c:831
+#: src/nano.c:852
 msgid "Directory for saving unique backup files"
 msgstr "Adresář pro ukládání jedinečných zálohovacích souborů"
 
-#: src/nano.c:834
+#: src/nano.c:855
 msgid "Use bold instead of reverse video text"
 msgstr "Použít tučný tisk místo opačného textu"
 
-#: src/nano.c:837
+#: src/nano.c:858
 msgid "Convert typed tabs to spaces"
 msgstr "Převést zadané zarážky na mezery"
 
-#: src/nano.c:840
+#: src/nano.c:861
 msgid "Enable multiple file buffers"
 msgstr "Povolit více souborových vyrovnávacích pamětí"
 
-#: src/nano.c:845
+#: src/nano.c:865
+msgid "Use (vim-style) lock files"
+msgstr "Použít soubory lock (ve stylu Vimu)"
+
+#: src/nano.c:869
 msgid "Log & read search/replace string history"
 msgstr "Zapisovat a číst historii hledání/nahrazování řetězců"
 
-#: src/nano.c:848
+#: src/nano.c:873
 msgid "Don't look at nanorc files"
 msgstr "Nezkoumat soubory nanorc"
 
-#: src/nano.c:851
+#: src/nano.c:876
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Opravit zmatek okolo kláves na číselné klávesnici"
 
-#: src/nano.c:853
+#: src/nano.c:878
 msgid "Don't add newlines to the ends of files"
 msgstr "Nepřidávat zalomení řádku na koncích souborů"
 
-#: src/nano.c:856
+#: src/nano.c:881
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Nepřevádět soubory z formátů DOS/Mac"
 
-#: src/nano.c:858
+#: src/nano.c:883
 msgid "Use one more line for editing"
 msgstr "Používat ještě jeden řádek k úpravám"
 
-#: src/nano.c:860
+#: src/nano.c:886
+msgid "Log & read location of cursor position"
+msgstr "Zapsat & přečíst umístění polohy ukazatele"
+
+#: src/nano.c:889
 msgid "-Q <str>"
 msgstr "-Q <řetězec znaků>"
 
-#: src/nano.c:860
+#: src/nano.c:889
 msgid "--quotestr=<str>"
 msgstr "--quotestr=<řetězec znaků>"
 
-#: src/nano.c:861
+#: src/nano.c:890
 msgid "Quoting string"
 msgstr "Dání řetězce do uvozovek"
 
-#: src/nano.c:863
+#: src/nano.c:892
 msgid "Restricted mode"
 msgstr "Omezený režim"
 
-#: src/nano.c:866
+#: src/nano.c:895
 msgid "Scroll by line instead of half-screen"
 msgstr "Posunovat obraz po řádcích místo po půlobrazovkách"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "-T <#cols>"
 msgstr "-T <#sloupce>"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#sloupce>"
 
-#: src/nano.c:869
+#: src/nano.c:898
 msgid "Set width of a tab to #cols columns"
 msgstr "Nastavit velikost zarážky na #sloupce"
 
-#: src/nano.c:871
+#: src/nano.c:900
 msgid "Do quick statusbar blanking"
 msgstr "Provést rychlé vymazání stavového řádku"
 
-#: src/nano.c:874
+#: src/nano.c:903
 msgid "Print version information and exit"
-msgstr "Vytisknout informaci o verzi a ukončit"
+msgstr "Zobrazit informaci o verzi a ukončit"
 
-#: src/nano.c:877
+#: src/nano.c:906
 msgid "Detect word boundaries more accurately"
 msgstr "Rozpoznávat hranice slov přesněji"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "-Y <str>"
 msgstr "-Y <řetězec znaků>"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "--syntax=<str>"
 msgstr "--syntax=<řetězec znaků>"
 
-#: src/nano.c:881
+#: src/nano.c:910
 msgid "Syntax definition to use for coloring"
 msgstr "Vymezení skladby k užití pro obarvování"
 
-#: src/nano.c:883
+#: src/nano.c:912
 msgid "Constantly show cursor position"
-msgstr "Stále ukazovat polohu ukazovátka"
+msgstr "Stále ukazovat polohu ukazatele"
 
-#: src/nano.c:885
+#: src/nano.c:914
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Odstranit záměnu kláves Backspace/Delete"
 
-#: src/nano.c:888
+#: src/nano.c:915
+msgid "Show this help text"
+msgstr "Ukázat tento text s nápovědou"
+
+#: src/nano.c:918
 msgid "Automatically indent new lines"
 msgstr "Automaticky odsadit nové řádky"
 
-#: src/nano.c:889
+#: src/nano.c:919
 msgid "Cut from cursor to end of line"
-msgstr "Vyjmout od polohy ukazovátka po konec řádku"
+msgstr "Vyjmout od polohy ukazatele po konec řádku"
 
-#: src/nano.c:892
+#: src/nano.c:922
 msgid "Don't follow symbolic links, overwrite"
 msgstr "Nenásledovat symbolické odkazy, nýbrž přepsat"
 
-#: src/nano.c:894
+#: src/nano.c:924
 msgid "Enable the use of the mouse"
 msgstr "Povolit použití myši"
 
-#: src/nano.c:897
+#: src/nano.c:926
+msgid "Do not read the file (only write it)"
+msgstr "Soubor nečíst (pouze jej zapsat)"
+
+#: src/nano.c:928
 msgid "-o <dir>"
 msgstr "-o <adresář>"
 
-#: src/nano.c:897
+#: src/nano.c:928
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<adresář>"
 
-#: src/nano.c:898
+#: src/nano.c:929
 msgid "Set operating directory"
 msgstr "Nastavit pracovní adresář"
 
-#: src/nano.c:901
+#: src/nano.c:932
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Zachovat klávesy XON (^Q) a XOFF (^S)"
 
-#: src/nano.c:903
+#: src/nano.c:935
 msgid "Silently ignore startup issues like rc file errors"
 msgstr "Přecházet tiše potíže při spuštění, jako jsou chyby v souborech rc"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "-r <#cols>"
 msgstr "-r <#sloupce>"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "--fill=<#cols>"
 msgstr "--fill=<#sloupce>"
 
-#: src/nano.c:906
-msgid "Set wrapping point at column #cols"
-msgstr "Nastavit bod zalomení při sloupci #sloupce"
+#: src/nano.c:939
+msgid "Set hard-wrapping point at column #cols"
+msgstr "Nastavit bod tvrdého zalomení při sloupci #sloupce"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "-s <prog>"
 msgstr "-s <program>"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "--speller=<prog>"
 msgstr "--speller=<program>"
 
-#: src/nano.c:910
+#: src/nano.c:943
 msgid "Enable alternate speller"
 msgstr "Povolit náhradní program na ověřování pravopisu"
 
-#: src/nano.c:913
+#: src/nano.c:946
 msgid "Auto save on exit, don't prompt"
 msgstr "Při ukončení automaticky bez zpětného dotazu uložit"
 
-#: src/nano.c:915
-msgid "Allow generic undo [EXPERIMENTAL]"
-msgstr "Povolit obecnou funkci pro zpět [pokusné]"
-
-#: src/nano.c:918
+#: src/nano.c:947
 msgid "View mode (read-only)"
 msgstr "Režim pouze pro čtení (žádné změny nejsou možné)"
 
-#: src/nano.c:920
-msgid "Don't wrap long lines"
-msgstr "Nezalamovat dlouhé řádky do nových řádků"
+#: src/nano.c:949
+msgid "Don't hard-wrap long lines"
+msgstr "Nezalamovat dlouhé řádky natvrdo"
 
-#: src/nano.c:922
+#: src/nano.c:951
 msgid "Don't show the two help lines"
 msgstr "Neukazovat dva pomocné řádky"
 
-#: src/nano.c:923
+#: src/nano.c:952
 msgid "Enable suspension"
 msgstr "Povolit odložení na pozadí (zastavit a zpět k shellu)"
 
-#: src/nano.c:924
+#: src/nano.c:954
 msgid "Enable soft line wrapping"
 msgstr "Povolit plynulé zalamování dlouhých řádků"
 
-#: src/nano.c:928
-msgid "(ignored, for Pico compatibility)"
-msgstr "(přechází se, pro slučitelnost s Pico)"
-
-#: src/nano.c:938
-#, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
+#: src/nano.c:963
+#, fuzzy, c-format
+msgid " GNU nano, version %s\n"
 msgstr " GNU verze nano %s (sestaveno %s, %s)\n"
 
-#: src/nano.c:943
+#: src/nano.c:966
 #, 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:944
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1592,154 +1695,180 @@ msgstr ""
 "\n"
 " Volby při sestavování:"
 
-#: src/nano.c:1022
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr "Promiňte, ale tato funkce není podporována"
 
-#: src/nano.c:1044
+#: src/nano.c:1125
+msgid "No file name"
+msgstr "Žádný název souboru"
+
+#: src/nano.c:1136
 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:1088
+#: src/nano.c:1189
 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:1114
+#: src/nano.c:1213
 #, 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:1182
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Přijat SIGHUP nebo SIGTERM\n"
 
-#: src/nano.c:1204
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Použijte \"fg\" pro návrat do nano.\n"
 
-#: src/nano.c:1386
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "povoleno"
 
-#: src/nano.c:1387
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "zakázáno"
 
-#: src/nano.c:1548 src/winio.c:1256
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr "Neznámý příkaz"
 
-#: src/nano.c:1674
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "XON nebrán na vědomí, huhňání"
 
-#: src/nano.c:1679
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF nebrán na vědomí, huhňání"
 
-#: src/nano.c:2209 src/rcfile.c:1100
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Požadovaná velikost zarážky \"%s\" je neplatná"
 
-#: src/nano.c:2268 src/rcfile.c:1025
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Požadovaná velikost výplně \"%s\" je neplatná"
 
+#: src/nano.c:2415
+#, c-format
+msgid "Type '%s -h' for a list of available options.\n"
+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:1259
+#: src/prompt.c:1055
 msgid "Yy"
 msgstr "Yy"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1056
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1057
 msgid "Aa"
 msgstr "Aa"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1071
 msgid "Yes"
 msgstr "Ano"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1076
 msgid "All"
 msgstr "Vše"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1081
 msgid "No"
 msgstr "Ne"
 
-#: src/rcfile.c:130
+#: src/rcfile.c:137
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Chyba v %s na řádku %lu: "
 
-#: src/rcfile.c:185
+#: src/rcfile.c:196
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "Argument „%s“ má neukončené \""
 
-#: src/rcfile.c:212 src/rcfile.c:264 src/rcfile.c:711 src/rcfile.c:768
-#: src/rcfile.c:821
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 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:238 src/search.c:62
+#: src/rcfile.c:249 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Špatný regulární výraz \"%s\": %s"
 
-#: src/rcfile.c:258
+#: src/rcfile.c:269
 msgid "Missing syntax name"
 msgstr "Chybí název skladby"
 
-#: src/rcfile.c:316
+#: src/rcfile.c:340
 msgid "The \"none\" syntax is reserved"
 msgstr "Skladba \"none\" je zamluvena"
 
-#: src/rcfile.c:323
+#: src/rcfile.c:347
 msgid "The \"default\" syntax must take no extensions"
-msgstr "Skladba \"defaul\" nesmí mít žádné přípony"
+msgstr "Skladba \"default\" nesmí mít žádné přípony"
 
-#: src/rcfile.c:386 src/rcfile.c:483
+#: src/rcfile.c:433
 msgid "Missing key name"
 msgstr "Chybí název klíče"
 
-#: src/rcfile.c:398 src/rcfile.c:499
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
+#: src/rcfile.c:442 src/rcfile.c:453
+msgid "Key name is too short"
+msgstr "Název klávesy zkratky je příliš krátký"
+
+#: src/rcfile.c:463
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr "Klávesové zkratky musí začínat \"^\", \"M\", nebo \"F\""
 
-#: src/rcfile.c:407
-msgid "Must specify function to bind key to"
-msgstr "Funkce spojená s klávesou musí být zadána"
+#: src/rcfile.c:472
+msgid "Must specify a function to bind the key to"
+msgstr "Musí být zadána funkce spojená s klávesovou zkratkou"
 
-#: src/rcfile.c:418 src/rcfile.c:510
-msgid "Must specify menu to bind key to (or \"all\")"
-msgstr "Nabídka spojená s klávesou (nebo \"vše\") musí být zadána"
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:482
+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:489
+#, c-format
+msgid "Cannot map name \"%s\" to a function"
+msgstr "Nelze spojit název \"%s\" s funkcí"
 
-#: src/rcfile.c:426
+#: src/rcfile.c:496
 #, c-format
-msgid "Could not map name \"%s\" to a function"
-msgstr "Nepodařilo se spojit název \"%s\" s funkcí"
+msgid "Cannot map name \"%s\" to a menu"
+msgstr "Nelze spojit název \"%s\" s nabídkou"
 
-#: src/rcfile.c:432 src/rcfile.c:517
+#: src/rcfile.c:528
 #, c-format
-msgid "Could not map name \"%s\" to a menu"
-msgstr "Nepodařilo se spojit název \"%s\" s nabídkou"
+msgid "Function '%s' does not exist in menu '%s'"
+msgstr "Funkce '%s' neexistuje v nabídce '%s'"
 
-#: src/rcfile.c:454
+#: src/rcfile.c:543
 #, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
-msgstr "Promiňte, ale keystr \"%s\" není dovoleným přiřazením"
+msgid "Sorry, keystroke \"%s\" may not be rebound"
+msgstr "Promiňte, ale klávesu \"%s\" nelze znovu přiřadit"
 
-#: src/rcfile.c:625
+#: src/rcfile.c:629
+#, c-format
+msgid "Error expanding %s: %s"
+msgstr "Chyba při rozšíření %s: %s"
+
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1755,116 +1884,173 @@ msgstr ""
 "a „black“ (černá), s volitelnou předponou „bright“ (světlá)\n"
 "pro barvy popředí."
 
-#: src/rcfile.c:647
+#: src/rcfile.c:694
 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:652
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "Chybí název barvy"
 
-#: src/rcfile.c:672
-#, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr "Barva pozadí \"%s\" nemůže být světlá (\"bright\")"
-
-#: src/rcfile.c:690 src/rcfile.c:809
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr "Chybí řetězec regulárního výrazu"
 
-#: src/rcfile.c:762
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "„start=“ vyžaduje odpovídající „end=“"
 
-#: src/rcfile.c:804
+#: src/rcfile.c:837
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr "Barva pozadí \"%s\" nemůže být světlá (\"bright\")"
+
+#: src/rcfile.c:865
 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:874
+#: src/rcfile.c:921
+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:926
+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:990
+msgid "Missing linter command"
+msgstr "Chybí příkaz pro statický rozbor"
+
+#: src/rcfile.c:1010
+#, fuzzy
+msgid "Cannot add formatter without a syntax command"
+msgstr "Nelze přidat statický rozbor bez příkazu pro skladbu - syntax"
+
+#: src/rcfile.c:1015
+#, fuzzy
+msgid "Missing formatter command"
+msgstr "Chybí příkaz pro statický rozbor"
+
+#: src/rcfile.c:1045
 #, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
-msgstr "Vážná chyba: s funkcí \"%s\" nejsou spojeny žádné klávesy"
+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:876
+#: src/rcfile.c:1047
+#, c-format
 msgid ""
-"Exiting.  Please use nano with the -I option if needed to adjust your nanorc "
-"settings\n"
+"If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
-"Ukončuje se. Spusťte, prosím, v případě potřeby nano s volbou \"-l\", chcete-"
-"li změnit svá nastavení nanorc\n"
+"Spusťte, prosím, v případě potřeby nano s volbou \"-l\", chcete-li změnit "
+"svá nastavení nanorc.\n"
+
+#: src/rcfile.c:1108
+#, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "Nepodařilo se najít skladbu \"%s\" k rozšíření"
 
-#: src/rcfile.c:926 src/rcfile.c:935 src/rcfile.c:945
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Příkaz \"%s\" nedovolen v zahrnutém souboru"
 
-#: src/rcfile.c:951 src/rcfile.c:1128
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Skladba \"%s\" nemá pokyny pro barvy"
 
-#: src/rcfile.c:966
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Příkazu \"%s\" neporozuměno"
 
-#: src/rcfile.c:972
-msgid "Missing flag"
-msgstr "Chybí příznak"
+#: src/rcfile.c:1186
+msgid "Missing option"
+msgstr "Chybějící volba"
 
-#: src/rcfile.c:994
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Volba \"%s\" vyžaduje argument"
 
-#: src/rcfile.c:1012
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr "Volba není žádným platným řetězcem znaků multibyte"
 
-#: src/rcfile.c:1038 src/rcfile.c:1066 src/rcfile.c:1075
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr "Požadovány ne-prázdné znaky"
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr "Požadovány dva znaky v rozsahu jednoho sloupce"
 
-#: src/rcfile.c:1114
+#: src/rcfile.c:1339
 #, c-format
-msgid "Cannot unset flag \"%s\""
-msgstr "Nelze vypnout příznak \"%s\""
+msgid "Cannot unset option \"%s\""
+msgstr "Nelze vypnout volbu \"%s\""
 
-#: src/rcfile.c:1123
+#: src/rcfile.c:1345
 #, c-format
-msgid "Unknown flag \"%s\""
-msgstr "Neznámý příznak \"%s\""
+msgid "Unknown option \"%s\""
+msgstr "Neznámá volba \"%s\""
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr "Nemohu najít svůj domovský adresář! Jau!"
 
+#: src/rcfile.c:1442
+#, c-format
+msgid ""
+"\n"
+"Press Enter to continue starting nano.\n"
+msgstr ""
+"\n"
+"Stiskněte klávesu Enter pro pokračování ve spouštění programu nano.\n"
+
 #: src/search.c:96
 #, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "\"%.*s%s\" nenalezen"
 
-#: src/search.c:205
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/search.c:184
+msgid " [Case Sensitive]"
+msgstr " [Rozlišovat velikost písmen]"
+
+#: src/search.c:188
+msgid " [Regexp]"
+msgstr " [regulární výraz]"
+
+#: src/search.c:192
+msgid " [Backwards]"
+msgstr " [Zpět]"
+
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:197
 msgid " (to replace) in selection"
 msgstr " (k nahrazení) ve výběru"
 
-#: src/search.c:207
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (k nahrazení)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "Nahradit tento případ?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:945
 msgid "Replace with"
 msgstr "Nahradit"
 
-#: src/search.c:1004
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
@@ -1872,19 +2058,20 @@ msgstr[0] "Nahrazen jeden výskyt"
 msgstr[1] "Nahrazeny %lu výskyty"
 msgstr[2] "Nahrazeno %lu výskytů"
 
-#: src/search.c:1034
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr "Zadat číslo řádku, číslo sloupce"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
 msgstr "Neplatné číslo řádku nebo, číslo sloupce"
 
-#: src/search.c:1214
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "Žádná závorka"
 
-#: src/search.c:1281
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "Žádná odpovídající závorka"
 
@@ -1896,219 +2083,325 @@ msgstr "Značka nastavena"
 msgid "Mark Unset"
 msgstr "Značka odstraněna"
 
-#: src/text.c:443
+#: src/text.c:439
 msgid "Nothing in undo buffer!"
 msgstr "Nic ve vyrovnávací paměti pro \"Zpět\"!"
 
-#: src/text.c:455 src/text.c:593
+#: src/text.c:445 src/text.c:590
 #, c-format
-msgid "Internal error: can't match line %d.  Please save your work"
-msgstr "Vnitřní chyba: nelze nalézt řádek %d. Uložte, prosím, svou práci."
+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."
 
-#: src/text.c:466 src/text.c:603
+#: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
 msgstr "Přidat text"
 
-#: src/text.c:475 src/text.c:613
+#: src/text.c:467 src/text.c:612
 msgid "text delete"
 msgstr "Smazat text"
 
-#: src/text.c:489 src/text.c:628
-msgid "line wrap"
-msgstr "Zalomení řádku"
-
-#: src/text.c:503 src/text.c:636
+#: src/text.c:491 src/text.c:641
 msgid "line join"
 msgstr "Spojit řádek"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:505 src/text.c:657
 msgid "text cut"
 msgstr "Vyjmout text"
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:510 src/text.c:661
 msgid "text uncut"
-msgstr "Vzít zpět vyjmutí textu"
+msgstr "Zrušit vyjmutí textu"
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:515 src/text.c:623
 msgid "line break"
 msgstr "Zalamovat řádky"
 
-#: src/text.c:532 src/text.c:665
+#: src/text.c:528 src/text.c:672
 msgid "text insert"
 msgstr "Vložit text"
 
-#: src/text.c:550 src/text.c:659
+#: src/text.c:549 src/text.c:665
 msgid "text replace"
 msgstr "Nahradit text"
 
-#: src/text.c:557 src/text.c:671
-msgid "Internal error: unknown type.  Please save your work"
+#: src/text.c:556 src/text.c:679 src/text.c:983
+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:563
+#: src/text.c:561
 #, c-format
 msgid "Undid action (%s)"
 msgstr "Operace vrácena zpět (%s)"
 
-#: src/text.c:578
+#: src/text.c:580
 msgid "Nothing to re-do!"
 msgstr "Nic k zopakování!"
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
+#: src/text.c:584
+msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
-"Vnitřní chyba: Příprava na zopakování operace se nezdařila. Uložte, prosím, "
-"svou práci."
+"Vnitřní chyba: Nelze připravit \"provést znovu\". Uložte, prosím, svou práci."
 
-#: src/text.c:676
+#: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Operace zopakována (%s)"
 
-#: src/text.c:766
-msgid "Could not pipe"
-msgstr "Přenos dat se nepodařilo provést"
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
+msgid "Could not create pipe"
+msgstr "Nepodařilo se vytvořit přenos dat"
 
-#: src/text.c:793 src/text.c:2636 src/text.c:2788
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "Vidlici se nepodařilo provést"
 
-#: src/text.c:941
-msgid "Internal error: can't setup uncut.  Please save your work."
+#: src/text.c:969
+msgid "Internal error: cannot set up uncut.  Please save your work."
 msgstr ""
-"Vnitřní chyba: vzetí vyjmutí zpět nelze nastavit. Uložte, prosím, svou práci."
-
-#: src/text.c:950
-msgid "Internal error: unknown type.  Please save your work."
-msgstr "Vnitřní chyba: neznámý typ. Uložte, prosím, svou práci."
+"Vnitřní chyba: Nelze připravit činnost vložení (vzetí vyjmutí zpět). Uložte, "
+"prosím, svou práci."
 
-#: src/text.c:1870
+#: src/text.c:1806
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Neplatný řetězec znaku uvozovek %s: %s"
 
-#: src/text.c:2267
+#: src/text.c:2207
 msgid "Can now UnJustify!"
 msgstr "Nyní lze zrušit zarovnání odstavce!"
 
-#: src/text.c:2462
+#: src/text.c:2404
 msgid "Edit a replacement"
 msgstr "Upravit nahrazení"
 
-#: src/text.c:2548
-msgid "Could not create pipe"
-msgstr "Nepodařilo se vytvořit přenos dat"
-
-#: src/text.c:2550
+#: src/text.c:2492
 msgid "Creating misspelled word list, please wait..."
 msgstr "Vytváří se seznam nesprávně napsaných slov. Čekejte, prosím,..."
 
-#: src/text.c:2642
+#: src/text.c:2584 src/text.c:3022
 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:2693
+#: src/text.c:2635
 msgid "Error invoking \"spell\""
 msgstr "Chyba při vyvolání „spell“"
 
-#: src/text.c:2696
+#: src/text.c:2638
 msgid "Error invoking \"sort -f\""
 msgstr "Chyba při vyvolání „sort -f“"
 
-#: src/text.c:2699
+#: src/text.c:2641
 msgid "Error invoking \"uniq\""
 msgstr "Chyba při vyvolání „uniq“"
 
-#: src/text.c:2756 src/text.c:2965
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "Ověřování pravopisu dokončeno"
 
-#: src/text.c:2815
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Chyba při vyvolání „%s“"
 
-#: src/text.c:2960
+#: src/text.c:2885
+msgid "Invoking spell checker, please wait"
+msgstr "Vyvolat ověření správného psaní. Počkejte, prosím"
+
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Ověření pravopisu se nezdařilo: %s"
 
-#: src/text.c:2962
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Ověření pravopisu se nezdařilo: %s: %s"
 
-#: src/text.c:3030
+#: src/text.c:2937
+msgid "No linter defined for this type of file!"
+msgstr "Pro tento typ souboru není stanoven žádný statický rozbor!"
+
+#: src/text.c:2947
+msgid "Save modified buffer before linting?"
+msgstr "Uložit před statickým rozborem změněnou vyrovnávací paměť?"
+
+#: src/text.c:2969
+msgid "Invoking linter, please wait"
+msgstr "Volá se statický rozbor. Počkejte, prosím"
+
+#: src/text.c:3125
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr "Příkaz %s nevytvořil žádný zpracovatelný řádek"
+
+#: src/text.c:3159
+#, 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:3205
+msgid "At last message"
+msgstr "Při poslední zprávě"
+
+#: src/text.c:3210
+msgid "At first message"
+msgstr "Při první zprávě"
+
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr ""
+
+#: src/text.c:3275
+msgid "Finished"
+msgstr ""
+
+#: src/text.c:3280
+#, fuzzy
+msgid "Invoking formatter, please wait"
+msgstr "Volá se statický rozbor. Počkejte, prosím"
+
+#: src/text.c:3360
+msgid "Finished formatting"
+msgstr ""
+
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sSlov: %lu  Řádků: %ld  Znaků: %lu"
 
-#: src/text.c:3031
+#: src/text.c:3439
 msgid "In Selection:  "
 msgstr "Ve výběru:  "
 
-#: src/utils.c:405 src/utils.c:417
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3453
+msgid "Verbatim Input"
+msgstr "Přímé zadání"
+
+#: src/utils.c:410 src/utils.c:422
 msgid "nano is out of memory!"
 msgstr "nano už nemá paměti!"
 
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
-#: src/winio.c:1557
+#: src/winio.c:1583
 msgid "Unicode Input"
 msgstr "Vstup Unicode"
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2142 src/winio.c:2146
 msgid "Modified"
 msgstr "Změněno"
 
-#: src/winio.c:2150
+#: src/winio.c:2143
 msgid "View"
 msgstr "Pohled"
 
-#: src/winio.c:2164
+#: src/winio.c:2157
 msgid "DIR:"
 msgstr "Adresář:"
 
-#: src/winio.c:2171
+#: src/winio.c:2164
 msgid "File:"
 msgstr "Soubor:"
 
-#: src/winio.c:3360
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2261
+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/winio.c:3377
 #, 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:3492
+#: src/winio.c:3507
 msgid "The nano text editor"
 msgstr "Textový editor nano"
 
-#: src/winio.c:3493
+#: src/winio.c:3508
 msgid "version"
 msgstr "Verze"
 
-#: src/winio.c:3494
+#: src/winio.c:3509
 msgid "Brought to you by:"
 msgstr "Vyvíjeno:"
 
-#: src/winio.c:3495
+#: src/winio.c:3510
 msgid "Special thanks to:"
 msgstr "Zvláštní poděkování:"
 
-#: src/winio.c:3496
+#: src/winio.c:3511
 msgid "The Free Software Foundation"
 msgstr "The Free Software Foundation"
 
-#: src/winio.c:3497
+#: src/winio.c:3512
+msgid "the many translators and the TP"
+msgstr ""
+
+#: src/winio.c:3513
 msgid "For ncurses:"
 msgstr "Pro ncurses:"
 
-#: src/winio.c:3498
+#: src/winio.c:3514
 msgid "and anyone else we forgot..."
 msgstr "a všichni nejmenovaní..."
 
-#: src/winio.c:3499
+#: src/winio.c:3515
 msgid "Thank you for using nano!"
 msgstr "Děkujeme vám za to, že používáte nano!"
 
+#~ msgid "Internal error: can't match line %ld.  Please save your work."
+#~ msgstr ""
+#~ "Vnitřní chyba: Nelze nalézt shodu pro řádek %ld. Uložte, prosím, svou "
+#~ "práci."
+
+#~ msgid "line wrap"
+#~ msgstr "Zalomení řádku"
+
+#~ msgid "Insert File"
+#~ msgstr "Vložit soubor"
+
+#~ msgid "Go to previous screen"
+#~ msgstr "Jít na předchozí obrazovku"
+
+#~ msgid "Find Other Bracket"
+#~ msgstr "Najít jiné závorky"
+
+#~ msgid "Long line wrapping"
+#~ msgstr "Zalamování dlouhých řádků"
+
+#~ msgid "Soft line wrapping"
+#~ msgstr "Plynulé zalamování dlouhých řádků"
+
+#~ msgid "Allow generic undo [EXPERIMENTAL]"
+#~ msgstr "Povolit obecnou funkci pro zpět [pokusné]"
+
+#~ msgid "(ignored, for Pico compatibility)"
+#~ msgstr "(přechází se, pro slučitelnost s Pico)"
+
+#~ msgid "Must specify menu to bind key to (or \"all\")"
+#~ msgstr "Nabídka spojená s klávesou (nebo \"vše\") musí být zadána"
+
+#~ msgid "Missing flag"
+#~ msgstr "Chybí příznak"
+
+#~ msgid "Internal error: unknown type.  Please save your work"
+#~ msgstr "Vnitřní chyba: neznámý typ. Uložte, prosím, svou práci."
+
+#~ msgid "Internal error: Redo setup failed.  Please save your work"
+#~ msgstr ""
+#~ "Vnitřní chyba: Příprava na zopakování operace se nezdařila. Uložte, "
+#~ "prosím, svou práci."
+
+#~ msgid "Could not pipe"
+#~ msgstr "Přenos dat se nepodařilo provést"
+
 #~ msgid "Error writing backup file %s: File owner mismatch"
 #~ msgstr "Chyba při zápisu zálohovacího souboru %s: Nesouhlasí vlastník"
diff --git a/po/da.gmo b/po/da.gmo
index af55c44..67709a7 100644
--- a/po/da.gmo
+++ b/po/da.gmo
diff --git a/po/da.po b/po/da.po
index 0a644d3..b5b3dbc 100644
--- a/po/da.po
+++ b/po/da.po
@@ -3,7 +3,7 @@
 # This file is distributed under the same license as the nano package.
 #
 # Keld Simonsen <keld@dkuug.dk>, 2001-2003
-# Ask Hjorth Larsen <asklarsen@gmail.com>, 2010
+# Ask Hjorth Larsen <asklarsen@gmail.com>, 2010-2011
 #
 # Konventioner:
 #   view mode -> visningstilstand ?
@@ -13,117 +13,142 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 2.2.4pre2\n"
+"Project-Id-Version: nano 2.3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-22 06:34-0500\n"
-"PO-Revision-Date: 2010-06-14 14:48+0200\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
+"PO-Revision-Date: 2011-11-11 22:53+0100\n"
 "Last-Translator: Ask Hjorth Larsen <asklarsen@gmail.com>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
+"Language: da\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"
 
-#: src/browser.c:220
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:203
 msgid "Go To Directory"
 msgstr "Gå til katalog"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:860 src/files.c:2048
-#: src/nano.c:1060 src/search.c:220 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Afbrudt"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:246 src/browser.c:293
 #, c-format
 msgid "Can't go outside of %s in restricted mode"
 msgstr "Kan ikke gå uden for %s i begrænset tilstand"
 
-#: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:722
-#: src/files.c:731 src/files.c:1540 src/files.c:1659 src/files.c:1711
-#: src/files.c:1732 src/files.c:1855 src/files.c:2691 src/rcfile.c:568
-#: src/rcfile.c:1204
+#: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
+#: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
+#: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Fejl ved læsning af %s: %s"
 
-#: src/browser.c:303
+#: src/browser.c:283
 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:665 src/browser.c:674
+#: src/browser.c:626 src/browser.c:635
 msgid "(dir)"
 msgstr "(kat)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:632
 msgid "(parent dir)"
 msgstr "(ophavs-kat)"
 
-#: src/browser.c:801 src/search.c:185
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "Søg"
 
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:805 src/search.c:189
-msgid " [Case Sensitive]"
-msgstr " [Versalfølsom]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:811 src/search.c:195
-msgid " [Regexp]"
-msgstr " [Regudtr]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:817 src/search.c:201
-msgid " [Backwards]"
-msgstr " [Bagud]"
-
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "Søgningen genstartet fra begyndelsen"
 
-#: src/browser.c:1006 src/browser.c:1039 src/search.c:514 src/search.c:517
-#: src/search.c:574 src/search.c:577
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "Dette er det eneste tilfælde"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr "Intet aktuelt søgemønster"
 
-#: src/files.c:125
+#: src/files.c:139
+msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
+msgstr ""
+
+#: src/files.c:145
+#, fuzzy, c-format
+msgid "Couldn't determine hostname for lock file: %s"
+msgstr "Kunne ikke sætte rettighederne %o på %s: %s"
+
+#: src/files.c:165 src/files.c:175 src/files.c:212 src/files.c:222
+#, fuzzy, c-format
+msgid "Error writing lock file %s: %s"
+msgstr "Fejl ved skrivning af sikkerhedskopifil %s: %s"
+
+#: src/files.c:237
+#, fuzzy, c-format
+msgid "Error deleting lock file %s: %s"
+msgstr "Fejl ved skrivning af sikkerhedskopifil %s: %s"
+
+#: src/files.c:272
+#, fuzzy, c-format
+msgid "Error opening lock file %s: %s"
+msgstr "Fejl ved skrivning af sikkerhedskopifil %s: %s"
+
+#: src/files.c:282
+#, 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:297
+#, c-format
+msgid "File %s is being edited (by %s with %s, PID %d); continue?"
+msgstr ""
+
+#: src/files.c:308
+#, fuzzy, c-format
+msgid "Error writing lock file: Directory '%s' doesn't exist"
+msgstr "Fejl ved skrivning af sikkerhedskopifil %s: Filens ejer stemmer ikke"
+
+#: src/files.c:339
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Kan ikke indsætte fil fra ydersiden af %s"
 
-#: src/files.c:234
+#: src/files.c:467
 msgid "No more open file buffers"
 msgstr "Ikke flere åbne filbuffere"
 
-#: src/files.c:250
+#: src/files.c:484
 #, c-format
 msgid "Switched to %s"
 msgstr "Skiftede til %s"
 
-#: src/files.c:251 src/global.c:469 src/winio.c:2168
+#: src/files.c:485 src/global.c:953 src/winio.c:2161
 msgid "New Buffer"
 msgstr "Ny buffer"
 
-#: src/files.c:633
+#: src/files.c:874
 #, 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:638
+#: src/files.c:879
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
@@ -138,14 +163,14 @@ msgstr[1] ""
 "Læste %lu linjer (Konverteret fra DOS- og Mac-format - Advarsel: Ingen "
 "skriveadgang)"
 
-#: src/files.c:644
+#: src/files.c:885
 #, 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:648
+#: src/files.c:889
 #, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
@@ -156,14 +181,14 @@ msgstr[0] ""
 msgstr[1] ""
 "Læste %lu linjer (Konverteret fra Mac-format - Advarsel: Ingen skriveadgang)"
 
-#: src/files.c:654
+#: src/files.c:895
 #, 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:658
+#: src/files.c:899
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
@@ -174,497 +199,450 @@ msgstr[0] ""
 msgstr[1] ""
 "Læste %lu linjer (Konverteret fra DOS-format - Advarsel: Ingen skriveadgang)"
 
-#: src/files.c:664
+#: src/files.c:905
 #, 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:667
+#: src/files.c:908
 #, 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:700 src/files.c:736
+#: src/files.c:943 src/files.c:980
 msgid "Reading File"
 msgstr "Læser filen"
 
-#: src/files.c:706
+#: src/files.c:950
 msgid "New File"
 msgstr "Ny fil"
 
-#: src/files.c:709
+#: src/files.c:953
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" kunne ikke findes"
 
-#: src/files.c:717 src/rcfile.c:559 src/rcfile.c:1154 src/rcfile.c:1195
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" er et katalog"
 
-#: src/files.c:718 src/rcfile.c:560 src/rcfile.c:1155 src/rcfile.c:1196
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" er en enhedsfil"
 
-#: src/files.c:817
+#: src/files.c:1060
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Kommando at køre i ny buffer [fra %s] "
 
-#: src/files.c:819
+#: src/files.c:1062
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Kommando der skal køres [fra %s] "
 
-#: src/files.c:825
+#: src/files.c:1069
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Fil at indsætte i ny buffer [fra %s] "
 
-#: src/files.c:827
+#: src/files.c:1071
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Fil at indsætte [fra %s] "
 
-#: src/files.c:1077
+#: src/files.c:1320
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Tasten ugyldig i ikke-multibuffer-tilstand"
 
-#: src/files.c:1486
+# afsluttende mellemrum efter strengen bevirker sandsynligvis at tekstmarkøren står rigtigt
+#: src/files.c:1622
+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:1746
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Kan ikke skrive uden for %s"
 
-#: src/files.c:1501
+#: src/files.c:1761
 msgid "Cannot prepend or append to a symlink with --nofollow set"
 msgstr "Kan ikke foran- eller efterstille til symlænke med --nofollow givet"
 
-#: src/files.c:1581 src/files.c:1603 src/files.c:1621 src/files.c:1632
-#: src/files.c:1640 src/files.c:1667
+#: src/files.c:1843 src/files.c:1868 src/files.c:1886 src/files.c:1899
+#: src/files.c:1910 src/files.c:1939
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Fejl ved skrivning af sikkerhedskopifil %s: %s"
 
-#: src/files.c:1582 src/nano.c:701
+#: src/files.c:1844 src/nano.c:719
 msgid "Too many backup files?"
 msgstr "For mange sikkerhedskopifiler?"
 
-#: src/files.c:1687 src/files.c:1744 src/files.c:1763 src/files.c:1775
-#: src/files.c:1799 src/files.c:1817 src/files.c:1827 src/files.c:1863
-#: src/files.c:1868 src/files.c:2764 src/files.c:2773
+#: src/files.c:1959 src/files.c:2016 src/files.c:2035 src/files.c:2047
+#: src/files.c:2071 src/files.c:2089 src/files.c:2099 src/files.c:2135
+#: src/files.c:2140 src/files.c:3101 src/files.c:3110 src/files.c:3133
+#: src/files.c:3145
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Fejl ved skrivning af %s: %s"
 
-#: src/files.c:1721 src/text.c:2929 src/text.c:2941
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Fejl ved skrivning af midlertidig fil: %s"
 
-#: src/files.c:1900
+#: src/files.c:2173
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "Skrev %lu linje"
 msgstr[1] "Skrev %lu linjer"
 
-#: src/files.c:2004
+#: src/files.c:2278
 msgid " [DOS Format]"
 msgstr " [DOS-format]"
 
-#: src/files.c:2005
+#: src/files.c:2279
 msgid " [Mac Format]"
 msgstr " [Mac-format]"
 
-#: src/files.c:2007
+#: src/files.c:2281
 msgid " [Backup]"
 msgstr " [Sikkerhedskopi]"
 
-#: src/files.c:2015
+#: src/files.c:2289
 msgid "Prepend Selection to File"
 msgstr "Foranstil udvalg til fil"
 
-#: src/files.c:2016
+#: src/files.c:2290
 msgid "Append Selection to File"
 msgstr "Tilføj udvalg til fil"
 
-#: src/files.c:2017
+#: src/files.c:2291
 msgid "Write Selection to File"
 msgstr "Skriv udvalg til fil"
 
-#: src/files.c:2020
+#: src/files.c:2294
 msgid "File Name to Prepend to"
 msgstr "Filnavn at foranstille på"
 
-#: src/files.c:2021
+#: src/files.c:2295
 msgid "File Name to Append to"
 msgstr "Filnavn at tilføje på"
 
-#: src/files.c:2022
+#: src/files.c:2296
 msgid "File Name to Write"
 msgstr "Filnavn at skrive"
 
-#: src/files.c:2153
+#: src/files.c:2427
 msgid "File exists, OVERWRITE ? "
-msgstr "Filen findes, OVERSKRIV?"
+msgstr "Filen findes, OVERSKRIV? "
 
-#: src/files.c:2162
+#: src/files.c:2436
 msgid "Save file under DIFFERENT NAME ? "
-msgstr "Gem filen under ET ANDET NAVN?"
+msgstr "Gem filen under ET ANDET NAVN? "
 
-#: src/files.c:2173
+#: src/files.c:2450
 msgid "File was modified since you opened it, continue saving ? "
-msgstr "Filen blev ændret siden du sidst åbnede den, gem alligevel?"
+msgstr "Filen blev ændret siden du sidst åbnede den, gem alligevel? "
 
-#: src/files.c:2611
+#: src/files.c:2882
 msgid "(more)"
 msgstr "(mere)"
 
-#: src/files.c:2694 src/rcfile.c:1220
+#: src/files.c:2974
 #, c-format
 msgid ""
 "\n"
-"Press Enter to continue starting nano.\n"
+"Press Enter to continue\n"
 msgstr ""
 "\n"
-"Tryk enter for at fortsætte opstart af nano.\n"
+"Tryk retur for at fortsætte\n"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:415 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Annullér"
+#: src/files.c:2989
+#, fuzzy, c-format
+msgid ""
+"Unable to create directory %s: %s\n"
+"It is required for saving/loading search history or cursor positions.\n"
+msgstr ""
+"Kan ikke oprette kataloget %s: %s\n"
+"Dette kræves for at kunne gemme/hente søgehistorik eller markørposition\n"
 
-# max 10 tegn
-#: src/global.c:416
-msgid "Replace"
-msgstr "Erstat"
+#: src/files.c:2995
+#, fuzzy, 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 ""
+"Stien %s er ikke et katalog, men skal være det.\n"
+"Nano vil ikke kunne indlæse eller gemme søge- eller markørpositionshistorik\n"
 
-# max 10 tegn
-#: src/global.c:417
-msgid "No Replace"
-msgstr "ErstatIkke"
+#: src/files.c:3012
+#, 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 ""
+"Fandt en ældre nanohistorikfil (%s), som jeg forsøgte at flytte\n"
+"til den foretrukne placering (%s), men stødte på en fejl: %s"
 
-# max 10 tegn
-#: src/global.c:420
-msgid "Case Sens"
-msgstr "VersalFøls"
+#: src/files.c:3016
+#, 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 ""
+"Fandt en ældre nanohistorikfil (%s), som jeg flyttede\n"
+"til den foretrukne placering (%s)\n"
+"(se OSS om nano vedrørende denne ændring)"
 
 # max 10 tegn
-#: src/global.c:421
-msgid "Backwards"
-msgstr "Baglæns"
-
-#: src/global.c:425
-msgid "Regexp"
-msgstr "Regudtr"
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
+#: src/global.c:477
+msgid "Exit"
+msgstr "Afslut"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:451
-msgid "PrevHstory"
-msgstr "ForrigHist"
+#: src/global.c:478
+msgid "Close"
+msgstr "Luk"
 
-#: src/global.c:452
-msgid "NextHstory"
-msgstr "NæstHist"
+#: src/global.c:479
+#, fuzzy
+msgid "Uncut Text"
+msgstr "Indsæt"
 
-#: src/global.c:453
-msgid "Go To Text"
-msgstr "Gå til tekst"
+#: src/global.c:481
+#, fuzzy
+msgid "Unjustify"
+msgstr "AfOmbryd"
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:455
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:485
 msgid "WhereIs Next"
 msgstr "Find næste"
 
-#: src/global.c:457
-msgid "First File"
-msgstr "Første fil"
-
-#: src/global.c:458
-msgid "Last File"
-msgstr "Sidste fil"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:460
-msgid "To Files"
-msgstr "Til filer"
-
-# max 16 tegn
-#: src/global.c:462
-msgid "DOS Format"
-msgstr "DOS-format"
-
-# max 16 tegn
-#: src/global.c:463
-msgid "Mac Format"
-msgstr "Mac-format"
-
-# max 16 tegn
-#: src/global.c:464
-msgid "Append"
-msgstr "Tilføj ved enden"
-
-# max 16 tegn
-#: src/global.c:465
-msgid "Prepend"
-msgstr "Tilføj ved start"
-
-# max 16 tegn
-#: src/global.c:466
-msgid "Backup File"
-msgstr "SikrKopiér fil"
-
-# max 16 tegn
-#: src/global.c:467
-msgid "Execute Command"
-msgstr "Kør kommando"
-
-# max 16 tegn
-#: src/global.c:471
-msgid "Go To Dir"
-msgstr "Gå til katalog"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:480
-msgid "Get Help"
-msgstr "Få hjælp"
-
 # max 10 tegn
-#: src/global.c:481
-msgid "Exit"
-msgstr "Afslut"
-
-# max 10 tegn
-#: src/global.c:482
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:492
 msgid "Where Is"
 msgstr "Hvor er"
 
 # max 10 tegn
-#: src/global.c:483
-msgid "Prev Page"
-msgstr "ForrigSide"
-
-# max 10 tegn
-#: src/global.c:484
-msgid "Next Page"
-msgstr "NæsteSide"
-
-# max 10 tegn
-#: src/global.c:485
-msgid "First Line"
-msgstr "FørstLinje"
+#: src/global.c:493
+msgid "Replace"
+msgstr "Erstat"
 
-# max 10 tegn
-#: src/global.c:486
-msgid "Last Line"
-msgstr "SidstLinje"
+#: src/global.c:494
+msgid "Go To Line"
+msgstr "Gå til linje"
 
-# max 10 tegn
-#: src/global.c:487
-msgid "Suspend"
-msgstr "I baggrund"
+#: src/global.c:495
+msgid "Prev Line"
+msgstr "Forrige linje"
 
-# max 10 tegn
-#: src/global.c:489
-msgid "Beg of Par"
-msgstr "AfsnitStrt"
+#: src/global.c:496
+msgid "Next Line"
+msgstr "Næste linje"
 
-# max 10 tegn
-#: src/global.c:490
-msgid "End of Par"
-msgstr "AfsnitSlut"
+#: src/global.c:497
+msgid "Read File"
+msgstr "Læs fil"
 
 # max 10 tegn
-#: src/global.c:491
+#: src/global.c:499
 msgid "FullJstify"
 msgstr "FuldOmbryd"
 
 # max 10 tegn
-#: src/global.c:493
+#: src/global.c:501
 msgid "Refresh"
 msgstr "Opdatér"
 
-# okay, her slutter 'max 10 tegn'-regionen vist, eftersom den engelske er på 11
-#: src/global.c:495
-msgid "Insert File"
-msgstr "Indsæt fil"
-
-#: src/global.c:497
-msgid "Go To Line"
-msgstr "Gå til linje"
-
-#: src/global.c:500
+#. 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:507
 msgid "Justify the current paragraph"
 msgstr "Ombryd den aktuelle paragraf"
 
-#. 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:505
+#: src/global.c:509
 msgid "Cancel the current function"
 msgstr "Afbryd den aktuelle funktion"
 
-#: src/global.c:506
+#: src/global.c:510
 msgid "Display this help text"
 msgstr "Vis denne hjælpetekst"
 
-#: src/global.c:509
+#: src/global.c:513
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Luk nuværende filbuffer / afslut nano"
 
-#: src/global.c:511
+#: src/global.c:515
 msgid "Exit from nano"
 msgstr "Afslut nano"
 
-#: src/global.c:515
+#: src/global.c:519
 msgid "Write the current file to disk"
 msgstr "Skriv den aktuelle fil til disk"
 
-#: src/global.c:517
+#: src/global.c:521
 msgid "Insert another file into the current one"
 msgstr "Indsæt en anden fil i den nuværende"
 
-#: src/global.c:519
+#: src/global.c:523
 msgid "Search for a string or a regular expression"
 msgstr "Søg efter en streng eller et regulært udtryk"
 
-#: src/global.c:520
-msgid "Go to previous screen"
-msgstr "Gå til forrige skærm"
+#: src/global.c:526
+#, fuzzy
+msgid "Search for a string"
+msgstr "Søg efter en streng eller et regulært udtryk"
+
+#: src/global.c:528
+#, fuzzy
+msgid "Go one screenful up"
+msgstr "Gå til næste skærm"
 
-#: src/global.c:521
-msgid "Go to next screen"
+#: src/global.c:529
+#, fuzzy
+msgid "Go one screenful down"
 msgstr "Gå til næste skærm"
 
-#: src/global.c:523
+#: src/global.c:531
 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:525
+#: src/global.c:533
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Indsæt fra udklipsbufferen i aktuel linje"
 
-#: src/global.c:527
+#: src/global.c:534
 msgid "Display the position of the cursor"
 msgstr "Vis markørens position"
 
-#: src/global.c:529
+#: src/global.c:536
 msgid "Invoke the spell checker, if available"
 msgstr "Start stavekontrollen, hvis tilgængelig"
 
-#: src/global.c:531
+#: src/global.c:538
 msgid "Replace a string or a regular expression"
 msgstr "Erstat en streng eller et regulært udtryk"
 
-#: src/global.c:532
+#: src/global.c:539
 msgid "Go to line and column number"
 msgstr "Gå til linje- og kolonnenummer"
 
-#: src/global.c:534
-msgid "Mark text at the cursor position"
+#: src/global.c:541
+#, fuzzy
+msgid "Mark text starting from the cursor position"
 msgstr "Markér tekst ved aktuel markørposition"
 
-#: src/global.c:535
-msgid "Repeat last search"
+#: src/global.c:542
+#, fuzzy
+msgid "Repeat the last search"
 msgstr "Gentag sidste søgning"
 
-#: src/global.c:537
+#: src/global.c:544
 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:538
+#: src/global.c:545
 msgid "Indent the current line"
 msgstr "Indryk den aktuelle linje"
 
-#: src/global.c:539
+#: src/global.c:546
 msgid "Unindent the current line"
 msgstr "Fjern indrykning af aktuel linje"
 
-#: src/global.c:540
+#: src/global.c:547
 msgid "Undo the last operation"
 msgstr "Fortryd sidste handling"
 
-#: src/global.c:541
+#: src/global.c:548
 msgid "Redo the last undone operation"
 msgstr "Omgør sidste fortrudte handling"
 
-#: src/global.c:543
+#: src/global.c:550
 msgid "Go forward one character"
 msgstr "Gå et tegn fremad"
 
-#: src/global.c:544
+#: src/global.c:551
 msgid "Go back one character"
 msgstr "Gå et tegn bagud"
 
-#: src/global.c:546
+#: src/global.c:553
 msgid "Go forward one word"
 msgstr "Gå et ord fremad"
 
-#: src/global.c:547
+#: src/global.c:554
 msgid "Go back one word"
 msgstr "Gå et ord bagud"
 
-#: src/global.c:549
+#: src/global.c:556
 msgid "Go to previous line"
 msgstr "Gå til forrige linje"
 
-#: src/global.c:550
+#: src/global.c:557
 msgid "Go to next line"
 msgstr "Gå til næste linje"
 
-#: src/global.c:551
+#: src/global.c:558
 msgid "Go to beginning of current line"
 msgstr "Gå til begyndelsen af aktuel linje"
 
-#: src/global.c:552
+#: src/global.c:559
 msgid "Go to end of current line"
 msgstr "Gå til enden af aktuel linje"
 
-#: src/global.c:555
+#: src/global.c:562
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "Gå til starten af afsnittet; dernæst af forrige afsnit"
 
-#: src/global.c:557
+#: src/global.c:564
 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:560
+#: src/global.c:566
 msgid "Go to the first line of the file"
 msgstr "Gå til filens første linje"
 
-#: src/global.c:562
+#: src/global.c:567
 msgid "Go to the last line of the file"
 msgstr "Gå til filens sidste linje"
 
-#: src/global.c:564
+#: src/global.c:569
 msgid "Go to the matching bracket"
 msgstr "Gå til modsvarende klamme"
 
-#: src/global.c:566
+#: src/global.c:571
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "Rul en linje op uden at flytte markøren"
 
-#: src/global.c:568
+#: src/global.c:573
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "Rul en linje ned uden at flytte markøren"
 
-#: src/global.c:572
+#: src/global.c:576
 msgid "Switch to the previous file buffer"
 msgstr "Gå til forrige filbuffer"
 
-#: src/global.c:574
+#: src/global.c:577
 msgid "Switch to the next file buffer"
 msgstr "Gå til næste filbuffer"
 
-#: src/global.c:577
+#: src/global.c:579
 msgid "Insert the next keystroke verbatim"
 msgstr "Indsæt næste tasteanslag ordret"
 
-#: src/global.c:579
+#: src/global.c:580
 msgid "Insert a tab at the cursor position"
 msgstr "Indsæt et tabulatortegn ved markørpositionen"
 
@@ -672,330 +650,466 @@ msgstr "Indsæt et tabulatortegn ved markørpositionen"
 msgid "Insert a newline at the cursor position"
 msgstr "Indsæt et linjeskift ved markørpositionen"
 
-#: src/global.c:583
+#: src/global.c:582
 msgid "Delete the character under the cursor"
 msgstr "Fjern tegnet under markøren"
 
-#: src/global.c:585
+#: src/global.c:584
 msgid "Delete the character to the left of the cursor"
 msgstr "Fjern tegnet til venstre for markøren"
 
-#: src/global.c:588
+#: src/global.c:587
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Klip fra markørpositionen til filens slutning"
 
-#: src/global.c:591
+#: src/global.c:590
 msgid "Justify the entire file"
 msgstr "Ombryd hele filen"
 
-#: src/global.c:595
+#: src/global.c:594
 msgid "Count the number of words, lines, and characters"
 msgstr "Tæl ord, linjer og tegn"
 
-#: src/global.c:598
+#: src/global.c:597
 msgid "Refresh (redraw) the current screen"
 msgstr "Opdatér (genskriv) den aktuelle skærm"
 
-#: src/global.c:600
+#: src/global.c:599
 msgid "Suspend the editor (if suspend is enabled)"
 msgstr "Kør i baggrunden (hvis suspend er slået til)"
 
-#: src/global.c:603
+#: src/global.c:602
 msgid "Toggle the case sensitivity of the search"
 msgstr "Slå forskel på store og små bogstaver til eller fra"
 
-#: src/global.c:605
+#: src/global.c:604
 msgid "Reverse the direction of the search"
 msgstr "Omvend søgeretning"
 
-#: src/global.c:609
+#: src/global.c:608
 msgid "Toggle the use of regular expressions"
 msgstr "Slå brug af regulære udtryk til eller fra"
 
-#: src/global.c:613
+#: src/global.c:612
 msgid "Recall the previous search/replace string"
 msgstr "Husk de foregående søg og erstat-strenge"
 
-#: src/global.c:615
+#: src/global.c:614
 msgid "Recall the next search/replace string"
 msgstr "Husk de følgende søg og erstat-strenge"
 
-#: src/global.c:618
+#: src/global.c:617
 msgid "Go to file browser"
 msgstr "Gå til filbrowser"
 
-#: src/global.c:621
+#: src/global.c:620
 msgid "Toggle the use of DOS format"
 msgstr "Slå DOS-format til eller fra"
 
-#: src/global.c:622
+#: src/global.c:621
 msgid "Toggle the use of Mac format"
 msgstr "Slå Mac-format til eller fra"
 
-#: src/global.c:624
+#: src/global.c:622
 msgid "Toggle appending"
 msgstr "Slå efterstillet tilføjelse til eller fra"
 
-#: src/global.c:625
+#: src/global.c:623
 msgid "Toggle prepending"
 msgstr "Slå foranstillet tilføjelse til eller fra"
 
-#: src/global.c:628
+#: src/global.c:624
 msgid "Toggle backing up of the original file"
 msgstr "Slå sikkerhedskopiering af originalfil til eller fra"
 
-#: src/global.c:629
+#: src/global.c:625
 msgid "Execute external command"
 msgstr "Udfør ekstern kommando"
 
-#: src/global.c:633
+#: src/global.c:628
 msgid "Toggle the use of a new buffer"
 msgstr "Slå brug af ny buffer til eller fra"
 
-#: src/global.c:636
+#: src/global.c:631
 msgid "Exit from the file browser"
 msgstr "Gå ud af filbrowseren"
 
-#: src/global.c:638
+#: src/global.c:632
 msgid "Go to the first file in the list"
 msgstr "Gå til første fil i listen"
 
-#: src/global.c:640
+#: src/global.c:633
 msgid "Go to the last file in the list"
 msgstr "Gå til sidste fil i listen"
 
-#: src/global.c:641
-msgid "Go to the next file in the list"
-msgstr "Gå til næste fil i listen"
-
-#: src/global.c:642
+#: src/global.c:634
 msgid "Go to the previous file in the list"
 msgstr "Gå til forrige fil i listen"
 
-#: src/global.c:643
+#: src/global.c:635
+msgid "Go to the next file in the list"
+msgstr "Gå til næste fil i listen"
+
+#: src/global.c:636
 msgid "Go to directory"
 msgstr "Gå til katalog"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:670
-msgid "Close"
-msgstr "Luk"
+#: src/global.c:639
+#, fuzzy
+msgid "Invoke the linter, if available"
+msgstr "Start stavekontrollen, hvis tilgængelig"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:679
-msgid "WriteOut"
+#: src/global.c:640
+#, fuzzy
+msgid "Go to previous linter msg"
+msgstr "Gå til forrige linje"
+
+#: src/global.c:641
+#, fuzzy
+msgid "Go to next linter msg"
+msgstr "Gå til næste linje"
+
+#: src/global.c:642
+#, fuzzy
+msgid "Invoke formatter, if available"
+msgstr "Start stavekontrollen, hvis tilgængelig"
+
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:662
+msgid "Get Help"
+msgstr "Få hjælp"
+
+#: src/global.c:665 src/prompt.c:1084
+msgid "Cancel"
+msgstr "Annullér"
+
+#: src/global.c:678
+#, fuzzy
+msgid "Write Out"
 msgstr "Gem"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+# max 16 tegn
+#: src/global.c:704
+msgid "Go To Dir"
+msgstr "Gå til katalog"
+
+#: src/global.c:719
+msgid "Cut Text"
+msgstr "Klip ud"
+
+#: src/global.c:728
 msgid "Justify"
 msgstr "Ombryd"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:696
-msgid "Read File"
-msgstr "Læs fil"
+#: src/global.c:733
+msgid "To Spell"
+msgstr "Stavetjek"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:713
-msgid "Cut Text"
-msgstr "Klip ud"
+#: src/global.c:738
+#, fuzzy
+msgid "To Linter"
+msgstr "Gå til linje"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:718
-msgid "UnJustify"
-msgstr "AfOmbryd"
+# max 16 tegn
+#: src/global.c:740
+#, fuzzy
+msgid "Formatter"
+msgstr "DOS-format"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:723
-msgid "UnCut Text"
-msgstr "Indsæt"
+# max 10 tegn
+#: src/global.c:745
+msgid "Case Sens"
+msgstr "VersalFøls"
+
+#: src/global.c:750
+msgid "Regexp"
+msgstr "Regudtr"
+
+# max 10 tegn
+#: src/global.c:755
+msgid "Backwards"
+msgstr "Baglæns"
+
+# max 10 tegn
+#: src/global.c:762
+msgid "No Replace"
+msgstr "ErstatIkke"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:728 src/global.c:755
+#: src/global.c:770
 msgid "Cur Pos"
 msgstr "Akt. pos"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:737
-msgid "To Spell"
-msgstr "Stavetjek"
+# max 10 tegn
+#: src/global.c:780
+msgid "Prev Page"
+msgstr "ForrigSide"
 
-#: src/global.c:771
+# max 10 tegn
+#: src/global.c:782
+msgid "Next Page"
+msgstr "NæsteSide"
+
+# max 10 tegn
+#: src/global.c:785
+msgid "First Line"
+msgstr "FørstLinje"
+
+# max 10 tegn
+#: src/global.c:787
+msgid "Last Line"
+msgstr "SidstLinje"
+
+#: src/global.c:794
+#, fuzzy
+msgid "To Bracket"
+msgstr "Ikke en klamme"
+
+#: src/global.c:797
 msgid "Mark Text"
 msgstr "Markér tekst"
 
-#: src/global.c:777
+#: src/global.c:800
 msgid "Copy Text"
 msgstr "Kopiér tekst"
 
-#: src/global.c:780
+#: src/global.c:803
 msgid "Indent Text"
 msgstr "Indryk tekst"
 
-#: src/global.c:783
+#: src/global.c:805
 msgid "Unindent Text"
 msgstr "Fjern indrykning"
 
-#: src/global.c:787
+#: src/global.c:808
 msgid "Undo"
 msgstr "Fortryd"
 
-#: src/global.c:790
+#: src/global.c:810
 msgid "Redo"
 msgstr "Omgør"
 
-#: src/global.c:796 src/global.c:800
-msgid "Forward"
-msgstr "Fremad"
-
-#: src/global.c:806 src/global.c:810
+#: src/global.c:814 src/global.c:820
 msgid "Back"
 msgstr "Bagud"
 
-#: src/global.c:817
-msgid "Next Word"
-msgstr "Næste ord"
+#: src/global.c:816 src/global.c:822
+msgid "Forward"
+msgstr "Fremad"
 
-#: src/global.c:820
+#: src/global.c:827
 msgid "Prev Word"
 msgstr "Forrige ord"
 
-#: src/global.c:824
-msgid "Prev Line"
-msgstr "Forrige linje"
-
-#: src/global.c:827
-msgid "Next Line"
-msgstr "Næste linje"
+#: src/global.c:829
+msgid "Next Word"
+msgstr "Næste ord"
 
-#: src/global.c:830
+#: src/global.c:833
 msgid "Home"
 msgstr "Hjem"
 
-#: src/global.c:833
+#: src/global.c:835
 msgid "End"
 msgstr "Slut"
 
-#: src/global.c:845
-msgid "Find Other Bracket"
-msgstr "Find anden klamme"
+# max 10 tegn
+#: src/global.c:844
+msgid "Beg of Par"
+msgstr "AfsnitStrt"
+
+# max 10 tegn
+#: src/global.c:846
+msgid "End of Par"
+msgstr "AfsnitSlut"
 
-#: src/global.c:848
+#: src/global.c:851
 msgid "Scroll Up"
 msgstr "Rul op"
 
-#: src/global.c:851
+#: src/global.c:853
 msgid "Scroll Down"
 msgstr "Rul ned"
 
-#: src/global.c:856
-msgid "Previous File"
+#: src/global.c:858
+#, fuzzy
+msgid "Prev File"
 msgstr "Foregående fil"
 
-#: src/global.c:858
+#: src/global.c:860
 msgid "Next File"
 msgstr "Næste fil"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:862 src/text.c:3045
-msgid "Verbatim Input"
+#: src/global.c:869
+#, fuzzy
+msgid "Verbatim"
 msgstr "Ordret input"
 
-#: src/global.c:867
+#: src/global.c:872
 msgid "Tab"
 msgstr "Tabulator"
 
-#: src/global.c:870
+#: src/global.c:874
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:873
+#: src/global.c:876
 msgid "Delete"
 msgstr "Fjern"
 
-#: src/global.c:876
+#: src/global.c:878
 msgid "Backspace"
 msgstr "Slet baglæns"
 
-#: src/global.c:893
+#: src/global.c:888
 msgid "CutTillEnd"
 msgstr "KlipResten"
 
-#: src/global.c:906
+#: src/global.c:898
 msgid "Word Count"
 msgstr "Ordtælling"
 
-#: src/global.c:1367
+# max 10 tegn
+#: src/global.c:905
+msgid "Suspend"
+msgstr "I baggrund"
+
+#: src/global.c:910
+msgid "PrevHstory"
+msgstr "ForrigHist"
+
+#: src/global.c:913
+msgid "NextHstory"
+msgstr "NæstHist"
+
+#: src/global.c:917
+msgid "Go To Text"
+msgstr "Gå til tekst"
+
+# max 16 tegn
+#: src/global.c:928
+msgid "DOS Format"
+msgstr "DOS-format"
+
+# max 16 tegn
+#: src/global.c:931
+msgid "Mac Format"
+msgstr "Mac-format"
+
+# max 16 tegn
+#: src/global.c:934
+msgid "Append"
+msgstr "Tilføj ved enden"
+
+# max 16 tegn
+#: src/global.c:936
+msgid "Prepend"
+msgstr "Tilføj ved start"
+
+# max 16 tegn
+#: src/global.c:939
+msgid "Backup File"
+msgstr "SikrKopiér fil"
+
+# max 16 tegn
+#: src/global.c:946
+msgid "Execute Command"
+msgstr "Kør kommando"
+
+#: src/global.c:961
+msgid "To Files"
+msgstr "Til filer"
+
+#: src/global.c:964
+msgid "First File"
+msgstr "Første fil"
+
+#: src/global.c:966
+msgid "Last File"
+msgstr "Sidste fil"
+
+#: src/global.c:977
+#, fuzzy
+msgid "Prev Lint Msg"
+msgstr "Forrige linje"
+
+#: src/global.c:979
+#, fuzzy
+msgid "Next Lint Msg"
+msgstr "Næste linje"
+
+#. TRANSLATORS: The next seventeen strings are toggle descriptions;
+#. * they are best kept shorter than 40 characters, but may be longer.
+#: src/global.c:1227
 msgid "Help mode"
 msgstr "Hjælpetilstand"
 
-#: src/global.c:1369
+#: src/global.c:1229
 msgid "Constant cursor position display"
 msgstr "Konstant visning af markørposition"
 
-#: src/global.c:1371
+#: src/global.c:1231
 msgid "Use of one more line for editing"
 msgstr "Brug af en ekstra linje til redigering"
 
-#: src/global.c:1373
+#: src/global.c:1233
 msgid "Smooth scrolling"
 msgstr "Jævn rulning"
 
-#: src/global.c:1375
+#: src/global.c:1235
+#, fuzzy
+msgid "Soft wrapping of overlong lines"
+msgstr "Ombryd ikke lange linjer"
+
+#: src/global.c:1237
 msgid "Whitespace display"
 msgstr "Visning af mellemrum"
 
-#: src/global.c:1377
+#: src/global.c:1239
 msgid "Color syntax highlighting"
 msgstr "Farvefremhævelse af syntaks"
 
-#: src/global.c:1379
+#: src/global.c:1241
 msgid "Smart home key"
 msgstr "Smart home-tast"
 
-#: src/global.c:1381
+#: src/global.c:1243
 msgid "Auto indent"
 msgstr "Automatisk indrykning"
 
-#: src/global.c:1383
+#: src/global.c:1245
 msgid "Cut to end"
 msgstr "Klip ud til enden"
 
-#: src/global.c:1385
-msgid "Long line wrapping"
-msgstr "Ombrydning af lange linjer"
+#: src/global.c:1247
+#, fuzzy
+msgid "Hard wrapping of overlong lines"
+msgstr "Ombryd ikke lange linjer"
 
-#: src/global.c:1387
+#: src/global.c:1249
 msgid "Conversion of typed tabs to spaces"
 msgstr "Konvertering af skrevne tab-tegn til mellemrum"
 
-#: src/global.c:1389
+#: src/global.c:1251
 msgid "Backup files"
 msgstr "Sikkerhedskopiér filer"
 
-#: src/global.c:1391
+#: src/global.c:1253
 msgid "Multiple file buffers"
 msgstr "Flere fil-buffere"
 
-#: src/global.c:1393
+#: src/global.c:1255
 msgid "Mouse support"
 msgstr "Museunderstøttelse"
 
-#: src/global.c:1395
+#: src/global.c:1257
 msgid "No conversion from DOS/Mac format"
 msgstr "Ingen konvertering fra DOS/Mac-format"
 
-#: src/global.c:1397
+#: src/global.c:1259
 msgid "Suspension"
 msgstr "Suspension"
 
-#: src/global.c:1399
-msgid "Soft line wrapping"
-msgstr "Blød linjeombrydning"
-
-#: src/help.c:236
+#: src/help.c:205
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1017,7 +1131,7 @@ msgstr ""
 "teksten. Hvis du taster enter uden at indtaste nogen tekst vil den "
 "foregående søgning blive udført.  "
 
-#: src/help.c:245
+#: src/help.c:214
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1030,7 +1144,7 @@ msgstr ""
 "\n"
 "Følgende funktionstaster er tilgængelige i søgetilstand:\n"
 
-#: src/help.c:251
+#: src/help.c:220
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1050,7 +1164,7 @@ msgstr ""
 " Følgende funktionstaster er til stede i Gå til linje-tilstand:\n"
 "\n"
 
-#: src/help.c:260
+#: src/help.c:229
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1073,7 +1187,7 @@ msgstr ""
 "få den til at blive indlæst i en separat buffer (brug Meta-< og > til at "
 "skifte mellem filbuffere).  "
 
-#: src/help.c:269
+#: src/help.c:238
 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"
@@ -1086,7 +1200,7 @@ msgstr ""
 "\n"
 " Følgende funktionstaster er tilgængelige i Indsæt fil-tilstand:\n"
 
-#: src/help.c:275
+#: src/help.c:244
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1114,7 +1228,7 @@ msgstr ""
 " Følgende funktionstaster er til stede i Skriv fil-tilstand:\n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:258
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1138,7 +1252,7 @@ msgstr ""
 " Følgende funktionstaster er til stede i filskimmeren:\n"
 "\n"
 
-#: src/help.c:302
+#: src/help.c:271
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1162,7 +1276,7 @@ msgstr ""
 "foregående søgning blive udført. \n"
 "\n"
 
-#: src/help.c:311
+#: src/help.c:280
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1170,7 +1284,7 @@ msgstr ""
 " Følgende funktionstaster er til stede i browsersøgetilstand:\n"
 "\n"
 
-#: src/help.c:315
+#: src/help.c:284
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1193,7 +1307,7 @@ msgstr ""
 "filbrowser:\n"
 "\n"
 
-#: src/help.c:328
+#: src/help.c:297
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1217,7 +1331,7 @@ msgstr ""
 " Følgende andre funktioner er til stede i stavekontrol-tilstand:\n"
 "\n"
 
-#: src/help.c:343
+#: src/help.c:312
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1237,7 +1351,7 @@ msgstr ""
 " Følgende taster er tilgængelige i denne tilstand:\n"
 "\n"
 
-#: src/help.c:356
+#: src/help.c:325
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1257,7 +1371,7 @@ msgstr ""
 "hovedvinduet som viser filen der redigeres. Statuslinjen er tredje linje fra "
 "underkanten og viser vigtige meddelelser.  "
 
-#: src/help.c:366
+#: src/help.c:335
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1275,7 +1389,7 @@ msgstr ""
 "(M-), og kan skrives enten ved at taste Esc, Alt eller selve Meta-tasten "
 "afhængigt af tastaturopsætningen.  "
 
-#: src/help.c:375
+#: src/help.c:344
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1289,15 +1403,15 @@ msgstr ""
 "Alternative taster vises i parenteser:\n"
 "\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:376 src/help.c:448
 msgid "enable/disable"
 msgstr "aktivér/deaktivér"
 
-#: src/nano.c:587
+#: src/nano.c:601
 msgid "Key invalid in view mode"
 msgstr "Tasten ugyldig i visningstilstand"
 
-#: src/nano.c:695
+#: src/nano.c:713
 #, c-format
 msgid ""
 "\n"
@@ -1306,7 +1420,7 @@ msgstr ""
 "\n"
 "Bufferen skrevet til %s\n"
 
-#: src/nano.c:697
+#: src/nano.c:715
 #, c-format
 msgid ""
 "\n"
@@ -1315,7 +1429,7 @@ msgstr ""
 "\n"
 "Buffer ikke skrevet til %s: %s\n"
 
-#: src/nano.c:700
+#: src/nano.c:718
 #, c-format
 msgid ""
 "\n"
@@ -1324,11 +1438,11 @@ msgstr ""
 "\n"
 "Buffer ikke skrevet: %s\n"
 
-#: src/nano.c:723
+#: src/nano.c:743
 msgid "Window size is too small for nano...\n"
 msgstr "Vinduestørrelsen er for lille til Nano...\n"
 
-#: src/nano.c:816
+#: src/nano.c:836
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
@@ -1337,251 +1451,260 @@ msgstr ""
 "Brug: nano [FLAG] [[+LINJE,KOLONNE] FIL]...\n"
 "\n"
 
-#: src/nano.c:819
+#: src/nano.c:839
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Flag\t\tLangt GNU-flag\t\tBetydning\n"
 
-#: src/nano.c:821
+#: src/nano.c:841
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Flag\t\tBetydning\n"
 
-#: src/nano.c:824
-msgid "Show this message"
-msgstr "Vis denne meddelelse"
-
-#: src/nano.c:825
+#: src/nano.c:844
 msgid "+LINE,COLUMN"
 msgstr "+LINJE,KOLONNE"
 
-#: src/nano.c:826
+#. TRANSLATORS: The next forty or so strings are option descriptions
+#. * for the --help output.  Try to keep them at most 40 characters.
+#: src/nano.c:847
 msgid "Start at line LINE, column COLUMN"
 msgstr "Start ved linjenummer LINJE, kolonne KOLONNE"
 
-#: src/nano.c:828
+#: src/nano.c:849
 msgid "Enable smart home key"
 msgstr "Brug smart home-tast"
 
-#: src/nano.c:829
+#: src/nano.c:850
 msgid "Save backups of existing files"
 msgstr "Gem sikkerhedskopier af eksisterende filer"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "-C <dir>"
 msgstr "-C <kat>"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<kat>"
 
-#: src/nano.c:831
+#: src/nano.c:852
 msgid "Directory for saving unique backup files"
 msgstr "Katalog til at gemme unikke sikkerhedskopifiler"
 
-#: src/nano.c:834
+#: src/nano.c:855
 msgid "Use bold instead of reverse video text"
 msgstr "Brug fed frem for omvendt video-tekst"
 
-#: src/nano.c:837
+#: src/nano.c:858
 msgid "Convert typed tabs to spaces"
 msgstr "Konvertér skrevne tabulatortegn til mellemrum"
 
-#: src/nano.c:840
+#: src/nano.c:861
 msgid "Enable multiple file buffers"
 msgstr "Tillad flere fil-buffere"
 
-#: src/nano.c:845
+#: src/nano.c:865
+msgid "Use (vim-style) lock files"
+msgstr ""
+
+#: src/nano.c:869
 msgid "Log & read search/replace string history"
 msgstr "Log & læs streng-historik for søg og erstat"
 
-#: src/nano.c:848
+#: src/nano.c:873
 msgid "Don't look at nanorc files"
 msgstr "Se ikke på nanorc-filer"
 
-#: src/nano.c:851
+#: src/nano.c:876
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Fiks forvirringsproblem med numerisk tastatur"
 
-#: src/nano.c:853
+#: src/nano.c:878
 msgid "Don't add newlines to the ends of files"
 msgstr "Tilføj ikke linjeskift til slut i filer"
 
-#: src/nano.c:856
+#: src/nano.c:881
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Konvertér ikke fra DOS/Mac-format"
 
-#: src/nano.c:858
+#: src/nano.c:883
 msgid "Use one more line for editing"
 msgstr "Brug en ekstra linje til redigering"
 
-#: src/nano.c:860
+#: src/nano.c:886
+msgid "Log & read location of cursor position"
+msgstr "Gem & læs markørens position"
+
+#: src/nano.c:889
 msgid "-Q <str>"
 msgstr "-Q <str>"
 
-#: src/nano.c:860
+#: src/nano.c:889
 msgid "--quotestr=<str>"
 msgstr "--quotestr=<str>"
 
-#: src/nano.c:861
+#: src/nano.c:890
 msgid "Quoting string"
 msgstr "Anførelsesstreng"
 
-#: src/nano.c:863
+#: src/nano.c:892
 msgid "Restricted mode"
 msgstr "Begrænset tilstand"
 
-#: src/nano.c:866
+#: src/nano.c:895
 msgid "Scroll by line instead of half-screen"
 msgstr "Rul linjevis frem for en halv skærm ad gangen"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "-T <#cols>"
 msgstr "-T <#kolonner>"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#kolonner>"
 
-#: src/nano.c:869
+#: src/nano.c:898
 msgid "Set width of a tab to #cols columns"
 msgstr "Sæt bredden på et tabulatortegn til #kolonner"
 
-#: src/nano.c:871
+#: src/nano.c:900
 msgid "Do quick statusbar blanking"
 msgstr "Ryd statuslinje hurtigt"
 
-#: src/nano.c:874
+#: src/nano.c:903
 msgid "Print version information and exit"
 msgstr "Udskriv versionsinformation og afslut"
 
-#: src/nano.c:877
+#: src/nano.c:906
 msgid "Detect word boundaries more accurately"
 msgstr "Find ordgrænser mere præcist"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "-Y <str>"
 msgstr "-Y <str>"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "--syntax=<str>"
 msgstr "--syntax=<str>"
 
-#: src/nano.c:881
+#: src/nano.c:910
 msgid "Syntax definition to use for coloring"
 msgstr "Syntaksdefinition for farvelægning"
 
-#: src/nano.c:883
+#: src/nano.c:912
 msgid "Constantly show cursor position"
 msgstr "Vis markørposition hele tiden"
 
-#: src/nano.c:885
+#: src/nano.c:914
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Fiks forvirringsproblem med Tilbagetast/Slettetast"
 
-#: src/nano.c:888
+#: src/nano.c:915
+#, fuzzy
+msgid "Show this help text"
+msgstr "Vis denne hjælpetekst"
+
+#: src/nano.c:918
 msgid "Automatically indent new lines"
 msgstr "Indryk automatisk nye linjer"
 
-#: src/nano.c:889
+#: src/nano.c:919
 msgid "Cut from cursor to end of line"
 msgstr "Klip fra markøren til linjens slutning"
 
-#: src/nano.c:892
+#: src/nano.c:922
 msgid "Don't follow symbolic links, overwrite"
 msgstr "Følg ikke symbolske lænker, overskriv"
 
-#: src/nano.c:894
+#: src/nano.c:924
 msgid "Enable the use of the mouse"
 msgstr "Aktivér styring med mus"
 
-#: src/nano.c:897
+#: src/nano.c:926
+msgid "Do not read the file (only write it)"
+msgstr ""
+
+#: src/nano.c:928
 msgid "-o <dir>"
 msgstr "-o <kat>"
 
-#: src/nano.c:897
+#: src/nano.c:928
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<kat>"
 
-#: src/nano.c:898
+#: src/nano.c:929
 msgid "Set operating directory"
 msgstr "Sæt behandlet katalog"
 
-#: src/nano.c:901
+#: src/nano.c:932
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Behold XON- (^Q) og XOFF- (^S) taster"
 
-#: src/nano.c:903
+#: src/nano.c:935
 msgid "Silently ignore startup issues like rc file errors"
 msgstr "Ignorer opstartsproblemer såsom fejl i rc-fil uden fejlmeddelelser"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "-r <#cols>"
 msgstr "-r <#kolonner>"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "--fill=<#cols>"
 msgstr "--fill=<#kolonner>"
 
-#: src/nano.c:906
-msgid "Set wrapping point at column #cols"
+#: src/nano.c:939
+#, fuzzy
+msgid "Set hard-wrapping point at column #cols"
 msgstr "Placér ombrydningspunkt ved #kolonner"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "-s <prog>"
 msgstr "-s <prog>"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "--speller=<prog>"
 msgstr "--speller=<prog>"
 
-#: src/nano.c:910
+#: src/nano.c:943
 msgid "Enable alternate speller"
 msgstr "Brug alternativ stavekontrol"
 
-#: src/nano.c:913
+#: src/nano.c:946
 msgid "Auto save on exit, don't prompt"
 msgstr "Gem automatisk ved afslutning, spørg ikke"
 
-#: src/nano.c:915
-msgid "Allow generic undo [EXPERIMENTAL]"
-msgstr "Tillad generisk fortryd [EKSPERIMENTEL]"
-
-#: src/nano.c:918
+#: src/nano.c:947
 msgid "View mode (read-only)"
 msgstr "Visningstilstand (skrivebeskyttet)"
 
-#: src/nano.c:920
-msgid "Don't wrap long lines"
+#: src/nano.c:949
+#, fuzzy
+msgid "Don't hard-wrap long lines"
 msgstr "Ombryd ikke lange linjer"
 
-#: src/nano.c:922
+#: src/nano.c:951
 msgid "Don't show the two help lines"
 msgstr "Vis ikke de to hjælpelinjer"
 
-#: src/nano.c:923
+#: src/nano.c:952
 msgid "Enable suspension"
 msgstr "Slå suspend til"
 
-#: src/nano.c:924
+#: src/nano.c:954
 msgid "Enable soft line wrapping"
 msgstr "Brug blød linjeombrydning"
 
-#: src/nano.c:928
-msgid "(ignored, for Pico compatibility)"
-msgstr "(ignoreret, for Pico-kompatibilitet)"
-
-#: src/nano.c:938
-#, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
+#: src/nano.c:963
+#, fuzzy, c-format
+msgid " GNU nano, version %s\n"
 msgstr " GNU nano version %s (kompileret %s, %s)\n"
 
-#: src/nano.c:943
+#: src/nano.c:966
 #, 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:944
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1590,154 +1713,180 @@ msgstr ""
 "\n"
 " Kompileringsflag:"
 
-#: src/nano.c:1022
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr "Desværre, understøttelse af denne funktion er blevet deaktiveret"
 
-#: src/nano.c:1044
+#: src/nano.c:1125
+msgid "No file name"
+msgstr ""
+
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "Gem ændret buffer (AT SVARE \"Nej\" VIL ØDELÆGGE ÆNDRINGER)? "
 
-#: src/nano.c:1088
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "Kunne ikke genåbne stdin fra tastaturet, beklager\n"
 
-#: src/nano.c:1114
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "Læser fra stdin, ^C for at afbryde\n"
 
-#: src/nano.c:1182
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Modtog SIGHUP eller SIGTERM\n"
 
-#: src/nano.c:1204
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Brug \"fg\" for at returnere til nano\n"
 
-#: src/nano.c:1386
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "aktiveret"
 
-#: src/nano.c:1387
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "deaktiveret"
 
-#: src/nano.c:1548 src/winio.c:1256
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr "Ukendt kommando"
 
-#: src/nano.c:1674
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "XON ignoreret, mumle mumle"
 
-#: src/nano.c:1679
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF ignoreret, mumle mumle"
 
-#: src/nano.c:2209 src/rcfile.c:1100
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Ønsket tab-størrelse \"%s\" er ugyldig"
 
-#: src/nano.c:2268 src/rcfile.c:1025
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Ønsket fyld-størrelse \"%s\" er ugyldig"
 
+#: src/nano.c:2415
+#, c-format
+msgid "Type '%s -h' for a list of available options.\n"
+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:1259
+#: src/prompt.c:1055
 msgid "Yy"
 msgstr "JjYy"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1056
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1057
 msgid "Aa"
 msgstr "Aa"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1071
 msgid "Yes"
 msgstr "Ja"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1076
 msgid "All"
 msgstr "Alle"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1081
 msgid "No"
 msgstr "Nej"
 
-#: src/rcfile.c:130
+#: src/rcfile.c:137
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Fejl i %s på linje %lu: "
 
-#: src/rcfile.c:185
+#: src/rcfile.c:196
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "Argument \"%s\" har et uafsluttet \""
 
-#: src/rcfile.c:212 src/rcfile.c:264 src/rcfile.c:711 src/rcfile.c:768
-#: src/rcfile.c:821
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Regex-strenge skal begynde og ende med et \"-tegn"
 
-#: src/rcfile.c:238 src/search.c:62
+#: src/rcfile.c:249 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Dårligt regulært udtryk \"%s\": %s"
 
-#: src/rcfile.c:258
+#: src/rcfile.c:269
 msgid "Missing syntax name"
 msgstr "Mangler syntaksnavn"
 
-#: src/rcfile.c:316
+#: src/rcfile.c:340
 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:323
+#: src/rcfile.c:347
 msgid "The \"default\" syntax must take no extensions"
 msgstr "\"default\"-syntaksen kan ikke tage udvidelser"
 
-#: src/rcfile.c:386 src/rcfile.c:483
+#: src/rcfile.c:433
 msgid "Missing key name"
 msgstr "Mangler tastenavn"
 
-#: src/rcfile.c:398 src/rcfile.c:499
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
+#: src/rcfile.c:442 src/rcfile.c:453
+msgid "Key name is too short"
+msgstr ""
+
+#: src/rcfile.c:463
+#, fuzzy
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr "tastebindinger skal starte med \"^\", \"M\" eller \"F\""
 
-#: src/rcfile.c:407
-msgid "Must specify function to bind key to"
+#: src/rcfile.c:472
+#, fuzzy
+msgid "Must specify a function to bind the key to"
 msgstr "Skal angive funktion at binde tast til"
 
-#: src/rcfile.c:418 src/rcfile.c:510
-msgid "Must specify menu to bind key to (or \"all\")"
-msgstr "Skal angive menu at binde tast til (eller \"all\")"
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:482
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
+msgstr ""
 
-#: src/rcfile.c:426
-#, c-format
-msgid "Could not map name \"%s\" to a function"
+#: src/rcfile.c:489
+#, fuzzy, c-format
+msgid "Cannot map name \"%s\" to a function"
 msgstr "Kunne ikke associere navnet \"%s\" med en funktion"
 
-#: src/rcfile.c:432 src/rcfile.c:517
-#, c-format
-msgid "Could not map name \"%s\" to a menu"
+#: src/rcfile.c:496
+#, fuzzy, c-format
+msgid "Cannot map name \"%s\" to a menu"
 msgstr "Kunne ikke associere navnet \"%s\" med en menu"
 
-#: src/rcfile.c:454
+#: src/rcfile.c:528
 #, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
+msgid "Function '%s' does not exist in menu '%s'"
+msgstr ""
+
+#: src/rcfile.c:543
+#, fuzzy, c-format
+msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "Beklager, keystr \"%s\" er en ugyldig binding"
 
-#: src/rcfile.c:625
+#: src/rcfile.c:629
+#, fuzzy, c-format
+msgid "Error expanding %s: %s"
+msgstr "Fejl ved læsning af %s: %s"
+
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1752,136 +1901,196 @@ msgstr ""
 "\"black\", med den valgfri forstavelse \"bright\"\n"
 "til forgrundsfarver."
 
-#: src/rcfile.c:647
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
 msgstr "Kan ikke tilføje farvekommando uden en syntakskommando"
 
-#: src/rcfile.c:652
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "Mangler farvenavn"
 
-#: src/rcfile.c:672
-#, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr "Baggrundsfarven \"%s\" må ikke være lys"
-
-#: src/rcfile.c:690 src/rcfile.c:809
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr "Mangler regex-streng"
 
-#: src/rcfile.c:762
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\" kræver et tilsvarende \"end=\""
 
+#: src/rcfile.c:837
+#, 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:804
+#: src/rcfile.c:865
 msgid "Cannot add a header regex without a syntax command"
 msgstr "Kan ikke tilføje filhoved-regex uden en syntakskommando"
 
-#: src/rcfile.c:874
-#, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
+#: src/rcfile.c:921
+msgid "Cannot add a magic string regex without a syntax command"
+msgstr "Kan ikke tilføje magisk strengregex uden syntakskommando"
+
+#: src/rcfile.c:926
+msgid "Missing magic string name"
+msgstr "Mangler magisk strengnavn"
+
+# Headeren/filhovedet er første linje i rc-filen, så vidt jeg kan se
+#: src/rcfile.c:985
+#, fuzzy
+msgid "Cannot add a linter without a syntax command"
+msgstr "Kan ikke tilføje filhoved-regex uden en syntakskommando"
+
+#: src/rcfile.c:990
+#, fuzzy
+msgid "Missing linter command"
+msgstr "Mangler farvenavn"
+
+#: src/rcfile.c:1010
+#, fuzzy
+msgid "Cannot add formatter without a syntax command"
+msgstr "Kan ikke tilføje farvekommando uden en syntakskommando"
+
+#: src/rcfile.c:1015
+msgid "Missing formatter command"
+msgstr ""
+
+#: src/rcfile.c:1045
+#, fuzzy, c-format
+msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr "Fatal fejl: Ingen taster bundet til funktionen \"%s\""
 
-#: src/rcfile.c:876
+#: src/rcfile.c:1047
+#, fuzzy, c-format
 msgid ""
-"Exiting.  Please use nano with the -I option if needed to adjust your nanorc "
-"settings\n"
+"If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
 "Afslutter.  Start om nødvendigt nano med flaget -I for at justere dine "
 "nanorc-indstillinger\n"
 
-#: src/rcfile.c:926 src/rcfile.c:935 src/rcfile.c:945
+#: src/rcfile.c:1108
+#, fuzzy, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "Kunne ikke associere navnet \"%s\" med en menu"
+
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Kommandoen \"%s\" tillades ikke i inkluderet fil"
 
-#: src/rcfile.c:951 src/rcfile.c:1128
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Syntaksen \"%s\" har ingen farvekommandoer"
 
-#: src/rcfile.c:966
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Kommando \"%s\" ikke forstået"
 
-#: src/rcfile.c:972
-msgid "Missing flag"
-msgstr "Mangler flag"
+#: src/rcfile.c:1186
+#, fuzzy
+msgid "Missing option"
+msgstr "Mangler farvenavn"
 
-#: src/rcfile.c:994
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Flaget \"%s\" kræver et argument"
 
-#: src/rcfile.c:1012
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr "Flaget er ikke en gyldig flerbytestreng"
 
-#: src/rcfile.c:1038 src/rcfile.c:1066 src/rcfile.c:1075
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr "Kræver ikke-blanke tegn"
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr "Der kræves to enkelt-kolonnetegn"
 
-#: src/rcfile.c:1114
-#, c-format
-msgid "Cannot unset flag \"%s\""
+#: src/rcfile.c:1339
+#, fuzzy, c-format
+msgid "Cannot unset option \"%s\""
 msgstr "Kan ikke fjerne flag \"%s\""
 
-#: src/rcfile.c:1123
-#, c-format
-msgid "Unknown flag \"%s\""
+#: src/rcfile.c:1345
+#, fuzzy, c-format
+msgid "Unknown option \"%s\""
 msgstr "Ukendt flag \"%s\""
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr "Jeg kan ikke finde mit hjemmekatalog!  Hulk!"
 
+#: src/rcfile.c:1442
+#, c-format
+msgid ""
+"\n"
+"Press Enter to continue starting nano.\n"
+msgstr ""
+"\n"
+"Tryk enter for at fortsætte opstart af nano.\n"
+
 #: src/search.c:96
 #, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "\"%.*s%s\" ikke fundet"
 
-#: src/search.c:205
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/search.c:184
+msgid " [Case Sensitive]"
+msgstr " [Versalfølsom]"
+
+#: src/search.c:188
+msgid " [Regexp]"
+msgstr " [Regudtr]"
+
+#: src/search.c:192
+msgid " [Backwards]"
+msgstr " [Bagud]"
+
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:197
 msgid " (to replace) in selection"
 msgstr " (at erstatte) i markering"
 
-#: src/search.c:207
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (at erstatte)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "Erstat denne forekomst?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:945
 msgid "Replace with"
 msgstr "Erstat med"
 
-#: src/search.c:1004
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
 msgstr[0] "Erstattede %lu forekomst"
 msgstr[1] "Erstattede %lu forekomster"
 
-#: src/search.c:1034
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr "Indtast linjenummer, kolonnenummer"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
 msgstr "Ugyldigt linje- eller kolonnenummer"
 
-#: src/search.c:1214
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "Ikke en klamme"
 
-#: src/search.c:1281
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "Ingen modsvarende klamme"
 
@@ -1893,222 +2102,320 @@ msgstr "Markering sat"
 msgid "Mark Unset"
 msgstr "Markering fjernet"
 
-#: src/text.c:443
+#: src/text.c:439
 msgid "Nothing in undo buffer!"
 msgstr "Intet i fortrydelsesbufferen!"
 
-#: src/text.c:455 src/text.c:593
-#, c-format
-msgid "Internal error: can't match line %d.  Please save your work"
+#: src/text.c:445 src/text.c:590
+#, fuzzy, 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
-#: src/text.c:466 src/text.c:603
+#: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
 msgstr "tilføj tekst"
 
-#: src/text.c:475 src/text.c:613
+#: src/text.c:467 src/text.c:612
 msgid "text delete"
 msgstr "slet tekst"
 
-#: src/text.c:489 src/text.c:628
-msgid "line wrap"
-msgstr "ombryd linje"
-
-#: src/text.c:503 src/text.c:636
+#: src/text.c:491 src/text.c:641
 msgid "line join"
 msgstr "sammenføj linje"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:505 src/text.c:657
 msgid "text cut"
 msgstr "klip tekst"
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:510 src/text.c:661
 msgid "text uncut"
 msgstr "indsæt tekst"
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:515 src/text.c:623
 msgid "line break"
 msgstr "linje bryd"
 
 # dette sker hvis teksten f.eks. er læst fra en fil
-#: src/text.c:532 src/text.c:665
+#: src/text.c:528 src/text.c:672
 msgid "text insert"
 msgstr "import af tekst"
 
-#: src/text.c:550 src/text.c:659
+#: src/text.c:549 src/text.c:665
 msgid "text replace"
 msgstr "tekst erstat"
 
-#: src/text.c:557 src/text.c:671
-msgid "Internal error: unknown type.  Please save your work"
-msgstr "Intern fejl: ukendt type.  Gem venligst dit arbejde"
+#: src/text.c:556 src/text.c:679 src/text.c:983
+msgid "Internal error: unknown type.  Please save your work."
+msgstr "Intern fejl: ukendt type.  Gem venligst dit arbejde."
 
-#: src/text.c:563
+#: src/text.c:561
 #, c-format
 msgid "Undid action (%s)"
 msgstr "Fortrød handling (%s)"
 
-#: src/text.c:578
+#: src/text.c:580
 msgid "Nothing to re-do!"
 msgstr "Intet at omgøre!"
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
-msgstr "Intern fejl: Opsætning af Omgør slog fejl.  Gem venligst dit arbejde"
+#: src/text.c:584
+#, fuzzy
+msgid "Internal error: cannot set up redo.  Please save your work."
+msgstr "Intern fejl: Kan ikke opsætte uncut.  Gem venligst dit arbejde."
 
-#: src/text.c:676
+#: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Omgjorde handling (%s)"
 
-#: src/text.c:766
-msgid "Could not pipe"
-msgstr "Kunne ikke overføre i datakanal"
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
+msgid "Could not create pipe"
+msgstr "Kunne ikke oprette datakanal"
 
-#: src/text.c:793 src/text.c:2636 src/text.c:2788
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "Kunne ikke forgrene"
 
-#: src/text.c:941
-msgid "Internal error: can't setup uncut.  Please save your work."
+#: src/text.c:969
+#, fuzzy
+msgid "Internal error: cannot set up uncut.  Please save your work."
 msgstr "Intern fejl: Kan ikke opsætte uncut.  Gem venligst dit arbejde."
 
-#: src/text.c:950
-msgid "Internal error: unknown type.  Please save your work."
-msgstr "Intern fejl: ukendt type.  Gem venligst dit arbejde."
-
-#: src/text.c:1870
+#: src/text.c:1806
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Dårlig anførselsstreng %s: %s"
 
-#: src/text.c:2267
+#: src/text.c:2207
 msgid "Can now UnJustify!"
 msgstr "Kan nu af-ombryde!"
 
-#: src/text.c:2462
+#: src/text.c:2404
 msgid "Edit a replacement"
 msgstr "Redigér en erstatning"
 
-#: src/text.c:2548
-msgid "Could not create pipe"
-msgstr "Kunne ikke oprette datakanal"
-
-#: src/text.c:2550
+#: src/text.c:2492
 msgid "Creating misspelled word list, please wait..."
 msgstr "Opretter ordliste med fejlstavelser, vent venligst..."
 
-#: src/text.c:2642
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
 msgstr "Kunde ikke få størrelse af datakanals-buffer"
 
-#: src/text.c:2693
+#: src/text.c:2635
 msgid "Error invoking \"spell\""
 msgstr "Fejl ved kald af \"spell\""
 
-#: src/text.c:2696
+#: src/text.c:2638
 msgid "Error invoking \"sort -f\""
 msgstr "Fejl ved kald af \"sort -f\""
 
-#: src/text.c:2699
+#: src/text.c:2641
 msgid "Error invoking \"uniq\""
 msgstr "Fejl ved kald af \"uniq\""
 
-#: src/text.c:2756 src/text.c:2965
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "Stavekontrol færdiggjort"
 
-#: src/text.c:2815
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Fejl ved kald af \"%s\""
 
-#: src/text.c:2960
+#: src/text.c:2885
+#, fuzzy
+msgid "Invoking spell checker, please wait"
+msgstr "Start stavekontrollen, hvis tilgængelig"
+
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Stavekontrollen mislykkedes: %s"
 
-#: src/text.c:2962
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Stavekontrollen mislykkedes: %s: %s"
 
-#: src/text.c:3030
+#: src/text.c:2937
+#, fuzzy
+msgid "No linter defined for this type of file!"
+msgstr "Tilføj ikke linjeskift til slut i filer"
+
+#: src/text.c:2947
+msgid "Save modified buffer before linting?"
+msgstr ""
+
+#: src/text.c:2969
+msgid "Invoking linter, please wait"
+msgstr ""
+
+#: src/text.c:3125
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr ""
+
+#: src/text.c:3159
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr ""
+
+#: src/text.c:3205
+#, fuzzy
+msgid "At last message"
+msgstr "Vis denne meddelelse"
+
+#: src/text.c:3210
+#, fuzzy
+msgid "At first message"
+msgstr "Vis denne meddelelse"
+
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr ""
+
+#: src/text.c:3275
+msgid "Finished"
+msgstr ""
+
+#: src/text.c:3280
+msgid "Invoking formatter, please wait"
+msgstr ""
+
+#: src/text.c:3360
+msgid "Finished formatting"
+msgstr ""
+
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sOrd: %lu  Linjer: %ld  Tegn: %lu"
 
-#: src/text.c:3031
+#: src/text.c:3439
 msgid "In Selection:  "
 msgstr "I markering:  "
 
-#: src/utils.c:405 src/utils.c:417
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3453
+msgid "Verbatim Input"
+msgstr "Ordret input"
+
+#: src/utils.c:410 src/utils.c:422
 msgid "nano is out of memory!"
 msgstr "nano har ikke mere hukommelse!"
 
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
-#: src/winio.c:1557
+#: src/winio.c:1583
 msgid "Unicode Input"
 msgstr "Unicode-input"
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2142 src/winio.c:2146
 msgid "Modified"
 msgstr "Ændret"
 
-#: src/winio.c:2150
+#: src/winio.c:2143
 msgid "View"
 msgstr "Se"
 
-#: src/winio.c:2164
+#: src/winio.c:2157
 msgid "DIR:"
 msgstr "KAT:"
 
-#: src/winio.c:2171
+#: src/winio.c:2164
 msgid "File:"
 msgstr "Fil:"
 
-#: src/winio.c:3360
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2261
+msgid ""
+"Warning: Modifying a file which is not locked, check directory permission?"
+msgstr ""
+
+#: src/winio.c:3377
 #, 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:3492
+#: src/winio.c:3507
 msgid "The nano text editor"
 msgstr "Tekstredigereren nano"
 
-#: src/winio.c:3493
+#: src/winio.c:3508
 msgid "version"
 msgstr "version"
 
-#: src/winio.c:3494
+#: src/winio.c:3509
 msgid "Brought to you by:"
 msgstr "Præsenteres af:"
 
-#: src/winio.c:3495
+#: src/winio.c:3510
 msgid "Special thanks to:"
 msgstr "Særlig tak til:"
 
-#: src/winio.c:3496
+#: src/winio.c:3511
 msgid "The Free Software Foundation"
 msgstr "Free Software Foundation"
 
-#: src/winio.c:3497
+#: src/winio.c:3512
+msgid "the many translators and the TP"
+msgstr ""
+
+#: src/winio.c:3513
 msgid "For ncurses:"
 msgstr "For ncurses:"
 
-#: src/winio.c:3498
+#: src/winio.c:3514
 msgid "and anyone else we forgot..."
 msgstr "og alle andre som vi har glemt..."
 
-#: src/winio.c:3499
+#: src/winio.c:3515
 msgid "Thank you for using nano!"
 msgstr "Tak for at du bruger nano!"
 
-#~ msgid "Error writing backup file %s: File owner mismatch"
+# okay, her slutter 'max 10 tegn'-regionen vist, eftersom den engelske er på 11
+#~ msgid "Insert File"
+#~ msgstr "Indsæt fil"
+
+#~ msgid "Go to previous screen"
+#~ msgstr "Gå til forrige skærm"
+
+#~ msgid "Find Other Bracket"
+#~ msgstr "Find anden klamme"
+
+#~ msgid "Long line wrapping"
+#~ msgstr "Ombrydning af lange linjer"
+
+#~ msgid "Soft line wrapping"
+#~ msgstr "Blød linjeombrydning"
+
+#~ msgid "Allow generic undo [EXPERIMENTAL]"
+#~ msgstr "Tillad generisk fortryd [EKSPERIMENTEL]"
+
+#~ msgid "(ignored, for Pico compatibility)"
+#~ msgstr "(ignoreret, for Pico-kompatibilitet)"
+
+#~ msgid "Must specify menu to bind key to (or \"all\")"
+#~ msgstr "Skal angive menu at binde tast til (eller \"all\")"
+
+#~ msgid "Missing flag"
+#~ msgstr "Mangler flag"
+
+#~ msgid "line wrap"
+#~ msgstr "ombryd linje"
+
+#~ msgid "Internal error: unknown type.  Please save your work"
+#~ msgstr "Intern fejl: ukendt type.  Gem venligst dit arbejde"
+
+#~ msgid "Internal error: Redo setup failed.  Please save your work"
 #~ msgstr ""
-#~ "Fejl ved skrivning af sikkerhedskopifil %s: Filens ejer stemmer ikke"
+#~ "Intern fejl: Opsætning af Omgør slog fejl.  Gem venligst dit arbejde"
+
+#~ msgid "Could not pipe"
+#~ msgstr "Kunne ikke overføre i datakanal"
 
 #~ msgid "add_to_cutbuffer() called with inptr->data = %s\n"
 #~ msgstr "add_to_cutbuffer() kaldt med inptr->data = %s\n"
@@ -2164,9 +2471,6 @@ msgstr "Tak for at du bruger nano!"
 #~ msgid "Could not open %s for prepend: %s"
 #~ msgstr "Kunde ikke åbne %s for foranstilling: %s"
 
-#~ msgid "Could not set permissions %o on %s: %s"
-#~ msgstr "Kunne ikke sætte rettighederne %o på %s: %s"
-
 #~ msgid "Can't open \"%s\": %s"
 #~ msgstr "Kan ikke åbne \"%s\": %s"
 
diff --git a/po/de.gmo b/po/de.gmo
index 852b801..a8da44b 100644
--- a/po/de.gmo
+++ b/po/de.gmo
diff --git a/po/de.po b/po/de.po
index 4fa0974..05ed520 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,123 +1,154 @@
-# German Messages for the nano editor
+# German messages for the nano editor.
 # Copyright (C) 2000, 2001 Free Software Foundation, Inc.
 # This file is distributed under the same license as the nano package.
+#
 # Karl Eichwalder <keichwa@gmx.net>, 2001.
 # Florian König <floki@bigfoot.com>, 2000, 2001.
-# Michael Piefel <piefel@informatik.hu-berlin.de>, 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009, 2010.
-#
+# Michael Piefel <piefel@informatik.hu-berlin.de>, 2001-2006, 2008-2011, 2013-2014.
+# Mario Blättermann <mario.blaettermann@gmail.com>, 2014, 2015.
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 2.2.4pre2\n"
+"Project-Id-Version: nano 2.3.99pre4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-22 06:34-0500\n"
-"PO-Revision-Date: 2010-04-15 15:28+0100\n"
-"Last-Translator: Michael Piefel <piefel@informatik.hu-berlin.de>\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
+"PO-Revision-Date: 2015-03-21 20:38+0100\n"
+"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
+"Language: de\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: Lokalize 1.5\n"
 
-#: src/browser.c:220
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:203
 msgid "Go To Directory"
 msgstr "Gehe zu Verzeichnis"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:860 src/files.c:2048
-#: src/nano.c:1060 src/search.c:220 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Abgebrochen"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:246 src/browser.c:293
 #, c-format
 msgid "Can't go outside of %s in restricted mode"
-msgstr "Kann im eingeschränkten Modus nicht nach außerhalb von %s gehen"
+msgstr ""
+"Im eingeschränkten Modus kann nicht zu Orten außerhalb von %s gewechselt "
+"werden."
 
-#: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:722
-#: src/files.c:731 src/files.c:1540 src/files.c:1659 src/files.c:1711
-#: src/files.c:1732 src/files.c:1855 src/files.c:2691 src/rcfile.c:568
-#: src/rcfile.c:1204
+#: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
+#: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
+#: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Fehler beim Lesen von %s: %s"
 
-#: src/browser.c:303
+#: src/browser.c:283
 msgid "Can't move up a directory"
-msgstr "Konnte nicht ins übergeordnete Verzeichnis wechseln"
+msgstr "Ins übergeordnete Verzeichnis kann nicht gewechselt werden."
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:665 src/browser.c:674
+#: src/browser.c:626 src/browser.c:635
 msgid "(dir)"
 msgstr "(Verz.)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:632
 msgid "(parent dir)"
 msgstr "(Verz. höher)"
 
-#: src/browser.c:801 src/search.c:185
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "Suche"
 
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:805 src/search.c:189
-msgid " [Case Sensitive]"
-msgstr " [GROSS/klein]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:811 src/search.c:195
-msgid " [Regexp]"
-msgstr " [reg. Ausdruck]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:817 src/search.c:201
-msgid " [Backwards]"
-msgstr " [Rückwärts]"
-
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "Suche wieder von vorn"
 
-#: src/browser.c:1006 src/browser.c:1039 src/search.c:514 src/search.c:517
-#: src/search.c:574 src/search.c:577
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "Das ist das einzige Auftreten"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr "Kein aktuelles Suchmuster"
 
-#: src/files.c:125
+#: src/files.c:139
+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:145
+#, c-format
+msgid "Couldn't determine hostname for lock file: %s"
+msgstr "Rechnername für Sperrdatei konnte nicht bestimmt werden: %s"
+
+#: src/files.c:165 src/files.c:175 src/files.c:212 src/files.c:222
+#, c-format
+msgid "Error writing lock file %s: %s"
+msgstr "Fehler beim Schreiben der Sperrdatei %s: %s"
+
+#: src/files.c:237
+#, c-format
+msgid "Error deleting lock file %s: %s"
+msgstr "Fehler beim Löschen der Sperrdatei %s: %s"
+
+#: src/files.c:272
+#, c-format
+msgid "Error opening lock file %s: %s"
+msgstr "Fehler beim Öffnen der Sperrdatei %s: %s"
+
+#: src/files.c:282
+#, 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:297
+#, 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:308
+#, c-format
+msgid "Error writing lock file: Directory '%s' doesn't exist"
+msgstr "Fehler beim Schreiben der Sperrdatei: Verzeichnis »%s« existiert nicht"
+
+#: src/files.c:339
 #, c-format
 msgid "Can't insert file from outside of %s"
-msgstr "Kann Datei von außerhalb %s nicht einfügen"
+msgstr "Datei kann außerhalb von %s nicht eingefügt werden"
 
-#: src/files.c:234
+#: src/files.c:467
 msgid "No more open file buffers"
 msgstr "Keine weiteren offenen Dateipuffer"
 
-#: src/files.c:250
+#: src/files.c:484
 #, c-format
 msgid "Switched to %s"
 msgstr "Umgeschaltet zu %s"
 
-#: src/files.c:251 src/global.c:469 src/winio.c:2168
+#: src/files.c:485 src/global.c:953 src/winio.c:2161
 msgid "New Buffer"
 msgstr "Neuer Puffer"
 
-#: src/files.c:633
+#: src/files.c:874
 #, 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] "eine Zeile gelesen (aus DOS- und Mac-Format konvertiert)"
+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:638
+#: src/files.c:879
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
@@ -126,851 +157,921 @@ msgid_plural ""
 "Read %lu lines (Converted from DOS and Mac format - Warning: No write "
 "permission)"
 msgstr[0] ""
-"eine Zeile gelesen (aus DOS- und Mac-Format konvertiert – Warnung: Kein "
+"%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:644
+#: src/files.c:885
 #, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
-msgstr[0] "eine Zeile gelesen (aus Mac-Format konvertiert)"
+msgstr[0] "%lu Zeile gelesen (aus Mac-Format konvertiert)"
 msgstr[1] "%lu Zeilen gelesen (aus Mac-Format konvertiert)"
 
-#: src/files.c:648
+#: src/files.c:889
 #, 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] ""
-"eine Zeile gelesen (aus Mac-Format konvertiert – Warnung: Kein Schreibrecht)"
+"%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:654
+#: src/files.c:895
 #, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
-msgstr[0] "eine Zeile gelesen (aus DOS-Format konvertiert)"
+msgstr[0] "%lu Zeile gelesen (aus DOS-Format konvertiert)"
 msgstr[1] "%lu Zeilen gelesen (aus DOS-Format konvertiert)"
 
-#: src/files.c:658
+#: src/files.c:899
 #, 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] ""
-"eine Zeile gelesen (aus DOS-Format konvertiert – Warnung: Kein Schreibrecht)"
+"%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:664
+#: src/files.c:905
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
-msgstr[0] "eine Zeile gelesen"
+msgstr[0] "%lu Zeile gelesen"
 msgstr[1] "%lu Zeilen gelesen"
 
-#: src/files.c:667
+#: src/files.c:908
 #, c-format
 msgid "Read %lu line ( Warning: No write permission)"
 msgid_plural "Read %lu lines (Warning: No write permission)"
-msgstr[0] "eine Zeile gelesen (Warnung: Kein Schreibrecht)"
+msgstr[0] "%lu Zeile gelesen (Warnung: Kein Schreibrecht)"
 msgstr[1] "%lu Zeilen gelesen (Warnung: Kein Schreibrecht)"
 
-#: src/files.c:700 src/files.c:736
+#: src/files.c:943 src/files.c:980
 msgid "Reading File"
-msgstr "Lese Datei"
+msgstr "Datei wird gelesen"
 
-#: src/files.c:706
+#: src/files.c:950
 msgid "New File"
 msgstr "Neue Datei"
 
-#: src/files.c:709
+#: src/files.c:953
 #, c-format
 msgid "\"%s\" not found"
 msgstr "„%s“ nicht gefunden"
 
-#: src/files.c:717 src/rcfile.c:559 src/rcfile.c:1154 src/rcfile.c:1195
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "„%s“ ist ein Verzeichnis"
 
-#: src/files.c:718 src/rcfile.c:560 src/rcfile.c:1155 src/rcfile.c:1196
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "„%s“ ist eine Gerätedatei"
 
-#: src/files.c:817
+#: src/files.c:1060
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "In neuem Puffer auszuführender Befehl [von %s] "
 
-#: src/files.c:819
+#: src/files.c:1062
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Auszuführender Befehl [von %s] "
 
-#: src/files.c:825
+#: src/files.c:1069
 #, c-format
 msgid "File to insert into new buffer [from %s] "
-msgstr "in neuen Puffer einzufügende Datei [von %s] "
+msgstr "In neuen Puffer einzufügende Datei [von %s] "
 
-#: src/files.c:827
+#: src/files.c:1071
 #, c-format
 msgid "File to insert [from %s] "
-msgstr "einzufügende Datei [von %s] "
+msgstr "Einzufügende Datei [von %s] "
 
-#: src/files.c:1077
+#: src/files.c:1320
 msgid "Key invalid in non-multibuffer mode"
-msgstr "Taste unzulässig wenn nicht im Multibuffer-Modus"
+msgstr "Taste unzulässig, wenn nicht im Multibuffer-Modus"
 
-#: src/files.c:1486
+#: src/files.c:1622
+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:1746
 #, c-format
 msgid "Can't write outside of %s"
-msgstr "Kann nicht außerhalb von %s schreiben"
+msgstr "Außerhalb von %s kann nicht geschrieben werden."
 
-#: src/files.c:1501
+#: src/files.c:1761
 msgid "Cannot prepend or append to a symlink with --nofollow set"
 msgstr ""
-"Kann nicht vorn oder hinten an eine symbolische Verknüpfung anfügen, wenn --"
-"nofollow gesetzt ist"
+"Voranstellen oder Anhängen an eine symbolische Verknüpfung ist nicht "
+"möglich, wenn --nofollow gesetzt ist."
 
-#: src/files.c:1581 src/files.c:1603 src/files.c:1621 src/files.c:1632
-#: src/files.c:1640 src/files.c:1667
+#: src/files.c:1843 src/files.c:1868 src/files.c:1886 src/files.c:1899
+#: src/files.c:1910 src/files.c:1939
 #, c-format
 msgid "Error writing backup file %s: %s"
-msgstr "Fehler beim Schreiben der Sicherungskopie %s: %s"
+msgstr "Fehler beim Schreiben der Sicherungsdatei %s: %s"
 
-#: src/files.c:1582 src/nano.c:701
+#: src/files.c:1844 src/nano.c:719
 msgid "Too many backup files?"
-msgstr "Zu viele Sicherungskopien?"
+msgstr "Zu viele Sicherungsdateien?"
 
-#: src/files.c:1687 src/files.c:1744 src/files.c:1763 src/files.c:1775
-#: src/files.c:1799 src/files.c:1817 src/files.c:1827 src/files.c:1863
-#: src/files.c:1868 src/files.c:2764 src/files.c:2773
+#: src/files.c:1959 src/files.c:2016 src/files.c:2035 src/files.c:2047
+#: src/files.c:2071 src/files.c:2089 src/files.c:2099 src/files.c:2135
+#: src/files.c:2140 src/files.c:3101 src/files.c:3110 src/files.c:3133
+#: src/files.c:3145
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Fehler beim Schreiben von %s: %s"
 
-#: src/files.c:1721 src/text.c:2929 src/text.c:2941
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Fehler beim Schreiben der temporären Datei: %s"
 
-#: src/files.c:1900
+#: src/files.c:2173
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
-msgstr[0] "eine Zeile geschrieben"
+msgstr[0] "%lu Zeile geschrieben"
 msgstr[1] "%lu Zeilen geschrieben"
 
-#: src/files.c:2004
+#: src/files.c:2278
 msgid " [DOS Format]"
 msgstr " [DOS-Format]"
 
-#: src/files.c:2005
+#: src/files.c:2279
 msgid " [Mac Format]"
 msgstr " [Mac-Format]"
 
-#: src/files.c:2007
+#: src/files.c:2281
 msgid " [Backup]"
-msgstr " [Sicherungskopie]"
+msgstr " [Sicherungsdatei]"
 
-#: src/files.c:2015
+#: src/files.c:2289
 msgid "Prepend Selection to File"
 msgstr "Auswahl vorne an Datei anfügen"
 
-#: src/files.c:2016
+#: src/files.c:2290
 msgid "Append Selection to File"
 msgstr "Auswahl an Datei anhängen"
 
-#: src/files.c:2017
+#: src/files.c:2291
 msgid "Write Selection to File"
 msgstr "Auswahl in Datei schreiben"
 
-#: src/files.c:2020
+#: src/files.c:2294
 msgid "File Name to Prepend to"
 msgstr "Dateiname zum vorn Anfügen"
 
-#: src/files.c:2021
+#: src/files.c:2295
 msgid "File Name to Append to"
 msgstr "Dateiname zum Anhängen"
 
-#: src/files.c:2022
+#: src/files.c:2296
 msgid "File Name to Write"
 msgstr "Dateiname zum Speichern"
 
-#: src/files.c:2153
+#: src/files.c:2427
 msgid "File exists, OVERWRITE ? "
 msgstr "Datei exisitiert, ÜBERSCHREIBEN? "
 
-#: src/files.c:2162
+#: src/files.c:2436
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "Datei unter einem ANDEREN NAMEN speichern? "
 
-#: src/files.c:2173
+#: src/files.c:2450
 msgid "File was modified since you opened it, continue saving ? "
 msgstr "Datei wurde seit dem Öffnen geändert, dennoch speichern? "
 
-#: src/files.c:2611
+#: src/files.c:2882
 msgid "(more)"
 msgstr "(mehr)"
 
-#: src/files.c:2694 src/rcfile.c:1220
+#: src/files.c:2974
 #, c-format
 msgid ""
 "\n"
-"Press Enter to continue starting nano.\n"
+"Press Enter to continue\n"
 msgstr ""
 "\n"
-"Drücken Sie die Eingabetaste, um mit dem Starten von nano fortzufahren.\n"
+"Drücken Sie die Eingabetaste zum Fortfahren\n"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:415 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Abbrechen"
-
-#: src/global.c:416
-msgid "Replace"
-msgstr "Ersetzen"
+#: src/files.c:2989
+#, c-format
+msgid ""
+"Unable to create directory %s: %s\n"
+"It is required for saving/loading search history or cursor positions.\n"
+msgstr ""
+"Verzeichnis %s kann nicht angelegt werden: %s\n"
+"Es wird benötigt, um Suchverlauf und Cursorposition zu speichern und zu "
+"laden.\n"
 
-#: src/global.c:417
-msgid "No Replace"
-msgstr "Keine Ersetzung"
+#: src/files.c:2995
+#, 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 ""
+"Pfad %s ist kein Verzeichnis, obwohl er eines sein muss.\n"
+"Nano wird Suchverlauf und Cursorposition nicht laden oder speichern können.\n"
 
-#: src/global.c:420
-msgid "Case Sens"
-msgstr "GROSS/klein"
+#: src/files.c:3012
+#, 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 ""
+"Eine veraltete Nano-Verlaufsdatei (%s) wurde gefunden. Es wurde\n"
+"versucht, diese an die neue bevorzugte Stelle (%s) zu schieben,\n"
+"was aber Fehler verursachte: %s"
 
-#: src/global.c:421
-msgid "Backwards"
-msgstr "Rückwärts"
+#: src/files.c:3016
+#, 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 ""
+"Eine veraltete Nano-Verlaufsdatei (%s) wurde gefunden. Diese wurde\n"
+"an die neue bevorzugte Stelle (%s) verschoben.\n"
+"(siehe die Nano-FAQ bezüglich dieser Änderung)"
 
-#: src/global.c:425
-msgid "Regexp"
-msgstr "reg. Ausdruck"
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
+#: src/global.c:477
+msgid "Exit"
+msgstr "Beenden"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:451
-msgid "PrevHstory"
-msgstr "zur. Geschichte"
+#: src/global.c:478
+msgid "Close"
+msgstr "Schließen"
 
-#: src/global.c:452
-msgid "NextHstory"
-msgstr "vor Geschichte"
+#: src/global.c:479
+msgid "Uncut Text"
+msgstr "Ausschn. r"
 
-#: src/global.c:453
-msgid "Go To Text"
-msgstr "Zu Text"
+#: src/global.c:481
+msgid "Unjustify"
+msgstr "Ausr.rückgängig"
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:455
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:485
 msgid "WhereIs Next"
 msgstr "Wo ist nächstes"
 
-#: src/global.c:457
-msgid "First File"
-msgstr "Erste Datei"
-
-#: src/global.c:458
-msgid "Last File"
-msgstr "Letzte Datei"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:460
-msgid "To Files"
-msgstr "In Dateien"
-
-#: src/global.c:462
-msgid "DOS Format"
-msgstr "DOS-Format"
-
-#: src/global.c:463
-msgid "Mac Format"
-msgstr "Mac-Format"
-
-#: src/global.c:464
-msgid "Append"
-msgstr "Anhängen"
-
-#: src/global.c:465
-msgid "Prepend"
-msgstr "vorn Anfügen"
-
-#: src/global.c:466
-msgid "Backup File"
-msgstr "Sicherungskopie"
-
-#: src/global.c:467
-msgid "Execute Command"
-msgstr "Befehl ausführen"
-
-#: src/global.c:471
-msgid "Go To Dir"
-msgstr "Gehe zu Verz."
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:480
-msgid "Get Help"
-msgstr "Hilfe"
-
-#: src/global.c:481
-msgid "Exit"
-msgstr "Beenden"
-
-#: src/global.c:482
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:492
 msgid "Where Is"
 msgstr "Wo ist"
 
-#: src/global.c:483
-msgid "Prev Page"
-msgstr "Seite zurück"
-
-#: src/global.c:484
-msgid "Next Page"
-msgstr "Seite vor"
-
-#: src/global.c:485
-msgid "First Line"
-msgstr "Erste Zeile"
+#: src/global.c:493
+msgid "Replace"
+msgstr "Ersetzen"
 
-#: src/global.c:486
-msgid "Last Line"
-msgstr "Letzte Zeile"
+#: src/global.c:494
+msgid "Go To Line"
+msgstr "Zu Zeile"
 
-#: src/global.c:487
-msgid "Suspend"
-msgstr "in den Hintergrund"
+#: src/global.c:495
+msgid "Prev Line"
+msgstr "Zeile zurück"
 
-#: src/global.c:489
-msgid "Beg of Par"
-msgstr "Anf des Abs."
+#: src/global.c:496
+msgid "Next Line"
+msgstr "Zeile vor"
 
-#: src/global.c:490
-msgid "End of Par"
-msgstr "Ende des Abs."
+#: src/global.c:497
+msgid "Read File"
+msgstr "Datei öffnen"
 
-#: src/global.c:491
+#: src/global.c:499
 msgid "FullJstify"
 msgstr "Kompl. Ausr."
 
-#: src/global.c:493
+#: src/global.c:501
 msgid "Refresh"
 msgstr "Auffrischen"
 
-#: src/global.c:495
-msgid "Insert File"
-msgstr "Datei einfügen"
-
-#: src/global.c:497
-msgid "Go To Line"
-msgstr "Zu Zeile"
-
-#: src/global.c:500
+#. 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:507
 msgid "Justify the current paragraph"
 msgstr "Absatz ausrichten"
 
-#. 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:505
+#: src/global.c:509
 msgid "Cancel the current function"
 msgstr "Funktion abbrechen"
 
-#: src/global.c:506
+#: src/global.c:510
 msgid "Display this help text"
 msgstr "Diese Hilfe anzeigen"
 
-#: src/global.c:509
+#: src/global.c:513
 msgid "Close the current file buffer / Exit from nano"
-msgstr "Aktuellen Dateipuffer schließen / nano beenden"
+msgstr "Aktuellen Dateipuffer schließen / Nano beenden"
 
-#: src/global.c:511
+#: src/global.c:515
 msgid "Exit from nano"
-msgstr "nano beenden"
+msgstr "Nano beenden"
 
-#: src/global.c:515
+#: src/global.c:519
 msgid "Write the current file to disk"
 msgstr "Datei speichern"
 
-#: src/global.c:517
+#: src/global.c:521
 msgid "Insert another file into the current one"
-msgstr "Datei einfügen"
+msgstr "Weitere Datei in die aktuelle Datei einfügen"
 
-#: src/global.c:519
+#: src/global.c:523
 msgid "Search for a string or a regular expression"
-msgstr "nach einer Zeichenkette oder einem regulären Ausdruck suchen"
+msgstr "Nach einer Zeichenkette oder einem regulären Ausdruck suchen"
 
-#: src/global.c:520
-msgid "Go to previous screen"
-msgstr "zum vorhergehenden Bildschirm springen"
+#: src/global.c:526
+msgid "Search for a string"
+msgstr "Nach einer Zeichenkette suchen"
 
-#: src/global.c:521
-msgid "Go to next screen"
-msgstr "zum folgenden Bildschirm springen"
+#: src/global.c:528
+msgid "Go one screenful up"
+msgstr "Eine Bildschirmseite hoch gehen"
 
-#: src/global.c:523
+#: src/global.c:529
+msgid "Go one screenful down"
+msgstr "Eine Bildschirmseite runter gehen"
+
+#: src/global.c:531
 msgid "Cut the current line and store it in the cutbuffer"
-msgstr "die aktuelle Zeile ausschneiden und in der Zwischenablage speichern"
+msgstr "Die aktuelle Zeile ausschneiden und in der Zwischenablage speichern"
 
-#: src/global.c:525
+#: src/global.c:533
 msgid "Uncut from the cutbuffer into the current line"
-msgstr "aus der Zwischenablage einfügen"
+msgstr "Aus der Zwischenablage einfügen"
 
-#: src/global.c:527
+#: src/global.c:534
 msgid "Display the position of the cursor"
-msgstr "die aktuelle Cursorposition anzeigen"
+msgstr "Die aktuelle Cursorposition anzeigen"
 
-#: src/global.c:529
+#: src/global.c:536
 msgid "Invoke the spell checker, if available"
 msgstr "Rechtschreibprüfung aufrufen (wenn verfügbar)"
 
-#: src/global.c:531
+#: src/global.c:538
 msgid "Replace a string or a regular expression"
-msgstr "eine Zeichenkette oder einen regulären Ausdruck ersetzen"
+msgstr "Eine Zeichenkette oder einen regulären Ausdruck ersetzen"
 
-#: src/global.c:532
+#: src/global.c:539
 msgid "Go to line and column number"
-msgstr "zu einer bestimmten Zeile und Spalte springen"
+msgstr "Zu einer bestimmten Zeile und Spalte springen"
 
-#: src/global.c:534
-msgid "Mark text at the cursor position"
-msgstr "Text an der Cursorposition markieren"
+#: src/global.c:541
+msgid "Mark text starting from the cursor position"
+msgstr "Text beginnend an Cursorposition markieren"
 
-#: src/global.c:535
-msgid "Repeat last search"
-msgstr "letzte Suche wiederholen"
+#: src/global.c:542
+msgid "Repeat the last search"
+msgstr "Die letzte Suche wiederholen"
 
-#: src/global.c:537
+#: src/global.c:544
 msgid "Copy the current line and store it in the cutbuffer"
-msgstr "die aktuelle Zeile kopieren und in der Zwischenablage speichern"
+msgstr "Die aktuelle Zeile kopieren und in der Zwischenablage speichern"
 
-#: src/global.c:538
+#: src/global.c:545
 msgid "Indent the current line"
-msgstr "die aktuelle Zeile einrücken"
+msgstr "Die aktuelle Zeile einrücken"
 
-#: src/global.c:539
+#: src/global.c:546
 msgid "Unindent the current line"
-msgstr "die aktuelle Zeile ausrücken"
+msgstr "Die aktuelle Zeile ausrücken"
 
-#: src/global.c:540
+#: src/global.c:547
 msgid "Undo the last operation"
-msgstr "letzte Operation rückgängig"
+msgstr "Letzte Operation rückgängig machen"
 
-#: src/global.c:541
+#: src/global.c:548
 msgid "Redo the last undone operation"
-msgstr "rückgängig gemachte Operation wiederholen"
+msgstr "Rückgängig gemachte Operation wiederholen"
 
-#: src/global.c:543
+#: src/global.c:550
 msgid "Go forward one character"
-msgstr "ein Zeichen vorwärts gehen"
+msgstr "Ein Zeichen vorwärts gehen"
 
-#: src/global.c:544
+#: src/global.c:551
 msgid "Go back one character"
-msgstr "ein Zeichen rückwärts gehen"
+msgstr "Ein Zeichen rückwärts gehen"
 
-#: src/global.c:546
+#: src/global.c:553
 msgid "Go forward one word"
-msgstr "ein Wort vorwärts gehen"
+msgstr "Ein Wort vorwärts gehen"
 
-#: src/global.c:547
+#: src/global.c:554
 msgid "Go back one word"
-msgstr "ein Wort rückwärts gehen"
+msgstr "Ein Wort rückwärts gehen"
 
-#: src/global.c:549
+#: src/global.c:556
 msgid "Go to previous line"
-msgstr "zur vorhergehenden Zeile gehen"
+msgstr "Zur vorhergehenden Zeile gehen"
 
-#: src/global.c:550
+#: src/global.c:557
 msgid "Go to next line"
-msgstr "zur folgenden Zeile gehen"
+msgstr "Zur folgenden Zeile gehen"
 
-#: src/global.c:551
+#: src/global.c:558
 msgid "Go to beginning of current line"
-msgstr "zum Anfang der aktuellen Zeile springen"
+msgstr "Zum Anfang der aktuellen Zeile springen"
 
-#: src/global.c:552
+#: src/global.c:559
 msgid "Go to end of current line"
-msgstr "zum Ende der aktuellen Zeile springen"
+msgstr "Zum Ende der aktuellen Zeile springen"
 
-#: src/global.c:555
+#: src/global.c:562
 msgid "Go to beginning of paragraph; then of previous paragraph"
-msgstr "zum Anfang des aktuellen Absatzes springen; dann des vorigen Absatzes"
+msgstr "Zum Anfang des aktuellen Absatzes springen; dann des vorigen Absatzes"
 
-#: src/global.c:557
+#: src/global.c:564
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr ""
-"hinter das Ende des aktuellen Absatzes springen; dann des vorigen Absatzes"
+"Hinter das Ende des aktuellen Absatzes springen; dann des vorigen Absatzes"
 
-#: src/global.c:560
+#: src/global.c:566
 msgid "Go to the first line of the file"
-msgstr "zur ersten Zeile der Datei springen"
+msgstr "Zur ersten Zeile der Datei springen"
 
-#: src/global.c:562
+#: src/global.c:567
 msgid "Go to the last line of the file"
-msgstr "zur letzten Zeile der Datei springen"
+msgstr "Zur letzten Zeile der Datei springen"
 
-#: src/global.c:564
+#: src/global.c:569
 msgid "Go to the matching bracket"
-msgstr "zur passenden Klammer springen"
+msgstr "Zur passenden Klammer springen"
 
-#: src/global.c:566
+#: src/global.c:571
 msgid "Scroll up one line without scrolling the cursor"
-msgstr "eine Zeile hochrollen, ohne den Cursor zu bewegen"
+msgstr "Eine Zeile hochrollen, ohne den Cursor zu bewegen"
 
-#: src/global.c:568
+#: src/global.c:573
 msgid "Scroll down one line without scrolling the cursor"
-msgstr "eine Zeile hinunterrollen, ohne den Cursor zu bewegen"
+msgstr "Eine Zeile hinunterrollen, ohne den Cursor zu bewegen"
 
-#: src/global.c:572
+#: src/global.c:576
 msgid "Switch to the previous file buffer"
-msgstr "zum vorhergehenden Dateipuffer umschalten"
+msgstr "Zum vorhergehenden Dateipuffer umschalten"
 
-#: src/global.c:574
+#: src/global.c:577
 msgid "Switch to the next file buffer"
-msgstr "zum folgenden Dateipuffer umschalten"
+msgstr "Zum folgenden Dateipuffer umschalten"
 
-#: src/global.c:577
+#: src/global.c:579
 msgid "Insert the next keystroke verbatim"
-msgstr "nächstes Zeichen direkt (nicht interpretiert) einfügen"
+msgstr "Nächstes Zeichen direkt (nicht interpretiert) einfügen"
 
-#: src/global.c:579
+#: src/global.c:580
 msgid "Insert a tab at the cursor position"
-msgstr "einen Tabulator an der Cursorposition einfügen"
+msgstr "Einen Tabulator an der Cursorposition einfügen"
 
 #: src/global.c:581
 msgid "Insert a newline at the cursor position"
-msgstr "einen Zeilenumbruch an der Cursorposition einfügen"
+msgstr "Einen Zeilenumbruch an der Cursorposition einfügen"
 
-#: src/global.c:583
+#: src/global.c:582
 msgid "Delete the character under the cursor"
 msgstr "Zeichen an der Cursorposition löschen"
 
-#: src/global.c:585
+#: src/global.c:584
 msgid "Delete the character to the left of the cursor"
 msgstr "Zeichen links vom Cursor löschen"
 
-#: src/global.c:588
+#: src/global.c:587
 msgid "Cut from the cursor position to the end of the file"
-msgstr "vom Cursor bis zum Dateiende ausschneiden"
+msgstr "Vom Cursor bis zum Dateiende ausschneiden"
 
-#: src/global.c:591
+#: src/global.c:590
 msgid "Justify the entire file"
-msgstr "die gesamte Datei ausrichten"
+msgstr "Die gesamte Datei ausrichten"
 
-#: src/global.c:595
+#: src/global.c:594
 msgid "Count the number of words, lines, and characters"
-msgstr "die Zahl der Wörter, Zeilen und Zeichen zählen"
+msgstr "Die Wörter, Zeilen und Zeichen zählen"
 
-#: src/global.c:598
+#: src/global.c:597
 msgid "Refresh (redraw) the current screen"
 msgstr "Bildschirm auffrischen (neu zeichnen)"
 
-#: src/global.c:600
+#: src/global.c:599
 msgid "Suspend the editor (if suspend is enabled)"
 msgstr ""
-"den Editor in den Hintergrund schieben (wenn „suspend“ angeschaltet ist)"
+"Den Editor in den Hintergrund schieben (wenn „suspend“ angeschaltet ist)"
 
-#: src/global.c:603
+#: src/global.c:602
 msgid "Toggle the case sensitivity of the search"
 msgstr "Unterscheidung von Groß- und Kleinschreibung bei Suche umschalten"
 
-#: src/global.c:605
+#: src/global.c:604
 msgid "Reverse the direction of the search"
-msgstr "die Richtung der Suche umkehren"
+msgstr "Die Richtung der Suche umkehren"
 
-#: src/global.c:609
+#: src/global.c:608
 msgid "Toggle the use of regular expressions"
 msgstr "Benutzung regulärer Ausdrücke umschalten"
 
-#: src/global.c:613
+#: src/global.c:612
 msgid "Recall the previous search/replace string"
-msgstr "den vorhergehenden Suchen-/Ersetzen-Begriff hervorholen"
+msgstr "Den vorhergehenden Suchen-/Ersetzen-Begriff hervorholen"
 
-#: src/global.c:615
+#: src/global.c:614
 msgid "Recall the next search/replace string"
-msgstr "den nächsten Suchen-/Ersetzen-Begriff hervorholen"
+msgstr "Den nächsten Suchen-/Ersetzen-Begriff hervorholen"
 
-#: src/global.c:618
+#: src/global.c:617
 msgid "Go to file browser"
-msgstr "zum Dateibrowser"
+msgstr "Zum Dateibrowser gehen"
 
-#: src/global.c:621
+#: src/global.c:620
 msgid "Toggle the use of DOS format"
 msgstr "Schreiben im DOS-Format umschalten"
 
-#: src/global.c:622
+#: src/global.c:621
 msgid "Toggle the use of Mac format"
 msgstr "Schreiben im Mac-Format umschalten"
 
-#: src/global.c:624
+#: src/global.c:622
 msgid "Toggle appending"
 msgstr "Anhängen umschalten"
 
-#: src/global.c:625
+#: src/global.c:623
 msgid "Toggle prepending"
-msgstr "vorn Anfügen umschalten"
+msgstr "Vorn Anfügen umschalten"
 
-#: src/global.c:628
+#: src/global.c:624
 msgid "Toggle backing up of the original file"
 msgstr "Sicherung existierender Dateien beim Speichern umschalten"
 
-#: src/global.c:629
+#: src/global.c:625
 msgid "Execute external command"
-msgstr "externen Befehl ausführen"
+msgstr "Externen Befehl ausführen"
 
-#: src/global.c:633
+#: src/global.c:628
 msgid "Toggle the use of a new buffer"
 msgstr "Benutzung eines neuen Puffers umschalten"
 
-#: src/global.c:636
+#: src/global.c:631
 msgid "Exit from the file browser"
-msgstr "den Dateibrowser beenden"
+msgstr "Den Dateibrowser beenden"
 
-#: src/global.c:638
+#: src/global.c:632
 msgid "Go to the first file in the list"
-msgstr "zur ersten Datei der Liste springen"
+msgstr "Zur ersten Datei der Liste springen"
 
-#: src/global.c:640
+#: src/global.c:633
 msgid "Go to the last file in the list"
-msgstr "zur letzten Datei der Liste springen"
+msgstr "Zur letzten Datei der Liste springen"
 
-#: src/global.c:641
+#: src/global.c:634
+msgid "Go to the previous file in the list"
+msgstr "Zur vorigen Datei der Liste springen"
+
+#: src/global.c:635
 msgid "Go to the next file in the list"
-msgstr "zur nächsten Datei der Liste springen"
+msgstr "Zur nächsten Datei der Liste springen"
+
+#: src/global.c:636
+msgid "Go to directory"
+msgstr "Zu Verzeichnis gehen"
+
+#: src/global.c:639
+msgid "Invoke the linter, if available"
+msgstr "Den Linter aufrufen (wenn verfügbar)"
+
+#: src/global.c:640
+msgid "Go to previous linter msg"
+msgstr "Zur vorhergehenden Linter-Meldung gehen"
+
+#: src/global.c:641
+msgid "Go to next linter msg"
+msgstr "Zur nächsten Linter-Meldung gehen"
 
 #: src/global.c:642
-msgid "Go to the previous file in the list"
-msgstr "zur vorigen Datei der Liste springen"
+msgid "Invoke formatter, if available"
+msgstr "Den Formatierer aufrufen (wenn verfügbar)"
 
-#: src/global.c:643
-msgid "Go to directory"
-msgstr "gehe zu Verzeichnis"
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:662
+msgid "Get Help"
+msgstr "Hilfe"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:670
-msgid "Close"
-msgstr "Schließen"
+#: src/global.c:665 src/prompt.c:1084
+msgid "Cancel"
+msgstr "Abbrechen"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:679
-msgid "WriteOut"
+#: src/global.c:678
+msgid "Write Out"
 msgstr "Speichern"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:704
+msgid "Go To Dir"
+msgstr "Gehe zu Verz."
+
+#: src/global.c:719
+msgid "Cut Text"
+msgstr "Ausschneiden"
+
+#: src/global.c:728
 msgid "Justify"
 msgstr "Ausrichten"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:696
-msgid "Read File"
-msgstr "Datei öffnen"
+#: src/global.c:733
+msgid "To Spell"
+msgstr "Rechtschr."
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:713
-msgid "Cut Text"
-msgstr "Ausschneiden"
+#: src/global.c:738
+msgid "To Linter"
+msgstr "Zum Linter"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:718
-msgid "UnJustify"
-msgstr "Ausr.rückgängig"
+#: src/global.c:740
+msgid "Formatter"
+msgstr "Formatierer"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:723
-msgid "UnCut Text"
-msgstr "Ausschn. rückgängig"
+#: src/global.c:745
+msgid "Case Sens"
+msgstr "GROSS/klein"
+
+#: src/global.c:750
+msgid "Regexp"
+msgstr "Reg. Ausdruck"
+
+#: src/global.c:755
+msgid "Backwards"
+msgstr "Rückwärts"
+
+#: src/global.c:762
+msgid "No Replace"
+msgstr "Keine Ersetzung"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:728 src/global.c:755
+#: src/global.c:770
 msgid "Cur Pos"
 msgstr "Cursor"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:737
-msgid "To Spell"
-msgstr "Rechtschr."
+#: src/global.c:780
+msgid "Prev Page"
+msgstr "Seite zurück"
 
-#: src/global.c:771
+#: src/global.c:782
+msgid "Next Page"
+msgstr "Seite vor"
+
+#: src/global.c:785
+msgid "First Line"
+msgstr "Erste Zeile"
+
+#: src/global.c:787
+msgid "Last Line"
+msgstr "Letzte Zeile"
+
+#: src/global.c:794
+msgid "To Bracket"
+msgstr "Zu Klammer"
+
+#: src/global.c:797
 msgid "Mark Text"
 msgstr "Text markieren"
 
-#: src/global.c:777
+#: src/global.c:800
 msgid "Copy Text"
 msgstr "Kopieren"
 
-#: src/global.c:780
+#: src/global.c:803
 msgid "Indent Text"
 msgstr "Einrücken"
 
-#: src/global.c:783
+#: src/global.c:805
 msgid "Unindent Text"
 msgstr "Ausrücken"
 
-#: src/global.c:787
+#: src/global.c:808
 msgid "Undo"
 msgstr "Rückgängig"
 
-#: src/global.c:790
+#: src/global.c:810
 msgid "Redo"
 msgstr "Wiederholen"
 
-#: src/global.c:796 src/global.c:800
-msgid "Forward"
-msgstr "Vorwärts"
-
-#: src/global.c:806 src/global.c:810
+#: src/global.c:814 src/global.c:820
 msgid "Back"
 msgstr "Zurück"
 
-#: src/global.c:817
-msgid "Next Word"
-msgstr "Nächstes Wort"
+#: src/global.c:816 src/global.c:822
+msgid "Forward"
+msgstr "Vorwärts"
 
-#: src/global.c:820
+#: src/global.c:827
 msgid "Prev Word"
 msgstr "Vorheriges Wort"
 
-#: src/global.c:824
-msgid "Prev Line"
-msgstr "Zeile zurück"
-
-#: src/global.c:827
-msgid "Next Line"
-msgstr "Zeile vor"
+#: src/global.c:829
+msgid "Next Word"
+msgstr "Nächstes Wort"
 
-#: src/global.c:830
+#: src/global.c:833
 msgid "Home"
 msgstr "Pos 1"
 
-#: src/global.c:833
+#: src/global.c:835
 msgid "End"
 msgstr "Ende"
 
-#: src/global.c:845
-msgid "Find Other Bracket"
-msgstr "Andere Klammer finden"
+#: src/global.c:844
+msgid "Beg of Par"
+msgstr "Anf des Abs."
+
+#: src/global.c:846
+msgid "End of Par"
+msgstr "Ende des Abs."
 
-#: src/global.c:848
+#: src/global.c:851
 msgid "Scroll Up"
 msgstr "Hochrollen"
 
-#: src/global.c:851
+#: src/global.c:853
 msgid "Scroll Down"
 msgstr "Herunterrollen"
 
-#: src/global.c:856
-msgid "Previous File"
-msgstr "Vorherige Datei"
-
 #: src/global.c:858
+msgid "Prev File"
+msgstr "Vorh. Datei"
+
+#: src/global.c:860
 msgid "Next File"
 msgstr "Nächste Datei"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:862 src/text.c:3045
-msgid "Verbatim Input"
-msgstr "Direkte Eingabe"
+#: src/global.c:869
+msgid "Verbatim"
+msgstr "Direkt"
 
-#: src/global.c:867
+#: src/global.c:872
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:870
+#: src/global.c:874
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:873
+#: src/global.c:876
 msgid "Delete"
 msgstr "Löschen"
 
-#: src/global.c:876
+#: src/global.c:878
 msgid "Backspace"
 msgstr "Rücktaste"
 
-#: src/global.c:893
+#: src/global.c:888
 msgid "CutTillEnd"
 msgstr "AusschnBisEnde"
 
-#: src/global.c:906
+#: src/global.c:898
 msgid "Word Count"
 msgstr "Wortanzahl"
 
-#: src/global.c:1367
+#: src/global.c:905
+msgid "Suspend"
+msgstr "In den Hintergrund"
+
+#: src/global.c:910
+msgid "PrevHstory"
+msgstr "Verl. zurück"
+
+#: src/global.c:913
+msgid "NextHstory"
+msgstr "Verlauf vor"
+
+#: src/global.c:917
+msgid "Go To Text"
+msgstr "Zu Text"
+
+#: src/global.c:928
+msgid "DOS Format"
+msgstr "DOS-Format"
+
+#: src/global.c:931
+msgid "Mac Format"
+msgstr "Mac-Format"
+
+#: src/global.c:934
+msgid "Append"
+msgstr "Anhängen"
+
+#: src/global.c:936
+msgid "Prepend"
+msgstr "Vorn Anfügen"
+
+#: src/global.c:939
+msgid "Backup File"
+msgstr "Sicherungsdatei"
+
+#: src/global.c:946
+msgid "Execute Command"
+msgstr "Befehl ausführen"
+
+#: src/global.c:961
+msgid "To Files"
+msgstr "In Dateien"
+
+#: src/global.c:964
+msgid "First File"
+msgstr "Erste Datei"
+
+#: src/global.c:966
+msgid "Last File"
+msgstr "Letzte Datei"
+
+#: src/global.c:977
+msgid "Prev Lint Msg"
+msgstr "Lintmld. zurück"
+
+#: src/global.c:979
+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:1227
 msgid "Help mode"
 msgstr "Hilfe-Modus"
 
-#: src/global.c:1369
+#: src/global.c:1229
 msgid "Constant cursor position display"
 msgstr "Cursorposition ständig anzeigen"
 
-#: src/global.c:1371
+#: src/global.c:1231
 msgid "Use of one more line for editing"
 msgstr "Verwendung einer Zeile mehr zum Editieren"
 
-#: src/global.c:1373
+#: src/global.c:1233
 msgid "Smooth scrolling"
 msgstr "Sanftes Rollen"
 
-#: src/global.c:1375
+#: src/global.c:1235
+msgid "Soft wrapping of overlong lines"
+msgstr "Überlange Zeilen fließend umbrechen"
+
+#: src/global.c:1237
 msgid "Whitespace display"
-msgstr "Weißraumanzeige"
+msgstr "Leerzeichenanzeige"
 
-#: src/global.c:1377
+#: src/global.c:1239
 msgid "Color syntax highlighting"
 msgstr "Farbige Syntaxhervorhebung"
 
-#: src/global.c:1379
+#: src/global.c:1241
 msgid "Smart home key"
-msgstr "Intell. Pos1-Taste"
+msgstr "Intelligente Pos1-Taste"
 
-#: src/global.c:1381
+#: src/global.c:1243
 msgid "Auto indent"
-msgstr "Automatischer Einzug"
+msgstr "Automatische Einrückung"
 
-#: src/global.c:1383
+#: src/global.c:1245
 msgid "Cut to end"
 msgstr "Bis Ende ausschneiden"
 
-#: src/global.c:1385
-msgid "Long line wrapping"
-msgstr "Lange Zeilen umbrechen"
+#: src/global.c:1247
+msgid "Hard wrapping of overlong lines"
+msgstr "Überlange Zeilen hart umbrechen"
 
-#: src/global.c:1387
+#: src/global.c:1249
 msgid "Conversion of typed tabs to spaces"
 msgstr "Umwandlungen eingegebener Tabulatoren in Leerzeichen"
 
-#: src/global.c:1389
+#: src/global.c:1251
 msgid "Backup files"
-msgstr "Sicherungskopien"
+msgstr "Sicherungsdateien"
 
-#: src/global.c:1391
+#: src/global.c:1253
 msgid "Multiple file buffers"
 msgstr "Mehrere Dateipuffer"
 
-#: src/global.c:1393
+#: src/global.c:1255
 msgid "Mouse support"
 msgstr "Mausunterstützung"
 
-#: src/global.c:1395
+#: src/global.c:1257
 msgid "No conversion from DOS/Mac format"
 msgstr "Keine Umwandlung aus DOS/Mac-Format"
 
-#: src/global.c:1397
+#: src/global.c:1259
 msgid "Suspension"
-msgstr "in den Hintergrund"
-
-#: src/global.c:1399
-msgid "Soft line wrapping"
-msgstr "Lange Zeilen fließend umbrechen"
+msgstr "In den Hintergrund"
 
-#: src/help.c:236
+#: src/help.c:205
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -982,18 +1083,18 @@ msgid ""
 "prompt.  Hitting Enter without entering any text will perform the previous "
 "search.  "
 msgstr ""
-"Hilfetext für das Suchkommando\n"
+"Hilfetext für den Suchbefehl\n"
 "\n"
 " Geben Sie die Wörter oder Buchstaben ein, nach denen Sie suchen möchten, "
-"und drücken Sie die Eingabetaste.  Wenn eine Übereinstimmung für den "
+"und drücken Sie die Eingabetaste. Wenn eine Übereinstimmung für den "
 "eingegebenen Text gefunden wird, dann wird die Anzeige zur nächsten "
 "Fundstelle bewegt.\n"
 "\n"
 " Die vorhergehende Suchzeichenkette wird in eckigen Klammern nach der Such-"
-"Aufforderung angezeigt. Drücken der Eingabetaste ohne Eingabe irgenwelchen "
+"Aufforderung angezeigt. Drücken der Eingabetaste ohne Eingabe irgendwelchen "
 "Textes führt die vorhergehende Suche durch.  "
 
-#: src/help.c:245
+#: src/help.c:214
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1001,13 +1102,13 @@ msgid ""
 " The following function keys are available in Search mode:\n"
 "\n"
 msgstr ""
-"Wenn Sie Text markiert haben und dann Suchen, um zu Ersetzen, werden nur "
+"Wenn Sie Text markiert haben und dann suchen, um zu ersetzen, werden nur "
 "Treffer in der ausgewählten Region ersetzt.\n"
 "\n"
 " Die folgenden Funktionstasten sind im Suchmodus verfügbar:\n"
 "\n"
 
-#: src/help.c:251
+#: src/help.c:220
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1021,13 +1122,13 @@ msgstr ""
 "Hilfetext für „Zu Zeile“\n"
 "\n"
 " Geben Sie die Nummer der gewünschten Zeile ein und drücken Sie die "
-"Eingabetaste. Gibt es weniger Zeilen im Text, so springt nano zur letzten "
+"Eingabetaste. Gibt es weniger Zeilen im Text, so springt Nano zur letzten "
 "Zeile der Datei.\n"
 "\n"
 " Die folgenden Funktionstasten sind im Zu-Zeile-Modus verfügbar:\n"
 "\n"
 
-#: src/help.c:260
+#: src/help.c:229
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1044,14 +1145,14 @@ msgstr ""
 " Geben Sie den Namen einer Datei ein, die an der momentanen Cursorposition "
 "in den momentanen Dateipuffer eingefügt werden soll.\n"
 "\n"
-" Wenn Sie nano mit Unterstützung für mehrere Dateipuffer compiliert haben "
-"und diese Funktion mit den Kommandozeilenoptionen -F oder --multibuffer, mit "
+" Wenn Sie Nano mit Unterstützung für mehrere Dateipuffer compiliert haben "
+"und diese Funktion mit den Befehlszeilenoptionen -F oder --multibuffer, mit "
 "der Tastenkombination Meta-F oder mittels einer nanorc-Datei eingeschaltet "
 "haben, so wird die Einfügeoperation die Datei in einen separaten Puffer "
 "laden. (Benutzen Sie Meta-< und >, um zwischen den Dateipuffern "
 "umzuschalten.)  "
 
-#: src/help.c:269
+#: src/help.c:238
 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"
@@ -1066,7 +1167,7 @@ msgstr ""
 " Die folgenden Funktionstasten sind im Datei-Einfügen-Modus verfügbar:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:244
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1083,18 +1184,19 @@ msgid ""
 msgstr ""
 "Hilfetext für „Datei schreiben“\n"
 "\n"
-" Geben Sie den Namen ein, unter dem Sie die momentane Datei speichern wollen "
-"und drücken Sie die Eingabetaste.\n"
+" Geben Sie den Namen ein, unter dem Sie die momentane Datei speichern "
+"wollen, und drücken Sie die Eingabetaste.\n"
 "\n"
 " Wenn Sie Text markiert haben, so werden Sie gefragt, ob Sie nur den "
 "ausgewählten Teil des Textes in eine separate Datei schreiben wollen. Um die "
-"Gefahr, eine Datei mit einem Teil von ihr zu überschreiben, zu minimieren, "
-"ist der aktuelle Dateiname in diesem Modus nicht die Vorgabe.\n"
+"Gefahr zu minimieren, dass eine Datei mit einem Teil von ihr selbst "
+"überschrieben wird, ist der aktuelle Dateiname in diesem Modus nicht die "
+"Vorgabe.\n"
 "\n"
 " Die folgenden Funktionstasten sind im Datei-Schreiben-Modus verfügbar:\n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:258
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1107,7 +1209,7 @@ msgid ""
 " The following function keys are available in the file browser:\n"
 "\n"
 msgstr ""
-"Hilfetext für den Dateiwähler\n"
+"Hilfetext für den Dateibrowser\n"
 "\n"
 " Mit dem Dateiwähler kann die Verzeichnisstruktur visuell durchsucht werden, "
 "um eine Datei für Lese- und Schreiboperationen auszuwählen. Sie können die "
@@ -1116,10 +1218,10 @@ msgstr ""
 "auszuwählen. Um sich eine Ebene aufwärts zu bewegen, wählen Sie das "
 "Verzeichnis namens „..“ ganz oben in der Dateiliste.\n"
 "\n"
-" Die folgenden Funktionstasten sind im Dateiwähler verfügbar:\n"
+" Die folgenden Funktionstasten sind im Dateibrowser verfügbar:\n"
 "\n"
 
-#: src/help.c:302
+#: src/help.c:271
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1132,28 +1234,27 @@ msgid ""
 "search.\n"
 "\n"
 msgstr ""
-"Hilfetext für das Suchkommando des Dateiwählers\n"
+"Hilfetext für den Suchbefehl des Dateibrowsers\n"
 "\n"
-" Geben Sie die Wörter oder Buchstaben ein, nach denen Sie suchen möchten, "
-"und drücken Sie die Eingabetaste.  Wenn eine Übereinstimmung für den "
-"eingegebenen Text gefunden wird, dann wird die Anzeige zur nächsten "
-"Fundstelle bewegt.\n"
+" Geben Sie die Wörter oder Zeichen ein, nach denen Sie suchen möchten, und "
+"drücken Sie die Eingabetaste. Wenn eine Übereinstimmung für den eingegebenen "
+"Text gefunden wird, dann wird die Anzeige zur nächsten Fundstelle bewegt.\n"
 "\n"
 " Die vorhergehende Suchzeichenkette wird in eckigen Klammern nach der Such-"
-"Aufforderung angezeigt. Drücken der Eingabetaste ohne Eingabe irgenwelchen "
+"Aufforderung angezeigt. Drücken der Eingabetaste ohne Eingabe irgendwelchen "
 "Textes führt die vorhergehende Suche durch.\n"
 "\n"
 
-#: src/help.c:311
+#: src/help.c:280
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
 msgstr ""
-" Die folgenden Funktionstasten sind im Suchkommando-Modus des Dateiwählers "
+" Die folgenden Funktionstasten sind im Suchbefehl-Modus des Dateibrowsers "
 "verfügbar:\n"
 "\n"
 
-#: src/help.c:315
+#: src/help.c:284
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1165,7 +1266,7 @@ msgid ""
 " The following function keys are available in Browser Go To Directory mode:\n"
 "\n"
 msgstr ""
-"Hilfetext für den Gehe-zu-Verzeichnis im Dateiwähler\n"
+"Hilfetext für Gehe-zu-Verzeichnis im Dateibrowser\n"
 "\n"
 " Geben Sie den Namen des Verzeichnisses ein, das Sie durchsuchen wollen.\n"
 "\n"
@@ -1174,10 +1275,10 @@ msgstr ""
 "automatisch vervollständigen zu lassen.\n"
 "\n"
 " Die folgenden Funktionstasten sind im Gehe-zu-Verzeichnis-Modus des "
-"Dateiwählers verfügbar:\n"
+"Dateibrowsers verfügbar:\n"
 "\n"
 
-#: src/help.c:328
+#: src/help.c:297
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1201,7 +1302,7 @@ msgstr ""
 " Die folgenden Funktionstasten sind in der Rechtschreibprüfung verfügbar:\n"
 "\n"
 
-#: src/help.c:343
+#: src/help.c:312
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1222,7 +1323,7 @@ msgstr ""
 " Die folgenden Funktionstasten sind im Befehl-Ausführen-Modus verfügbar:\n"
 "\n"
 
-#: src/help.c:356
+#: src/help.c:325
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1233,7 +1334,7 @@ msgid ""
 "showing the file being edited.  The status line is the third line from the "
 "bottom and shows important messages.  "
 msgstr ""
-"Haupt-Hilfe für nano\n"
+"Haupt-Hilfe für Nano\n"
 "\n"
 " Nano wurde konzipiert, die Funktionalität und die Benutzerfreundlichkeit "
 "des UW-Pico-Texteditors zu imitieren.  Es gibt vier Hauptbereiche: Die "
@@ -1242,7 +1343,7 @@ msgstr ""
 "Hauptfenster enthält die zu bearbeitende Datei.  Die Statuszeile (die dritte "
 "Zeile von unten) zeigt wichtige Meldungen.  "
 
-#: src/help.c:366
+#: src/help.c:335
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1253,15 +1354,15 @@ msgid ""
 "Alt, or Meta key depending on your keyboard setup.  "
 msgstr ""
 "Die untersten zwei Zeilen listen die meistgebrauchten Tastenkombinationen "
-"von nano auf.\n"
+"von Nano auf.\n"
 "\n"
 " Tastenkombinationen werden wie folgt abgekürzt: Kombinationen mit der Strg-"
 "Taste werden mit einem ^ ausgedrückt und können auch eingegeben werden, "
 "indem Esc zwei Mal gedrückt wird. Escape-Sequenzen werden mit dem Meta-"
-"Symbol (M) angegeben und können je nach Tastatureinstellung mit Esc, Alt "
-"oder Meta eingegeben werden, abhängig von Ihrer Tastatureinstellung.  "
+"Symbol (M) angegeben und können mit Esc, Alt oder Meta eingegeben werden, "
+"abhängig von Ihrer Tastatureinstellung.  "
 
-#: src/help.c:375
+#: src/help.c:344
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1270,20 +1371,20 @@ msgid ""
 "\n"
 msgstr ""
 "Zudem kann durch zweimaliges Drücken von Esc und anschließender Eingabe "
-"einer dreistelliger Zahl von 000 bis 255 das Zeichen mit dem entsprechenden "
-"Wert eingegeben werden.  Die folgenden Tasten(kombinationen) sind im "
+"einer dreistelligen Zahl von 000 bis 255 das Zeichen mit dem entsprechenden "
+"Wert eingegeben werden. Die folgenden Tasten(-kombinationen) sind im "
 "Hauptfenster verfügbar. Alternative Tasten stehen in Klammern:\n"
 "\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:376 src/help.c:448
 msgid "enable/disable"
 msgstr "aktivieren/deaktivieren"
 
-#: src/nano.c:587
+#: src/nano.c:601
 msgid "Key invalid in view mode"
 msgstr "Taste unzulässig im Nur-Lese-Modus"
 
-#: src/nano.c:695
+#: src/nano.c:713
 #, c-format
 msgid ""
 "\n"
@@ -1292,7 +1393,7 @@ msgstr ""
 "\n"
 "Puffer in %s geschrieben\n"
 
-#: src/nano.c:697
+#: src/nano.c:715
 #, c-format
 msgid ""
 "\n"
@@ -1301,7 +1402,7 @@ msgstr ""
 "\n"
 "Puffer nicht in %s geschrieben: %s\n"
 
-#: src/nano.c:700
+#: src/nano.c:718
 #, c-format
 msgid ""
 "\n"
@@ -1310,11 +1411,11 @@ msgstr ""
 "\n"
 "Puffer nicht geschrieben: %s\n"
 
-#: src/nano.c:723
+#: src/nano.c:743
 msgid "Window size is too small for nano...\n"
-msgstr "Fenstergröße ist zu klein für Nano...\n"
+msgstr "Fenster ist zu klein für Nano...\n"
 
-#: src/nano.c:816
+#: src/nano.c:836
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
@@ -1323,251 +1424,257 @@ msgstr ""
 "Aufruf: nano [OPTIONEN] [[+ZEILE,SPALTE] Datei]...\n"
 "\n"
 
-#: src/nano.c:819
+#: src/nano.c:839
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Option\t\tlange GNU-Option\t\tBedeutung\n"
 
-#: src/nano.c:821
+#: src/nano.c:841
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Option\t\tBedeutung\n"
 
-#: src/nano.c:824
-msgid "Show this message"
-msgstr "diese Meldung anzeigen"
-
-#: src/nano.c:825
+#: src/nano.c:844
 msgid "+LINE,COLUMN"
 msgstr "+ZEILE,SPALTE"
 
-#: src/nano.c:826
+#. TRANSLATORS: The next forty or so strings are option descriptions
+#. * for the --help output.  Try to keep them at most 40 characters.
+#: src/nano.c:847
 msgid "Start at line LINE, column COLUMN"
 msgstr "bei Zeile ZEILE, Spalte SPALTE beginnen"
 
-#: src/nano.c:828
+#: src/nano.c:849
 msgid "Enable smart home key"
-msgstr "intelligente Pos1-Taste aktivieren"
+msgstr "Intelligente Pos1-Taste aktivieren"
 
-#: src/nano.c:829
+#: src/nano.c:850
 msgid "Save backups of existing files"
-msgstr "existierende Dateien beim Speichern sichern"
+msgstr "Existierende Dateien beim Speichern sichern"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "-C <dir>"
-msgstr "-C <verz>"
+msgstr "-C <Verz>"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "--backupdir=<dir>"
-msgstr "--backupdir=<verz>"
+msgstr "--backupdir=<Verz>"
 
-#: src/nano.c:831
+#: src/nano.c:852
 msgid "Directory for saving unique backup files"
-msgstr "Verzeichnis, um Backupdateien zu schreiben"
+msgstr "Verzeichnis zum Speichern von Sicherungsdateien"
 
-#: src/nano.c:834
+#: src/nano.c:855
 msgid "Use bold instead of reverse video text"
 msgstr "Fettdruck anstelle von inversem Text benutzen"
 
-#: src/nano.c:837
+#: src/nano.c:858
 msgid "Convert typed tabs to spaces"
-msgstr "eingegebebene Tabulatoren in Leerzeichen umwandeln"
+msgstr "Eingegebebene Tabulatoren in Leerzeichen umwandeln"
 
-#: src/nano.c:840
+#: src/nano.c:861
 msgid "Enable multiple file buffers"
 msgstr "Benutzung mehrerer Dateipuffer aktivieren"
 
-#: src/nano.c:845
+#: src/nano.c:865
+msgid "Use (vim-style) lock files"
+msgstr "Sperrdateien benutzen (nach Art von Vim)"
+
+#: src/nano.c:869
 msgid "Log & read search/replace string history"
-msgstr "Geschichte der Suchen-/Ersetzen-Begriffe mitschreiben und lesen"
+msgstr "Verlauf der Suchen-/Ersetzen-Begriffe mitschreiben und lesen"
 
-#: src/nano.c:848
+#: src/nano.c:873
 msgid "Don't look at nanorc files"
-msgstr "die nanorc-Dateien ignorieren"
+msgstr "Die nanorc-Dateien ignorieren"
 
-#: src/nano.c:851
+#: src/nano.c:876
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Verwirrung um Zehnertastatur lösen"
 
-#: src/nano.c:853
+#: src/nano.c:878
 msgid "Don't add newlines to the ends of files"
-msgstr "keine Zeilenvorschübe an die Enden von Dateien anhängen"
+msgstr "Keine Zeilenvorschübe an die Enden von Dateien anhängen"
 
-#: src/nano.c:856
+#: src/nano.c:881
 msgid "Don't convert files from DOS/Mac format"
-msgstr "keine Umwandlung aus DOS/Mac-Format"
+msgstr "Keine Umwandlung aus DOS/Mac-Format"
 
-#: src/nano.c:858
+#: src/nano.c:883
 msgid "Use one more line for editing"
-msgstr "eine Zeile mehr zum Editieren verwenden"
+msgstr "Eine Zeile mehr zum Editieren verwenden"
+
+#: src/nano.c:886
+msgid "Log & read location of cursor position"
+msgstr "Cursorposition aufzeichnen und lesen"
 
-#: src/nano.c:860
+#: src/nano.c:889
 msgid "-Q <str>"
-msgstr "-Q <zkette>"
+msgstr "-Q <Zeichenkette>"
 
-#: src/nano.c:860
+#: src/nano.c:889
 msgid "--quotestr=<str>"
-msgstr "--quotestr=<zkette>"
+msgstr "--quotestr=<Zeichenkette>"
 
-#: src/nano.c:861
+#: src/nano.c:890
 msgid "Quoting string"
 msgstr "Zitatzeichen"
 
-#: src/nano.c:863
+#: src/nano.c:892
 msgid "Restricted mode"
-msgstr "eingeschränkter Modus"
+msgstr "Eingeschränkter Modus"
 
-#: src/nano.c:866
+#: src/nano.c:895
 msgid "Scroll by line instead of half-screen"
-msgstr "zeilenweise rollen (statt halb-bildschirm-weise)"
+msgstr "Zeilenweise rollen (statt halb-bildschirm-weise)"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "-T <#cols>"
-msgstr "-T <#spalten>"
+msgstr "-T <#Spalten>"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "--tabsize=<#cols>"
-msgstr "--tabsize=<#spalten>"
+msgstr "--tabsize=<#Spalten>"
 
-#: src/nano.c:869
+#: src/nano.c:898
 msgid "Set width of a tab to #cols columns"
-msgstr "Tabulator-Größe auf #spalten setzen"
+msgstr "Tabulatorbreite auf #Spalten setzen"
 
-#: src/nano.c:871
+#: src/nano.c:900
 msgid "Do quick statusbar blanking"
-msgstr "schnelles Löschen der Statuszeile durchführen"
+msgstr "Schnelles Löschen der Statuszeile durchführen"
 
-#: src/nano.c:874
+#: src/nano.c:903
 msgid "Print version information and exit"
 msgstr "Versionsinfo ausgeben und beenden"
 
-#: src/nano.c:877
+#: src/nano.c:906
 msgid "Detect word boundaries more accurately"
 msgstr "Wortgrenzen genauer erkennen"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "-Y <str>"
-msgstr "-Y <zkette>"
+msgstr "-Y <Zeichenkette>"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "--syntax=<str>"
-msgstr "--syntax=<zkette>"
+msgstr "--syntax=<Zeichenkette>"
 
-#: src/nano.c:881
+#: src/nano.c:910
 msgid "Syntax definition to use for coloring"
-msgstr "zu benutzende Syntaxdefinition für Einfärben"
+msgstr "Zu benutzende Syntaxdefinition für Einfärben"
 
-#: src/nano.c:883
+#: src/nano.c:912
 msgid "Constantly show cursor position"
 msgstr "Cursorposition ständig anzeigen"
 
-#: src/nano.c:885
+#: src/nano.c:914
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Vertauschung von Rücktaste/Entf beheben"
 
-#: src/nano.c:888
+#: src/nano.c:915
+msgid "Show this help text"
+msgstr "Diese Hilfe anzeigen"
+
+#: src/nano.c:918
 msgid "Automatically indent new lines"
 msgstr "Neue Zeilen automatisch einrücken"
 
-#: src/nano.c:889
+#: src/nano.c:919
 msgid "Cut from cursor to end of line"
 msgstr "Vom Cursor bis zum Zeilenende ausschneiden"
 
-#: src/nano.c:892
+#: src/nano.c:922
 msgid "Don't follow symbolic links, overwrite"
 msgstr "Symbolischen Links nicht folgen, sondern überschreiben"
 
-#: src/nano.c:894
+#: src/nano.c:924
 msgid "Enable the use of the mouse"
 msgstr "Benutzung der Maus aktivieren"
 
-#: src/nano.c:897
+#: src/nano.c:926
+msgid "Do not read the file (only write it)"
+msgstr "Datei nicht lesen (nur schreiben)"
+
+#: src/nano.c:928
 msgid "-o <dir>"
-msgstr "-o <verz>"
+msgstr "-o <Verz>"
 
-#: src/nano.c:897
+#: src/nano.c:928
 msgid "--operatingdir=<dir>"
-msgstr "--operatingdir=<verz>"
+msgstr "--operatingdir=<Verz>"
 
-#: src/nano.c:898
+#: src/nano.c:929
 msgid "Set operating directory"
 msgstr "Arbeitsverzeichnis setzen"
 
-#: src/nano.c:901
+#: src/nano.c:932
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Tasten XON (^Q) und XOFF (^S) beibehalten"
 
-#: src/nano.c:903
+#: src/nano.c:935
 msgid "Silently ignore startup issues like rc file errors"
 msgstr "Startprobleme wie Fehler in den RC-Dateien stillschweigend ignorieren"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "-r <#cols>"
-msgstr "-r <#spalten>"
+msgstr "-r <#Spalten>"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "--fill=<#cols>"
-msgstr "--fill=<#spalten>"
+msgstr "--fill=<#Spalten>"
 
-#: src/nano.c:906
-msgid "Set wrapping point at column #cols"
-msgstr "Umbruchpunkt bei #spalten setzen"
+#: src/nano.c:939
+msgid "Set hard-wrapping point at column #cols"
+msgstr "Harten Umbruchpunkt bei #Spalten setzen"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "-s <prog>"
-msgstr "-s <prog>"
+msgstr "-s <Prog>"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "--speller=<prog>"
-msgstr "--speller=<prog>"
+msgstr "--speller=<Prog>"
 
-#: src/nano.c:910
+#: src/nano.c:943
 msgid "Enable alternate speller"
 msgstr "Alternatives Rechtschreibprüfungsprogramm"
 
-#: src/nano.c:913
+#: src/nano.c:946
 msgid "Auto save on exit, don't prompt"
 msgstr "Beim Beenden ohne Rückfrage speichern"
 
-#: src/nano.c:915
-msgid "Allow generic undo [EXPERIMENTAL]"
-msgstr "Allgemeine Rückgängig-Function aktivieren [EXPERIMENTELL]"
-
-#: src/nano.c:918
+#: src/nano.c:947
 msgid "View mode (read-only)"
-msgstr "Nur-Lese-Modus (keine Veränderungen möglich)"
+msgstr "Nur-Lesen-Modus (keine Veränderungen möglich)"
 
-#: src/nano.c:920
-msgid "Don't wrap long lines"
-msgstr "Lange Zeilen nicht in neue Zeilen umbrechen"
+#: src/nano.c:949
+msgid "Don't hard-wrap long lines"
+msgstr "Lange Zeilen nicht hart umbrechen"
 
-#: src/nano.c:922
+#: src/nano.c:951
 msgid "Don't show the two help lines"
-msgstr "die zwei Hilfe-Zeilen nicht anzeigen"
+msgstr "Die zwei Hilfe-Zeilen nicht anzeigen"
 
-#: src/nano.c:923
+#: src/nano.c:952
 msgid "Enable suspension"
 msgstr "Schieben in den Hintergrund (anhalten und zurück zur Shell) aktivieren"
 
-#: src/nano.c:924
+#: src/nano.c:954
 msgid "Enable soft line wrapping"
-msgstr "fließenden Zeilenumbruch aktivieren"
+msgstr "Fließenden Zeilenumbruch aktivieren"
 
-#: src/nano.c:928
-msgid "(ignored, for Pico compatibility)"
-msgstr "(ignoriert, für Kompatibilität zu Pico)"
-
-#: src/nano.c:938
+#: src/nano.c:963
 #, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
-msgstr " GNU nano Version %s (compiliert um %s, %s)\n"
+msgid " GNU nano, version %s\n"
+msgstr " GNU Nano Version %s\n"
 
-#: src/nano.c:943
+#: src/nano.c:966
 #, 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:944
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1576,153 +1683,180 @@ msgstr ""
 "\n"
 " Kompilierte Optionen:"
 
-#: src/nano.c:1022
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
-msgstr "Tut mir leid, diese Funktion wird nicht unterstützt"
+msgstr "Die Unterstützung für diese Funktion wurde leider deaktiviert"
+
+#: src/nano.c:1125
+msgid "No file name"
+msgstr "Kein Dateiname"
 
-#: src/nano.c:1044
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
-msgstr "Veränderten Puffer speichern („Nein“ VERWIRFT DIE ÄNDERUNGEN) ? "
+msgstr "Veränderten Puffer speichern („Nein“ VERWIRFT DIE ÄNDERUNGEN)? "
 
-#: src/nano.c:1088
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
-msgstr "Konnte Standardeingabe nicht erneut von Tastatur öffnen, sorry\n"
+msgstr ""
+"Standardeingabe konnte leider nicht erneut mit der Tastatur geöffnet "
+"werden.\n"
 
-#: src/nano.c:1114
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
-msgstr "Lese von Standardeingabe, ^C zum Abbrechen\n"
+msgstr "Von Standardeingabe wird gelesen, ^C zum Abbrechen\n"
 
-#: src/nano.c:1182
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "SIGHUP oder SIGTERM empfangen\n"
 
-#: src/nano.c:1204
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
-msgstr "Benutzen Sie „fg“, um zu nano zurückzukehren.\n"
+msgstr "Benutzen Sie „fg“, um zu Nano zurückzukehren.\n"
 
-#: src/nano.c:1386
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "aktiviert"
 
-#: src/nano.c:1387
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "deaktiviert"
 
-#: src/nano.c:1548 src/winio.c:1256
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr "Unbekannter Befehl"
 
-#: src/nano.c:1674
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "XON ignoriert, murmel murmel"
 
-#: src/nano.c:1679
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF ignoriert, murmel murmel"
 
-#: src/nano.c:2209 src/rcfile.c:1100
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
-msgstr "Angeforderte Tabulatorweite „%s“ ungültig"
+msgstr "Angeforderte Tabulatorbreite „%s“ ist ungültig."
 
-#: src/nano.c:2268 src/rcfile.c:1025
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
-msgstr "Angeforderte Füllgröße „%s“ ungültig"
+msgstr "Angeforderte Füllgröße „%s“ ist ungültig."
+
+#: src/nano.c:2415
+#, 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"
 
 #. 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:1259
+#: src/prompt.c:1055
 msgid "Yy"
 msgstr "JjYy"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1056
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1057
 msgid "Aa"
 msgstr "Aa"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1071
 msgid "Yes"
 msgstr "Ja"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1076
 msgid "All"
 msgstr "Alle"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1081
 msgid "No"
 msgstr "Nein"
 
-#: src/rcfile.c:130
+#: src/rcfile.c:137
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Fehler in %s in Zeile %lu: "
 
-#: src/rcfile.c:185
+#: src/rcfile.c:196
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "Argument „%s“ hat nicht beendetes \""
 
-#: src/rcfile.c:212 src/rcfile.c:264 src/rcfile.c:711 src/rcfile.c:768
-#: src/rcfile.c:821
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 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:238 src/search.c:62
+#: src/rcfile.c:249 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Ungültiger regulärer Ausdruck „%s“: %s"
 
-#: src/rcfile.c:258
+#: src/rcfile.c:269
 msgid "Missing syntax name"
 msgstr "Fehlender Syntaxname"
 
-#: src/rcfile.c:316
+#: src/rcfile.c:340
 msgid "The \"none\" syntax is reserved"
 msgstr "Die Syntax „none“ ist reserviert"
 
-#: src/rcfile.c:323
+#: src/rcfile.c:347
 msgid "The \"default\" syntax must take no extensions"
 msgstr "Die Syntax „default“ darf keine Erweiterungen haben"
 
-#: src/rcfile.c:386 src/rcfile.c:483
+#: src/rcfile.c:433
 msgid "Missing key name"
 msgstr "Fehlender Schlüsselname"
 
-#: src/rcfile.c:398 src/rcfile.c:499
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
-msgstr "Tastenkürzel müssen mit „^“, „M“ oder „F“ beginnen"
+#: src/rcfile.c:442 src/rcfile.c:453
+msgid "Key name is too short"
+msgstr "Schlüsselname ist zu kurz"
+
+#: src/rcfile.c:463
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
+msgstr "Schlüsselnamen müssen mit „^“, „M“ oder „F“ beginnen"
+
+#: src/rcfile.c:472
+msgid "Must specify a function to bind the key to"
+msgstr "Die an die Taste zu bindende Funktion muss angegeben werden"
 
-#: src/rcfile.c:407
-msgid "Must specify function to bind key to"
-msgstr "Die an die Taste zu bindene Funktion muss angegeben werden"
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:482
+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:418 src/rcfile.c:510
-msgid "Must specify menu to bind key to (or \"all\")"
-msgstr "Das an die Taste zu bindene Menü (oder „all“) muss angegeben werden"
+#: src/rcfile.c:489
+#, c-format
+msgid "Cannot map name \"%s\" to a function"
+msgstr "„%s“ kann nicht auf eine Funktion gebunden werden"
 
-#: src/rcfile.c:426
+#: src/rcfile.c:496
 #, c-format
-msgid "Could not map name \"%s\" to a function"
-msgstr "Konnte „%s“ nicht auf eine Funktion binden"
+msgid "Cannot map name \"%s\" to a menu"
+msgstr "„%s“ kann nicht auf ein Menü gebunden werden"
 
-#: src/rcfile.c:432 src/rcfile.c:517
+#: src/rcfile.c:528
 #, c-format
-msgid "Could not map name \"%s\" to a menu"
-msgstr "Konnte „%s“ nicht auf ein Menü binden"
+msgid "Function '%s' does not exist in menu '%s'"
+msgstr "Funktion »%s« existiert im Menü »%s« nicht"
 
-#: src/rcfile.c:454
+#: src/rcfile.c:543
 #, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
-msgstr "Tut mir Leid, keystr „%s“ ist keine legale Zuordnung"
+msgid "Sorry, keystroke \"%s\" may not be rebound"
+msgstr "Taste „%s“ kann leider nicht neu zugewiesen werden."
 
-#: src/rcfile.c:625
+#: src/rcfile.c:629
+#, c-format
+msgid "Error expanding %s: %s"
+msgstr "Fehler beim Erweitern von %s: %s"
+
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1737,137 +1871,200 @@ msgstr ""
 "und „black“ (schwarz), mit dem optionalen Präfix „bright“ (hell)\n"
 "für Vordergrundfarben."
 
-#: src/rcfile.c:647
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
-msgstr "Kann keine Farbdirektive hinzufügen, ohne einen Syntaxbefehl zu haben"
+msgstr ""
+"Farbdirektive kann nicht hinzugefügt werden, ohne einen Syntaxbefehl zu "
+"haben."
 
-#: src/rcfile.c:652
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "Fehlender Farbname"
 
-#: src/rcfile.c:672
-#, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr "Hintergrundfarbe „%s“ kann nicht hell („bright“) sein"
-
-#: src/rcfile.c:690 src/rcfile.c:809
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr "Fehlender regulärer Ausdruck"
 
-#: src/rcfile.c:762
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "„start=“ erfordert ein entsprechendes „end=“"
 
-#: src/rcfile.c:804
+#: src/rcfile.c:837
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr "Hintergrundfarbe „%s“ kann nicht hell („bright“) sein"
+
+#: src/rcfile.c:865
 msgid "Cannot add a header regex without a syntax command"
 msgstr ""
-"Kann keinen reg. Ausdruck für Header hinzufügen, ohne einen Syntaxbefehl zu "
-"haben"
+"Regulärer Ausdruck für Header kann nicht hinzugefügt werden, ohne einen "
+"Syntaxbefehl zu haben."
+
+#: src/rcfile.c:921
+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:926
+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:990
+msgid "Missing linter command"
+msgstr "Fehlender Linter-Name"
+
+#: src/rcfile.c:1010
+msgid "Cannot add formatter without a syntax command"
+msgstr ""
+"Formatierer kann nicht hinzugefügt werden, ohne einen Syntaxbefehl zu haben."
+
+#: src/rcfile.c:1015
+msgid "Missing formatter command"
+msgstr "Formatierer-Befehl fehlt"
 
-#: src/rcfile.c:874
+#: src/rcfile.c:1045
 #, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
-msgstr "Schwerwiegender Fehler: keine Tassten an Funktion „%s“ gebunden"
+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:876
+#: src/rcfile.c:1047
+#, c-format
 msgid ""
-"Exiting.  Please use nano with the -I option if needed to adjust your nanorc "
-"settings\n"
+"If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
-"Beende. Bitte starten Sie nano bei Bedarf mit der Option „-I“, wenn Sie Ihre "
-"nanorc-Einstellungen anpassen wollen\n"
+"Bitte starten Sie nano bei Bedarf mit der Option „-I“, um Ihre nanorc-"
+"Einstellungen anzupassen\n"
 
-#: src/rcfile.c:926 src/rcfile.c:935 src/rcfile.c:945
+#: src/rcfile.c:1108
+#, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "Zu erweiternde Syntax „%s“ konnte nicht gefunden werden."
+
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Befehl „%s“ nicht in eingebundener Datei erlaubt"
 
-#: src/rcfile.c:951 src/rcfile.c:1128
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Syntax „%s“ hat keine Farbbefehle"
 
-#: src/rcfile.c:966
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Befehl „%s“ nicht verstanden"
 
-#: src/rcfile.c:972
-msgid "Missing flag"
-msgstr "Fehlendes Flag"
+#: src/rcfile.c:1186
+msgid "Missing option"
+msgstr "Fehlende Option"
 
-#: src/rcfile.c:994
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Option „%s“ erfordert ein Argument"
 
-#: src/rcfile.c:1012
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr "Option ist keine gültige Multibyte-Zeichenkette"
 
-#: src/rcfile.c:1038 src/rcfile.c:1066 src/rcfile.c:1075
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr "Nicht-Leerraum-Zeichen erforderlich"
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr "Zwei einspaltige Zeichen erforderlich"
 
-#: src/rcfile.c:1114
+#: src/rcfile.c:1339
 #, c-format
-msgid "Cannot unset flag \"%s\""
-msgstr "kann Flag „%s“ nicht löschen"
+msgid "Cannot unset option \"%s\""
+msgstr "Option „%s“ kann nicht zurückgesetzt werden"
 
-#: src/rcfile.c:1123
+#: src/rcfile.c:1345
 #, c-format
-msgid "Unknown flag \"%s\""
-msgstr "Unbekanntes Flag „%s“"
+msgid "Unknown option \"%s\""
+msgstr "Unbekannte Option „%s“"
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
-msgstr "Kann mein Heimatverzeichnis nicht finden!  Autsch!"
+msgstr "Heimatverzeichnis kann nicht gefunden werden! Autsch!"
+
+#: src/rcfile.c:1442
+#, c-format
+msgid ""
+"\n"
+"Press Enter to continue starting nano.\n"
+msgstr ""
+"\n"
+"Drücken Sie die Eingabetaste, um mit dem Starten von nano fortzufahren.\n"
 
 #: src/search.c:96
 #, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "„%.*s%s“ nicht gefunden"
 
-#: src/search.c:205
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/search.c:184
+msgid " [Case Sensitive]"
+msgstr " [GROSS/klein]"
+
+#: src/search.c:188
+msgid " [Regexp]"
+msgstr " [reg. Ausdruck]"
+
+#: src/search.c:192
+msgid " [Backwards]"
+msgstr " [Rückwärts]"
+
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:197
 msgid " (to replace) in selection"
 msgstr " (zu ersetzen) in Auswahl"
 
-#: src/search.c:207
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (zu ersetzen)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "Fundstelle ersetzen?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:945
 msgid "Replace with"
-msgstr "Ersetzen mit"
+msgstr "Ersetzen durch"
 
-#: src/search.c:1004
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
-msgstr[0] "eine Ersetzung vorgenommen"
+msgstr[0] "%lu Ersetzung vorgenommen"
 msgstr[1] "%lu Ersetzungen vorgenommen"
 
-#: src/search.c:1034
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr "Zeilennummer, Spaltennummer eingeben"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
 msgstr "Ungültige Zeilen- oder Spaltennummer"
 
-#: src/search.c:1214
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "Keine Klammer"
 
-#: src/search.c:1281
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "Keine passende Klammer"
 
@@ -1879,595 +2076,282 @@ msgstr "Markierung gesetzt"
 msgid "Mark Unset"
 msgstr "Markierung entfernt"
 
-#: src/text.c:443
+#: src/text.c:439
 msgid "Nothing in undo buffer!"
 msgstr "Nichts im Rückgängig-Puffer!"
 
-#: src/text.c:455 src/text.c:593
+#: src/text.c:445 src/text.c:590
 #, c-format
-msgid "Internal error: can't match line %d.  Please save your work"
+msgid "Internal error: can't match line %d.  Please save your work."
 msgstr ""
-"Interner Fehler: kann Zeile %d nicht finden. Bitte speichern Sie Ihre Arbeit"
+"Interner Fehler: Zeile %d kann nicht gefunden werden. Bitte speichern Sie "
+"Ihre Arbeit."
 
-#: src/text.c:466 src/text.c:603
+#: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
 msgstr "Text hinzu"
 
-#: src/text.c:475 src/text.c:613
+#: src/text.c:467 src/text.c:612
 msgid "text delete"
 msgstr "Text löschen"
 
-#: src/text.c:489 src/text.c:628
-msgid "line wrap"
-msgstr "Zeilenumbruch"
-
-#: src/text.c:503 src/text.c:636
+#: src/text.c:491 src/text.c:641
 msgid "line join"
 msgstr "Zeile verbinden"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:505 src/text.c:657
 msgid "text cut"
 msgstr "Text ausschneiden"
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:510 src/text.c:661
 msgid "text uncut"
 msgstr "Text ausschneiden zurücknehmen"
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:515 src/text.c:623
 msgid "line break"
 msgstr "Zeilenvorschub"
 
-#: src/text.c:532 src/text.c:665
+#: src/text.c:528 src/text.c:672
 msgid "text insert"
 msgstr "Text einfügen"
 
-#: src/text.c:550 src/text.c:659
+#: src/text.c:549 src/text.c:665
 msgid "text replace"
 msgstr "Text ersetzen"
 
-#: src/text.c:557 src/text.c:671
-msgid "Internal error: unknown type.  Please save your work"
-msgstr "Interner Fehler: unbekannter Typ. Bitte speichern Sie Ihre Arbeit"
+#: src/text.c:556 src/text.c:679 src/text.c:983
+msgid "Internal error: unknown type.  Please save your work."
+msgstr "Interner Fehler: Unbekannter Typ. Bitte speichern Sie Ihre Arbeit."
 
-#: src/text.c:563
+#: src/text.c:561
 #, c-format
 msgid "Undid action (%s)"
-msgstr "Operation rückgangig gemacht (%s)"
+msgstr "Operation rückgängig gemacht (%s)"
 
-#: src/text.c:578
+#: src/text.c:580
 msgid "Nothing to re-do!"
 msgstr "Nichts zu wiederholen!"
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
+#: src/text.c:584
+msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
-"Interner Fehler: Vorbereitung für Wiederholen fehlgeschlagen. Bitte "
-"speichern Sie Ihre Arbeit"
+"Interner Fehler: „Wiederholen“ kann nicht aufgesetzt werden. Bitte speichern "
+"Sie Ihre Arbeit."
 
-#: src/text.c:676
+#: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Operation wiederholt (%s)"
 
-#: src/text.c:766
-msgid "Could not pipe"
-msgstr "Konnte kein Pipe durchführen"
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
+msgid "Could not create pipe"
+msgstr "Pipe konnte nicht erstellt werden"
 
-#: src/text.c:793 src/text.c:2636 src/text.c:2788
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
-msgstr "Konnte kein Fork durchführen"
+msgstr "Fork konnte nicht durchgeführt werden"
 
-#: src/text.c:941
-msgid "Internal error: can't setup uncut.  Please save your work."
+#: src/text.c:969
+msgid "Internal error: cannot set up uncut.  Please save your work."
 msgstr ""
-"Interner Fehler: kann Zurücknehmen des Ausschneidens nicht aufsetzen. Bitte "
-"speichern Sie Ihre Arbeit"
+"Interner Fehler: Zurücknehmen des Ausschneidens kann nicht aufgesetzt "
+"werden. Bitte speichern Sie Ihre Arbeit."
 
-#: src/text.c:950
-msgid "Internal error: unknown type.  Please save your work."
-msgstr "Interner Fehler: Unbekannter Typ. Bitte speichern Sie Ihre Arbeit"
-
-#: src/text.c:1870
+#: src/text.c:1806
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Ungültiges Zitatzeichen %s: %s"
 
-#: src/text.c:2267
+#: src/text.c:2207
 msgid "Can now UnJustify!"
-msgstr "Kann Absatzausrichtung jetzt rückgängig machen"
+msgstr "Absatzausrichtung kann jetzt rückgängig gemacht werden!"
 
-#: src/text.c:2462
+#: src/text.c:2404
 msgid "Edit a replacement"
 msgstr "Ersetzung editieren"
 
-#: src/text.c:2548
-msgid "Could not create pipe"
-msgstr "Konnte keine Pipe erstellen"
-
-#: src/text.c:2550
+#: src/text.c:2492
 msgid "Creating misspelled word list, please wait..."
-msgstr "Erstelle Liste falsch geschriebener Wörter, bitte warten..."
+msgstr "Liste falsch geschriebener Wörter wird erstellt, bitte warten..."
 
-#: src/text.c:2642
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
-msgstr "Konnte Größe des Pipe-Puffers nicht bestimmen"
+msgstr "Größe des Pipe-Puffers konnte nicht bestimmt werden"
 
-#: src/text.c:2693
+#: src/text.c:2635
 msgid "Error invoking \"spell\""
 msgstr "Fehler beim Aufruf von „spell“"
 
-#: src/text.c:2696
+#: src/text.c:2638
 msgid "Error invoking \"sort -f\""
 msgstr "Fehler beim Aufruf von „sort -f“"
 
-#: src/text.c:2699
+#: src/text.c:2641
 msgid "Error invoking \"uniq\""
 msgstr "Fehler beim Aufruf von „uniq“"
 
-#: src/text.c:2756 src/text.c:2965
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "Rechtschreibprüfung abgeschlossen"
 
-#: src/text.c:2815
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Fehler beim Aufruf von „%s“"
 
-#: src/text.c:2960
+#: src/text.c:2885
+msgid "Invoking spell checker, please wait"
+msgstr "Rechtschreibprüfung wird aufgerufen, bitte warten"
+
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Rechtschreibprüfung fehlgeschlagen: %s"
 
-#: src/text.c:2962
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Rechtschreibprüfung fehlgeschlagen: %s: %s"
 
-#: src/text.c:3030
+#: src/text.c:2937
+msgid "No linter defined for this type of file!"
+msgstr "Kein Linter für diesen Dateitype definiert"
+
+#: src/text.c:2947
+msgid "Save modified buffer before linting?"
+msgstr "Geänderten Puffer vor dem Linter-Aufruf speichern?"
+
+#: src/text.c:2969
+msgid "Invoking linter, please wait"
+msgstr "Linter wird aufgerufen, bitte warten"
+
+#: src/text.c:3125
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr "Keine verarbeitbaren Zeilen vom Befehl erhalten: %s"
+
+#: src/text.c:3159
+#, 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:3205
+msgid "At last message"
+msgstr "Bei letzter Meldung"
+
+#: src/text.c:3210
+msgid "At first message"
+msgstr "Bei erster Meldung"
+
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr "Fehler: kein Formatierer definiert"
+
+#: src/text.c:3275
+msgid "Finished"
+msgstr "Abgeschlossen"
+
+#: src/text.c:3280
+msgid "Invoking formatter, please wait"
+msgstr "Formatierer wird aufgerufen, bitte warten"
+
+#: src/text.c:3360
+msgid "Finished formatting"
+msgstr "Formatierung abgeschlossen"
+
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sWörter: %lu  Zeilen: %ld  Zeichen: %lu"
 
-#: src/text.c:3031
+#: src/text.c:3439
 msgid "In Selection:  "
 msgstr "In Auswahl:  "
 
-#: src/utils.c:405 src/utils.c:417
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3453
+msgid "Verbatim Input"
+msgstr "Direkte Eingabe"
+
+#: src/utils.c:410 src/utils.c:422
 msgid "nano is out of memory!"
-msgstr "nano hat keinen Speicher mehr!"
+msgstr "Nano hat keinen Speicher mehr!"
 
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
-#: src/winio.c:1557
+#: src/winio.c:1583
 msgid "Unicode Input"
 msgstr "Unicode-Eingabe"
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2142 src/winio.c:2146
 msgid "Modified"
 msgstr "Verändert"
 
-#: src/winio.c:2150
+#: src/winio.c:2143
 msgid "View"
 msgstr "Ansehen"
 
-#: src/winio.c:2164
+#: src/winio.c:2157
 msgid "DIR:"
 msgstr "Verz.:"
 
-#: src/winio.c:2171
+#: src/winio.c:2164
 msgid "File:"
 msgstr "Datei:"
 
-#: src/winio.c:3360
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2261
+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/winio.c:3377
 #, 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:3492
+#: src/winio.c:3507
 msgid "The nano text editor"
-msgstr "Der nano-Text-Editor"
+msgstr "Der Nano-Text-Editor"
 
-#: src/winio.c:3493
+#: src/winio.c:3508
 msgid "version"
 msgstr "Version"
 
-#: src/winio.c:3494
+#: src/winio.c:3509
 msgid "Brought to you by:"
 msgstr "Entwickelt von:"
 
-#: src/winio.c:3495
+#: src/winio.c:3510
 msgid "Special thanks to:"
 msgstr "Speziellen Dank an:"
 
-#: src/winio.c:3496
+#: src/winio.c:3511
 msgid "The Free Software Foundation"
 msgstr "The Free Software Foundation"
 
-#: src/winio.c:3497
+#: src/winio.c:3512
+msgid "the many translators and the TP"
+msgstr "die zahlreichen Übersetzer und das TP"
+
+#: src/winio.c:3513
 msgid "For ncurses:"
 msgstr "Für ncurses:"
 
-#: src/winio.c:3498
+#: src/winio.c:3514
 msgid "and anyone else we forgot..."
-msgstr "und alle Nichtgenannten..."
+msgstr "und alle Nichtgenannten …"
 
-#: src/winio.c:3499
+#: src/winio.c:3515
 msgid "Thank you for using nano!"
 msgstr "Danke für die Benutzung von nano!"
 
-#~ msgid "Error writing backup file %s: File owner mismatch"
-#~ msgstr ""
-#~ "Fehler beim Schreiben der Sicherungskopie %s: Besitzer stimmt nicht "
-#~ "überein"
-
-#~ msgid "line split"
-#~ msgstr "Zeile aufteilen"
-
-#~ msgid "line cut"
-#~ msgstr "Zeile ausschneiden"
-
-#~ msgid "Space"
-#~ msgstr "Space"
-
-#~ msgid "Come on, be reasonable"
-#~ msgstr "Komm schon, sei vernünftig"
-
-#~ msgid "Prepending to %s failed: %s"
-#~ msgstr "Vorne an %s anfügen fehlgeschlagen: %s"
-
-#~ msgid "Invoke the help menu"
-#~ msgstr "Hilfe-Menü anzeigen"
-
-#~ msgid "Search for text within the editor"
-#~ msgstr "Im Editor nach Text suchen"
-
-#~ msgid "Replace text within the editor"
-#~ msgstr "Text im Editor ersetzen"
-
-#~ msgid "Find matching bracket"
-#~ msgstr "Passende Klammer finden"
-
-#~ msgid "Make the current search/replace case (in)sensitive"
-#~ msgstr ""
-#~ "Groß- und Kleinschreibung bei aktueller Suche oder Ersetzen (nicht) "
-#~ "berücksichtigen"
-
-#~ msgid "Make the current search/replace go backwards"
-#~ msgstr "Aktuelle Suche oder Ersetzen rückwärts gehen lassen"
-
-#~ msgid "Prepend to the current file"
-#~ msgstr "An momentane Datei vorne anfügen"
-
-#~ msgid "Back up original file when saving"
-#~ msgstr "Original beim Abspeichern sichern"
-
-#~ msgid "Insert into new buffer"
-#~ msgstr "In neuen Puffer einfügen"
-
-#~ msgid "Set fill cols to (wrap lines at) #cols"
-#~ msgstr "Spalten auffüllen (Zeilenumbruch bei) #Spalten"
-
-#~ msgid "Duplicate syntax name %s"
-#~ msgstr "Doppelter Syntaxname %s"
-
-#~ msgid "Could not create temp file: %s"
-#~ msgstr "Konnte temporäre Datei nicht erzeugen: %s"
-
-#~ msgid "Refusing zero-length regex match"
-#~ msgstr "Treffer mit Länge 0 bei regulärem Ausdruck abgelehnt"
-
-#~ msgid "Find other bracket"
-#~ msgstr "Andere Klammer finden"
-
-#~ msgid "Direction"
-#~ msgstr "Richtung"
-
-#~ msgid "Up"
-#~ msgstr "Hoch"
-
-#~ msgid "+LINE"
-#~ msgstr "+ZEILE"
-
-#~ msgid "Do regular expression searches"
-#~ msgstr "Suche mit regulären Ausdrücken durchführen"
-
-#~ msgid "Verbatim input"
-#~ msgstr "Direkte Eingabe"
-
-#~ msgid "Search Cancelled"
-#~ msgstr "Suche abgebrochen"
-
-#~ msgid "Replace Cancelled"
-#~ msgstr "Ersetzung abgebrochen"
-
-#~ msgid "Aborted"
-#~ msgstr "Abgebrochen"
-
-#~ msgid "add_to_cutbuffer() called with inptr->data = %s\n"
-#~ msgstr "add_to_cutbuffer() aufgerufen mit inptr->data = %s\n"
-
-#~ msgid "Blew away cutbuffer =)\n"
-#~ msgstr "Inhalt der Zwischenablage verworfen\n"
-
-#~ msgid "filename is %s\n"
-#~ msgstr "Dateiname ist %s\n"
-
-#~ msgid "%s: free'd a node, YAY!\n"
-#~ msgstr "%s: Knoten freigegeben, JO!\n"
-
-#~ msgid "%s: free'd last node.\n"
-#~ msgstr "%s: letzter Knoten freigegeben.\n"
-
-#~ msgid "Could not read %s for backup: %s"
-#~ msgstr "Konnte %s nicht für die Sicherungskopie lesen: %s"
-
-#~ msgid "Couldn't write backup: %s"
-#~ msgstr "Konnte Sicherungskopie nicht schreiben: %s"
-
-#~ msgid "Backing up %s to %s\n"
-#~ msgstr "Fertige Sicherungskopie von %s auf %s an\n"
-
-#~ msgid "Could not set permissions %o on backup %s: %s"
-#~ msgstr "Konnte Rechte %o für Sicherungskopie %s nicht setzen: %s"
-
-#~ msgid "Could not set owner %d/group %d on backup %s: %s"
-#~ msgstr ""
-#~ "Konnte Besitzer %d/Gruppe %d für Sicherungskopie %s nicht setzen: %s"
-
-#~ msgid "Could not set access/modification time on backup %s: %s"
-#~ msgstr ""
-#~ "Konnte Zugriffs-/Änderungszeit für Sicherungskopie %s nicht setzen: %s"
-
-#~ msgid "Could not open file for writing: %s"
-#~ msgstr "Konnte nicht in Datei schreiben: %s"
-
-#~ msgid "Wrote >%s\n"
-#~ msgstr "Schrieb >%s\n"
-
-#~ msgid "Could not close %s: %s"
-#~ msgstr "Konnte %s nicht schließen: %s"
-
-#~ msgid "Could not reopen %s: %s"
-#~ msgstr "Konnte %s nicht erneut öffnen: %s"
-
-#~ msgid "Could not open %s for prepend: %s"
-#~ msgstr "Konnte %s nicht zum vorn Anfügen öffnen: %s"
-
-#~ msgid "Could not open %s for writing: %s"
-#~ msgstr "Konnte %s nicht zum Schreiben öffnen: %s"
-
-#~ msgid "Could not set permissions %o on %s: %s"
-#~ msgstr "Konnte Rechte %o für %s nicht setzen: %s"
-
-#~ msgid "Goto Cancelled"
-#~ msgstr "„Gehe zu“ abgebrochen"
-
-#~ msgid "Unable to open ~/.nano_history file, %s"
-#~ msgstr "Kann Datei ~/.nano_history nicht öffnen, %s"
-
-#~ msgid "Unable to write ~/.nano_history file, %s"
-#~ msgstr "Kann Datei ~/.nano_history nicht öffnen, %s"
-
-#~ msgid "Backing up file"
-#~ msgstr "Lege Sicherungskopie der Datei an"
-
-#~ msgid "Unjustify after a justify"
-#~ msgstr "Absatzausrichtung rückgängig machen"
-
-#~ msgid "Move up one line"
-#~ msgstr "Zur vorhergehenden Zeile springen"
-
-#~ msgid "Move down one line"
-#~ msgstr "Zur folgenden Zeile springen"
-
-#~ msgid "Search backwards"
-#~ msgstr "Suche rückwärts"
-
-#~ msgid "Open previously loaded file"
-#~ msgstr "Vorige geladene Datei öffnen"
-
-#~ msgid "Open next loaded file"
-#~ msgstr "Nächste geladene Datei öffnen"
-
-#~ msgid "Down"
-#~ msgstr "Runter"
-
-#~ msgid "Use alternate keypad routines"
-#~ msgstr "Alternative Routinen für Nummernblock benutzen"
-
-#~ msgid "-T [num]"
-#~ msgstr "-T [anzahl]"
-
-#~ msgid "current->data now = \"%s\"\n"
-#~ msgstr "current->data jetzt = „%s“\n"
-
-#~ msgid "After, data = \"%s\"\n"
-#~ msgstr "Nachher, data = „%s“\n"
-
-#~ msgid "Spell checking failed: unable to write temp file!"
-#~ msgstr ""
-#~ "Rechtschreibprüfung fehlgeschlagen: konnte nicht in temporäre Datei "
-#~ "schreiben"
-
-#~ msgid "Cannot resize top win"
-#~ msgstr "Kann die Größe des oberen Fensters nicht verändern"
-
-#~ msgid "Cannot move top win"
-#~ msgstr "Kann oberes Fenster nicht verschieben"
-
-#~ msgid "Cannot resize edit win"
-#~ msgstr "Kann Größe des Bearbeitungsfensters nicht verändern"
-
-#~ msgid "Cannot move edit win"
-#~ msgstr "Kann Bearbeitungsfenster nicht verschieben"
-
-#~ msgid "Cannot resize bottom win"
-#~ msgstr "Kann Größe des unteren Fensters nicht verändern"
-
-#~ msgid "Cannot move bottom win"
-#~ msgstr "Kann unteres Fenster nicht verschieben"
-
-#~ msgid "NumLock glitch detected.  Keypad will malfunction with NumLock off"
+#~ msgid "Internal error: can't match line %ld.  Please save your work."
 #~ msgstr ""
-#~ "NumLock-Problem entdeckt. Tastenblock funktioniert bei ausgeschaltetem "
-#~ "NumLock nicht"
-
-#~ msgid "Tab size is too small for nano...\n"
-#~ msgstr "Tabulatorweite ist zu klein für Nano...\n"
-
-#~ msgid "Main: set up windows\n"
-#~ msgstr "Hauptprogramm: Fenster konfigurieren\n"
-
-#~ msgid "Main: bottom win\n"
-#~ msgstr "Hauptprogramm: unteres Fenster\n"
-
-#~ msgid "Main: open file\n"
-#~ msgstr "Hauptprogramm: Datei öffnen\n"
-
-#~ msgid "AHA!  %c (%d)\n"
-#~ msgstr "Aha!  %c (%d)\n"
-
-#~ msgid "I got Alt-O-%c! (%d)\n"
-#~ msgstr "Erhielt Alt-O-%c! (%d)\n"
-
-#~ msgid "I got Alt-[-1-%c! (%d)\n"
-#~ msgstr "Erhielt Alt-[-1-%c! (%d)\n"
-
-#~ msgid "I got Alt-[-2-%c! (%d)\n"
-#~ msgstr "Erhielt Alt-[-2-%c! (%d)\n"
-
-#~ msgid "I got Alt-[-%c! (%d)\n"
-#~ msgstr "Erhielt Alt-[-%c! (%d)\n"
-
-#~ msgid "I got Alt-%c! (%d)\n"
-#~ msgstr "Erhielt Alt-%c! (%d)\n"
-
-#~ msgid "I got %c (%d)!\n"
-#~ msgstr "Erhielt %c (%d)!\n"
-
-#~ msgid "Adding new syntax after 1st\n"
-#~ msgstr "Füge neue Syntax nach der ersten hinzu\n"
-
-#~ msgid "Starting a new syntax type\n"
-#~ msgstr "Beginne einen neuen Syntaxtyp\n"
-
-#~ msgid "Starting a new colorstring for fg %d bg %d\n"
-#~ msgstr "Beginne eine neue Farbzeichenkette für fg %d bg %d\n"
-
-#~ msgid "Adding new entry for fg %d bg %d\n"
-#~ msgstr "Füge neuen Eintrag für fg %d bg %d hinzu\n"
-
-#~ msgid "%s: Read a comment\n"
-#~ msgstr "%s: Kommentar lesen\n"
-
-#~ msgid "%s: Parsing option %s\n"
-#~ msgstr "%s: Option %s lesen\n"
-
-#~ msgid "set flag %d!\n"
-#~ msgstr "setze Flag %d!\n"
-
-#~ msgid "Errors found in .nanorc file"
-#~ msgstr "Fehler in .nanorc-Datei gefunden"
-
-#~ msgid "Unable to open ~/.nanorc file, %s"
-#~ msgstr "Kann Datei ~/.nanorc nicht öffnen, %s"
-
-#~ msgid "\"%s...\" not found"
-#~ msgstr "„%s...“ nicht gefunden"
-
-#~ msgid "Invalid regex \"%s\""
-#~ msgstr "Ungültiger regulärer Ausdrücke „%s“"
-
-#~ msgid "Replace failed: unknown subexpression!"
-#~ msgstr "Ersetzung gescheitert: unbekannter Unterausdruck"
-
-#~ msgid "actual_x for xplus=%d returns %d\n"
-#~ msgstr "actual_x für xplus=%d gab %d zurück\n"
-
-#~ msgid "Aha! '%c' (%d)\n"
-#~ msgstr "Aha! ‚%c‘ (%d)\n"
-
-#~ msgid "input '%c' (%d)\n"
-#~ msgstr "Eingabe ‚%c‘ (%d)\n"
-
-#~ msgid "  File: ..."
-#~ msgstr "  Datei: ..."
-
-#~ msgid "   DIR: ..."
-#~ msgstr "   Verz.: ..."
-
-#~ msgid "Moved to (%d, %d) in edit buffer\n"
-#~ msgstr "Nach (%d, %d) im Bearbeitungspuffer verschoben\n"
-
-#~ msgid "I got \"%s\"\n"
-#~ msgstr "Erhielt „%s“\n"
-
-#~ msgid "Dumping file buffer to stderr...\n"
-#~ msgstr "Gebe Datei Puffer nach stderr aus...\n"
-
-#~ msgid "Dumping cutbuffer to stderr...\n"
-#~ msgstr "Gebe Inhalt der Zwischenablage nach stderr aus...\n"
-
-#~ msgid "Dumping a buffer to stderr...\n"
-#~ msgstr "Gebe einen Puffer nach stderr aus...\n"
-
-#~ msgid "Generic error"
-#~ msgstr "Allgemeiner Fehler"
-
-#~ msgid "Can't visit parent in restricted mode"
-#~ msgstr "Kann im eingeschränkten Modus nicht nach oben wechseln"
-
-#~ msgid "Press return to continue\n"
-#~ msgstr "Drücken Sie die Eingabetaste zum Fortfahren\n"
-
-#~ msgid "string val=%s\n"
-#~ msgstr "Zeichenkette Wert=%s\n"
-
-#~ msgid "For end part, beginning = \"%s\"\n"
-#~ msgstr "Für End-Teil, Anfang = „%s“\n"
-
-#~ msgid "current->data = \"%s\"\n"
-#~ msgstr "current->data = „%s“\n"
-
-#~ msgid "do_cursorpos: linepct = %f, bytepct = %f\n"
-#~ msgstr "do_cursorpos: linepct = %f, bytepct = %f\n"
-
-#~ msgid "read_line: not on first line and prev is NULL"
-#~ msgstr "read_line: nicht in der ersten Zeile und prev ist NULL"
-
-# Punctuation: 
-#~ msgid "'\")}]>"
-#~ msgstr "'\")}]>"
-
-#~ msgid "Replaced 1 occurrence"
-#~ msgstr "1 Ersetzung vorgenommen"
-
-#~ msgid "Replace with [%s]"
-#~ msgstr "Ersetzen mit [%s]"
-
-#~ msgid "nano: realloc: out of memory!"
-#~ msgstr "nano: realloc: Kein Speicher verfügbar!"
-
-#~ msgid "nano: calloc: out of memory!"
-#~ msgstr "nano: calloc: Kein Speicher verfügbar!"
-
-#~ msgid "Match! (%d chars) \"%s\"\n"
-#~ msgstr "Treffer! (%d Zeichen) „%s“\n"
-
-#~ msgid "paintlen (%d) = eo (%d) - so (%d)\n"
-#~ msgstr "paintlen (%d) = eo (%d) - so (%d)\n"
-
-#~ msgid "paintlen (%d) = COLS (%d) - k (%d), - rm.so (%d) - 1\n"
-#~ msgstr "paintlen (%d) = COLS (%d) - k (%d), - rm.so (%d) - 1\n"
-
-#~ msgid "start = %d, smatch = %d, ematch = %d\n"
-#~ msgstr "start = %d, smatch = %d, ematch = %d\n"
-
-#~ msgid "Backwards search"
-#~ msgstr "Suche rückwärts"
-
-#~ msgid "Goto"
-#~ msgstr "Zu Zeile"
-
-#~ msgid "check_wrap called with inptr->data=\"%s\"\n"
-#~ msgstr "check_wrap aufgerufen mit inptr->data=„%s“\n"
+#~ "Interner Fehler: Zeile %ld kann nicht gefunden werden. Bitte speichern "
+#~ "Sie Ihre Arbeit."
diff --git a/po/eo.gmo b/po/eo.gmo
new file mode 100644
index 0000000..9a68315
--- /dev/null
+++ b/po/eo.gmo
diff --git a/po/eo.po b/po/eo.po
new file mode 100644
index 0000000..d99dcb6
--- /dev/null
+++ b/po/eo.po
@@ -0,0 +1,2356 @@
+# Esperanto translations for GNU nano.
+# Copyright (C) 2015 Free Software Foundation, Inc.
+# This file is distributed under the same license as the nano package.
+#
+# “Haben Sie einen Investor brauchen?”
+#
+# Benno Schulenberg <benno@vertaalt.nl>, 2010, 2011, 2013, 2014, 2015.
+msgid ""
+msgstr ""
+"Project-Id-Version: nano 2.3.99pre4\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
+"PO-Revision-Date: 2015-03-19 11:03+0100\n"
+"Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
+"Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
+"Language: eo\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8-bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Lokalize 1.0\n"
+
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:203
+msgid "Go To Directory"
+msgstr "Iri dosierujon"
+
+#: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
+msgid "Cancelled"
+msgstr "Rezignita"
+
+#: src/browser.c:246 src/browser.c:293
+#, c-format
+msgid "Can't go outside of %s in restricted mode"
+msgstr "Ne eblas iri ekstere de %s en limigita reĝimo"
+
+#: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
+#: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
+#: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
+#: src/rcfile.c:590 src/rcfile.c:1426
+#, c-format
+msgid "Error reading %s: %s"
+msgstr "Eraro dum legado de %s: %s"
+
+#: src/browser.c:283
+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:626 src/browser.c:635
+msgid "(dir)"
+msgstr "(ujo)"
+
+#. TRANSLATORS: Try to keep this at most 12
+#. * characters.
+#: src/browser.c:632
+msgid "(parent dir)"
+msgstr "(patra ujo)"
+
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:759 src/search.c:181
+msgid "Search"
+msgstr "Serĉi"
+
+#: src/browser.c:812 src/search.c:382
+msgid "Search Wrapped"
+msgstr "Serĉado ĉirkaŭiris"
+
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
+msgid "This is the only occurrence"
+msgstr "Ĉi tiu estas la ununura aperaĵo"
+
+#: src/browser.c:915 src/search.c:569
+msgid "No current search pattern"
+msgstr "Mankas ankoraŭ serĉendaĵo"
+
+#: src/files.c:139
+msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
+msgstr ""
+"Malsukcesis eltrovi mian identecon por rigla dosiero (getpwuid() fiaskis)"
+
+#: src/files.c:145
+#, c-format
+msgid "Couldn't determine hostname for lock file: %s"
+msgstr "Malsukcesis eltrovi komputilretnomon por rigla dosiero: %s"
+
+#: src/files.c:165 src/files.c:175 src/files.c:212 src/files.c:222
+#, c-format
+msgid "Error writing lock file %s: %s"
+msgstr "Eraro dum skribado de rigla dosiero %s: %s"
+
+#: src/files.c:237
+#, c-format
+msgid "Error deleting lock file %s: %s"
+msgstr "Eraro dum forigo de rigla dosiero %s: %s"
+
+#: src/files.c:272
+#, c-format
+msgid "Error opening lock file %s: %s"
+msgstr "Eraro dum malfermo de rigla dosiero %s: %s"
+
+#: src/files.c:282
+#, 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:297
+#, 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:308
+#, c-format
+msgid "Error writing lock file: Directory '%s' doesn't exist"
+msgstr "Eraro dum skribado de rigla dosiero: dosierujo '%s' ne ekzistas"
+
+#: src/files.c:339
+#, c-format
+msgid "Can't insert file from outside of %s"
+msgstr "Ne eblas enmeti dosieron el ekstere de %s"
+
+#: src/files.c:467
+msgid "No more open file buffers"
+msgstr "Ne ekzistas pliaj malfermaj bufroj"
+
+#: src/files.c:484
+#, c-format
+msgid "Switched to %s"
+msgstr "Ŝaltita al %s"
+
+#: src/files.c:485 src/global.c:953 src/winio.c:2161
+msgid "New Buffer"
+msgstr "Nova bufro"
+
+#: src/files.c:874
+#, 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 (konvertita el DOS- kaj Mac-aranĝo)"
+
+#: src/files.c:879
+#, 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 -- Averto: skribrajto "
+"mankas)"
+msgstr[1] ""
+"Legiĝis %lu linioj (konvertita el DOS- kaj Mac-aranĝo -- Averto: skribrajto "
+"mankas)"
+
+#: src/files.c:885
+#, 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:889
+#, 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 -- Averto: skribrajto mankas)"
+msgstr[1] ""
+"Legiĝis %lu linioj (konvertitaj el Mac-aranĝo -- Averto: skribrajto mankas)"
+
+#: src/files.c:895
+#, 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:899
+#, 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 -- Averto: skribrajto mankas)"
+msgstr[1] ""
+"Legiĝis %lu linioj (konvertitaj el DOS-aranĝo -- Averto: skribrajto mankas)"
+
+#: src/files.c:905
+#, 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:908
+#, 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: skribrajto mankas)"
+msgstr[1] "Legiĝis %lu linioj (Averto: skribrajto mankas)"
+
+#: src/files.c:943 src/files.c:980
+msgid "Reading File"
+msgstr "Legado de dosiero"
+
+#: src/files.c:950
+msgid "New File"
+msgstr "Nova dosiero"
+
+#: src/files.c:953
+#, c-format
+msgid "\"%s\" not found"
+msgstr "\"%s\" ne trovatas"
+
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
+#, c-format
+msgid "\"%s\" is a directory"
+msgstr "\"%s\" estas dosierujo"
+
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
+#, c-format
+msgid "\"%s\" is a device file"
+msgstr "\"%s\" estas aparato"
+
+#: src/files.c:1060
+#, c-format
+msgid "Command to execute in new buffer [from %s] "
+msgstr "Rulenda komando en nova bufro [el %s] "
+
+#: src/files.c:1062
+#, c-format
+msgid "Command to execute [from %s] "
+msgstr "Rulenda komando [el %s] "
+
+#: src/files.c:1069
+#, c-format
+msgid "File to insert into new buffer [from %s] "
+msgstr "Enmetenda dosiero en nova bufro [el %s] "
+
+#: src/files.c:1071
+#, c-format
+msgid "File to insert [from %s] "
+msgstr "Enmetenda dosiero [el %s] "
+
+#: src/files.c:1320
+msgid "Key invalid in non-multibuffer mode"
+msgstr "Klavo nur validas en multbufra moduso"
+
+#: src/files.c:1622
+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:1746
+#, c-format
+msgid "Can't write outside of %s"
+msgstr "Ne eblas skribi ekstere de %s"
+
+#: src/files.c:1761
+msgid "Cannot prepend or append to a symlink with --nofollow set"
+msgstr "Kun \"--nofollow\" ne eblas antaŭglui nek postglui al simbola ligilo"
+
+#: src/files.c:1843 src/files.c:1868 src/files.c:1886 src/files.c:1899
+#: src/files.c:1910 src/files.c:1939
+#, c-format
+msgid "Error writing backup file %s: %s"
+msgstr "Eraro dum skribado de savkopio %s: %s"
+
+#: src/files.c:1844 src/nano.c:719
+msgid "Too many backup files?"
+msgstr "Ĉu troaj savkopioj?"
+
+#: src/files.c:1959 src/files.c:2016 src/files.c:2035 src/files.c:2047
+#: src/files.c:2071 src/files.c:2089 src/files.c:2099 src/files.c:2135
+#: src/files.c:2140 src/files.c:3101 src/files.c:3110 src/files.c:3133
+#: src/files.c:3145
+#, c-format
+msgid "Error writing %s: %s"
+msgstr "Eraro dum skribado de %s: %s"
+
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
+#, c-format
+msgid "Error writing temp file: %s"
+msgstr "Eraro dum skribado de portempa dosiero: %s"
+
+#: src/files.c:2173
+#, 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:2278
+msgid " [DOS Format]"
+msgstr " [DOS-aranĝo]"
+
+#: src/files.c:2279
+msgid " [Mac Format]"
+msgstr " [Mac-aranĝo]"
+
+#: src/files.c:2281
+msgid " [Backup]"
+msgstr " [savkopii]"
+
+#: src/files.c:2289
+msgid "Prepend Selection to File"
+msgstr "Antaŭglui markaĵon al dosiero"
+
+#: src/files.c:2290
+msgid "Append Selection to File"
+msgstr "Postglui markaĵon al dosiero"
+
+#: src/files.c:2291
+msgid "Write Selection to File"
+msgstr "Konservi markaĵon en dosiero"
+
+#: src/files.c:2294
+msgid "File Name to Prepend to"
+msgstr "Nomo de dosiero al kiu antaŭglui"
+
+#: src/files.c:2295
+msgid "File Name to Append to"
+msgstr "Nomo de dosiero al kiu postglui"
+
+#: src/files.c:2296
+msgid "File Name to Write"
+msgstr "Nomo de skribota dosiero"
+
+#: src/files.c:2427
+msgid "File exists, OVERWRITE ? "
+msgstr "Dosiero jam ekzistas; ĉu ANSTATAŬIGI? "
+
+#: src/files.c:2436
+msgid "Save file under DIFFERENT NAME ? "
+msgstr "Ĉu konservi ALINOME? "
+
+#: src/files.c:2450
+msgid "File was modified since you opened it, continue saving ? "
+msgstr "Dosiero modifiĝis post malfermo; ĉu tamen surskribi ĝin? "
+
+#: src/files.c:2882
+msgid "(more)"
+msgstr "(plu)"
+
+#: src/files.c:2974
+#, c-format
+msgid ""
+"\n"
+"Press Enter to continue\n"
+msgstr ""
+"\n"
+"Premu \"Enter\" por daŭrigi.\n"
+
+#: src/files.c:2989
+#, c-format
+msgid ""
+"Unable to create directory %s: %s\n"
+"It is required for saving/loading search history or cursor positions.\n"
+msgstr ""
+"Malsukcesis krei dosierujon %s: %s\n"
+"Ĉi tiu dosierujo bezonatas por konservi/relegi serĉan historion kaj kursoran "
+"pozicion.\n"
+
+#: src/files.c:2995
+#, 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 ""
+"Vojo %s ne estas dosierujo sed devas esti.\n"
+"'Nano' ne kapablos konservi/relegi serĉan historion nek kursorajn "
+"poziciojn.\n"
+
+#: src/files.c:3012
+#, 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 ""
+"Troviĝis olda historia dosiero (%s);\n"
+"dum movo al preferata loko (%s)\n"
+"okazis eraro: %s"
+
+#: src/files.c:3016
+#, 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 ""
+"Troviĝis olda historia dosiero (%s)\n"
+"kiu nun moviĝis al preferata loko (%s).\n"
+"(Vidu la 'nano-FAQ' por informo pri ĉi tiu ŝanĝo.)"
+
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
+#: src/global.c:477
+msgid "Exit"
+msgstr "Fini"
+
+#: src/global.c:478
+msgid "Close"
+msgstr "Fermi"
+
+#: src/global.c:479
+msgid "Uncut Text"
+msgstr "Alglui"
+
+#: src/global.c:481
+msgid "Unjustify"
+msgstr "Malrektigi"
+
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:485
+msgid "WhereIs Next"
+msgstr "Serĉi sekvan"
+
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:492
+msgid "Where Is"
+msgstr "Serĉi"
+
+#: src/global.c:493
+msgid "Replace"
+msgstr "Anstataŭigi"
+
+#: src/global.c:494
+msgid "Go To Line"
+msgstr "Iri linion"
+
+#: src/global.c:495
+msgid "Prev Line"
+msgstr "Linio supren"
+
+#: src/global.c:496
+msgid "Next Line"
+msgstr "Linio suben"
+
+#: src/global.c:497
+msgid "Read File"
+msgstr "Enmeti"
+
+#: src/global.c:499
+msgid "FullJstify"
+msgstr "Rektigi ĉion"
+
+#: src/global.c:501
+msgid "Refresh"
+msgstr "Remontri"
+
+#. 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:507
+msgid "Justify the current paragraph"
+msgstr "Rektigi la nunan alineon"
+
+#: src/global.c:509
+msgid "Cancel the current function"
+msgstr "Rezigni la nunan operacion"
+
+#: src/global.c:510
+msgid "Display this help text"
+msgstr "Montri ĉi tiun helptekston"
+
+#: src/global.c:513
+msgid "Close the current file buffer / Exit from nano"
+msgstr "Fermi la nunan bufron / Eliri el 'nano'"
+
+#: src/global.c:515
+msgid "Exit from nano"
+msgstr "Eliri el 'nano'"
+
+#: src/global.c:519
+msgid "Write the current file to disk"
+msgstr "Konservi la nunan dosieron sur disko"
+
+#: src/global.c:521
+msgid "Insert another file into the current one"
+msgstr "Enmeti alian dosieron en la nuna bufro"
+
+#: src/global.c:523
+msgid "Search for a string or a regular expression"
+msgstr "Serĉi signoĉenon aŭ regulesprimon"
+
+#: src/global.c:526
+msgid "Search for a string"
+msgstr "Serĉi parton de dosiernomo"
+
+#: src/global.c:528
+msgid "Go one screenful up"
+msgstr "Iri unu paĝo supren"
+
+#: src/global.c:529
+msgid "Go one screenful down"
+msgstr "Iri unu paĝo suben"
+
+#: src/global.c:531
+msgid "Cut the current line and store it in the cutbuffer"
+msgstr "Eltondi la nunan linion kaj konservi ĝin en tondbufro"
+
+#: src/global.c:533
+msgid "Uncut from the cutbuffer into the current line"
+msgstr "Glui tekstaĵon el la tondbufro en la nuna linio"
+
+#: src/global.c:534
+msgid "Display the position of the cursor"
+msgstr "Montri la pozicion de la kursoro"
+
+#: src/global.c:536
+msgid "Invoke the spell checker, if available"
+msgstr "Ruli literumilon (se disponeblas)"
+
+#: src/global.c:538
+msgid "Replace a string or a regular expression"
+msgstr "Anstataŭigi signoĉenon aŭ regulesprimon"
+
+#: src/global.c:539
+msgid "Go to line and column number"
+msgstr "Iri al linionumero (kaj kolumnonumero)"
+
+#: src/global.c:541
+msgid "Mark text starting from the cursor position"
+msgstr "Marki tekston ekde la kursora pozicio"
+
+#: src/global.c:542
+msgid "Repeat the last search"
+msgstr "Ripeti lastan serĉon"
+
+#: src/global.c:544
+msgid "Copy the current line and store it in the cutbuffer"
+msgstr "Kopii la nunan linion kaj konservi ĝin en tondbufro"
+
+#: src/global.c:545
+msgid "Indent the current line"
+msgstr "Deŝovi enen la nunan linion"
+
+#: src/global.c:546
+msgid "Unindent the current line"
+msgstr "Deŝovi eksteren la nunan linion"
+
+#: src/global.c:547
+msgid "Undo the last operation"
+msgstr "Malfari la lastan operacion"
+
+#: src/global.c:548
+msgid "Redo the last undone operation"
+msgstr "Refari la lastan malfaratan operacion"
+
+#: src/global.c:550
+msgid "Go forward one character"
+msgstr "Iri unu signon antaŭen"
+
+#: src/global.c:551
+msgid "Go back one character"
+msgstr "Iri unu signon malantaŭen"
+
+#: src/global.c:553
+msgid "Go forward one word"
+msgstr "Iri unu vorton antaŭen"
+
+#: src/global.c:554
+msgid "Go back one word"
+msgstr "Iri unu vorton malantaŭen"
+
+#: src/global.c:556
+msgid "Go to previous line"
+msgstr "Iri al la supra linio"
+
+#: src/global.c:557
+msgid "Go to next line"
+msgstr "Iri al la suba linio"
+
+#: src/global.c:558
+msgid "Go to beginning of current line"
+msgstr "Iri al la komenco de la nuna linio"
+
+#: src/global.c:559
+msgid "Go to end of current line"
+msgstr "Iri al la fino de la nuna linio"
+
+#: src/global.c:562
+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:564
+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:566
+msgid "Go to the first line of the file"
+msgstr "Iri al la unua linio de la dosiero"
+
+#: src/global.c:567
+msgid "Go to the last line of the file"
+msgstr "Iri al la lasta linio de la dosiero"
+
+#: src/global.c:569
+msgid "Go to the matching bracket"
+msgstr "Iri al para krampo"
+
+#: src/global.c:571
+msgid "Scroll up one line without scrolling the cursor"
+msgstr "Rulumi unu linion supren sen movi la kursoron"
+
+#: src/global.c:573
+msgid "Scroll down one line without scrolling the cursor"
+msgstr "Rulumi unu linion suben sen movi la kursoron"
+
+#: src/global.c:576
+msgid "Switch to the previous file buffer"
+msgstr "Ŝalti al malsekva dosierbufro"
+
+#: src/global.c:577
+msgid "Switch to the next file buffer"
+msgstr "Ŝalti al sekva dosierbufro"
+
+#: src/global.c:579
+msgid "Insert the next keystroke verbatim"
+msgstr "Enmeti la tujsekvan klavon tielkiel"
+
+#: src/global.c:580
+msgid "Insert a tab at the cursor position"
+msgstr "Enmeti tabon je la kursora pozicio"
+
+#: src/global.c:581
+msgid "Insert a newline at the cursor position"
+msgstr "Enmeti novlinion je la kursora pozicio"
+
+#: src/global.c:582
+msgid "Delete the character under the cursor"
+msgstr "Forigi la signon sub la kursoro"
+
+#: src/global.c:584
+msgid "Delete the character to the left of the cursor"
+msgstr "Forigi la signon maldekstran de la kursoro"
+
+#: src/global.c:587
+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:590
+msgid "Justify the entire file"
+msgstr "Rektigi la tutan dosieron"
+
+#: src/global.c:594
+msgid "Count the number of words, lines, and characters"
+msgstr "Nombri la vortojn, liniojn, kaj signojn"
+
+#: src/global.c:597
+msgid "Refresh (redraw) the current screen"
+msgstr "Aktualigi (redesegni) la nunan ekranon"
+
+#: src/global.c:599
+msgid "Suspend the editor (if suspend is enabled)"
+msgstr "Paŭzigi la redaktilon (se paŭzigebleco enŝaltitas)"
+
+#: src/global.c:602
+msgid "Toggle the case sensitivity of the search"
+msgstr "Ŝalti la usklecdistingon de serĉo"
+
+#: src/global.c:604
+msgid "Reverse the direction of the search"
+msgstr "Mali la direkton de serĉo"
+
+#: src/global.c:608
+msgid "Toggle the use of regular expressions"
+msgstr "Ŝalti la uzon de regulesprimoj"
+
+#: src/global.c:612
+msgid "Recall the previous search/replace string"
+msgstr "Repreni la antaŭan serĉitan signoĉenon"
+
+#: src/global.c:614
+msgid "Recall the next search/replace string"
+msgstr "Repreni la postan serĉitan signoĉenon"
+
+#: src/global.c:617
+msgid "Go to file browser"
+msgstr "Iri al dosieresplorilo"
+
+#: src/global.c:620
+msgid "Toggle the use of DOS format"
+msgstr "Ŝalti la uzon de DOS-aranĝo"
+
+#: src/global.c:621
+msgid "Toggle the use of Mac format"
+msgstr "Ŝalti la uzon de Mac-aranĝo"
+
+#: src/global.c:622
+msgid "Toggle appending"
+msgstr "Ŝalti postgluon"
+
+#: src/global.c:623
+msgid "Toggle prepending"
+msgstr "Ŝalti antaŭgluon"
+
+#: src/global.c:624
+msgid "Toggle backing up of the original file"
+msgstr "Ŝalti fari savkopion de redaktota dosiero"
+
+#: src/global.c:625
+msgid "Execute external command"
+msgstr "Ruli eksteran komandon"
+
+#: src/global.c:628
+msgid "Toggle the use of a new buffer"
+msgstr "Ŝalti la uzon de nova bufro"
+
+#: src/global.c:631
+msgid "Exit from the file browser"
+msgstr "Eliri el dosieresplorilo"
+
+#: src/global.c:632
+msgid "Go to the first file in the list"
+msgstr "Iri al la unua dosiero en la listo"
+
+#: src/global.c:633
+msgid "Go to the last file in the list"
+msgstr "Iri al la lasta dosiero en la listo"
+
+#: src/global.c:634
+msgid "Go to the previous file in the list"
+msgstr "Iri al la malsekva dosiero en la listo"
+
+#: src/global.c:635
+msgid "Go to the next file in the list"
+msgstr "Iri al la sekva dosiero en la listo"
+
+#: src/global.c:636
+msgid "Go to directory"
+msgstr "Iri al indikota dosierujo"
+
+#: src/global.c:639
+msgid "Invoke the linter, if available"
+msgstr "Ruli sintaks-kontrolilon (se disponeblas)"
+
+#: src/global.c:640
+msgid "Go to previous linter msg"
+msgstr "Iri al la antaŭa mesaĝo de la kontrolilo"
+
+#: src/global.c:641
+msgid "Go to next linter msg"
+msgstr "Iri al la sekva mesaĝo de la kontrolilo"
+
+#: src/global.c:642
+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:662
+msgid "Get Help"
+msgstr "Helpo"
+
+#: src/global.c:665 src/prompt.c:1084
+msgid "Cancel"
+msgstr "Rezigni"
+
+#: src/global.c:678
+msgid "Write Out"
+msgstr "Konservi"
+
+#: src/global.c:704
+msgid "Go To Dir"
+msgstr "Iri dosierujon"
+
+#: src/global.c:719
+msgid "Cut Text"
+msgstr "Eltondi"
+
+#: src/global.c:728
+msgid "Justify"
+msgstr "Rektigi"
+
+#: src/global.c:733
+msgid "To Spell"
+msgstr "Literumo"
+
+#: src/global.c:738
+msgid "To Linter"
+msgstr "Trakombi"
+
+#: src/global.c:740
+msgid "Formatter"
+msgstr "Aranĝilo"
+
+#: src/global.c:745
+msgid "Case Sens"
+msgstr "Usklece"
+
+#: src/global.c:750
+msgid "Regexp"
+msgstr "Regulesprime"
+
+#: src/global.c:755
+msgid "Backwards"
+msgstr "Malantaŭen"
+
+#: src/global.c:762
+msgid "No Replace"
+msgstr "Ne anstataŭigi"
+
+#: src/global.c:770
+msgid "Cur Pos"
+msgstr "Pozicio"
+
+#: src/global.c:780
+msgid "Prev Page"
+msgstr "Paĝo supren"
+
+#: src/global.c:782
+msgid "Next Page"
+msgstr "Paĝo suben"
+
+#: src/global.c:785
+msgid "First Line"
+msgstr "Unua linio"
+
+#: src/global.c:787
+msgid "Last Line"
+msgstr "Lasta linio"
+
+#: src/global.c:794
+msgid "To Bracket"
+msgstr "Al krampo"
+
+#: src/global.c:797
+msgid "Mark Text"
+msgstr "Markŝalto"
+
+#: src/global.c:800
+msgid "Copy Text"
+msgstr "Kopii tekston"
+
+#: src/global.c:803
+msgid "Indent Text"
+msgstr "Deŝovi enen"
+
+#: src/global.c:805
+msgid "Unindent Text"
+msgstr "Deŝovi eksteren"
+
+#: src/global.c:808
+msgid "Undo"
+msgstr "Malfari"
+
+#: src/global.c:810
+msgid "Redo"
+msgstr "Refari"
+
+#: src/global.c:814 src/global.c:820
+msgid "Back"
+msgstr "Malantaŭen"
+
+#: src/global.c:816 src/global.c:822
+msgid "Forward"
+msgstr "Antaŭen"
+
+#: src/global.c:827
+msgid "Prev Word"
+msgstr "Antaŭa vorto"
+
+#: src/global.c:829
+msgid "Next Word"
+msgstr "Posta vorto"
+
+#: src/global.c:833
+msgid "Home"
+msgstr "Linikomencen"
+
+#: src/global.c:835
+msgid "End"
+msgstr "Linifinen"
+
+#: src/global.c:844
+msgid "Beg of Par"
+msgstr "Alineo-eken"
+
+#: src/global.c:846
+msgid "End of Par"
+msgstr "Alineo-finen"
+
+#: src/global.c:851
+msgid "Scroll Up"
+msgstr "Rulumi supren"
+
+#: src/global.c:853
+msgid "Scroll Down"
+msgstr "Rulumi suben"
+
+#: src/global.c:858
+msgid "Prev File"
+msgstr "Malsekvan"
+
+#: src/global.c:860
+msgid "Next File"
+msgstr "Sekvan"
+
+#: src/global.c:869
+msgid "Verbatim"
+msgstr "Konforme"
+
+#: src/global.c:872
+msgid "Tab"
+msgstr "«Tabo»"
+
+#: src/global.c:874
+msgid "Enter"
+msgstr "«Enigo»"
+
+#: src/global.c:876
+msgid "Delete"
+msgstr "«Forigo»"
+
+#: src/global.c:878
+msgid "Backspace"
+msgstr "«Retropaŝo»"
+
+#: src/global.c:888
+msgid "CutTillEnd"
+msgstr "Tondi reston"
+
+#: src/global.c:898
+msgid "Word Count"
+msgstr "Nombri vortojn"
+
+#: src/global.c:905
+msgid "Suspend"
+msgstr "Paŭzigi"
+
+#: src/global.c:910
+msgid "PrevHstory"
+msgstr "Pli olda"
+
+#: src/global.c:913
+msgid "NextHstory"
+msgstr "Malpli olda"
+
+#: src/global.c:917
+msgid "Go To Text"
+msgstr "Serĉi"
+
+#: src/global.c:928
+msgid "DOS Format"
+msgstr "DOS-aranĝo"
+
+#: src/global.c:931
+msgid "Mac Format"
+msgstr "Mac-aranĝo"
+
+#: src/global.c:934
+msgid "Append"
+msgstr "Postglui"
+
+#: src/global.c:936
+msgid "Prepend"
+msgstr "Antaŭglui"
+
+#: src/global.c:939
+msgid "Backup File"
+msgstr "Savkopii"
+
+#: src/global.c:946
+msgid "Execute Command"
+msgstr "Ruli komandon"
+
+#: src/global.c:961
+msgid "To Files"
+msgstr "Dosierlisto"
+
+#: src/global.c:964
+msgid "First File"
+msgstr "Unua dosiero"
+
+#: src/global.c:966
+msgid "Last File"
+msgstr "Lasta dosiero"
+
+#: src/global.c:977
+msgid "Prev Lint Msg"
+msgstr "Antaŭa mesaĝo"
+
+#: src/global.c:979
+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:1227
+msgid "Help mode"
+msgstr "Helpaj linioj"
+
+#: src/global.c:1229
+msgid "Constant cursor position display"
+msgstr "Daŭra montro de kursora pozicio"
+
+#: src/global.c:1231
+msgid "Use of one more line for editing"
+msgstr "Uzi unu plian linion por redakti"
+
+#: src/global.c:1233
+msgid "Smooth scrolling"
+msgstr "Rulumi linie"
+
+#: src/global.c:1235
+msgid "Soft wrapping of overlong lines"
+msgstr "Ĉirkaŭfluigo de tro longaj linioj"
+
+#: src/global.c:1237
+msgid "Whitespace display"
+msgstr "Montri blankan spacon"
+
+#: src/global.c:1239
+msgid "Color syntax highlighting"
+msgstr "Kolore montri sintakson"
+
+#: src/global.c:1241
+msgid "Smart home key"
+msgstr "Inteligenta klavo «Komencen»"
+
+#: src/global.c:1243
+msgid "Auto indent"
+msgstr "Aŭtomate deŝovi"
+
+#: src/global.c:1245
+msgid "Cut to end"
+msgstr "Tondi ekde kursoro ĝis linifino"
+
+#: src/global.c:1247
+msgid "Hard wrapping of overlong lines"
+msgstr "Faldi longajn liniojn (enmeti linifinon)"
+
+#: src/global.c:1249
+msgid "Conversion of typed tabs to spaces"
+msgstr "Konverti tajpatajn tabojn al spacoj"
+
+#: src/global.c:1251
+msgid "Backup files"
+msgstr "Fari savkopion de redaktota dosiero"
+
+#: src/global.c:1253
+msgid "Multiple file buffers"
+msgstr "Pluraj dosierbufroj"
+
+#: src/global.c:1255
+msgid "Mouse support"
+msgstr "Subteno de muso"
+
+#: src/global.c:1257
+msgid "No conversion from DOS/Mac format"
+msgstr "Ne konverti el DOS-/Mac-aranĝo"
+
+#: src/global.c:1259
+msgid "Suspension"
+msgstr "Paŭzigebleco"
+
+#: src/help.c:205
+msgid ""
+"Search Command Help Text\n"
+"\n"
+" Enter the words or characters you would like to search for, and then press "
+"Enter.  If there is a match for the text you entered, the screen will be "
+"updated to the location of the nearest match for the search string.\n"
+"\n"
+" The previous search string will be shown in brackets after the search "
+"prompt.  Hitting Enter without entering any text will perform the previous "
+"search.  "
+msgstr ""
+"Serĉa helpteksto\n"
+"\n"
+" Enigu la vortojn aŭ signojn kiujn vi volas trovi, kaj premu «Enigo».  Se "
+"ekzistas kongruo por la teksto kiun vi enigis, la ekrano aktualiĝos al la "
+"loko de la unue trovata kongruo.\n"
+"\n"
+" 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:214
+msgid ""
+"If you have selected text with the mark and then search to replace, only "
+"matches in the selected text will be replaced.\n"
+"\n"
+" The following function keys are available in Search mode:\n"
+"\n"
+msgstr ""
+"Se vi markis tekston kaj tiam serĉas por anstataŭigi, nur kongruoj en la "
+"markita teksto anstataŭiĝos.\n"
+"\n"
+" La subaj klavkomandoj disponeblas en serĉa moduso:\n"
+"\n"
+
+#: src/help.c:220
+msgid ""
+"Go To Line Help Text\n"
+"\n"
+" Enter the line number that you wish to go to and hit Enter.  If there are "
+"fewer lines of text than the number you entered, you will be brought to the "
+"last line of the file.\n"
+"\n"
+" The following function keys are available in Go To Line mode:\n"
+"\n"
+msgstr ""
+"Helpteksto por iri al specifa linio\n"
+"\n"
+" Enigu la numeron de la linio al kiu vi volas iri, kaj premu «Enigo».  Se "
+"ekzistas malpli linioj da teksto ol la numero kiun vi enigis, la fino de la "
+"dosiero estos montrata.\n"
+"\n"
+" La subaj klavkomandoj disponeblas dum «Iri linion»:\n"
+"\n"
+
+#: src/help.c:229
+msgid ""
+"Insert File Help Text\n"
+"\n"
+" Type in the name of a file to be inserted into the current file buffer at "
+"the current cursor location.\n"
+"\n"
+" If you have compiled nano with multiple file buffer support, and enable "
+"multiple file buffers with the -F or --multibuffer command line flags, the "
+"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 ""
+"Helpteksto por enmeti dosieron\n"
+"\n"
+" Tajpu la nomon de la dosiero kiu enmetendas en la nuna dosierbufro je la "
+"nuna kursora pozicio.\n"
+"\n"
+" Se vi kompilis 'nano' kun subteno por pluraj dosierbufroj, kaj se vi "
+"ebligis multbufran moduson (per opcio '-F' aŭ '--multibuffer', per 'nanorc', "
+"aŭ per ŝalto Meta-F), enmeti dosieron ŝargos ĝin en aparta bufro.  Uzu Meta-"
+"< kaj Meta-> por ŝalti inter bufroj.  "
+
+#: src/help.c:238
+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"
+"\n"
+" The following function keys are available in Insert File mode:\n"
+"\n"
+msgstr ""
+"Se vi bezonas novan, vakan bufron, ne enigu nomon (aŭ enigu neekzistantan "
+"nomon) kaj premu «Enigo».\n"
+"\n"
+" La subaj klavkomandoj disponeblas dum «Enmeti dosieron»:\n"
+"\n"
+
+#: src/help.c:244
+msgid ""
+"Write File Help Text\n"
+"\n"
+" Type the name that you wish to save the current file as and press Enter to "
+"save the file.\n"
+"\n"
+" If you have selected text with the mark, you will be prompted to save only "
+"the selected portion to a separate file.  To reduce the chance of "
+"overwriting the current file with just a portion of it, the current filename "
+"is not the default in this mode.\n"
+"\n"
+" The following function keys are available in Write File mode:\n"
+"\n"
+msgstr ""
+"Helpteksto por konservi dosieron\n"
+"\n"
+" Tajpu la nomon sub kiu konservi la nunan dosierbufron, kaj premu «Enigo».\n"
+"\n"
+" Se vi markis tekston, vi invitiĝos konservi nur la markitan tekston.  Por "
+"limigi la ŝancon de surskribi la nunan dosieron kun nur parton de tiu, la "
+"nuna dosiernomo ne estas la defaŭlto en ĉi tiu moduso.\n"
+"\n"
+" La subaj klavkomandoj disponeblas dum «Konservi dosieron»:\n"
+"\n"
+
+#: src/help.c:258
+msgid ""
+"File Browser Help Text\n"
+"\n"
+" The file browser is used to visually browse the directory structure to "
+"select a file for reading or writing.  You may use the arrow keys or Page Up/"
+"Down to browse through the files, and S or Enter to choose the selected file "
+"or enter the selected directory.  To move up one level, select the directory "
+"called \"..\" at the top of the file list.\n"
+"\n"
+" The following function keys are available in the file browser:\n"
+"\n"
+msgstr ""
+"Helpteksto por dosieresplorilo\n"
+"\n"
+" La dosieresplorilo uzeblas por esplori la arbo de dosierujoj por elekti "
+"dosieron por legi aŭ skribi.  Vi povas uzi la sagoklavojn aŭ «paĝon supren/"
+"suben» por foliumi tra la dosieroj, kaj «S» aŭ «Enigo» por elekti la "
+"indikatan dosieron aŭ eniri la indikatan dosierujon.  Por iri unu nivelon "
+"supren, elektu la dosierujon «..» je la supro de la listo.\n"
+"\n"
+" La subaj klavkomandoj disponeblas en la dosieresplorilo:\n"
+"\n"
+
+#: src/help.c:271
+msgid ""
+"Browser Search Command Help Text\n"
+"\n"
+" Enter the words or characters you would like to search for, and then press "
+"Enter.  If there is a match for the text you entered, the screen will be "
+"updated to the location of the nearest match for the search string.\n"
+"\n"
+" The previous search string will be shown in brackets after the search "
+"prompt.  Hitting Enter without entering any text will perform the previous "
+"search.\n"
+"\n"
+msgstr ""
+"Helpteksto por serĉi dosieron\n"
+"\n"
+" Enigu la vortojn aŭ signojn kiujn vi volas trovi, kaj premu «Enigo».  Se "
+"ekzistas kongruo por la teksto kiun vi enigis, la ekrano aktualiĝos al la "
+"loko de la unue trovata kongruo.\n"
+"\n"
+" La antaŭa serĉendaĵo montriĝas inter krampoj post la serĉa invito -- premi "
+"«Enigo» sen enigi iun ajn tekston, kontinuigos tiun antaŭan serĉon.\n"
+"\n"
+
+#: src/help.c:280
+msgid ""
+" The following function keys are available in Browser Search mode:\n"
+"\n"
+msgstr ""
+" La subaj klavkomandoj disponeblas dum «Serĉi dosieron»:\n"
+"\n"
+
+#: src/help.c:284
+msgid ""
+"Browser Go To Directory Help Text\n"
+"\n"
+" Enter the name of the directory you would like to browse to.\n"
+"\n"
+" If tab completion has not been disabled, you can use the Tab key to "
+"(attempt to) automatically complete the directory name.\n"
+"\n"
+" The following function keys are available in Browser Go To Directory mode:\n"
+"\n"
+msgstr ""
+"Helpteksto por iri al dosierujo\n"
+"\n"
+" Enigu la nomon de la dosierujo kiun vi volas viziti.\n"
+"\n"
+" Se kompletigo-per-tabo ne malŝaltitas, eblas uzi la taban klavon por "
+"(provi) aŭtomate kompletigi la nomon de la dosierujo.\n"
+"\n"
+" La subaj klavkomandoj disponeblas dum «Iri dosierujon»:\n"
+"\n"
+
+#: src/help.c:297
+msgid ""
+"Spell Check Help Text\n"
+"\n"
+" The spell checker checks the spelling of all text in the current file.  "
+"When an unknown word is encountered, it is highlighted and a replacement can "
+"be edited.  It will then prompt to replace every instance of the given "
+"misspelled word in the current file, or, if you have selected text with the "
+"mark, in the selected text.\n"
+"\n"
+" The following function keys are available in Spell Check mode:\n"
+"\n"
+msgstr ""
+"Helpteksto por literuma kontrolo\n"
+"\n"
+" La literumilo kontrolas la ortografion de la tuta teksto en la nuna "
+"dosierbufro.  Kiam nekonata vorto renkontiĝas, ĉi tiu emfaziĝas kaj eblas "
+"redakti anstataŭigon.  Poste, la literumilo demandas ĉu anstataŭigi la "
+"misliterumatan vorton en la tuta nuna dosiero, aŭ, se vi markis tekston, en "
+"la markita teksto.\n"
+"\n"
+" La subaj klavkomandoj disponeblas dum «Literuma kontrolo»:\n"
+"\n"
+
+#: src/help.c:312
+msgid ""
+"Execute Command Help Text\n"
+"\n"
+" This mode allows you to insert the output of a command run by the shell "
+"into the current buffer (or a new buffer in multiple file buffer mode).  If "
+"you need another blank buffer, do not enter any command.\n"
+"\n"
+" The following function keys are available in Execute Command mode:\n"
+"\n"
+msgstr ""
+"Helpteksto por ruli komandon\n"
+"\n"
+" Ĉi tiu moduso permesas enmeti eligon de ŝela komando en la nuna dosierbufro "
+"(aŭ en nova bufro en multbufra moduso).  Se vi bezonas novan, vakan bufron, "
+"ne enigu komandon.\n"
+"\n"
+" La subaj klavkomandoj disponeblas dum «Ruli komandon»:\n"
+"\n"
+
+#: src/help.c:325
+msgid ""
+"Main nano help text\n"
+"\n"
+" The nano editor is designed to emulate the functionality and ease-of-use of "
+"the UW Pico text editor.  There are four main sections of the editor.  The "
+"top line shows the program version, the current filename being edited, and "
+"whether or not the file has been modified.  Next is the main editor window "
+"showing the file being edited.  The status line is the third line from the "
+"bottom and shows important messages.  "
+msgstr ""
+"Ĉefa helpteksto de 'nano'\n"
+"\n"
+" La redaktilo 'nano' estas dizajnita por imiti la funkciojn kaj uzfacilecon "
+"de la 'UW Pico' tekstredaktilo.  La redaktila ekrano konsistas el kvar "
+"sekcioj.  La supra linio montras la programversion, la nomon de la redaktata "
+"dosiero, kaj ĉu la dosiero modifiĝis.  Sube sekvas la ĉefa fenestro, kiu "
+"montras la redaktatan dosieron.  La tria linio ekde la fundo estas la stata "
+"linio, kiu montras gravajn mesaĝojn.  "
+
+#: src/help.c:335
+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.  "
+msgstr ""
+"La du fundaj linioj montras la plej uzatajn klavkomandojn de la redaktilo.\n"
+"\n"
+" La notmaniero por klavkomandoj estas tiel: kombinoj kun Stir-klavo "
+"montriĝas per \"^\" kaj eblas enigi ilin premtenante klavon \"Ctrl\", aŭ "
+"premante antaŭe dufoje klavon \"Esc\"; kombinoj kun Alt-klavo montriĝas per "
+"\"M-\" kaj eblas enigi ilin premtenante klavon \"Alt\" aŭ \"Meta\", aŭ "
+"premante antaŭe unufoje klavon \"Esc\".  "
+
+#: src/help.c:344
+msgid ""
+"Also, pressing Esc twice and then typing a three-digit decimal number from "
+"000 to 255 will enter the character with the corresponding value.  The "
+"following keystrokes are available in the main editor window.  Alternative "
+"keys are shown in parentheses:\n"
+"\n"
+msgstr ""
+"Ankaŭ, premante dufoje \"Esc\" kaj poste tajpante triciferan dekuman nombron "
+"(de 000 al 255) enmetos la signon de tiu kodo.\n"
+"\n"
+" La subaj klavkomandoj disponeblas en la ĉefa redaktila fenestro; "
+"alternativaj kombinoj montriĝas inter krampoj:\n"
+"\n"
+
+#: src/help.c:376 src/help.c:448
+msgid "enable/disable"
+msgstr " (ŝalto)"
+
+#: src/nano.c:601
+msgid "Key invalid in view mode"
+msgstr "Klavo ne validas en rigarda reĝimo"
+
+#: src/nano.c:713
+#, c-format
+msgid ""
+"\n"
+"Buffer written to %s\n"
+msgstr ""
+"\n"
+"Bufro skribiĝis al %s\n"
+
+#: src/nano.c:715
+#, c-format
+msgid ""
+"\n"
+"Buffer not written to %s: %s\n"
+msgstr ""
+"\n"
+"Bufro ne skribiĝis al %s: %s\n"
+
+#: src/nano.c:718
+#, c-format
+msgid ""
+"\n"
+"Buffer not written: %s\n"
+msgstr ""
+"\n"
+"Bufro ne skribiĝis: %s\n"
+
+#: src/nano.c:743
+msgid "Window size is too small for nano...\n"
+msgstr "Fenestro estas tro malgranda por 'nano'...\n"
+
+#: src/nano.c:836
+#, c-format
+msgid ""
+"Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
+"\n"
+msgstr ""
+"Uzmaniero:  nano [OPCIO...] [[+LINIO,KOLUMNO] DOSIERO...]\n"
+"\n"
+
+#: src/nano.c:839
+#, c-format
+msgid "Option\t\tGNU long option\t\tMeaning\n"
+msgstr "Opcio\t\tLonga GNU-a opcio\t  Signifo\n"
+
+#: src/nano.c:841
+#, c-format
+msgid "Option\t\tMeaning\n"
+msgstr "Opcio\t\t  Signifo\n"
+
+#: src/nano.c:844
+msgid "+LINE,COLUMN"
+msgstr "+LINIO,KOLUMNO"
+
+#. TRANSLATORS: The next forty or so strings are option descriptions
+#. * for the --help output.  Try to keep them at most 40 characters.
+#: src/nano.c:847
+msgid "Start at line LINE, column COLUMN"
+msgstr "komenci en ĉi tiu LINIO (kaj KOLUMNO)"
+
+#: src/nano.c:849
+msgid "Enable smart home key"
+msgstr "estigi klavon «Komencen» inteligenta"
+
+#: src/nano.c:850
+msgid "Save backups of existing files"
+msgstr "fari savkopion de ekzistanta dosiero"
+
+#: src/nano.c:851
+msgid "-C <dir>"
+msgstr "-C <ujo>"
+
+#: src/nano.c:851
+msgid "--backupdir=<dir>"
+msgstr "--backupdir=<ujo>"
+
+#: src/nano.c:852
+msgid "Directory for saving unique backup files"
+msgstr "dosierujo por konservi unikajn savkopiojn"
+
+#: src/nano.c:855
+msgid "Use bold instead of reverse video text"
+msgstr "uzi grasan anstataŭ negativan tekston"
+
+#: src/nano.c:858
+msgid "Convert typed tabs to spaces"
+msgstr "konverti tajpatajn tabojn al spacoj"
+
+#: src/nano.c:861
+msgid "Enable multiple file buffers"
+msgstr "ebligi uzon de pluraj dosierbufroj"
+
+#: src/nano.c:865
+msgid "Use (vim-style) lock files"
+msgstr "uzi riglajn dosierojn (kiel je 'vim')"
+
+#: src/nano.c:869
+msgid "Log & read search/replace string history"
+msgstr "memori historion de serĉitaj signoĉenoj"
+
+#: src/nano.c:873
+msgid "Don't look at nanorc files"
+msgstr "ignori 'nanorc'-dosierojn"
+
+#: src/nano.c:876
+msgid "Fix numeric keypad key confusion problem"
+msgstr "fliki konfuzon je cifera klavareto"
+
+#: src/nano.c:878
+msgid "Don't add newlines to the ends of files"
+msgstr "ne aldoni novlinion al fino de dosiero"
+
+#: src/nano.c:881
+msgid "Don't convert files from DOS/Mac format"
+msgstr "ne konverti el DOS-/Mac-aranĝo"
+
+#: src/nano.c:883
+msgid "Use one more line for editing"
+msgstr "uzi unu plian linion por redakti"
+
+#: src/nano.c:886
+msgid "Log & read location of cursor position"
+msgstr "konservi kaj restaŭri kursoran pozicion"
+
+#: src/nano.c:889
+msgid "-Q <str>"
+msgstr "-Q <ĉeno>"
+
+#: src/nano.c:889
+msgid "--quotestr=<str>"
+msgstr "--quotestr=<ĉeno>"
+
+#: src/nano.c:890
+msgid "Quoting string"
+msgstr "signoĉeno de rekonendaj citiloj"
+
+#: src/nano.c:892
+msgid "Restricted mode"
+msgstr "limigita reĝimo"
+
+#: src/nano.c:895
+msgid "Scroll by line instead of half-screen"
+msgstr "rulumi po linio anstataŭ po duon-ekrano"
+
+#: src/nano.c:897
+msgid "-T <#cols>"
+msgstr "-T <nombro>"
+
+#: src/nano.c:897
+msgid "--tabsize=<#cols>"
+msgstr "--tabsize=<nombro>"
+
+#: src/nano.c:898
+msgid "Set width of a tab to #cols columns"
+msgstr "uzenda larĝo de tabo"
+
+#: src/nano.c:900
+msgid "Do quick statusbar blanking"
+msgstr "viŝi statlinio tuj post sekva klavtuŝo"
+
+#: src/nano.c:903
+msgid "Print version information and exit"
+msgstr "montri programversion kaj fini"
+
+#: src/nano.c:906
+msgid "Detect word boundaries more accurately"
+msgstr "detekti vortlimojn pli akurate"
+
+#: src/nano.c:909
+msgid "-Y <str>"
+msgstr "-Y <nomo>"
+
+#: src/nano.c:909
+msgid "--syntax=<str>"
+msgstr "--syntax=<nomo>"
+
+#: src/nano.c:910
+msgid "Syntax definition to use for coloring"
+msgstr "uzenda sintaksdifino por kolorigi"
+
+#: src/nano.c:912
+msgid "Constantly show cursor position"
+msgstr "daŭre montri kursoran pozicion"
+
+#: src/nano.c:914
+msgid "Fix Backspace/Delete confusion problem"
+msgstr "fliki konfuzon pri «Retropaŝo»/«Forigo»"
+
+#: src/nano.c:915
+msgid "Show this help text"
+msgstr "montri ĉi tiun helptekston kaj fini"
+
+#: src/nano.c:918
+msgid "Automatically indent new lines"
+msgstr "aŭtomate deŝovi novajn liniojn"
+
+#: src/nano.c:919
+msgid "Cut from cursor to end of line"
+msgstr "forigi ekde de la kursoro ĝis liniofino"
+
+#: src/nano.c:922
+msgid "Don't follow symbolic links, overwrite"
+msgstr "ne sekvi simbolajn ligilojn; anstataŭigi"
+
+#: src/nano.c:924
+msgid "Enable the use of the mouse"
+msgstr "ebligi uzon de muso"
+
+#: src/nano.c:926
+msgid "Do not read the file (only write it)"
+msgstr "ne legi dosieron (nur skribi ĝin)"
+
+#: src/nano.c:928
+msgid "-o <dir>"
+msgstr "-o <ujo>"
+
+#: src/nano.c:928
+msgid "--operatingdir=<dir>"
+msgstr "--operatingdir=<ujo>"
+
+#: src/nano.c:929
+msgid "Set operating directory"
+msgstr "uzenda kuranta dosierujo"
+
+#: src/nano.c:932
+msgid "Preserve XON (^Q) and XOFF (^S) keys"
+msgstr "ebligi klavojn ^Q (XON) kaj ^S (XOFF)"
+
+#: src/nano.c:935
+msgid "Silently ignore startup issues like rc file errors"
+msgstr "silente ignori lanĉajn problemetojn"
+
+#: src/nano.c:938
+msgid "-r <#cols>"
+msgstr "-r <nombro>"
+
+#: src/nano.c:938
+msgid "--fill=<#cols>"
+msgstr "--fill=<nombro>"
+
+#: src/nano.c:939
+msgid "Set hard-wrapping point at column #cols"
+msgstr "uzenda larĝo por faldi/rektigi"
+
+#: src/nano.c:942
+msgid "-s <prog>"
+msgstr "-s <programo>"
+
+#: src/nano.c:942
+msgid "--speller=<prog>"
+msgstr "--speller=<programo>"
+
+#: src/nano.c:943
+msgid "Enable alternate speller"
+msgstr "uzenda alternativa literumilo"
+
+#: src/nano.c:946
+msgid "Auto save on exit, don't prompt"
+msgstr "aŭtomate konservi je fino, sen demandi"
+
+#: src/nano.c:947
+msgid "View mode (read-only)"
+msgstr "rigarda reĝimo (ne eblas redakti)"
+
+#: src/nano.c:949
+msgid "Don't hard-wrap long lines"
+msgstr "ne faldi longajn liniojn"
+
+#: src/nano.c:951
+msgid "Don't show the two help lines"
+msgstr "ne montri la du helpajn liniojn"
+
+#: src/nano.c:952
+msgid "Enable suspension"
+msgstr "ebligi paŭzigo"
+
+#: src/nano.c:954
+msgid "Enable soft line wrapping"
+msgstr "ĉirkaŭfluigi longajn liniojn"
+
+#: src/nano.c:963
+#, c-format
+msgid " GNU nano, version %s\n"
+msgstr " GNU nano, versio %s\n"
+
+#: src/nano.c:966
+#, 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:967
+#, c-format
+msgid ""
+"\n"
+" Compiled options:"
+msgstr ""
+"\n"
+" Kompilaj opcioj:"
+
+#: src/nano.c:1096
+msgid "Sorry, support for this function has been disabled"
+msgstr "Subteno de ĉi tiu funkcio malebliĝis"
+
+#: src/nano.c:1125
+msgid "No file name"
+msgstr "Vaka dosiernomo"
+
+#: src/nano.c:1136
+msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
+msgstr "Ĉu konservi modifitan bufron? (\"N\" DETRUOS ŜANĜOJN) "
+
+#: src/nano.c:1189
+msgid "Couldn't reopen stdin from keyboard, sorry\n"
+msgstr "Maleblas remalfermi klavaron kiel ĉefenigujon\n"
+
+#: src/nano.c:1213
+#, c-format
+msgid "Reading from stdin, ^C to abort\n"
+msgstr "Legado el ĉefenigujo; ^C por ĉesigi\n"
+
+#: src/nano.c:1279
+msgid "Received SIGHUP or SIGTERM\n"
+msgstr "Ricevitas SIGHUP aŭ SIGTERM\n"
+
+#: src/nano.c:1301
+#, c-format
+msgid "Use \"fg\" to return to nano.\n"
+msgstr "Uzu \"fg\" por reveni al 'nano'.\n"
+
+#: src/nano.c:1481
+msgid "enabled"
+msgstr "(enŝaltitas)"
+
+#: src/nano.c:1481
+msgid "disabled"
+msgstr "(malŝaltitas)"
+
+#: src/nano.c:1635 src/winio.c:1283
+msgid "Unknown Command"
+msgstr "Nekonata komando"
+
+#: src/nano.c:1747
+msgid "XON ignored, mumble mumble"
+msgstr "Mmm-mmm, XON ignoratas"
+
+#: src/nano.c:1752
+msgid "XOFF ignored, mumble mumble"
+msgstr "Mmm-mmm, XOFF ignoratas"
+
+#: src/nano.c:2310 src/rcfile.c:1325
+#, c-format
+msgid "Requested tab size \"%s\" is invalid"
+msgstr "Petata tablarĝo \"%s\" ne validas"
+
+#: src/nano.c:2374 src/rcfile.c:1250
+#, c-format
+msgid "Requested fill size \"%s\" is invalid"
+msgstr "Petata faldlarĝo \"%s\" ne validas"
+
+#: src/nano.c:2415
+#, c-format
+msgid "Type '%s -h' for a list of available options.\n"
+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:1055
+msgid "Yy"
+msgstr "JjYy"
+
+#: src/prompt.c:1056
+msgid "Nn"
+msgstr "NnNn"
+
+# Tute, All.
+# "Ĉiujn" ne eblas, ĉar plurbitokajn klavojn 'nano' ĉi tie ne komprenas.
+#: src/prompt.c:1057
+msgid "Aa"
+msgstr "TtCcAa"
+
+#: src/prompt.c:1071
+msgid "Yes"
+msgstr "Jes"
+
+#: src/prompt.c:1076
+msgid "All"
+msgstr "Tute"
+
+#: src/prompt.c:1081
+msgid "No"
+msgstr "Ne"
+
+#: src/rcfile.c:137
+#, c-format
+msgid "Error in %s on line %lu: "
+msgstr "Eraro en %s en linio %lu: "
+
+#: src/rcfile.c:196
+#, c-format
+msgid "Argument '%s' has an unterminated \""
+msgstr "Argumento '%s' havas senparan citilon \""
+
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
+msgid "Regex strings must begin and end with a \" character"
+msgstr "Regulesprimaj signoĉenoj devas komenci kaj fini kun citilo \""
+
+#: src/rcfile.c:249 src/search.c:62
+#, c-format
+msgid "Bad regex \"%s\": %s"
+msgstr "Malbonas regulesprimo \"%s\": %s"
+
+#: src/rcfile.c:269
+msgid "Missing syntax name"
+msgstr "Mankas nomo de sintakso"
+
+#: src/rcfile.c:340
+msgid "The \"none\" syntax is reserved"
+msgstr "Sintakso \"none\" estas rezervita"
+
+#: src/rcfile.c:347
+msgid "The \"default\" syntax must take no extensions"
+msgstr "Sintakso \"default\" ne permesas finaĵojn"
+
+#: src/rcfile.c:433
+msgid "Missing key name"
+msgstr "Mankas nomo de klavo"
+
+#: src/rcfile.c:442 src/rcfile.c:453
+msgid "Key name is too short"
+msgstr "Klavnomo tro mallongas"
+
+#: src/rcfile.c:463
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
+msgstr "Klavnomo devas komenci kun '^', 'M', aŭ 'F'"
+
+#: src/rcfile.c:472
+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:482
+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:489
+#, c-format
+msgid "Cannot map name \"%s\" to a function"
+msgstr "Ĉeno '%s' ne estas nomo de funkcio"
+
+#: src/rcfile.c:496
+#, c-format
+msgid "Cannot map name \"%s\" to a menu"
+msgstr "Ĉeno '%s' ne estas nomo de menuo"
+
+#: src/rcfile.c:528
+#, c-format
+msgid "Function '%s' does not exist in menu '%s'"
+msgstr "Funkcio '%s' ne ekzistas en menuo '%s'"
+
+#: src/rcfile.c:543
+#, c-format
+msgid "Sorry, keystroke \"%s\" may not be rebound"
+msgstr "Ne eblas religi klavĉenon '%s'"
+
+#: src/rcfile.c:629
+#, c-format
+msgid "Error expanding %s: %s"
+msgstr "Eraro dum malvolvo de %s: %s"
+
+#: src/rcfile.c:672
+#, c-format
+msgid ""
+"Color \"%s\" not understood.\n"
+"Valid colors are \"green\", \"red\", \"blue\",\n"
+"\"white\", \"yellow\", \"cyan\", \"magenta\" and\n"
+"\"black\", with the optional prefix \"bright\"\n"
+"for foreground colors."
+msgstr ""
+"Koloro '%s' ne rekoniĝas.\n"
+"Validaj nomoj de koloroj estas: 'red' (ruĝa), 'green' (verda), "
+"'blue' (blua),\n"
+"'magenta' (fuksina), 'yellow' (flava), 'cyan' (cejana), 'black' (nigra) kaj\n"
+"'white' (blanka), kun la ebla prefikso 'bright' (hela) por malfonaj koloroj."
+
+#: src/rcfile.c:694
+msgid "Cannot add a color command without a syntax command"
+msgstr "Ne eblas aldoni komandon 'color' sen komando 'syntax'"
+
+#: src/rcfile.c:699
+msgid "Missing color name"
+msgstr "Mankas nomo de koloro"
+
+#: src/rcfile.c:709 src/rcfile.c:870
+msgid "Missing regex string"
+msgstr "Mankas regulesprima signoĉeno"
+
+#: src/rcfile.c:785
+msgid "\"start=\" requires a corresponding \"end=\""
+msgstr "\"start=\" bezonas paran \"end=\""
+
+#: src/rcfile.c:837
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr "Fona koloro \"%s\" ne povas esti hela"
+
+#: src/rcfile.c:865
+msgid "Cannot add a header regex without a syntax command"
+msgstr "Ne eblas aldoni regulesprimon por kaplinio sen komando 'syntax'"
+
+#: src/rcfile.c:921
+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:926
+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:990
+msgid "Missing linter command"
+msgstr "Mankas programnomo post 'linter'"
+
+#: src/rcfile.c:1010
+msgid "Cannot add formatter without a syntax command"
+msgstr "Ne eblas aldoni komandon por 'formatter' sen komando 'syntax'"
+
+#: src/rcfile.c:1015
+msgid "Missing formatter command"
+msgstr "Mankas programnomo post 'formatter'"
+
+#: src/rcfile.c:1045
+#, 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:1047
+#, 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:1108
+#, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "Ne troviĝas sintakso '%s' por pliampleksigi"
+
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
+#, c-format
+msgid "Command \"%s\" not allowed in included file"
+msgstr "Komando \"%s\" ne permesatas en inkluda dosiero"
+
+#: src/rcfile.c:1149 src/rcfile.c:1350
+#, c-format
+msgid "Syntax \"%s\" has no color commands"
+msgstr "Sintakso \"%s\" ne havas kolorajn komandojn"
+
+#: src/rcfile.c:1171
+#, c-format
+msgid "Command \"%s\" not understood"
+msgstr "Komando \"%s\" ne estas komprenata"
+
+#: src/rcfile.c:1186
+msgid "Missing option"
+msgstr "Mankas opcio"
+
+#: src/rcfile.c:1208
+#, c-format
+msgid "Option \"%s\" requires an argument"
+msgstr "Opcio \"%s\" bezonas argumenton"
+
+#: src/rcfile.c:1226
+msgid "Option is not a valid multibyte string"
+msgstr "Opcia argumento ne estas valida plurbitoka signoĉeno"
+
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
+msgid "Non-blank characters required"
+msgstr "Neblankaj signoj bezonatas"
+
+#: src/rcfile.c:1273
+msgid "Two single-column characters required"
+msgstr "Du unukolumnaj signoj bezonatas"
+
+#: src/rcfile.c:1339
+#, c-format
+msgid "Cannot unset option \"%s\""
+msgstr "Ne eblas malŝalti opcion \"%s\""
+
+#: src/rcfile.c:1345
+#, c-format
+msgid "Unknown option \"%s\""
+msgstr "Nekonata opcio \"%s\""
+
+#: src/rcfile.c:1404
+msgid "I can't find my home directory!  Wah!"
+msgstr "Malsukcesis trovi hejman dosierujon.  Ve!"
+
+#: src/rcfile.c:1442
+#, c-format
+msgid ""
+"\n"
+"Press Enter to continue starting nano.\n"
+msgstr ""
+"\n"
+"Premu \"Enter\" por daŭrigi la lanĉon de 'nano'.\n"
+
+#: src/search.c:96
+#, 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:184
+msgid " [Case Sensitive]"
+msgstr " [usklecdistinge]"
+
+#: src/search.c:188
+msgid " [Regexp]"
+msgstr " [regulesprime]"
+
+#: src/search.c:192
+msgid " [Backwards]"
+msgstr " [malantaŭen]"
+
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:197
+msgid " (to replace) in selection"
+msgstr " (por anstataŭigi) en markaĵo"
+
+#: src/search.c:199
+msgid " (to replace)"
+msgstr " (por anstataŭigi)"
+
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:769
+msgid "Replace this instance?"
+msgstr "Anstataŭigi ĉi tiun aperaĵon?"
+
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:945
+msgid "Replace with"
+msgstr "Anstataŭigi per"
+
+#: src/search.c:986
+#, c-format
+msgid "Replaced %lu occurrence"
+msgid_plural "Replaced %lu occurrences"
+msgstr[0] "Anstataŭiĝis %lu aperaĵo"
+msgstr[1] "Anstataŭiĝis %lu aperaĵoj"
+
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1027
+msgid "Enter line number, column number"
+msgstr "Enigu linionumeron, kolumnonumeron"
+
+#: src/search.c:1054
+msgid "Invalid line or column number"
+msgstr "Ne validas numero de linio aŭ kolumno"
+
+#: src/search.c:1207
+msgid "Not a bracket"
+msgstr "Ne estas krampo"
+
+#: src/search.c:1274
+msgid "No matching bracket"
+msgstr "Ne ekzistas para krampo"
+
+#: src/text.c:54
+msgid "Mark Set"
+msgstr "Markado enŝaltitas"
+
+#: src/text.c:58
+msgid "Mark Unset"
+msgstr "Malŝaltitas"
+
+#: src/text.c:439
+msgid "Nothing in undo buffer!"
+msgstr "Nenio por malfari!"
+
+#: src/text.c:445 src/text.c:590
+#, c-format
+msgid "Internal error: can't match line %d.  Please save your work."
+msgstr "**Programeraro**: ne eblas kongrui linion %d.  Konservu vian laboron."
+
+#: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
+msgid "text add"
+msgstr "teksta aldono"
+
+#: src/text.c:467 src/text.c:612
+msgid "text delete"
+msgstr "teksta forigo"
+
+#: src/text.c:491 src/text.c:641
+msgid "line join"
+msgstr "linikunigo"
+
+#: src/text.c:505 src/text.c:657
+msgid "text cut"
+msgstr "teksta eltondo"
+
+#: src/text.c:510 src/text.c:661
+msgid "text uncut"
+msgstr "teksta algluo"
+
+#: src/text.c:515 src/text.c:623
+msgid "line break"
+msgstr "linifaldo"
+
+#: src/text.c:528 src/text.c:672
+msgid "text insert"
+msgstr "teksta enmeto"
+
+#: src/text.c:549 src/text.c:665
+msgid "text replace"
+msgstr "teksta anstataŭigo"
+
+#: src/text.c:556 src/text.c:679 src/text.c:983
+msgid "Internal error: unknown type.  Please save your work."
+msgstr "**Programeraro**: nekonata tipo.  Konservu vian laboron."
+
+#: src/text.c:561
+#, c-format
+msgid "Undid action (%s)"
+msgstr "Malfariĝis ago (%s)"
+
+#: src/text.c:580
+msgid "Nothing to re-do!"
+msgstr "Nenio por refari!"
+
+#: src/text.c:584
+msgid "Internal error: cannot set up redo.  Please save your work."
+msgstr "**Programeraro**: ne eblas prepari refaron.  Konservu vian laboron."
+
+#: src/text.c:684
+#, c-format
+msgid "Redid action (%s)"
+msgstr "Refariĝis ago (%s)"
+
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
+msgid "Could not create pipe"
+msgstr "Malsukcesis krei dukton"
+
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
+msgid "Could not fork"
+msgstr "Malsukcesis krei novan procezon"
+
+#: src/text.c:969
+msgid "Internal error: cannot set up uncut.  Please save your work."
+msgstr "**Programeraro**: ne eblas prepari maltondon.  Konservu vian laboron."
+
+#: src/text.c:1806
+#, c-format
+msgid "Bad quote string %s: %s"
+msgstr "Signoĉeno de citiloj %s ne validas: %s"
+
+#: src/text.c:2207
+msgid "Can now UnJustify!"
+msgstr "Nun eblas malrektigi!"
+
+#: src/text.c:2404
+msgid "Edit a replacement"
+msgstr "Redakti anstataŭigon"
+
+#: src/text.c:2492
+msgid "Creating misspelled word list, please wait..."
+msgstr "Kreado de listo de misliterumataj vortoj; bonvolu atendi..."
+
+#: src/text.c:2584 src/text.c:3022
+msgid "Could not get size of pipe buffer"
+msgstr "Ne eblas scii grandon de dukta bufro"
+
+#: src/text.c:2635
+msgid "Error invoking \"spell\""
+msgstr "Eraro dum lanĉo de 'spell'"
+
+#: src/text.c:2638
+msgid "Error invoking \"sort -f\""
+msgstr "Eraro dum lanĉo de 'sort -f'"
+
+#: src/text.c:2641
+msgid "Error invoking \"uniq\""
+msgstr "Eraro dum lanĉo de 'uniq'"
+
+#: src/text.c:2696 src/text.c:2907
+msgid "Finished checking spelling"
+msgstr "Finiĝis literuma kontrolo"
+
+#: src/text.c:2759 src/text.c:3340
+#, c-format
+msgid "Error invoking \"%s\""
+msgstr "Eraro dum lanĉo de '%s'"
+
+#: src/text.c:2885
+msgid "Invoking spell checker, please wait"
+msgstr "Ekruliĝas literumilo; bonvolu atendi..."
+
+#: src/text.c:2902
+#, c-format
+msgid "Spell checking failed: %s"
+msgstr "Literuma kontrolo malsukcesis: %s"
+
+#: src/text.c:2904
+#, c-format
+msgid "Spell checking failed: %s: %s"
+msgstr "Literuma kontrolo malsukcesis: %s: %s"
+
+#: src/text.c:2937
+msgid "No linter defined for this type of file!"
+msgstr "Ne definiĝis sintaks-kontrolilo por ĉi tiu tipo de dosiero"
+
+#: src/text.c:2947
+msgid "Save modified buffer before linting?"
+msgstr "Ĉu konservi modifitan bufron antaŭ la kontrolo?"
+
+#: src/text.c:2969
+msgid "Invoking linter, please wait"
+msgstr "Ekruliĝas sintaks-kontrolilo; bonvolu atendi..."
+
+#: src/text.c:3125
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr "Riceviĝis nul analizeblaj linioj de la komando «%s»"
+
+#: src/text.c:3159
+#, 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?"
+
+# La sekvaj mesaĝoj komencas en traduko per minusklo,
+# ĉar ili estas komandlinia helpteksto, kaj tiel normalas.
+#: src/text.c:3205
+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:3210
+msgid "At first message"
+msgstr "Ĉi tiu estas la unua mesaĝo"
+
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr "Eraro: neniu 'formatter' definiĝis"
+
+#: src/text.c:3275
+msgid "Finished"
+msgstr "Pretas"
+
+#: src/text.c:3280
+msgid "Invoking formatter, please wait"
+msgstr "Ekruliĝas aranĝilo; bonvolu atendi..."
+
+#: src/text.c:3360
+msgid "Finished formatting"
+msgstr "Pretas la aranĝado"
+
+#: src/text.c:3438
+#, c-format
+msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
+msgstr "%sVortoj: %lu  Linioj: %ld  Literoj: %lu"
+
+#: src/text.c:3439
+msgid "In Selection:  "
+msgstr "En markaĵo:  "
+
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3453
+msgid "Verbatim Input"
+msgstr "Konforma enigo"
+
+#: src/utils.c:410 src/utils.c:422
+msgid "nano is out of memory!"
+msgstr "Mankas sufiĉa memoro por 'nano'!"
+
+#. TRANSLATORS: This is displayed during the input of a
+#. * six-digit hexadecimal Unicode character code.
+#: src/winio.c:1583
+msgid "Unicode Input"
+msgstr "Enigo de Unikodo"
+
+#: src/winio.c:2142 src/winio.c:2146
+msgid "Modified"
+msgstr "Ŝanĝita"
+
+#: src/winio.c:2143
+msgid "View"
+msgstr "Nur rigardi"
+
+#: src/winio.c:2157
+msgid "DIR:"
+msgstr "DOSIERUJO:"
+
+#: src/winio.c:2164
+msgid "File:"
+msgstr "Dosiero:"
+
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2261
+msgid ""
+"Warning: Modifying a file which is not locked, check directory permission?"
+msgstr ""
+"Averto: modifiĝas dosiero kiu ne rigliĝis; ĉu kontroli dosierujajn permesojn?"
+
+#: src/winio.c:3377
+#, 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:3507
+msgid "The nano text editor"
+msgstr "La tekstredaktilo 'nano'"
+
+#: src/winio.c:3508
+msgid "version"
+msgstr "versio"
+
+#: src/winio.c:3509
+msgid "Brought to you by:"
+msgstr "Prezentita al vi per:"
+
+#: src/winio.c:3510
+msgid "Special thanks to:"
+msgstr "Specialan dankon al:"
+
+#: src/winio.c:3511
+msgid "The Free Software Foundation"
+msgstr "la “Free Software Foundation”"
+
+#: src/winio.c:3512
+msgid "the many translators and the TP"
+msgstr "la multaj tradukantoj kaj la TP"
+
+#: src/winio.c:3513
+msgid "For ncurses:"
+msgstr "por 'ncurses':"
+
+#: src/winio.c:3514
+msgid "and anyone else we forgot..."
+msgstr "kaj iuj ajn kiujn ni forgesis..."
+
+#: src/winio.c:3515
+msgid "Thank you for using nano!"
+msgstr "Dankon pro via uzo de 'nano'!"
+
+#~ msgid "Internal error: can't match line %ld.  Please save your work."
+#~ msgstr ""
+#~ "**Programeraro**: ne eblas kongrui linion %ld.  Konservu vian laboron."
+
+#~ msgid " GNU nano version %s (compiled %s, %s)\n"
+#~ msgstr " GNU nano  versio %s  (kompilita %s, %s)\n"
+
+#~ msgid "line wrap"
+#~ msgstr "linifaldo"
+
+#~ msgid "Allow generic undo [EXPERIMENTAL]"
+#~ msgstr "ebligi ĝeneralan malfaron [PROVA]"
+
+#~ msgid "Insert File"
+#~ msgstr "Enmeti dosieron"
+
+#~ msgid "Go to previous screen"
+#~ msgstr "Iri al la supra paĝo"
+
+#~ msgid "Find Other Bracket"
+#~ msgstr "Al para krampo"
+
+#~ msgid "Long line wrapping"
+#~ msgstr "Faldi longajn liniojn"
+
+#~ msgid "Soft line wrapping"
+#~ msgstr "Ĉirkaŭfluo de longaj linioj"
+
+#~ msgid "(ignored, for Pico compatibility)"
+#~ msgstr "(ignoritaj, por kongruo kun 'Pico')"
+
+#~ msgid "Must specify menu to bind key to (or \"all\")"
+#~ msgstr "Mankas menuo (aŭ \"all\") al kiu ligi klavon"
+
+#~ msgid "Missing flag"
+#~ msgstr "Mankas flago"
+
+#~ msgid "Could not pipe"
+#~ msgstr "Malsukcesis krei dukton"
+
+#~ msgid "Error writing backup file %s: File owner mismatch"
+#~ msgstr "Eraro dum skribado de savkopio %s: alia posedanto"
diff --git a/po/es.gmo b/po/es.gmo
index 9df945b..5aa6fa6 100644
--- a/po/es.gmo
+++ b/po/es.gmo
diff --git a/po/es.po b/po/es.po
index 5214250..88dee0e 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,1011 +1,1089 @@
-# translation of nano-1.9.99pre0.es.po to Spanish
-# Mensajes en espa�ol para GNU nano.
-# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-# $Id: es.po,v 1.127 2002/10/26 19:56:43 jordi Exp $
+# Mensajes en español para GNU nano.
+# Copyright (C) 2015 Free Software Foundation, Inc.
+# This file is distributed under the same license as the nano package.
 #
 # Jordi Mallach <jordi@sindominio.net>, 2000, 2001, 2002.
-# Ricardo C�rdenes <ricardo@conysis.com>, 2002, 2003, 2004, 2005.
+# Ricardo Cárdenes <ricardo@conysis.com>, 2002, 2003, 2004, 2005.
 # Ricardo Javier Cardenes Medina <rcardenes@not.iac.es>, 2006.
+# Jorge González <aloriel@gmail.com>, 2013.
+# Benno Schulenberg <benno@vertaalt.nl>, 2015.
 msgid ""
 msgstr ""
-"Project-Id-Version: nano-1.9.99pre0\n"
+"Project-Id-Version: nano-2.3.99pre4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-22 06:34-0500\n"
-"PO-Revision-Date: 2006-08-30 23:38+0100\n"
-"Last-Translator: Ricardo Javier Cardenes Medina <rcardenes@not.iac.es>\n"
-"Language-Team: Spanish <es@li.org>\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
+"PO-Revision-Date: 2015-03-21 09:52+0100\n"
+"Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
+"Language-Team: Spanish <es@tp.org.es>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n!=1;\n"
-"X-Generator: KBabel 1.11.2\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Lokalize 1.0\n"
 
-# a un. sv
-#: src/browser.c:220
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:203
 msgid "Go To Directory"
-msgstr "Ir a un Directorio"
+msgstr "Ir a un directorio"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:860 src/files.c:2048
-#: src/nano.c:1060 src/search.c:220 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:246 src/browser.c:293
 #, c-format
 msgid "Can't go outside of %s in restricted mode"
 msgstr "No se puede ir fuera de %s en modo restringido"
 
-#: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:722
-#: src/files.c:731 src/files.c:1540 src/files.c:1659 src/files.c:1711
-#: src/files.c:1732 src/files.c:1855 src/files.c:2691 src/rcfile.c:568
-#: src/rcfile.c:1204
+#: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
+#: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
+#: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
-msgstr "Error leyendo '%s': %s"
+msgstr "Error leyendo «%s»: %s"
 
-# No se puede. sv
-#: src/browser.c:303
+#: src/browser.c:283
 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:665 src/browser.c:674
+#: src/browser.c:626 src/browser.c:635
 msgid "(dir)"
 msgstr "(dir)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:632
 msgid "(parent dir)"
 msgstr "(dir padre)"
 
-#: src/browser.c:801 src/search.c:185
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "Buscar"
 
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:805 src/search.c:189
-msgid " [Case Sensitive]"
-msgstr " [May�sc/Min�sc]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:811 src/search.c:195
-msgid " [Regexp]"
-msgstr " [ExpReg]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:817 src/search.c:201
-msgid " [Backwards]"
-msgstr " [Hacia Atr�s]"
-
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
-msgstr "B�squeda Recomenzada"
+msgstr "Búsqueda recomenzada"
 
-#: src/browser.c:1006 src/browser.c:1039 src/search.c:514 src/search.c:517
-#: src/search.c:574 src/search.c:577
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
-msgstr "�sta es la �nica coincidencia"
+msgstr "Ésta es la única coincidencia"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
-msgstr "No hay patr�n de b�squeda"
+msgstr "No hay patrón de búsqueda"
+
+#: src/files.c:139
+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:145
+#, 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:165 src/files.c:175 src/files.c:212 src/files.c:222
+#, c-format
+msgid "Error writing lock file %s: %s"
+msgstr "Error al escribir el fichero temporal «%s»: %s"
+
+#: src/files.c:237
+#, c-format
+msgid "Error deleting lock file %s: %s"
+msgstr "Error al eliminar el fichero de bloqueo «%s»: %s"
 
-# queda raro no usar ni "un" ni "el" antes de fichero. sv
-#: src/files.c:125
+#: src/files.c:272
+#, c-format
+msgid "Error opening lock file %s: %s"
+msgstr "Error al abrir el fichero de bloqueo «%s»: %s"
+
+#: src/files.c:282
+#, c-format
+msgid "Error reading lock file %s: Not enough data read"
+msgstr ""
+"Error al leer el fichero de bloqueo «%s»: se han leído insuficientes datos"
+
+#. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
+#: src/files.c:297
+#, 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:308
+#, c-format
+msgid "Error writing lock file: Directory '%s' doesn't exist"
+msgstr "Error al escribir el fichero de bloqueo: directorio «%s» no existe"
+
+#: src/files.c:339
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "No se puede insertar un fichero desde fuera de %s"
 
-#: src/files.c:234
+#: src/files.c:467
 msgid "No more open file buffers"
-msgstr "No hay m�s ficheros abiertos"
+msgstr "No hay más ficheros abiertos"
 
-#: src/files.c:250
+#: src/files.c:484
 #, c-format
 msgid "Switched to %s"
 msgstr "Se ha cambiado a %s"
 
-#: src/files.c:251 src/global.c:469 src/winio.c:2168
+#: src/files.c:485 src/global.c:953 src/winio.c:2161
 msgid "New Buffer"
-msgstr "Nuevo B�fer"
+msgstr "Búfer nuevo"
 
-#: src/files.c:633
+#: src/files.c:874
 #, 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)"
+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:638
-#, fuzzy, c-format
+#: src/files.c:879
+#, 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)"
-msgstr[1] "%lu l�neas le�das (convertidas desde formatos DOS y Mac)"
+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:644
+#: src/files.c:885
 #, 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)"
+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:648
-#, fuzzy, c-format
+#: src/files.c:889
+#, 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)"
-msgstr[1] "%lu l�neas le�das (convertidas desde formato Mac)"
+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:654
+#: src/files.c:895
 #, 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)"
+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:658
-#, fuzzy, c-format
+#: src/files.c:899
+#, 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)"
-msgstr[1] "%lu l�neas le�das (convertidas desde formato DOS)"
+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:664
+#: src/files.c:905
 #, 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"
+msgstr[0] "%lu línea leída"
+msgstr[1] "%lu líneas leídas"
 
-#: src/files.c:667
+#: src/files.c:908
 #, c-format
 msgid "Read %lu line ( Warning: No write permission)"
 msgid_plural "Read %lu lines (Warning: No write permission)"
-msgstr[0] ""
-msgstr[1] ""
+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:700 src/files.c:736
+#: src/files.c:943 src/files.c:980
 msgid "Reading File"
-msgstr "Leyendo Fichero"
+msgstr "Leyendo fichero"
 
-#: src/files.c:706
+#: src/files.c:950
 msgid "New File"
-msgstr "Nuevo Fichero"
+msgstr "Nuevo fichero"
 
-#: src/files.c:709
+#: src/files.c:953
 #, c-format
 msgid "\"%s\" not found"
-msgstr "\"%s\" no encontrado"
+msgstr "No se encontró «%s»"
 
-# Aqu� pegar�a poner "El fichero...", como en el mensaje siguiente. sv
-#: src/files.c:717 src/rcfile.c:559 src/rcfile.c:1154 src/rcfile.c:1195
+# Aquí pegaría poner "El fichero...", como en el mensaje siguiente. sv
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
-msgstr "El fichero \"%s\" es un directorio"
+msgstr "«%s» es un directorio"
 
-#: src/files.c:718 src/rcfile.c:560 src/rcfile.c:1155 src/rcfile.c:1196
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
-msgstr "El fichero \"%s\" es un dispositivo"
+msgstr "«%s» es un fichero de dispositivo"
 
-#: src/files.c:817
+#: src/files.c:1060
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
-msgstr "Orden a ejecutar en el nuevo b�fer [desde %s] "
+msgstr "Comando que ejecutar en el nuevo búfer [desde %s] "
 
-#: src/files.c:819
+#: src/files.c:1062
 #, c-format
 msgid "Command to execute [from %s] "
-msgstr "Orden a ejecutar [desde %s]"
+msgstr "Comando que ejecutar [desde %s]"
 
-#: src/files.c:825
+#: src/files.c:1069
 #, c-format
 msgid "File to insert into new buffer [from %s] "
-msgstr "Fichero a insertar en el nuevo b�fer [desde %s] "
+msgstr "Fichero que insertar en el nuevo búfer [desde %s] "
 
-#: src/files.c:827
+#: src/files.c:1071
 #, c-format
 msgid "File to insert [from %s] "
-msgstr "Fichero a insertar [desde %s] "
+msgstr "Fichero que insertar [desde %s] "
 
-#: src/files.c:1077
+#: src/files.c:1320
 msgid "Key invalid in non-multibuffer mode"
-msgstr "Tecla ilegal en modo no-multibuffer"
+msgstr "Tecla ilegal en modo no-multibúfer"
+
+#: src/files.c:1622
+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:1486
+#: src/files.c:1746
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "No se puede escribir fuera de %s"
 
-#: src/files.c:1501
+#: src/files.c:1761
 msgid "Cannot prepend or append to a symlink with --nofollow set"
 msgstr ""
-"No puedo a�adir al principio o final a un enlace simb�lico con --nofollow "
+"No se pudo añadir al principio o final a un enlace simbólico con --nofollow "
 "activo"
 
-#: src/files.c:1581 src/files.c:1603 src/files.c:1621 src/files.c:1632
-#: src/files.c:1640 src/files.c:1667
-#, fuzzy, c-format
+#: src/files.c:1843 src/files.c:1868 src/files.c:1886 src/files.c:1899
+#: src/files.c:1910 src/files.c:1939
+#, c-format
 msgid "Error writing backup file %s: %s"
-msgstr "Error escribiendo en fichero temporal: %s"
+msgstr "Error al escribir el fichero de respaldo «%s»: %s"
 
-#: src/files.c:1582 src/nano.c:701
+#: src/files.c:1844 src/nano.c:719
 msgid "Too many backup files?"
-msgstr "Demasiados ficheros de respaldo?"
+msgstr "¿Demasiados ficheros de respaldo?"
 
-#: src/files.c:1687 src/files.c:1744 src/files.c:1763 src/files.c:1775
-#: src/files.c:1799 src/files.c:1817 src/files.c:1827 src/files.c:1863
-#: src/files.c:1868 src/files.c:2764 src/files.c:2773
+#: src/files.c:1959 src/files.c:2016 src/files.c:2035 src/files.c:2047
+#: src/files.c:2071 src/files.c:2089 src/files.c:2099 src/files.c:2135
+#: src/files.c:2140 src/files.c:3101 src/files.c:3110 src/files.c:3133
+#: src/files.c:3145
 #, c-format
 msgid "Error writing %s: %s"
-msgstr "Error guardando '%s': %s"
+msgstr "Error al escirbir «%s»: %s"
 
-#: src/files.c:1721 src/text.c:2929 src/text.c:2941
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
-msgstr "Error escribiendo en fichero temporal: %s"
+msgstr "Error al escribir en el fichero temporal: %s"
 
-#: src/files.c:1900
+#: src/files.c:2173
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
-msgstr[0] "Escrita l�nea %lu"
-msgstr[1] "%lu l�neas escritas"
+msgstr[0] "%lu línea escrita"
+msgstr[1] "%lu líneas escritas"
 
-#: src/files.c:2004
+#: src/files.c:2278
 msgid " [DOS Format]"
 msgstr " [Formato DOS]"
 
-#: src/files.c:2005
+#: src/files.c:2279
 msgid " [Mac Format]"
 msgstr " [Formato Mac]"
 
-#: src/files.c:2007
+#: src/files.c:2281
 msgid " [Backup]"
 msgstr " [Respaldo]"
 
-# Como antes, me suena raro que antes de Fichero no haya "un" o "el". sv
-#: src/files.c:2015
+#: src/files.c:2289
 msgid "Prepend Selection to File"
-msgstr "Anteponer selecci�n al fichero"
+msgstr "Anteponer selección al fichero"
 
-#: src/files.c:2016
+#: src/files.c:2290
 msgid "Append Selection to File"
-msgstr "A�adir selecci�n al fichero"
+msgstr "Añadir selección al fichero"
 
-# a el -> al. jm
-#: src/files.c:2017
+#: src/files.c:2291
 msgid "Write Selection to File"
-msgstr "Escribir selecci�n al fichero"
+msgstr "Escribir selección al fichero"
 
-# de -> del. sv
-#: src/files.c:2020
+#: src/files.c:2294
 msgid "File Name to Prepend to"
 msgstr "Nombre del fichero al que anteponer"
 
-# de -> del. sv
-#: src/files.c:2021
+#: src/files.c:2295
 msgid "File Name to Append to"
-msgstr "Nombre del fichero al que a�adir"
+msgstr "Nombre del fichero al que añadir"
 
-# �dem. sv
-#: src/files.c:2022
+#: src/files.c:2296
 msgid "File Name to Write"
 msgstr "Nombre del fichero a escribir"
 
-#: src/files.c:2153
+#: src/files.c:2427
 msgid "File exists, OVERWRITE ? "
-msgstr "El fichero existe, � SOBREESCRIBIR ?"
+msgstr "El fichero existe, ¿SOBREESCRIBIR?"
 
-#: src/files.c:2162
+#: src/files.c:2436
 msgid "Save file under DIFFERENT NAME ? "
-msgstr "� Guardar el fichero con un NOMBRE DIFERENTE ? "
+msgstr "¿Guardar el fichero con un NOMBRE DIFERENTE?"
 
-#: src/files.c:2173
+#: src/files.c:2450
 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:2611
+#: src/files.c:2882
 msgid "(more)"
-msgstr "(m�s)"
+msgstr "(más)"
 
-#: src/files.c:2694 src/rcfile.c:1220
+#: src/files.c:2974
 #, c-format
 msgid ""
 "\n"
-"Press Enter to continue starting nano.\n"
+"Press Enter to continue\n"
 msgstr ""
 "\n"
-"Pulsa intro para continuar iniciando nano\n"
+"Pulse Intro para continuar\n"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:415 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: src/global.c:416
-msgid "Replace"
-msgstr "Reemplazar"
+#: src/files.c:2989
+#, c-format
+msgid ""
+"Unable to create directory %s: %s\n"
+"It is required for saving/loading search history or cursor positions.\n"
+msgstr ""
+"No se puede crear el directorio «%s»: %s\n"
+"Se necesita para guardar/cargar el histórico de búsquedas o la posición del "
+"cursor.\n"
 
-#: src/global.c:417
-msgid "No Replace"
-msgstr "No sustituir"
+#: src/files.c:2995
+#, 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 ""
+"La ruta «%s» no es un directorio y debe serlo.\n"
+"Nano no podrá cargar ni guardar el histórico de búsquedas ni las posiciones "
+"del cursor.\n"
 
-#: src/global.c:420
-msgid "Case Sens"
-msgstr "May/Min"
+#: src/files.c:3012
+#, 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 ""
+"Se detectó un antiguo fichero de histórico de nano (%s) que se intentó "
+"mover\n"
+"a la ubicación preferida (%s) pero se encontró un error: %s"
 
-#: src/global.c:421
-msgid "Backwards"
-msgstr "Hacia Atr�s"
+#: src/files.c:3016
+#, 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 ""
+"Se detectó un antiguo fichero de histórico de nano (%s) que se movió\n"
+"a la ubicación preferida (%s).\n"
+"(Consulte las P+F de nano acerca de este cambio.)"
 
-#: src/global.c:425
-msgid "Regexp"
-msgstr "ExpReg"
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
+#: src/global.c:477
+msgid "Exit"
+msgstr "Salir"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:451
-msgid "PrevHstory"
-msgstr "Hist�ricoPrev"
+#: src/global.c:478
+msgid "Close"
+msgstr "Cerrar"
 
-#: src/global.c:452
-msgid "NextHstory"
-msgstr "HistSig"
+#: src/global.c:479
+msgid "Uncut Text"
+msgstr "Pegar texto"
 
-#: src/global.c:453
-msgid "Go To Text"
-msgstr "Ir a texto"
+#: src/global.c:481
+msgid "Unjustify"
+msgstr "Desjustificar"
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:455
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:485
 msgid "WhereIs Next"
-msgstr "D�ndeEst� Sig"
+msgstr "Siguiente"
 
-#: src/global.c:457
-msgid "First File"
-msgstr "Primer Fich"
-
-#: src/global.c:458
-msgid "Last File"
-msgstr "�ltimo Fich"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:460
-msgid "To Files"
-msgstr "A ficheros"
-
-#: src/global.c:462
-msgid "DOS Format"
-msgstr "Formato DOS"
-
-#: src/global.c:463
-msgid "Mac Format"
-msgstr "Formato Mac"
-
-#: src/global.c:464
-msgid "Append"
-msgstr "A�adir"
-
-#: src/global.c:465
-msgid "Prepend"
-msgstr "Anteponer"
-
-#: src/global.c:466
-msgid "Backup File"
-msgstr "Respaldar fich"
-
-#: src/global.c:467
-msgid "Execute Command"
-msgstr "Ejecutar orden"
-
-# a un. sv
-#: src/global.c:471
-msgid "Go To Dir"
-msgstr "Ir a un dir"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:480
-msgid "Get Help"
-msgstr "Ver ayuda"
-
-#: src/global.c:481
-msgid "Exit"
-msgstr "Salir"
-
-#: src/global.c:482
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:492
 msgid "Where Is"
 msgstr "Buscar"
 
-#: src/global.c:483
-msgid "Prev Page"
-msgstr "P�g Ant"
-
-#: src/global.c:484
-msgid "Next Page"
-msgstr "P�g Sig"
-
-#: src/global.c:485
-msgid "First Line"
-msgstr "Prim. l�n."
+#: src/global.c:493
+msgid "Replace"
+msgstr "Reemplazar"
 
-#: src/global.c:486
-msgid "Last Line"
-msgstr "�ltima l�nea"
+#: src/global.c:494
+msgid "Go To Line"
+msgstr "Ir a línea"
 
-#: src/global.c:487
-#, fuzzy
-msgid "Suspend"
-msgstr "Suspensi�n"
+#: src/global.c:495
+msgid "Prev Line"
+msgstr "Línea anterior"
 
-#: src/global.c:489
-msgid "Beg of Par"
-msgstr "Ini de P�r"
+#: src/global.c:496
+msgid "Next Line"
+msgstr "Línea siguiente"
 
-#: src/global.c:490
-msgid "End of Par"
-msgstr "Fin de P�r"
+#: src/global.c:497
+msgid "Read File"
+msgstr "Leer fichero"
 
-#: src/global.c:491
+#: src/global.c:499
 msgid "FullJstify"
 msgstr "JustifTodo"
 
-#: src/global.c:493
+#: src/global.c:501
 msgid "Refresh"
-msgstr "Refrescar"
-
-#: src/global.c:495
-msgid "Insert File"
-msgstr "Inserte fichero"
-
-#: src/global.c:497
-msgid "Go To Line"
-msgstr "Ir a L�nea"
-
-#: src/global.c:500
-msgid "Justify the current paragraph"
-msgstr "Justificar el p�rrafo actual"
+msgstr "Actualizar"
 
 #. 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:505
+#: src/global.c:507
+msgid "Justify the current paragraph"
+msgstr "Justificar el párrafo actual"
+
+#: src/global.c:509
 msgid "Cancel the current function"
-msgstr "Cancelar la funci�n actual"
+msgstr "Cancelar la función actual"
 
-#: src/global.c:506
+#: src/global.c:510
 msgid "Display this help text"
 msgstr "Mostrar esta ayuda"
 
-#: src/global.c:509
+#: src/global.c:513
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Cerrar el fichero mostrado / Salir de nano"
 
-#: src/global.c:511
+#: src/global.c:515
 msgid "Exit from nano"
 msgstr "Salir de nano"
 
-#: src/global.c:515
+#: src/global.c:519
 msgid "Write the current file to disk"
 msgstr "Escribir el fichero actual a disco"
 
-#: src/global.c:517
+#: src/global.c:521
 msgid "Insert another file into the current one"
 msgstr "Insertar otro fichero en el actual"
 
-#: src/global.c:519
+#: src/global.c:523
 msgid "Search for a string or a regular expression"
-msgstr "Buscar una cadena o expresi�n regular"
+msgstr "Buscar una cadena o expresión regular"
 
-#: src/global.c:520
-#, fuzzy
-msgid "Go to previous screen"
-msgstr "Moverse a la p�gina anterior"
+#: src/global.c:526
+msgid "Search for a string"
+msgstr "Buscar una cadena"
 
-#: src/global.c:521
-#, fuzzy
-msgid "Go to next screen"
-msgstr "Moverse a la p�gina siguiente"
+#: src/global.c:528
+msgid "Go one screenful up"
+msgstr "Ir a la pantalla anterior"
 
-#: src/global.c:523
+#: src/global.c:529
+msgid "Go one screenful down"
+msgstr "Ir a la siguiente pantalla"
+
+#: src/global.c:531
 msgid "Cut the current line and store it in the cutbuffer"
-msgstr "Cortar la l�nea actual y guardarla en el cutbuffer"
+msgstr "Cortar la línea actual y guardarla en el cutbuffer"
 
-#: src/global.c:525
+#: src/global.c:533
 msgid "Uncut from the cutbuffer into the current line"
-msgstr "Pegar el cutbuffer en la l�nea actual"
+msgstr "Pegar el cutbuffer en la línea actual"
 
-#: src/global.c:527
+#: src/global.c:534
 msgid "Display the position of the cursor"
-msgstr "Mostrar la posici�n del cursor"
+msgstr "Mostrar la posición del cursor"
 
-#: src/global.c:529
+#: src/global.c:536
 msgid "Invoke the spell checker, if available"
-msgstr "Invocar el corrector ortogr�fico (si est� disponible)"
+msgstr "Invocar el corrector ortográfico (si está disponible)"
 
-#: src/global.c:531
+#: src/global.c:538
 msgid "Replace a string or a regular expression"
-msgstr "Reemplazar una cadena o expresi�n regular"
+msgstr "Reemplazar una cadena o expresión regular"
 
-#: src/global.c:532
+#: src/global.c:539
 msgid "Go to line and column number"
-msgstr "Ir a una l�nea y columna"
+msgstr "Ir a una línea y columna"
 
-#: src/global.c:534
-msgid "Mark text at the cursor position"
-msgstr "Marcar texto en la posici�n actual del cursor"
+#: src/global.c:541
+msgid "Mark text starting from the cursor position"
+msgstr "Marcar texto desde la posición actual del cursor"
 
-#: src/global.c:535
-msgid "Repeat last search"
-msgstr "Repetir la �ltima b�squeda"
+#: src/global.c:542
+msgid "Repeat the last search"
+msgstr "Repetir la última búsqueda"
 
-#: src/global.c:537
+#: src/global.c:544
 msgid "Copy the current line and store it in the cutbuffer"
-msgstr "Copiar la l�nea actual y guardarla en el cutbuffer"
+msgstr "Copiar la línea actual y guardarla en el cutbuffer"
 
-#: src/global.c:538
+#: src/global.c:545
 msgid "Indent the current line"
-msgstr "Sangrar la l�nea actual"
+msgstr "Sangrar la línea actual"
 
-#: src/global.c:539
+#: src/global.c:546
 msgid "Unindent the current line"
-msgstr "Quitar sangrado a la l�nea actual"
+msgstr "Quitar sangrado a la línea actual"
 
-#: src/global.c:540
+#: src/global.c:547
 msgid "Undo the last operation"
-msgstr ""
+msgstr "Deshacer la última operación"
 
-#: src/global.c:541
+#: src/global.c:548
 msgid "Redo the last undone operation"
-msgstr ""
+msgstr "Rehacer la última operación deshecha"
 
-#: src/global.c:543
-#, fuzzy
+#: src/global.c:550
 msgid "Go forward one character"
-msgstr "Moverse hacia adelante un car�cter"
+msgstr "Ir hacia adelante un carácter"
 
-#: src/global.c:544
-#, fuzzy
+#: src/global.c:551
 msgid "Go back one character"
-msgstr "Moverse hacia atr�s un car�cter"
+msgstr "Ir hacia atrás un carácter"
 
-#: src/global.c:546
-#, fuzzy
+#: src/global.c:553
 msgid "Go forward one word"
-msgstr "Moverse hacia adelante una palabra"
+msgstr "Ir hacia adelante una palabra"
 
-#: src/global.c:547
-#, fuzzy
+#: src/global.c:554
 msgid "Go back one word"
-msgstr "Moverse una palabra atr�s"
+msgstr "Ir hacia atrás una palabra"
 
-#: src/global.c:549
-#, fuzzy
+#: src/global.c:556
 msgid "Go to previous line"
-msgstr "Moverse a la l�nea anterior"
+msgstr "Ir a la línea anterior"
 
-#: src/global.c:550
-#, fuzzy
+#: src/global.c:557
 msgid "Go to next line"
-msgstr "Moverse a la l�nea siguiente"
+msgstr "Ir a la siguiente línea"
 
-#: src/global.c:551
-#, fuzzy
+#: src/global.c:558
 msgid "Go to beginning of current line"
-msgstr "Moverse al principio de la l�nea actual"
+msgstr "Ir al principio de la línea actual"
 
-#: src/global.c:552
-#, fuzzy
+#: src/global.c:559
 msgid "Go to end of current line"
-msgstr "Moverse al final de la l�nea actual"
+msgstr "Ir al final de la línea actual"
 
-#: src/global.c:555
-#, fuzzy
+#: src/global.c:562
 msgid "Go to beginning of paragraph; then of previous paragraph"
-msgstr "Moverse al principio del p�rrafo actual"
+msgstr "Ir al principio del párrafo; después al del párrafo anterior"
 
-#: src/global.c:557
-#, fuzzy
+#: src/global.c:564
 msgid "Go just beyond end of paragraph; then of next paragraph"
-msgstr "Moverse al final del p�rrafo actual"
+msgstr "Ir al final del párrafo; después al del párrafo siguiente"
 
-#: src/global.c:560
-#, fuzzy
+#: src/global.c:566
 msgid "Go to the first line of the file"
-msgstr "Mover a la primera l�nea del fichero"
+msgstr "Ir a la primera línea del fichero"
 
-#: src/global.c:562
-#, fuzzy
+#: src/global.c:567
 msgid "Go to the last line of the file"
-msgstr "Mover a la �ltima l�nea del fichero"
+msgstr "Ir a la última línea del fichero"
 
-#: src/global.c:564
-#, fuzzy
+#: src/global.c:569
 msgid "Go to the matching bracket"
-msgstr "Mover a la llave correspondiente"
+msgstr "Ir a la llave correspondiente"
 
-#: src/global.c:566
+#: src/global.c:571
 msgid "Scroll up one line without scrolling the cursor"
-msgstr "Desplazar el texto una l�nea arriba sin mover el cursor"
+msgstr "Desplazar el texto una línea arriba sin mover el cursor"
 
-#: src/global.c:568
+#: src/global.c:573
 msgid "Scroll down one line without scrolling the cursor"
-msgstr "Desplazar el texto una l�nea abajo sin mover el cursor"
+msgstr "Desplazar el texto una línea abajo sin mover el cursor"
 
-#: src/global.c:572
+#: src/global.c:576
 msgid "Switch to the previous file buffer"
-msgstr "Cambiar al b�fer de fichero anterior"
+msgstr "Cambiar al búfer de fichero anterior"
 
-#: src/global.c:574
+#: src/global.c:577
 msgid "Switch to the next file buffer"
-msgstr "Cambiar al siguiente b�fer de fichero"
+msgstr "Cambiar al siguiente búfer de fichero"
 
-#: src/global.c:577
+#: src/global.c:579
 msgid "Insert the next keystroke verbatim"
-msgstr "Insertar la pr�xima pulsaci�n literalmente"
+msgstr "Insertar la próxima pulsación literalmente"
 
-#: src/global.c:579
+#: src/global.c:580
 msgid "Insert a tab at the cursor position"
-msgstr "Insertar un car�cter de tabulaci�n en la posici�n del cursor"
+msgstr "Insertar un carácter de tabulación en la posición del cursor"
 
 #: src/global.c:581
 msgid "Insert a newline at the cursor position"
-msgstr "Insertar un retorno de carro en la posici�n del cursor"
+msgstr "Insertar un retorno de carro en la posición del cursor"
 
-#: src/global.c:583
+#: src/global.c:582
 msgid "Delete the character under the cursor"
-msgstr "Borrar el car�cter bajo el cursor"
+msgstr "Borrar el carácter bajo el cursor"
 
-#: src/global.c:585
+#: src/global.c:584
 msgid "Delete the character to the left of the cursor"
-msgstr "Borrar el car�cter a la izquierda del cursor"
+msgstr "Borrar el carácter a la izquierda del cursor"
 
-#: src/global.c:588
+#: src/global.c:587
 msgid "Cut from the cursor position to the end of the file"
-msgstr "Cortar desde el cursor hasta el final de l�nea"
+msgstr "Cortar desde el cursor hasta el final de línea"
 
-#: src/global.c:591
+#: src/global.c:590
 msgid "Justify the entire file"
 msgstr "Justificar el fichero completo"
 
-#: src/global.c:595
+#: src/global.c:594
 msgid "Count the number of words, lines, and characters"
-msgstr "Contar el n�mero de palabras, l�neas y caracteres"
+msgstr "Contar el número de palabras, líneas y caracteres"
 
-#: src/global.c:598
+#: src/global.c:597
 msgid "Refresh (redraw) the current screen"
 msgstr "Redibujar la pantalla actual"
 
-#: src/global.c:600
+#: src/global.c:599
 msgid "Suspend the editor (if suspend is enabled)"
-msgstr ""
+msgstr "Suspender el editor (si suspender está activado)"
 
-#: src/global.c:603
+#: src/global.c:602
 msgid "Toggle the case sensitivity of the search"
-msgstr "Cambiar la importancia de may�s./min�s. en la b�squeda"
+msgstr "Cambiar la importancia de mayús./minús. en la búsqueda"
 
-#: src/global.c:605
+#: src/global.c:604
 msgid "Reverse the direction of the search"
-msgstr "Cambiar la direcci�n de b�squeda"
+msgstr "Cambiar la dirección de búsqueda"
 
-#: src/global.c:609
+#: src/global.c:608
 msgid "Toggle the use of regular expressions"
 msgstr "Cambiar el uso de expresiones regulares"
 
-#: src/global.c:613
+#: src/global.c:612
 msgid "Recall the previous search/replace string"
-msgstr "Recupera la cadena previa de b�squeda/reemplazo"
+msgstr "Recuperar la cadena previa de búsqueda/reemplazo"
 
-#: src/global.c:615
+#: src/global.c:614
 msgid "Recall the next search/replace string"
-msgstr "Recupera la siguiente cadena de b�squeda/reemplazo"
+msgstr "Recuperar la siguiente cadena de búsqueda/reemplazo"
 
-#: src/global.c:618
+#: src/global.c:617
 msgid "Go to file browser"
 msgstr "Ir al navegador de ficheros"
 
-#: src/global.c:621
+#: src/global.c:620
 msgid "Toggle the use of DOS format"
-msgstr "Conmuta el uso de formato DOS"
+msgstr "Conmutar el uso de formato DOS"
 
-#: src/global.c:622
+#: src/global.c:621
 msgid "Toggle the use of Mac format"
-msgstr "Conmuta el uso de formato Mac"
+msgstr "Conmutar el uso de formato Mac"
 
-#: src/global.c:624
+#: src/global.c:622
 msgid "Toggle appending"
-msgstr "Conmuta a�adir texto"
+msgstr "Conmutar el añadir texto"
 
-#: src/global.c:625
+#: src/global.c:623
 msgid "Toggle prepending"
-msgstr "Conmuta prefijar texto"
+msgstr "Conmutar el prefijar texto"
 
-#: src/global.c:628
+#: src/global.c:624
 msgid "Toggle backing up of the original file"
-msgstr "Conmuta creaci�n de ficheros de respaldo"
+msgstr "Conmutar la creación de ficheros de respaldo"
 
-#: src/global.c:629
+#: src/global.c:625
 msgid "Execute external command"
-msgstr "Ejecutar orden externa"
+msgstr "Ejecutar una orden externa"
 
-# �dem de �dem. Te dejo que revises los que siguen.
-#: src/global.c:633
+#: src/global.c:628
 msgid "Toggle the use of a new buffer"
-msgstr "Conmuta el uso de nuevo b�fer"
+msgstr "Conmutar el uso de nuevo búfer"
 
-#: src/global.c:636
+#: src/global.c:631
 msgid "Exit from the file browser"
 msgstr "Salir del navegador de ficheros"
 
-#: src/global.c:638
+#: src/global.c:632
 msgid "Go to the first file in the list"
 msgstr "Ir al primer fichero de la lista"
 
-#: src/global.c:640
+#: src/global.c:633
 msgid "Go to the last file in the list"
-msgstr "Ir al �ltimo fichero de la lista"
+msgstr "Ir al último fichero de la lista"
 
-#: src/global.c:641
-#, fuzzy
+#: src/global.c:634
+msgid "Go to the previous file in the list"
+msgstr "Ir al fichero anterior en la lista"
+
+#: src/global.c:635
 msgid "Go to the next file in the list"
-msgstr "Ir al �ltimo fichero de la lista"
+msgstr "Ir al siguiente fichero en la lista"
+
+#: src/global.c:636
+msgid "Go to directory"
+msgstr "Ir a un directorio"
+
+#: src/global.c:639
+msgid "Invoke the linter, if available"
+msgstr "Invocar el corrector de sintaxis (si está disponible)"
+
+#: src/global.c:640
+msgid "Go to previous linter msg"
+msgstr "Ir al mensaje anterior del corrector"
+
+#: src/global.c:641
+msgid "Go to next linter msg"
+msgstr "Ir al siguiente mensaje del corrector"
 
 #: src/global.c:642
-#, fuzzy
-msgid "Go to the previous file in the list"
-msgstr "Ir al primer fichero de la lista"
+msgid "Invoke formatter, if available"
+msgstr "Invocar el arreglador (si está disponible)"
 
-# a un. sv
-#: src/global.c:643
-msgid "Go to directory"
-msgstr "Ir a un Directorio"
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:662
+msgid "Get Help"
+msgstr "Ver ayuda"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:670
-msgid "Close"
-msgstr "Cerrar"
+#: src/global.c:665 src/prompt.c:1084
+msgid "Cancel"
+msgstr "Cancelar"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:679
-msgid "WriteOut"
+#: src/global.c:678
+msgid "Write Out"
 msgstr "Guardar"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:704
+msgid "Go To Dir"
+msgstr "A un directorio"
+
+#: src/global.c:719
+msgid "Cut Text"
+msgstr "Cortar texto"
+
+#: src/global.c:728
 msgid "Justify"
 msgstr "Justificar"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:696
-msgid "Read File"
-msgstr "Leer Fich"
+#: src/global.c:733
+msgid "To Spell"
+msgstr "Ortografía"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:713
-msgid "Cut Text"
-msgstr "CortarTxt"
+#: src/global.c:738
+msgid "To Linter"
+msgstr "Corrector"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:718
-msgid "UnJustify"
-msgstr "Desjustificar"
+#: src/global.c:740
+msgid "Formatter"
+msgstr "Arreglador"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:723
-msgid "UnCut Text"
-msgstr "PegarTxt"
+#: src/global.c:745
+msgid "Case Sens"
+msgstr "Mayús/minús"
+
+#: src/global.c:750
+msgid "Regexp"
+msgstr "Exp. regular"
+
+#: src/global.c:755
+msgid "Backwards"
+msgstr "Hacia atrás"
+
+#: src/global.c:762
+msgid "No Replace"
+msgstr "No sustituir"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:728 src/global.c:755
+#: src/global.c:770
 msgid "Cur Pos"
-msgstr "Pos actual"
+msgstr "Posición"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:737
-msgid "To Spell"
-msgstr "Ortograf�a"
+#: src/global.c:780
+msgid "Prev Page"
+msgstr "Página ant."
+
+#: src/global.c:782
+msgid "Next Page"
+msgstr "Página sig."
+
+#: src/global.c:785
+msgid "First Line"
+msgstr "Primera línea"
 
-#: src/global.c:771
+#: src/global.c:787
+msgid "Last Line"
+msgstr "Última línea"
+
+#: src/global.c:794
+msgid "To Bracket"
+msgstr "A llave"
+
+#: src/global.c:797
 msgid "Mark Text"
-msgstr "MarcarTxt"
+msgstr "Marcar texto"
 
-#: src/global.c:777
+#: src/global.c:800
 msgid "Copy Text"
-msgstr "CopiarTxt"
+msgstr "Copiar texto"
 
-#: src/global.c:780
+#: src/global.c:803
 msgid "Indent Text"
-msgstr "SangrarTxt"
+msgstr "Sangrar texto"
 
-#: src/global.c:783
+#: src/global.c:805
 msgid "Unindent Text"
-msgstr "DesangrarTxt"
+msgstr "Desangrar texto"
 
-#: src/global.c:787
+#: src/global.c:808
 msgid "Undo"
-msgstr ""
+msgstr "Deshacer"
 
-#: src/global.c:790
+#: src/global.c:810
 msgid "Redo"
-msgstr ""
+msgstr "Rehacer"
 
-#: src/global.c:796 src/global.c:800
-msgid "Forward"
-msgstr "Adelante"
-
-#: src/global.c:806 src/global.c:810
+#: src/global.c:814 src/global.c:820
 msgid "Back"
-msgstr "Atr�s"
+msgstr "Atrás"
 
-#: src/global.c:817
-msgid "Next Word"
-msgstr "Palabra siguiente"
+#: src/global.c:816 src/global.c:822
+msgid "Forward"
+msgstr "Adelante"
 
-#: src/global.c:820
+#: src/global.c:827
 msgid "Prev Word"
 msgstr "Palabra anterior"
 
-#: src/global.c:824
-msgid "Prev Line"
-msgstr "L�nea Ant"
-
-#: src/global.c:827
-msgid "Next Line"
-msgstr "L�nea siguiente"
+#: src/global.c:829
+msgid "Next Word"
+msgstr "Palabra siguiente"
 
-#: src/global.c:830
+#: src/global.c:833
 msgid "Home"
 msgstr "Inicio"
 
-#: src/global.c:833
+#: src/global.c:835
 msgid "End"
 msgstr "Fin"
 
-#: src/global.c:845
-msgid "Find Other Bracket"
-msgstr "Buscar la otra llave"
+#: src/global.c:844
+msgid "Beg of Par"
+msgstr "Ini de pár."
 
-#: src/global.c:848
-msgid "Scroll Up"
-msgstr "DesplArriba"
+#: src/global.c:846
+msgid "End of Par"
+msgstr "Fin de pár."
 
 #: src/global.c:851
+msgid "Scroll Up"
+msgstr "Despl arriba"
+
+#: src/global.c:853
 msgid "Scroll Down"
-msgstr "DesplAbajo"
+msgstr "Despl abajo"
 
-#: src/global.c:856
-msgid "Previous File"
+#: src/global.c:858
+msgid "Prev File"
 msgstr "Fichero anterior"
 
-#: src/global.c:858
+#: src/global.c:860
 msgid "Next File"
 msgstr "Fichero siguiente"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:862 src/text.c:3045
-msgid "Verbatim Input"
+#: src/global.c:869
+msgid "Verbatim"
 msgstr "Entrada literal"
 
-#: src/global.c:867
+#: src/global.c:872
 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:870
+# Ok, es Intro (pero no se usa, parece, reportaré el bug) jm
+#: src/global.c:874
 msgid "Enter"
 msgstr "Intro"
 
-#: src/global.c:873
+#: src/global.c:876
 msgid "Delete"
 msgstr "Suprimir"
 
-#: src/global.c:876
+#: src/global.c:878
 msgid "Backspace"
 msgstr "Borrar"
 
-#: src/global.c:893
+#: src/global.c:888
 msgid "CutTillEnd"
 msgstr "CortarHastaFinal"
 
-#: src/global.c:906
+#: src/global.c:898
 msgid "Word Count"
-msgstr "Contar Palabras"
+msgstr "Contar palabras"
+
+#: src/global.c:905
+msgid "Suspend"
+msgstr "Suspender"
+
+#: src/global.c:910
+msgid "PrevHstory"
+msgstr "Previo histórico"
+
+#: src/global.c:913
+msgid "NextHstory"
+msgstr "Sig. histórico"
+
+#: src/global.c:917
+msgid "Go To Text"
+msgstr "Ir a texto"
+
+#: src/global.c:928
+msgid "DOS Format"
+msgstr "Formato DOS"
+
+#: src/global.c:931
+msgid "Mac Format"
+msgstr "Formato Mac"
+
+#: src/global.c:934
+msgid "Append"
+msgstr "Añadir"
+
+#: src/global.c:936
+msgid "Prepend"
+msgstr "Anteponer"
+
+#: src/global.c:939
+msgid "Backup File"
+msgstr "Respaldar fichero"
+
+#: src/global.c:946
+msgid "Execute Command"
+msgstr "Ejecutar orden"
 
-#: src/global.c:1367
+#: src/global.c:961
+msgid "To Files"
+msgstr "A ficheros"
+
+#: src/global.c:964
+msgid "First File"
+msgstr "Primer fichero"
+
+#: src/global.c:966
+msgid "Last File"
+msgstr "Último fichero"
+
+#: src/global.c:977
+msgid "Prev Lint Msg"
+msgstr "Mensaje anterior"
+
+#: src/global.c:979
+msgid "Next Lint Msg"
+msgstr "Mensaje siguiente"
+
+#. TRANSLATORS: The next seventeen strings are toggle descriptions;
+#. * they are best kept shorter than 40 characters, but may be longer.
+#: src/global.c:1227
 msgid "Help mode"
-msgstr "Modo ayuda"
+msgstr "Modo de ayuda"
 
-#: src/global.c:1369
+#: src/global.c:1229
 msgid "Constant cursor position display"
-msgstr "Posici�n del cursor constante"
+msgstr "Muestra constante de la posición del cursor"
 
-#: src/global.c:1371
+#: src/global.c:1231
 msgid "Use of one more line for editing"
-msgstr "Uso de una l�nea m�s para editar"
+msgstr "Uso de una línea más para editar"
 
-#: src/global.c:1373
+#: src/global.c:1233
 msgid "Smooth scrolling"
 msgstr "Desplazamiento suave"
 
-#: src/global.c:1375
+#: src/global.c:1235
+msgid "Soft wrapping of overlong lines"
+msgstr "Suave ajuste de líneas largas"
+
+#: src/global.c:1237
 msgid "Whitespace display"
-msgstr "Mostrar blancos"
+msgstr "Muestra de blancos"
 
-#: src/global.c:1377
+#: src/global.c:1239
 msgid "Color syntax highlighting"
 msgstr "Coloreado de sintaxis"
 
-#: src/global.c:1379
+#: src/global.c:1241
 msgid "Smart home key"
-msgstr "Tecla 'smart home'"
+msgstr "Sagaz tecla «Home»"
 
-# 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:1381
+# 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:1243
 msgid "Auto indent"
-msgstr "Auto sangrar"
+msgstr "Auto-sangrado"
 
-# de la l�nea. sv
-#: src/global.c:1383
+#: src/global.c:1245
 msgid "Cut to end"
-msgstr "Cortar hasta el final"
+msgstr "Cortado desde el cursor hasta el final de línea"
 
-# Uf. A ver si alguien encuentra una palabra para decir eso... sv
-# Esto creo que ya lo pregunt� en la lista, a parte de en muchos otros
-# sitios y nadie encontr� nada convincente. jm
-#: src/global.c:1385
-msgid "Long line wrapping"
-msgstr "Ajuste de l�neas largas"
+#: src/global.c:1247
+msgid "Hard wrapping of overlong lines"
+msgstr "Rígido ajuste de líneas largas"
 
-#: src/global.c:1387
+#: src/global.c:1249
 msgid "Conversion of typed tabs to spaces"
-msgstr "Conversi�n de las pulsaciones de tabulador a espacios"
+msgstr "Conversión de pulsaciones de tabulador a espacios"
 
-#: src/global.c:1389
+#: src/global.c:1251
 msgid "Backup files"
-msgstr "Respaldar ficheros"
+msgstr "Respaldado de ficheros"
 
-#: src/global.c:1391
+#: src/global.c:1253
 msgid "Multiple file buffers"
-msgstr "M�ltiples b�fers de ficheros"
+msgstr "Múltiples búferes de fichero"
 
-#: src/global.c:1393
+#: src/global.c:1255
 msgid "Mouse support"
-msgstr "Soporte para rat�n"
+msgstr "Soporte para ratón"
 
-#: src/global.c:1395
+#: src/global.c:1257
 msgid "No conversion from DOS/Mac format"
 msgstr "No convertir desde el formato DOS/Mac"
 
-#: src/global.c:1397
+#: src/global.c:1259
 msgid "Suspension"
-msgstr "Suspensi�n"
+msgstr "Suspensión"
 
-# Uf. A ver si alguien encuentra una palabra para decir eso... sv
-# Esto creo que ya lo pregunt� en la lista, a parte de en muchos otros
-# sitios y nadie encontr� nada convincente. jm
-#: src/global.c:1399
-#, fuzzy
-msgid "Soft line wrapping"
-msgstr "Ajuste de l�neas largas"
-
-#: src/help.c:236
+#: src/help.c:205
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1017,17 +1095,17 @@ msgid ""
 "prompt.  Hitting Enter without entering any text will perform the previous "
 "search.  "
 msgstr ""
-"Texto de ayuda de la orden B�squeda\n"
+"Texto de ayuda de la orden Búsqueda\n"
 "\n"
-" Introduzca las palabras o caracteres que quiera buscar y pulse intro. Si "
-"hay una coincidencia para el texto introducido, la pantalla se actualizar� "
-"en el lugar donde est� la coincidencia m�s cercana de la cadena buscada.\n"
+" Introduzca las palabras o caracteres que quiera buscar y pulse Intro. Si "
+"hay una coincidencia para el texto introducido, la pantalla se actualizará "
+"en el lugar donde esté la coincidencia más cercana de la cadena buscada.\n"
 "\n"
-" Se mostrar� la cadena de texto de la b�squeda anterior entre corchetes tras "
-"el indicador. Si pulsa intro sin introducir texto repetir� la �ltima "
-"b�squeda."
+" Se mostrará la cadena de texto de la búsqueda anterior entre corchetes tras "
+"el indicador. Si pulsa Intro sin introducir texto repetirá la última "
+"búsqueda."
 
-#: src/help.c:245
+#: src/help.c:214
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1035,13 +1113,13 @@ msgid ""
 " The following function keys are available in Search mode:\n"
 "\n"
 msgstr ""
-"Si ha escogido texto con el marcador y luego hace b�squeda con reemplazo, "
-"s�lo se modificar�n las coincidencias dentro del texto seleccionado.\n"
+"Si ha escogido texto con el marcador y luego hace búsqueda con reemplazo, "
+"sólo se modificarán las coincidencias dentro del texto seleccionado.\n"
 "\n"
-" Dispone de las siguientes teclas de funci�n en modo B�squeda:\n"
+" Dispone de las siguientes teclas de función en modo Búsqueda:\n"
 "\n"
 
-#: src/help.c:251
+#: src/help.c:220
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1052,16 +1130,16 @@ msgid ""
 " The following function keys are available in Go To Line mode:\n"
 "\n"
 msgstr ""
-"Texto de ayuda de Ir a L�nea\n"
+"Texto de ayuda de Ir a Línea\n"
 "\n"
-" Introduce el n�mero de la l�nea a la que quieres ir y pulsa Intro. Si hay "
-"menos l�neas de texto que el n�mero que has introducido, el cursor se mover� "
-"a la �ltima l�nea del fichero.\n"
+" Introduce el número de la línea a la que quieres ir y pulsa Intro. Si hay "
+"menos líneas de texto que el número que has introducido, el cursor se moverá "
+"a la última línea del fichero.\n"
 "\n"
-" Se dispone de las siguientes teclas de funci�n en el modo Ir a L�nea:\n"
+" Se dispone de las siguientes teclas de función en el modo Ir a Línea:\n"
 "\n"
 
-#: src/help.c:260
+#: src/help.c:229
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1075,15 +1153,15 @@ msgid ""
 msgstr ""
 "Texto de ayuda de Insertar Fichero\n"
 "\n"
-" Escriba el nombre del fichero a insertar en el b�fer, en la posici�n actual "
+" Escriba el nombre del fichero a insertar en el búfer, en la posición actual "
 "del cursor.\n"
 "\n"
-" Si ha compilado nano con soporte para m�ltiples b�fer y habilita los b�fer "
-"m�ltiples con las opciones -F o --multibuffer, con la combinaci�n Meta-F o "
-"usando un fichero nanorc, el fichero ser� insertado en un b�fer diferente "
-"(use Meta-< y > para cambiar de b�fers de fichero)."
+" Si ha compilado nano con soporte para múltiples búfer y habilita los búfer "
+"múltiples con las opciones -F o --multibuffer, con la combinación Meta-F o "
+"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:269
+#: src/help.c:238
 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"
@@ -1091,13 +1169,13 @@ msgid ""
 " The following function keys are available in Insert File mode:\n"
 "\n"
 msgstr ""
-"Si necesitase otro b�fer vac�o, no escriba ning�n nombre de fichero o en su "
+"Si necesitase otro búfer vacío, no escriba ningún nombre de fichero o en su "
 "lugar el nombre de un fichero que no exista y pulse Intro.\n"
 "\n"
-" Dispone de las siguientes teclas de funci�n en el modo Insertar Fichero:\n"
+" Dispone de las siguientes teclas de función en el modo Insertar Fichero:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:244
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1112,20 +1190,20 @@ msgid ""
 " The following function keys are available in Write File mode:\n"
 "\n"
 msgstr ""
-"Texto de ayuda de Guardar Fichero\n"
+"Texto de ayuda de Guardar fichero\n"
 "\n"
-" Escriba el nombre con el que quiera guardar el fichero actual y pulse intro "
-"para salvarlo.\n"
+"Escriba el nombre con el que quiera guardar el fichero actual y pulse Intro "
+"para guardarlo.\n"
 "\n"
-" Si ha escogido texto marc�ndolo, se le preguntar� si quiere guardar s�lo la "
-"porci�n marcada a un fichero diferente. Para reducir la posibilidad de "
-"sobreescribir el fichero actual con s�lo una parte, el nombre del fichero "
+"Si ha escogido texto marcándolo, se le preguntará si quiere guardar sólo la "
+"porción marcada a un fichero diferente. Para reducir la posibilidad de "
+"sobreescribir el fichero actual con sólo una parte, el nombre del fichero "
 "actual no es el predeterminado en este modo.\n"
 "\n"
-" Dispone de las siguientes teclas de funci�n en el modo Guardar Fichero:\n"
+"Dispone de las siguientes teclas de función en el modo Guardar fichero:\n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:258
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1138,20 +1216,19 @@ msgid ""
 " The following function keys are available in the file browser:\n"
 "\n"
 msgstr ""
-"Texto de ayuda del Navegador de Ficheros\n"
+"Texto de ayuda del Navegador de ficheros\n"
 "\n"
-" El navegador de ficheros se utiliza para navegar visualmente la estructura "
+"El navegador de ficheros se utiliza para navegar visualmente la estructura "
 "del directorio para seleccionar un fichero para lectura o escritura. Puedes "
-"usar los cursores o Re/Av P�g para navegar por los ficheros y S o Intro para "
+"usar los cursores o Re/Av Pág para navegar por los ficheros y S o Intro para "
 "elegir el fichero seleccionado o entrar en el directorio solicitado. Para "
 "subir un nivel, selecciona el directorio \"..\" en la parte superior de la "
 "lista de ficheros.\n"
 "\n"
-" Se dispone de las siguientes teclas de funci�n en el navegador de "
-"ficheros:\n"
+"Se dispone de las siguientes teclas de función en el navegador de ficheros:\n"
 "\n"
 
-#: src/help.c:302
+#: src/help.c:271
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1164,26 +1241,26 @@ msgid ""
 "search.\n"
 "\n"
 msgstr ""
-"Texto de ayuda de la orden B�squeda\n"
+"Texto de ayuda de la orden Búsqueda\n"
 "\n"
-" Introduzca las palabras o caracteres que quiera buscar y pulse intro.  Si "
-"hay una coincidencia para el texto introducido, la pantalla se actualizar� "
-"en el lugar donde est� la coincidencia m�s cercana de la cadena buscada.\n"
+" Introduzca las palabras o caracteres que quiera buscar y pulse Intro. Si "
+"hay una coincidencia para el texto introducido, la pantalla se actualizará "
+"en el lugar donde esté la coincidencia más cercana de la cadena buscada.\n"
 "\n"
-" Se mostrar� entre corchetes la cadena de texto de la b�squeda anterior tras "
-"el indicador. Si pulsa intro sin introducir texto repetir� la �ltima "
-"b�squeda.\n"
+" Se mostrará entre corchetes la cadena de texto de la búsqueda anterior tras "
+"el indicador. Si pulsa Intro sin introducir texto repetirá la última "
+"búsqueda.\n"
 "\n"
 
-#: src/help.c:311
+#: src/help.c:280
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
 msgstr ""
-" Se dispone de las siguientes teclas de funci�n en el modo B�squeda:\n"
+" Se dispone de las siguientes teclas de función en el modo Búsqueda:\n"
 "\n"
 
-#: src/help.c:315
+#: src/help.c:284
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1199,14 +1276,14 @@ msgstr ""
 "\n"
 " Introduzca el nombre del directorio por el que quiera navegar.\n"
 "\n"
-" Si el completado con el tabulador no est� inactivo, puede usar la tecla TAB "
-"para (intentar) completar autom�ticamente el nombre del directorio.\n"
+" Si el completado con el tabulador no está inactivo, puede usar la tecla TAB "
+"para (intentar) completar automáticamente el nombre del directorio.\n"
 "\n"
-" Se dispone de las siguientes teclas de funci�n en el modo Ir a Directorio "
+" Se dispone de las siguientes teclas de función en el modo Ir a Directorio "
 "del Navegador:\n"
 "\n"
 
-#: src/help.c:328
+#: src/help.c:297
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1219,20 +1296,19 @@ msgid ""
 " The following function keys are available in Spell Check mode:\n"
 "\n"
 msgstr ""
-"Texto de ayuda del Corrector de ortograf�a\n"
+"Texto de ayuda del Corrector de ortografía\n"
 "\n"
-" El Corrector de ortograf�a comprueba la ortograf�a de todo el texto en el "
+" El Corrector de ortografía comprueba la ortografía de todo el texto en el "
 "fichero actual. Cuando se encuentra una palabra desconocida, queda marcada y "
-"se puede proporcionar un sustituto. Despu�s preguntar� si se quiere "
+"se puede proporcionar un sustituto. Después preguntará si se quiere "
 "reemplazar todas las coincidencias de esa palabra mal escrita en el fichero "
-"actual o, si ha seleccionado un texto, dentro de la selecci�.\n"
+"actual o, si ha seleccionado un texto, dentro de la selecció.\n"
 "\n"
 " Dispone de las siguientes funciones adicionales en el modo Corrector de "
-"ortograf�a:\n"
+"ortografía:\n"
 "\n"
 
-#: src/help.c:343
-#, fuzzy
+#: src/help.c:312
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1243,15 +1319,16 @@ msgid ""
 " The following function keys are available in Execute Command mode:\n"
 "\n"
 msgstr ""
-"Texto de ayuda de Orden Externa\n"
+"Texto de ayuda de ejecución de comandos\n"
 "\n"
-" Este modo le permite insertar en el b�fer actual (o en uno nuevo en modo "
-"multib�fer) la salida de una orden ejecutada por el int�rprete. Si necesita "
-"un b�fer vac�o, no introduzca ninguna orden.\n"
+"Este modo le permite insertar la salida del comando ejecutado en una consola "
+"en el búfer actual (o en búfer nuevo en modo multibúfer). Si necesita otro "
+"búfer vacío no introduzca ningún comando.\n"
+"\n"
+"Las siguientes teclas de función están disponibles en este modo:\n"
 "\n"
-" En este modo dispone de las siguientes funciones adicionales:\n"
 
-#: src/help.c:356
+#: src/help.c:325
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1264,15 +1341,15 @@ msgid ""
 msgstr ""
 "Texto de ayuda principal de nano\n"
 "\n"
-" El editor nano est� dise�ado para emular la funcionalidad y sencillez de "
+" El editor nano está diseñado para emular la funcionalidad y sencillez de "
 "uso del editor de texto UW Pico. El editor cuenta con cuatro secciones "
-"principales. La l�nea superior muestra la versi�n del programa, el nombre "
-"del fichero que se est� editando, y si ha sido modificado o no. La siguiente "
-"es la ventana principal del editor que muestra lo que est� siendo editado. "
-"La l�nea de estado es la tercera empezando por abajo y muestra mensajes "
+"principales. La línea superior muestra la versión del programa, el nombre "
+"del fichero que se está editando, y si ha sido modificado o no. La siguiente "
+"es la ventana principal del editor que muestra lo que está siendo editado. "
+"La línea de estado es la tercera empezando por abajo y muestra mensajes "
 "importantes. "
 
-#: src/help.c:366
+#: src/help.c:335
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1282,17 +1359,17 @@ msgid ""
 "notated with the Meta (M-) symbol and can be entered using either the Esc, "
 "Alt, or Meta key depending on your keyboard setup.  "
 msgstr ""
-"Las dos �ltimas l�neas muestran los atajos usados m�s a menudo en el "
+"Las dos últimas líneas muestran los atajos usados más a menudo en el "
 "editor \n"
 "\n"
-" La notaci�n para los atajos es como sigue: las secuencias con la tecla "
+" La notación para los atajos es como sigue: las secuencias con la tecla "
 "Control se indican con un circunflejo (^) y se pueden introducir tanto "
 "pulsando la tecla de Control (Ctrl) como pulsando dos veces la de Escape "
-"(Esc). Las secuencias con la tecla de Escape se indican con el s�mbolo Meta "
+"(Esc). Las secuencias con la tecla de Escape se indican con el símbolo Meta "
 "(M-) y se pueden introducir con las teclas Esc, Alt o Meta, dependiendo de "
-"su configuraci�n de teclado. "
+"su configuración de teclado. "
 
-#: src/help.c:375
+#: src/help.c:344
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1300,21 +1377,21 @@ msgid ""
 "keys are shown in parentheses:\n"
 "\n"
 msgstr ""
-"Adem�s, si pulsa dos veces Esc y escribe despu�s un c�digo decimal de tres "
-"d�gitos entre 000 y 255, introducir� el car�cter de valor correspondiente. "
+"Además, si pulsa dos veces Esc y escribe después un código decimal de tres "
+"dígitos entre 000 y 255, introducirá el carácter de valor correspondiente. "
 "Dispone de las siguientes pulsaciones en la ventana principal del editor. "
-"Las pulsaciones alternativas se muestran entre par�ntesis:\n"
+"Las pulsaciones alternativas se muestran entre paréntesis:\n"
 "\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:376 src/help.c:448
 msgid "enable/disable"
-msgstr "habilitar/deshabilitar"
+msgstr " activar/desactivar"
 
-#: src/nano.c:587
+#: src/nano.c:601
 msgid "Key invalid in view mode"
-msgstr "Tecla ilegal en modo vistualizaci�n"
+msgstr "Tecla no es válida en modo de visualización"
 
-#: src/nano.c:695
+#: src/nano.c:713
 #, c-format
 msgid ""
 "\n"
@@ -1323,286 +1400,293 @@ msgstr ""
 "\n"
 "Buffer escrito en %s\n"
 
-#: src/nano.c:697
+#: src/nano.c:715
 #, c-format
 msgid ""
 "\n"
 "Buffer not written to %s: %s\n"
 msgstr ""
 "\n"
-"No se ha escrito el b�fer a %s: %s\n"
+"No se ha escrito el búfer a %s: %s\n"
 
-#: src/nano.c:700
+#: src/nano.c:718
 #, c-format
 msgid ""
 "\n"
 "Buffer not written: %s\n"
 msgstr ""
 "\n"
-"No se ha escrito el b�fer: %s\n"
+"No se ha escrito el búfer: %s\n"
 
-#: src/nano.c:723
+#: src/nano.c:743
 msgid "Window size is too small for nano...\n"
-msgstr "La ventana es demasiado peque�a para Nano...\n"
+msgstr "La ventana es demasiado pequeña para nano...\n"
 
-#: src/nano.c:816
+#: src/nano.c:836
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
 "\n"
 msgstr ""
-"Uso: nano [OPCIONES] [[+L�NEA,COLUMNA] FICHERO]...\n"
+"Uso: nano [OPCIONES] [[+LÍNEA,COLUMNA] FICHERO]...\n"
 "\n"
 
-#: src/nano.c:819
+#: src/nano.c:839
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
-msgstr "Opci�n\t\tOpci�n larga\t\tSignificado\n"
+msgstr "Opción\t\tOpción larga\t\tSignificado\n"
 
-#: src/nano.c:821
+#: src/nano.c:841
 #, c-format
 msgid "Option\t\tMeaning\n"
-msgstr "Opci�n\t\tSignificado\n"
-
-#: src/nano.c:824
-msgid "Show this message"
-msgstr "Mostrar este mensaje"
+msgstr "Opción\t\tSignificado\n"
 
-#: src/nano.c:825
+#: src/nano.c:844
 msgid "+LINE,COLUMN"
-msgstr "+L�NEA,COLUMNA"
+msgstr "+LÍNEA,COLUMNA"
 
-#: src/nano.c:826
+#. TRANSLATORS: The next forty or so strings are option descriptions
+#. * for the --help output.  Try to keep them at most 40 characters.
+#: src/nano.c:847
 msgid "Start at line LINE, column COLUMN"
-msgstr "Comenzar en la l�nea n�mero L�NEA, y columna COLUMNA"
+msgstr "Comenzar en la línea número LÍNEA, y columna COLUMNA"
 
-#: src/nano.c:828
+#: src/nano.c:849
 msgid "Enable smart home key"
-msgstr "Habilitar tecla 'smart home'"
+msgstr "Habilitar una sagaz tecla «Home»"
 
-#: src/nano.c:829
+#: src/nano.c:850
 msgid "Save backups of existing files"
 msgstr "Guardar respaldo de los ficheros existentes"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "-C <dir>"
 msgstr "-C <dir>"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<dir>"
 
-#: src/nano.c:831
+# The "unique" is unnecessary and confusing.  --  benno
+#: src/nano.c:852
 msgid "Directory for saving unique backup files"
-msgstr "Directorio donde guardar ficheros de respaldo �nicos"
+msgstr "Directorio donde guardar ficheros de respaldo"
 
-#: src/nano.c:834
+#: src/nano.c:855
 msgid "Use bold instead of reverse video text"
 msgstr "Usar negrita en lugar de texto inverso"
 
-#: src/nano.c:837
+#: src/nano.c:858
 msgid "Convert typed tabs to spaces"
 msgstr "Convertir tabulaciones a espacios al escribir"
 
-#: src/nano.c:840
+#: src/nano.c:861
 msgid "Enable multiple file buffers"
-msgstr "Habilitar m�ltiples b�fer de ficheros"
+msgstr "Habilitar múltiples búferes de fichero"
 
-#: src/nano.c:845
+#: src/nano.c:865
+msgid "Use (vim-style) lock files"
+msgstr "Usar ficheros de bloqueo (estilo vim)"
+
+#: src/nano.c:869
 msgid "Log & read search/replace string history"
-msgstr "Registrar y leer el hist�rico de cadenas de b�squeda/reemplazo"
+msgstr "Registrar y leer el histórico de cadenas de búsqueda/reemplazo"
 
-#: src/nano.c:848
+#: src/nano.c:873
 msgid "Don't look at nanorc files"
 msgstr "No leer los ficheros nanorc"
 
-#: src/nano.c:851
+#: src/nano.c:876
 msgid "Fix numeric keypad key confusion problem"
-msgstr "Arreglar el problema de confusi�n del teclado num�rico"
+msgstr "Arreglar el problema de confusión del teclado numérico"
 
-#: src/nano.c:853
+#: src/nano.c:878
 msgid "Don't add newlines to the ends of files"
-msgstr "No a�adir avances de l�nea al final de los ficheros"
+msgstr "No añadir avances de línea al final de los ficheros"
 
-#: src/nano.c:856
+#: src/nano.c:881
 msgid "Don't convert files from DOS/Mac format"
 msgstr "No convertir los ficheros desde el formato DOS/Mac"
 
-#: src/nano.c:858
+#: src/nano.c:883
 msgid "Use one more line for editing"
-msgstr "Usar una l�nea m�s para edici�n"
+msgstr "Usar una línea más para edición"
 
-#: src/nano.c:860
+# The original is poor.  --  benno
+#: src/nano.c:886
+msgid "Log & read location of cursor position"
+msgstr "Guardar y restaurar la posición del cursor"
+
+#: src/nano.c:889
 msgid "-Q <str>"
-msgstr "-Q <cad>"
+msgstr "-Q <cadena>"
 
-#: src/nano.c:860
+#: src/nano.c:889
 msgid "--quotestr=<str>"
-msgstr "--quotestr=<cad>"
+msgstr "--quotestr=<cadena>"
 
-#: src/nano.c:861
+#: src/nano.c:890
 msgid "Quoting string"
 msgstr "Marcador de cita"
 
-#: src/nano.c:863
+#: src/nano.c:892
 msgid "Restricted mode"
 msgstr "Modo restringido"
 
-#: src/nano.c:866
+#: src/nano.c:895
 msgid "Scroll by line instead of half-screen"
-msgstr ""
+msgstr "Desplazarse línea a línea en lugar de media pantalla"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "-T <#cols>"
-msgstr "-T <n�m>"
+msgstr "-T <número>"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "--tabsize=<#cols>"
-msgstr "--tabsize=<n�m>"
+msgstr "--tabsize=<número>"
 
-#: src/nano.c:869
+#: src/nano.c:898
 msgid "Set width of a tab to #cols columns"
-msgstr "Fijar el ancho de tab a n�m columnas"
+msgstr "Fijar el ancho de tab a <número> columnas"
 
-#: src/nano.c:871
+#: src/nano.c:900
 msgid "Do quick statusbar blanking"
-msgstr "Borrado r�pido de la barra de estado"
+msgstr "Borrado rápido de la barra de estado"
 
-#: src/nano.c:874
+#: src/nano.c:903
 msgid "Print version information and exit"
-msgstr "Imprimir informaci�n sobre la versi�n y salir"
+msgstr "Mostrar información sobre la versión y salir"
 
-#: src/nano.c:877
+#: src/nano.c:906
 msgid "Detect word boundaries more accurately"
-msgstr "Detectar l�mite entre palabras m�s detalladamente"
+msgstr "Detectar límite entre palabras más detalladamente"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "-Y <str>"
-msgstr "-Y <cad>"
+msgstr "-Y <cadena>"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "--syntax=<str>"
 msgstr "--syntax=<cadena>"
 
-#: src/nano.c:881
+#: src/nano.c:910
 msgid "Syntax definition to use for coloring"
-msgstr "Definici�n de sintaxis a usar para coloreado"
+msgstr "Definición de sintaxis a usar para coloreado"
 
-#: src/nano.c:883
+#: src/nano.c:912
 msgid "Constantly show cursor position"
-msgstr "Mostrar constantemente la posici�n del cursor"
+msgstr "Mostrar constantemente la posición del cursor"
 
-#: src/nano.c:885
+#: src/nano.c:914
 msgid "Fix Backspace/Delete confusion problem"
-msgstr "Arreglar el problema de confusi�n Retroceso/Suprimir"
+msgstr "Arreglar el problema de confusión Retroceso/Suprimir"
+
+#: src/nano.c:915
+msgid "Show this help text"
+msgstr "Mostrar este texto de ayuda y salir"
 
-#: src/nano.c:888
+#: src/nano.c:918
 msgid "Automatically indent new lines"
-msgstr "Indentar autom�ticamente nuevas l�neas"
+msgstr "Sangrar automáticamente nuevas líneas"
 
-#: src/nano.c:889
+#: src/nano.c:919
 msgid "Cut from cursor to end of line"
-msgstr "Cortar desde el cursor al final de l�nea"
+msgstr "Cortar desde el cursor al final de línea"
 
-#: src/nano.c:892
+#: src/nano.c:922
 msgid "Don't follow symbolic links, overwrite"
-msgstr "No seguir enlaces simb�licos, sobreescribirlos"
+msgstr "No seguir enlaces simbólicos, sobreescribirlos"
 
-#: src/nano.c:894
+#: src/nano.c:924
 msgid "Enable the use of the mouse"
-msgstr "Habilitar el uso del rat�n"
+msgstr "Habilitar el uso del ratón"
 
-#: src/nano.c:897
+#: src/nano.c:926
+msgid "Do not read the file (only write it)"
+msgstr "No leer el fichero (sólo escribirlo)"
+
+#: src/nano.c:928
 msgid "-o <dir>"
 msgstr "-o <dir>"
 
-#: src/nano.c:897
+#: src/nano.c:928
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<dir>"
 
-#: src/nano.c:898
+#: src/nano.c:929
 msgid "Set operating directory"
-msgstr "Establecer el directorio de operaci�n"
+msgstr "Establecer el directorio de operación"
 
-#: src/nano.c:901
+#: src/nano.c:932
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Conservar teclas XON (^Q) y XOFF (^S)"
 
-#: src/nano.c:903
+#: src/nano.c:935
 msgid "Silently ignore startup issues like rc file errors"
-msgstr ""
+msgstr "Ignorar silenciosamente problemillas de inicio"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "-r <#cols>"
-msgstr "-r <n�m>"
+msgstr "-r <número>"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "--fill=<#cols>"
-msgstr "--fill=<n�m>"
+msgstr "--fill=<número>"
 
-#: src/nano.c:906
-msgid "Set wrapping point at column #cols"
-msgstr "Fijar el l�mite de ajuste de l�neas en n�m columnas"
+#: src/nano.c:939
+msgid "Set hard-wrapping point at column #cols"
+msgstr "Fijar el límite de ajuste en <número> columnas"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "-s <prog>"
-msgstr "-s <prog>"
+msgstr "-s <programa>"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "--speller=<prog>"
-msgstr "--speller=<prog>"
+msgstr "--speller=<programa>"
 
-#: src/nano.c:910
+#: src/nano.c:943
 msgid "Enable alternate speller"
-msgstr "Habilitar corrector alternativo"
+msgstr "Habilitar un corrector ortográfico alternativo"
 
-#: src/nano.c:913
+#: src/nano.c:946
 msgid "Auto save on exit, don't prompt"
-msgstr "Autosalvar al salir, no preguntar"
-
-#: src/nano.c:915
-msgid "Allow generic undo [EXPERIMENTAL]"
-msgstr ""
+msgstr "Guardar automáticamente al salir, sin preguntar"
 
-#: src/nano.c:918
+#: src/nano.c:947
 msgid "View mode (read-only)"
-msgstr "Modo visualizaci�n (s�lo lectura)"
+msgstr "Modo de visualización (sólo lectura)"
 
-#: src/nano.c:920
-msgid "Don't wrap long lines"
-msgstr "No wrapear l�neas largas"
+#: src/nano.c:949
+msgid "Don't hard-wrap long lines"
+msgstr "No rígidamente ajustar líneas largas"
 
-#: src/nano.c:922
+#: src/nano.c:951
 msgid "Don't show the two help lines"
-msgstr "No mostrar las dos l�neas de ayuda"
+msgstr "No mostrar las dos líneas de ayuda"
 
-#: src/nano.c:923
+#: src/nano.c:952
 msgid "Enable suspension"
-msgstr "Habilitar suspensi�n"
+msgstr "Habilitar suspensión"
 
 # Uf. A ver si alguien encuentra una palabra para decir eso... sv
-# Esto creo que ya lo pregunt� en la lista, a parte de en muchos otros
-# sitios y nadie encontr� nada convincente. jm
-#: src/nano.c:924
-#, fuzzy
+# Esto creo que ya lo pregunté en la lista, a parte de en muchos otros
+# sitios y nadie encontró nada convincente. jm
+#: src/nano.c:954
 msgid "Enable soft line wrapping"
-msgstr "Ajuste de l�neas largas"
+msgstr "Habilitar ajuste de línea suave"
 
-#: src/nano.c:928
-msgid "(ignored, for Pico compatibility)"
-msgstr "(se ignora, est� por compatibilidad con Pico)"
-
-#: src/nano.c:938
+#: src/nano.c:963
 #, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
-msgstr " GNU nano versi�n %s (compilado %s, %s)\n"
+msgid " GNU nano, version %s\n"
+msgstr " GNU nano, versión %s\n"
 
-#: src/nano.c:943
+#: src/nano.c:966
 #, 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:944
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1611,156 +1695,179 @@ msgstr ""
 "\n"
 " Opciones compiladas:"
 
-#: src/nano.c:1022
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
-msgstr "Lo siento, se ha deshabilitado el soporte de esta funci�n"
+msgstr "Lo siento, se ha deshabilitado el soporte de esta función"
 
-#: src/nano.c:1044
+#: src/nano.c:1125
+msgid "No file name"
+msgstr "Sin nombre de fichero"
+
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr ""
-"� Salvar el b�fer modificado (RESPONDER \"No\" DESTRUIR� LOS CAMBIOS) ?"
+"¿Guardar el búfer modificado (RESPONDER \"No\" DESTRUIRÁ LOS CAMBIOS)? "
 
-#: src/nano.c:1088
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
-msgstr ""
+msgstr "No se pudo reabrir stdin desde el teclado\n"
 
-#: src/nano.c:1114
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
-msgstr ""
+msgstr "Leyendo de stdin, ^C para abortar\n"
 
-#: src/nano.c:1182
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Recibido SIGHUP o SIGTERM\n"
 
-#: src/nano.c:1204
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
-msgstr "Use \"fg\" para volver a nano \n"
+msgstr "Use «fg» para volver a nano.\n"
 
-#: src/nano.c:1386
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "habilitado"
 
-#: src/nano.c:1387
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "deshabilitado"
 
-#: src/nano.c:1548 src/winio.c:1256
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr "Orden desconocida"
 
-#: src/nano.c:1674
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "Se ignora XON, mmh mmh"
 
-#: src/nano.c:1679
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "Se ignora XOFF, mmh mmh"
 
-#: src/nano.c:2209 src/rcfile.c:1100
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
-msgstr "El tama�o de tabulador \"%s\" no es v�lido"
+msgstr "El tamaño «%s» de tabulador no es válido"
 
-#: src/nano.c:2268 src/rcfile.c:1025
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
-msgstr "El tama�o de llenado \"%s\" no es v�lido"
+msgstr "El tamaño «%s» de llenado no es válido"
+
+#: src/nano.c:2415
+#, c-format
+msgid "Type '%s -h' for a list of available options.\n"
+msgstr "Teclea «%s -h» para una 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:1259
+#: src/prompt.c:1055
 msgid "Yy"
 msgstr "SsYy"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1056
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1057
 msgid "Aa"
-msgstr "Tt"
+msgstr "TtAa"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1071
 msgid "Yes"
-msgstr "S�"
+msgstr "Sí"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1076
 msgid "All"
 msgstr "Todas"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1081
 msgid "No"
 msgstr "No"
 
-#: src/rcfile.c:130
+#: src/rcfile.c:137
 #, c-format
 msgid "Error in %s on line %lu: "
-msgstr "Error en %s en la l�nea %lu: "
+msgstr "Error en %s en la línea %lu: "
 
-#: src/rcfile.c:185
+#: src/rcfile.c:196
 #, c-format
 msgid "Argument '%s' has an unterminated \""
-msgstr "El argumento '%s' tiene una \" sin terminar"
+msgstr "El argumento «%s» tiene una \" sin terminar"
 
-#: src/rcfile.c:212 src/rcfile.c:264 src/rcfile.c:711 src/rcfile.c:768
-#: src/rcfile.c:821
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
-msgstr "Las cadenas de regex han de empezar y acabar con un car�cter \""
+msgstr "Las cadenas de regex han de empezar y acabar con un carácter \""
 
-# c-format
-#: src/rcfile.c:238 src/search.c:62
+#: src/rcfile.c:249 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
-msgstr "Regex \"%s\" incorrecta: %s"
+msgstr "Regex «%s» incorrecta: %s"
 
-#: src/rcfile.c:258
+#: src/rcfile.c:269
 msgid "Missing syntax name"
-msgstr "Nombre de la sintaxis inexistente"
+msgstr "Falta el nombre para la sintaxis"
 
-#: src/rcfile.c:316
+#: src/rcfile.c:340
 msgid "The \"none\" syntax is reserved"
-msgstr "La sintaxis \"none\" est� reservada"
+msgstr "La sintaxis «none» está reservada"
 
-#: src/rcfile.c:323
+#: src/rcfile.c:347
 msgid "The \"default\" syntax must take no extensions"
-msgstr "La sintaxis \"default\" no toma extensiones"
+msgstr "La sintaxis «default» no toma extensiones"
 
-#: src/rcfile.c:386 src/rcfile.c:483
-#, fuzzy
+#: src/rcfile.c:433
 msgid "Missing key name"
-msgstr "Nombre de la sintaxis inexistente"
+msgstr "Falta el nombre de la combinación"
 
-#: src/rcfile.c:398 src/rcfile.c:499
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
-msgstr ""
+#: src/rcfile.c:442 src/rcfile.c:453
+msgid "Key name is too short"
+msgstr "El nombre de la combinación está demasiado corta"
 
-#: src/rcfile.c:407
-msgid "Must specify function to bind key to"
-msgstr ""
+#: src/rcfile.c:463
+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:472
+msgid "Must specify a function to bind the key to"
+msgstr "Debe especificar una función a la cual vincular la tecla"
 
-#: src/rcfile.c:418 src/rcfile.c:510
-msgid "Must specify menu to bind key to (or \"all\")"
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:482
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
+"Debe especificar un menú (o «all») en la cual vincular/desvincular la tecla"
 
-#: src/rcfile.c:426
+#: src/rcfile.c:489
 #, c-format
-msgid "Could not map name \"%s\" to a function"
-msgstr ""
+msgid "Cannot map name \"%s\" to a function"
+msgstr "El «%s» no es un nombre de función"
 
-#: src/rcfile.c:432 src/rcfile.c:517
+#: src/rcfile.c:496
 #, c-format
-msgid "Could not map name \"%s\" to a menu"
-msgstr ""
+msgid "Cannot map name \"%s\" to a menu"
+msgstr "El «%s» no es un nombre de menú"
 
-#: src/rcfile.c:454
+#: src/rcfile.c:528
 #, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
-msgstr ""
+msgid "Function '%s' does not exist in menu '%s'"
+msgstr "La función «%s» no existe en menú «%s»"
 
-#: src/rcfile.c:625
+#: src/rcfile.c:543
+#, c-format
+msgid "Sorry, keystroke \"%s\" may not be rebound"
+msgstr "La combinación «%s» no puede ser revinculado"
+
+#: src/rcfile.c:629
+#, c-format
+msgid "Error expanding %s: %s"
+msgstr "Error al expandir «%s»: %s"
+
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1769,381 +1876,527 @@ msgid ""
 "\"black\", with the optional prefix \"bright\"\n"
 "for foreground colors."
 msgstr ""
-"No se ha reconocido el color \"%s\".\n"
-"Los v�lidos son \"green\", \"red\", \"blue\", \n"
-"\"white\", \"yellow\", \"cyan\", \"magenta\" y\n"
-"\"black\", con el prefijo opcional \"bright\"\n"
+"No se ha reconocido el color «%s».\n"
+"Los válidos son «green», «red», «blue», \n"
+"«white», «yellow», «cyan», «magenta» y\n"
+"«black», con el prefijo opcional «bright»\n"
 "para los de primer plano."
 
-#: src/rcfile.c:647
+#: src/rcfile.c:694
 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"
+msgstr "No se puede añadir una directiva de color sin una orden de sintaxis"
 
-#: src/rcfile.c:652
+#: src/rcfile.c:699
 msgid "Missing color name"
-msgstr "Nombre del color inexistente"
+msgstr "Falta un nombre de color"
 
-#: src/rcfile.c:672
-#, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr "El color de fondo \"%s\" no puede ser brillante"
-
-#: src/rcfile.c:690 src/rcfile.c:809
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr "Falta la cadena regex"
 
-#: src/rcfile.c:762
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
-msgstr "�start=� requiere su �end=� correspondiente"
+msgstr "«start=» requiere su «end=» correspondiente"
+
+#: src/rcfile.c:837
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr "El color de fondo «%s» no puede ser brillante"
 
-#: src/rcfile.c:804
-#, fuzzy
+#: src/rcfile.c:865
 msgid "Cannot add a header regex without a syntax command"
-msgstr "No se puede a�adir una directiva de color sin una orden de sintaxis"
+msgstr ""
+"No se puede añadir una expresión regular para «header» sin un comando "
+"«syntax»"
+
+#: src/rcfile.c:921
+msgid "Cannot add a magic string regex without a syntax command"
+msgstr ""
+"No se puede añadir una expresión regular para «magic» sin un comando «syntax»"
+
+#: src/rcfile.c:926
+msgid "Missing magic string name"
+msgstr "Falta el nombre de la cadena mágica"
 
-#: src/rcfile.c:874
+#: src/rcfile.c:985
+msgid "Cannot add a linter without a syntax command"
+msgstr "No se puede añadir un «linter» sin un comando «syntax»"
+
+#: src/rcfile.c:990
+msgid "Missing linter command"
+msgstr "Falta un nombre de programa detrás «linter»"
+
+#: src/rcfile.c:1010
+msgid "Cannot add formatter without a syntax command"
+msgstr "No se puede añadir un «formatter» sin un comando «syntax»"
+
+#: src/rcfile.c:1015
+msgid "Missing formatter command"
+msgstr "Falta un nombre de programa detrás «formatter»"
+
+#: src/rcfile.c:1045
 #, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
+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:876
+#: src/rcfile.c:1047
+#, c-format
 msgid ""
-"Exiting.  Please use nano with the -I option if needed to adjust your nanorc "
-"settings\n"
+"If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
+"Si es necesario, use nano con la opción -I para ajustar su configuración "
+"nanorc.\n"
+
+#: src/rcfile.c:1108
+#, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "No se pudo encontrar el sintaxis «%s» para extender"
 
-#: src/rcfile.c:926 src/rcfile.c:935 src/rcfile.c:945
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
-msgstr "No se admite la orden \"%s\" en el fichero incluido"
+msgstr "No se admite la orden «%s» en el fichero incluido"
 
-#: src/rcfile.c:951 src/rcfile.c:1128
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
-msgstr "La sintaxis \"%s\" no tiene �rdenes de color"
+msgstr "La sintaxis «%s» no tiene órdenes de color"
 
-# en la l�nea. sv
-# el comando -> la orden.
-#: src/rcfile.c:966
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
-msgstr "Orden \"%s\" no reconocida"
+msgstr "Orden «%s» no reconocida"
 
-#: src/rcfile.c:972
-msgid "Missing flag"
-msgstr "Falta la opci�n"
+#: src/rcfile.c:1186
+msgid "Missing option"
+msgstr "Falta una opción"
 
-#: src/rcfile.c:994
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
-msgstr "La opci�n \"%s\" precisa un argumento"
+msgstr "La opción «%s» precisa un argumento"
 
-#: src/rcfile.c:1012
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
-msgstr "La opci�n no es una cadena multibyte v�lida"
+msgstr "La opción no es una cadena multibyte válida"
 
-#: src/rcfile.c:1038 src/rcfile.c:1066 src/rcfile.c:1075
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
-msgstr "Se requieren caracteres que no sean blancos"
+msgstr "Se precisan caracteres que no sean blancos"
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr "Se precisan dos caracteres de una sola columna"
 
-#: src/rcfile.c:1114
+#: src/rcfile.c:1339
 #, c-format
-msgid "Cannot unset flag \"%s\""
-msgstr "No se pudo desactivar la opci�n \"%s\""
+msgid "Cannot unset option \"%s\""
+msgstr "No es posible desactivar la opción «%s»"
 
-#: src/rcfile.c:1123
+#: src/rcfile.c:1345
 #, c-format
-msgid "Unknown flag \"%s\""
-msgstr "Opci�n \"%s\" desconocida"
+msgid "Unknown option \"%s\""
+msgstr "Opción «%s» desconocida"
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
-msgstr "No se ha encontrado el directorio del usuario! Wah!"
+msgstr "No se encontró el directorio del usuario.  Ay!"
+
+#: src/rcfile.c:1442
+#, c-format
+msgid ""
+"\n"
+"Press Enter to continue starting nano.\n"
+msgstr ""
+"\n"
+"Pulsa Intro para continuar iniciando nano.\n"
 
 #: src/search.c:96
 #, c-format
 msgid "\"%.*s%s\" not found"
-msgstr "\"%.*s%s\" no encontrado"
+msgstr "No se encontró «%.*s%s»"
 
-#: src/search.c:205
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/search.c:184
+msgid " [Case Sensitive]"
+msgstr " [Mayúsc/minúsc]"
+
+#: src/search.c:188
+msgid " [Regexp]"
+msgstr " [ExpReg]"
+
+#: src/search.c:192
+msgid " [Backwards]"
+msgstr " [Hacia atrás]"
+
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:197
 msgid " (to replace) in selection"
-msgstr " (a reemplazar) en la selecci�n"
+msgstr " (a reemplazar) en la selección"
 
-#: src/search.c:207
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (a reemplazar)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:769
 msgid "Replace this instance?"
-msgstr "�Reemplazar esta instancia?"
+msgstr "¿Reemplazar esta instancia?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:945
 msgid "Replace with"
 msgstr "Reemplazar con"
 
-#: src/search.c:1004
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
-msgstr[0] "Ocurrencia %lu reemplazada"
+msgstr[0] "%lu ocurrencia reemplazada"
 msgstr[1] "%lu ocurrencias reemplazadas"
 
-#: src/search.c:1034
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1027
 msgid "Enter line number, column number"
-msgstr "Introduce n�mero de l�nea, n�mero de columna"
+msgstr "Introduce número de línea, número de columna"
 
-#: src/search.c:1061
-#, fuzzy
+#: src/search.c:1054
 msgid "Invalid line or column number"
-msgstr "Introduce n�mero de l�nea, n�mero de columna"
+msgstr "Número de línea o columna no válido"
 
-#: src/search.c:1214
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "No es una llave"
 
-#: src/search.c:1281
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "No hay una llave correspondiente"
 
 #: src/text.c:54
 msgid "Mark Set"
-msgstr "Marca Establecida"
+msgstr "Marca establecida"
 
 #: src/text.c:58
 msgid "Mark Unset"
-msgstr "Marca Borrada"
+msgstr "Marca borrada"
 
-#: src/text.c:443
+#: src/text.c:439
 msgid "Nothing in undo buffer!"
-msgstr ""
+msgstr "Nada para deshacer en el búfer"
 
-#: src/text.c:455 src/text.c:593
+#: src/text.c:445 src/text.c:590
 #, c-format
-msgid "Internal error: can't match line %d.  Please save your work"
-msgstr ""
+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."
 
-#: src/text.c:466 src/text.c:603
+#: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
-msgstr ""
+msgstr "añadido de texto"
 
-#: src/text.c:475 src/text.c:613
-#, fuzzy
+#: src/text.c:467 src/text.c:612
 msgid "text delete"
-msgstr "Fichero siguiente"
+msgstr "eliminado de texto"
 
-# Uf. A ver si alguien encuentra una palabra para decir eso... sv
-# Esto creo que ya lo pregunt� en la lista, a parte de en muchos otros
-# sitios y nadie encontr� nada convincente. jm
-#: src/text.c:489 src/text.c:628
-#, fuzzy
-msgid "line wrap"
-msgstr "Ajuste de l�neas largas"
-
-#: src/text.c:503 src/text.c:636
+#: src/text.c:491 src/text.c:641
 msgid "line join"
-msgstr ""
+msgstr "juntado de líneas"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:505 src/text.c:657
 msgid "text cut"
-msgstr ""
+msgstr "cortado de texto"
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:510 src/text.c:661
 msgid "text uncut"
-msgstr ""
+msgstr "pegado de texto"
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:515 src/text.c:623
 msgid "line break"
-msgstr ""
+msgstr "salto de línea"
 
-#: src/text.c:532 src/text.c:665
-#, fuzzy
+#: src/text.c:528 src/text.c:672
 msgid "text insert"
-msgstr "L�nea siguiente"
+msgstr "inserción de texto"
 
-#: src/text.c:550 src/text.c:659
-#, fuzzy
+#: src/text.c:549 src/text.c:665
 msgid "text replace"
-msgstr " (a reemplazar)"
+msgstr "reemplazo de texto"
 
-#: src/text.c:557 src/text.c:671
-msgid "Internal error: unknown type.  Please save your work"
-msgstr ""
+#: src/text.c:556 src/text.c:679 src/text.c:983
+msgid "Internal error: unknown type.  Please save your work."
+msgstr "Error interno: tipo desconocido.  Guarde su trabajo."
 
-#: src/text.c:563
+#: src/text.c:561
 #, c-format
 msgid "Undid action (%s)"
-msgstr ""
+msgstr "Acción deshecha (%s)"
 
-#: src/text.c:578
+#: src/text.c:580
 msgid "Nothing to re-do!"
-msgstr ""
+msgstr "Nada para rehacer"
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
-msgstr ""
+#: src/text.c:584
+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:676
+#: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
-msgstr ""
+msgstr "Acción rehecha (%s)"
 
-# Lo mismo. No se pudo cerrar. sv
-#: src/text.c:766
-msgid "Could not pipe"
-msgstr "No se pudo canalizar"
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
+msgid "Could not create pipe"
+msgstr "No se pudo crear una tubería («pipe»)"
 
-# Lo mismo. No se pudo cerrar. sv
-#: src/text.c:793 src/text.c:2636 src/text.c:2788
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "No se pudo crear otro proceso"
 
-#: src/text.c:941
-msgid "Internal error: can't setup uncut.  Please save your work."
-msgstr ""
-
-#: src/text.c:950
-msgid "Internal error: unknown type.  Please save your work."
-msgstr ""
+#: src/text.c:969
+msgid "Internal error: cannot set up uncut.  Please save your work."
+msgstr "Error interno: no se puede configurar un pegar.  Guarde su trabajo."
 
-#: src/text.c:1870
+#: src/text.c:1806
 #, c-format
 msgid "Bad quote string %s: %s"
-msgstr "El marcador de cita '%s' no es v�lido: %s"
+msgstr "El marcador de cita «%s» no es válido: %s"
 
-# ahora se puede. sv
-#: src/text.c:2267
+#: src/text.c:2207
 msgid "Can now UnJustify!"
-msgstr "�Ahora se puede desjustificar!"
+msgstr "Ahora se puede desjustificar."
 
-#: src/text.c:2462
+#: src/text.c:2404
 msgid "Edit a replacement"
 msgstr "Editar un reemplazo"
 
-# Lo mismo. No se pudo cerrar. sv
-#: src/text.c:2548
-msgid "Could not create pipe"
-msgstr "No se pudo crear una tuber�a (\"pipe\")"
-
-#: src/text.c:2550
+#: src/text.c:2492
 msgid "Creating misspelled word list, please wait..."
-msgstr "Creando lista de palabras mal escritas. Espere, por favor..."
+msgstr "Creando una lista de palabras mal escritas.  Espere, por favor..."
 
-# �dem de �dem. Te dejo que revises los que siguen.
-#: src/text.c:2642
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
-msgstr "No se pudo obtener el tama�o del b�fer de la tuber�a (\"pipe\")"
+msgstr "No se pudo obtener el tamaño del búfer de la tubería («pipe»)"
 
-#: src/text.c:2693
+#: src/text.c:2635
 msgid "Error invoking \"spell\""
-msgstr "Error al invocar �spell�"
+msgstr "Error al invocar «spell»"
 
-#: src/text.c:2696
+#: src/text.c:2638
 msgid "Error invoking \"sort -f\""
-msgstr "Error al invocar �sort -f�"
+msgstr "Error al invocar «sort -f»"
 
-#: src/text.c:2699
+#: src/text.c:2641
 msgid "Error invoking \"uniq\""
-msgstr "Error al invocar �uniq�"
+msgstr "Error al invocar «uniq»"
 
-#: src/text.c:2756 src/text.c:2965
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
-msgstr "Revisi�n de ortograf�a finalizada"
+msgstr "Revisión de ortografía finalizada"
 
-#: src/text.c:2815
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
-msgstr "Error al invocar \"%s\""
+msgstr "Error al invocar «%s»"
 
-#: src/text.c:2960
+#: src/text.c:2885
+msgid "Invoking spell checker, please wait"
+msgstr "Invocando el corrector ortográfico.  Espere, por favor..."
+
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
-msgstr "Comprobaci�n de ortograf�a fallida: \"%s\""
+msgstr "Comprobación de ortografía fallida: %s"
 
-#: src/text.c:2962
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
-msgstr "Comprobaci�n de ortograf�a fallida: %s: %s"
+msgstr "Comprobación de ortografía fallida: %s: %s"
+
+#: src/text.c:2937
+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:3030
+#: src/text.c:2947
+msgid "Save modified buffer before linting?"
+msgstr "¿Guardar el búfer modificado antes de invocar el corrector?"
+
+#: src/text.c:2969
+msgid "Invoking linter, please wait"
+msgstr "Invocando el corrector de sintaxis.  Espere, por favor..."
+
+#: src/text.c:3125
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr "Se ha recibido cero líneas analizables del comando «%s»"
+
+#: src/text.c:3159
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr "Este mensaje es para fichero %s; ¿abrirlo en un nuevo búfer?"
+
+#: src/text.c:3205
+msgid "At last message"
+msgstr "Este es el último mensaje"
+
+#: src/text.c:3210
+msgid "At first message"
+msgstr "Este es el primer mensaje"
+
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr "Error: no se ha definido un «formatter»"
+
+#: src/text.c:3275
+msgid "Finished"
+msgstr "Acabado"
+
+#: src/text.c:3280
+msgid "Invoking formatter, please wait"
+msgstr "Invocando el arreglador.  Espere, por favor..."
+
+#: src/text.c:3360
+msgid "Finished formatting"
+msgstr "Se acabó el arreglado"
+
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
-msgstr "%sPalabras: %lu L�neas: %ld Caracteres: %lu "
+msgstr "%sPalabras: %lu Líneas: %ld Caracteres: %lu "
 
-#: src/text.c:3031
+#: src/text.c:3439
 msgid "In Selection:  "
-msgstr "En la selecci�n:  "
+msgstr "En la selección: "
 
-# �memoria insuficiente! sv
-#: src/utils.c:405 src/utils.c:417
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3453
+msgid "Verbatim Input"
+msgstr "Entrada literal"
+
+# ¡memoria insuficiente! sv
+#: src/utils.c:410 src/utils.c:422
 msgid "nano is out of memory!"
-msgstr "�nano se ha quedado sin memoria!"
+msgstr "nano se ha quedado sin memoria"
 
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
-#: src/winio.c:1557
+#: src/winio.c:1583
 msgid "Unicode Input"
 msgstr "Entrada de Unicode"
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2142 src/winio.c:2146
 msgid "Modified"
 msgstr "Modificado"
 
-#: src/winio.c:2150
+#: src/winio.c:2143
 msgid "View"
 msgstr "Ver"
 
-#: src/winio.c:2164
+#: src/winio.c:2157
 msgid "DIR:"
 msgstr "DIR:"
 
-#: src/winio.c:2171
+#: src/winio.c:2164
 msgid "File:"
 msgstr "Fichero:"
 
-#: src/winio.c:3360
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2261
+msgid ""
+"Warning: Modifying a file which is not locked, check directory permission?"
+msgstr ""
+"Aviso: modificando un fichero no bloqueado, ¿comprobar los permisos del "
+"directorio?"
+
+#: src/winio.c:3377
 #, 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%%)"
+msgstr "línea %ld/%ld (%d%%), col %lu/%lu (%d%%), car %lu/%lu (%d%%)"
 
-#: src/winio.c:3492
+#: src/winio.c:3507
 msgid "The nano text editor"
 msgstr "El editor de textos GNU nano"
 
-#: src/winio.c:3493
+#: src/winio.c:3508
 msgid "version"
-msgstr "versi�n"
+msgstr "versión"
 
-#: src/winio.c:3494
+#: src/winio.c:3509
 msgid "Brought to you by:"
-msgstr "Por cortes�a de:"
+msgstr "Por cortesía de:"
 
-#: src/winio.c:3495
+#: src/winio.c:3510
 msgid "Special thanks to:"
 msgstr "Agradecimientos especiales para:"
 
-#: src/winio.c:3496
+#: src/winio.c:3511
 msgid "The Free Software Foundation"
 msgstr "La Free Software Foundation"
 
-#: src/winio.c:3497
+#: src/winio.c:3512
+msgid "the many translators and the TP"
+msgstr "los traductores y la TP"
+
+#: src/winio.c:3513
 msgid "For ncurses:"
 msgstr "Por ncurses:"
 
-#: src/winio.c:3498
+#: src/winio.c:3514
 msgid "and anyone else we forgot..."
 msgstr "y cualquiera del que nos hayamos olvidado..."
 
-#: src/winio.c:3499
+#: src/winio.c:3515
 msgid "Thank you for using nano!"
-msgstr "�Gracias por usar nano!"
+msgstr "Gracias por usar nano."
+
+#~ msgid "Internal error: can't match line %ld.  Please save your work."
+#~ msgstr ""
+#~ "Error interno: no se puede encontrar la línea %ld.  Guarde su trabajo."
+
+#~ msgid "Insert File"
+#~ msgstr "Insertar fichero"
+
+#~ msgid "Go to previous screen"
+#~ msgstr "Ir a la pantalla anterior"
+
+#~ msgid "Find Other Bracket"
+#~ msgstr "Buscar la otra llave"
+
+# Uf. A ver si alguien encuentra una palabra para decir eso... sv
+# Esto creo que ya lo pregunté en la lista, a parte de en muchos otros
+# sitios y nadie encontró nada convincente. jm
+#~ msgid "Long line wrapping"
+#~ msgstr "Ajuste de líneas largas"
+
+# Uf. A ver si alguien encuentra una palabra para decir eso... sv
+# Esto creo que ya lo pregunté en la lista, a parte de en muchos otros
+# sitios y nadie encontró nada convincente. jm
+#~ msgid "Soft line wrapping"
+#~ msgstr "Ajuste suave de línea"
+
+#~ msgid "Allow generic undo [EXPERIMENTAL]"
+#~ msgstr "Permitir deshacer genérico [EXPERIMENTAL]"
+
+#~ msgid "(ignored, for Pico compatibility)"
+#~ msgstr "(se ignora, está por compatibilidad con Pico)"
+
+#~ msgid "Must specify menu to bind key to (or \"all\")"
+#~ msgstr "Debe especificar un al que vincular la tecla (o «todos»)"
+
+#~ msgid "Missing flag"
+#~ msgstr "Falta la opción"
+
+#~ msgid "Internal error: unknown type.  Please save your work"
+#~ msgstr "Error interno: tipo desconocido. Guarde su trabajo."
+
+#~ msgid "Internal error: Redo setup failed.  Please save your work"
+#~ msgstr ""
+#~ "Error interno: falló la configuración de rehacer. Guarde su trabajo."
 
 #~ msgid "Space"
 #~ msgstr "Espacio"
 
-# s�. sv
+# sé. sv
 #~ msgid "Come on, be reasonable"
-#~ msgstr "Venga ya, s� razonable"
+#~ msgstr "Venga ya, sé razonable"
diff --git a/po/eu.gmo b/po/eu.gmo
index a7a42d5..df6aa34 100644
--- a/po/eu.gmo
+++ b/po/eu.gmo
diff --git a/po/eu.po b/po/eu.po
index 2dd366f..0ccbb81 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -1,123 +1,147 @@
 # GNU nano-rentzat egindako hitzulpena.
 # Copyright (C) 2006 Free Software Foundation, Inc.
 # This file is distributed under the same license as the nano package.
-# Mikel Olasagasti <hey_neken@mundurat.net>, 2004,2005,2006.
-# Peio Ziarsolo <peio@sindominio.net>, 2001, 2002.
-#
 #
+# Peio Ziarsolo <peio@sindominio.net>, 2001, 2002.
+# Mikel Olasagasti <hey_neken@mundurat.net>, 2004, 2005, 2006.
 msgid ""
 msgstr ""
 "Project-Id-Version: nano 1.9.99pre0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-22 06:34-0500\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\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"
+"Language: eu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: src/browser.c:220
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:203
 msgid "Go To Directory"
 msgstr "Joan direktorio honetara"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:860 src/files.c:2048
-#: src/nano.c:1060 src/search.c:220 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Bertan behera utzita"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:246 src/browser.c:293
 #, c-format
 msgid "Can't go outside of %s in restricted mode"
 msgstr "Ezin da %stik kanpora joan era murriztuan"
 
-#: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:722
-#: src/files.c:731 src/files.c:1540 src/files.c:1659 src/files.c:1711
-#: src/files.c:1732 src/files.c:1855 src/files.c:2691 src/rcfile.c:568
-#: src/rcfile.c:1204
+#: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
+#: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
+#: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Errorea %s irakurtzen: %s"
 
-#: src/browser.c:303
+#: src/browser.c:283
 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:665 src/browser.c:674
+#: src/browser.c:626 src/browser.c:635
 msgid "(dir)"
 msgstr "(dir)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:632
 msgid "(parent dir)"
 msgstr "(aita dir.)"
 
-#: src/browser.c:801 src/search.c:185
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "Bilatu"
 
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:805 src/search.c:189
-msgid " [Case Sensitive]"
-msgstr "[May/Min]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:811 src/search.c:195
-msgid " [Regexp]"
-msgstr "[Regexp]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:817 src/search.c:201
-msgid " [Backwards]"
-msgstr "[Atzeruntza]"
-
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "Bilaketa berriz hasia"
 
-#: src/browser.c:1006 src/browser.c:1039 src/search.c:514 src/search.c:517
-#: src/search.c:574 src/search.c:577
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "Hau da kointzidentzia bakarra"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr "Ez dago bilatzeko eredurik"
 
-#: src/files.c:125
+#: src/files.c:139
+msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
+msgstr ""
+
+#: src/files.c:145
+#, fuzzy, c-format
+msgid "Couldn't determine hostname for lock file: %s"
+msgstr "Ezin izan da aldi baterako fitxategia sortu: %s"
+
+#: src/files.c:165 src/files.c:175 src/files.c:212 src/files.c:222
+#, fuzzy, c-format
+msgid "Error writing lock file %s: %s"
+msgstr "Errorea aldi baterako fitxategia idazten: %s"
+
+#: src/files.c:237
+#, fuzzy, c-format
+msgid "Error deleting lock file %s: %s"
+msgstr "Errorea aldi baterako fitxategia idazten: %s"
+
+#: src/files.c:272
+#, fuzzy, c-format
+msgid "Error opening lock file %s: %s"
+msgstr "Errorea %s irakurtzen: %s"
+
+#: src/files.c:282
+#, 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:297
+#, c-format
+msgid "File %s is being edited (by %s with %s, PID %d); continue?"
+msgstr ""
+
+#: src/files.c:308
+#, c-format
+msgid "Error writing lock file: Directory '%s' doesn't exist"
+msgstr ""
+
+#: src/files.c:339
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Ezin da artxiboa txertatu %s-tik kanpo"
 
-#: src/files.c:234
+#: src/files.c:467
 msgid "No more open file buffers"
 msgstr "Ez dago irekitako fitxategi buffer gehiagorik"
 
-#: src/files.c:250
+#: src/files.c:484
 #, c-format
 msgid "Switched to %s"
 msgstr "%s-ra aldatua"
 
-#: src/files.c:251 src/global.c:469 src/winio.c:2168
+#: src/files.c:485 src/global.c:953 src/winio.c:2161
 msgid "New Buffer"
 msgstr "Bufer berria"
 
-#: src/files.c:633
+#: src/files.c:874
 #, 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:638
+#: src/files.c:879
 #, fuzzy, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
@@ -128,14 +152,14 @@ msgid_plural ""
 msgstr[0] "Lerro %lu irakurria (DOS eta Mac formatutik bihurtuak)"
 msgstr[1] "%lu lerro irakurriak (DOS eta Mac formatutik bihurtuak)"
 
-#: src/files.c:644
+#: src/files.c:885
 #, 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:648
+#: src/files.c:889
 #, fuzzy, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
@@ -144,14 +168,14 @@ msgid_plural ""
 msgstr[0] "Lerro %lu irakurria (Mac formatutik bihurtuak)"
 msgstr[1] "%lu lerro irakurriak (Mac formatutik bihurtuak)"
 
-#: src/files.c:654
+#: src/files.c:895
 #, 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:658
+#: src/files.c:899
 #, fuzzy, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
@@ -160,492 +184,447 @@ msgid_plural ""
 msgstr[0] "Lerro %lu irakurria (DOS formatutik bihurtuak)"
 msgstr[1] "%lu lerro irakurriak (DOS formatutik bihurtuak)"
 
-#: src/files.c:664
+#: src/files.c:905
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "Lerro %lu irakurria"
 msgstr[1] "%lu lerro irakurriak"
 
-#: src/files.c:667
+#: src/files.c:908
 #, 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:700 src/files.c:736
+#: src/files.c:943 src/files.c:980
 msgid "Reading File"
 msgstr "Fitxategia irakurtzen"
 
-#: src/files.c:706
+#: src/files.c:950
 msgid "New File"
 msgstr "Fitxategi berria"
 
-#: src/files.c:709
+#: src/files.c:953
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" ezin aurkitu"
 
-#: src/files.c:717 src/rcfile.c:559 src/rcfile.c:1154 src/rcfile.c:1195
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" direktorio bat da"
 
-#: src/files.c:718 src/rcfile.c:560 src/rcfile.c:1155 src/rcfile.c:1196
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" fitxategia dispositibo-fitxategi bat da"
 
-#: src/files.c:817
+#: src/files.c:1060
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Buffer berrian exekutatzeko komandoa [%s-tik] "
 
-#: src/files.c:819
+#: src/files.c:1062
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Exekutatutzeko komandoa [%s-(e)tik] "
 
-#: src/files.c:825
+#: src/files.c:1069
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Buffer berrian txertatzeko fitxategia [%s-tik]"
 
-#: src/files.c:827
+#: src/files.c:1071
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Txertatzeko fitxategia [%s-tik] "
 
-#: src/files.c:1077
+#: src/files.c:1320
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Baligabeko tekla ez-multibuffer moduan"
 
-#: src/files.c:1486
+#: src/files.c:1622
+msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+msgstr ""
+
+#: src/files.c:1746
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Ezin da %staz kanpo idatzi"
 
-#: src/files.c:1501
+#: src/files.c:1761
 msgid "Cannot prepend or append to a symlink with --nofollow set"
 msgstr ""
 "Ezin zaio hasieran edo amaieran gehitu esteka sinboliko bati --nofollow "
 "ezarria dagoenean"
 
-#: src/files.c:1581 src/files.c:1603 src/files.c:1621 src/files.c:1632
-#: src/files.c:1640 src/files.c:1667
+#: src/files.c:1843 src/files.c:1868 src/files.c:1886 src/files.c:1899
+#: src/files.c:1910 src/files.c:1939
 #, fuzzy, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Errorea aldi baterako fitxategia idazten: %s"
 
-#: src/files.c:1582 src/nano.c:701
+#: src/files.c:1844 src/nano.c:719
 msgid "Too many backup files?"
 msgstr "Babes-kopia fitxategi gehiegi?"
 
-#: src/files.c:1687 src/files.c:1744 src/files.c:1763 src/files.c:1775
-#: src/files.c:1799 src/files.c:1817 src/files.c:1827 src/files.c:1863
-#: src/files.c:1868 src/files.c:2764 src/files.c:2773
+#: src/files.c:1959 src/files.c:2016 src/files.c:2035 src/files.c:2047
+#: src/files.c:2071 src/files.c:2089 src/files.c:2099 src/files.c:2135
+#: src/files.c:2140 src/files.c:3101 src/files.c:3110 src/files.c:3133
+#: src/files.c:3145
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Errorea %s idazten: %s"
 
-#: src/files.c:1721 src/text.c:2929 src/text.c:2941
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Errorea aldi baterako fitxategia idazten: %s"
 
-#: src/files.c:1900
+#: src/files.c:2173
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "Lerro %lu idatzia"
 msgstr[1] "%lu lerro idatziak"
 
-#: src/files.c:2004
+#: src/files.c:2278
 msgid " [DOS Format]"
 msgstr "[DOS formatua]"
 
-#: src/files.c:2005
+#: src/files.c:2279
 msgid " [Mac Format]"
 msgstr "[Mac formatua]"
 
-#: src/files.c:2007
+#: src/files.c:2281
 msgid " [Backup]"
 msgstr " [Babeskopia]"
 
-#: src/files.c:2015
+#: src/files.c:2289
 msgid "Prepend Selection to File"
 msgstr "Gehitu aukeraketa fitxategiaren hasieran"
 
-#: src/files.c:2016
+#: src/files.c:2290
 msgid "Append Selection to File"
 msgstr "Gehitu aukeraketa fitxategian"
 
-#: src/files.c:2017
+#: src/files.c:2291
 msgid "Write Selection to File"
 msgstr "Ahuatespena artxiboan idatzi"
 
-#: src/files.c:2020
+#: src/files.c:2294
 msgid "File Name to Prepend to"
 msgstr "Gehitu nahi duzun fitxategiaren izena"
 
-#: src/files.c:2021
+#: src/files.c:2295
 msgid "File Name to Append to"
 msgstr "Gehituko zaion fitxategiaren izena "
 
-#: src/files.c:2022
+#: src/files.c:2296
 msgid "File Name to Write"
 msgstr "Idatzi nahi duzun artxiboaren izena"
 
-#: src/files.c:2153
+#: src/files.c:2427
 msgid "File exists, OVERWRITE ? "
 msgstr "Fitxategia existitzen da dagoeneko, GAINIDATZI?"
 
-#: src/files.c:2162
+#: src/files.c:2436
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "Gorde fitxategia BESTE izen batekin?"
 
-#: src/files.c:2173
+#: src/files.c:2450
 msgid "File was modified since you opened it, continue saving ? "
 msgstr ""
 
-#: src/files.c:2611
+#: src/files.c:2882
 msgid "(more)"
 msgstr "(gehiago)"
 
-#: src/files.c:2694 src/rcfile.c:1220
-#, c-format
+#: src/files.c:2974
+#, fuzzy, c-format
 msgid ""
 "\n"
-"Press Enter to continue starting nano.\n"
+"Press Enter to continue\n"
 msgstr ""
 "\n"
-"Nano abiarazten jarraitzeko return sakatu.\n"
-
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:415 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Bertan behera utzi"
+"Nanorekin jarraitzeko return sakatu\n"
 
-#: src/global.c:416
-msgid "Replace"
-msgstr "Ordezkatu"
+#: src/files.c:2989
+#, c-format
+msgid ""
+"Unable to create directory %s: %s\n"
+"It is required for saving/loading search history or cursor positions.\n"
+msgstr ""
 
-#: src/global.c:417
-msgid "No Replace"
-msgstr "Ez ordezkatu"
+#: src/files.c:2995
+#, 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/global.c:420
-msgid "Case Sens"
-msgstr "May/Min"
+#: src/files.c:3012
+#, 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/global.c:421
-msgid "Backwards"
-msgstr "Atzeruntza"
+#: src/files.c:3016
+#, 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 ""
 
-#: src/global.c:425
-msgid "Regexp"
-msgstr "Regexp"
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
+#: src/global.c:477
+msgid "Exit"
+msgstr "Irten"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:451
-msgid "PrevHstory"
-msgstr "Aurreko historikoa"
+#: src/global.c:478
+msgid "Close"
+msgstr "Itxi"
 
-#: src/global.c:452
-msgid "NextHstory"
-msgstr "Hurrengo historikoa"
+#: src/global.c:479
+#, fuzzy
+msgid "Uncut Text"
+msgstr "Ezmoztu testua"
 
-#: src/global.c:453
-msgid "Go To Text"
-msgstr "Joan testu hontara"
+#: src/global.c:481
+#, fuzzy
+msgid "Unjustify"
+msgstr "Justifikazioa ezeztatu"
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:455
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:485
 msgid "WhereIs Next"
 msgstr "Non dago Hur."
 
-#: src/global.c:457
-msgid "First File"
-msgstr "Lehen fitxategia"
-
-#: src/global.c:458
-msgid "Last File"
-msgstr "Azken Fitxategia"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:460
-msgid "To Files"
-msgstr "Fitxategietara"
-
-#: src/global.c:462
-msgid "DOS Format"
-msgstr "DOS formatua"
-
-#: src/global.c:463
-msgid "Mac Format"
-msgstr "Mac formatua"
-
-#: src/global.c:464
-msgid "Append"
-msgstr "Gehitu"
-
-#: src/global.c:465
-msgid "Prepend"
-msgstr "Gehitu"
-
-#: src/global.c:466
-msgid "Backup File"
-msgstr "Babeskopia fitxategia"
-
-#: src/global.c:467
-msgid "Execute Command"
-msgstr "Exekutatu komandoa"
-
-#: src/global.c:471
-msgid "Go To Dir"
-msgstr "Joan direktorio honetara"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:480
-msgid "Get Help"
-msgstr "Laguntza begiratu"
-
-#: src/global.c:481
-msgid "Exit"
-msgstr "Irten"
-
-#: src/global.c:482
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:492
 msgid "Where Is"
 msgstr "Bilatu"
 
-#: src/global.c:483
-msgid "Prev Page"
-msgstr "Aurreko orrialdea"
-
-#: src/global.c:484
-msgid "Next Page"
-msgstr "Hurrengo orrialdea"
-
-#: src/global.c:485
-msgid "First Line"
-msgstr "Lehen lerroa"
+#: src/global.c:493
+msgid "Replace"
+msgstr "Ordezkatu"
 
-#: src/global.c:486
-msgid "Last Line"
-msgstr "Azken lerroa"
+#: src/global.c:494
+msgid "Go To Line"
+msgstr "Joan lerro hontara"
 
-#: src/global.c:487
-#, fuzzy
-msgid "Suspend"
-msgstr "Eseki"
+#: src/global.c:495
+msgid "Prev Line"
+msgstr "Aurreko lerroa"
 
-#: src/global.c:489
-msgid "Beg of Par"
-msgstr "Par hasi"
+#: src/global.c:496
+msgid "Next Line"
+msgstr "Hurrengo lerroa"
 
-#: src/global.c:490
-msgid "End of Par"
-msgstr "Par amai"
+#: src/global.c:497
+msgid "Read File"
+msgstr "Artxiboa irakurri"
 
-#: src/global.c:491
+#: src/global.c:499
 msgid "FullJstify"
 msgstr "Justifikatu"
 
-#: src/global.c:493
+#: src/global.c:501
 msgid "Refresh"
 msgstr "Freskatu"
 
-#: src/global.c:495
-msgid "Insert File"
-msgstr "Txertatu fitxategia"
-
-#: src/global.c:497
-msgid "Go To Line"
-msgstr "Joan lerro hontara"
-
-#: src/global.c:500
+#. 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:507
 msgid "Justify the current paragraph"
 msgstr "Uneko parrafoa justifikatu"
 
-#. 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:505
+#: src/global.c:509
 msgid "Cancel the current function"
 msgstr "Uneko funtzioa bertan behera utzi"
 
-#: src/global.c:506
+#: src/global.c:510
 msgid "Display this help text"
 msgstr "Erakutsi laguntza testu hau"
 
-#: src/global.c:509
+#: src/global.c:513
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Unean kargatutako fitxategi bufferra itxi/Nanotik irten"
 
-#: src/global.c:511
+#: src/global.c:515
 msgid "Exit from nano"
 msgstr "Nanotik irten"
 
-#: src/global.c:515
+#: src/global.c:519
 msgid "Write the current file to disk"
 msgstr "Uneko artxiboa diskoan idatzi"
 
-#: src/global.c:517
+#: src/global.c:521
 msgid "Insert another file into the current one"
 msgstr "Uneko lerroan beste lerro bat txertatu"
 
-#: src/global.c:519
+#: src/global.c:523
 msgid "Search for a string or a regular expression"
 msgstr "Bilatu kate bat edo expresio erregular bat"
 
-#: src/global.c:520
+#: src/global.c:526
 #, fuzzy
-msgid "Go to previous screen"
-msgstr "Aurreko pantailara mugitu"
+msgid "Search for a string"
+msgstr "Bilatu kate bat edo expresio erregular bat"
 
-#: src/global.c:521
-#, fuzzy
-msgid "Go to next screen"
-msgstr "Hurrengo pantailara mugitu"
+#: src/global.c:528
+msgid "Go one screenful up"
+msgstr ""
 
-#: src/global.c:523
+#: src/global.c:529
+msgid "Go one screenful down"
+msgstr ""
+
+#: src/global.c:531
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Uneko lerroa moztu eta cutbufferean gorde"
 
-#: src/global.c:525
+#: src/global.c:533
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Cutbufferekoa uneko lerroan txertatu"
 
-#: src/global.c:527
+#: src/global.c:534
 msgid "Display the position of the cursor"
 msgstr "Kurtsorearen posisioa erakutsi"
 
-#: src/global.c:529
+#: src/global.c:536
 msgid "Invoke the spell checker, if available"
 msgstr "Deitu zuzentzaileari, eskuragarri badago"
 
-#: src/global.c:531
+#: src/global.c:538
 msgid "Replace a string or a regular expression"
 msgstr "Ordezkatu kate bat edo expresio erregular bat"
 
-#: src/global.c:532
+#: src/global.c:539
 msgid "Go to line and column number"
 msgstr "Joan espezifikatutako lerro eta zutabera"
 
-#: src/global.c:534
-msgid "Mark text at the cursor position"
+#: src/global.c:541
+#, fuzzy
+msgid "Mark text starting from the cursor position"
 msgstr "Markatu testua kurtsorearen uneko posizioan"
 
-#: src/global.c:535
-msgid "Repeat last search"
+#: src/global.c:542
+#, fuzzy
+msgid "Repeat the last search"
 msgstr "Errepikatu azken bilaketa"
 
-#: src/global.c:537
+#: src/global.c:544
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "Uneko lerroa kopiatu eta cutbufferean gorde"
 
-#: src/global.c:538
+#: src/global.c:545
 msgid "Indent the current line"
 msgstr "Koskatu uneko lerroa"
 
-#: src/global.c:539
+#: src/global.c:546
 msgid "Unindent the current line"
 msgstr "Koska kendu uneko lerroari"
 
-#: src/global.c:540
+#: src/global.c:547
 msgid "Undo the last operation"
 msgstr ""
 
-#: src/global.c:541
+#: src/global.c:548
 msgid "Redo the last undone operation"
 msgstr ""
 
-#: src/global.c:543
+#: src/global.c:550
 #, fuzzy
 msgid "Go forward one character"
 msgstr "Karaktere bat aurreruntz mugitu"
 
-#: src/global.c:544
+#: src/global.c:551
 #, fuzzy
 msgid "Go back one character"
 msgstr "Karaktere bat atzeruntz mugitu"
 
-#: src/global.c:546
+#: src/global.c:553
 #, fuzzy
 msgid "Go forward one word"
 msgstr "Mugitu hitz bat atzera"
 
-#: src/global.c:547
+#: src/global.c:554
 #, fuzzy
 msgid "Go back one word"
 msgstr "Mugitu hitz bat atzeruntz"
 
-#: src/global.c:549
+#: src/global.c:556
 #, fuzzy
 msgid "Go to previous line"
 msgstr "Aurreko lerrora mugitu"
 
-#: src/global.c:550
+#: src/global.c:557
 #, fuzzy
 msgid "Go to next line"
 msgstr "Mugitu hurrengo lerrora"
 
-#: src/global.c:551
+#: src/global.c:558
 #, fuzzy
 msgid "Go to beginning of current line"
 msgstr "Uneko lerroaren hasierara mugitu"
 
-#: src/global.c:552
+#: src/global.c:559
 #, fuzzy
 msgid "Go to end of current line"
 msgstr "Uneko lerroaren bukaerara mugitu"
 
-#: src/global.c:555
+#: src/global.c:562
 #, fuzzy
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "Mugitu uneko parrafoaren hasierara"
 
-#: src/global.c:557
+#: src/global.c:564
 #, fuzzy
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr "Mugitu uneko parrafoaren amaierara"
 
-#: src/global.c:560
+#: src/global.c:566
 #, fuzzy
 msgid "Go to the first line of the file"
 msgstr "Mugitu fitxategiaren lehen lerrora"
 
-#: src/global.c:562
+#: src/global.c:567
 #, fuzzy
 msgid "Go to the last line of the file"
 msgstr "Mugitu fitxategiaren azken lerrora"
 
-#: src/global.c:564
+#: src/global.c:569
 #, fuzzy
 msgid "Go to the matching bracket"
 msgstr "Ez dago giltz egokirik"
 
-#: src/global.c:566
+#: src/global.c:571
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "Korritu gora lerro bat kurtsorea korritu gabe"
 
-#: src/global.c:568
+#: src/global.c:573
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "Korritu behera lerro bat kurtsorea korritu gabe"
 
-#: src/global.c:572
+#: src/global.c:576
 msgid "Switch to the previous file buffer"
 msgstr "Aldatu aurreko fitxategi buffer-era"
 
-#: src/global.c:574
+#: src/global.c:577
 msgid "Switch to the next file buffer"
 msgstr "Aldatu hurrengo fitxategi buffer-era"
 
-#: src/global.c:577
+#: src/global.c:579
 msgid "Insert the next keystroke verbatim"
 msgstr "Hurrengo tekla-sakatzea literalki sartu"
 
-#: src/global.c:579
+#: src/global.c:580
 msgid "Insert a tab at the cursor position"
 msgstr "Txertatu tabuladore karaktere bat kurtsorearen posizioan"
 
@@ -654,343 +633,461 @@ msgstr "Txertatu tabuladore karaktere bat kurtsorearen posizioan"
 msgid "Insert a newline at the cursor position"
 msgstr "Orga-itzulera bat kurtsorearen posizioan txertatu"
 
-#: src/global.c:583
+#: src/global.c:582
 msgid "Delete the character under the cursor"
 msgstr "Kurtsorearen azpiko karaterea ezabatu"
 
-#: src/global.c:585
+#: src/global.c:584
 msgid "Delete the character to the left of the cursor"
 msgstr "Kurtsorearen ezkerraldeko karaterea ezabatu"
 
-#: src/global.c:588
+#: src/global.c:587
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Moztu kurtsoretik posiziotik lerro amaierara arte"
 
-#: src/global.c:591
+#: src/global.c:590
 msgid "Justify the entire file"
 msgstr "Justifikatu lerro osoa"
 
-#: src/global.c:595
+#: src/global.c:594
 msgid "Count the number of words, lines, and characters"
 msgstr "Zenbatu hitz, lerro eta karaktere kopurua"
 
-#: src/global.c:598
+#: src/global.c:597
 msgid "Refresh (redraw) the current screen"
 msgstr "Freskatu uneko pantaila"
 
-#: src/global.c:600
+#: src/global.c:599
 msgid "Suspend the editor (if suspend is enabled)"
 msgstr ""
 
-#: src/global.c:603
+#: src/global.c:602
 #, fuzzy
 msgid "Toggle the case sensitivity of the search"
 msgstr "Mayuskula/minuskulaz egindako bilaketa"
 
-#: src/global.c:605
+#: src/global.c:604
 #, fuzzy
 msgid "Reverse the direction of the search"
 msgstr "kurtsorearen posisioa erakutsi"
 
-#: src/global.c:609
+#: src/global.c:608
 #, fuzzy
 msgid "Toggle the use of regular expressions"
 msgstr "Expresio erregularrak erabili"
 
-#: src/global.c:613
+#: src/global.c:612
 #, fuzzy
 msgid "Recall the previous search/replace string"
 msgstr "Editatu aurreko bilaketa/aldaketa kateak"
 
-#: src/global.c:615
+#: src/global.c:614
 #, fuzzy
 msgid "Recall the next search/replace string"
 msgstr "Editatu aurreko bilaketa/aldaketa kateak"
 
-#: src/global.c:618
+#: src/global.c:617
 msgid "Go to file browser"
 msgstr "Fitxategi nabigatzailera joan"
 
-#: src/global.c:621
+#: src/global.c:620
 #, fuzzy
 msgid "Toggle the use of DOS format"
 msgstr "Dos formatoan fitxategia idazten"
 
-#: src/global.c:622
+#: src/global.c:621
 #, fuzzy
 msgid "Toggle the use of Mac format"
 msgstr "Idatzi fitxategia Mac formatuan"
 
-#: src/global.c:624
+#: src/global.c:622
 #, fuzzy
 msgid "Toggle appending"
 msgstr "Auto-doitu lerro luzeak"
 
-#: src/global.c:625
+#: src/global.c:623
 msgid "Toggle prepending"
 msgstr ""
 
-#: src/global.c:628
+#: src/global.c:624
 #, fuzzy
 msgid "Toggle backing up of the original file"
 msgstr "Gorde existitzen diren fitxategien babeskopiak"
 
-#: src/global.c:629
+#: src/global.c:625
 msgid "Execute external command"
 msgstr "Exekutatu kanpo-komandoa"
 
-#: src/global.c:633
+#: src/global.c:628
 #, fuzzy
 msgid "Toggle the use of a new buffer"
 msgstr "Ezin izan da hodi buffer-aren tamainua lortu"
 
-#: src/global.c:636
+#: src/global.c:631
 msgid "Exit from the file browser"
 msgstr "Irten fitxategi nabigatzailetik"
 
-#: src/global.c:638
+#: src/global.c:632
 msgid "Go to the first file in the list"
 msgstr "Joan zerrendako lehen fitxategira"
 
-#: src/global.c:640
+#: src/global.c:633
 msgid "Go to the last file in the list"
 msgstr "Joan zerrendako azken fitxategira"
 
-#: src/global.c:641
+#: src/global.c:634
+#, fuzzy
+msgid "Go to the previous file in the list"
+msgstr "Joan zerrendako lehen fitxategira"
+
+#: src/global.c:635
 #, fuzzy
 msgid "Go to the next file in the list"
 msgstr "Joan zerrendako azken fitxategira"
 
+#: src/global.c:636
+msgid "Go to directory"
+msgstr "Joan direktorio honetara"
+
+#: src/global.c:639
+#, fuzzy
+msgid "Invoke the linter, if available"
+msgstr "Deitu zuzentzaileari, eskuragarri badago"
+
+#: src/global.c:640
+#, fuzzy
+msgid "Go to previous linter msg"
+msgstr "Aurreko lerrora mugitu"
+
+#: src/global.c:641
+#, fuzzy
+msgid "Go to next linter msg"
+msgstr "Mugitu hurrengo lerrora"
+
 #: src/global.c:642
 #, fuzzy
-msgid "Go to the previous file in the list"
-msgstr "Joan zerrendako lehen fitxategira"
+msgid "Invoke formatter, if available"
+msgstr "Deitu zuzentzaileari, eskuragarri badago"
 
-#: src/global.c:643
-msgid "Go to directory"
-msgstr "Joan direktorio honetara"
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:662
+msgid "Get Help"
+msgstr "Laguntza begiratu"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:670
-msgid "Close"
-msgstr "Itxi"
+#: src/global.c:665 src/prompt.c:1084
+msgid "Cancel"
+msgstr "Bertan behera utzi"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:679
-msgid "WriteOut"
+#: src/global.c:678
+#, fuzzy
+msgid "Write Out"
 msgstr "Gorde"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:704
+msgid "Go To Dir"
+msgstr "Joan direktorio honetara"
+
+#: src/global.c:719
+msgid "Cut Text"
+msgstr "Textua moztu"
+
+#: src/global.c:728
 msgid "Justify"
 msgstr "Justifikatu"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:696
-msgid "Read File"
-msgstr "Artxiboa irakurri"
+#: src/global.c:733
+msgid "To Spell"
+msgstr "Ortografia"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:713
-msgid "Cut Text"
-msgstr "Textua moztu"
+#: src/global.c:738
+#, fuzzy
+msgid "To Linter"
+msgstr "Joan lerro hontara"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:718
-msgid "UnJustify"
-msgstr "Justifikazioa ezeztatu"
+#: src/global.c:740
+#, fuzzy
+msgid "Formatter"
+msgstr "DOS formatua"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:723
-msgid "UnCut Text"
-msgstr "Ezmoztu testua"
+#: src/global.c:745
+msgid "Case Sens"
+msgstr "May/Min"
+
+#: src/global.c:750
+msgid "Regexp"
+msgstr "Regexp"
+
+#: src/global.c:755
+msgid "Backwards"
+msgstr "Atzeruntza"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:728 src/global.c:755
+#: src/global.c:762
+msgid "No Replace"
+msgstr "Ez ordezkatu"
+
+#: src/global.c:770
 msgid "Cur Pos"
 msgstr "Uneko posizioa"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:737
-msgid "To Spell"
-msgstr "Ortografia"
+#: src/global.c:780
+msgid "Prev Page"
+msgstr "Aurreko orrialdea"
+
+#: src/global.c:782
+msgid "Next Page"
+msgstr "Hurrengo orrialdea"
+
+#: src/global.c:785
+msgid "First Line"
+msgstr "Lehen lerroa"
+
+#: src/global.c:787
+msgid "Last Line"
+msgstr "Azken lerroa"
 
-#: src/global.c:771
+#: src/global.c:794
+#, fuzzy
+msgid "To Bracket"
+msgstr "Ez da hori giltza"
+
+#: src/global.c:797
 msgid "Mark Text"
 msgstr "Textua markatu"
 
-#: src/global.c:777
+#: src/global.c:800
 msgid "Copy Text"
 msgstr "Kopiatu testua"
 
-#: src/global.c:780
+#: src/global.c:803
 msgid "Indent Text"
 msgstr "Koskatu testua"
 
-#: src/global.c:783
+#: src/global.c:805
 msgid "Unindent Text"
 msgstr "Ez koskatu testua"
 
-#: src/global.c:787
+#: src/global.c:808
 msgid "Undo"
 msgstr ""
 
-#: src/global.c:790
+#: src/global.c:810
 msgid "Redo"
 msgstr ""
 
-#: src/global.c:796 src/global.c:800
-msgid "Forward"
-msgstr "Aurrean"
-
-#: src/global.c:806 src/global.c:810
+#: src/global.c:814 src/global.c:820
 msgid "Back"
 msgstr "Atzean"
 
-#: src/global.c:817
-msgid "Next Word"
-msgstr "Hurrengo hitza"
+#: src/global.c:816 src/global.c:822
+msgid "Forward"
+msgstr "Aurrean"
 
-#: src/global.c:820
+#: src/global.c:827
 msgid "Prev Word"
 msgstr "Aurreko hitza"
 
-#: src/global.c:824
-msgid "Prev Line"
-msgstr "Aurreko lerroa"
-
-#: src/global.c:827
-msgid "Next Line"
-msgstr "Hurrengo lerroa"
+#: src/global.c:829
+msgid "Next Word"
+msgstr "Hurrengo hitza"
 
-#: src/global.c:830
+#: src/global.c:833
 msgid "Home"
 msgstr "Etxea"
 
-#: src/global.c:833
+#: src/global.c:835
 msgid "End"
 msgstr "Bukaera"
 
-#: src/global.c:845
-msgid "Find Other Bracket"
-msgstr "Beste giltz bat bilatu"
+#: src/global.c:844
+msgid "Beg of Par"
+msgstr "Par hasi"
+
+#: src/global.c:846
+msgid "End of Par"
+msgstr "Par amai"
 
-#: src/global.c:848
+#: src/global.c:851
 msgid "Scroll Up"
 msgstr "Korritu gora"
 
-#: src/global.c:851
+#: src/global.c:853
 msgid "Scroll Down"
 msgstr "Korritu behera"
 
-#: src/global.c:856
-msgid "Previous File"
+#: src/global.c:858
+#, fuzzy
+msgid "Prev File"
 msgstr "Aurreko fitxategia"
 
-#: src/global.c:858
+#: src/global.c:860
 msgid "Next File"
 msgstr "Hurrengo fitxategia"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:862 src/text.c:3045
-msgid "Verbatim Input"
+#: src/global.c:869
+#, fuzzy
+msgid "Verbatim"
 msgstr "Sarrera literala"
 
-#: src/global.c:867
+#: src/global.c:872
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:870
+#: src/global.c:874
 msgid "Enter"
 msgstr "Sartu"
 
-#: src/global.c:873
+#: src/global.c:876
 msgid "Delete"
 msgstr "Ezabatu"
 
-#: src/global.c:876
+#: src/global.c:878
 msgid "Backspace"
 msgstr "Atzera tekla"
 
-#: src/global.c:893
+#: src/global.c:888
 msgid "CutTillEnd"
 msgstr "MoztuAmaieraraArte"
 
-#: src/global.c:906
+#: src/global.c:898
 msgid "Word Count"
 msgstr "Hitz kopurua"
 
-#: src/global.c:1367
+#: src/global.c:905
+#, fuzzy
+msgid "Suspend"
+msgstr "Eseki"
+
+#: src/global.c:910
+msgid "PrevHstory"
+msgstr "Aurreko historikoa"
+
+#: src/global.c:913
+msgid "NextHstory"
+msgstr "Hurrengo historikoa"
+
+#: src/global.c:917
+msgid "Go To Text"
+msgstr "Joan testu hontara"
+
+#: src/global.c:928
+msgid "DOS Format"
+msgstr "DOS formatua"
+
+#: src/global.c:931
+msgid "Mac Format"
+msgstr "Mac formatua"
+
+#: src/global.c:934
+msgid "Append"
+msgstr "Gehitu"
+
+#: src/global.c:936
+msgid "Prepend"
+msgstr "Gehitu"
+
+#: src/global.c:939
+msgid "Backup File"
+msgstr "Babeskopia fitxategia"
+
+#: src/global.c:946
+msgid "Execute Command"
+msgstr "Exekutatu komandoa"
+
+#: src/global.c:961
+msgid "To Files"
+msgstr "Fitxategietara"
+
+#: src/global.c:964
+msgid "First File"
+msgstr "Lehen fitxategia"
+
+#: src/global.c:966
+msgid "Last File"
+msgstr "Azken Fitxategia"
+
+#: src/global.c:977
+#, fuzzy
+msgid "Prev Lint Msg"
+msgstr "Aurreko lerroa"
+
+#: src/global.c:979
+#, 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:1227
 msgid "Help mode"
 msgstr "Laguntza modua"
 
-#: src/global.c:1369
+#: src/global.c:1229
 msgid "Constant cursor position display"
 msgstr "Kurtzorearen posizioa bistaratu beti"
 
-#: src/global.c:1371
+#: src/global.c:1231
 msgid "Use of one more line for editing"
 msgstr "Erabili lerro bat edo gehiago editatzeko"
 
-#: src/global.c:1373
+#: src/global.c:1233
 msgid "Smooth scrolling"
 msgstr "Korritze leuna"
 
-#: src/global.c:1375
+#: src/global.c:1235
+#, fuzzy
+msgid "Soft wrapping of overlong lines"
+msgstr "Ez doitu lerro luzeak"
+
+#: src/global.c:1237
 msgid "Whitespace display"
 msgstr "Erakutsi txuriguneak"
 
-#: src/global.c:1377
+#: src/global.c:1239
 msgid "Color syntax highlighting"
 msgstr "Kolore sintaxi nabarmentzea"
 
-#: src/global.c:1379
+#: src/global.c:1241
 msgid "Smart home key"
 msgstr "'Smart home' tekla"
 
-#: src/global.c:1381
+#: src/global.c:1243
 msgid "Auto indent"
 msgstr "Auto indentatu"
 
-#: src/global.c:1383
+#: src/global.c:1245
 msgid "Cut to end"
 msgstr "Lerroaren bukaeraraino ebaki"
 
-#: src/global.c:1385
-msgid "Long line wrapping"
-msgstr "Auto-doitu lerro luzeak"
+#: src/global.c:1247
+#, fuzzy
+msgid "Hard wrapping of overlong lines"
+msgstr "Ez doitu lerro luzeak"
 
-#: src/global.c:1387
+#: src/global.c:1249
 msgid "Conversion of typed tabs to spaces"
 msgstr "Bihurtu idatzitako tabulazioak zuriuneetara"
 
-#: src/global.c:1389
+#: src/global.c:1251
 msgid "Backup files"
 msgstr "Babeskopia fitxategiak"
 
-#: src/global.c:1391
+#: src/global.c:1253
 msgid "Multiple file buffers"
 msgstr "Fitxategi anitzen buffer-a"
 
-#: src/global.c:1393
+#: src/global.c:1255
 msgid "Mouse support"
 msgstr "Xagu euskarria"
 
-#: src/global.c:1395
+#: src/global.c:1257
 msgid "No conversion from DOS/Mac format"
 msgstr "Ez bihurtu DOS/Mac formatuak"
 
-#: src/global.c:1397
+#: src/global.c:1259
 msgid "Suspension"
 msgstr "Eseki"
 
-#: src/global.c:1399
-#, fuzzy
-msgid "Soft line wrapping"
-msgstr "Auto-doitu lerro luzeak"
-
-#: src/help.c:236
+#: src/help.c:205
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1011,7 +1108,7 @@ msgstr ""
 "Enter sakatuz karaktere berririk sartu gabe aurreko bilaketa berriz burutuko "
 "du.  "
 
-#: src/help.c:245
+#: src/help.c:214
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1025,7 +1122,7 @@ msgstr ""
 " Honako funtzio teklak daude Bilaketa moduan:\n"
 "\n"
 
-#: src/help.c:251
+#: src/help.c:220
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1044,7 +1141,7 @@ msgstr ""
 " Honako funtzio teklak daude joan lerrora moduan:\n"
 "\n"
 
-#: src/help.c:260
+#: src/help.c:229
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1067,7 +1164,7 @@ msgstr ""
 "beste buffer batean kargatzen du (erabili Meta-< edo > buffer-ez "
 "aldatzeko).  "
 
-#: src/help.c:269
+#: src/help.c:238
 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"
@@ -1081,7 +1178,7 @@ msgstr ""
 " Honako funtzio teklak daude eskuragarri fitxategi txertaketa moduan:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:244
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1107,7 +1204,7 @@ msgstr ""
 "Honako funtzio teklak daude eskuragarri fitxategia idatzi moduan:\n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:258
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1132,7 +1229,7 @@ msgstr ""
 " Honako funtzio teklak daude eskuragarri fitxategi nabigatzaile moduan:\n"
 "\n"
 
-#: src/help.c:302
+#: src/help.c:271
 #, fuzzy
 msgid ""
 "Browser Search Command Help Text\n"
@@ -1155,7 +1252,7 @@ msgstr ""
 "Enter sakatuz karaktere berririk sartu gabe aurreko bilaketa berriz burutuko "
 "du.  "
 
-#: src/help.c:311
+#: src/help.c:280
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1163,7 +1260,7 @@ msgstr ""
 " Honako funtzio teklak daude eskuragarri Bilaketa Nabigatzaile moduan:\n"
 "\n"
 
-#: src/help.c:315
+#: src/help.c:284
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1186,7 +1283,7 @@ msgstr ""
 "moduan:\n"
 "\n"
 
-#: src/help.c:328
+#: src/help.c:297
 #, fuzzy
 msgid ""
 "Spell Check Help Text\n"
@@ -1210,7 +1307,7 @@ msgstr ""
 " Honako funtzio teklak daude eskuragarri zuzenketa moduan:\n"
 "\n"
 
-#: src/help.c:343
+#: src/help.c:312
 #, fuzzy
 msgid ""
 "Execute Command Help Text\n"
@@ -1231,7 +1328,7 @@ msgstr ""
 " Honako teklak gaituak daude modu hontan:\n"
 "\n"
 
-#: src/help.c:356
+#: src/help.c:325
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1251,7 +1348,7 @@ msgstr ""
 "erakutsiz.  Egoera lerroa da hirugarrena eta informazio garrantzitsuak "
 "ematen ditu  "
 
-#: src/help.c:366
+#: src/help.c:335
 #, fuzzy
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
@@ -1268,7 +1365,7 @@ msgstr ""
 "agertzen dira, eta Esc, Alt edo Meta-tekla (zure teklatuaren araberakoa) "
 "sakatuz erabili daitezke.  "
 
-#: src/help.c:375
+#: src/help.c:344
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1282,15 +1379,15 @@ msgstr ""
 "parentesi artean erakusten dira:\n"
 "\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:376 src/help.c:448
 msgid "enable/disable"
 msgstr "gaitu/ezgaitu"
 
-#: src/nano.c:587
+#: src/nano.c:601
 msgid "Key invalid in view mode"
 msgstr "Tekla baliogabea ikuskatze moduan"
 
-#: src/nano.c:695
+#: src/nano.c:713
 #, c-format
 msgid ""
 "\n"
@@ -1299,7 +1396,7 @@ msgstr ""
 "\n"
 "Bufferra hemen idatzia: %s\n"
 
-#: src/nano.c:697
+#: src/nano.c:715
 #, c-format
 msgid ""
 "\n"
@@ -1308,7 +1405,7 @@ msgstr ""
 "\n"
 "Bufferra ez da %s-(e)n idatzi: %s\n"
 
-#: src/nano.c:700
+#: src/nano.c:718
 #, c-format
 msgid ""
 "\n"
@@ -1317,11 +1414,11 @@ msgstr ""
 "\n"
 "Bufferra ez da idatzi: %s\n"
 
-#: src/nano.c:723
+#: src/nano.c:743
 msgid "Window size is too small for nano...\n"
 msgstr "Leihoaren tamainua txikiegia da nano-rentzat...\n"
 
-#: src/nano.c:816
+#: src/nano.c:836
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
@@ -1330,254 +1427,263 @@ msgstr ""
 "Erabilera: nano [AUKERAK] [[+LERROA,ZUTABEA] FITXATEGIA]\n"
 "\n"
 
-#: src/nano.c:819
+#: src/nano.c:839
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Aukera\t\tGNU aukera luzea\t\tEsanahia\n"
 
-#: src/nano.c:821
+#: src/nano.c:841
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Aukera\t\tEsanahia\n"
 
-#: src/nano.c:824
-msgid "Show this message"
-msgstr "Mezu hau erakutsi"
-
-#: src/nano.c:825
+#: src/nano.c:844
 msgid "+LINE,COLUMN"
 msgstr "+LERROA,ZUTABEA"
 
-#: src/nano.c:826
+#. TRANSLATORS: The next forty or so strings are option descriptions
+#. * for the --help output.  Try to keep them at most 40 characters.
+#: src/nano.c:847
 msgid "Start at line LINE, column COLUMN"
 msgstr "Hasi LERRO lerro zenbakian, ZUTABE zutabean"
 
-#: src/nano.c:828
+#: src/nano.c:849
 msgid "Enable smart home key"
 msgstr "Gaitu 'smart home' tekla"
 
-#: src/nano.c:829
+#: src/nano.c:850
 msgid "Save backups of existing files"
 msgstr "Gorde existitzen diren fitxategien babeskopiak"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "-C <dir>"
 msgstr "-C <dir>"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<dir>"
 
-#: src/nano.c:831
+#: src/nano.c:852
 msgid "Directory for saving unique backup files"
 msgstr "Babeskopia fitxategiak idazteko direktorioa"
 
-#: src/nano.c:834
+#: src/nano.c:855
 msgid "Use bold instead of reverse video text"
 msgstr "Erabili lodia alderantzizko testua beharrean"
 
-#: src/nano.c:837
+#: src/nano.c:858
 msgid "Convert typed tabs to spaces"
 msgstr "Bihurtu idatzitako tabuladoreak zuriuneetara"
 
-#: src/nano.c:840
+#: src/nano.c:861
 msgid "Enable multiple file buffers"
 msgstr "Gaitu fitxategi buffer ugari"
 
-#: src/nano.c:845
+#: src/nano.c:865
+msgid "Use (vim-style) lock files"
+msgstr ""
+
+#: src/nano.c:869
 msgid "Log & read search/replace string history"
 msgstr "Idatzi eta irakurri bilaketa/aldaketa kateen historia"
 
-#: src/nano.c:848
+#: src/nano.c:873
 msgid "Don't look at nanorc files"
 msgstr "Ez begiratu nanorc fitxategietan"
 
-#: src/nano.c:851
+#: src/nano.c:876
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Konpondu zenbakizko teklatu nahaste arazoak"
 
-#: src/nano.c:853
+#: src/nano.c:878
 msgid "Don't add newlines to the ends of files"
 msgstr "Ez gehitu lerro berria fitxategiaren amaieran"
 
-#: src/nano.c:856
+#: src/nano.c:881
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Ez bihurtu DOS/Mac formatuko fitxategiak"
 
-#: src/nano.c:858
+#: src/nano.c:883
 msgid "Use one more line for editing"
 msgstr "Erabili lerro bat edo gehiago editatzeko"
 
-#: src/nano.c:860
+#: src/nano.c:886
+#, fuzzy
+msgid "Log & read location of cursor position"
+msgstr "Txertatu tabuladore karaktere bat kurtsorearen posizioan"
+
+#: src/nano.c:889
 msgid "-Q <str>"
 msgstr "-Q <str>"
 
-#: src/nano.c:860
+#: src/nano.c:889
 msgid "--quotestr=<str>"
 msgstr "--quotestr=<str>"
 
-#: src/nano.c:861
+#: src/nano.c:890
 msgid "Quoting string"
 msgstr "Aipamen katea"
 
-#: src/nano.c:863
+#: src/nano.c:892
 msgid "Restricted mode"
 msgstr "Mugatutako modua"
 
-#: src/nano.c:866
+#: src/nano.c:895
 msgid "Scroll by line instead of half-screen"
 msgstr ""
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "-T <#cols>"
 msgstr "-T <#cols>"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#cols>"
 
-#: src/nano.c:869
+#: src/nano.c:898
 msgid "Set width of a tab to #cols columns"
 msgstr "Ezarri fitxa baten zabalera #cols-era"
 
-#: src/nano.c:871
+#: src/nano.c:900
 msgid "Do quick statusbar blanking"
 msgstr "Egin egoera-barra garbiketa azkarra"
 
-#: src/nano.c:874
+#: src/nano.c:903
 msgid "Print version information and exit"
 msgstr "Bertsioaren informazioa inprimatu eta irten"
 
-#: src/nano.c:877
+#: src/nano.c:906
 msgid "Detect word boundaries more accurately"
 msgstr "Aurkitu hitz amaierak zehatzago aurkitu"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "-Y <str>"
 msgstr "-Y <str>"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "--syntax=<str>"
 msgstr "--syntax=<str>"
 
-#: src/nano.c:881
+#: src/nano.c:910
 #, fuzzy
 msgid "Syntax definition to use for coloring"
 msgstr "Erabiltzeko sintaxi definizioa"
 
-#: src/nano.c:883
+#: src/nano.c:912
 msgid "Constantly show cursor position"
 msgstr "Erakutsi beti kurtsorearen posizioa"
 
-#: src/nano.c:885
+#: src/nano.c:914
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Konpondu atzera tekla/ezabatu nahaste arazoak"
 
-#: src/nano.c:888
+#: src/nano.c:915
+#, fuzzy
+msgid "Show this help text"
+msgstr "Erakutsi laguntza testu hau"
+
+#: src/nano.c:918
 msgid "Automatically indent new lines"
 msgstr "Automatikoki indentatu lerro berriak"
 
-#: src/nano.c:889
+#: src/nano.c:919
 msgid "Cut from cursor to end of line"
 msgstr "Moztu kurtsoretik lerro amaierara"
 
-#: src/nano.c:892
+#: src/nano.c:922
 msgid "Don't follow symbolic links, overwrite"
 msgstr "Ez jarraitu esteka sinbolikoak, gainidatzi"
 
-#: src/nano.c:894
+#: src/nano.c:924
 msgid "Enable the use of the mouse"
 msgstr "Gaitu xaguaren erabilera"
 
-#: src/nano.c:897
+#: src/nano.c:926
+msgid "Do not read the file (only write it)"
+msgstr ""
+
+#: src/nano.c:928
 msgid "-o <dir>"
 msgstr "-o <dir>"
 
-#: src/nano.c:897
+#: src/nano.c:928
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<dir>"
 
-#: src/nano.c:898
+#: src/nano.c:929
 msgid "Set operating directory"
 msgstr "Ezarri eragiketa direktorioa"
 
-#: src/nano.c:901
+#: src/nano.c:932
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Mantendu XON (^Q) eta XOFF (^S) teklak"
 
-#: src/nano.c:903
+#: src/nano.c:935
 msgid "Silently ignore startup issues like rc file errors"
 msgstr ""
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "-r <#cols>"
 msgstr "-r <#cols>"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "--fill=<#cols>"
 msgstr "--fill=<#cols>"
 
-#: src/nano.c:906
+#: src/nano.c:939
 #, fuzzy
-msgid "Set wrapping point at column #cols"
+msgid "Set hard-wrapping point at column #cols"
 msgstr "Ezarri zutabe-tab baten zabalera #cols-i"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "-s <prog>"
 msgstr "-s <prog>"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "--speller=<prog>"
 msgstr "--speller=<prog>"
 
-#: src/nano.c:910
+#: src/nano.c:943
 msgid "Enable alternate speller"
 msgstr "Gahitu zuzentzaile alternatiboa"
 
-#: src/nano.c:913
+#: src/nano.c:946
 msgid "Auto save on exit, don't prompt"
 msgstr "Irteterakoan automatikoki gorde, ez galdetu"
 
-#: src/nano.c:915
-msgid "Allow generic undo [EXPERIMENTAL]"
-msgstr ""
-
-#: src/nano.c:918
+#: src/nano.c:947
 msgid "View mode (read-only)"
 msgstr "Ikuskatze modua (irakurri bakarrik)"
 
-#: src/nano.c:920
-msgid "Don't wrap long lines"
+#: src/nano.c:949
+#, fuzzy
+msgid "Don't hard-wrap long lines"
 msgstr "Ez doitu lerro luzeak"
 
-#: src/nano.c:922
+#: src/nano.c:951
 msgid "Don't show the two help lines"
 msgstr "Ez erakutsi bi laguntza lerroak"
 
-#: src/nano.c:923
+#: src/nano.c:952
 msgid "Enable suspension"
 msgstr "Gaitu esekitzea"
 
-#: src/nano.c:924
+#: src/nano.c:954
 #, fuzzy
 msgid "Enable soft line wrapping"
 msgstr "Auto-doitu lerro luzeak"
 
-#: src/nano.c:928
-msgid "(ignored, for Pico compatibility)"
-msgstr "(ignoratua, Pico-rekin konpatibilitatea mantentzeko)"
-
-#: src/nano.c:938
-#, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
+#: src/nano.c:963
+#, fuzzy, c-format
+msgid " GNU nano, version %s\n"
 msgstr "GNU nano %s bertsioa (%s %s konpilatua)\n"
 
-#: src/nano.c:943
+#: src/nano.c:966
 #, 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:944
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1586,155 +1692,179 @@ msgstr ""
 "\n"
 "Konpilazio aukerak:"
 
-#: src/nano.c:1022
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr "Barkatu, funtzio horrentzat euskarria gaitu gabe dago"
 
-#: src/nano.c:1044
+#: src/nano.c:1125
+msgid "No file name"
+msgstr ""
+
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr ""
 "Buffer aldatua gorde? (\"Ez\" ERANTZUTEKOTAN ALDAKETAK DEUZESTUEGINGO DIRA) ?"
 
-#: src/nano.c:1088
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr ""
 
-#: src/nano.c:1114
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr ""
 
-#: src/nano.c:1182
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "SIGHUP edo SIGTERM jaso da\n"
 
-#: src/nano.c:1204
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Erabili \"fg\" nano-ra itzultzeko.\n"
 
-#: src/nano.c:1386
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "gaitua"
 
-#: src/nano.c:1387
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "ez gaitua"
 
-#: src/nano.c:1548 src/winio.c:1256
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr "Komando ezezaguna"
 
-#: src/nano.c:1674
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "XON ignoratua, kaka zarra"
 
-#: src/nano.c:1679
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF ignoratua, kaka zarra"
 
-#: src/nano.c:2209 src/rcfile.c:1100
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Eskatutako \"%s\" tab tamainua baliogabea da"
 
-#: src/nano.c:2268 src/rcfile.c:1025
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Eskatutako \"%s\" betetze tamainua baliogabea da"
 
+#: src/nano.c:2415
+#, c-format
+msgid "Type '%s -h' for a list of available options.\n"
+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:1259
+#: src/prompt.c:1055
 msgid "Yy"
 msgstr "Bb"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1056
 msgid "Nn"
 msgstr "Ee"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1057
 msgid "Aa"
 msgstr "Dd"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1071
 msgid "Yes"
 msgstr "Bai"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1076
 msgid "All"
 msgstr "Guztiak"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1081
 msgid "No"
 msgstr "Ez"
 
-#: src/rcfile.c:130
+#: src/rcfile.c:137
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Errorea %s-n %lu lerroan: "
 
-#: src/rcfile.c:185
+#: src/rcfile.c:196
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "'%s' argumentuak amaitu gabeko \" bat dauka"
 
-#: src/rcfile.c:212 src/rcfile.c:264 src/rcfile.c:711 src/rcfile.c:768
-#: src/rcfile.c:821
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Regex kateak \" karaktearekin hasi eta amaitu behar dute"
 
-#: src/rcfile.c:238 src/search.c:62
+#: src/rcfile.c:249 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "\"%s\" regex okerra: %s"
 
-#: src/rcfile.c:258
+#: src/rcfile.c:269
 msgid "Missing syntax name"
 msgstr "Sintaxiaren izena falta da"
 
-#: src/rcfile.c:316
+#: src/rcfile.c:340
 msgid "The \"none\" syntax is reserved"
 msgstr "\"none\" sintaxia erreserbaturik dago"
 
-#: src/rcfile.c:323
+#: src/rcfile.c:347
 msgid "The \"default\" syntax must take no extensions"
 msgstr "\"default\" sintaxiak ez du extentsiorik hartu behar"
 
-#: src/rcfile.c:386 src/rcfile.c:483
+#: src/rcfile.c:433
 #, fuzzy
 msgid "Missing key name"
 msgstr "Sintaxiaren izena falta da"
 
-#: src/rcfile.c:398 src/rcfile.c:499
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
+#: src/rcfile.c:442 src/rcfile.c:453
+msgid "Key name is too short"
 msgstr ""
 
-#: src/rcfile.c:407
-msgid "Must specify function to bind key to"
+#: src/rcfile.c:463
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr ""
 
-#: src/rcfile.c:418 src/rcfile.c:510
-msgid "Must specify menu to bind key to (or \"all\")"
+#: src/rcfile.c:472
+msgid "Must specify a function to bind the key to"
 msgstr ""
 
-#: src/rcfile.c:426
-#, fuzzy, c-format
-msgid "Could not map name \"%s\" to a function"
-msgstr "Ezin izan zen %s ireki %s idazteko"
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:482
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
+msgstr ""
 
-#: src/rcfile.c:432 src/rcfile.c:517
-#, fuzzy, c-format
-msgid "Could not map name \"%s\" to a menu"
-msgstr "Ezin izan da \"%s\"-i deitu"
+#: src/rcfile.c:489
+#, c-format
+msgid "Cannot map name \"%s\" to a function"
+msgstr ""
 
-#: src/rcfile.c:454
+#: src/rcfile.c:496
 #, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
+msgid "Cannot map name \"%s\" to a menu"
 msgstr ""
 
-#: src/rcfile.c:625
+#: src/rcfile.c:528
+#, c-format
+msgid "Function '%s' does not exist in menu '%s'"
+msgstr ""
+
+#: src/rcfile.c:543
+#, c-format
+msgid "Sorry, keystroke \"%s\" may not be rebound"
+msgstr ""
+
+#: src/rcfile.c:629
+#, fuzzy, c-format
+msgid "Error expanding %s: %s"
+msgstr "Errorea %s irakurtzen: %s"
+
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1750,135 +1880,196 @@ msgstr ""
 "\"black\", \"bright\" aukerazko aurrizkiarekin\n"
 "aurreplanoko koloreentzat."
 
-#: src/rcfile.c:647
+#: src/rcfile.c:694
 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:652
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "Kolorearen izena falta da"
 
-#: src/rcfile.c:672
-#, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr "Atzekaldeko \"%s\" koloreak ezin du bizia izan"
-
-#: src/rcfile.c:690 src/rcfile.c:809
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr "Regex katea falta da"
 
-#: src/rcfile.c:762
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\"-k \"end=\" behar du"
 
-#: src/rcfile.c:804
+#: src/rcfile.c:837
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr "Atzekaldeko \"%s\" koloreak ezin du bizia izan"
+
+#: src/rcfile.c:865
 #, 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:874
+#: src/rcfile.c:921
+#, 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:926
+#, 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:1010
+#, fuzzy
+msgid "Cannot add formatter without a syntax command"
+msgstr "Ezin izan da kolorea komando bat gehitu sintaxi komando bat gabe"
+
+#: src/rcfile.c:1015
+msgid "Missing formatter command"
+msgstr ""
+
+#: src/rcfile.c:1045
 #, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
+msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr ""
 
-#: src/rcfile.c:876
+#: src/rcfile.c:1047
+#, c-format
 msgid ""
-"Exiting.  Please use nano with the -I option if needed to adjust your nanorc "
-"settings\n"
+"If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
 
-#: src/rcfile.c:926 src/rcfile.c:935 src/rcfile.c:945
+#: src/rcfile.c:1108
+#, fuzzy, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "Ezin izan zen %s ireki %s idazteko"
+
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "\"%s\" komandoa ez dago baimendua fitxategia barne moduan"
 
-#: src/rcfile.c:951 src/rcfile.c:1128
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "\"%s\" sintaxiak ez dauka kolore komandorik"
 
-#: src/rcfile.c:966
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Ez da \"%s\" komandoa ulertu"
 
-#: src/rcfile.c:972
-msgid "Missing flag"
-msgstr "Bandera falta da"
+#: src/rcfile.c:1186
+#, fuzzy
+msgid "Missing option"
+msgstr "Kolorearen izena falta da"
 
-#: src/rcfile.c:994
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "\"%s\" aukerak argumentu bat behar du"
 
-#: src/rcfile.c:1012
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr "Aukera ez da baliodun multibyte katea"
 
-#: src/rcfile.c:1038 src/rcfile.c:1066 src/rcfile.c:1075
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr "Ez-hutsune karaktereak behar dira"
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr "Bi zutabe-bakar karaktere behar dira"
 
-#: src/rcfile.c:1114
-#, c-format
-msgid "Cannot unset flag \"%s\""
+#: src/rcfile.c:1339
+#, fuzzy, c-format
+msgid "Cannot unset option \"%s\""
 msgstr "Ezin da \"%s\" bandera kendu"
 
-#: src/rcfile.c:1123
-#, c-format
-msgid "Unknown flag \"%s\""
+#: src/rcfile.c:1345
+#, fuzzy, c-format
+msgid "Unknown option \"%s\""
 msgstr "\"%s\" bandera ezezaguna"
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr "Ezin dut nire etxe direktorioa aurkitu!  Outx!"
 
+#: src/rcfile.c:1442
+#, c-format
+msgid ""
+"\n"
+"Press Enter to continue starting nano.\n"
+msgstr ""
+"\n"
+"Nano abiarazten jarraitzeko return sakatu.\n"
+
 #: src/search.c:96
 #, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "\"%.*s%s\" ez da aurkitu"
 
-#: src/search.c:205
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/search.c:184
+msgid " [Case Sensitive]"
+msgstr "[May/Min]"
+
+#: src/search.c:188
+msgid " [Regexp]"
+msgstr "[Regexp]"
+
+#: src/search.c:192
+msgid " [Backwards]"
+msgstr "[Atzeruntza]"
+
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:197
 msgid " (to replace) in selection"
 msgstr " (aldatzeko) aukeraketan"
 
-#: src/search.c:207
+#: src/search.c:199
 msgid " (to replace)"
 msgstr "(aldatzeko)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "Instantsia hau aldatu?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:945
 msgid "Replace with"
 msgstr "Aldatu honekin"
 
-#: src/search.c:1004
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
 msgstr[0] "%lu kointzidentzia aldatuta"
 msgstr[1] "%lu kointzidentzia aldatuta"
 
-#: src/search.c:1034
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr "Lerroaren zenbakia, zutabe zenbakia sartu"
 
-#: src/search.c:1061
+#: src/search.c:1054
 #, fuzzy
 msgid "Invalid line or column number"
 msgstr "Lerroaren zenbakia, zutabe zenbakia sartu"
 
-#: src/search.c:1214
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "Ez da hori giltza"
 
-#: src/search.c:1281
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "Ez dago giltz egokirik"
 
@@ -1890,228 +2081,307 @@ msgstr "Marka aukeratua"
 msgid "Mark Unset"
 msgstr "Markatu ez hautatua"
 
-#: src/text.c:443
+#: src/text.c:439
 msgid "Nothing in undo buffer!"
 msgstr ""
 
-#: src/text.c:455 src/text.c:593
+#: src/text.c:445 src/text.c:590
 #, c-format
-msgid "Internal error: can't match line %d.  Please save your work"
+msgid "Internal error: can't match line %d.  Please save your work."
 msgstr ""
 
-#: src/text.c:466 src/text.c:603
+#: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
 msgstr ""
 
-#: src/text.c:475 src/text.c:613
+#: src/text.c:467 src/text.c:612
 #, fuzzy
 msgid "text delete"
 msgstr "Hurrengo fitxategia"
 
-#: src/text.c:489 src/text.c:628
-#, fuzzy
-msgid "line wrap"
-msgstr "Auto-doitu lerro luzeak"
-
-#: src/text.c:503 src/text.c:636
+#: src/text.c:491 src/text.c:641
 msgid "line join"
 msgstr ""
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:505 src/text.c:657
 msgid "text cut"
 msgstr ""
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:510 src/text.c:661
 msgid "text uncut"
 msgstr ""
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:515 src/text.c:623
 msgid "line break"
 msgstr ""
 
-#: src/text.c:532 src/text.c:665
+#: src/text.c:528 src/text.c:672
 #, fuzzy
 msgid "text insert"
 msgstr "Hurrengo lerroa"
 
-#: src/text.c:550 src/text.c:659
+#: src/text.c:549 src/text.c:665
 #, fuzzy
 msgid "text replace"
 msgstr "(aldatzeko)"
 
-#: src/text.c:557 src/text.c:671
-msgid "Internal error: unknown type.  Please save your work"
+#: src/text.c:556 src/text.c:679 src/text.c:983
+msgid "Internal error: unknown type.  Please save your work."
 msgstr ""
 
-#: src/text.c:563
+#: src/text.c:561
 #, c-format
 msgid "Undid action (%s)"
 msgstr ""
 
-#: src/text.c:578
+#: src/text.c:580
 msgid "Nothing to re-do!"
 msgstr ""
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
+#: src/text.c:584
+msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
 
-#: src/text.c:676
+#: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr ""
 
-#: src/text.c:766
-msgid "Could not pipe"
-msgstr "Ezin da hoditik pasa"
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
+msgid "Could not create pipe"
+msgstr "Ezin izan da hodia sortu"
 
-#: src/text.c:793 src/text.c:2636 src/text.c:2788
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "Ezin izan da bikoiztu"
 
-#: src/text.c:941
-msgid "Internal error: can't setup uncut.  Please save your work."
+#: src/text.c:969
+msgid "Internal error: cannot set up uncut.  Please save your work."
 msgstr ""
 
-#: src/text.c:950
-msgid "Internal error: unknown type.  Please save your work."
-msgstr ""
-
-#: src/text.c:1870
+#: src/text.c:1806
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "%s aipamen kate okerra: %s"
 
-#: src/text.c:2267
+#: src/text.c:2207
 msgid "Can now UnJustify!"
 msgstr "Orain ez-justifikatu dezakezu!"
 
-#: src/text.c:2462
+#: src/text.c:2404
 msgid "Edit a replacement"
 msgstr "Ordezkoa editatu"
 
-#: src/text.c:2548
-msgid "Could not create pipe"
-msgstr "Ezin izan da hodia sortu"
-
-#: src/text.c:2550
+#: src/text.c:2492
 msgid "Creating misspelled word list, please wait..."
 msgstr "Gaizki idatzitako hiz zerrenda sortzen, itxaron mesedez..."
 
-#: src/text.c:2642
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
 msgstr "Ezin izan da hodi buffer-aren tamainua lortu"
 
-#: src/text.c:2693
+#: src/text.c:2635
 msgid "Error invoking \"spell\""
 msgstr "Errorea \"spell\"-i deitzen"
 
-#: src/text.c:2696
+#: src/text.c:2638
 msgid "Error invoking \"sort -f\""
 msgstr "Errorea \"sort -f\"-i deitzen"
 
-#: src/text.c:2699
+#: src/text.c:2641
 msgid "Error invoking \"uniq\""
 msgstr "Errorea \"uniq\"-i deitzen"
 
-#: src/text.c:2756 src/text.c:2965
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "Zuzenketa ortografikoa bukatu da"
 
-#: src/text.c:2815
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Errorea \"%s\"-(e)ri deitzen"
 
-#: src/text.c:2960
+#: src/text.c:2885
+#, fuzzy
+msgid "Invoking spell checker, please wait"
+msgstr "Deitu zuzentzaileari, eskuragarri badago"
+
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Zuzenketa ortografikoan huts egin du: %s"
 
-#: src/text.c:2962
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Zuzenketa ortografikoan huts egin du: %s: %s"
 
-#: src/text.c:3030
+#: src/text.c:2937
+#, fuzzy
+msgid "No linter defined for this type of file!"
+msgstr "Ez gehitu lerro berria fitxategiaren amaieran"
+
+#: src/text.c:2947
+msgid "Save modified buffer before linting?"
+msgstr ""
+
+#: src/text.c:2969
+msgid "Invoking linter, please wait"
+msgstr ""
+
+#: src/text.c:3125
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr ""
+
+#: src/text.c:3159
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr ""
+
+#: src/text.c:3205
+#, fuzzy
+msgid "At last message"
+msgstr "Mezu hau erakutsi"
+
+#: src/text.c:3210
+#, fuzzy
+msgid "At first message"
+msgstr "Mezu hau erakutsi"
+
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr ""
+
+#: src/text.c:3275
+msgid "Finished"
+msgstr ""
+
+#: src/text.c:3280
+msgid "Invoking formatter, please wait"
+msgstr ""
+
+#: src/text.c:3360
+msgid "Finished formatting"
+msgstr ""
+
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sHitzak: %lu  Lerroak: %ld  Karaktereak: %lu"
 
-#: src/text.c:3031
+#: src/text.c:3439
 msgid "In Selection:  "
 msgstr "Aukeraketan:  "
 
-#: src/utils.c:405 src/utils.c:417
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3453
+msgid "Verbatim Input"
+msgstr "Sarrera literala"
+
+#: src/utils.c:410 src/utils.c:422
 msgid "nano is out of memory!"
 msgstr "nano: memoriatik kanpo!"
 
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
-#: src/winio.c:1557
+#: src/winio.c:1583
 msgid "Unicode Input"
 msgstr "Unicode sarrera"
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2142 src/winio.c:2146
 msgid "Modified"
 msgstr "Aldatua"
 
-#: src/winio.c:2150
+#: src/winio.c:2143
 msgid "View"
 msgstr "Ikusi"
 
-#: src/winio.c:2164
+#: src/winio.c:2157
 msgid "DIR:"
 msgstr "DIR:"
 
-#: src/winio.c:2171
+#: src/winio.c:2164
 msgid "File:"
 msgstr "Fitxategia:"
 
-#: src/winio.c:3360
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2261
+msgid ""
+"Warning: Modifying a file which is not locked, check directory permission?"
+msgstr ""
+
+#: src/winio.c:3377
 #, 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:3492
+#: src/winio.c:3507
 msgid "The nano text editor"
 msgstr "Nano textu editorea"
 
-#: src/winio.c:3493
+#: src/winio.c:3508
 msgid "version"
 msgstr "bertsioa"
 
-#: src/winio.c:3494
+#: src/winio.c:3509
 msgid "Brought to you by:"
 msgstr "Zuretzako hauek egina:"
 
-#: src/winio.c:3495
+#: src/winio.c:3510
 msgid "Special thanks to:"
 msgstr "Esker bereziak:"
 
-#: src/winio.c:3496
+#: src/winio.c:3511
 msgid "The Free Software Foundation"
 msgstr "The Free Software Foundation"
 
-#: src/winio.c:3497
+#: src/winio.c:3512
+msgid "the many translators and the TP"
+msgstr ""
+
+#: src/winio.c:3513
 msgid "For ncurses:"
 msgstr "ncurses-entzat:"
 
-#: src/winio.c:3498
+#: src/winio.c:3514
 msgid "and anyone else we forgot..."
 msgstr "eta ahaztu dugun baten bat..."
 
-#: src/winio.c:3499
+#: src/winio.c:3515
 msgid "Thank you for using nano!"
 msgstr "Mila esker nano erabiltzeagatik!"
 
+#~ msgid "Move to the previous screen"
+#~ msgstr "Aurreko pantailara mugitu"
+
+#~ msgid "Move to the next screen"
+#~ msgstr "Hurrengo pantailara mugitu"
+
+#~ msgid "Find Other Bracket"
+#~ msgstr "Beste giltz bat bilatu"
+
+#~ msgid "Insert File"
+#~ msgstr "Txertatu fitxategia"
+
 #~ msgid "Space"
 #~ msgstr "Hutsunea"
 
+#~ msgid "(ignored, for Pico compatibility)"
+#~ msgstr "(ignoratua, Pico-rekin konpatibilitatea mantentzeko)"
+
+#~ msgid "Missing flag"
+#~ msgstr "Bandera falta da"
+
 #~ msgid "Come on, be reasonable"
 #~ msgstr "Bai zera, izan zentzuduna!"
 
+#~ msgid "Could not pipe"
+#~ msgstr "Ezin da hoditik pasa"
+
 #~ msgid "Prepending to %s failed: %s"
 #~ msgstr "%s-(e)ra gehitzen huts egin da: %s"
 
@@ -2164,9 +2434,6 @@ msgstr "Mila esker nano erabiltzeagatik!"
 #~ msgid "Duplicate syntax name %s"
 #~ msgstr "Bikoiztutako %s sintaxi izena"
 
-#~ msgid "Could not create temp file: %s"
-#~ msgstr "Ezin izan da aldi baterako fitxategia sortu: %s"
-
 #~ msgid "Refusing zero-length regex match"
 #~ msgstr "0 regex parekotasun luzeera ukatzen"
 
@@ -2203,6 +2470,9 @@ msgstr "Mila esker nano erabiltzeagatik!"
 #~ msgid "Verbatim input"
 #~ msgstr "Sarrera literala"
 
+#~ msgid "Could not invoke \"%s\""
+#~ msgstr "Ezin izan da \"%s\"-i deitu"
+
 #~ msgid "Search Cancelled"
 #~ msgstr "Bilaketa ezeztatua"
 
@@ -2242,8 +2512,7 @@ msgstr "Mila esker nano erabiltzeagatik!"
 #~ msgid "Could not reopen %s: %s"
 #~ msgstr "Ezin izan zen %s: %s itxi"
 
-#, fuzzy
-#~ msgid "Could not open %s for prepend: %s"
+#~ msgid "Could not open %s for writing: %s"
 #~ msgstr "Ezin izan zen %s ireki %s idazteko"
 
 #~ msgid "Could not set permissions %o on %s: %s"
@@ -2440,12 +2709,6 @@ msgstr "Mila esker nano erabiltzeagatik!"
 #~ msgid "delete_opennode(): free'd last node.\n"
 #~ msgstr "delete_node(): Azkenengo nodoa liberatua.\n"
 
-#, fuzzy
-#~ msgid "Press return to continue\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Nanorekin jarraitzeko return sakatu\n"
-
 #~ msgid "current->data = \"%s\"\n"
 #~ msgstr "current->data = \"%s\"\n"
 
diff --git a/po/fi.gmo b/po/fi.gmo
index 3ae1d96..cb9ccf9 100644
--- a/po/fi.gmo
+++ b/po/fi.gmo
diff --git a/po/fi.po b/po/fi.po
index 4a251b5..b0688d6 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,124 +1,153 @@
 # GNU nano Finnish Translation.
-# Copyright © 2000, 2001, 2003, 2009, 2010 Free Software Foundation, Inc.
+# Copyright © 2000, 2001, 2003, 2009, 2010, 2011, 2013, 2014, 2015 Free Software Foundation, Inc.
 # This file is distributed under the same license as the nano package.
+#
 # Pauli Virtanen <pauli.virtanen@saunalahti.fi>, 2000, 2001.
 # Kalle Kivimaa <kalle.kivimaa@iki.fi>, 2003.
 # Kalle Olavi Niemitalo <kon@iki.fi>, 2003.
-# Jorma Karvonen <karvonen.jorma@gmail.com>, 2009-2010
-#
+# Jorma Karvonen <karvonen.jorma@gmail.com>, 2009-2011, 2013-2015.
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 2.2.4pre2\n"
+"Project-Id-Version: nano 2.3.99pre3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-22 06:34-0500\n"
-"PO-Revision-Date: 2010-04-08 10:55+0200\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
+"PO-Revision-Date: 2015-03-07 21:10+0200\n"
 "Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\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"
 
-#: src/browser.c:220
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:203
 msgid "Go To Directory"
 msgstr "Siirry hakemistoon"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:860 src/files.c:2048
-#: src/nano.c:1060 src/search.c:220 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Peruttu"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:246 src/browser.c:293
 #, c-format
 msgid "Can't go outside of %s in restricted mode"
-msgstr "Ei voi siirtyä pois hakemistosta %s rajoitetussa tilassa"
+msgstr "Hakemistosta %s pois siirtyminen rajoitetussa tilassa epäonnistui"
 
-#: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:722
-#: src/files.c:731 src/files.c:1540 src/files.c:1659 src/files.c:1711
-#: src/files.c:1732 src/files.c:1855 src/files.c:2691 src/rcfile.c:568
-#: src/rcfile.c:1204
+#: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
+#: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
+#: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Virhe luettaessa kohdetta %s: %s"
 
-#: src/browser.c:303
+#: src/browser.c:283
 msgid "Can't move up a directory"
-msgstr "Ei voi siirtyä ylähakemistoon"
+msgstr "Ylähakemistoon siirtyminen epäonnistui"
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:665 src/browser.c:674
+#: src/browser.c:626 src/browser.c:635
 msgid "(dir)"
 msgstr "(hakem.)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:632
 msgid "(parent dir)"
 msgstr "(ylähakem.)"
 
-#: src/browser.c:801 src/search.c:185
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "Etsi"
 
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:805 src/search.c:189
-msgid " [Case Sensitive]"
-msgstr " [Kirj. koko]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:811 src/search.c:195
-msgid " [Regexp]"
-msgstr " [Säännöke]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:817 src/search.c:201
-msgid " [Backwards]"
-msgstr " [Taaksepäin]"
-
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "Etsintä jatkuu"
 
-#: src/browser.c:1006 src/browser.c:1039 src/search.c:514 src/search.c:517
-#: src/search.c:574 src/search.c:577
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "Tämä on ainoa esiintymä"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr "Ei nykyistä etsintämallia"
 
-#: src/files.c:125
+#: src/files.c:139
+msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
+msgstr ""
+"Identiteettini määritteleminen lukitustiedostolle (getpwuid()-funktiolla) "
+"epäonnistui"
+
+#: src/files.c:145
+#, c-format
+msgid "Couldn't determine hostname for lock file: %s"
+msgstr "Tietokonenimen määritteleminen lukitustiedostolle epäonnistui: %s"
+
+#: src/files.c:165 src/files.c:175 src/files.c:212 src/files.c:222
+#, c-format
+msgid "Error writing lock file %s: %s"
+msgstr "Virhe kirjoitettaessa lukitustiedostoa %s: %s"
+
+#: src/files.c:237
+#, c-format
+msgid "Error deleting lock file %s: %s"
+msgstr "Virhe poistettaessa lukitustiedostoa %s: %s"
+
+#: src/files.c:272
+#, c-format
+msgid "Error opening lock file %s: %s"
+msgstr "Virhe avattaessa lukitustiedostoa %s: %s"
+
+#: src/files.c:282
+#, c-format
+msgid "Error reading lock file %s: Not enough data read"
+msgstr "Virhe luettaessa lukitustiedostoa %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:297
+#, 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?"
+
+#: src/files.c:308
+#, c-format
+msgid "Error writing lock file: Directory '%s' doesn't exist"
+msgstr "Virhe kirjoitettaessa lukitustiedostoa: Hakemistoa ’%s’ ei ole"
+
+#: src/files.c:339
 #, c-format
 msgid "Can't insert file from outside of %s"
-msgstr "Ei voi lisätä tiedostoa hakemiston %s ulkopuolelta"
+msgstr "Tiedoston lisääminen hakemiston %s ulkopuolelta epäonnistui"
 
-#: src/files.c:234
+#: src/files.c:467
 msgid "No more open file buffers"
 msgstr "Ei enää avoimia tiedostopuskureita"
 
-#: src/files.c:250
+#: src/files.c:484
 #, c-format
 msgid "Switched to %s"
 msgstr "Vaihdoin tiedostoon %s"
 
-#: src/files.c:251 src/global.c:469 src/winio.c:2168
+#: src/files.c:485 src/global.c:953 src/winio.c:2161
 msgid "New Buffer"
 msgstr "Uusi teksti"
 
-#: src/files.c:633
+#: src/files.c:874
 #, 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:638
+#: src/files.c:879
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
@@ -131,14 +160,14 @@ msgstr[0] ""
 msgstr[1] ""
 "Luettu %lu riviä (Muunnettu Mac-muodosta - Varoitus: Ei kirjoitusoikeutta)"
 
-#: src/files.c:644
+#: src/files.c:885
 #, 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:648
+#: src/files.c:889
 #, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
@@ -149,14 +178,14 @@ msgstr[0] ""
 msgstr[1] ""
 "Luettu %lu riviä (Muunnettu Mac-muodosta - Varoitus: Ei kirjoitusoikeutta)"
 
-#: src/files.c:654
+#: src/files.c:895
 #, 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:658
+#: src/files.c:899
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
@@ -167,503 +196,457 @@ msgstr[0] ""
 msgstr[1] ""
 "Luettu %lu riviä (Muunnettu DOS-muodosta - Varoitus: Ei kirjoitusoikeutta)"
 
-#: src/files.c:664
+#: src/files.c:905
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "Luettu %lu rivi"
 msgstr[1] "Luettu %lu riviä"
 
-#: src/files.c:667
+#: src/files.c:908
 #, 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:700 src/files.c:736
+#: src/files.c:943 src/files.c:980
 msgid "Reading File"
 msgstr "Lukee tiedostoa"
 
-#: src/files.c:706
+#: src/files.c:950
 msgid "New File"
 msgstr "Uusi tiedosto"
 
-#: src/files.c:709
+#: src/files.c:953
 #, c-format
 msgid "\"%s\" not found"
 msgstr "Ei löytynyt: ”%s”"
 
-#: src/files.c:717 src/rcfile.c:559 src/rcfile.c:1154 src/rcfile.c:1195
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "”%s” on hakemisto"
 
-#: src/files.c:718 src/rcfile.c:560 src/rcfile.c:1155 src/rcfile.c:1196
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "”%s” on laitetiedosto"
 
-#: src/files.c:817
+#: src/files.c:1060
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Uudessa puskurissa suoritettava komento [kohteesta %s] "
 
-#: src/files.c:819
+#: src/files.c:1062
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Suoritettava komento [kohteesta %s] "
 
-#  Toisaalla on "Ei voi lisätä tiedostoa hakemiston %s ulkopuolelta",
+#  Toisaalla on "Tiedoston lisääminen hakemiston %s ulkopuolelta epäonnistui",
 #  joten täälläkin on "hakemistosta" eikä "hakemistossa".
-#: src/files.c:825
+#: src/files.c:1069
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Uuteen puskuriin lisättävä tiedosto [hakemistosta %s] "
 
-#: src/files.c:827
+#: src/files.c:1071
 #, 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:1077
+#: src/files.c:1320
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Virheellinen näppäin yhden puskurin tilassa"
 
-#: src/files.c:1486
+#: src/files.c:1622
+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) "
+
+#: src/files.c:1746
 #, c-format
 msgid "Can't write outside of %s"
-msgstr "Ei voi kirjoittaa hakemiston %s ulkopuolelle"
+msgstr "Hakemiston %s ulkopuolelle kirjoittaminen epäonnistui"
 
 #  "Prepend" ei ole englanti, oikea sana on "prefix"
 #  "Prepend" is not an English word, use "prefix"
-#: src/files.c:1501
+#: src/files.c:1761
 msgid "Cannot prepend or append to a symlink with --nofollow set"
 msgstr ""
 "Symboliseen linkkiin ei voi liittää etuliitettä eikä jälkiliikettä "
 "parametrillä ”--nofollow set”"
 
-#: src/files.c:1581 src/files.c:1603 src/files.c:1621 src/files.c:1632
-#: src/files.c:1640 src/files.c:1667
+#: src/files.c:1843 src/files.c:1868 src/files.c:1886 src/files.c:1899
+#: src/files.c:1910 src/files.c:1939
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Virhe kirjoitettaessa varmuuskopiotiedostoon %s: %s"
 
-#: src/files.c:1582 src/nano.c:701
+#: src/files.c:1844 src/nano.c:719
 msgid "Too many backup files?"
 msgstr "Liian monta varmuuskopiotiedostoa?"
 
-#: src/files.c:1687 src/files.c:1744 src/files.c:1763 src/files.c:1775
-#: src/files.c:1799 src/files.c:1817 src/files.c:1827 src/files.c:1863
-#: src/files.c:1868 src/files.c:2764 src/files.c:2773
+#: src/files.c:1959 src/files.c:2016 src/files.c:2035 src/files.c:2047
+#: src/files.c:2071 src/files.c:2089 src/files.c:2099 src/files.c:2135
+#: src/files.c:2140 src/files.c:3101 src/files.c:3110 src/files.c:3133
+#: src/files.c:3145
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Virhe kirjoitettaessa %s: %s"
 
-#: src/files.c:1721 src/text.c:2929 src/text.c:2941
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Virhe kirjoitettaessa tilapäiseen tiedostoon: %s"
 
-#: src/files.c:1900
+#: src/files.c:2173
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "Kirjoitettu %lu rivi"
 msgstr[1] "Kirjoitettu %lu riviä"
 
-#: src/files.c:2004
+#: src/files.c:2278
 msgid " [DOS Format]"
 msgstr " [DOS-muoto]"
 
-#: src/files.c:2005
+#: src/files.c:2279
 msgid " [Mac Format]"
 msgstr " [Mac-muoto]"
 
-#: src/files.c:2007
+#: src/files.c:2281
 msgid " [Backup]"
 msgstr " [Varmuuskopio]"
 
 #  "Prepend" is not an English word, use "prefix"
-#: src/files.c:2015
+#: src/files.c:2289
 msgid "Prepend Selection to File"
 msgstr "Lisää valinta tiedoston alkuun"
 
-#: src/files.c:2016
+#: src/files.c:2290
 msgid "Append Selection to File"
 msgstr "Lisää valinta tiedoston loppuun"
 
-#: src/files.c:2017
+#: src/files.c:2291
 msgid "Write Selection to File"
 msgstr "Kirjoita valinta tiedostoon"
 
 #  "Alkuun lisättävä tiedosto" olisi väärinpäin.
-#: src/files.c:2020
+#: src/files.c:2294
 msgid "File Name to Prepend to"
 msgstr "Minkä tiedoston alkuun"
 
-#: src/files.c:2021
+#: src/files.c:2295
 msgid "File Name to Append to"
 msgstr "Minkä tiedoston loppuun"
 
-#: src/files.c:2022
+#: src/files.c:2296
 msgid "File Name to Write"
 msgstr "Kirjoitettava tiedosto"
 
-#: src/files.c:2153
+#: src/files.c:2427
 msgid "File exists, OVERWRITE ? "
 msgstr "Tiedosto olemassa, korvataanko ? "
 
-#: src/files.c:2162
+#: src/files.c:2436
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "Tallennetaanko tiedosto eri nimellä ? "
 
-#: src/files.c:2173
+#: src/files.c:2450
 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:2611
+#: src/files.c:2882
 msgid "(more)"
 msgstr "(jatkuu)"
 
-#: src/files.c:2694 src/rcfile.c:1220
+#: src/files.c:2974
 #, c-format
 msgid ""
 "\n"
-"Press Enter to continue starting nano.\n"
+"Press Enter to continue\n"
 msgstr ""
 "\n"
-"Paina enteriä jatkaaksesi Nanon käynnistämistä.\n"
+"Paina return-painiketta jatkaaksesi Nanon käynnistämistä\n"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:415 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Peru"
-
-#: src/global.c:416
-msgid "Replace"
-msgstr "Korvaa"
+#: src/files.c:2989
+#, 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/"
+"lataamiseksi.\n"
 
-#: src/global.c:417
-msgid "No Replace"
-msgstr "Älä korvaa"
+#: src/files.c:2995
+#, 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"
 
-#: src/global.c:420
-msgid "Case Sens"
-msgstr "Kirj. koko"
+#: src/files.c:3012
+#, 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"
 
-#: src/global.c:421
-msgid "Backwards"
-msgstr "Taaksepäin"
+#: src/files.c:3016
+#, 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)"
 
-#  "Äiti, mikä on säännöke?" "Kai se joku pikku sääntö on."
-#: src/global.c:425
-msgid "Regexp"
-msgstr "Säännöke"
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
+#: src/global.c:477
+msgid "Exit"
+msgstr "Lopeta"
 
-#  Tämä on Etsi-valikossa.
-#  80 sarakkeen näytöllä mahtuu 11 merkkiä.
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:451
-msgid "PrevHstory"
-msgstr "EdHistoria"
+#: src/global.c:478
+msgid "Close"
+msgstr "Sulje"
 
-#  Tämä on Etsi-valikossa.
-#  80 sarakkeen näytöllä mahtuu 11 merkkiä.
-#: src/global.c:452
-msgid "NextHstory"
-msgstr "SeurHistor."
+#: src/global.c:479
+msgid "Uncut Text"
+msgstr "Liitä"
 
-#  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:453
-msgid "Go To Text"
-msgstr "Tekstiin"
+#  80 sarakkeen näytöllä mahtuu 10 merkkiä, mieluummin 9.
+#: src/global.c:481
+msgid "Unjustify"
+msgstr "Epätasaa"
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:455
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:485
 msgid "WhereIs Next"
 msgstr "EtsiSeuraava"
 
-#: src/global.c:457
-msgid "First File"
-msgstr "Ensim. tiedosto"
-
-#: src/global.c:458
-msgid "Last File"
-msgstr "Viim. tiedosto"
-
-#  Tämä on Kirjoita tiedosto- ja Lisää tiedosto -valikoissa.
-#  80 sarakkeen näytöllä mahtuu 17 merkkiä, mieluummin 16.
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:460
-msgid "To Files"
-msgstr "Tiedostoselain"
-
-#: src/global.c:462
-msgid "DOS Format"
-msgstr "DOS-muoto"
-
-#: src/global.c:463
-msgid "Mac Format"
-msgstr "Mac-muoto"
-
-#: src/global.c:464
-msgid "Append"
-msgstr "Lisää loppuun"
-
-#  "Prepend" is not an English word, use "prefix"
-#: src/global.c:465
-msgid "Prepend"
-msgstr "Lisää alkuun"
-
-#: src/global.c:466
-msgid "Backup File"
-msgstr "Varmuuskopio"
-
-#: src/global.c:467
-msgid "Execute Command"
-msgstr "Suorita komento"
-
-#: src/global.c:471
-msgid "Go To Dir"
-msgstr "Siirry hakemistoon"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:480
-msgid "Get Help"
-msgstr "Ohjeita"
-
-#: src/global.c:481
-msgid "Exit"
-msgstr "Lopeta"
-
-#: src/global.c:482
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:492
 msgid "Where Is"
 msgstr "Etsi"
 
-#: src/global.c:483
-msgid "Prev Page"
-msgstr "Ed. sivu"
-
-#: src/global.c:484
-msgid "Next Page"
-msgstr "Seur. sivu"
-
-#: src/global.c:485
-msgid "First Line"
-msgstr "Ensim. rivi"
+#: src/global.c:493
+msgid "Replace"
+msgstr "Korvaa"
 
-#: src/global.c:486
-msgid "Last Line"
-msgstr "Viim. rivi"
+#  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:494
+msgid "Go To Line"
+msgstr "Rivinumero"
 
-#  Perään tulee "käytössä" tai "ei käytössä".
-#: src/global.c:487
-msgid "Suspend"
-msgstr "Keskeytysnäppäin"
+#: src/global.c:495
+msgid "Prev Line"
+msgstr "Ed. rivi"
 
-#  "Par" on "paragraph" ?
-#: src/global.c:489
-msgid "Beg of Par"
-msgstr "Kappalealku"
+#: src/global.c:496
+msgid "Next Line"
+msgstr "Seuraava rivi"
 
-#: src/global.c:490
-msgid "End of Par"
-msgstr "Kappaleloppu"
+#: src/global.c:497
+msgid "Read File"
+msgstr "Lue tied."
 
-#: src/global.c:491
+#: src/global.c:499
 msgid "FullJstify"
 msgstr "KokoTasaus"
 
 #  "Päivitä"?
-#: src/global.c:493
+#: src/global.c:501
 msgid "Refresh"
 msgstr "Piirrä uudelleen"
 
-#: src/global.c:495
-msgid "Insert File"
-msgstr "Lisää tiedosto"
-
-#  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:497
-msgid "Go To Line"
-msgstr "Rivinumero"
-
-#: src/global.c:500
+#. 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:507
 msgid "Justify the current paragraph"
 msgstr "Tasaa nykyinen kappale"
 
-#. 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:505
+#: src/global.c:509
 msgid "Cancel the current function"
 msgstr "Peru nykyinen toiminto"
 
-#: src/global.c:506
+#: src/global.c:510
 msgid "Display this help text"
 msgstr "Näytä tämä ohjeteksti"
 
-#: src/global.c:509
+#: src/global.c:513
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Sulje nykyinen tiedostopuskuri / Poistu Nanosta"
 
-#: src/global.c:511
+#: src/global.c:515
 msgid "Exit from nano"
 msgstr "Poistu Nanosta"
 
-#: src/global.c:515
+#: src/global.c:519
 msgid "Write the current file to disk"
 msgstr "Kirjoita nykyinen tiedosto levylle"
 
-#: src/global.c:517
+#: src/global.c:521
 msgid "Insert another file into the current one"
 msgstr "Lisää toinen tiedosto nykyiseen tiedostoon"
 
-#: src/global.c:519
+#: src/global.c:523
 msgid "Search for a string or a regular expression"
 msgstr "Etsi merkkijonoa tai säännöllistä lauseketta"
 
-#: src/global.c:520
-msgid "Go to previous screen"
-msgstr "Siirry edelliseen ruutuun"
+#: src/global.c:526
+msgid "Search for a string"
+msgstr "Etsi merkkijonoa"
 
-#: src/global.c:521
-msgid "Go to next screen"
-msgstr "Siirry seuraavaan ruutuun"
+#: src/global.c:528
+msgid "Go one screenful up"
+msgstr "Siirry ruutu ylöspäin"
 
-#: src/global.c:523
+#: src/global.c:529
+msgid "Go one screenful down"
+msgstr "Siirry ruutu alaspäin"
+
+#: src/global.c:531
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Leikkaa nykyinen rivi leiketilaan"
 
-#: src/global.c:525
+#: src/global.c:533
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Liitä rivi leiketilasta nykyiselle riville"
 
-#: src/global.c:527
+#: src/global.c:534
 msgid "Display the position of the cursor"
 msgstr "Näytä kohdistimen sijainti"
 
-#: src/global.c:529
+#: src/global.c:536
 msgid "Invoke the spell checker, if available"
 msgstr "Käynnistä oikoluin (jos saatavilla)"
 
-#: src/global.c:531
+#: src/global.c:538
 msgid "Replace a string or a regular expression"
 msgstr "Korvaa merkkijono tai säännöllinen lauseke"
 
-#: src/global.c:532
+#: src/global.c:539
 msgid "Go to line and column number"
 msgstr "Siirry riville ja sarakkeelle numero"
 
-#: src/global.c:534
-msgid "Mark text at the cursor position"
-msgstr "Merkitse kohdistimen kohdalla oleva teksti"
+#: src/global.c:541
+msgid "Mark text starting from the cursor position"
+msgstr "Merkitse teksti alkaen kohdistimen kohdalta"
 
-#: src/global.c:535
-msgid "Repeat last search"
+#: src/global.c:542
+msgid "Repeat the last search"
 msgstr "Toista viimeisin etsintä"
 
-#: src/global.c:537
+#: src/global.c:544
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "Leikkaa nykyinen rivi leiketilaan"
 
-#: src/global.c:538
+#: src/global.c:545
 msgid "Indent the current line"
 msgstr "Sisennä nykyinen rivi"
 
-#: src/global.c:539
+#: src/global.c:546
 msgid "Unindent the current line"
 msgstr "Poista nykyisen rivin sisennys"
 
-#: src/global.c:540
+#: src/global.c:547
 msgid "Undo the last operation"
 msgstr "Peru viimeisin toiminto"
 
-#: src/global.c:541
+#: src/global.c:548
 msgid "Redo the last undone operation"
 msgstr "Tee uudelleen viimeisen toiminnon peruminen"
 
-#: src/global.c:543
+#: src/global.c:550
 msgid "Go forward one character"
 msgstr "Siirry yksi merkki eteenpäin"
 
-#: src/global.c:544
+#: src/global.c:551
 msgid "Go back one character"
 msgstr "Siirry yksi merkki taaksepäin"
 
-#: src/global.c:546
+#: src/global.c:553
 msgid "Go forward one word"
 msgstr "Siirry yksi sana eteenpäin"
 
-#: src/global.c:547
+#: src/global.c:554
 msgid "Go back one word"
 msgstr "Siirry yksi sana taaksepäin"
 
-#: src/global.c:549
+#: src/global.c:556
 msgid "Go to previous line"
 msgstr "Siirry edelliselle riville"
 
-#: src/global.c:550
+#: src/global.c:557
 msgid "Go to next line"
 msgstr "Siirry seuraavalle riville"
 
-#: src/global.c:551
+#: src/global.c:558
 msgid "Go to beginning of current line"
 msgstr "Siirry nykyisen rivin alkuun"
 
-#: src/global.c:552
+#: src/global.c:559
 msgid "Go to end of current line"
 msgstr "Siirry nykyisen rivin loppuun"
 
-#: src/global.c:555
+#: src/global.c:562
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "Siirry kappaleen alkuun; sitten seuraavan kappaleen"
 
-#: src/global.c:557
+#: src/global.c:564
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr "Siirry vain kappaleen loppuun; sitten seuraavan kappaleen"
 
-#: src/global.c:560
+#: src/global.c:566
 msgid "Go to the first line of the file"
 msgstr "Siirry tiedoston ensimmäiselle riville"
 
-#: src/global.c:562
+#: src/global.c:567
 msgid "Go to the last line of the file"
 msgstr "Siirry tiedoston viimeiselle riville"
 
-#: src/global.c:564
+#: src/global.c:569
 msgid "Go to the matching bracket"
 msgstr "Siirry vastaavalle sulkeelle"
 
-#: src/global.c:566
+#: src/global.c:571
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "Siirry rivi ylöspäin liikuttamatta kohdistinta"
 
-#: src/global.c:568
+#: src/global.c:573
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "Siirry rivi alaspäin liikuttamatta kohdistinta"
 
-#: src/global.c:572
+#: src/global.c:576
 msgid "Switch to the previous file buffer"
 msgstr "Vaihda edelliseen tiedostopuskuriin"
 
-#: src/global.c:574
+#: src/global.c:577
 msgid "Switch to the next file buffer"
 msgstr "Vaihda seuraavaan tiedostopuskuriin"
 
-#: src/global.c:577
+#: src/global.c:579
 msgid "Insert the next keystroke verbatim"
 msgstr "Lisää seuraava näppäily kirjaimellisesti"
 
-#: src/global.c:579
+#: src/global.c:580
 msgid "Insert a tab at the cursor position"
 msgstr "Lisää sarkain kohdistimen kohdalle"
 
@@ -671,334 +654,454 @@ msgstr "Lisää sarkain kohdistimen kohdalle"
 msgid "Insert a newline at the cursor position"
 msgstr "Lisää rivinvaihto kohdistimen kohdalle"
 
-#: src/global.c:583
+#: src/global.c:582
 msgid "Delete the character under the cursor"
 msgstr "Poista kohdistimen kohdalla oleva merkki"
 
 #  "Poista merkki kohdistimen vasemmalta puolelta"?
-#: src/global.c:585
+#: src/global.c:584
 msgid "Delete the character to the left of the cursor"
 msgstr "Poista kohdistimesta vasemmalle oleva merkki"
 
-#: src/global.c:588
+#: src/global.c:587
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Liitä teksti kohdistimesta tiedoston loppuun"
 
-#: src/global.c:591
+#: src/global.c:590
 msgid "Justify the entire file"
 msgstr "Tasaa nykyinen tiedosto"
 
-#: src/global.c:595
+#: src/global.c:594
 msgid "Count the number of words, lines, and characters"
 msgstr "Laske sanojen, rivien ja merkkien määrä"
 
-#: src/global.c:598
+#: src/global.c:597
 msgid "Refresh (redraw) the current screen"
 msgstr "Piirrä ruutu uudestaan"
 
-#: src/global.c:600
+#: src/global.c:599
 msgid "Suspend the editor (if suspend is enabled)"
 msgstr "Keskeytä editori (jos keskeytys on aktivoitu)"
 
-#: src/global.c:603
+#: src/global.c:602
 msgid "Toggle the case sensitivity of the search"
 msgstr "Vaihda merkkikoko etsinnässä"
 
-#: src/global.c:605
+#: src/global.c:604
 msgid "Reverse the direction of the search"
 msgstr "Vaihda etsinnän suunta"
 
-#: src/global.c:609
+#: src/global.c:608
 msgid "Toggle the use of regular expressions"
 msgstr "Vaihda säännöllisten lausekkeiden käyttö"
 
-#: src/global.c:613
+#: src/global.c:612
 msgid "Recall the previous search/replace string"
 msgstr "Kutsu takaisin edellinen haettu/korvattu merkkijono"
 
-#: src/global.c:615
+#: src/global.c:614
 msgid "Recall the next search/replace string"
 msgstr "Kutsu takaisin seuraava haettu/korvattu merkkijono"
 
-#: src/global.c:618
+#: src/global.c:617
 msgid "Go to file browser"
 msgstr "Siirry tiedostoselaimeen"
 
-#: src/global.c:621
+#: src/global.c:620
 msgid "Toggle the use of DOS format"
 msgstr "Vaihda DOS-muodon käyttö"
 
-#: src/global.c:622
+#: src/global.c:621
 msgid "Toggle the use of Mac format"
 msgstr "Vaihda Mac-muodon käyttö"
 
-#: src/global.c:624
+#: src/global.c:622
 msgid "Toggle appending"
 msgstr "Vaihda liittäminen loppuun"
 
 #  "Prepend" is not an English word, use "prefix"
-#: src/global.c:625
+#: src/global.c:623
 msgid "Toggle prepending"
 msgstr "Vaihda liittäminen alkuun"
 
-#: src/global.c:628
+#: src/global.c:624
 msgid "Toggle backing up of the original file"
 msgstr "Vaihda alkuperäisen tiedoston varmuuskopiointi"
 
-#: src/global.c:629
+#: src/global.c:625
 msgid "Execute external command"
 msgstr "Suorita ulkoinen komento"
 
-#: src/global.c:633
+#: src/global.c:628
 msgid "Toggle the use of a new buffer"
 msgstr "Vaihda uuden puskurin käyttö"
 
-#: src/global.c:636
+#: src/global.c:631
 msgid "Exit from the file browser"
 msgstr "Poistu tiedostoselaimesta"
 
-#: src/global.c:638
+#: src/global.c:632
 msgid "Go to the first file in the list"
 msgstr "Siirry luettelon ensimmäiseen tiedostoon"
 
-#: src/global.c:640
+#: src/global.c:633
 msgid "Go to the last file in the list"
 msgstr "Siirry luettelon viimeiseen tiedostoon"
 
-#: src/global.c:641
-msgid "Go to the next file in the list"
-msgstr "Siirry luettelon seuraavaan tiedostoon"
-
-#: src/global.c:642
+#: src/global.c:634
 msgid "Go to the previous file in the list"
 msgstr "Siirry luettelon edelliseen tiedostoon"
 
-#: src/global.c:643
+#: src/global.c:635
+msgid "Go to the next file in the list"
+msgstr "Siirry luettelon seuraavaan tiedostoon"
+
+#: src/global.c:636
 msgid "Go to directory"
 msgstr "Siirry hakemistoon"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:670
-msgid "Close"
-msgstr "Sulje"
+#: src/global.c:639
+msgid "Invoke the linter, if available"
+msgstr "Käynnistä esikatselu (jos saatavilla)"
+
+#: src/global.c:640
+msgid "Go to previous linter msg"
+msgstr "Siirry edelliseen esikatseluun"
+
+#: src/global.c:641
+msgid "Go to next linter msg"
+msgstr "Siirry seuraavaan esikatseluun"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:679
-msgid "WriteOut"
+#: src/global.c:642
+msgid "Invoke formatter, if available"
+msgstr "Käynnistä muotoilija (jos saatavilla)"
+
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:662
+msgid "Get Help"
+msgstr "Ohjeita"
+
+#: src/global.c:665 src/prompt.c:1084
+msgid "Cancel"
+msgstr "Peru"
+
+#: src/global.c:678
+msgid "Write Out"
 msgstr "Kirjoita"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:704
+msgid "Go To Dir"
+msgstr "Siirry hakemistoon"
+
+#: src/global.c:719
+msgid "Cut Text"
+msgstr "Leikkaa"
+
+#: src/global.c:728
 msgid "Justify"
 msgstr "Tasaa"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:696
-msgid "Read File"
-msgstr "Lue tied."
+#: src/global.c:733
+msgid "To Spell"
+msgstr "Oikolue"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:713
-msgid "Cut Text"
-msgstr "Leikkaa"
+#  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:738
+msgid "To Linter"
+msgstr "Esikatseluun"
 
-#  80 sarakkeen näytöllä mahtuu 10 merkkiä, mieluummin 9.
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:718
-msgid "UnJustify"
-msgstr "Epätasaa"
+#: src/global.c:740
+msgid "Formatter"
+msgstr "Muotoilija"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:723
-msgid "UnCut Text"
-msgstr "Liitä"
+#: src/global.c:745
+msgid "Case Sens"
+msgstr "Kirj. koko"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:728 src/global.c:755
+#  "Äiti, mikä on säännöke?" "Kai se joku pikku sääntö on."
+#: src/global.c:750
+msgid "Regexp"
+msgstr "Säännöke"
+
+#: src/global.c:755
+msgid "Backwards"
+msgstr "Taaksepäin"
+
+#: src/global.c:762
+msgid "No Replace"
+msgstr "Älä korvaa"
+
+#: src/global.c:770
 msgid "Cur Pos"
 msgstr "Sijainti"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:737
-msgid "To Spell"
-msgstr "Oikolue"
+#: src/global.c:780
+msgid "Prev Page"
+msgstr "Ed. sivu"
+
+#: src/global.c:782
+msgid "Next Page"
+msgstr "Seur. sivu"
+
+#: src/global.c:785
+msgid "First Line"
+msgstr "Ensim. rivi"
 
-#: src/global.c:771
+#: src/global.c:787
+msgid "Last Line"
+msgstr "Viim. rivi"
+
+#  versiossa 1.1.99pre2 hakee merkkejä "([{<>}])"
+#: src/global.c:794
+msgid "To Bracket"
+msgstr "Sulkeeseen"
+
+#: src/global.c:797
 msgid "Mark Text"
 msgstr "Merkitse tekstiä"
 
-#: src/global.c:777
+#: src/global.c:800
 msgid "Copy Text"
 msgstr "Kopioi"
 
-#: src/global.c:780
+#: src/global.c:803
 msgid "Indent Text"
 msgstr "Sisennä"
 
-#: src/global.c:783
+#: src/global.c:805
 msgid "Unindent Text"
 msgstr "Poista sisennys"
 
-#: src/global.c:787
+#: src/global.c:808
 msgid "Undo"
 msgstr "Peru"
 
-#: src/global.c:790
+#: src/global.c:810
 msgid "Redo"
 msgstr "Tee uudelleen"
 
-#: src/global.c:796 src/global.c:800
-msgid "Forward"
-msgstr "Eteenpäin"
-
-#: src/global.c:806 src/global.c:810
+#: src/global.c:814 src/global.c:820
 msgid "Back"
 msgstr "Takaisin"
 
-#: src/global.c:817
-msgid "Next Word"
-msgstr "Seuraava sana"
+#: src/global.c:816 src/global.c:822
+msgid "Forward"
+msgstr "Eteenpäin"
 
-#: src/global.c:820
+#: src/global.c:827
 msgid "Prev Word"
 msgstr "Edellinen sana"
 
-#: src/global.c:824
-msgid "Prev Line"
-msgstr "Ed. rivi"
-
-#: src/global.c:827
-msgid "Next Line"
-msgstr "Seuraava rivi"
+#: src/global.c:829
+msgid "Next Word"
+msgstr "Seuraava sana"
 
-#: src/global.c:830
+#: src/global.c:833
 msgid "Home"
 msgstr "Koti"
 
-#: src/global.c:833
+#: src/global.c:835
 msgid "End"
 msgstr "Loppu"
 
-#: src/global.c:845
-msgid "Find Other Bracket"
-msgstr "Etsi toinen sulje"
+#  "Par" on "paragraph" ?
+#: src/global.c:844
+msgid "Beg of Par"
+msgstr "Kappalealku"
 
-#: src/global.c:848
+#: src/global.c:846
+msgid "End of Par"
+msgstr "Kappaleloppu"
+
+#: src/global.c:851
 msgid "Scroll Up"
 msgstr "Vieritä ylös"
 
-#: src/global.c:851
+#: src/global.c:853
 msgid "Scroll Down"
 msgstr "Vieritä alas"
 
-#: src/global.c:856
-msgid "Previous File"
+#: src/global.c:858
+msgid "Prev File"
 msgstr "Edellinen tiedosto"
 
-#: src/global.c:858
+#: src/global.c:860
 msgid "Next File"
 msgstr "Seuraava tiedosto"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:862 src/text.c:3045
-msgid "Verbatim Input"
-msgstr "Merkintarkka syöte"
+#: src/global.c:869
+msgid "Verbatim"
+msgstr "Merkintarkka"
 
-#: src/global.c:867
+#: src/global.c:872
 msgid "Tab"
 msgstr "Sarkain"
 
-#: src/global.c:870
+#: src/global.c:874
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:873
+#: src/global.c:876
 msgid "Delete"
 msgstr "Poista"
 
-#: src/global.c:876
+#: src/global.c:878
 msgid "Backspace"
 msgstr "Askelpalautin"
 
-#: src/global.c:893
+#: src/global.c:888
 msgid "CutTillEnd"
 msgstr "LeikLoppuun"
 
-#: src/global.c:906
+#: src/global.c:898
 msgid "Word Count"
 msgstr "Sanaluku"
 
-#: src/global.c:1367
+#  Perään tulee "käytössä" tai "ei käytössä".
+#: src/global.c:905
+msgid "Suspend"
+msgstr "Keskeytysnäppäin"
+
+#  Tämä on Etsi-valikossa.
+#  80 sarakkeen näytöllä mahtuu 11 merkkiä.
+#: src/global.c:910
+msgid "PrevHstory"
+msgstr "EdHistoria"
+
+#  Tämä on Etsi-valikossa.
+#  80 sarakkeen näytöllä mahtuu 11 merkkiä.
+#: src/global.c:913
+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:917
+msgid "Go To Text"
+msgstr "Tekstiin"
+
+#: src/global.c:928
+msgid "DOS Format"
+msgstr "DOS-muoto"
+
+#: src/global.c:931
+msgid "Mac Format"
+msgstr "Mac-muoto"
+
+#: src/global.c:934
+msgid "Append"
+msgstr "Lisää loppuun"
+
+#  "Prepend" is not an English word, use "prefix"
+#: src/global.c:936
+msgid "Prepend"
+msgstr "Lisää alkuun"
+
+#: src/global.c:939
+msgid "Backup File"
+msgstr "Varmuuskopio"
+
+#: src/global.c:946
+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:961
+msgid "To Files"
+msgstr "Tiedostoselain"
+
+#: src/global.c:964
+msgid "First File"
+msgstr "Ensim. tiedosto"
+
+#: src/global.c:966
+msgid "Last File"
+msgstr "Viim. tiedosto"
+
+#: src/global.c:977
+msgid "Prev Lint Msg"
+msgstr "Ed. esikatselu"
+
+#: src/global.c:979
+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:1227
 msgid "Help mode"
 msgstr "Ohjetila"
 
-#: src/global.c:1369
+#: src/global.c:1229
 msgid "Constant cursor position display"
 msgstr "Näytä kohdistimen sijainti aina"
 
-#: src/global.c:1371
+#: src/global.c:1231
 msgid "Use of one more line for editing"
 msgstr "Käytä lisäriviä muokkaukseen"
 
-#: src/global.c:1373
+#: src/global.c:1233
 msgid "Smooth scrolling"
 msgstr "Pehmeä vieritys"
 
-#: src/global.c:1375
+#: src/global.c:1235
+msgid "Soft wrapping of overlong lines"
+msgstr "Pitkien rivien pehmeä rivitys"
+
+#: src/global.c:1237
 msgid "Whitespace display"
 msgstr "Tyhjemerkkien näyttö"
 
-#: src/global.c:1377
+#: src/global.c:1239
 msgid "Color syntax highlighting"
 msgstr "Värillinen rakenteen merkintä"
 
-#: src/global.c:1379
+#: src/global.c:1241
 msgid "Smart home key"
 msgstr "Älykäs kotiavain"
 
-#: src/global.c:1381
+#: src/global.c:1243
 msgid "Auto indent"
 msgstr "Automaattinen sisennys"
 
-#: src/global.c:1383
+#: src/global.c:1245
 msgid "Cut to end"
 msgstr "Leikkaa loppuun saakka"
 
-#: src/global.c:1385
-msgid "Long line wrapping"
-msgstr "Pitkän rivin jakaminen eri riveille"
+#: src/global.c:1247
+msgid "Hard wrapping of overlong lines"
+msgstr "Pitkien rivien kova rivitys"
 
-#: src/global.c:1387
+#: src/global.c:1249
 msgid "Conversion of typed tabs to spaces"
 msgstr "Kirjoitettujen sarkainmerkkien muunnos välilyönneiksi"
 
-#: src/global.c:1389
+#: src/global.c:1251
 msgid "Backup files"
 msgstr "Varmuuskopiotiedostot"
 
-#: src/global.c:1391
+#: src/global.c:1253
 msgid "Multiple file buffers"
 msgstr "Useat puskurit"
 
-#: src/global.c:1393
+#: src/global.c:1255
 msgid "Mouse support"
 msgstr "Hiirituki"
 
-#: src/global.c:1395
+#: src/global.c:1257
 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:1397
+#: src/global.c:1259
 msgid "Suspension"
 msgstr "Keskeytysnäppäin"
 
-#: src/global.c:1399
-msgid "Soft line wrapping"
-msgstr "Pehmeä rivin jakaminen usealle riville"
-
-#: src/help.c:236
+#: src/help.c:205
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1019,7 +1122,7 @@ msgstr ""
 "vain enteriä antamatta mitään uutta tekstiä, Nano hakee edellistä "
 "hakutekstiä uudestaan.  "
 
-#: src/help.c:245
+#: src/help.c:214
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1033,7 +1136,7 @@ msgstr ""
 " Seuraavat toimintonäppäimet ovat käytettävissä Etsintä-tilassa:\n"
 "\n"
 
-#: src/help.c:251
+#: src/help.c:220
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1052,7 +1155,7 @@ msgstr ""
 " Seuraavat funktionäppäimet ovat käytössä Etsi rivinumero -tilassa:\n"
 "\n"
 
-#: src/help.c:260
+#: src/help.c:229
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1076,7 +1179,7 @@ msgstr ""
 "puskuriin. (Tiedostopuskureita voit vaihtaa näppäinkomennoilla Meta-< ja "
 "Meta->).  "
 
-#: src/help.c:269
+#: src/help.c:238
 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"
@@ -1091,7 +1194,7 @@ msgstr ""
 " Seuraavat toimintonäppäimet ovat käytössä Lisää tiedosto -tilassa:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:244
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1119,7 +1222,7 @@ msgstr ""
 " Seuraavat funktionäppäimet ovat käytössä Kirjoita tiedosto -tilassa:\n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:258
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1145,7 +1248,7 @@ msgstr ""
 " Seuraavat funktionäppäimet ovat käytössä tiedostoselaimessa:\n"
 "\n"
 
-#: src/help.c:302
+#: src/help.c:271
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1168,7 +1271,7 @@ msgstr ""
 "hakutekstiä uudestaan.\n"
 "\n"
 
-#: src/help.c:311
+#: src/help.c:280
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1176,7 +1279,7 @@ msgstr ""
 " Seuraavat funktionäppäimet ovat käytössä selaimen Etsi-tilassa:\n"
 "\n"
 
-#: src/help.c:315
+#: src/help.c:284
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1200,7 +1303,7 @@ msgstr ""
 "tilassa:\n"
 "\n"
 
-#: src/help.c:328
+#: src/help.c:297
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1224,7 +1327,7 @@ msgstr ""
 " Seuraavat funktionäppäimet ovat käytössä Oikolue-tilassa:\n"
 "\n"
 
-#: src/help.c:343
+#: src/help.c:312
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1244,7 +1347,7 @@ msgstr ""
 " Seuraavat funktionäppäimet ovat käytössä Suorita komento -tilassa:\n"
 "\n"
 
-#: src/help.c:356
+#: src/help.c:325
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1264,7 +1367,7 @@ msgstr ""
 "muokattava tiedosto. Tilarivi on kolmas rivi alhaalta lukien ja näyttää "
 "tärkeät viestit."
 
-#: src/help.c:366
+#: src/help.c:335
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1282,7 +1385,7 @@ msgstr ""
 "merkitään Meta (M-) -symbolillla ja voidaan kirjoittaa joko Esc, Alt, tai "
 "Meta -näppäimellä riippuen näppäimistösi asetuksista.  "
 
-#: src/help.c:375
+#: src/help.c:344
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1296,15 +1399,15 @@ msgstr ""
 "pääikkunassa. Vaihtoehtoiset näppäimet näytetään sulkeissa:\n"
 "\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:376 src/help.c:448
 msgid "enable/disable"
 msgstr "päälle/pois"
 
-#: src/nano.c:587
+#: src/nano.c:601
 msgid "Key invalid in view mode"
 msgstr "Virheellinen näppäin katselutilassa"
 
-#: src/nano.c:695
+#: src/nano.c:713
 #, c-format
 msgid ""
 "\n"
@@ -1313,7 +1416,7 @@ msgstr ""
 "\n"
 "Puskuri kirjoitettu tiedostoon ”%s”\n"
 
-#: src/nano.c:697
+#: src/nano.c:715
 #, c-format
 msgid ""
 "\n"
@@ -1322,7 +1425,7 @@ msgstr ""
 "\n"
 "Puskuria ei kirjoitettu tiedostoon %s: %s\n"
 
-#: src/nano.c:700
+#: src/nano.c:718
 #, c-format
 msgid ""
 "\n"
@@ -1331,11 +1434,11 @@ msgstr ""
 "\n"
 "Puskuria ei kirjoitettu tiedostoon: %s\n"
 
-#: src/nano.c:723
+#: src/nano.c:743
 msgid "Window size is too small for nano...\n"
 msgstr "Ikkuna on liian pieni Nanolle...\n"
 
-#: src/nano.c:816
+#: src/nano.c:836
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
@@ -1344,252 +1447,258 @@ msgstr ""
 "Käyttö: nano [VALITSIMET] [[+RIVI,SARAKE] TIEDOSTO]...\n"
 "\n"
 
-#: src/nano.c:819
+#: src/nano.c:839
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Valitsin\t\tPitkä valitsin\t\tMerkitys\n"
 
-#: src/nano.c:821
+#: src/nano.c:841
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Valitsin\tMerkitys\n"
 
-#: src/nano.c:824
-msgid "Show this message"
-msgstr "Näytä tämä ohje"
-
-#: src/nano.c:825
+#: src/nano.c:844
 msgid "+LINE,COLUMN"
 msgstr "+RIVI,SARAKE"
 
-#: src/nano.c:826
+#. TRANSLATORS: The next forty or so strings are option descriptions
+#. * for the --help output.  Try to keep them at most 40 characters.
+#: src/nano.c:847
 msgid "Start at line LINE, column COLUMN"
 msgstr "Aloita rivillä RIVI, sarakkeessa SARAKE"
 
-#: src/nano.c:828
+#: src/nano.c:849
 msgid "Enable smart home key"
 msgstr "Ota käyttöön älykäs kotinäppäin"
 
 #  "tallennettaessa"?
-#: src/nano.c:829
+#: src/nano.c:850
 msgid "Save backups of existing files"
 msgstr "Tallenna olemassaolevien tiedostojen varmuuskopiot"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "-C <dir>"
 msgstr "-C <hak>"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<hak>"
 
-#: src/nano.c:831
+#: src/nano.c:852
 msgid "Directory for saving unique backup files"
 msgstr "Hakemisto uniikkien varmuuskopitiedostojen tallentamiseen"
 
-#: src/nano.c:834
+#: src/nano.c:855
 msgid "Use bold instead of reverse video text"
 msgstr "Käytä lihavoitua tekstiä käänteisen videotekstin sijasta"
 
-#: src/nano.c:837
+#: src/nano.c:858
 msgid "Convert typed tabs to spaces"
 msgstr "Muunna näppäillyt sarkainlyönnit välilyönneiksi"
 
-#: src/nano.c:840
+#: src/nano.c:861
 msgid "Enable multiple file buffers"
 msgstr "Mahdollista useiden puskureiden käyttö"
 
-#: src/nano.c:845
+#: src/nano.c:865
+msgid "Use (vim-style) lock files"
+msgstr "Käytä (vim-tyylisiä) lukitustiedostoja"
+
+#: src/nano.c:869
 msgid "Log & read search/replace string history"
 msgstr "Muista viimeksi etsityt/korvatut merkkijonot"
 
-#: src/nano.c:848
+#: src/nano.c:873
 msgid "Don't look at nanorc files"
 msgstr "Älä käytä nanorc-tiedostoja"
 
-#: src/nano.c:851
+#: src/nano.c:876
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Korjaa numeerisen näppäistön näppäinten sekaantumispulma"
 
-#: src/nano.c:853
+#: src/nano.c:878
 msgid "Don't add newlines to the ends of files"
 msgstr "Älä lisää rivinvaihtoa tiedostojen loppuun"
 
-#: src/nano.c:856
+#: src/nano.c:881
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Älä muunna tiedostoja DOS/Mac-muodosta"
 
-#: src/nano.c:858
+#: src/nano.c:883
 msgid "Use one more line for editing"
 msgstr "Käytä yhtä lisäriviä muokkaukseen"
 
-#: src/nano.c:860
+#: src/nano.c:886
+msgid "Log & read location of cursor position"
+msgstr "Kirjaa lokiin ja lue kohdistinkoordinaatin sijainti"
+
+#: src/nano.c:889
 msgid "-Q <str>"
 msgstr "-Q <jono>"
 
-#: src/nano.c:860
+#: src/nano.c:889
 msgid "--quotestr=<str>"
 msgstr "--quotestr=<jono>"
 
-#: src/nano.c:861
+#: src/nano.c:890
 msgid "Quoting string"
 msgstr "Lainauksen merkintä"
 
-#: src/nano.c:863
+#: src/nano.c:892
 msgid "Restricted mode"
 msgstr "Rajoitettu tila"
 
-#: src/nano.c:866
+#: src/nano.c:895
 msgid "Scroll by line instead of half-screen"
 msgstr "Vieritä rivi kerrallaan puoliruudun sijasta"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "-T <#cols>"
 msgstr "-T <#saraketta>"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#saraketta>"
 
-#: src/nano.c:869
+#: src/nano.c:898
 msgid "Set width of a tab to #cols columns"
 msgstr "Aseta sarkaimen leveys #cols -sarakkeeksi"
 
-#: src/nano.c:871
+#: src/nano.c:900
 msgid "Do quick statusbar blanking"
 msgstr "Tyhjennä tilarivi pikaisesti"
 
-#: src/nano.c:874
+#: src/nano.c:903
 msgid "Print version information and exit"
 msgstr "Tulosta versiotiedot ja lopeta"
 
-#: src/nano.c:877
+#: src/nano.c:906
 msgid "Detect word boundaries more accurately"
 msgstr "Havaitse sanarajat tarkemmin"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "-Y <str>"
 msgstr "-Y <jono>"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "--syntax=<str>"
 msgstr "--syntax=<jono>"
 
-#: src/nano.c:881
+#: src/nano.c:910
 msgid "Syntax definition to use for coloring"
 msgstr "Väritykseen käytettävä syntaksimääritys"
 
-#: src/nano.c:883
+#: src/nano.c:912
 msgid "Constantly show cursor position"
 msgstr "Näytä kohdistimen sijainti jatkuvasti"
 
-#: src/nano.c:885
+#: src/nano.c:914
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Korjaa Backspace/Delete -näppäinten sekaantumispulma"
 
-#: src/nano.c:888
+#: src/nano.c:915
+msgid "Show this help text"
+msgstr "Näytä tämä ohjeteksti"
+
+#: src/nano.c:918
 msgid "Automatically indent new lines"
 msgstr "Sisennä uudet rivit automaattisesti"
 
-#: src/nano.c:889
+#: src/nano.c:919
 msgid "Cut from cursor to end of line"
 msgstr "Leikkaa rivin loppuun saakka"
 
-#: src/nano.c:892
+#: src/nano.c:922
 msgid "Don't follow symbolic links, overwrite"
 msgstr "Älä seuraa symbolisia linkkejä, vaan korvaa ne tiedostoilla."
 
-#: src/nano.c:894
+#: src/nano.c:924
 msgid "Enable the use of the mouse"
 msgstr "Käytä hiirtä"
 
-#: src/nano.c:897
+#: src/nano.c:926
+msgid "Do not read the file (only write it)"
+msgstr "Älä lue tiedostoa (vain kirjoita se)"
+
+#: src/nano.c:928
 msgid "-o <dir>"
 msgstr "-o <hak>"
 
-#: src/nano.c:897
+#: src/nano.c:928
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<hak>"
 
-#: src/nano.c:898
+#: src/nano.c:929
 msgid "Set operating directory"
 msgstr "Aseta toimintahakemisto"
 
-#: src/nano.c:901
+#: src/nano.c:932
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Salli XON (^Q)- ja XOFF (^S) -näppäimet"
 
-#: src/nano.c:903
+#: src/nano.c:935
 msgid "Silently ignore startup issues like rc file errors"
 msgstr "Älä ilmoita käynnistyspulmista kuten rc-tiedoston virheistä"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "-r <#cols>"
 msgstr "-r <#sarakkeet>"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "--fill=<#cols>"
 msgstr "--fill=<#sarakkeet>"
 
-#: src/nano.c:906
-msgid "Set wrapping point at column #cols"
-msgstr "Aseta rivityspiste sarakkeeseen #cols"
+#: src/nano.c:939
+msgid "Set hard-wrapping point at column #cols"
+msgstr "Aseta kova rivitys sarakkeeseen #cols"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "-s <prog>"
 msgstr "-s <ohjelma>"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "--speller=<prog>"
 msgstr "--speller=<ohjelma>"
 
-#: src/nano.c:910
+#: src/nano.c:943
 msgid "Enable alternate speller"
 msgstr "Käytö vaihtoehtoista oikolukuohjelmaa"
 
-#: src/nano.c:913
+#: src/nano.c:946
 msgid "Auto save on exit, don't prompt"
 msgstr "Tallenna tiedosto kysymättä poistuttaessa"
 
-#: src/nano.c:915
-msgid "Allow generic undo [EXPERIMENTAL]"
-msgstr "Ota käyttöön yleinen perumistoiminto [KOKEELLINEN]"
-
-#: src/nano.c:918
+#: src/nano.c:947
 msgid "View mode (read-only)"
 msgstr "Katselutila (vain luku)"
 
-#: src/nano.c:920
-msgid "Don't wrap long lines"
-msgstr "Älä rivitä pitkiä rivejä"
+#: src/nano.c:949
+msgid "Don't hard-wrap long lines"
+msgstr "Älä kovarivitä pitkiä rivejä"
 
-#: src/nano.c:922
+#: src/nano.c:951
 msgid "Don't show the two help lines"
 msgstr "Älä näytä kahta avusteriviä"
 
-#: src/nano.c:923
+#: src/nano.c:952
 msgid "Enable suspension"
 msgstr "Ota käyttöön keskeyttäminen"
 
-#: src/nano.c:924
+#: src/nano.c:954
 msgid "Enable soft line wrapping"
 msgstr "Ota käyttöön pehmeä rivitys"
 
-#: src/nano.c:928
-msgid "(ignored, for Pico compatibility)"
-msgstr "(eivät vaikuta Nanoon; Pico käyttäisi)"
-
-#: src/nano.c:938
-#, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
+#: src/nano.c:963
+#, fuzzy, c-format
+msgid " GNU nano, version %s\n"
 msgstr " GNU Nano, versio %s (käännetty %s, %s)\n"
 
-#: src/nano.c:943
+#: src/nano.c:966
 #, 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:944
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1598,155 +1707,181 @@ msgstr ""
 "\n"
 " Mukaan käännetyt valitsimet:"
 
-#: src/nano.c:1022
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr "Tämä ominaisuus ei ikävä kyllä ole käytössä"
 
-#: src/nano.c:1044
+#: src/nano.c:1125
+msgid "No file name"
+msgstr "Ei tiedostonimeä"
+
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "Tallenna muutettu teksti (Muutokset häviävät, jos vastaat ”ei”) ? "
 
-#: src/nano.c:1088
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
-msgstr "Ei voitu valitettavasti avata uudelleen vakiosyötettä näppäimistöstä\n"
+msgstr "Vakiosyötteen avaaminen uudelleen näppäimistöstä epäonnistui\n"
 
-#: src/nano.c:1114
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "Luetaan vakiosyötteestä, ^C lopettaa toiminnon\n"
 
-#: src/nano.c:1182
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Vastaanotettiin SIGHUP tai SIGTERM\n"
 
-#: src/nano.c:1204
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Palaa Nanoon komennolla ”fg”.\n"
 
-#: src/nano.c:1386
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "käytössä"
 
-#: src/nano.c:1387
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "ei käytössä"
 
-#: src/nano.c:1548 src/winio.c:1256
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr "Tuntematon komento"
 
-#: src/nano.c:1674
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "XON:ia ei käytetä, mutinaa"
 
-#: src/nano.c:1679
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF:ia ei käytetä, mutinaa"
 
 #  puuttuu tai liian iso tai liian pieni
-#: src/nano.c:2209 src/rcfile.c:1100
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Haluttu sarkaimen koko ”%s” ei kelpaa"
 
 #  puuttuu tai liian iso tai liian pieni
-#: src/nano.c:2268 src/rcfile.c:1025
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Haluttu täydennyspituus ”%s” ei kelpaa"
 
+#: src/nano.c:2415
+#, c-format
+msgid "Type '%s -h' for a list of available options.\n"
+msgstr "Hae käytettävissä olevat valitsimet kirjoittamalla ’%s -h’.\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:1259
+#: src/prompt.c:1055
 msgid "Yy"
 msgstr "KkYy"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1056
 msgid "Nn"
 msgstr "EeNn"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1057
 msgid "Aa"
 msgstr "aA"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1071
 msgid "Yes"
 msgstr "Kyllä"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1076
 msgid "All"
 msgstr "Kaikki"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1081
 msgid "No"
 msgstr "Ei"
 
-#: src/rcfile.c:130
+#: src/rcfile.c:137
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Virhe tiedostossa %s rivillä %lu: "
 
-#: src/rcfile.c:185
+#: src/rcfile.c:196
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "parametri ’%s’ sisältää parittoman ”-merkin"
 
-#: src/rcfile.c:212 src/rcfile.c:264 src/rcfile.c:711 src/rcfile.c:768
-#: src/rcfile.c:821
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Säännöllisten lausekkeiden on alettava ja loputtava ”-merkillä"
 
-#: src/rcfile.c:238 src/search.c:62
+#: src/rcfile.c:249 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Säännöllinen lauseke ”%s” ei kelpaa: %s"
 
-#: src/rcfile.c:258
+#: src/rcfile.c:269
 msgid "Missing syntax name"
 msgstr "Puuttuva syntaksin nimi"
 
-#: src/rcfile.c:316
+#: src/rcfile.c:340
 msgid "The \"none\" syntax is reserved"
 msgstr "Syntaksi ”none” on varattu"
 
-#: src/rcfile.c:323
+#: src/rcfile.c:347
 msgid "The \"default\" syntax must take no extensions"
 msgstr "Syntaksi ”default” ei saa ottaa laajennuksia"
 
-#: src/rcfile.c:386 src/rcfile.c:483
+#: src/rcfile.c:433
 msgid "Missing key name"
 msgstr "Puuttuva näppäinnimi"
 
-#: src/rcfile.c:398 src/rcfile.c:499
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
-msgstr "Näppäinsidontojen on alettava merkeillä ”^”, ”M”, tai ”F”"
+#: src/rcfile.c:442 src/rcfile.c:453
+msgid "Key name is too short"
+msgstr "Näppäinnimi on liian lyhyt"
+
+#: src/rcfile.c:463
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
+msgstr "Näppäinnimien on alettava merkeillä ”^”, ”M”, tai ”F”"
 
-#: src/rcfile.c:407
-msgid "Must specify function to bind key to"
+#: src/rcfile.c:472
+msgid "Must specify a function to bind the key to"
 msgstr "On määriteltävä funktionäppäin, johon näppäin sidotaan"
 
-#: src/rcfile.c:418 src/rcfile.c:510
-msgid "Must specify menu to bind key to (or \"all\")"
-msgstr "On määriteltävä valikko, johon näppäin sidotaan (tai ”all”)"
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:482
+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"
+
+#: src/rcfile.c:489
+#, c-format
+msgid "Cannot map name \"%s\" to a function"
+msgstr "Nimen ”%s” kartoittaminen funktioon epäonnistui"
 
-#: src/rcfile.c:426
+#: src/rcfile.c:496
 #, c-format
-msgid "Could not map name \"%s\" to a function"
-msgstr "Ei voitu kartoittaa nimeä ”%s” funktioon"
+msgid "Cannot map name \"%s\" to a menu"
+msgstr "Nimen ”%s” kartoittaminen valikkoon epäonnistui"
 
-#: src/rcfile.c:432 src/rcfile.c:517
+#: src/rcfile.c:528
 #, c-format
-msgid "Could not map name \"%s\" to a menu"
-msgstr "Ei voitu kartoittaa nimeä ”%s” valikkoon"
+msgid "Function '%s' does not exist in menu '%s'"
+msgstr "Funktiota ’%s’ ei ole valikossa ’%s’"
 
-#: src/rcfile.c:454
+#: src/rcfile.c:543
 #, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
+msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "Valitettavasti näppäinmerkkijonossa ”%s” on väärä sidonta"
 
-#: src/rcfile.c:625
+#: src/rcfile.c:629
+#, c-format
+msgid "Error expanding %s: %s"
+msgstr "Virhe laajennettaessa kohdetta %s: %s"
+
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1761,137 +1896,194 @@ msgstr ""
 "”black”, ja alussa voi olla ”bright”\n"
 "edustaväreinä."
 
-#: src/rcfile.c:647
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
 msgstr "En voi lisätä värikomentoa ilman syntaksikomentoa"
 
-#: src/rcfile.c:652
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "Puuttuva värin nimi"
 
-#: src/rcfile.c:672
-#, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr "Taustaväri ”%s” ei  voi olla ”bright”"
-
-#: src/rcfile.c:690 src/rcfile.c:809
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr "Puuttuva säännöllinen lausekemerkkijono"
 
-#: src/rcfile.c:762
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "”start=” vaatii vastaavan ”end=”:n"
 
-#: src/rcfile.c:804
+#: src/rcfile.c:837
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr "Taustaväri ”%s” ei voi olla ”bright”"
+
+#: src/rcfile.c:865
 msgid "Cannot add a header regex without a syntax command"
-msgstr "Ei voi lisätä säännöllistä otsakelauseketta ilman syntaksikomentoa"
+msgstr "En voi lisätä säännöllistä otsakelauseketta ilman syntaksikomentoa"
+
+#: src/rcfile.c:921
+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:874
+#: src/rcfile.c:926
+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:990
+msgid "Missing linter command"
+msgstr "Puuttuva esikatselukomento"
+
+#: src/rcfile.c:1010
+msgid "Cannot add formatter without a syntax command"
+msgstr "En voi lisätä muotoilijaa ilman syntaksikomentoa"
+
+#: src/rcfile.c:1015
+msgid "Missing formatter command"
+msgstr "Puuttuva muotoilijakomento"
+
+#: src/rcfile.c:1045
 #, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
-msgstr "Vakava virhe: funktioon ”%s” ei ole kartoitettu näppäimiä"
+msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
+msgstr ""
+"Vakava virhe: funktioon ”%s” ei ole kartoitettu näppäimiä. Poistutaan.\n"
 
-#: src/rcfile.c:876
+#: src/rcfile.c:1047
+#, c-format
 msgid ""
-"Exiting.  Please use nano with the -I option if needed to adjust your nanorc "
-"settings\n"
+"If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
-"Poistutaan. Käytä Nano-ohjelmaa ”-I”-valitsimella, jos nanorc-asetuksia "
-"täytyy säätää\n"
+"Tarvittaessa käytä Nano-ohjelmaa ”-I”-valitsimella, jos nanorc-asetuksia "
+"täytyy säätää.\n"
+
+#: src/rcfile.c:1108
+#, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "Laajennettavan syntaksin ”%s” löytäminen epäonnistui"
 
-#: src/rcfile.c:926 src/rcfile.c:935 src/rcfile.c:945
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Komentoa ”%s” ei sallita sisällytetyssä tiedostossa"
 
-#: src/rcfile.c:951 src/rcfile.c:1128
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Syntaksissa ”%s” ei ole värikomentoja"
 
-#: src/rcfile.c:966
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Komentoa ”%s” ei ymmärretty"
 
-#: src/rcfile.c:972
-msgid "Missing flag"
-msgstr "Puuttuva lippu"
+#: src/rcfile.c:1186
+msgid "Missing option"
+msgstr "Puuttuva valitsin"
 
-#: src/rcfile.c:994
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
-msgstr "valitsin ”%s” vaatii argumentin"
+msgstr "Valitsin ”%s” vaatii argumentin"
 
-#: src/rcfile.c:1012
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr "Valitsin ei ole monitavuinen merkkijono"
 
-#: src/rcfile.c:1038 src/rcfile.c:1066 src/rcfile.c:1075
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr "Ei-tyhjemerkkejä vaadittu"
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr "Kaksi yksisarakkeista merkkiä vaadittu"
 
-#: src/rcfile.c:1114
+#: src/rcfile.c:1339
 #, c-format
-msgid "Cannot unset flag \"%s\""
-msgstr "Ei voi poistaa lippua ”%s”"
+msgid "Cannot unset option \"%s\""
+msgstr "En voi poistaa valitsinta ”%s”"
 
-#: src/rcfile.c:1123
+#: src/rcfile.c:1345
 #, c-format
-msgid "Unknown flag \"%s\""
-msgstr "Tuntematon lippu ”%s”"
+msgid "Unknown option \"%s\""
+msgstr "Tuntematon valitsin ”%s”"
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr "Kotihakemistoa ei löydy! Vää!"
 
+#: src/rcfile.c:1442
+#, c-format
+msgid ""
+"\n"
+"Press Enter to continue starting nano.\n"
+msgstr ""
+"\n"
+"Paina enteriä jatkaaksesi Nanon käynnistämistä.\n"
+
 #: src/search.c:96
 #, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "”%.*s%s” ei löytynyt"
 
-#: src/search.c:205
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/search.c:184
+msgid " [Case Sensitive]"
+msgstr " [Kirj. koko]"
+
+#: src/search.c:188
+msgid " [Regexp]"
+msgstr " [Säännöke]"
+
+#: src/search.c:192
+msgid " [Backwards]"
+msgstr " [Taaksepäin]"
+
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:197
 msgid " (to replace) in selection"
 msgstr " (korvattava) valinnassa"
 
-#: src/search.c:207
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (korvattava)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "Korvataanko tämä kohta?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:945
 msgid "Replace with"
 msgstr "Korvaa merkkijonolla"
 
 # Pitäisiköhän olla passiivi?
-#: src/search.c:1004
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
 msgstr[0] "Korvattu %lu kohta"
 msgstr[1] "Korvattu %lu kohtaa"
 
-#: src/search.c:1034
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr "Kirjoita rivin numero, sarakkeen numero"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
 msgstr "Virheellinen rivi- tai sarakenumero"
 
 #  versiossa 1.1.99pre2 hakee merkkejä "([{<>}])"
-#: src/search.c:1214
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "Ei ole suljemerkki"
 
-#: src/search.c:1281
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "Ei vastaavaa suljetta"
 
@@ -1903,712 +2095,335 @@ msgstr "Merkintä alkoi"
 msgid "Mark Unset"
 msgstr "Merkintä loppui"
 
-#: src/text.c:443
+#: src/text.c:439
 msgid "Nothing in undo buffer!"
 msgstr "Peruutuspuskurissa ei ole mitään!"
 
-#: src/text.c:455 src/text.c:593
+#: src/text.c:445 src/text.c:590
 #, 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"
+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:466 src/text.c:603
+#: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
 msgstr "teksti lisää"
 
-#: src/text.c:475 src/text.c:613
+#: src/text.c:467 src/text.c:612
 msgid "text delete"
 msgstr "teksti poista"
 
-#: src/text.c:489 src/text.c:628
-msgid "line wrap"
-msgstr "rivittäminen"
-
-#: src/text.c:503 src/text.c:636
+#: src/text.c:491 src/text.c:641
 msgid "line join"
 msgstr "rivin liittäminen"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:505 src/text.c:657
 msgid "text cut"
 msgstr "tekstileikkaus"
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:510 src/text.c:661
 msgid "text uncut"
 msgstr "testin leikkauksen peruutus"
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:515 src/text.c:623
 msgid "line break"
 msgstr "rivin katkaiseminen"
 
-#: src/text.c:532 src/text.c:665
+#: src/text.c:528 src/text.c:672
 msgid "text insert"
 msgstr "teksti lisää"
 
-#: src/text.c:550 src/text.c:659
+#: src/text.c:549 src/text.c:665
 msgid "text replace"
 msgstr "teksti korvaa"
 
-#: src/text.c:557 src/text.c:671
-msgid "Internal error: unknown type.  Please save your work"
-msgstr "Sisäinen virhe: tuntematon tyyppi. Tallenna työsi"
+#: src/text.c:556 src/text.c:679 src/text.c:983
+msgid "Internal error: unknown type.  Please save your work."
+msgstr "Sisäinen virhe: tuntematon tyyppi. Tallenna työsi."
 
-#: src/text.c:563
+#: src/text.c:561
 #, c-format
 msgid "Undid action (%s)"
 msgstr "Peruttu toiminto (%s)"
 
-#: src/text.c:578
+#: src/text.c:580
 msgid "Nothing to re-do!"
 msgstr "Ei mitään tehtävää!"
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
-msgstr "Sisäinen virhe: Uudelleenteon asetukset epäonnistuivat. Tallenna työsi"
+#: src/text.c:584
+msgid "Internal error: cannot set up redo.  Please save your work."
+msgstr "Sisäinen virhe: komennon redo asettaminen epäonnistui. Tallenna työsi."
 
-#: src/text.c:676
+#: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Toiminto tehtiin uudelleen (%s)"
 
-#: src/text.c:766
-msgid "Could not pipe"
-msgstr "Ei voitu tehdä putkea"
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
+msgid "Could not create pipe"
+msgstr "Putken luominen epäonnistui"
 
-#: src/text.c:793 src/text.c:2636 src/text.c:2788
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
-msgstr "Ei voitu tehdä lapsiprosessia"
+msgstr "Lapsiprosessi epäonnistui"
 
-#: src/text.c:941
-msgid "Internal error: can't setup uncut.  Please save your work."
-msgstr "Sisäinen virhe: ei voi asettaa uncut-komentoa. Tallenna työsi"
-
-#: src/text.c:950
-msgid "Internal error: unknown type.  Please save your work."
-msgstr "Sisäinen virhe: tuntematon tyyppi. Tallenna työsi."
+#: src/text.c:969
+msgid "Internal error: cannot set up uncut.  Please save your work."
+msgstr ""
+"Sisäinen virhe: komennon uncut asettaminen epäonnistui. Tallenna työsi."
 
-#: src/text.c:1870
+#: src/text.c:1806
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Lainausmerkintä %s ei kelpaa: %s"
 
-#: src/text.c:2267
+#: src/text.c:2207
 msgid "Can now UnJustify!"
 msgstr "Tasaamisen voi perua nyt."
 
-#: src/text.c:2462
+#: src/text.c:2404
 msgid "Edit a replacement"
 msgstr "Muokkaa korvausta"
 
-#: src/text.c:2548
-msgid "Could not create pipe"
-msgstr "Ei voitu tehdä putkea"
-
-#: src/text.c:2550
+#: src/text.c:2492
 msgid "Creating misspelled word list, please wait..."
 msgstr "Luodaan väärin kirjoitettujen sanojen lista, ole hyvä ja odota..."
 
-#: src/text.c:2642
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
 msgstr "Putken puskurin kokoa ei saatu selville"
 
-#: src/text.c:2693
+#: src/text.c:2635
 msgid "Error invoking \"spell\""
 msgstr "Virhe komennon ”spell” aikana"
 
-#: src/text.c:2696
+#: src/text.c:2638
 msgid "Error invoking \"sort -f\""
 msgstr "Virhe komennon ”sort -f” aikana"
 
-#: src/text.c:2699
+#: src/text.c:2641
 msgid "Error invoking \"uniq\""
 msgstr "Virhe komennon ”uniq” aikana"
 
-#: src/text.c:2756 src/text.c:2965
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "Oikoluku on valmis"
 
-#: src/text.c:2815
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Virhe kutsuttaessa kohdetta ”%s”"
 
-#: src/text.c:2960
+#: src/text.c:2885
+msgid "Invoking spell checker, please wait"
+msgstr "Käynnistä oikoluin, odota hetki"
+
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Oikoluku epäonnistui: %s"
 
-#: src/text.c:2962
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Oikoluku epäonnistui: %s: %s"
 
-#: src/text.c:3030
+#: src/text.c:2937
+msgid "No linter defined for this type of file!"
+msgstr "Esikatselua ei ole määritelty tämäntyyppiselle tiedostolle"
+
+#: src/text.c:2947
+msgid "Save modified buffer before linting?"
+msgstr "Tallennetaanko muokattu puskuri ennen esikatselua?"
+
+#: src/text.c:2969
+msgid "Invoking linter, please wait"
+msgstr "Kutsutaan esikastelua, odota vähän"
+
+#: src/text.c:3125
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr "Saatiin 0 jäsenneltäviltä riveiltä komennosta: %s"
+
+#: src/text.c:3159
+#, 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:3205
+msgid "At last message"
+msgstr "Viimeisessä viestissä"
+
+#: src/text.c:3210
+msgid "At first message"
+msgstr "Ensimmäisessä viestissä"
+
+#: src/text.c:3250
+#, fuzzy
+msgid "Error: no formatter defined"
+msgstr "Virhe: esikatselua ei ole määritelty"
+
+#: src/text.c:3275
+msgid "Finished"
+msgstr "Valmis"
+
+#: src/text.c:3280
+msgid "Invoking formatter, please wait"
+msgstr "Kutsutaan muotoilijaa, odota vähän"
+
+#: src/text.c:3360
+msgid "Finished formatting"
+msgstr "Lopetettiin muotoilu"
+
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sSanoja: %lu  riviä: %ld  merkkiä: %lu"
 
-#: src/text.c:3031
+#: src/text.c:3439
 msgid "In Selection:  "
-msgstr "Valinnassa:"
+msgstr "Valinnassa:    "
+
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3453
+msgid "Verbatim Input"
+msgstr "Merkintarkka syöte"
 
-#: src/utils.c:405 src/utils.c:417
+#: src/utils.c:410 src/utils.c:422
 msgid "nano is out of memory!"
 msgstr "Nanolta loppui muisti!"
 
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
-#: src/winio.c:1557
+#: src/winio.c:1583
 msgid "Unicode Input"
 msgstr "Unikoodisyöte"
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2142 src/winio.c:2146
 msgid "Modified"
 msgstr "Muokattu"
 
-#: src/winio.c:2150
+#: src/winio.c:2143
 msgid "View"
 msgstr "Näkymä"
 
-#: src/winio.c:2164
+#: src/winio.c:2157
 msgid "DIR:"
 msgstr "HAKEMISTO:"
 
-#: src/winio.c:2171
+#: src/winio.c:2164
 msgid "File:"
 msgstr "Tiedosto:"
 
-#: src/winio.c:3360
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2261
+msgid ""
+"Warning: Modifying a file which is not locked, check directory permission?"
+msgstr ""
+"Varoitus: Muokataan tiedostoa, joka ei ole lukittu, tarkista hakemiston "
+"käyttöoikeudet?"
+
+#: src/winio.c:3377
 #, 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%%)"
 
-#: src/winio.c:3492
+#: src/winio.c:3507
 msgid "The nano text editor"
 msgstr "Nano-editori"
 
-#: src/winio.c:3493
+#: src/winio.c:3508
 msgid "version"
 msgstr "versio"
 
-#: src/winio.c:3494
+#: src/winio.c:3509
 msgid "Brought to you by:"
 msgstr "Tehneet:"
 
-#: src/winio.c:3495
+#: src/winio.c:3510
 msgid "Special thanks to:"
 msgstr "Erikoiskiitokset:"
 
-#: src/winio.c:3496
+#: src/winio.c:3511
 msgid "The Free Software Foundation"
 msgstr "Free Software Foundation"
 
+#: src/winio.c:3512
+msgid "the many translators and the TP"
+msgstr "monta kielenkääntäjää ja Translationproject"
+
 #  Special thanks to: (nimiä) For ncurses: (nimiä)
-#: src/winio.c:3497
+#: src/winio.c:3513
 msgid "For ncurses:"
 msgstr "Ncursesista:"
 
-#: src/winio.c:3498
+#: src/winio.c:3514
 msgid "and anyone else we forgot..."
 msgstr "ja kaikille muille, jotka unohdimme..."
 
-#: src/winio.c:3499
+#: src/winio.c:3515
 msgid "Thank you for using nano!"
 msgstr "Kiitos Nanon käyttämisestä!"
 
-#~ msgid "Error writing backup file %s: File owner mismatch"
-#~ msgstr ""
-#~ "Virhe kirjoitettaessa varmuuskopiotiedostoon %s: Tiedoston "
-#~ "omistajatäsmäämättömyys"
-
-#~ msgid "Space"
-#~ msgstr "Väli"
-
-#~ msgid "Come on, be reasonable"
-#~ msgstr "Jotakin järkevää, kiitos?"
-
-#~ msgid "File to insert into new buffer [from ./] "
-#~ msgstr "Uuteen puskuriin lisättävä tiedosto [hakemistosta ./] "
-
-#~ msgid "File to insert [from ./] "
-#~ msgstr "Lisättävä tiedosto [hakemistosta ./] "
-
-# Oikeasti ohjelma tuossa kohtaa vasta avaa tiedoston, mutta eipä
-# englanninkielinenkään versio käyttäjälle sitä kerro.
-#~ msgid "Could not read %s for backup: %s"
-#~ msgstr "Tiedostoa %s ei voitu lukea varmuuskopioitavaksi: %s"
-
-#~ msgid "Couldn't write backup: %s"
-#~ msgstr "Varmuuskopiota ei voitu kirjoittaa: %s"
-
-# Allatiivi kuulostaa väärältä.
-#~ msgid "Could not set permissions %o on backup %s: %s"
-#~ msgstr "Oikeuksia %o ei voitu asettaa varmuuskopiolle %s: %s"
-
-# Allatiivi kuulostaa väärältä.
-#
-# "Varmuuskopion %3$s omistajaa ei voitu asettaa %1$d:ksi ja ryhmää %2$d:ksi: %4$s"?
-# "Varmuuskopiota %3$s ei voitu siirtää käyttäjän %1$d ja ryhmän %2$d omistukseen: %4$s"?
-# "Käyttäjää %d ja ryhmää %d ei voitu asettaa varmuuskopion %s omistajaksi: %s"?
-#~ msgid "Could not set owner %d/group %d on backup %s: %s"
-#~ msgstr "Omistajaa %d ja ryhmää %d ei voitu asettaa varmuuskopiolle %s: %s"
-
-# Allatiivi kuulostaa väärältä.
-#
-# Mitenhän ajat pitäisi kääntää? Unixissa niitä on kolme:
-# * atime = access time
-#   - milloin tiedoston sisältöä on luettu (read, execve)
-#   - "käyttöaika", "lukuaika"?
-# * mtime = modification time
-#   - milloin tiedoston sisältöä on muutettu (write)
-#   - "muutosaika", "kirjoitusaika"?
-# * ctime = change time
-#   - milloin metatietoja on muutettu (chown, chmod, link, unlink)
-#   - "luontiaika"?
-#~ msgid "Could not set access/modification time on backup %s: %s"
-#~ msgstr "Varmuuskopion %s käyttö- ja muutosaikaa ei voitu asettaa: %s"
-
-#~ msgid "Could not open file for writing: %s"
-#~ msgstr "Tiedostoa ei voitu avata kirjoitettavaksi: %s"
-
-#~ msgid "Could not close %s: %s"
-#~ msgstr "Tiedostoa %s ei voitu sulkea: %s"
-
-#~ msgid "Could not reopen %s: %s"
-#~ msgstr "Tiedostoa %s ei voitu avata uudestaan: %s"
-
-# Ohjelma on tallentanut puskurin väliaikaiseen tiedostoon. Nyt se avaa
-# alkuperäisen tiedoston ja kopioi sen sisällön väliaikaistiedoston
-# perään. Jos tämä onnistuu, niin seuraavaksi se siirtää
-# väliaikaistiedoston alkuperäisen tilalle.
-#~ msgid "Could not open %s for prepend: %s"
-#~ msgstr "Tiedostoa %s ei voitu avata alkuun kirjoittamista varten: %s"
-
-# Allatiivi kuulostaa väärältä.
-#~ msgid "Could not set permissions %o on %s: %s"
-#~ msgstr "Oikeuksia %o ei voitu asettaa tiedostolle %s: %s"
-
-#~ msgid "Can't open \"%s\": %s"
-#~ msgstr "Hakemistoa ”%s” ei voi avata: %s"
-
-#~ msgid "Goto Cancelled"
-#~ msgstr "Siirtyminen peruttu"
-
-#~ msgid "Unable to open ~/.nano_history file, %s"
-#~ msgstr "Ei voi avata tiedostoa ~/.nano_history: %s"
-
-#~ msgid "Unable to write ~/.nano_history file, %s"
-#~ msgstr "Ei voi kirjoittaa tiedostoa ~/.nano_history: %s"
-
-# Perään tulee "käytössä" tai "ei käytössä".
-#~ msgid "Writing file in DOS format"
-#~ msgstr "Tiedoston kirjoitus DOS-muodossa"
-
-# Perään tulee "käytössä" tai "ei käytössä".
-#~ msgid "Writing file in Mac format"
-#~ msgstr "Tiedoston kirjoitus Mac-muodossa"
-
-# Perään tulee "käytössä" tai "ei käytössä".
-#~ msgid "Backing up file"
-#~ msgstr "Varmuuskopiointi"
-
-#~ msgid "Auto wrap"
-#~ msgstr "Automaattinen rivitys"
-
-#~ msgid "Invoke the help menu"
-#~ msgstr "Avaa ohjevalikko"
-
-#~ msgid "Unjustify after a justify"
-#~ msgstr "Poista tasaus tasauksen jälkeen"
-
-#~ msgid "Replace text within the editor"
-#~ msgstr "Etsi ja korvaa tekstiä"
-
-#~ msgid "Search for text within the editor"
-#~ msgstr "Etsi tekstiä"
-
-#~ msgid "Move up one line"
-#~ msgstr "Siirry yksi rivi yläspäin"
-
-#~ msgid "Move down one line"
-#~ msgstr "Siirry yksi rivi alaspäin"
-
-#~ msgid "Insert a tab character"
-#~ msgstr "Lisää sarkainmerkki"
-
-# 80 sarakkeen näytöllä mahtuu 56 merkkiä.
-#~ msgid "Make the current search or replace case (in)sensitive"
-#~ msgstr "Muuta, huomioiko etsintä tai korvaus kirjainkokoa (a/A)"
-
-#~ msgid "Prepend to the current file"
-#~ msgstr "Lisää levyllä olevan tiedoston alkuun"
-
-#~ msgid "Search backwards"
-#~ msgstr "Etsi taaksepäin"
-
-#~ msgid "Write file out in DOS format"
-#~ msgstr "Kirjoita tiedosto DOS-muodossa"
-
-#~ msgid "Write file out in Mac format"
-#~ msgstr "Kirjoita tiedosto Mac-muodossa"
-
-# "tallennettaessa"?
-#~ msgid "Back up original file when saving"
-#~ msgstr "Tee varmuuskopio alkuperäisestä tiedostosta talletettaessa"
-
-#~ msgid "Find other bracket"
-#~ msgstr "Etsi toinen suljemerkki"
-
-# "edellinen"?
-#~ msgid "Open previously loaded file"
-#~ msgstr "Avaa viimeksi ladattu tiedosto"
-
-# "seuraavaksi"?
-#~ msgid "Open next loaded file"
-#~ msgstr "Avaa seuraava ladattu tiedosto"
-
-#~ msgid "Up"
-#~ msgstr "Yläs"
-
-#~ msgid "Down"
-#~ msgstr "Alas"
-
-#~ msgid "Direction"
-#~ msgstr "Suunta"
-
-#~ msgid ""
-#~ "Usage: nano [+LINE] [GNU long option] [option] [file]\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Käyttö: nano [+RIVI] [GNU pitkät valitsimet] [valitsimet] [tiedosto]\n"
-
-#~ msgid ""
-#~ "Usage: nano [+LINE] [option] [file]\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Käyttö: nano [+RIVI] [valitsimet] [tiedosto]\n"
-#~ "\n"
-
-#~ msgid "+LINE"
-#~ msgstr "+RIVI"
-
-#~ msgid "Use alternate keypad routines"
-#~ msgstr "Käytä vaihtoehtoisia näppäimistörutiineja"
-
-#~ msgid "Do regular expression searches"
-#~ msgstr "Etsi säännällisillä lausekkeilla"
-
-#~ msgid "-T [num]"
-#~ msgstr "-T [luku]"
-
-#~ msgid "Set fill cols to (wrap lines at) #cols"
-#~ msgstr "Rivitä annettua pidemmät rivit"
-
-#~ msgid "Could not create a temporary filename: %s"
-#~ msgstr "Väliaikaista tiedostonnimeä ei voitu luoda: %s"
-
-#~ msgid "Spell checking failed: unable to write temp file!"
-#~ msgstr "Oikoluku epäonnistui: väliaikaistiedostoa ei voitu kirjoittaa"
-
-#~ msgid "Cannot resize top win"
-#~ msgstr "Yläikkunan kokoa ei voi muuttaa"
-
-#~ msgid "Cannot move top win"
-#~ msgstr "Yläikkunaa ei voi siirtää"
-
-#~ msgid "Cannot resize edit win"
-#~ msgstr "Muokkausikkunan kokoa ei voi muuttaa"
-
-#~ msgid "Cannot move edit win"
-#~ msgstr "Muokkausikkunaa ei voi siirtää"
-
-#~ msgid "Cannot resize bottom win"
-#~ msgstr "Alaikkunan kokoa ei voi muuttaa"
+#~ msgid "Internal error: can't match line %ld.  Please save your work."
+#~ msgstr "Sisäinen virhe: vastaavaa riviä %ld ei löydy. Tallenna työsi."
 
-#~ msgid "Cannot move bottom win"
-#~ msgstr "Alaikkunaa ei voi siirtää"
+#~ msgid "line wrap"
+#~ msgstr "rivittäminen"
 
-#~ msgid "NumLock glitch detected.  Keypad will malfunction with NumLock off"
-#~ msgstr ""
-#~ "NumLock-ongelma: Numeronäppäimistö toimii väärin, kun NumLock ei ole "
-#~ "päällä."
-
-#~ msgid "Tab size is too small for nano...\n"
-#~ msgstr "Sarkaimen leveys on liian pieni Nanolle...\n"
-
-#~ msgid "Errors found in .nanorc file"
-#~ msgstr "Tiedostossa .nanorc oli virheitä"
-
-#~ msgid "Unable to open ~/.nanorc file, %s"
-#~ msgstr "Ei voi avata tiedostoa ~/.nanorc: %s"
-
-#~ msgid "\"%s...\" not found"
-#~ msgstr "”%s...” ei löytynyt"
-
-#~ msgid "Invalid regex ”%s”"
-#~ msgstr "Virheellinen säännöllinen lauseke ”%s”"
-
-#~ msgid "Search Cancelled"
-#~ msgstr "Etsintä peruttu"
-
-#~ msgid "Replace Cancelled"
-#~ msgstr "Korvaus peruttu"
-
-#~ msgid "Replace failed: unknown subexpression!"
-#~ msgstr "Korvaus epäonnistui: tuntematon alilauseke!"
-
-#~ msgid "Aborted"
-#~ msgstr "Keskeytetty"
-
-#~ msgid "  File: ..."
-#~ msgstr "  Tiedosto: ..."
-
-#~ msgid "   DIR: ..."
-#~ msgstr "   HAKEMISTO: ..."
-
-#~ msgid "Refusing 0 length regex match"
-#~ msgstr "En hyväksy 0-pituista säännöllisen lausekkeen osumaa"
-
-#~ msgid "add_to_cutbuffer() called with inptr->data = %s\n"
-#~ msgstr "add_to_cutbuffer() kutsuttu, inptr->data = %s\n"
-
-#~ msgid "Blew away cutbuffer =)\n"
-#~ msgstr "Leiketila katosi =)\n"
-
-#~ msgid "filename is %s\n"
-#~ msgstr "tiedoston nimi on %s\n"
-
-#~ msgid "%s: free'd a node, YAY!\n"
-#~ msgstr "%s: solmu vapautettu, YAY!\n"
-
-#~ msgid "%s: free'd last node.\n"
-#~ msgstr "%s: viimeinen solmu vapautettu.\n"
-
-#~ msgid "Backing up %s to %s\n"
-#~ msgstr "Kopioin tiedoston %s tiedostoksi %s\n"
-
-#~ msgid "Wrote >%s\n"
-#~ msgstr "Kirjoitettu: >%s\n"
-
-#~ msgid "current->data now = \"%s\"\n"
-#~ msgstr "current->data nyt = ”%s”\n"
-
-#~ msgid "After, data = \"%s\"\n"
-#~ msgstr "Jälkeenpäin data = ”%s”\n"
+#~ msgid "Allow generic undo [EXPERIMENTAL]"
+#~ msgstr "Ota käyttöön yleinen perumistoiminto [KOKEELLINEN]"
 
-#~ msgid "Main: set up windows\n"
-#~ msgstr "Pääohjelma: ikkunoiden asettelu\n"
+#~ msgid "Insert File"
+#~ msgstr "Lisää tiedosto"
 
-#~ msgid "Main: bottom win\n"
-#~ msgstr "Pääohjelma: alaikkuna\n"
+#~ msgid "Go to previous screen"
+#~ msgstr "Siirry edelliseen ruutuun"
 
-#~ msgid "Main: open file\n"
-#~ msgstr "Pääohjelma: avaa tiedosto\n"
+#~ msgid "Find Other Bracket"
+#~ msgstr "Etsi toinen sulje"
 
-#~ msgid "AHA!  %c (%d)\n"
-#~ msgstr "Ahaa! %c (%d)\n"
+#~ msgid "Long line wrapping"
+#~ msgstr "Pitkän rivin jakaminen eri riveille"
 
-#~ msgid "I got Alt-O-%c! (%d)\n"
-#~ msgstr "Vastaanotettu Alt-O-%c! (%d)\n"
+#~ msgid "Soft line wrapping"
+#~ msgstr "Pehmeä rivin jakaminen usealle riville"
 
-#~ msgid "I got Alt-[-1-%c! (%d)\n"
-#~ msgstr "Vastaanotettu Alt-[-1-%c! (%d)\n"
+#~ msgid "(ignored, for Pico compatibility)"
+#~ msgstr "(eivät vaikuta Nanoon; Pico käyttäisi)"
 
-#~ msgid "I got Alt-[-2-%c! (%d)\n"
-#~ msgstr "Vastaanotettu Alt-[-2-%c! (%d)\n"
+#~ msgid "Must specify menu to bind key to (or \"all\")"
+#~ msgstr "On määriteltävä valikko, johon näppäin sidotaan (tai ”all”)"
 
-#~ msgid "I got Alt-[-%c! (%d)\n"
-#~ msgstr "Vastaanotettu Alt-[-%c! (%d)\n"
+#~ msgid "Missing flag"
+#~ msgstr "Puuttuva lippu"
 
-#~ msgid "I got Alt-%c! (%d)\n"
-#~ msgstr "Vastaanotettu Alt-%c! (%d)\n"
+#~ msgid "Internal error: unknown type.  Please save your work"
+#~ msgstr "Sisäinen virhe: tuntematon tyyppi. Tallenna työsi"
 
-#~ msgid "I got %c (%d)!\n"
-#~ msgstr "Vastaanotettu %c (%d)!\n"
-
-#~ msgid "Adding new syntax after 1st\n"
-#~ msgstr "Lisään syntaksin ensimmäisen jälkeen\n"
-
-#~ msgid "Starting a new syntax type\n"
-#~ msgstr "Aloitan uuden syntaksityypin\n"
-
-#~ msgid "Starting a new colorstring for fg %d bg %d\n"
-#~ msgstr "Aloitan uuden värimerkkijonon fg: %d bg: %d\n"
-
-#~ msgid "Adding new entry for fg %d bg %d\n"
-#~ msgstr "Lisään uuden määrityksen fg: %d bg: %d\n"
-
-#~ msgid "%s: Read a comment\n"
-#~ msgstr "%s: Luki kommentin\n"
-
-#~ msgid "%s: Parsing option %s\n"
-#~ msgstr "%s: Tulkitsee asetusta %s\n"
-
-#~ msgid "set flag %d!\n"
-#~ msgstr "asetti lipun %d!\n"
-
-#~ msgid "actual_x for xplus=%d returns %d\n"
-#~ msgstr "actual_x parametrilla xplus=%d palauttaa %d\n"
-
-#~ msgid "Aha! '%c' (%d)\n"
-#~ msgstr "Ahaa! '%c' (%d)\n"
-
-#~ msgid "input '%c' (%d)\n"
-#~ msgstr "syäte '%c' (%d)\n"
-
-#~ msgid "Moved to (%d, %d) in edit buffer\n"
-#~ msgstr "Kohtaan (%d,%d) siirrytty muokkausruudussa\n"
-
-#~ msgid "I got \"%s\"\n"
-#~ msgstr "Saatiin ”%s”\n"
-
-#~ msgid "Dumping file buffer to stderr...\n"
-#~ msgstr "Syöttää tiedoston stderriin...\n"
-
-#~ msgid "Dumping cutbuffer to stderr...\n"
-#~ msgstr "Syöttää leiketilan stderriin...\n"
-
-#~ msgid "Dumping a buffer to stderr...\n"
-#~ msgstr "Syöttää tekstin stderriin...\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "The -p flag now invokes the Pico \"preserve\" flag.\n"
-#~ "The Pico compatibility flag has been removed as nano\n"
-#~ "now fully Pico compatible.  Please see the nano FAQ\n"
-#~ "for more info on this change...\n"
-#~ "\n"
-#~ "Press return to continue\n"
+#~ msgid "Internal error: Redo setup failed.  Please save your work"
 #~ msgstr ""
-#~ "\n"
-#~ "-p-valitsin tarkoittaa nyt Picon ”preserve”-valitsinta.\n"
-#~ "Pico-yhteensopivuusvalitsin on poistettu, koska Nano on\n"
-#~ "nyt täysin Pico-yhteensopiva. Lue Nanon FAQ:sta\n"
-#~ "lisätietoja tästä muutoksesta...\n"
-#~ "\n"
-#~ "Paina enteriä jatkaaksesi\n"
-
-#~ msgid "Generic error"
-#~ msgstr "Yleinen virhe"
-
-#~ msgid "Can't visit parent in restricted mode"
-#~ msgstr "Ei voi siirtyä ylähakemistoon rajoitetussa tilassa"
-
-#~ msgid "delete_node(): free'd a node, YAY!\n"
-#~ msgstr "delete_node(): solmu vapautettu, YAY!\n"
-
-#~ msgid "delete_node(): free'd last node.\n"
-#~ msgstr "delete_node(): viimeinen solmu vapautettu.\n"
-
-#~ msgid "Press return to continue\n"
-#~ msgstr "Paina return-painiketta jatkaaksesi Nanon käynnistämistä\n"
+#~ "Sisäinen virhe: Uudelleenteon asetukset epäonnistuivat. Tallenna työsi"
 
-#~ msgid "read_line: not on first line and prev is NULL"
-#~ msgstr "read_line: ei ensimmäisellä rivillä ja prev on NULL"
+#~ msgid "Could not pipe"
+#~ msgstr "Putki epäonnistui"
 
-#~ msgid "Pico mode"
-#~ msgstr "Pico-tila"
-
-#~ msgid "Emulate Pico as closely as possible"
-#~ msgstr "Jäljittele Picoa mahdollisimman tarkasti"
-
-#~ msgid "Replaced 1 occurrence"
-#~ msgstr "Korvattu 1 tapahtuma"
-
-#~ msgid "Replace with [%s]"
-#~ msgstr "Korvaa merkkijonolla [%s]"
-
-#~ msgid "nano: realloc: out of memory!"
-#~ msgstr "nano: realloc: muisti loppui!"
-
-#~ msgid " -T \t\t--tabsize=[num]\t\tSet width of a tab to num\n"
-#~ msgstr " -T \t\t--tabsize=[luku]\tAseta sarkaimen leveys\n"
-
-#~ msgid " -R\t\t--regexp\t\tUse regular expressions for search\n"
-#~ msgstr " -R\t\t--regexp\t\tEtsi säännöllisillä lausekkeilla\n"
-
-#~ msgid " -V \t\t--version\t\tPrint version information and exit\n"
-#~ msgstr " -V \t\t--version\t\tTulosta versiotiedot ja lopeta\n"
-
-#~ msgid " -c \t\t--const\t\t\tConstantly show cursor position\n"
-#~ msgstr " -c \t\t--const\t\t\tNäytä kohdistimen sijainti jatkuvasti\n"
-
-#~ msgid " -h \t\t--help\t\t\tShow this message\n"
-#~ msgstr " -h \t\t--help\t\t\tNäytä tämä ohje\n"
-
-#~ msgid " -k \t\t--cut\t\t\tLet ^K cut from cursor to end of line\n"
-#~ msgstr " -k \t\t--cut\t\t\t^K leikkaa rivin loppuun saakka\n"
-
-#~ msgid " -i \t\t--autoindent\t\tAutomatically indent new lines\n"
-#~ msgstr " -i \t\t--autoindent\t\tSisennä uudet rivit automaattisesti\n"
-
-#~ msgid " -l \t\t--nofollow\t\tDon't follow symbolic links, overwrite\n"
-#~ msgstr ""
-#~ " -l \t\t--nofollow\t\tÄlä seuraa symbolisia linkkejä, vaan\n"
-#~ "\t\t\t\t\tkorvaa ne tiedostoilla.\n"
-
-#~ msgid " -m \t\t--mouse\t\t\tEnable mouse\n"
-#~ msgstr " -m \t\t--mouse\t\t\tKäytä hiirtä\n"
-
-#~ msgid ""
-#~ " -r [#cols] \t--fill=[#cols]\t\tSet fill cols to (wrap lines at) #cols\n"
-#~ msgstr " -r [#lkm] \t--fill=[#lkm]\t\tRivitä annettua pidemmät rivit\n"
-
-#~ msgid " -p\t \t--pico\t\t\tEmulate Pico as closely as possible\n"
-#~ msgstr " -p\t \t--pico\t\t\tJäljittele Picoa mahdollisimman tarkasti\n"
-
-#~ msgid " -s [prog] \t--speller=[prog]\tEnable alternate speller\n"
-#~ msgstr ""
-#~ " -s [ohjelma] \t--speller=[ohjelma]\tKäytä annettua oikolukuohjelmaa\n"
-
-#~ msgid " -t \t\t--tempfile\t\tAuto save on exit, don't prompt\n"
+#~ msgid "Error writing backup file %s: File owner mismatch"
 #~ msgstr ""
-#~ " -t \t\t--tempfile\t\tTallenna tiedosto kysymättä\n"
-#~ "\t\t\t\t\tpoistuttaessa \n"
-
-#~ msgid " -v \t\t--view\t\t\tView (read only) mode\n"
-#~ msgstr " -v \t\t--view\t\t\tKatselutila (vain luku)\n"
-
-#~ msgid " -w \t\t--nowrap\t\tDon't wrap long lines\n"
-#~ msgstr " -w \t\t--nowrap\t\tÄlä rivitä pitkiä rivejä\n"
-
-#~ msgid " -x \t\t--nohelp\t\tDon't show help window\n"
-#~ msgstr " -x \t\t--nohelp\t\tÄlä näytä ohjeikkunaa\n"
-
-#~ msgid " -z \t\t--suspend\t\tEnable suspend\n"
-#~ msgstr " -z \t\t--suspend\t\tMahdollista keskeyttäminen\n"
-
-#~ msgid " +LINE\t\t\t\t\tStart at line number LINE\n"
-#~ msgstr " +RIVI\t\t\t\t\tSiirry riville RIVI\n"
-
-#~ msgid " -R\t\tUse regular expressions for search\n"
-#~ msgstr " -R\t\tEtsi säännöllisillä lausekkeilla\n"
-
-#~ msgid "check_wrap called with inptr->data=\"%s\"\n"
-#~ msgstr "check_wrap-funktion parametri inptr->data=”%s”\n"
-
-#~ msgid "Case Sensitive Search%s%s"
-#~ msgstr "Kirjainkokotarkka etsintä%s%s"
-
-#~ msgid "Pavel Curtis, Zeyd Ben-Halim and Eric S. Raymond for ncurses"
-#~ msgstr "Pavel Curtis, Zeyd Ben-Halim ja Eric S. Raymond ncursesista"
-
-#~ msgid "Backwards search"
-#~ msgstr "Taaksepäin etsintä"
-
-#~ msgid "Goto"
-#~ msgstr "Siirry"
-
-#~ msgid "nano: calloc: out of memory!"
-#~ msgstr "nano: calloc: muisti loppui!"
+#~ "Virhe kirjoitettaessa varmuuskopiotiedostoon %s: Tiedoston "
+#~ "omistajatäsmäämättömyys"
 
-#~ msgid " -D \t\t--dos\t\t\tWrite file in DOS format\n"
-#~ msgstr " -D \t\t--dos\t\t\tKirjoita tiedosto DOS-muodossa\n"
+#~ msgid "Space"
+#~ msgstr "Väli"
 
-#~ msgid " -F \t\t--multibuffer\t\tEnable multiple file buffers\n"
-#~ msgstr " -F \t\t--multibuffer\t\tMahdollista useiden puskureiden käyttö\n"
+#~ msgid "Come on, be reasonable"
+#~ msgstr "Jotakin järkevää, kiitos?"
 
-#~ msgid " -M \t\t--mac\t\t\tWrite file in Mac format\n"
-#~ msgstr " -M \t\t--mac\t\t\tKirjoita tiedosto Mac-muodossa\n"
+#~ msgid "File to insert into new buffer [from ./] "
+#~ msgstr "Uuteen puskuriin lisättävä tiedosto [hakemistosta ./] "
 
-#~ msgid " -S\t\t--smooth\t\tSmooth scrolling\n"
-#~ msgstr " -S\t\t--smooth\t\tPehmeä vieritys\n"
+#~ msgid "File to insert [from ./] "
+#~ msgstr "Lisättävä tiedosto [hakemistosta ./] "
diff --git a/po/fr.gmo b/po/fr.gmo
index b6a23c7..f2ed1a0 100644
--- a/po/fr.gmo
+++ b/po/fr.gmo
diff --git a/po/fr.po b/po/fr.po
index 9b65df9..f6671f2 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,30 +1,34 @@
-# Translation of the nano editor to French
-# Messages en langue française pour l'éditeur nano
+# Translation of the nano editor to French.
+# Messages en langue française pour l'éditeur nano.
 # Copyright (C) 2000, 2001 Free Software Foundation, Inc.
 # This file is distributed under the same license as the nano package.
 #
 # Pierre Tane <tanep@bigfoot.com>, 2000.
 # Clement Laforet <sheep.killer@free.fr>, 2000.
 # Michel Robitaille <robitail@IRO.UMontreal.CA>, 2001.
-# Jean-Philippe Guérard <jean-philippe.guerard@corbeaunoir.org>, 2001-2010.
+# Jean-Philippe Guérard <jean-philippe.guerard@corbeaunoir.org>, 2001-2015.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 2.2.4pre2\n"
+"Project-Id-Version: nano 2.3.99pre4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-22 06:34-0500\n"
-"PO-Revision-Date: 2010-10-30 15:43+0200\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
+"PO-Revision-Date: 2015-03-19 00:43+0100\n"
 "Last-Translator: Jean-Philippe Guérard <jean-philippe.guerard@corbeaunoir."
 "org>\n"
 "Language-Team: French <traduc@traduc.org>\n"
+"Language: fr\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"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Gtranslator 2.91.6\n"
 
 #
 # File: src/browser.c, line: 207
 # File: src/browser.c, line: 207
-#: src/browser.c:220
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:203
 msgid "Go To Directory"
 msgstr "Changer de répertoire"
 
@@ -45,9 +49,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:233 src/browser.c:830 src/files.c:860 src/files.c:2048
-#: src/nano.c:1060 src/search.c:220 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Annulé"
 
@@ -56,7 +60,7 @@ msgstr "Annulé"
 # File: src/browser.c, line: 299
 # File: src/browser.c, line: 246
 # File: src/browser.c, line: 299
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:246 src/browser.c:293
 #, c-format
 msgid "Can't go outside of %s in restricted mode"
 msgstr "En mode restreint, sortir de %s est impossible"
@@ -90,10 +94,10 @@ msgstr "En mode restreint, sortir de %s est impossible"
 # File: src/rcfile.c, line: 366
 # File: src/rcfile.c, line: 383
 # File: src/rcfile.c, line: 913
-#: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:722
-#: src/files.c:731 src/files.c:1540 src/files.c:1659 src/files.c:1711
-#: src/files.c:1732 src/files.c:1855 src/files.c:2691 src/rcfile.c:568
-#: src/rcfile.c:1204
+#: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
+#: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
+#: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Erreur lors de la lecture de %s : %s"
@@ -101,7 +105,7 @@ msgstr "Erreur lors de la lecture de %s : %s"
 #
 # File: src/browser.c, line: 288
 # File: src/browser.c, line: 288
-#: src/browser.c:303
+#: src/browser.c:283
 msgid "Can't move up a directory"
 msgstr "Impossible de passer au répertoire supérieur"
 
@@ -112,13 +116,13 @@ msgstr "Impossible de passer au répertoire supérieur"
 # File: src/browser.c, line: 569
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:665 src/browser.c:674
+#: src/browser.c:626 src/browser.c:635
 msgid "(dir)"
 msgstr "(rép.)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:632
 msgid "(parent dir)"
 msgstr "(remonter)"
 
@@ -127,51 +131,19 @@ msgstr "(remonter)"
 # File: src/search.c, line: 179
 # File: src/browser.c, line: 651
 # File: src/search.c, line: 179
-#: src/browser.c:801 src/search.c:185
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "Recherche"
 
 #
-# File: src/browser.c, line: 655
-# File: src/search.c, line: 183
-# File: src/browser.c, line: 655
-# File: src/search.c, line: 183
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:805 src/search.c:189
-msgid " [Case Sensitive]"
-msgstr " [Resp. casse]"
-
-#
-# File: src/browser.c, line: 661
-# File: src/search.c, line: 189
-# File: src/browser.c, line: 661
-# File: src/search.c, line: 189
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:811 src/search.c:195
-msgid " [Regexp]"
-msgstr " [Exp. ration.]"
-
-#
-# File: src/browser.c, line: 667
-# File: src/search.c, line: 195
-# File: src/browser.c, line: 667
-# File: src/search.c, line: 195
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:817 src/search.c:201
-msgid " [Backwards]"
-msgstr " [Arrière]"
-
-#
 # 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:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "La recherche a fait le tour"
 
@@ -188,8 +160,8 @@ msgstr "La recherche a fait le tour"
 # File: src/search.c, line: 489
 # File: src/search.c, line: 546
 # File: src/search.c, line: 549
-#: src/browser.c:1006 src/browser.c:1039 src/search.c:514 src/search.c:517
-#: src/search.c:574 src/search.c:577
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "C'est la seule occurrence"
 
@@ -198,14 +170,83 @@ msgstr "C'est la seule occurrence"
 # File: src/search.c, line: 555
 # File: src/browser.c, line: 891
 # File: src/search.c, line: 555
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr "Aucun motif de recherche défini"
 
+#: src/files.c:139
+msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
+msgstr "Fichier verrou : compte actuel inconnu (échec de getpwuid())"
+
+#: src/files.c:145
+#, 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"
+
+#
+# File: src/files.c, line: 1476
+# File: src/text.c, line: 2315
+# File: src/text.c, line: 2327
+# File: src/files.c, line: 1476
+# File: src/text.c, line: 2315
+# File: src/text.c, line: 2327
+#: src/files.c:165 src/files.c:175 src/files.c:212 src/files.c:222
+#, c-format
+msgid "Error writing lock file %s: %s"
+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
+# File: src/files.c, line: 1476
+# File: src/text.c, line: 2315
+# File: src/text.c, line: 2327
+#: src/files.c:237
+#, c-format
+msgid "Error deleting lock file %s: %s"
+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
+# File: src/files.c, line: 1476
+# File: src/text.c, line: 2315
+# File: src/text.c, line: 2327
+#: src/files.c:272
+#, c-format
+msgid "Error opening lock file %s: %s"
+msgstr "Erreur d'ouverture du fichier verrou %s : %s"
+
+#: src/files.c:282
+#, 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:297
+#, 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 ?"
+
+#
+# File: src/files.c, line: 1476
+# File: src/text.c, line: 2315
+# File: src/text.c, line: 2327
+# File: src/files.c, line: 1476
+# File: src/text.c, line: 2315
+# File: src/text.c, line: 2327
+#: src/files.c:308
+#, c-format
+msgid "Error writing lock file: Directory '%s' doesn't exist"
+msgstr ""
+"Erreur d'écriture du fichier verrou : le répertoire « %s » n'existe pas"
+
 #
 # File: src/files.c, line: 119
 # File: src/files.c, line: 119
-#: src/files.c:125
+#: src/files.c:339
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Impossible d'insérer le fichier depuis l'extérieur de %s"
@@ -213,14 +254,14 @@ msgstr "Impossible d'insérer le fichier depuis l'extérieur de %s"
 #
 # File: src/files.c, line: 228
 # File: src/files.c, line: 228
-#: src/files.c:234
+#: src/files.c:467
 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:250
+#: src/files.c:484
 #, c-format
 msgid "Switched to %s"
 msgstr "Basculement vers %s"
@@ -232,14 +273,14 @@ 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:251 src/global.c:469 src/winio.c:2168
+#: src/files.c:485 src/global.c:953 src/winio.c:2161
 msgid "New Buffer"
 msgstr "Nouvel espace"
 
 #
 # File: src/files.c, line: 559
 # File: src/files.c, line: 559
-#: src/files.c:633
+#: src/files.c:874
 #, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
@@ -249,7 +290,7 @@ 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:638
+#: src/files.c:879
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
@@ -266,7 +307,7 @@ msgstr[1] ""
 #
 # File: src/files.c, line: 564
 # File: src/files.c, line: 564
-#: src/files.c:644
+#: src/files.c:885
 #, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
@@ -276,7 +317,7 @@ 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:648
+#: src/files.c:889
 #, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
@@ -289,7 +330,7 @@ msgstr[1] ""
 #
 # File: src/files.c, line: 569
 # File: src/files.c, line: 569
-#: src/files.c:654
+#: src/files.c:895
 #, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
@@ -299,7 +340,7 @@ 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:658
+#: src/files.c:899
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
@@ -312,14 +353,14 @@ msgstr[1] ""
 #
 # File: src/files.c, line: 574
 # File: src/files.c, line: 574
-#: src/files.c:664
+#: src/files.c:905
 #, 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:667
+#: src/files.c:908
 #, c-format
 msgid "Read %lu line ( Warning: No write permission)"
 msgid_plural "Read %lu lines (Warning: No write permission)"
@@ -329,21 +370,21 @@ msgstr[1] "Lecture de %lu lignes (En lecture seule !)"
 #
 # File: src/files.c, line: 623
 # File: src/files.c, line: 623
-#: src/files.c:700 src/files.c:736
+#: src/files.c:943 src/files.c:980
 msgid "Reading File"
 msgstr "Lecture du fichier"
 
 #
 # File: src/files.c, line: 594
 # File: src/files.c, line: 594
-#: src/files.c:706
+#: src/files.c:950
 msgid "New File"
 msgstr "Nouveau fichier"
 
 #
 # File: src/files.c, line: 597
 # File: src/files.c, line: 597
-#: src/files.c:709
+#: src/files.c:953
 #, c-format
 msgid "\"%s\" not found"
 msgstr "« %s » non trouvé"
@@ -357,7 +398,7 @@ msgstr "« %s » non trouvé"
 # File: src/rcfile.c, line: 375
 # File: src/rcfile.c, line: 870
 # File: src/rcfile.c, line: 904
-#: src/files.c:717 src/rcfile.c:559 src/rcfile.c:1154 src/rcfile.c:1195
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "« %s » est un répertoire"
@@ -371,7 +412,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:718 src/rcfile.c:560 src/rcfile.c:1155 src/rcfile.c:1196
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "« %s » est un périphérique"
@@ -379,7 +420,7 @@ msgstr "« %s » est un périphérique"
 #
 # File: src/files.c, line: 696
 # File: src/files.c, line: 696
-#: src/files.c:817
+#: src/files.c:1060
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Commande à exécuter dans un nouvel espace [à partir de %s] "
@@ -387,7 +428,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:819
+#: src/files.c:1062
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Commande à exécuter [à partir de %s] "
@@ -395,7 +436,7 @@ msgstr "Commande à exécuter [à partir de %s] "
 #
 # File: src/files.c, line: 704
 # File: src/files.c, line: 704
-#: src/files.c:825
+#: src/files.c:1069
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Fichier à insérer dans un nouvel espace [à partir de %s] "
@@ -403,7 +444,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:827
+#: src/files.c:1071
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Fichier à insérer [à partir de %s] "
@@ -411,14 +452,20 @@ msgstr "Fichier à insérer [à partir de %s] "
 #
 # File: src/files.c, line: 885
 # File: src/files.c, line: 885
-#: src/files.c:1077
+#: src/files.c:1320
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Touche illégale hors du mode multi-espace"
 
+#: src/files.c:1622
+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) "
+
 #
 # File: src/files.c, line: 1286
 # File: src/files.c, line: 1286
-#: src/files.c:1486
+#: src/files.c:1746
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Impossible d'écrire à l'extérieur de %s"
@@ -426,7 +473,7 @@ msgstr "Impossible d'écrire à l'extérieur de %s"
 #
 # File: src/files.c, line: 1301
 # File: src/files.c, line: 1301
-#: src/files.c:1501
+#: src/files.c:1761
 msgid "Cannot prepend or append to a symlink with --nofollow set"
 msgstr "Impossible d'ajouter pour un lien symbolique (option --nofollow)"
 
@@ -437,8 +484,8 @@ msgstr "Impossible d'ajouter pour un lien symbolique (option --nofollow)"
 # File: src/files.c, line: 1476
 # File: src/text.c, line: 2315
 # File: src/text.c, line: 2327
-#: src/files.c:1581 src/files.c:1603 src/files.c:1621 src/files.c:1632
-#: src/files.c:1640 src/files.c:1667
+#: src/files.c:1843 src/files.c:1868 src/files.c:1886 src/files.c:1899
+#: src/files.c:1910 src/files.c:1939
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Erreur d'écriture de la copie de sécurité %s : %s"
@@ -448,7 +495,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:1582 src/nano.c:701
+#: src/files.c:1844 src/nano.c:719
 msgid "Too many backup files?"
 msgstr "Trop de copies de sécurité ?"
 
@@ -479,9 +526,10 @@ msgstr "Trop de copies de sécurité ?"
 # File: src/files.c, line: 1617
 # File: src/files.c, line: 2449
 # File: src/files.c, line: 2458
-#: src/files.c:1687 src/files.c:1744 src/files.c:1763 src/files.c:1775
-#: src/files.c:1799 src/files.c:1817 src/files.c:1827 src/files.c:1863
-#: src/files.c:1868 src/files.c:2764 src/files.c:2773
+#: src/files.c:1959 src/files.c:2016 src/files.c:2035 src/files.c:2047
+#: src/files.c:2071 src/files.c:2089 src/files.c:2099 src/files.c:2135
+#: src/files.c:2140 src/files.c:3101 src/files.c:3110 src/files.c:3133
+#: src/files.c:3145
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Erreur lors de l'écriture de %s : %s"
@@ -493,7 +541,8 @@ msgstr "Erreur lors de l'écriture de %s : %s"
 # File: src/files.c, line: 1476
 # File: src/text.c, line: 2315
 # File: src/text.c, line: 2327
-#: src/files.c:1721 src/text.c:2929 src/text.c:2941
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Erreur d'écriture du fichier temporaire : %s"
@@ -501,7 +550,7 @@ msgstr "Erreur d'écriture du fichier temporaire : %s"
 #
 # File: src/files.c, line: 1651
 # File: src/files.c, line: 1651
-#: src/files.c:1900
+#: src/files.c:2173
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
@@ -511,90 +560,88 @@ msgstr[1] "%lu lignes écrites"
 #
 # File: src/files.c, line: 1751
 # File: src/files.c, line: 1751
-#: src/files.c:2004
+#: src/files.c:2278
 msgid " [DOS Format]"
 msgstr " [Format DOS]"
 
 #
 # File: src/files.c, line: 1752
 # File: src/files.c, line: 1752
-#: src/files.c:2005
+#: src/files.c:2279
 msgid " [Mac Format]"
 msgstr " [Format Mac]"
 
 #
 # File: src/files.c, line: 1754
 # File: src/files.c, line: 1754
-#: src/files.c:2007
+#: src/files.c:2281
 msgid " [Backup]"
 msgstr " [Copie de sécurité]"
 
 #
 # File: src/files.c, line: 1758
 # File: src/files.c, line: 1758
-#: src/files.c:2015
+#: src/files.c:2289
 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:2016
+#: src/files.c:2290
 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:2017
+#: src/files.c:2291
 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:2020
+#: src/files.c:2294
 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:2021
+#: src/files.c:2295
 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:2022
+#: src/files.c:2296
 msgid "File Name to Write"
 msgstr "Nom du fichier à écrire"
 
 #
 # File: src/files.c, line: 1856
 # File: src/files.c, line: 1856
-#: src/files.c:2153
+#: src/files.c:2427
 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:2162
+#: src/files.c:2436
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "Écrire le fichier sous un NOM MODIFIÉ ? "
 
-#: src/files.c:2173
+#: src/files.c:2450
 msgid "File was modified since you opened it, continue saving ? "
-msgstr ""
-"Le fichier a été modifié depuis son ouverture. Voulez-vous vraiment "
-"sauvegarder ?"
+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:2611
+#: src/files.c:2882
 msgid "(more)"
 msgstr "(suite)"
 
@@ -603,549 +650,448 @@ msgstr "(suite)"
 # File: src/rcfile.c, line: 848
 # File: src/files.c, line: 2379
 # File: src/rcfile.c, line: 848
-#: src/files.c:2694 src/rcfile.c:1220
+#: src/files.c:2974
 #, c-format
 msgid ""
 "\n"
-"Press Enter to continue starting nano.\n"
+"Press Enter to continue\n"
 msgstr ""
 "\n"
-"Appuyez sur « Entrée » pour poursuivre le démarrage de nano.\n"
-
-#
-# File: src/global.c, line: 264
-# File: src/prompt.c, line: 1281
-# File: src/global.c, line: 264
-# File: src/prompt.c, line: 1281
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:415 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Annuler"
+"Appuyez sur « Entrée » pour continuer\n"
 
-#
-# File: src/global.c, line: 272
-# File: src/global.c, line: 272
-#: src/global.c:416
-msgid "Replace"
-msgstr "Remplacer"
+#: src/files.c:2989
+#, c-format
+msgid ""
+"Unable to create directory %s: %s\n"
+"It is required for saving/loading search history or cursor positions.\n"
+msgstr ""
+"Impossible de créer le répertoire %s : %s\n"
+"Il permet de conserver l'historique des recherches\n"
+"et les positions du curseur\n"
 
-#
-# File: src/global.c, line: 828
-# File: src/global.c, line: 828
-#: src/global.c:417
-msgid "No Replace"
-msgstr "Rechercher"
+#: src/files.c:2995
+#, 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 ""
+"Le chemin %s n'est pas un répertoire et devrait l'être.\n"
+"Nano ne pourra pas conserver l'historique des recherches\n"
+"et les positions du curseur\n"
 
-#
-# File: src/global.c, line: 290
-# File: src/global.c, line: 290
-#: src/global.c:420
-msgid "Case Sens"
-msgstr "Resp.casse"
+#: src/files.c:3012
+#, 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 ""
+"Un ancien fichier d'historique (%s) a été détecté, mais une\n"
+"tentative de déplacement vers le nouvel emplacement (%s)\n"
+"a rencontré une erreur : %s"
 
-#
-# File: src/global.c, line: 291
-# File: src/global.c, line: 291
-#: src/global.c:421
-msgid "Backwards"
-msgstr "->Arrière"
+#: src/files.c:3016
+#, 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 ""
+"Un ancien fichier d'historique (%s) a été détecté, et déplacé\n"
+"vers le nouvel emplacement (%s)\n"
+"(consultez la FAQ nano pour plus d'information)"
 
 #
-# File: src/global.c, line: 294
-# File: src/global.c, line: 294
-#: src/global.c:425
-msgid "Regexp"
-msgstr "Exp. ratio."
+# File: src/global.c, line: 266
+# File: src/global.c, line: 266
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
+#: src/global.c:477
+msgid "Exit"
+msgstr "Quitter"
 
 #
-# File: src/global.c, line: 297
-# File: src/global.c, line: 297
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:451
-msgid "PrevHstory"
-msgstr "Précédente"
+# File: src/global.c, line: 477
+# File: src/global.c, line: 477
+#: src/global.c:478
+msgid "Close"
+msgstr "Fermer"
 
 #
-# File: src/global.c, line: 299
-# File: src/global.c, line: 299
-#: src/global.c:452
-msgid "NextHstory"
-msgstr "Suivante"
+# File: src/global.c, line: 539
+# File: src/global.c, line: 539
+#: src/global.c:479
+msgid "Uncut Text"
+msgstr "Coller"
 
 #
-# File: src/global.c, line: 919
-# File: src/global.c, line: 919
-#: src/global.c:453
-msgid "Go To Text"
-msgstr "Rechercher"
+# File: src/global.c, line: 534
+# File: src/global.c, line: 534
+#: src/global.c:481
+msgid "Unjustify"
+msgstr "Dé-justif."
 
 #
 # File: src/global.c, line: 275
 # File: src/global.c, line: 275
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:455
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:485
 msgid "WhereIs Next"
 msgstr "Cherch.suiv."
 
 #
-# File: src/global.c, line: 309
-# File: src/global.c, line: 309
-#: src/global.c:457
-msgid "First File"
-msgstr "Prem. fich."
-
-#
-# File: src/global.c, line: 311
-# File: src/global.c, line: 311
-#: src/global.c:458
-msgid "Last File"
-msgstr "Dern. fich."
-
-#
-# File: src/global.c, line: 307
-# File: src/global.c, line: 307
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:460
-msgid "To Files"
-msgstr "Parcourir"
-
-#
-# File: src/global.c, line: 958
-# File: src/global.c, line: 958
-#: src/global.c:462
-msgid "DOS Format"
-msgstr "Format DOS"
-
-#
-# File: src/global.c, line: 964
-# File: src/global.c, line: 964
-#: src/global.c:463
-msgid "Mac Format"
-msgstr "Format Mac"
-
-#
-# File: src/global.c, line: 971
-# File: src/global.c, line: 971
-#: src/global.c:464
-msgid "Append"
-msgstr "Ajout (à la fin)"
-
-#
-# File: src/global.c, line: 977
-# File: src/global.c, line: 977
-#: src/global.c:465
-msgid "Prepend"
-msgstr "Ajout (au début)"
-
-#
-# File: src/global.c, line: 984
-# File: src/global.c, line: 984
-#: src/global.c:466
-msgid "Backup File"
-msgstr "Copie de sécu."
-
-#
-# File: src/global.c, line: 1021
-# File: src/global.c, line: 1021
-#: src/global.c:467
-msgid "Execute Command"
-msgstr "Exécuter une commande"
-
-#
-# File: src/global.c, line: 1154
-# File: src/global.c, line: 1154
-#: src/global.c:471
-msgid "Go To Dir"
-msgstr "Aller -> rép."
-
-#
-# Les messages suivants doivent tenir sur 10 caractères !
-# Ils sont utilisés comme entrée des menus du bas d'écran.
-# 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:480
-msgid "Get Help"
-msgstr "Aide"
-
-#
-# File: src/global.c, line: 266
-# File: src/global.c, line: 266
-#: src/global.c:481
-msgid "Exit"
-msgstr "Quitter"
-
-#
 # File: src/global.c, line: 267
 # File: src/global.c, line: 267
-#: src/global.c:482
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:492
 msgid "Where Is"
 msgstr "Chercher"
 
 #
-# File: src/global.c, line: 268
-# File: src/global.c, line: 268
-#: src/global.c:483
-msgid "Prev Page"
-msgstr "Page préc."
-
-#
-# File: src/global.c, line: 269
-# File: src/global.c, line: 269
-#: src/global.c:484
-msgid "Next Page"
-msgstr "Page suiv."
-
-#
-# File: src/global.c, line: 278
-# File: src/global.c, line: 278
-#: src/global.c:485
-msgid "First Line"
-msgstr "Prem. lig."
+# File: src/global.c, line: 272
+# File: src/global.c, line: 272
+#: src/global.c:493
+msgid "Replace"
+msgstr "Remplacer"
 
 #
-# File: src/global.c, line: 279
-# File: src/global.c, line: 279
-#: src/global.c:486
-msgid "Last Line"
-msgstr "Dern. Lig."
+# File: src/global.c, line: 270
+# File: src/global.c, line: 270
+#: src/global.c:494
+msgid "Go To Line"
+msgstr "Aller lig."
 
 #
-# File: src/global.c, line: 1360
-# File: src/global.c, line: 1360
-#: src/global.c:487
-msgid "Suspend"
-msgstr "Suspendre"
+# File: src/global.c, line: 614
+# File: src/global.c, line: 1083
+# File: src/global.c, line: 614
+# File: src/global.c, line: 1083
+#: src/global.c:495
+msgid "Prev Line"
+msgstr "Ligne préc."
 
 #
-# File: src/global.c, line: 284
-# File: src/global.c, line: 284
-#: src/global.c:489
-msgid "Beg of Par"
-msgstr "Début para."
+# 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:496
+msgid "Next Line"
+msgstr "Ligne suiv."
 
 #
-# File: src/global.c, line: 285
-# File: src/global.c, line: 285
-#: src/global.c:490
-msgid "End of Par"
-msgstr "Fin para."
+# File: src/global.c, line: 505
+# File: src/global.c, line: 505
+#: src/global.c:497
+msgid "Read File"
+msgstr "Lire fich."
 
 #
 # File: src/global.c, line: 286
 # File: src/global.c, line: 286
-#: src/global.c:491
+#: src/global.c:499
 msgid "FullJstify"
 msgstr "Justifier"
 
 #
 # File: src/global.c, line: 288
 # File: src/global.c, line: 288
-#: src/global.c:493
+#: src/global.c:501
 msgid "Refresh"
 msgstr "Rafraîchir"
 
 #
-# File: src/global.c, line: 1053
-# File: src/global.c, line: 1053
-#: src/global.c:495
-msgid "Insert File"
-msgstr "Insérer un fichier"
-
-#
-# File: src/global.c, line: 270
-# File: src/global.c, line: 270
-#: src/global.c:497
-msgid "Go To Line"
-msgstr "Aller lig."
-
-#
 # File: src/global.c, line: 325
 # File: src/global.c, line: 325
-#: src/global.c:500
+#. 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:507
 msgid "Justify the current paragraph"
 msgstr "Justifier le paragraphe courant"
 
 #
 # File: src/global.c, line: 314
 # File: src/global.c, line: 314
-#. 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:505
+#: src/global.c:509
 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:506
+#: src/global.c:510
 msgid "Display this help text"
-msgstr "Affiche de message"
+msgstr "Afficher ce message"
 
 #
 # File: src/global.c, line: 318
 # File: src/global.c, line: 318
-#: src/global.c:509
+#: src/global.c:513
 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:511
+#: src/global.c:515
 msgid "Exit from nano"
 msgstr "Quitter nano"
 
 #
 # File: src/global.c, line: 324
 # File: src/global.c, line: 324
-#: src/global.c:515
+#: src/global.c:519
 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:517
+#: src/global.c:521
 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:519
+#: src/global.c:523
 msgid "Search for a string or a regular expression"
-msgstr "Recherche d'une chaîne ou d'une expression rationnelle"
+msgstr "Rechercher une chaîne ou une expression rationnelle"
 
 #
-# File: src/global.c, line: 330
-# File: src/global.c, line: 330
-#: src/global.c:520
-msgid "Go to previous screen"
-msgstr "Aller à l'écran précédent"
+# File: src/global.c, line: 329
+# File: src/global.c, line: 329
+#: src/global.c:526
+msgid "Search for a string"
+msgstr "Recherche d'une chaîne"
 
 #
 # File: src/global.c, line: 331
 # File: src/global.c, line: 331
-#: src/global.c:521
-msgid "Go to next screen"
-msgstr "Aller à l'écran suivant"
+#: src/global.c:528
+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:529
+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:523
+#: src/global.c:531
 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:525
+#: src/global.c:533
 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:527
+#: src/global.c:534
 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:529
+#: src/global.c:536
 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:531
+#: src/global.c:538
 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:532
+#: src/global.c:539
 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:534
-msgid "Mark text at the cursor position"
-msgstr "Marquer le texte à la position du curseur"
+#: src/global.c:541
+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:535
-msgid "Repeat last search"
+#: src/global.c:542
+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:537
+#: src/global.c:544
 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:538
+#: src/global.c:545
 msgid "Indent the current line"
-msgstr "Mise en retrait de la ligne courante"
+msgstr "Augmenter la marge de la ligne courante"
 
 #
 # File: src/global.c, line: 314
 # File: src/global.c, line: 314
-#: src/global.c:539
+#: src/global.c:546
 msgid "Unindent the current line"
-msgstr "Annuler le retrait de la ligne courante"
+msgstr "Diminuer la marge de la ligne courante"
 
-#: src/global.c:540
+#: src/global.c:547
 msgid "Undo the last operation"
 msgstr "Annuler la dernière opération"
 
-#: src/global.c:541
+#: src/global.c:548
 msgid "Redo the last undone operation"
 msgstr "Refaire la dernière opération annulée"
 
 #
 # File: src/global.c, line: 351
 # File: src/global.c, line: 351
-#: src/global.c:543
+#: src/global.c:550
 msgid "Go forward one character"
 msgstr "Avancer d'un caractère"
 
 #
 # File: src/global.c, line: 352
 # File: src/global.c, line: 352
-#: src/global.c:544
+#: src/global.c:551
 msgid "Go back one character"
 msgstr "Reculer d'un caractère"
 
 #
 # File: src/global.c, line: 354
 # File: src/global.c, line: 354
-#: src/global.c:546
+#: src/global.c:553
 msgid "Go forward one word"
 msgstr "Avancer d'un mot"
 
 #
 # File: src/global.c, line: 355
 # File: src/global.c, line: 355
-#: src/global.c:547
+#: src/global.c:554
 msgid "Go back one word"
 msgstr "Reculer d'un mot"
 
 #
 # File: src/global.c, line: 357
 # File: src/global.c, line: 357
-#: src/global.c:549
+#: src/global.c:556
 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:550
+#: src/global.c:557
 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:551
+#: src/global.c:558
 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:552
+#: src/global.c:559
 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:555
+#: src/global.c:562
 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:557
+#: src/global.c:564
 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:560
+#: src/global.c:566
 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:562
+#: src/global.c:567
 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:564
+#: src/global.c:569
 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:566
+#: src/global.c:571
 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:568
+#: src/global.c:573
 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:572
+#: src/global.c:576
 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:574
+#: src/global.c:577
 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:577
+#: src/global.c:579
 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:579
+#: src/global.c:580
 msgid "Insert a tab at the cursor position"
 msgstr "Insérer une tabulation à la position du curseur"
 
@@ -1159,382 +1105,465 @@ 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:583
+#: src/global.c:582
 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:585
+#: src/global.c:584
 msgid "Delete the character to the left of the cursor"
 msgstr "Supprimer le caractère à la gauche du curseur"
 
 #
 # File: src/global.c, line: 398
 # File: src/global.c, line: 398
-#: src/global.c:588
+#: src/global.c:587
 msgid "Cut from the cursor position to the end of the file"
-msgstr "Coupe du curseur à la fin du fichier"
+msgstr "Couper du curseur à la fin du fichier"
 
 #
 # File: src/global.c, line: 401
 # File: src/global.c, line: 401
-#: src/global.c:591
+#: src/global.c:590
 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:595
+#: src/global.c:594
 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:598
+#: src/global.c:597
 msgid "Refresh (redraw) the current screen"
 msgstr "Rafraîchir (redessiner) l'écran courant"
 
-#: src/global.c:600
+#: src/global.c:599
 msgid "Suspend the editor (if suspend is enabled)"
 msgstr "Suspendre l'éditeur (si vous y êtes autorisé)"
 
 #
 # File: src/global.c, line: 411
 # File: src/global.c, line: 411
-#: src/global.c:603
+#: src/global.c:602
 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:605
+#: src/global.c:604
 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:609
+#: src/global.c:608
 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:613
+#: src/global.c:612
 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:615
+#: src/global.c:614
 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:618
+#: src/global.c:617
 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:621
+#: src/global.c:620
 msgid "Toggle the use of DOS format"
-msgstr "Utilisation du format DOS (commutateur)"
+msgstr "Utiliser le format DOS (commutateur)"
 
 #
 # File: src/global.c, line: 430
 # File: src/global.c, line: 430
-#: src/global.c:622
+#: src/global.c:621
 msgid "Toggle the use of Mac format"
-msgstr "Utilisation du format Mac (commutateur)"
+msgstr "Utiliser le format Mac (commutateur)"
 
 #
 # File: src/global.c, line: 432
 # File: src/global.c, line: 432
-#: src/global.c:624
+#: src/global.c:622
 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:625
+#: src/global.c:623
 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:628
+#: src/global.c:624
 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:629
+#: src/global.c:625
 msgid "Execute external command"
 msgstr "Exécuter une commande externe"
 
 #
 # File: src/global.c, line: 441
 # File: src/global.c, line: 441
-#: src/global.c:633
+#: src/global.c:628
 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:636
+#: src/global.c:631
 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:638
+#: src/global.c:632
 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:640
+#: src/global.c:633
 msgid "Go to the last file in the list"
 msgstr "Aller au dernier fichier de la liste"
 
 #
-# File: src/global.c, line: 448
-# File: src/global.c, line: 448
-#: src/global.c:641
-msgid "Go to the next file in the list"
-msgstr "Aller au prochain fichier de la liste"
-
-#
 # File: src/global.c, line: 446
 # File: src/global.c, line: 446
-#: src/global.c:642
+#: src/global.c:634
 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:635
+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:643
+#: src/global.c:636
 msgid "Go to directory"
 msgstr "Changer de répertoire"
 
 #
-# File: src/global.c, line: 477
-# File: src/global.c, line: 477
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:670
-msgid "Close"
-msgstr "Fermer"
+# File: src/global.c, line: 339
+# File: src/global.c, line: 339
+#: src/global.c:639
+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:640
+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:641
+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:642
+msgid "Invoke formatter, if available"
+msgstr "Appeler l'outil de mise en forme (si dispo.)"
+
+#
+# Les messages suivants doivent tenir sur 10 caractères !
+# Ils sont utilisés comme entrée des menus du bas d'écran.
+# 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:662
+msgid "Get Help"
+msgstr "Aide"
+
+#
+# File: src/global.c, line: 264
+# File: src/prompt.c, line: 1281
+# File: src/global.c, line: 264
+# File: src/prompt.c, line: 1281
+#: src/global.c:665 src/prompt.c:1084
+msgid "Cancel"
+msgstr "Annuler"
 
 #
 # File: src/global.c, line: 483
 # File: src/global.c, line: 483
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:679
-msgid "WriteOut"
+#: src/global.c:678
+msgid "Write Out"
 msgstr "Écrire"
 
 #
+# File: src/global.c, line: 1154
+# File: src/global.c, line: 1154
+#: src/global.c:704
+msgid "Go To Dir"
+msgstr "Aller -> rép."
+
+#
+# File: src/global.c, line: 528
+# File: src/global.c, line: 528
+#: src/global.c:719
+msgid "Cut Text"
+msgstr "Couper"
+
+#
 # File: src/global.c, line: 488
 # File: src/global.c, line: 488
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:728
 msgid "Justify"
 msgstr "Justifier"
 
 #
-# File: src/global.c, line: 505
-# File: src/global.c, line: 505
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:696
-msgid "Read File"
-msgstr "Lire fich."
+# File: src/global.c, line: 552
+# File: src/global.c, line: 552
+#: src/global.c:733
+msgid "To Spell"
+msgstr "Orthograp."
 
 #
-# File: src/global.c, line: 528
-# File: src/global.c, line: 528
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:713
-msgid "Cut Text"
-msgstr "Couper"
+# File: src/global.c, line: 270
+# File: src/global.c, line: 270
+#: src/global.c:738
+msgid "To Linter"
+msgstr "Analyse statique"
 
 #
-# File: src/global.c, line: 534
-# File: src/global.c, line: 534
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:718
-msgid "UnJustify"
-msgstr "Dé-justif."
+# File: src/global.c, line: 958
+# File: src/global.c, line: 958
+#: src/global.c:740
+msgid "Formatter"
+msgstr "Formateur"
 
 #
-# File: src/global.c, line: 539
-# File: src/global.c, line: 539
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:723
-msgid "UnCut Text"
-msgstr "Coller"
+# File: src/global.c, line: 290
+# File: src/global.c, line: 290
+#: src/global.c:745
+msgid "Case Sens"
+msgstr "Resp.casse"
+
+#
+# File: src/global.c, line: 294
+# File: src/global.c, line: 294
+#: src/global.c:750
+msgid "Regexp"
+msgstr "Exp. ratio."
+
+#
+# File: src/global.c, line: 291
+# File: src/global.c, line: 291
+#: src/global.c:755
+msgid "Backwards"
+msgstr "->Arrière"
+
+#
+# File: src/global.c, line: 828
+# File: src/global.c, line: 828
+#: src/global.c:762
+msgid "No Replace"
+msgstr "Rechercher"
 
 #
 # File: src/global.c, line: 544
 # File: src/global.c, line: 544
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:728 src/global.c:755
+#: src/global.c:770
 msgid "Cur Pos"
 msgstr "Pos. cur."
 
 #
-# File: src/global.c, line: 552
-# File: src/global.c, line: 552
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:737
-msgid "To Spell"
-msgstr "Orthograp."
+# File: src/global.c, line: 268
+# File: src/global.c, line: 268
+#: src/global.c:780
+msgid "Prev Page"
+msgstr "Page préc."
+
+#
+# File: src/global.c, line: 269
+# File: src/global.c, line: 269
+#: src/global.c:782
+msgid "Next Page"
+msgstr "Page suiv."
+
+#
+# File: src/global.c, line: 278
+# File: src/global.c, line: 278
+#: src/global.c:785
+msgid "First Line"
+msgstr "Prem. lig."
+
+#
+# File: src/global.c, line: 279
+# File: src/global.c, line: 279
+#: src/global.c:787
+msgid "Last Line"
+msgstr "Dern. Lig."
+
+#
+# File: src/search.c, line: 1167
+# File: src/search.c, line: 1167
+#: src/global.c:794
+msgid "To Bracket"
+msgstr "Parenthèse corresp."
 
 #
 # File: src/global.c, line: 575
 # File: src/global.c, line: 575
-#: src/global.c:771
+#: src/global.c:797
 msgid "Mark Text"
 msgstr "Marquer"
 
 #
 # File: src/global.c, line: 583
 # File: src/global.c, line: 583
-#: src/global.c:777
+#: src/global.c:800
 msgid "Copy Text"
 msgstr "Copier"
 
 #
 # File: src/global.c, line: 587
 # File: src/global.c, line: 587
-#: src/global.c:780
+#: src/global.c:803
 msgid "Indent Text"
 msgstr "Indenter"
 
 #
 # File: src/global.c, line: 591
 # File: src/global.c, line: 591
-#: src/global.c:783
+#: src/global.c:805
 msgid "Unindent Text"
 msgstr "Supprimer l'indentation"
 
-#: src/global.c:787
+#: src/global.c:808
 msgid "Undo"
 msgstr "Annuler"
 
-#: src/global.c:790
+#: src/global.c:810
 msgid "Redo"
 msgstr "Refaire"
 
 #
-# File: src/global.c, line: 596
-# File: src/global.c, line: 596
-#: src/global.c:796 src/global.c:800
-msgid "Forward"
-msgstr "En avant"
-
-#
 # File: src/global.c, line: 600
 # File: src/global.c, line: 600
-#: src/global.c:806 src/global.c:810
+#: src/global.c:814 src/global.c:820
 msgid "Back"
 msgstr "En arrière"
 
 #
-# File: src/global.c, line: 605
-# File: src/global.c, line: 605
-#: src/global.c:817
-msgid "Next Word"
-msgstr "Mot suivant"
+# File: src/global.c, line: 596
+# File: src/global.c, line: 596
+#: src/global.c:816 src/global.c:822
+msgid "Forward"
+msgstr "En avant"
 
 #
 # File: src/global.c, line: 609
 # File: src/global.c, line: 609
-#: src/global.c:820
+#: src/global.c:827
 msgid "Prev Word"
 msgstr "Mot précédent"
 
 #
-# File: src/global.c, line: 614
-# File: src/global.c, line: 1083
-# File: src/global.c, line: 614
-# File: src/global.c, line: 1083
-#: src/global.c:824
-msgid "Prev Line"
-msgstr "Ligne préc."
-
-#
-# 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:827
-msgid "Next Line"
-msgstr "Ligne suiv."
+# File: src/global.c, line: 605
+# File: src/global.c, line: 605
+#: src/global.c:829
+msgid "Next Word"
+msgstr "Mot suivant"
 
 #
 # File: src/global.c, line: 622
 # File: src/global.c, line: 622
-#: src/global.c:830
+#: src/global.c:833
 msgid "Home"
 msgstr "Début doc."
 
 #
 # File: src/global.c, line: 626
 # File: src/global.c, line: 626
-#: src/global.c:833
+#: src/global.c:835
 msgid "End"
 msgstr "Fin"
 
 #
-# File: src/global.c, line: 649
-# File: src/global.c, line: 649
-#: src/global.c:845
-msgid "Find Other Bracket"
-msgstr "Trouver l'autre crochet"
+# File: src/global.c, line: 284
+# File: src/global.c, line: 284
+#: src/global.c:844
+msgid "Beg of Par"
+msgstr "Début para."
+
+#
+# File: src/global.c, line: 285
+# File: src/global.c, line: 285
+#: src/global.c:846
+msgid "End of Par"
+msgstr "Fin para."
 
 #
 # File: src/global.c, line: 653
 # File: src/global.c, line: 653
-#: src/global.c:848
+#: src/global.c:851
 msgid "Scroll Up"
 msgstr "Remonter"
 
 #
 # File: src/global.c, line: 657
 # File: src/global.c, line: 657
-#: src/global.c:851
+#: src/global.c:853
 msgid "Scroll Down"
 msgstr "Descendre"
 
 #
 # File: src/global.c, line: 663
 # File: src/global.c, line: 663
-#: src/global.c:856
-msgid "Previous File"
+#: src/global.c:858
+msgid "Prev File"
 msgstr "Fichier précédent"
 
 #
 # File: src/global.c, line: 668
 # File: src/global.c, line: 668
-#: src/global.c:858
+#: src/global.c:860
 msgid "Next File"
 msgstr "Fichier suivant"
 
@@ -1543,72 +1572,181 @@ msgstr "Fichier suivant"
 # File: src/text.c, line: 2431
 # File: src/global.c, line: 673
 # File: src/text.c, line: 2431
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:862 src/text.c:3045
-msgid "Verbatim Input"
+#: src/global.c:869
+msgid "Verbatim"
 msgstr "Entrée telle quelle"
 
 #
 # File: src/global.c, line: 677
 # File: src/global.c, line: 677
-#: src/global.c:867
+#: src/global.c:872
 msgid "Tab"
 msgstr "Tabulation"
 
 #
 # File: src/global.c, line: 681
 # File: src/global.c, line: 681
-#: src/global.c:870
+#: src/global.c:874
 msgid "Enter"
 msgstr "Entrée"
 
 #
 # File: src/global.c, line: 685
 # File: src/global.c, line: 685
-#: src/global.c:873
+#: src/global.c:876
 msgid "Delete"
 msgstr "Supprimer"
 
 #
 # File: src/global.c, line: 689
 # File: src/global.c, line: 689
-#: src/global.c:876
+#: src/global.c:878
 msgid "Backspace"
 msgstr "RetourArr."
 
 #
 # File: src/global.c, line: 281
 # File: src/global.c, line: 281
-#: src/global.c:893
+#: src/global.c:888
 msgid "CutTillEnd"
 msgstr "Coup.->Fin"
 
 #
 # File: src/global.c, line: 710
 # File: src/global.c, line: 710
-#: src/global.c:906
+#: src/global.c:898
 msgid "Word Count"
 msgstr "Nombre de mots "
 
 #
+# File: src/global.c, line: 1360
+# File: src/global.c, line: 1360
+#: src/global.c:905
+msgid "Suspend"
+msgstr "Suspendre"
+
+#
+# File: src/global.c, line: 297
+# File: src/global.c, line: 297
+#: src/global.c:910
+msgid "PrevHstory"
+msgstr "Précédente"
+
+#
+# File: src/global.c, line: 299
+# File: src/global.c, line: 299
+#: src/global.c:913
+msgid "NextHstory"
+msgstr "Suivante"
+
+#
+# File: src/global.c, line: 919
+# File: src/global.c, line: 919
+#: src/global.c:917
+msgid "Go To Text"
+msgstr "Rechercher"
+
+#
+# File: src/global.c, line: 958
+# File: src/global.c, line: 958
+#: src/global.c:928
+msgid "DOS Format"
+msgstr "Format DOS"
+
+#
+# File: src/global.c, line: 964
+# File: src/global.c, line: 964
+#: src/global.c:931
+msgid "Mac Format"
+msgstr "Format Mac"
+
+#
+# File: src/global.c, line: 971
+# File: src/global.c, line: 971
+#: src/global.c:934
+msgid "Append"
+msgstr "Ajout (à la fin)"
+
+#
+# File: src/global.c, line: 977
+# File: src/global.c, line: 977
+#: src/global.c:936
+msgid "Prepend"
+msgstr "Ajout (au début)"
+
+#
+# File: src/global.c, line: 984
+# File: src/global.c, line: 984
+#: src/global.c:939
+msgid "Backup File"
+msgstr "Copie de sécu."
+
+#
+# File: src/global.c, line: 1021
+# File: src/global.c, line: 1021
+#: src/global.c:946
+msgid "Execute Command"
+msgstr "Exécuter une commande"
+
+#
+# File: src/global.c, line: 307
+# File: src/global.c, line: 307
+#: src/global.c:961
+msgid "To Files"
+msgstr "Parcourir"
+
+#
+# File: src/global.c, line: 309
+# File: src/global.c, line: 309
+#: src/global.c:964
+msgid "First File"
+msgstr "Prem. fich."
+
+#
+# File: src/global.c, line: 311
+# File: src/global.c, line: 311
+#: src/global.c:966
+msgid "Last File"
+msgstr "Dern. fich."
+
+#
+# File: src/global.c, line: 614
+# File: src/global.c, line: 1083
+# File: src/global.c, line: 614
+# File: src/global.c, line: 1083
+#: src/global.c:977
+msgid "Prev Lint Msg"
+msgstr "Analyse préc."
+
+#
+# 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:979
+msgid "Next Lint Msg"
+msgstr "Analyse suiv."
+
+#
 # File: src/global.c, line: 1277
 # File: src/global.c, line: 1277
-#: src/global.c:1367
+#. TRANSLATORS: The next seventeen strings are toggle descriptions;
+#. * they are best kept shorter than 40 characters, but may be longer.
+#: src/global.c:1227
 msgid "Help mode"
 msgstr "Mode aide"
 
 #
 # File: src/global.c, line: 1280
 # File: src/global.c, line: 1280
-#: src/global.c:1369
+#: src/global.c:1229
 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:1371
+#: src/global.c:1231
 msgid "Use of one more line for editing"
 msgstr "Utiliser 1 ligne de plus pour l'édition"
 
@@ -1617,105 +1755,105 @@ 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:1373
+#: src/global.c:1233
 msgid "Smooth scrolling"
 msgstr "Défilement progressif"
 
 #
+# File: src/nano.c, line: 824
+# File: src/nano.c, line: 824
+#: src/global.c:1235
+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:1375
+#: src/global.c:1237
 msgid "Whitespace display"
 msgstr "Afficher les blancs"
 
 #
 # File: src/global.c, line: 1304
 # File: src/global.c, line: 1304
-#: src/global.c:1377
+#: src/global.c:1239
 msgid "Color syntax highlighting"
 msgstr "Coloration syntaxique"
 
 #
 # File: src/global.c, line: 1308
 # File: src/global.c, line: 1308
-#: src/global.c:1379
+#: src/global.c:1241
 msgid "Smart home key"
 msgstr "Touche « Début » intelligente"
 
 #
 # File: src/global.c, line: 1311
 # File: src/global.c, line: 1311
-#: src/global.c:1381
+#: src/global.c:1243
 msgid "Auto indent"
 msgstr "Indenter automatiquement"
 
 #
 # File: src/global.c, line: 1314
 # File: src/global.c, line: 1314
-#: src/global.c:1383
+#: src/global.c:1245
 msgid "Cut to end"
 msgstr "Couper jusqu'en fin de ligne"
 
 #
-# File: src/global.c, line: 1318
-# File: src/global.c, line: 1318
-#: src/global.c:1385
-msgid "Long line wrapping"
+# File: src/nano.c, line: 824
+# File: src/nano.c, line: 824
+#: src/global.c:1247
+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:1387
+#: src/global.c:1249
 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:1389
+#: src/global.c:1251
 msgid "Backup files"
 msgstr "Conserver des copies de sécurité"
 
 #
 # File: src/global.c, line: 1342
 # File: src/global.c, line: 1342
-#: src/global.c:1391
+#: src/global.c:1253
 msgid "Multiple file buffers"
 msgstr "Mode multi-espace"
 
 #
 # File: src/global.c, line: 1346
 # File: src/global.c, line: 1346
-#: src/global.c:1393
+#: src/global.c:1255
 msgid "Mouse support"
 msgstr "Utiliser la souris"
 
 #
 # File: src/global.c, line: 1354
 # File: src/global.c, line: 1354
-#: src/global.c:1395
+#: src/global.c:1257
 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:1397
+#: src/global.c:1259
 msgid "Suspension"
 msgstr "Autoriser à suspendre"
 
 #
-# File: src/global.c, line: 1318
-# File: src/global.c, line: 1318
-#: src/global.c:1399
-msgid "Soft line wrapping"
-msgstr "Affichage multiligne automatique"
-
-#
 # File: src/help.c, line: 228
 # File: src/help.c, line: 228
-#: src/help.c:236
+#: src/help.c:205
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1740,7 +1878,7 @@ msgstr ""
 #
 # File: src/help.c, line: 237
 # File: src/help.c, line: 237
-#: src/help.c:245
+#: src/help.c:214
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1758,7 +1896,7 @@ msgstr ""
 #
 # File: src/help.c, line: 243
 # File: src/help.c, line: 243
-#: src/help.c:251
+#: src/help.c:220
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1782,7 +1920,7 @@ msgstr ""
 #
 # File: src/help.c, line: 252
 # File: src/help.c, line: 252
-#: src/help.c:260
+#: src/help.c:229
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1809,7 +1947,7 @@ msgstr ""
 #
 # File: src/help.c, line: 261
 # File: src/help.c, line: 261
-#: src/help.c:269
+#: src/help.c:238
 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"
@@ -1828,7 +1966,7 @@ msgstr ""
 #
 # File: src/help.c, line: 267
 # File: src/help.c, line: 267
-#: src/help.c:275
+#: src/help.c:244
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1846,13 +1984,13 @@ msgstr ""
 " Aide de l'écriture de fichier\n"
 "\n"
 " Indiquez le nom sous lequel vous désirez écrire le fichier courant et "
-"appuyez sur la touche « Entrée » pour effectuer la sauvegarde.\n"
+"appuyez sur la touche « Entrée » pour sauver le fichier.\n"
 "\n"
 " Si vous avez sélectionné du texte en le marquant, il vous sera proposé de "
-"sauvegarder seulement la partie sélectionnée du texte dans un fichier "
-"différent. Pour limiter le risque d'écraser le fichier en cours avec une "
-"simple portion de ce dernier, le nom du fichier courant ne vous sera proposé "
-"par défaut dans ce mode.\n"
+"sauver seulement la partie sélectionnée du texte dans un fichier différent. "
+"Pour limiter le risque d'écraser le fichier en cours avec une simple portion "
+"de ce dernier, le nom du fichier courant ne vous sera proposé par défaut "
+"dans ce mode.\n"
 "\n"
 " Les touches de fonction suivantes sont disponibles en mode écriture de "
 "fichier :\n"
@@ -1861,7 +1999,7 @@ msgstr ""
 #
 # File: src/help.c, line: 281
 # File: src/help.c, line: 281
-#: src/help.c:289
+#: src/help.c:258
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1878,11 +2016,11 @@ msgstr ""
 "\n"
 " Le navigateur de fichiers est utilisé pour parcourir visuellement la "
 "structure des répertoires afin de sélectionner un fichier en lecture ou en "
-"écriture. Les flèches et les touches « page précédente » et « page suivante » "
-"peuvent être utilisées pour parcourir les fichiers, les touches « S » et "
-"« Entrée » permettent de sélectionner un fichier ou de descendre dans un "
-"répertoire. Pour remonter dans l'arborescence des répertoires, sélectionner "
-"le répertoire appelé  « .. » en haut de la liste des fichiers.\n"
+"écriture. Les flèches et les touches « page précédente » et « page "
+"suivante » peuvent être utilisées pour parcourir les fichiers, les touches "
+"« S » et « Entrée » permettent de sélectionner un fichier ou de descendre "
+"dans un répertoire. Pour remonter dans l'arborescence des répertoires, "
+"sélectionner le répertoire appelé  « .. » en haut de la liste des fichiers.\n"
 "\n"
 " Les touches de fonction suivantes sont disponibles en mode navigateur de "
 "fichiers :\n"
@@ -1891,7 +2029,7 @@ msgstr ""
 #
 # File: src/help.c, line: 294
 # File: src/help.c, line: 294
-#: src/help.c:302
+#: src/help.c:271
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1918,7 +2056,7 @@ msgstr ""
 #
 # File: src/help.c, line: 303
 # File: src/help.c, line: 303
-#: src/help.c:311
+#: src/help.c:280
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1930,7 +2068,7 @@ msgstr ""
 #
 # File: src/help.c, line: 307
 # File: src/help.c, line: 307
-#: src/help.c:315
+#: src/help.c:284
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1957,7 +2095,7 @@ msgstr ""
 #
 # File: src/help.c, line: 320
 # File: src/help.c, line: 320
-#: src/help.c:328
+#: src/help.c:297
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1985,7 +2123,7 @@ msgstr ""
 #
 # File: src/help.c, line: 335
 # File: src/help.c, line: 335
-#: src/help.c:343
+#: src/help.c:312
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -2010,7 +2148,7 @@ msgstr ""
 #
 # File: src/help.c, line: 348
 # File: src/help.c, line: 348
-#: src/help.c:356
+#: src/help.c:325
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -2034,7 +2172,7 @@ msgstr ""
 #
 # File: src/help.c, line: 359
 # File: src/help.c, line: 359
-#: src/help.c:366
+#: src/help.c:335
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -2048,16 +2186,16 @@ msgstr ""
 "utilisés.\n"
 "\n"
 " Les raccourcis sont représentés de la façon suivante : la touche "
-"« Contrôle » est représentée par l'accent circonflexe (^) et peut être entrée "
-"soit via la touche Contrôle (Ctrl), soit en pressant 2 fois la touche "
+"« Contrôle » est représentée par l'accent circonflexe (^) et peut être "
+"entrée soit via la touche Contrôle (Ctrl), soit en pressant 2 fois la touche "
 "« Échap. ». Les séquences d'échappement sont représentées par le symbole "
 "« Méta » (M) et peuvent être entrées via les touches « Échap. », « Alt. » ou "
-"« Méta » selon la configuration de votre clavier.  "
+"« Méta » selon la configuration de votre clavier. "
 
 #
 # File: src/help.c, line: 366
 # File: src/help.c, line: 366
-#: src/help.c:375
+#: src/help.c:344
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -2066,9 +2204,9 @@ msgid ""
 "\n"
 msgstr ""
 "Appuyer 2 fois sur la touche « Échap. » puis entrer un nombre à 3 chiffres "
-"entre 000 et 255 insère le caractère de code correspondant. Les combinaisons "
+"entre 000 et 255 insère le caractère de code correspondant. Les raccourcis "
 "suivantes sont disponibles dans la fenêtre principale de l'éditeur. Les "
-"combinaisons pouvant être utilisées comme alternatives sont affichées entre "
+"raccourcis pouvant être utilisées comme alternatives sont affichées entre "
 "parenthèses :\n"
 "\n"
 
@@ -2077,14 +2215,14 @@ msgstr ""
 # File: src/help.c, line: 551
 # File: src/help.c, line: 397
 # File: src/help.c, line: 551
-#: src/help.c:407 src/help.c:483
+#: src/help.c:376 src/help.c:448
 msgid "enable/disable"
 msgstr "(commutateur)"
 
 #
 # File: src/nano.c, line: 522
 # File: src/nano.c, line: 522
-#: src/nano.c:587
+#: src/nano.c:601
 msgid "Key invalid in view mode"
 msgstr "Touche illégale en mode visualisation"
 
@@ -2092,7 +2230,7 @@ msgstr "Touche illégale en mode visualisation"
 # 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:695
+#: src/nano.c:713
 #, c-format
 msgid ""
 "\n"
@@ -2105,7 +2243,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:697
+#: src/nano.c:715
 #, c-format
 msgid ""
 "\n"
@@ -2118,7 +2256,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:700
+#: src/nano.c:718
 #, c-format
 msgid ""
 "\n"
@@ -2130,14 +2268,14 @@ msgstr ""
 #
 # File: src/nano.c, line: 635
 # File: src/nano.c, line: 635
-#: src/nano.c:723
+#: src/nano.c:743
 msgid "Window size is too small for nano...\n"
 msgstr "La taille de la fenêtre est trop petite pour nano...\n"
 
 #
 # File: src/nano.c, line: 727
 # File: src/nano.c, line: 727
-#: src/nano.c:816
+#: src/nano.c:836
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
@@ -2149,7 +2287,7 @@ msgstr ""
 #
 # File: src/nano.c, line: 730
 # File: src/nano.c, line: 730
-#: src/nano.c:819
+#: src/nano.c:839
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Option\t\tOption longue GNU\t\tDescription\n"
@@ -2157,406 +2295,412 @@ msgstr "Option\t\tOption longue GNU\t\tDescription\n"
 #
 # File: src/nano.c, line: 732
 # File: src/nano.c, line: 732
-#: src/nano.c:821
+#: src/nano.c:841
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Option\t\tSignification\n"
 
 #
-# File: src/nano.c, line: 735
-# File: src/nano.c, line: 735
-#: src/nano.c:824
-msgid "Show this message"
-msgstr "Affiche ce message"
-
-#
 # File: src/nano.c, line: 736
 # File: src/nano.c, line: 736
-#: src/nano.c:825
+#: src/nano.c:844
 msgid "+LINE,COLUMN"
 msgstr "+LIGNE,COLONNE"
 
 #
 # File: src/nano.c, line: 737
 # File: src/nano.c, line: 737
-#: src/nano.c:826
+#. TRANSLATORS: The next forty or so strings are option descriptions
+#. * for the --help output.  Try to keep them at most 40 characters.
+#: src/nano.c:847
 msgid "Start at line LINE, column COLUMN"
 msgstr "Démarre ligne LIGNE, colonne COLONNE"
 
 #
 # File: src/nano.c, line: 739
 # File: src/nano.c, line: 739
-#: src/nano.c:828
+#: src/nano.c:849
 msgid "Enable smart home key"
 msgstr "Touche « Début » intelligente"
 
 #
 # File: src/nano.c, line: 740
 # File: src/nano.c, line: 740
-#: src/nano.c:829
+#: src/nano.c:850
 msgid "Save backups of existing files"
-msgstr "Sauver en créant une copie de sécurité"
+msgstr "Créer des copies de sécurité des fichiers existants"
 
 #
 # File: src/nano.c, line: 741
 # File: src/nano.c, line: 741
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "-C <dir>"
 msgstr "-C <rép.>"
 
 #
 # File: src/nano.c, line: 741
 # File: src/nano.c, line: 741
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<rép.>"
 
 #
 # File: src/nano.c, line: 742
 # File: src/nano.c, line: 742
-#: src/nano.c:831
+#: src/nano.c:852
 msgid "Directory for saving unique backup files"
 msgstr "Répertoire des copies de sécu. uniques"
 
 #
 # File: src/nano.c, line: 745
 # File: src/nano.c, line: 745
-#: src/nano.c:834
+#: src/nano.c:855
 msgid "Use bold instead of reverse video text"
 msgstr "Affiche en gras le texte vidéo inverse"
 
 #
 # File: src/nano.c, line: 748
 # File: src/nano.c, line: 748
-#: src/nano.c:837
+#: src/nano.c:858
 msgid "Convert typed tabs to spaces"
 msgstr "La touche tabulation ajoute des espaces"
 
 #
 # File: src/nano.c, line: 751
 # File: src/nano.c, line: 751
-#: src/nano.c:840
+#: src/nano.c:861
 msgid "Enable multiple file buffers"
 msgstr "Mode multi-espace"
 
+#: src/nano.c:865
+msgid "Use (vim-style) lock files"
+msgstr "Utilisation de fichiers verrou (du type vim)"
+
 #
 # File: src/nano.c, line: 756
 # File: src/nano.c, line: 756
-#: src/nano.c:845
+#: src/nano.c:869
 msgid "Log & read search/replace string history"
 msgstr "Mémorise les recherches & remplacements"
 
 #
 # File: src/nano.c, line: 759
 # File: src/nano.c, line: 759
-#: src/nano.c:848
+#: src/nano.c:873
 msgid "Don't look at nanorc files"
 msgstr "Ne pas utiliser les fichiers nanorc"
 
 #
 # File: src/nano.c, line: 762
 # File: src/nano.c, line: 762
-#: src/nano.c:851
+#: src/nano.c:876
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Corrige la gestion du pavé numérique"
 
 #
 # File: src/nano.c, line: 764
 # File: src/nano.c, line: 764
-#: src/nano.c:853
+#: src/nano.c:878
 msgid "Don't add newlines to the ends of files"
 msgstr "Pas d'ajout de ligne en fin de fichier"
 
 #
 # File: src/nano.c, line: 767
 # File: src/nano.c, line: 767
-#: src/nano.c:856
+#: src/nano.c:881
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Pas de conversion depuis DOS et Mac"
 
 #
 # File: src/global.c, line: 1283
 # File: src/global.c, line: 1283
-#: src/nano.c:858
+#: src/nano.c:883
 msgid "Use one more line for editing"
 msgstr "Utiliser 1 ligne de plus pour l'édition"
 
 #
+# File: src/global.c, line: 389
+# File: src/global.c, line: 389
+#: src/nano.c:886
+msgid "Log & read location of cursor position"
+msgstr "Mémoriser la position du curseur"
+
+#
 # File: src/nano.c, line: 771
 # File: src/nano.c, line: 771
-#: src/nano.c:860
+#: src/nano.c:889
 msgid "-Q <str>"
 msgstr "-Q <chaîne>"
 
 #
 # File: src/nano.c, line: 771
 # File: src/nano.c, line: 771
-#: src/nano.c:860
+#: src/nano.c:889
 msgid "--quotestr=<str>"
 msgstr "--quotestr=<chaîne>"
 
 #
 # File: src/nano.c, line: 772
 # File: src/nano.c, line: 772
-#: src/nano.c:861
+#: src/nano.c:890
 msgid "Quoting string"
 msgstr "Préfixe des citations"
 
 #
 # File: src/nano.c, line: 774
 # File: src/nano.c, line: 774
-#: src/nano.c:863
+#: src/nano.c:892
 msgid "Restricted mode"
 msgstr "Mode restreint"
 
-#: src/nano.c:866
+#: src/nano.c:895
 msgid "Scroll by line instead of half-screen"
-msgstr "Défilement ligne par ligne*"
+msgstr "Défilement ligne par ligne"
 
 #
 # File: src/nano.c, line: 778
 # File: src/nano.c, line: 778
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "-T <#cols>"
 msgstr "-T <nombre>"
 
 #
 # File: src/nano.c, line: 778
 # File: src/nano.c, line: 778
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<nombre>"
 
 #
 # File: src/nano.c, line: 779
 # File: src/nano.c, line: 779
-#: src/nano.c:869
+#: src/nano.c:898
 msgid "Set width of a tab to #cols columns"
 msgstr "Largeur des tabulations"
 
 #
 # File: src/nano.c, line: 781
 # File: src/nano.c, line: 781
-#: src/nano.c:871
+#: src/nano.c:900
 msgid "Do quick statusbar blanking"
 msgstr "Effacement rapide de la barre d'état"
 
 #
 # File: src/nano.c, line: 784
 # File: src/nano.c, line: 784
-#: src/nano.c:874
+#: src/nano.c:903
 msgid "Print version information and exit"
 msgstr "Affiche la version et s'arrête"
 
 #
 # File: src/nano.c, line: 787
 # File: src/nano.c, line: 787
-#: src/nano.c:877
+#: src/nano.c:906
 msgid "Detect word boundaries more accurately"
 msgstr "Meilleure détection des limites de mots"
 
 #
 # File: src/nano.c, line: 790
 # File: src/nano.c, line: 790
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "-Y <str>"
 msgstr "-Y <chaîne>"
 
 #
 # File: src/nano.c, line: 790
 # File: src/nano.c, line: 790
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "--syntax=<str>"
 msgstr "--syntax=<chaîne>"
 
 #
 # File: src/nano.c, line: 791
 # File: src/nano.c, line: 791
-#: src/nano.c:881
+#: src/nano.c:910
 msgid "Syntax definition to use for coloring"
 msgstr "Définit la syntaxe de coloration"
 
 #
 # File: src/nano.c, line: 793
 # File: src/nano.c, line: 793
-#: src/nano.c:883
+#: src/nano.c:912
 msgid "Constantly show cursor position"
 msgstr "Afficher la position du curseur"
 
 #
 # File: src/nano.c, line: 795
 # File: src/nano.c, line: 795
-#: src/nano.c:885
+#: src/nano.c:914
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Corrige la confusion effac. arr./suppr."
 
 #
+# File: src/global.c, line: 315
+# File: src/global.c, line: 315
+#: src/nano.c:915
+msgid "Show this help text"
+msgstr "Affiche de message"
+
+#
 # File: src/nano.c, line: 798
 # File: src/nano.c, line: 798
-#: src/nano.c:888
+#: src/nano.c:918
 msgid "Automatically indent new lines"
 msgstr "Indentation automatique"
 
 #
 # File: src/nano.c, line: 799
 # File: src/nano.c, line: 799
-#: src/nano.c:889
+#: src/nano.c:919
 msgid "Cut from cursor to end of line"
 msgstr "Coupe du curseur à la fin de la ligne"
 
 #
 # File: src/nano.c, line: 802
 # File: src/nano.c, line: 802
-#: src/nano.c:892
+#: src/nano.c:922
 msgid "Don't follow symbolic links, overwrite"
 msgstr "Écraser les liens sym., sans les suivre"
 
 #
 # File: src/nano.c, line: 804
 # File: src/nano.c, line: 804
-#: src/nano.c:894
+#: src/nano.c:924
 msgid "Enable the use of the mouse"
 msgstr "Active l'utilisation de la souris"
 
+#: src/nano.c:926
+msgid "Do not read the file (only write it)"
+msgstr "Ne pas lire le fichier existant (mais l'écraser)"
+
 #
 # File: src/nano.c, line: 807
 # File: src/nano.c, line: 807
-#: src/nano.c:897
+#: src/nano.c:928
 msgid "-o <dir>"
 msgstr "-o <rép.>"
 
 #
 # File: src/nano.c, line: 807
 # File: src/nano.c, line: 807
-#: src/nano.c:897
+#: src/nano.c:928
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<rép.>"
 
 #
 # File: src/nano.c, line: 808
 # File: src/nano.c, line: 808
-#: src/nano.c:898
+#: src/nano.c:929
 msgid "Set operating directory"
 msgstr "Répertoire de fonctionnement"
 
 #
 # File: src/nano.c, line: 811
 # File: src/nano.c, line: 811
-#: src/nano.c:901
+#: src/nano.c:932
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Préserver ^Q (XON) & ^S (XOFF)"
 
-#: src/nano.c:903
+#: src/nano.c:935
 msgid "Silently ignore startup issues like rc file errors"
 msgstr "Pas d'erreur au démarrage (nanorc...)"
 
 #
 # File: src/nano.c, line: 813
 # File: src/nano.c, line: 813
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "-r <#cols>"
 msgstr "-r <numéro>"
 
 #
 # File: src/nano.c, line: 813
 # File: src/nano.c, line: 813
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "--fill=<#cols>"
 msgstr "--fill=<numéro>"
 
 #
 # File: src/nano.c, line: 779
 # File: src/nano.c, line: 779
-#: src/nano.c:906
-msgid "Set wrapping point at column #cols"
-msgstr "Colonne de passage à la ligne"
+#: src/nano.c:939
+msgid "Set hard-wrapping point at column #cols"
+msgstr "Passer automatiquement à la ligne à la colonne #col"
 
 #
 # File: src/nano.c, line: 817
 # File: src/nano.c, line: 817
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "-s <prog>"
 msgstr "-s <prog>"
 
 #
 # File: src/nano.c, line: 817
 # File: src/nano.c, line: 817
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "--speller=<prog>"
 msgstr "--speller=<prog>"
 
 #
 # File: src/nano.c, line: 818
 # File: src/nano.c, line: 818
-#: src/nano.c:910
+#: src/nano.c:943
 msgid "Enable alternate speller"
 msgstr "Correcteur orthographique"
 
 #
 # File: src/nano.c, line: 821
 # File: src/nano.c, line: 821
-#: src/nano.c:913
+#: src/nano.c:946
 msgid "Auto save on exit, don't prompt"
 msgstr "Sauver en quittant, sans question"
 
-#: src/nano.c:915
-msgid "Allow generic undo [EXPERIMENTAL]"
-msgstr "Fonct. annuler générique [EXPÉRIMENTAL]"
-
 #
 # File: src/nano.c, line: 822
 # File: src/nano.c, line: 822
-#: src/nano.c:918
+#: src/nano.c:947
 msgid "View mode (read-only)"
 msgstr "Mode visualisation (lecture seule)"
 
 #
 # File: src/nano.c, line: 824
 # File: src/nano.c, line: 824
-#: src/nano.c:920
-msgid "Don't wrap long lines"
+#: src/nano.c:949
+msgid "Don't hard-wrap long lines"
 msgstr "Désactive le passage auto. à la ligne"
 
 #
 # File: src/nano.c, line: 826
 # File: src/nano.c, line: 826
-#: src/nano.c:922
+#: src/nano.c:951
 msgid "Don't show the two help lines"
 msgstr "Ne pas afficher les deux lignes d'aide"
 
 #
 # File: src/nano.c, line: 827
 # File: src/nano.c, line: 827
-#: src/nano.c:923
+#: src/nano.c:952
 msgid "Enable suspension"
 msgstr "Autoriser à suspendre"
 
 #
 # File: src/global.c, line: 1318
 # File: src/global.c, line: 1318
-#: src/nano.c:924
+#: src/nano.c:954
 msgid "Enable soft line wrapping"
 msgstr "Affichage multiligne automatique"
 
 #
-# File: src/nano.c, line: 831
-# File: src/nano.c, line: 831
-#: src/nano.c:928
-msgid "(ignored, for Pico compatibility)"
-msgstr "(ignoré, pour être compatible Pico)"
-
-#
 # File: src/nano.c, line: 841
 # File: src/nano.c, line: 841
-#: src/nano.c:938
+#: src/nano.c:963
 #, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
-msgstr " nano GNU version %s (compilé à %s, le %s)\n"
+msgid " GNU nano, version %s\n"
+msgstr " nano GNU version %s\n"
 
 #
 # File: src/nano.c, line: 844
 # File: src/nano.c, line: 844
-#: src/nano.c:943
+#: src/nano.c:966
 #, 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/"
@@ -2564,7 +2708,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:944
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -2576,22 +2720,26 @@ msgstr ""
 #
 # File: src/nano.c, line: 923
 # File: src/nano.c, line: 923
-#: src/nano.c:1022
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr "Désolé, le support de cette fonction a été désactivé"
 
+#: src/nano.c:1125
+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:1044
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "Sauver l'espace modifié (RÉPONDRE « Non » EFFACERA LES CHANGEMENTS) ? "
 
-#: src/nano.c:1088
+#: src/nano.c:1189
 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:1114
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "Lecture depuis l'entrée standard, ^C pour abandonner\n"
@@ -2599,14 +2747,14 @@ 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:1182
+#: src/nano.c:1279
 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:1204
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Utilisez « fg » pour revenir à nano.\n"
@@ -2614,14 +2762,14 @@ msgstr "Utilisez « fg » pour revenir à nano.\n"
 #
 # File: src/nano.c, line: 1186
 # File: src/nano.c, line: 1186
-#: src/nano.c:1386
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "- marche"
 
 #
 # File: src/nano.c, line: 1187
 # File: src/nano.c, line: 1187
-#: src/nano.c:1387
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "- arrêt"
 
@@ -2630,21 +2778,21 @@ msgstr "- arrêt"
 # File: src/winio.c, line: 530
 # File: src/nano.c, line: 1361
 # File: src/winio.c, line: 530
-#: src/nano.c:1548 src/winio.c:1256
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr "Commande inconnue"
 
 #
 # File: src/nano.c, line: 1425
 # File: src/nano.c, line: 1425
-#: src/nano.c:1674
+#: src/nano.c:1747
 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:1679
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF ignoré, humm humm"
 
@@ -2653,7 +2801,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:2209 src/rcfile.c:1100
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "taille de tabulation « %s » demandée non valide"
@@ -2663,60 +2811,65 @@ 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:2268 src/rcfile.c:1025
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "la colonne maximale « %s » n'est pas valide"
 
+#: src/nano.c:2415
+#, c-format
+msgid "Type '%s -h' for a list of available options.\n"
+msgstr "Entrez « %s -h » pour une liste des options disponibles.\n"
+
 #
 # File: src/prompt.c, line: 1252
 # File: src/prompt.c, line: 1252
 #. 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:1259
+#: src/prompt.c:1055
 msgid "Yy"
 msgstr "Oo"
 
 #
 # File: src/prompt.c, line: 1253
 # File: src/prompt.c, line: 1253
-#: src/prompt.c:1260
+#: src/prompt.c:1056
 msgid "Nn"
 msgstr "Nn"
 
 #
 # File: src/prompt.c, line: 1254
 # File: src/prompt.c, line: 1254
-#: src/prompt.c:1261
+#: src/prompt.c:1057
 msgid "Aa"
 msgstr "Tt"
 
 #
 # File: src/prompt.c, line: 1268
 # File: src/prompt.c, line: 1268
-#: src/prompt.c:1275
+#: src/prompt.c:1071
 msgid "Yes"
 msgstr "Oui"
 
 #
 # File: src/prompt.c, line: 1273
 # File: src/prompt.c, line: 1273
-#: src/prompt.c:1280
+#: src/prompt.c:1076
 msgid "All"
 msgstr "Tous"
 
 #
 # File: src/prompt.c, line: 1278
 # File: src/prompt.c, line: 1278
-#: src/prompt.c:1285
+#: src/prompt.c:1081
 msgid "No"
 msgstr "Non"
 
 #
 # File: src/rcfile.c, line: 120
 # File: src/rcfile.c, line: 120
-#: src/rcfile.c:130
+#: src/rcfile.c:137
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Erreur dans %s (ligne %lu) : "
@@ -2724,7 +2877,7 @@ msgstr "Erreur dans %s (ligne %lu) : "
 #
 # File: src/rcfile.c, line: 174
 # File: src/rcfile.c, line: 174
-#: src/rcfile.c:185
+#: src/rcfile.c:196
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "l'argument %s contient un \" non fermé"
@@ -2738,8 +2891,8 @@ 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:212 src/rcfile.c:264 src/rcfile.c:711 src/rcfile.c:768
-#: src/rcfile.c:821
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
 msgstr "les expr. rationnelles doivent être encadrées par des « \" »"
 
@@ -2748,7 +2901,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:238 src/search.c:62
+#: src/rcfile.c:249 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "mauvaise expr. rationnelle « %s » : %s"
@@ -2756,65 +2909,108 @@ msgstr "mauvaise expr. rationnelle « %s » : %s"
 #
 # File: src/rcfile.c, line: 247
 # File: src/rcfile.c, line: 247
-#: src/rcfile.c:258
+#: src/rcfile.c:269
 msgid "Missing syntax name"
 msgstr "nom de syntaxe manquant"
 
 #
 # File: src/rcfile.c, line: 302
 # File: src/rcfile.c, line: 302
-#: src/rcfile.c:316
+#: src/rcfile.c:340
 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:323
+#: src/rcfile.c:347
 msgid "The \"default\" syntax must take no 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:386 src/rcfile.c:483
+#: src/rcfile.c:433
 msgid "Missing key name"
-msgstr "Nom de clef manquant"
+msgstr "Raccourci manquant"
 
-#: src/rcfile.c:398 src/rcfile.c:499
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
-msgstr "Les combinaisons clavier doivent commencer par « ^ », « M » ou « F »"
+#: src/rcfile.c:442 src/rcfile.c:453
+msgid "Key name is too short"
+msgstr "Raccourci trop court"
 
-#: src/rcfile.c:407
-msgid "Must specify function to bind key to"
-msgstr ""
-"vous devez indiquer la fonction à laquelle cette combinaison est associée"
+#: src/rcfile.c:463
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
+msgstr "Les raccourcis doivent commencer par « ^ », « M » ou « F »"
 
-#: src/rcfile.c:418 src/rcfile.c:510
-msgid "Must specify menu to bind key to (or \"all\")"
+#: src/rcfile.c:472
+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:482
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
-"vous devez indiquer dans quel menu cette combinaison sera utilisée (ou "
-"« all » pour tous)"
+"Vous devez indiquer le menu (ou « all » pour tous) auquel ce raccourci est "
+"rattaché"
 
-#: src/rcfile.c:426
+#: src/rcfile.c:489
 #, c-format
-msgid "Could not map name \"%s\" to a function"
+msgid "Cannot map name \"%s\" to a function"
 msgstr "impossible de trouver la fonction « %s »"
 
-#: src/rcfile.c:432 src/rcfile.c:517
+#: src/rcfile.c:496
 #, c-format
-msgid "Could not map name \"%s\" to a menu"
+msgid "Cannot map name \"%s\" to a menu"
 msgstr "impossible de trouver le menu « %s »"
 
-#: src/rcfile.c:454
+#: src/rcfile.c:528
+#, 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:543
+#, c-format
+msgid "Sorry, keystroke \"%s\" may not be rebound"
+msgstr "désolé, le raccourci « %s » ne peut être réattribué"
+
+#
+# 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/rcfile.c:629
 #, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
-msgstr "désolé, « %s » n'est pas une combinaison valide"
+msgid "Error expanding %s: %s"
+msgstr "Erreur lors de l'expansion de %s : %s"
 
 #
 # File: src/rcfile.c, line: 438
 # File: src/rcfile.c, line: 438
-#: src/rcfile.c:625
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -2834,7 +3030,7 @@ msgstr ""
 #
 # File: src/rcfile.c, line: 460
 # File: src/rcfile.c, line: 460
-#: src/rcfile.c:647
+#: src/rcfile.c:694
 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 "
@@ -2843,53 +3039,102 @@ msgstr ""
 #
 # File: src/rcfile.c, line: 465
 # File: src/rcfile.c, line: 465
-#: src/rcfile.c:652
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "nom de couleur manquant"
 
 #
-# File: src/rcfile.c, line: 485
-# File: src/rcfile.c, line: 485
-#: src/rcfile.c:672
-#, 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: 503
 # File: src/rcfile.c, line: 503
-#: src/rcfile.c:690 src/rcfile.c:809
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr "chaîne d'expr. rationnelle manquante"
 
 #
 # File: src/rcfile.c, line: 575
 # File: src/rcfile.c, line: 575
-#: src/rcfile.c:762
+#: src/rcfile.c:785
 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:837
+#, 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:804
+#: src/rcfile.c:865
 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 »"
 
-#: src/rcfile.c:874
+#
+# File: src/rcfile.c, line: 460
+# File: src/rcfile.c, line: 460
+#: src/rcfile.c:921
+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:926
+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: 465
+# File: src/rcfile.c, line: 465
+#: src/rcfile.c:990
+msgid "Missing linter command"
+msgstr "Commande d'analyse statique manquante"
+
+#
+# File: src/rcfile.c, line: 460
+# File: src/rcfile.c, line: 460
+#: src/rcfile.c:1010
+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:1015
+msgid "Missing formatter command"
+msgstr "Commande de l'outil de mise en forme manquante"
+
+#: src/rcfile.c:1045
 #, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
+msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr ""
-"Erreur bloquante : aucune combinaison n'est associée à la fonction « %s »"
+"Erreur bloquante : aucun raccourci n'est associé à la fonction « %s ». "
+"Arrêt.\n"
 
-#: src/rcfile.c:876
+#: src/rcfile.c:1047
+#, c-format
 msgid ""
-"Exiting.  Please use nano with the -I option if needed to adjust your nanorc "
-"settings\n"
+"If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
-"Arrêt. Si besoin, lancez nano avec l'option -I pour modifier les paramètres "
-"de votre fichier nanorc\n"
+"Si besoin, lancez nano avec l'option -I pour modifier les paramètres de "
+"votre fichier nanorc\n"
+
+#: src/rcfile.c:1108
+#, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "impossible de trouver la syntaxe « %s » à étendre"
 
 #
 # File: src/rcfile.c, line: 646
@@ -2898,7 +3143,7 @@ msgstr ""
 # File: src/rcfile.c, line: 646
 # File: src/rcfile.c, line: 655
 # File: src/rcfile.c, line: 665
-#: src/rcfile.c:926 src/rcfile.c:935 src/rcfile.c:945
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "la commande « %s » est interdite dans un fichier inclus"
@@ -2908,7 +3153,7 @@ msgstr "la commande « %s » est interdite dans un fichier inclus"
 # File: src/rcfile.c, line: 838
 # File: src/rcfile.c, line: 671
 # File: src/rcfile.c, line: 838
-#: src/rcfile.c:951 src/rcfile.c:1128
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "la syntaxe « %s » ne contient aucune commande de coloration (color)"
@@ -2916,22 +3161,22 @@ 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:966
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "impossible de comprendre la commande « %s »"
 
 #
-# File: src/rcfile.c, line: 686
-# File: src/rcfile.c, line: 686
-#: src/rcfile.c:972
-msgid "Missing flag"
-msgstr "nom de l'option manquant"
+# File: src/rcfile.c, line: 465
+# File: src/rcfile.c, line: 465
+#: src/rcfile.c:1186
+msgid "Missing option"
+msgstr "Option manquante"
 
 #
 # File: src/rcfile.c, line: 708
 # File: src/rcfile.c, line: 708
-#: src/rcfile.c:994
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "l'option « %s » nécessite un argument"
@@ -2939,7 +3184,7 @@ msgstr "l'option « %s » nécessite un argument"
 #
 # File: src/rcfile.c, line: 726
 # File: src/rcfile.c, line: 726
-#: src/rcfile.c:1012
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr "l'option n'est pas une chaîne multioctet valide"
 
@@ -2950,41 +3195,55 @@ 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:1038 src/rcfile.c:1066 src/rcfile.c:1075
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 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:1048
+#: src/rcfile.c:1273
 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:1114
+#: src/rcfile.c:1339
 #, c-format
-msgid "Cannot unset flag \"%s\""
+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:1123
+#: src/rcfile.c:1345
 #, c-format
-msgid "Unknown flag \"%s\""
-msgstr "option inconnue « %s »"
+msgid "Unknown option \"%s\""
+msgstr "Option « %s » inconnue"
 
 #
 # File: src/rcfile.c, line: 894
 # File: src/rcfile.c, line: 894
-#: src/rcfile.c:1182
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr "impossible de trouver mon répertoire personnel ! Ouah !"
 
 #
+# File: src/files.c, line: 2379
+# File: src/rcfile.c, line: 848
+# File: src/files.c, line: 2379
+# File: src/rcfile.c, line: 848
+#: src/rcfile.c:1442
+#, c-format
+msgid ""
+"\n"
+"Press Enter to continue starting nano.\n"
+msgstr ""
+"\n"
+"Appuyez sur « Entrée » pour poursuivre le démarrage de nano.\n"
+
+#
 # File: src/search.c, line: 94
 # File: src/search.c, line: 94
 #: src/search.c:96
@@ -2993,37 +3252,68 @@ msgid "\"%.*s%s\" not found"
 msgstr "« %.*s%s » non trouvé"
 
 #
+# File: src/browser.c, line: 655
+# File: src/search.c, line: 183
+# 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:184
+msgid " [Case Sensitive]"
+msgstr " [Resp. casse]"
+
+#
+# File: src/browser.c, line: 661
+# File: src/search.c, line: 189
+# File: src/browser.c, line: 661
+# File: src/search.c, line: 189
+#: src/search.c:188
+msgid " [Regexp]"
+msgstr " [Exp. ration.]"
+
+#
+# File: src/browser.c, line: 667
+# File: src/search.c, line: 195
+# File: src/browser.c, line: 667
+# File: src/search.c, line: 195
+#: src/search.c:192
+msgid " [Backwards]"
+msgstr " [Arrière]"
+
+#
 # File: src/search.c, line: 199
 # File: src/search.c, line: 199
-#: src/search.c:205
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:197
 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:207
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (à remplacer)"
 
 #
 # File: src/search.c, line: 753
 # File: src/search.c, line: 753
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "Remplacer cette occurrence ?"
 
 #
 # File: src/search.c, line: 921
 # File: src/search.c, line: 921
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:945
 msgid "Replace with"
 msgstr "Remplacer par"
 
 #
 # File: src/search.c, line: 963
 # File: src/search.c, line: 963
-#: src/search.c:1004
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
@@ -3033,28 +3323,29 @@ msgstr[1] "%lu remplacements effectués"
 #
 # File: src/search.c, line: 989
 # File: src/search.c, line: 989
-#: src/search.c:1034
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1027
 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:1061
+#: src/search.c:1054
 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:1214
+#: src/search.c:1207
 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:1281
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "Aucun crochet correspondant"
 
@@ -3072,48 +3363,41 @@ msgstr "Marque posée"
 msgid "Mark Unset"
 msgstr "Marque enlevée"
 
-#: src/text.c:443
+#: src/text.c:439
 msgid "Nothing in undo buffer!"
 msgstr "Aucune opération à annuler !"
 
-#: src/text.c:455 src/text.c:593
+#: src/text.c:445 src/text.c:590
 #, c-format
-msgid "Internal error: can't match line %d.  Please save your work"
+msgid "Internal error: can't match line %d.  Please save your work."
 msgstr ""
 "Erreur interne : impossible de trouver une correspondance pour la ligne %d. "
-"Sauvegardez votre travail"
+"Sauvez votre travail."
 
-#: src/text.c:466 src/text.c:603
+#: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
 msgstr "ajout de texte"
 
 #
 # File: src/global.c, line: 668
 # File: src/global.c, line: 668
-#: src/text.c:475 src/text.c:613
+#: src/text.c:467 src/text.c:612
 msgid "text delete"
 msgstr "effacement de texte"
 
-#
-# File: src/global.c, line: 1318
-# File: src/global.c, line: 1318
-#: src/text.c:489 src/text.c:628
-msgid "line wrap"
-msgstr "passage à la ligne"
-
-#: src/text.c:503 src/text.c:636
+#: src/text.c:491 src/text.c:641
 msgid "line join"
 msgstr "fusion de lignes"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:505 src/text.c:657
 msgid "text cut"
 msgstr "texte coupé"
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:510 src/text.c:661
 msgid "text uncut"
 msgstr "texte restauré"
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:515 src/text.c:623
 msgid "line break"
 msgstr "nouvelle ligne"
 
@@ -3122,47 +3406,47 @@ msgstr "nouvelle ligne"
 # File: src/global.c, line: 1087
 # File: src/global.c, line: 618
 # File: src/global.c, line: 1087
-#: src/text.c:532 src/text.c:665
+#: src/text.c:528 src/text.c:672
 msgid "text insert"
 msgstr "insertion de texte"
 
 #
 # File: src/search.c, line: 201
 # File: src/search.c, line: 201
-#: src/text.c:550 src/text.c:659
+#: src/text.c:549 src/text.c:665
 msgid "text replace"
 msgstr "remplacement de texte"
 
-#: src/text.c:557 src/text.c:671
-msgid "Internal error: unknown type.  Please save your work"
-msgstr "Erreur interne : type inconnu. Sauvegardez votre travail"
+#: src/text.c:556 src/text.c:679 src/text.c:983
+msgid "Internal error: unknown type.  Please save your work."
+msgstr "Erreur interne : type inconnu. Sauvez votre travail"
 
-#: src/text.c:563
+#: src/text.c:561
 #, c-format
 msgid "Undid action (%s)"
 msgstr "Action annulée (%s)"
 
-#: src/text.c:578
+#: src/text.c:580
 msgid "Nothing to re-do!"
 msgstr "Rien à refaire !"
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
+#: src/text.c:584
+msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
-"Erreur interne : impossible de se préparer à refaire l'action. Sauvegardez "
-"votre travail"
+"Erreur interne : impossible de préparer le retour en avant. Sauvez votre "
+"travail."
 
-#: src/text.c:676
+#: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Action refaite (%s)"
 
 #
-# File: src/text.c, line: 441
-# File: src/text.c, line: 441
-#: src/text.c:766
-msgid "Could not pipe"
-msgstr "Impossible d'ouvrir un tube"
+# File: src/text.c, line: 1944
+# File: src/text.c, line: 1944
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
+msgid "Could not create pipe"
+msgstr "Impossible de créer un tube"
 
 #
 # File: src/text.c, line: 468
@@ -3171,24 +3455,21 @@ msgstr "Impossible d'ouvrir un tube"
 # File: src/text.c, line: 468
 # File: src/text.c, line: 2032
 # File: src/text.c, line: 2179
-#: src/text.c:793 src/text.c:2636 src/text.c:2788
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "Impossible de créer un nouveau processus"
 
-#: src/text.c:941
-msgid "Internal error: can't setup uncut.  Please save your work."
+#: src/text.c:969
+msgid "Internal error: cannot set up uncut.  Please save your work."
 msgstr ""
-"Erreur interne : impossible de mettre en place le moyen d'annuler l'action "
-"« couper ». Sauvegardez votre travail."
-
-#: src/text.c:950
-msgid "Internal error: unknown type.  Please save your work."
-msgstr "Erreur interne : type inconnu. Sauvegardez votre travail"
+"Erreur interne : impossible de préparer l'action « coller ». Sauvez votre "
+"travail."
 
 #
 # File: src/text.c, line: 1270
 # File: src/text.c, line: 1270
-#: src/text.c:1870
+#: src/text.c:1806
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Mauvaise chaîne de citation %s : %s"
@@ -3196,78 +3477,78 @@ msgstr "Mauvaise chaîne de citation %s : %s"
 #
 # File: src/text.c, line: 1666
 # File: src/text.c, line: 1666
-#: src/text.c:2267
+#: src/text.c:2207
 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:2462
+#: src/text.c:2404
 msgid "Edit a replacement"
 msgstr "Entrez une correction"
 
 #
-# File: src/text.c, line: 1944
-# File: src/text.c, line: 1944
-#: src/text.c:2548
-msgid "Could not create pipe"
-msgstr "Impossible de créer un tube"
-
-#
 # File: src/text.c, line: 1946
 # File: src/text.c, line: 1946
-#: src/text.c:2550
+#: src/text.c:2492
 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:2642
+#: src/text.c:2584 src/text.c:3022
 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:2693
+#: src/text.c:2635
 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:2696
+#: src/text.c:2638
 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:2699
+#: src/text.c:2641
 msgid "Error invoking \"uniq\""
 msgstr "erreur à l'appel de « uniq »"
 
 #
 # File: src/text.c, line: 2351
 # File: src/text.c, line: 2351
-#: src/text.c:2756 src/text.c:2965
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "Vérification orthographique terminée"
 
 #
 # File: src/text.c, line: 2206
 # File: src/text.c, line: 2206
-#: src/text.c:2815
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "erreur d'appel de « %s »"
 
 #
+# File: src/global.c, line: 339
+# File: src/global.c, line: 339
+#: src/text.c:2885
+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:2960
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Échec de la correction : %s"
@@ -3275,15 +3556,72 @@ msgstr "Échec de la correction : %s"
 #
 # File: src/text.c, line: 2348
 # File: src/text.c, line: 2348
-#: src/text.c:2962
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Échec de la correction : %s : %s"
 
 #
+# File: src/nano.c, line: 764
+# File: src/nano.c, line: 764
+#: src/text.c:2937
+msgid "No linter defined for this type of file!"
+msgstr "Aucun analyseur statique défini pour ce type de fichiers !"
+
+#: src/text.c:2947
+msgid "Save modified buffer before linting?"
+msgstr "Sauver l'espace modifié avant l'analyse statique ?"
+
+#: src/text.c:2969
+msgid "Invoking linter, please wait"
+msgstr "Lancement de l'analyse statique, veuillez patienter"
+
+#: src/text.c:3125
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr "La commande « %s » n'a produit aucune ligne analysable"
+
+#: src/text.c:3159
+#, 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 ?"
+
+#
+# File: src/nano.c, line: 735
+# File: src/nano.c, line: 735
+#: src/text.c:3205
+msgid "At last message"
+msgstr "Dernier message"
+
+#
+# File: src/nano.c, line: 735
+# File: src/nano.c, line: 735
+#: src/text.c:3210
+msgid "At first message"
+msgstr "Premier message"
+
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr "Erreur : aucun formateur n'est défini"
+
+#: src/text.c:3275
+msgid "Finished"
+msgstr "Terminé"
+
+#: src/text.c:3280
+msgid "Invoking formatter, please wait"
+msgstr "Lancement de la mise en forme, veuillez patienter"
+
+#: src/text.c:3360
+msgid "Finished formatting"
+msgstr "Mise en forme terminée"
+
+#
 # File: src/text.c, line: 2416
 # File: src/text.c, line: 2416
-#: src/text.c:3030
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%s %lu mots,  %ld lignes, %lu caractères"
@@ -3291,16 +3629,27 @@ msgstr "%s %lu mots,  %ld lignes, %lu caractères"
 #
 # File: src/text.c, line: 2417
 # File: src/text.c, line: 2417
-#: src/text.c:3031
+#: src/text.c:3439
 msgid "In Selection:  "
 msgstr "Contenu de la sélection : "
 
 #
+# File: src/global.c, line: 673
+# File: src/text.c, line: 2431
+# File: src/global.c, line: 673
+# File: src/text.c, line: 2431
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3453
+msgid "Verbatim Input"
+msgstr "Entrée telle quelle"
+
+#
 # File: src/utils.c, line: 365
 # File: src/utils.c, line: 377
 # File: src/utils.c, line: 365
 # File: src/utils.c, line: 377
-#: src/utils.c:405 src/utils.c:417
+#: src/utils.c:410 src/utils.c:422
 msgid "nano is out of memory!"
 msgstr "nano n'a plus de mémoire !"
 
@@ -3309,7 +3658,7 @@ msgstr "nano n'a plus de mémoire !"
 # File: src/winio.c, line: 1467
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
-#: src/winio.c:1557
+#: src/winio.c:1583
 msgid "Unicode Input"
 msgstr "Entrée Unicode"
 
@@ -3318,7 +3667,7 @@ msgstr "Entrée Unicode"
 # File: src/winio.c, line: 2007
 # File: src/winio.c, line: 2004
 # File: src/winio.c, line: 2007
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2142 src/winio.c:2146
 msgid "Modified"
 msgstr "Modifié"
 
@@ -3328,28 +3677,36 @@ 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:2150
+#: src/winio.c:2143
 msgid "View"
 msgstr "Voir"
 
 #
 # File: src/winio.c, line: 2018
 # File: src/winio.c, line: 2018
-#: src/winio.c:2164
+#: src/winio.c:2157
 msgid "DIR:"
 msgstr "RÉP. :"
 
 #
 # File: src/winio.c, line: 2025
 # File: src/winio.c, line: 2025
-#: src/winio.c:2171
+#: src/winio.c:2164
 msgid "File:"
 msgstr "Fichier :"
 
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2261
+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."
+
 #
 # File: src/winio.c, line: 3046
 # File: src/winio.c, line: 3046
-#: src/winio.c:3360
+#: src/winio.c:3377
 #, 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%%)"
@@ -3357,69 +3714,70 @@ 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:3492
+#: src/winio.c:3507
 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:3493
+#: src/winio.c:3508
 msgid "version"
 msgstr "version"
 
 #
 # File: src/winio.c, line: 3168
 # File: src/winio.c, line: 3168
-#: src/winio.c:3494
+#: src/winio.c:3509
 msgid "Brought to you by:"
 msgstr "Proposé par :"
 
 #
 # File: src/winio.c, line: 3169
 # File: src/winio.c, line: 3169
-#: src/winio.c:3495
+#: src/winio.c:3510
 msgid "Special thanks to:"
 msgstr "Remerciements particuliers à :"
 
 #
 # File: src/winio.c, line: 3170
 # File: src/winio.c, line: 3170
-#: src/winio.c:3496
+#: src/winio.c:3511
 msgid "The Free Software Foundation"
 msgstr "La Free Software Foundation"
 
+#: src/winio.c:3512
+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:3497
+#: src/winio.c:3513
 msgid "For ncurses:"
 msgstr "Pour ncurses :"
 
 #
 # File: src/winio.c, line: 3172
 # File: src/winio.c, line: 3172
-#: src/winio.c:3498
+#: src/winio.c:3514
 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:3499
+#: src/winio.c:3515
 msgid "Thank you for using nano!"
 msgstr "Merci d'utiliser nano !"
 
-#
-# File: src/files.c, line: 1476
-# File: src/text.c, line: 2315
-# File: src/text.c, line: 2327
-# File: src/files.c, line: 1476
-# File: src/text.c, line: 2315
-# File: src/text.c, line: 2327
-#~ msgid "Error writing backup file %s: File owner mismatch"
+#~ msgid "Internal error: can't match line %ld.  Please save your work."
 #~ msgstr ""
-#~ "Erreur d'écriture de la copie de sécurité %s : propriétaire différent"
+#~ "Erreur interne : pas de correspondance pour la ligne %ld. Sauvez votre "
+#~ "travail."
 
-#~ msgid "line split"
-#~ msgstr "coupure de ligne"
+#
+# File: src/global.c, line: 1318
+# File: src/global.c, line: 1318
+#~ msgid "line wrap"
+#~ msgstr "passage à la ligne"
diff --git a/po/ga.gmo b/po/ga.gmo
index c006617..89f7a8c 100644
--- a/po/ga.gmo
+++ b/po/ga.gmo
diff --git a/po/ga.po b/po/ga.po
index 9f00382..60f8269 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -1,116 +1,141 @@
 # Irish translations for nano.
 # Copyright (C) 2006 Free Software Foundation, Inc.
 # This file is distributed under the same license as the nano package.
-# Kevin Patrick Scannell <scannell@SLU.EDU>, 2006, 2008.
 #
+# Kevin Patrick Scannell <scannell@SLU.EDU>, 2006, 2008.
 msgid ""
 msgstr ""
 "Project-Id-Version: nano 2.1.7pre1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-22 06:34-0500\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\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"
+"Language: ga\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "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:220
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:203
 msgid "Go To Directory"
 msgstr "Téigh go Comhadlann"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:860 src/files.c:2048
-#: src/nano.c:1060 src/search.c:220 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Cealaithe"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:246 src/browser.c:293
 #, c-format
 msgid "Can't go outside of %s in restricted mode"
 msgstr "Ní féidir %s a fhágáil sa mhód teoranta"
 
-#: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:722
-#: src/files.c:731 src/files.c:1540 src/files.c:1659 src/files.c:1711
-#: src/files.c:1732 src/files.c:1855 src/files.c:2691 src/rcfile.c:568
-#: src/rcfile.c:1204
+#: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
+#: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
+#: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Earráid agus %s á léamh: %s"
 
-#: src/browser.c:303
+#: src/browser.c:283
 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:665 src/browser.c:674
+#: src/browser.c:626 src/browser.c:635
 msgid "(dir)"
 msgstr "cmhdlnn"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:632
 msgid "(parent dir)"
 msgstr "téigh suas"
 
-#: src/browser.c:801 src/search.c:185
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "Cuardaigh"
 
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:805 src/search.c:189
-msgid " [Case Sensitive]"
-msgstr " [Cásíogair]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:811 src/search.c:195
-msgid " [Regexp]"
-msgstr " [Slonn]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:817 src/search.c:201
-msgid " [Backwards]"
-msgstr " [Siar]"
-
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "Thimfhill an Cuardach"
 
-#: src/browser.c:1006 src/browser.c:1039 src/search.c:514 src/search.c:517
-#: src/search.c:574 src/search.c:577
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "Níor aimsíodh an patrún in aon áit eile"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr "Níl patrún cuardaigh ann faoi láthair"
 
-#: src/files.c:125
+#: src/files.c:139
+msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
+msgstr ""
+
+#: src/files.c:145
+#, 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:165 src/files.c:175 src/files.c:212 src/files.c:222
+#, fuzzy, c-format
+msgid "Error writing lock file %s: %s"
+msgstr "Earráid agus comhad cúltaca %s á scríobh: %s"
+
+#: src/files.c:237
+#, fuzzy, c-format
+msgid "Error deleting lock file %s: %s"
+msgstr "Earráid agus comhad cúltaca %s á scríobh: %s"
+
+#: src/files.c:272
+#, fuzzy, c-format
+msgid "Error opening lock file %s: %s"
+msgstr "Earráid agus comhad cúltaca %s á scríobh: %s"
+
+#: src/files.c:282
+#, 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:297
+#, c-format
+msgid "File %s is being edited (by %s with %s, PID %d); continue?"
+msgstr ""
+
+#: src/files.c:308
+#, fuzzy, c-format
+msgid "Error writing lock file: Directory '%s' doesn't exist"
+msgstr "Earráid agus comhad cúltaca %s á scríobh: %s"
+
+#: src/files.c:339
 #, 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:234
+#: src/files.c:467
 msgid "No more open file buffers"
 msgstr "Níl aon mhaoláin oscailte fágtha"
 
-#: src/files.c:250
+#: src/files.c:484
 #, c-format
 msgid "Switched to %s"
 msgstr "Athraithe go %s"
 
-#: src/files.c:251 src/global.c:469 src/winio.c:2168
+#: src/files.c:485 src/global.c:953 src/winio.c:2161
 msgid "New Buffer"
 msgstr "Maolán Nua"
 
-#: src/files.c:633
+#: src/files.c:874
 #, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
@@ -120,7 +145,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:638
+#: src/files.c:879
 #, fuzzy, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
@@ -134,7 +159,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:644
+#: src/files.c:885
 #, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
@@ -144,7 +169,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:648
+#: src/files.c:889
 #, fuzzy, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
@@ -156,7 +181,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:654
+#: src/files.c:895
 #, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
@@ -166,7 +191,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:658
+#: src/files.c:899
 #, fuzzy, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
@@ -178,7 +203,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:664
+#: src/files.c:905
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
@@ -188,7 +213,7 @@ msgstr[2] "Léadh %lu líne"
 msgstr[3] "Léadh %lu líne"
 msgstr[4] "Léadh %lu líne"
 
-#: src/files.c:667
+#: src/files.c:908
 #, c-format
 msgid "Read %lu line ( Warning: No write permission)"
 msgid_plural "Read %lu lines (Warning: No write permission)"
@@ -198,87 +223,93 @@ msgstr[2] ""
 msgstr[3] ""
 msgstr[4] ""
 
-#: src/files.c:700 src/files.c:736
+#: src/files.c:943 src/files.c:980
 msgid "Reading File"
 msgstr "Comhad á Léamh"
 
-#: src/files.c:706
+#: src/files.c:950
 msgid "New File"
 msgstr "Comhad Nua"
 
-#: src/files.c:709
+#: src/files.c:953
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" gan aimsiú"
 
-#: src/files.c:717 src/rcfile.c:559 src/rcfile.c:1154 src/rcfile.c:1195
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "Is comhadlann é \"%s\""
 
-#: src/files.c:718 src/rcfile.c:560 src/rcfile.c:1155 src/rcfile.c:1196
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "Is comhad gléis é \"%s\""
 
-#: src/files.c:817
+#: src/files.c:1060
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Ordú le rith i maolán nua [ó %s] "
 
-#: src/files.c:819
+#: src/files.c:1062
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Ordú le rith [ó %s]"
 
-#: src/files.c:825
+#: src/files.c:1069
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Comhad le hionsá i maolán nua [ó %s] "
 
-#: src/files.c:827
+#: src/files.c:1071
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Comhad le hionsá [ó %s]"
 
-#: src/files.c:1077
+#: src/files.c:1320
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Eochair neamhcheadaithe mura bhfuiltear i mód ilmhaoláin"
 
-#: src/files.c:1486
+#: src/files.c:1622
+msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+msgstr ""
+
+#: src/files.c:1746
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Ní féidir scríobh lasmuigh de %s"
 
-#: src/files.c:1501
+#: src/files.c:1761
 msgid "Cannot prepend or append to a symlink with --nofollow set"
 msgstr ""
 "Ní féidir réamhcheangal nó iarcheangal le nasc siombalach nuair atá --"
 "nofollow socraithe"
 
-#: src/files.c:1581 src/files.c:1603 src/files.c:1621 src/files.c:1632
-#: src/files.c:1640 src/files.c:1667
+#: src/files.c:1843 src/files.c:1868 src/files.c:1886 src/files.c:1899
+#: src/files.c:1910 src/files.c:1939
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Earráid agus comhad cúltaca %s á scríobh: %s"
 
-#: src/files.c:1582 src/nano.c:701
+#: src/files.c:1844 src/nano.c:719
 msgid "Too many backup files?"
 msgstr "An iomarca comhad cúltaca?"
 
-#: src/files.c:1687 src/files.c:1744 src/files.c:1763 src/files.c:1775
-#: src/files.c:1799 src/files.c:1817 src/files.c:1827 src/files.c:1863
-#: src/files.c:1868 src/files.c:2764 src/files.c:2773
+#: src/files.c:1959 src/files.c:2016 src/files.c:2035 src/files.c:2047
+#: src/files.c:2071 src/files.c:2089 src/files.c:2099 src/files.c:2135
+#: src/files.c:2140 src/files.c:3101 src/files.c:3110 src/files.c:3133
+#: src/files.c:3145
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Earráid agus %s á scríobh: %s"
 
-#: src/files.c:1721 src/text.c:2929 src/text.c:2941
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Earráid agus comhad sealadach á scríobh: %s"
 
-#: src/files.c:1900
+#: src/files.c:2173
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
@@ -288,377 +319,332 @@ msgstr[2] "Scríobhadh %lu líne"
 msgstr[3] "Scríobhadh %lu líne"
 msgstr[4] "Scríobhadh %lu líne"
 
-#: src/files.c:2004
+#: src/files.c:2278
 msgid " [DOS Format]"
 msgstr " [Formáid DOS]"
 
-#: src/files.c:2005
+#: src/files.c:2279
 msgid " [Mac Format]"
 msgstr " [Formáid Mac]"
 
-#: src/files.c:2007
+#: src/files.c:2281
 msgid " [Backup]"
 msgstr " [Cúltaca]"
 
-#: src/files.c:2015
+#: src/files.c:2289
 msgid "Prepend Selection to File"
 msgstr "Réamhcheangail an Roghnúchán le Comhad"
 
-#: src/files.c:2016
+#: src/files.c:2290
 msgid "Append Selection to File"
 msgstr "Iarcheangail an Roghnúchán le Comhad"
 
-#: src/files.c:2017
+#: src/files.c:2291
 msgid "Write Selection to File"
 msgstr "Scríobh an Roghnúchán i gComhad"
 
-#: src/files.c:2020
+#: src/files.c:2294
 msgid "File Name to Prepend to"
 msgstr "Comhad is mian leat Réamhcheangal leis"
 
-#: src/files.c:2021
+#: src/files.c:2295
 msgid "File Name to Append to"
 msgstr "Comhad is mian leat Iarcheangal leis"
 
-#: src/files.c:2022
+#: src/files.c:2296
 msgid "File Name to Write"
 msgstr "Ainm Comhaid le Scríobh"
 
-#: src/files.c:2153
+#: src/files.c:2427
 msgid "File exists, OVERWRITE ? "
 msgstr "Tá an comhad ann; FORSCRÍOBH ? "
 
-#: src/files.c:2162
+#: src/files.c:2436
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "Sábháil an comhad le hAINM DIFRIÚIL ? "
 
-#: src/files.c:2173
+#: src/files.c:2450
 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:2611
+#: src/files.c:2882
 msgid "(more)"
 msgstr "(tuilleadh)"
 
-#: src/files.c:2694 src/rcfile.c:1220
-#, c-format
+#: src/files.c:2974
+#, fuzzy, c-format
 msgid ""
 "\n"
-"Press Enter to continue starting nano.\n"
+"Press Enter to continue\n"
 msgstr ""
 "\n"
 "Brúigh \"Enter\" chun dul ar aghaidh le tosú nano.\n"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:415 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Cealaigh"
-
-#: src/global.c:416
-msgid "Replace"
-msgstr "Ionadaigh"
+#: src/files.c:2989
+#, c-format
+msgid ""
+"Unable to create directory %s: %s\n"
+"It is required for saving/loading search history or cursor positions.\n"
+msgstr ""
 
-#: src/global.c:417
-msgid "No Replace"
-msgstr "Gan Ionadú"
+#: src/files.c:2995
+#, 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/global.c:420
-msgid "Case Sens"
-msgstr "Cásíogair"
+#: src/files.c:3012
+#, 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/global.c:421
-msgid "Backwards"
-msgstr "Siar"
+#: src/files.c:3016
+#, 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 ""
 
-#: src/global.c:425
-msgid "Regexp"
-msgstr "Slonn"
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
+#: src/global.c:477
+msgid "Exit"
+msgstr "Scoir"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:451
-msgid "PrevHstory"
-msgstr "StairArAis"
+# 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:478
+msgid "Close"
+msgstr "Dún"
 
-#: src/global.c:452
-msgid "NextHstory"
-msgstr "StairArAghaidh"
+#: src/global.c:479
+#, fuzzy
+msgid "Uncut Text"
+msgstr "DíGhearr Téacs"
 
-#: src/global.c:453
-msgid "Go To Text"
-msgstr "Téigh Go Téacs"
+#: src/global.c:481
+#, fuzzy
+msgid "Unjustify"
+msgstr "DíComhfhdú"
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:455
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:485
 msgid "WhereIs Next"
 msgstr "Cuardaigh Arís"
 
-#: src/global.c:457
-msgid "First File"
-msgstr "An Chéad Chomhad"
-
-#: src/global.c:458
-msgid "Last File"
-msgstr "Comhad Deiridh"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:460
-msgid "To Files"
-msgstr "Go Comhaid"
-
-#: src/global.c:462
-msgid "DOS Format"
-msgstr "Formáid DOS"
-
-#: src/global.c:463
-msgid "Mac Format"
-msgstr "Formáid Mac"
-
-#: src/global.c:464
-msgid "Append"
-msgstr "Iarcheangail"
-
-#: src/global.c:465
-msgid "Prepend"
-msgstr "Réamhcheangail"
-
-#: src/global.c:466
-msgid "Backup File"
-msgstr "Comhad Cúltaca"
-
-#: src/global.c:467
-msgid "Execute Command"
-msgstr "Rith Ordú"
-
-#: src/global.c:471
-msgid "Go To Dir"
-msgstr "Téigh i gComhadlann"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:480
-msgid "Get Help"
-msgstr "Cabhair"
-
-#: src/global.c:481
-msgid "Exit"
-msgstr "Scoir"
-
-#: src/global.c:482
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:492
 msgid "Where Is"
 msgstr "Cuardach"
 
-# main menu - keep short?
-#: src/global.c:483
-msgid "Prev Page"
-msgstr "Ar Ais"
-
-# main menu - keep short?
-#: src/global.c:484
-msgid "Next Page"
-msgstr "Ar Aghaidh"
-
-#: src/global.c:485
-msgid "First Line"
-msgstr "An Chéad Líne"
+#: src/global.c:493
+msgid "Replace"
+msgstr "Ionadaigh"
 
-#: src/global.c:486
-msgid "Last Line"
-msgstr "Líne Dheiridh"
+#: src/global.c:494
+msgid "Go To Line"
+msgstr "Téigh Go Líne"
 
-#: src/global.c:487
-msgid "Suspend"
-msgstr "Cuir ar Fionraí"
+#: src/global.c:495
+msgid "Prev Line"
+msgstr "An Líne Roimhe Seo"
 
-#: src/global.c:489
-msgid "Beg of Par"
-msgstr "Barr an Ailt"
+#: src/global.c:496
+msgid "Next Line"
+msgstr "An Chéad Líne Eile"
 
-#: src/global.c:490
-msgid "End of Par"
-msgstr "Bun an Ailt"
+#: src/global.c:497
+msgid "Read File"
+msgstr "Léigh"
 
-#: src/global.c:491
+#: src/global.c:499
 msgid "FullJstify"
 msgstr "LánComhfhadú"
 
-#: src/global.c:493
+#: src/global.c:501
 msgid "Refresh"
 msgstr "Athnuaigh"
 
-#: src/global.c:495
-msgid "Insert File"
-msgstr "Ionsáigh Comhad"
-
-#: src/global.c:497
-msgid "Go To Line"
-msgstr "Téigh Go Líne"
-
-#: src/global.c:500
+#. 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:507
 msgid "Justify the current paragraph"
 msgstr "Comhfhadaigh an t-alt reatha"
 
-#. 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:505
+#: src/global.c:509
 msgid "Cancel the current function"
 msgstr "Cealaigh an fheidhm reatha"
 
-#: src/global.c:506
+#: src/global.c:510
 msgid "Display this help text"
 msgstr "Taispeáin an chabhair seo"
 
-#: src/global.c:509
+#: src/global.c:513
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Dún an maolán reatha / Scoir nano"
 
-#: src/global.c:511
+#: src/global.c:515
 msgid "Exit from nano"
 msgstr "Scoir nano"
 
-#: src/global.c:515
+#: src/global.c:519
 msgid "Write the current file to disk"
 msgstr "Scríobh an comhad reatha ar an diosca"
 
-#: src/global.c:517
+#: src/global.c:521
 msgid "Insert another file into the current one"
 msgstr "Ionsáigh comhad eile isteach sa cheann reatha"
 
-#: src/global.c:519
+#: src/global.c:523
 msgid "Search for a string or a regular expression"
 msgstr "Cuardach ar theaghrán nó slonn ionadaíochta"
 
-#: src/global.c:520
-msgid "Go to previous screen"
-msgstr "Téigh chuig an scáileán roimhe seo"
+#: src/global.c:526
+#, fuzzy
+msgid "Search for a string"
+msgstr "Cuardach ar theaghrán nó slonn ionadaíochta"
 
-#: src/global.c:521
-msgid "Go to next screen"
+#: src/global.c:528
+#, fuzzy
+msgid "Go one screenful up"
 msgstr "Téigh chuig an chéad scáileán eile"
 
-#: src/global.c:523
+#: src/global.c:529
+#, fuzzy
+msgid "Go one screenful down"
+msgstr "Téigh chuig an chéad scáileán eile"
+
+#: src/global.c:531
 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:525
+#: src/global.c:533
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Greamaigh ón mhaolán gearrtha isteach sa líne reatha"
 
-#: src/global.c:527
+#: src/global.c:534
 msgid "Display the position of the cursor"
 msgstr "Taispeáin ionad an chúrsóra"
 
-#: src/global.c:529
+#: src/global.c:536
 msgid "Invoke the spell checker, if available"
 msgstr "Rith an litreoir, má tá sé ar fáil"
 
-#: src/global.c:531
+#: src/global.c:538
 msgid "Replace a string or a regular expression"
 msgstr "Ionadaigh teaghrán nó slonn ionadaíochta"
 
-#: src/global.c:532
+#: src/global.c:539
 msgid "Go to line and column number"
 msgstr "Téigh go dtí an líne agus an colún sonraithe"
 
-#: src/global.c:534
-msgid "Mark text at the cursor position"
+#: src/global.c:541
+#, fuzzy
+msgid "Mark text starting from the cursor position"
 msgstr "Marcáil téacs ag ionad an chúrsóra"
 
-#: src/global.c:535
-msgid "Repeat last search"
+#: src/global.c:542
+#, fuzzy
+msgid "Repeat the last search"
 msgstr "An cuardach céanna arís"
 
-#: src/global.c:537
+#: src/global.c:544
 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:538
+#: src/global.c:545
 msgid "Indent the current line"
 msgstr "Eangaigh an líne reatha"
 
-#: src/global.c:539
+#: src/global.c:546
 msgid "Unindent the current line"
 msgstr "Dí-eangaigh an líne reatha"
 
-#: src/global.c:540
+#: src/global.c:547
 msgid "Undo the last operation"
 msgstr "Cealaigh an oibríocht is déanaí"
 
-#: src/global.c:541
+#: src/global.c:548
 msgid "Redo the last undone operation"
 msgstr "Athdhéan an oibríocht is déanaí a cealaíodh"
 
-#: src/global.c:543
+#: src/global.c:550
 msgid "Go forward one character"
 msgstr "Ar aghaidh carachtar amháin"
 
-#: src/global.c:544
+#: src/global.c:551
 msgid "Go back one character"
 msgstr "Carachtar amháin siar"
 
-#: src/global.c:546
+#: src/global.c:553
 msgid "Go forward one word"
 msgstr "Téigh ar aghaidh focal amháin"
 
-#: src/global.c:547
+#: src/global.c:554
 msgid "Go back one word"
 msgstr "Téigh siar focal amháin"
 
-#: src/global.c:549
+#: src/global.c:556
 msgid "Go to previous line"
 msgstr "Téigh go dtí an líne roimhe seo"
 
-#: src/global.c:550
+#: src/global.c:557
 msgid "Go to next line"
 msgstr "Téigh go dtí an chéad líne eile"
 
-#: src/global.c:551
+#: src/global.c:558
 msgid "Go to beginning of current line"
 msgstr "Téigh go tosach na líne reatha"
 
-#: src/global.c:552
+#: src/global.c:559
 msgid "Go to end of current line"
 msgstr "Téigh go deireadh na líne reatha"
 
-#: src/global.c:555
+#: src/global.c:562
 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:557
+#: src/global.c:564
 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:560
+#: src/global.c:566
 msgid "Go to the first line of the file"
 msgstr "Téigh go dtí an chéad líne sa chomhad"
 
-#: src/global.c:562
+#: src/global.c:567
 msgid "Go to the last line of the file"
 msgstr "Téigh go dtí an líne dheiridh sa chomhad"
 
-#: src/global.c:564
+#: src/global.c:569
 msgid "Go to the matching bracket"
 msgstr "Téigh go dtí an lúibín comhoiriúnach"
 
-#: src/global.c:566
+#: src/global.c:571
 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:568
+#: src/global.c:573
 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:572
+#: src/global.c:576
 msgid "Switch to the previous file buffer"
 msgstr "Athraigh go dtí an maolán roimhe seo"
 
-#: src/global.c:574
+#: src/global.c:577
 msgid "Switch to the next file buffer"
 msgstr "Athraigh go dtí an chéad mhaolán eile"
 
-#: src/global.c:577
+#: src/global.c:579
 msgid "Insert the next keystroke verbatim"
 msgstr "Ionsáigh an chéad charachtar eile go litriúil"
 
-#: src/global.c:579
+#: src/global.c:580
 msgid "Insert a tab at the cursor position"
 msgstr "Ionsáigh táb ag an gcúrsóir"
 
@@ -666,336 +652,452 @@ msgstr "Ionsáigh táb ag an gcúrsóir"
 msgid "Insert a newline at the cursor position"
 msgstr "Ionsáigh líne nua ag an gcúrsóir"
 
-#: src/global.c:583
+#: src/global.c:582
 msgid "Delete the character under the cursor"
 msgstr "Scrios an carachtar faoin chúrsóir"
 
-#: src/global.c:585
+#: src/global.c:584
 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:588
+#: src/global.c:587
 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:591
+#: src/global.c:590
 msgid "Justify the entire file"
 msgstr "Comhfhadaigh an comhad iomlán"
 
-#: src/global.c:595
+#: src/global.c:594
 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:598
+#: src/global.c:597
 msgid "Refresh (redraw) the current screen"
 msgstr "Athnuaigh (ataispeáin) an scáileán reatha"
 
-#: src/global.c:600
+#: src/global.c:599
 msgid "Suspend the editor (if suspend is enabled)"
 msgstr "Cuir an t-eagarthóir ar fionraí (más féidir)"
 
-#: src/global.c:603
+#: src/global.c:602
 msgid "Toggle the case sensitivity of the search"
 msgstr "Scoránaigh cásíogaireacht"
 
-#: src/global.c:605
+#: src/global.c:604
 msgid "Reverse the direction of the search"
 msgstr "Scoránaigh treo an chuardaigh"
 
-#: src/global.c:609
+#: src/global.c:608
 msgid "Toggle the use of regular expressions"
 msgstr "Scoránaigh úsáid de shloinn ionadaíochta"
 
-#: src/global.c:613
+#: src/global.c:612
 msgid "Recall the previous search/replace string"
 msgstr "Athghair an teaghrán cuardaigh roimhe seo"
 
-#: src/global.c:615
+#: src/global.c:614
 msgid "Recall the next search/replace string"
 msgstr "Athghair an chéad teaghrán cuardaigh eile"
 
-#: src/global.c:618
+#: src/global.c:617
 msgid "Go to file browser"
 msgstr "Téigh go brabhsálaí na gcomhad"
 
-#: src/global.c:621
+#: src/global.c:620
 msgid "Toggle the use of DOS format"
 msgstr "Scoránaigh úsáid d'fhormáid DOS"
 
-#: src/global.c:622
+#: src/global.c:621
 msgid "Toggle the use of Mac format"
 msgstr "Scoránaigh úsáid d'fhormáid Mac"
 
-#: src/global.c:624
+#: src/global.c:622
 msgid "Toggle appending"
 msgstr "Scoránaigh iarcheangal"
 
-#: src/global.c:625
+#: src/global.c:623
 msgid "Toggle prepending"
 msgstr "Scoránaigh réamhcheangal"
 
-#: src/global.c:628
+#: src/global.c:624
 msgid "Toggle backing up of the original file"
 msgstr "Scoránaigh cúltacaí"
 
-#: src/global.c:629
+#: src/global.c:625
 msgid "Execute external command"
 msgstr "Rith ordú seachtrach"
 
-#: src/global.c:633
+#: src/global.c:628
 msgid "Toggle the use of a new buffer"
 msgstr "Scoránaigh úsáid de mhaolán nua"
 
-#: src/global.c:636
+#: src/global.c:631
 msgid "Exit from the file browser"
 msgstr "Scoir brabhsálaí na gcomhad"
 
-#: src/global.c:638
+#: src/global.c:632
 msgid "Go to the first file in the list"
 msgstr "Téigh go dtí an chéad chomhad sa liosta"
 
-#: src/global.c:640
+#: src/global.c:633
 msgid "Go to the last file in the list"
 msgstr "Téigh go dtí an comhad deiridh sa liosta"
 
-#: src/global.c:641
+#: src/global.c:634
+#, fuzzy
+msgid "Go to the previous file in the list"
+msgstr "Téigh go dtí an chéad chomhad sa liosta"
+
+#: src/global.c:635
 #, fuzzy
 msgid "Go to the next file in the list"
 msgstr "Téigh go dtí an comhad deiridh sa liosta"
 
+#: src/global.c:636
+msgid "Go to directory"
+msgstr "Téigh go comhadlann"
+
+#: src/global.c:639
+#, fuzzy
+msgid "Invoke the linter, if available"
+msgstr "Rith an litreoir, má tá sé ar fáil"
+
+#: src/global.c:640
+#, fuzzy
+msgid "Go to previous linter msg"
+msgstr "Téigh go dtí an líne roimhe seo"
+
+#: src/global.c:641
+#, fuzzy
+msgid "Go to next linter msg"
+msgstr "Téigh go dtí an chéad líne eile"
+
 #: src/global.c:642
 #, fuzzy
-msgid "Go to the previous file in the list"
-msgstr "Téigh go dtí an chéad chomhad sa liosta"
+msgid "Invoke formatter, if available"
+msgstr "Rith an litreoir, má tá sé ar fáil"
 
-#: src/global.c:643
-msgid "Go to directory"
-msgstr "Téigh go comhadlann"
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:662
+msgid "Get Help"
+msgstr "Cabhair"
 
-# 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
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:670
-msgid "Close"
-msgstr "Dún"
+#: src/global.c:665 src/prompt.c:1084
+msgid "Cancel"
+msgstr "Cealaigh"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:679
-msgid "WriteOut"
+#: src/global.c:678
+#, fuzzy
+msgid "Write Out"
 msgstr "Scríobh"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:704
+msgid "Go To Dir"
+msgstr "Téigh i gComhadlann"
+
+#: src/global.c:719
+msgid "Cut Text"
+msgstr "Gearr"
+
+#: src/global.c:728
 msgid "Justify"
 msgstr "Comhfhadú"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:696
-msgid "Read File"
-msgstr "Léigh"
+#: src/global.c:733
+msgid "To Spell"
+msgstr "Litreoir"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:713
-msgid "Cut Text"
-msgstr "Gearr"
+#: src/global.c:738
+#, fuzzy
+msgid "To Linter"
+msgstr "Téigh Go Líne"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:718
-msgid "UnJustify"
-msgstr "DíComhfhdú"
+#: src/global.c:740
+#, fuzzy
+msgid "Formatter"
+msgstr "Formáid DOS"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:723
-msgid "UnCut Text"
-msgstr "DíGhearr Téacs"
+#: src/global.c:745
+msgid "Case Sens"
+msgstr "Cásíogair"
+
+#: src/global.c:750
+msgid "Regexp"
+msgstr "Slonn"
+
+#: src/global.c:755
+msgid "Backwards"
+msgstr "Siar"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:728 src/global.c:755
+#: src/global.c:762
+msgid "No Replace"
+msgstr "Gan Ionadú"
+
+#: src/global.c:770
 msgid "Cur Pos"
 msgstr "Cúrsóir"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:737
-msgid "To Spell"
-msgstr "Litreoir"
+# main menu - keep short?
+#: src/global.c:780
+msgid "Prev Page"
+msgstr "Ar Ais"
 
-#: src/global.c:771
+# main menu - keep short?
+#: src/global.c:782
+msgid "Next Page"
+msgstr "Ar Aghaidh"
+
+#: src/global.c:785
+msgid "First Line"
+msgstr "An Chéad Líne"
+
+#: src/global.c:787
+msgid "Last Line"
+msgstr "Líne Dheiridh"
+
+#: src/global.c:794
+#, fuzzy
+msgid "To Bracket"
+msgstr "Ní lúibín é"
+
+#: src/global.c:797
 msgid "Mark Text"
 msgstr "Marcáil Téacs"
 
-#: src/global.c:777
+#: src/global.c:800
 msgid "Copy Text"
 msgstr "Cóipeáil Téacs"
 
-#: src/global.c:780
+#: src/global.c:803
 msgid "Indent Text"
 msgstr "Eangaigh Téacs"
 
-#: src/global.c:783
+#: src/global.c:805
 msgid "Unindent Text"
 msgstr "Dí-eangaigh Téacs"
 
-#: src/global.c:787
+#: src/global.c:808
 msgid "Undo"
 msgstr "Cealaigh"
 
-#: src/global.c:790
+#: src/global.c:810
 msgid "Redo"
 msgstr "Athdhéan"
 
-#: src/global.c:796 src/global.c:800
-msgid "Forward"
-msgstr "Ar Aghaidh"
-
-#: src/global.c:806 src/global.c:810
+#: src/global.c:814 src/global.c:820
 msgid "Back"
 msgstr "Siar"
 
-#: src/global.c:817
-msgid "Next Word"
-msgstr "An Chéad Fhocal Eile"
+#: src/global.c:816 src/global.c:822
+msgid "Forward"
+msgstr "Ar Aghaidh"
 
-#: src/global.c:820
+#: src/global.c:827
 msgid "Prev Word"
 msgstr "An Focal Roimhe Seo"
 
-#: src/global.c:824
-msgid "Prev Line"
-msgstr "An Líne Roimhe Seo"
-
-#: src/global.c:827
-msgid "Next Line"
-msgstr "An Chéad Líne Eile"
+#: src/global.c:829
+msgid "Next Word"
+msgstr "An Chéad Fhocal Eile"
 
-#: src/global.c:830
+#: src/global.c:833
 msgid "Home"
 msgstr "Baile"
 
-#: src/global.c:833
+#: src/global.c:835
 msgid "End"
 msgstr "Deireadh"
 
-#: src/global.c:845
-msgid "Find Other Bracket"
-msgstr "Aimsigh an Lúibín Eile"
+#: src/global.c:844
+msgid "Beg of Par"
+msgstr "Barr an Ailt"
+
+#: src/global.c:846
+msgid "End of Par"
+msgstr "Bun an Ailt"
 
-#: src/global.c:848
+#: src/global.c:851
 msgid "Scroll Up"
 msgstr "Scrollaigh Suas"
 
-#: src/global.c:851
+#: src/global.c:853
 msgid "Scroll Down"
 msgstr "Scrollaigh Síos"
 
-#: src/global.c:856
-msgid "Previous File"
+#: src/global.c:858
+#, fuzzy
+msgid "Prev File"
 msgstr "An Comhad Roimhe Seo"
 
-#: src/global.c:858
+#: src/global.c:860
 msgid "Next File"
 msgstr "An Chéad Chomhad Eile"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:862 src/text.c:3045
-msgid "Verbatim Input"
+#: src/global.c:869
+#, fuzzy
+msgid "Verbatim"
 msgstr "Ionchur Litriúil"
 
-#: src/global.c:867
+#: src/global.c:872
 msgid "Tab"
 msgstr "Táb"
 
-#: src/global.c:870
+#: src/global.c:874
 msgid "Enter"
 msgstr "Iontráil"
 
-#: src/global.c:873
+#: src/global.c:876
 msgid "Delete"
 msgstr "Scrios"
 
-#: src/global.c:876
+#: src/global.c:878
 msgid "Backspace"
 msgstr "Cúlspás"
 
-#: src/global.c:893
+#: src/global.c:888
 msgid "CutTillEnd"
 msgstr "GearrGoBun"
 
-#: src/global.c:906
+#: src/global.c:898
 msgid "Word Count"
 msgstr "Líon na bhFocal"
 
-#: src/global.c:1367
+#: src/global.c:905
+msgid "Suspend"
+msgstr "Cuir ar Fionraí"
+
+#: src/global.c:910
+msgid "PrevHstory"
+msgstr "StairArAis"
+
+#: src/global.c:913
+msgid "NextHstory"
+msgstr "StairArAghaidh"
+
+#: src/global.c:917
+msgid "Go To Text"
+msgstr "Téigh Go Téacs"
+
+#: src/global.c:928
+msgid "DOS Format"
+msgstr "Formáid DOS"
+
+#: src/global.c:931
+msgid "Mac Format"
+msgstr "Formáid Mac"
+
+#: src/global.c:934
+msgid "Append"
+msgstr "Iarcheangail"
+
+#: src/global.c:936
+msgid "Prepend"
+msgstr "Réamhcheangail"
+
+#: src/global.c:939
+msgid "Backup File"
+msgstr "Comhad Cúltaca"
+
+#: src/global.c:946
+msgid "Execute Command"
+msgstr "Rith Ordú"
+
+#: src/global.c:961
+msgid "To Files"
+msgstr "Go Comhaid"
+
+#: src/global.c:964
+msgid "First File"
+msgstr "An Chéad Chomhad"
+
+#: src/global.c:966
+msgid "Last File"
+msgstr "Comhad Deiridh"
+
+#: src/global.c:977
+#, fuzzy
+msgid "Prev Lint Msg"
+msgstr "An Líne Roimhe Seo"
+
+#: src/global.c:979
+#, 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:1227
 msgid "Help mode"
 msgstr "Mód cabhrach"
 
-#: src/global.c:1369
+#: src/global.c:1229
 msgid "Constant cursor position display"
 msgstr "Taispeáin ionad an chúrsóra i gcónaí"
 
-#: src/global.c:1371
+#: src/global.c:1231
 msgid "Use of one more line for editing"
 msgstr "Úsáid líne amháin eile le haghaidh eagarthóireachta"
 
-#: src/global.c:1373
+#: src/global.c:1233
 msgid "Smooth scrolling"
 msgstr "Mínscrollú"
 
-#: src/global.c:1375
+#: src/global.c:1235
+#, fuzzy
+msgid "Soft wrapping of overlong lines"
+msgstr "Ná timfhill línte fada"
+
+#: src/global.c:1237
 msgid "Whitespace display"
 msgstr "Taispeáint spáis bháin"
 
-#: src/global.c:1377
+#: src/global.c:1239
 msgid "Color syntax highlighting"
 msgstr "Aibhsiú comhréire le dathanna"
 
-#: src/global.c:1379
+#: src/global.c:1241
 msgid "Smart home key"
 msgstr "Eochair bhaile chliste"
 
-#: src/global.c:1381
+#: src/global.c:1243
 msgid "Auto indent"
 msgstr "Uath-eangú"
 
-#: src/global.c:1383
+#: src/global.c:1245
 msgid "Cut to end"
 msgstr "Gearr go dtí an deireadh"
 
-#: src/global.c:1385
-msgid "Long line wrapping"
-msgstr "Timfhilleadh líne"
+#: src/global.c:1247
+#, fuzzy
+msgid "Hard wrapping of overlong lines"
+msgstr "Ná timfhill línte fada"
 
-#: src/global.c:1387
+#: src/global.c:1249
 msgid "Conversion of typed tabs to spaces"
 msgstr "Tiontaigh táib chlóscríofa go spásanna"
 
-#: src/global.c:1389
+#: src/global.c:1251
 msgid "Backup files"
 msgstr "Comhaid chúltaca"
 
-#: src/global.c:1391
+#: src/global.c:1253
 msgid "Multiple file buffers"
 msgstr "Maoláin iomadúla"
 
-#: src/global.c:1393
+#: src/global.c:1255
 msgid "Mouse support"
 msgstr "Tacaíocht luiche"
 
-#: src/global.c:1395
+#: src/global.c:1257
 msgid "No conversion from DOS/Mac format"
 msgstr "Ná tiontaigh ó fhormáid DOS/Mac"
 
-#: src/global.c:1397
+#: src/global.c:1259
 msgid "Suspension"
 msgstr "Cur ar Fionraí"
 
-#: src/global.c:1399
-#, fuzzy
-msgid "Soft line wrapping"
-msgstr "Timfhilleadh líne"
-
-#: src/help.c:236
+#: src/help.c:205
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1017,7 +1119,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:245
+#: src/help.c:214
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1031,7 +1133,7 @@ msgstr ""
 "Tá na heochracha feidhme seo a leanas ar fáil sa mhód Cuardaigh:\n"
 "\n"
 
-#: src/help.c:251
+#: src/help.c:220
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1051,7 +1153,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:260
+#: src/help.c:229
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1074,7 +1176,7 @@ msgstr ""
 "comhad ionsáite  i maolán ar leith (úsáid Meta-< agus > chun bogadh idir "
 "maoláin oscailte).  "
 
-#: src/help.c:269
+#: src/help.c:238
 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"
@@ -1085,7 +1187,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:275
+#: src/help.c:244
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1113,7 +1215,7 @@ msgstr ""
 "Tá na heochracha feidhme seo a leanas ar fáil sa mhód \"Scríobh Comhad\":\n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:258
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1135,7 +1237,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:302
+#: src/help.c:271
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1159,7 +1261,7 @@ msgstr ""
 "cuardach céanna arís.\n"
 "\n"
 
-#: src/help.c:311
+#: src/help.c:280
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1168,7 +1270,7 @@ msgstr ""
 "\":\n"
 "\n"
 
-#: src/help.c:315
+#: src/help.c:284
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1192,7 +1294,7 @@ msgstr ""
 "\":\n"
 "\n"
 
-#: src/help.c:328
+#: src/help.c:297
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1216,7 +1318,7 @@ msgstr ""
 " Tá na heochracha feidhme seo a leanas ar fáil i mód an Litreora:\n"
 "\n"
 
-#: src/help.c:343
+#: src/help.c:312
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1236,7 +1338,7 @@ msgstr ""
 " Tá na heochracha feidhme seo a leanas ar fáil sa mhód \"Rith Ordú\":\n"
 "\n"
 
-#: src/help.c:356
+#: src/help.c:325
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1257,7 +1359,7 @@ 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:366
+#: src/help.c:335
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1275,7 +1377,7 @@ msgstr ""
 "tsiombail Meta (M-), agus is féidir iad féin a iontráil le ceann de Esc, "
 "Alt, nó Meta, ag brath ar shocruithe do mhéarchlár.  "
 
-#: src/help.c:375
+#: src/help.c:344
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1289,15 +1391,15 @@ msgstr ""
 "Taispeántar eochracha malartacha idir lúibíní:\n"
 "\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:376 src/help.c:448
 msgid "enable/disable"
 msgstr "(cumasú/díchumasú)"
 
-#: src/nano.c:587
+#: src/nano.c:601
 msgid "Key invalid in view mode"
 msgstr "Eochair neamhcheadaithe sa mhód amhairc"
 
-#: src/nano.c:695
+#: src/nano.c:713
 #, c-format
 msgid ""
 "\n"
@@ -1306,7 +1408,7 @@ msgstr ""
 "\n"
 "Scríobhadh an maolán i %s\n"
 
-#: src/nano.c:697
+#: src/nano.c:715
 #, c-format
 msgid ""
 "\n"
@@ -1315,7 +1417,7 @@ msgstr ""
 "\n"
 "Níor scríobhadh an maolán i %s: %s\n"
 
-#: src/nano.c:700
+#: src/nano.c:718
 #, c-format
 msgid ""
 "\n"
@@ -1324,11 +1426,11 @@ msgstr ""
 "\n"
 "Níor scríobhadh an maolán: %s\n"
 
-#: src/nano.c:723
+#: src/nano.c:743
 msgid "Window size is too small for nano...\n"
 msgstr "Tá an fhuinneog róbheag le haghaidh nano...\n"
 
-#: src/nano.c:816
+#: src/nano.c:836
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
@@ -1337,253 +1439,262 @@ msgstr ""
 "Úsáid: nano [ROGHANNA] [[+LÍNE,COLÚN] COMHAD]...\n"
 "\n"
 
-#: src/nano.c:819
+#: src/nano.c:839
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Rogha\t\tRogha fhada GNU\t\tMíniú\n"
 
-#: src/nano.c:821
+#: src/nano.c:841
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Rogha\t\tMíniú\n"
 
-#: src/nano.c:824
-msgid "Show this message"
-msgstr "Taispeáin an teachtaireacht seo"
-
-#: src/nano.c:825
+#: src/nano.c:844
 msgid "+LINE,COLUMN"
 msgstr "+LÍNE,COLÚN"
 
-#: src/nano.c:826
+#. TRANSLATORS: The next forty or so strings are option descriptions
+#. * for the --help output.  Try to keep them at most 40 characters.
+#: src/nano.c:847
 msgid "Start at line LINE, column COLUMN"
 msgstr "Tosaigh ag líne LÍNE, colún COLÚN"
 
-#: src/nano.c:828
+#: src/nano.c:849
 msgid "Enable smart home key"
 msgstr "Cumasaigh eochair bhaile chliste"
 
-#: src/nano.c:829
+#: src/nano.c:850
 msgid "Save backups of existing files"
 msgstr "Sábháil cúltacaí de chomhaid atá ann cheana"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "-C <dir>"
 msgstr "-C <comhadlann>"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<comhadlann>"
 
-#: src/nano.c:831
+#: src/nano.c:852
 msgid "Directory for saving unique backup files"
 msgstr "Comhadlann a sábhálfar comhaid uathúla chúltaca inti"
 
-#: src/nano.c:834
+#: src/nano.c:855
 msgid "Use bold instead of reverse video text"
 msgstr "Úsáid cló trom in ionad téacs aisiompaithe"
 
-#: src/nano.c:837
+#: src/nano.c:858
 msgid "Convert typed tabs to spaces"
 msgstr "Tiontaigh táib chlóscríofa go spásanna"
 
-#: src/nano.c:840
+#: src/nano.c:861
 msgid "Enable multiple file buffers"
 msgstr "Cumasaigh maoláin iomadúla"
 
-#: src/nano.c:845
+#: src/nano.c:865
+msgid "Use (vim-style) lock files"
+msgstr ""
+
+#: src/nano.c:869
 msgid "Log & read search/replace string history"
 msgstr "Logáil agus léigh stair na dteaghrán cuardaigh"
 
-#: src/nano.c:848
+#: src/nano.c:873
 msgid "Don't look at nanorc files"
 msgstr "Ná húsáid comhaid nanorc"
 
-#: src/nano.c:851
+#: src/nano.c:876
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Deisigh mearbhall maidir leis an eochaircheap uimhriúil"
 
-#: src/nano.c:853
+#: src/nano.c:878
 msgid "Don't add newlines to the ends of files"
 msgstr "Ná cuir carachtair líne nua ag deireadh comhad"
 
-#: src/nano.c:856
+#: src/nano.c:881
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Ná tiontaigh comhaid ó fhormáid Dos/Mac"
 
-#: src/nano.c:858
+#: src/nano.c:883
 msgid "Use one more line for editing"
 msgstr "Úsáid líne amháin eile le haghaidh eagarthóireachta"
 
-#: src/nano.c:860
+#: src/nano.c:886
+#, fuzzy
+msgid "Log & read location of cursor position"
+msgstr "Ionsáigh táb ag an gcúrsóir"
+
+#: src/nano.c:889
 msgid "-Q <str>"
 msgstr "-Q <teaghrán>"
 
-#: src/nano.c:860
+#: src/nano.c:889
 msgid "--quotestr=<str>"
 msgstr "--quotestr=<teaghrán>"
 
-#: src/nano.c:861
+#: src/nano.c:890
 msgid "Quoting string"
 msgstr "Teaghrán athfhriotail"
 
-#: src/nano.c:863
+#: src/nano.c:892
 msgid "Restricted mode"
 msgstr "Mód teoranta"
 
-#: src/nano.c:866
+#: src/nano.c:895
 msgid "Scroll by line instead of half-screen"
 msgstr "Scrollaigh de réir línte in ionad leathscáileáin"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "-T <#cols>"
 msgstr "-T <#colúin>"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#colúin>"
 
-#: src/nano.c:869
+#: src/nano.c:898
 msgid "Set width of a tab to #cols columns"
 msgstr "Socraigh leithead de tháib a bheith #colúin"
 
-#: src/nano.c:871
+#: src/nano.c:900
 msgid "Do quick statusbar blanking"
 msgstr "Bánaigh an barra stádais go gasta"
 
-#: src/nano.c:874
+#: src/nano.c:903
 msgid "Print version information and exit"
 msgstr "Taispeáin eolas faoin leagan agus scoir"
 
-#: src/nano.c:877
+#: src/nano.c:906
 msgid "Detect word boundaries more accurately"
 msgstr "Braith teorainneacha idir focail i slí níos cruinne"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "-Y <str>"
 msgstr "-Y <teaghrán>"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "--syntax=<str>"
 msgstr "--syntax=<teaghrán>"
 
-#: src/nano.c:881
+#: src/nano.c:910
 msgid "Syntax definition to use for coloring"
 msgstr "Sainmhíniú na comhréire le haghaidh dathaithe"
 
-#: src/nano.c:883
+#: src/nano.c:912
 msgid "Constantly show cursor position"
 msgstr "Taispeáin ionad an chúrsóra i gcónaí"
 
-#: src/nano.c:885
+#: src/nano.c:914
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Deisigh mearbhall idir na heochracha \"Backspace\" agus \"Delete\""
 
-#: src/nano.c:888
+#: src/nano.c:915
+#, fuzzy
+msgid "Show this help text"
+msgstr "Taispeáin an chabhair seo"
+
+#: src/nano.c:918
 msgid "Automatically indent new lines"
 msgstr "Eangaigh línte nua go huathoibríoch"
 
-#: src/nano.c:889
+#: src/nano.c:919
 msgid "Cut from cursor to end of line"
 msgstr "Gearr ón chúrsóir go deireadh na líne"
 
-#: src/nano.c:892
+#: src/nano.c:922
 msgid "Don't follow symbolic links, overwrite"
 msgstr "Ná lean naisc shiombalacha; forscríobh"
 
-#: src/nano.c:894
+#: src/nano.c:924
 msgid "Enable the use of the mouse"
 msgstr "Cumasaigh úsáid na luiche"
 
-#: src/nano.c:897
+#: src/nano.c:926
+msgid "Do not read the file (only write it)"
+msgstr ""
+
+#: src/nano.c:928
 msgid "-o <dir>"
 msgstr "-o <comhadlann>"
 
-#: src/nano.c:897
+#: src/nano.c:928
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<comhadlann>"
 
-#: src/nano.c:898
+#: src/nano.c:929
 msgid "Set operating directory"
 msgstr "Socraigh an chomhadlann oibre"
 
-#: src/nano.c:901
+#: src/nano.c:932
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Caomhnaigh eochracha XON (^Q) agus XOFF (^S)"
 
-#: src/nano.c:903
+#: src/nano.c:935
 msgid "Silently ignore startup issues like rc file errors"
 msgstr ""
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "-r <#cols>"
 msgstr "-r <#colúin>"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "--fill=<#cols>"
 msgstr "--fill=<#colúin>"
 
-#: src/nano.c:906
-msgid "Set wrapping point at column #cols"
+#: src/nano.c:939
+#, fuzzy
+msgid "Set hard-wrapping point at column #cols"
 msgstr "Socraigh timfhilleadh ag #colúin colún"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "-s <prog>"
 msgstr "-s <clár>"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "--speller=<prog>"
 msgstr "--speller=<clár>"
 
-#: src/nano.c:910
+#: src/nano.c:943
 msgid "Enable alternate speller"
 msgstr "Cumasaigh litreoir malartach"
 
-#: src/nano.c:913
+#: src/nano.c:946
 msgid "Auto save on exit, don't prompt"
 msgstr "Sábháil go huathoibríoch ag am scortha; ná fiafraigh díom"
 
-#: src/nano.c:915
-msgid "Allow generic undo [EXPERIMENTAL]"
-msgstr ""
-
-#: src/nano.c:918
+#: src/nano.c:947
 msgid "View mode (read-only)"
 msgstr "Mód amhairc (inléite amháin)"
 
-#: src/nano.c:920
-msgid "Don't wrap long lines"
+#: src/nano.c:949
+#, fuzzy
+msgid "Don't hard-wrap long lines"
 msgstr "Ná timfhill línte fada"
 
-#: src/nano.c:922
+#: src/nano.c:951
 msgid "Don't show the two help lines"
 msgstr "Ná taispeáin an dá líne chabhrach"
 
-#: src/nano.c:923
+#: src/nano.c:952
 msgid "Enable suspension"
 msgstr "Cumasaigh cur ar fionraí"
 
-#: src/nano.c:924
+#: src/nano.c:954
 #, fuzzy
 msgid "Enable soft line wrapping"
 msgstr "Timfhilleadh líne"
 
-# plural flags ignored in my version --kps
-#: src/nano.c:928
-msgid "(ignored, for Pico compatibility)"
-msgstr "(rinneadh neamhshuim orthu seo - comhoiriúnacht le Pico)"
-
-#: src/nano.c:938
-#, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
+#: src/nano.c:963
+#, fuzzy, c-format
+msgid " GNU nano, version %s\n"
 msgstr " GNU nano, leagan %s (tiomsaithe %s, %s)\n"
 
-#: src/nano.c:943
+#: src/nano.c:966
 #, 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:944
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1592,159 +1703,180 @@ msgstr ""
 "\n"
 " Roghanna tiomsaithe:"
 
-#: src/nano.c:1022
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr "Tá brón orm, díchumasaíodh an fheidhm seo"
 
-#: src/nano.c:1044
+#: src/nano.c:1125
+msgid "No file name"
+msgstr ""
+
+#: src/nano.c:1136
 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:1088
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr ""
 
-#: src/nano.c:1114
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr ""
 
-#: src/nano.c:1182
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Fuarthas SIGHUP nó SIGTERM\n"
 
-#: src/nano.c:1204
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Úsáid \"fg\" chun dul ar ais go nano.\n"
 
-#: src/nano.c:1386
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "cumasaithe"
 
-#: src/nano.c:1387
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "díchumasaithe"
 
-#: src/nano.c:1548 src/winio.c:1256
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr "Ordú Anaithnid"
 
-#: src/nano.c:1674
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "Rinneadh neamhshuim ar XON :-("
 
-#: src/nano.c:1679
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "Rinneadh neamhshuim ar XOFF :-("
 
-#: src/nano.c:2209 src/rcfile.c:1100
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Is neamhbhailí í méid táib iarrtha \"%s\""
 
-#: src/nano.c:2268 src/rcfile.c:1025
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Is neamhbhailí í méid líonta iarrtha \"%s\""
 
+#: src/nano.c:2415
+#, c-format
+msgid "Type '%s -h' for a list of available options.\n"
+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:1259
+#: src/prompt.c:1055
 msgid "Yy"
 msgstr "Ss"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1056
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1057
 msgid "Aa"
 msgstr "Uu"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1071
 msgid "Yes"
 msgstr "Sábháil"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1076
 msgid "All"
 msgstr "Uile"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1081
 msgid "No"
 msgstr "Ná Sábháil"
 
-#: src/rcfile.c:130
+#: src/rcfile.c:137
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Earráid i %s ar líne %lu: "
 
-#: src/rcfile.c:185
+#: src/rcfile.c:196
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "Tá \" gan chríoch in argóint '%s'"
 
-#: src/rcfile.c:212 src/rcfile.c:264 src/rcfile.c:711 src/rcfile.c:768
-#: src/rcfile.c:821
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 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:238 src/search.c:62
+#: src/rcfile.c:249 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Slonn ionadaíochta neamhbhailí \"%s\": %s"
 
-#: src/rcfile.c:258
+#: src/rcfile.c:269
 msgid "Missing syntax name"
 msgstr "Ainm comhréire ar iarraidh"
 
-#: src/rcfile.c:316
+#: src/rcfile.c:340
 msgid "The \"none\" syntax is reserved"
 msgstr "Comhréir \"none\" in áirithe"
 
-#: src/rcfile.c:323
+#: src/rcfile.c:347
 msgid "The \"default\" syntax must take no extensions"
 msgstr "Ní cheadaítear eisínteachtaí leis an gcomhréir \"default\""
 
-#: src/rcfile.c:386 src/rcfile.c:483
+#: src/rcfile.c:433
 msgid "Missing key name"
 msgstr "Ainm eochrach ar iarraidh"
 
-#: src/rcfile.c:398 src/rcfile.c:499
+#: src/rcfile.c:442 src/rcfile.c:453
+msgid "Key name is too short"
+msgstr ""
+
+#: src/rcfile.c:463
 #, fuzzy
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
+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:407
+#: src/rcfile.c:472
 #, fuzzy
-msgid "Must specify function to bind key to"
+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"
 
-#: src/rcfile.c:418 src/rcfile.c:510
-#, fuzzy
-msgid "Must specify menu to bind key to (or \"all\")"
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:482
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
-"Ní mór duit an roghchlár a gceanglófar an eochair leis a thabhairt (nó \"all"
-"\")\n"
 
-#: src/rcfile.c:426
+#: src/rcfile.c:489
 #, fuzzy, c-format
-msgid "Could not map name \"%s\" to a function"
+msgid "Cannot map name \"%s\" to a function"
 msgstr "Níorbh fhéidir ainm \"%s\" a mhapáil go feidhm\n"
 
-#: src/rcfile.c:432 src/rcfile.c:517
+#: src/rcfile.c:496
 #, fuzzy, c-format
-msgid "Could not map name \"%s\" to a menu"
+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:454
+#: src/rcfile.c:528
+#, c-format
+msgid "Function '%s' does not exist in menu '%s'"
+msgstr ""
+
+#: src/rcfile.c:543
 #, fuzzy, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
+msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "Tá brón orm, ceangal neamhcheadaithe é keystr \"%s\"\n"
 
-#: src/rcfile.c:625
+#: src/rcfile.c:629
+#, fuzzy, c-format
+msgid "Error expanding %s: %s"
+msgstr "Earráid agus %s á léamh: %s"
+
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1759,117 +1891,179 @@ msgstr ""
 "\"black\", leis an réimír roghnach \"bright\"\n"
 "le haghaidh dathanna tulra."
 
-#: src/rcfile.c:647
+#: src/rcfile.c:694
 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:652
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "Ainm datha ar iarraidh"
 
-#: src/rcfile.c:672
-#, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr "Ní cheadaítear do dhath cúlra \"%s\" a bheith geal"
-
-#: src/rcfile.c:690 src/rcfile.c:809
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr "Slonn ionadaíochta ar iarraidh"
 
-#: src/rcfile.c:762
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "Tá gá le \"end=\" in éineacht le gach \"start=\""
 
-#: src/rcfile.c:804
+#: src/rcfile.c:837
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr "Ní cheadaítear do dhath cúlra \"%s\" a bheith geal"
+
+#: src/rcfile.c:865
 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:874
-#, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
+#: src/rcfile.c:921
+#, 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:926
+#, fuzzy
+msgid "Missing magic string name"
+msgstr "Slonn ionadaíochta ar iarraidh"
+
+#: src/rcfile.c:985
+#, fuzzy
+msgid "Cannot add a linter without a syntax command"
+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:1010
+#, 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:1015
+msgid "Missing formatter command"
+msgstr ""
+
+#: src/rcfile.c:1045
+#, 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:876
+#: src/rcfile.c:1047
+#, fuzzy, c-format
 msgid ""
-"Exiting.  Please use nano with the -I option if needed to adjust your nanorc "
-"settings\n"
+"If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
 "Á scor.  Úsáid nano leis an rogha -I más gá do chuid socruithe nanorc a "
 "athrú\n"
 
-#: src/rcfile.c:926 src/rcfile.c:935 src/rcfile.c:945
+#: src/rcfile.c:1108
+#, 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:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Ní cheadaítear ordú \"%s\" i gcomhad iniata"
 
-#: src/rcfile.c:951 src/rcfile.c:1128
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Níl orduithe datha ag an gcomhréir \"%s\""
 
-#: src/rcfile.c:966
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Níor tuigeadh ordú \"%s\""
 
-#: src/rcfile.c:972
-msgid "Missing flag"
-msgstr "Bratach ar iarraidh"
+#: src/rcfile.c:1186
+#, fuzzy
+msgid "Missing option"
+msgstr "Ainm datha ar iarraidh"
 
-#: src/rcfile.c:994
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Caithfidh tú argóint a thabhairt le rogha \"%s\""
 
-#: src/rcfile.c:1012
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr "Níl an rogha ina teaghrán bailí il-bhirt"
 
-#: src/rcfile.c:1038 src/rcfile.c:1066 src/rcfile.c:1075
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr "Carachtair neamhbhána de dhíth"
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr "Dhá charachtar aoncholúin de dhíth"
 
-#: src/rcfile.c:1114
-#, c-format
-msgid "Cannot unset flag \"%s\""
+#: src/rcfile.c:1339
+#, fuzzy, c-format
+msgid "Cannot unset option \"%s\""
 msgstr "Ní féidir bratach \"%s\" a dhíchumasú"
 
-#: src/rcfile.c:1123
-#, c-format
-msgid "Unknown flag \"%s\""
+#: src/rcfile.c:1345
+#, fuzzy, c-format
+msgid "Unknown option \"%s\""
 msgstr "Bratach anaithnid \"%s\""
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr "Ní féidir mo chomhadlann bhaile a aimsiú!  Ochón!"
 
+#: src/rcfile.c:1442
+#, c-format
+msgid ""
+"\n"
+"Press Enter to continue starting nano.\n"
+msgstr ""
+"\n"
+"Brúigh \"Enter\" chun dul ar aghaidh le tosú nano.\n"
+
 #: src/search.c:96
 #, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "\"%.*s%s\" gan aimsiú"
 
-#: src/search.c:205
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/search.c:184
+msgid " [Case Sensitive]"
+msgstr " [Cásíogair]"
+
+#: src/search.c:188
+msgid " [Regexp]"
+msgstr " [Slonn]"
+
+#: src/search.c:192
+msgid " [Backwards]"
+msgstr " [Siar]"
+
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:197
 msgid " (to replace) in selection"
 msgstr " (le cur in ionad) i roghnúchán"
 
-#: src/search.c:207
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (le cur in ionad)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "Ionadaigh an ceann seo?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:945
 msgid "Replace with"
 msgstr "Ionadaigh le"
 
-#: src/search.c:1004
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
@@ -1879,19 +2073,20 @@ msgstr[2] "Cuireadh teaghrán nua in ionad %lu huaire"
 msgstr[3] "Cuireadh teaghrán nua in ionad %lu n-uaire"
 msgstr[4] "Cuireadh teaghrán nua in ionad %lu uair"
 
-#: src/search.c:1034
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr "Iontráil uimhir na líne agus uimhir an cholúin"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
 msgstr "Uimhir líne nó uimhir cholúin neamhbhailí"
 
-#: src/search.c:1214
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "Ní lúibín é"
 
-#: src/search.c:1281
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "Níl lúibín comhoiriúnach ann"
 
@@ -1903,224 +2098,315 @@ msgstr "Socraíodh Marc"
 msgid "Mark Unset"
 msgstr "Díshocraíodh Marc"
 
-#: src/text.c:443
+#: src/text.c:439
 msgid "Nothing in undo buffer!"
 msgstr "Níl faic le cealú!"
 
-#: src/text.c:455 src/text.c:593
-#, c-format
-msgid "Internal error: can't match line %d.  Please save your work"
+#: src/text.c:445 src/text.c:590
+#, 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"
 
-#: src/text.c:466 src/text.c:603
+#: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
 msgstr "téacs a chur leis"
 
-#: src/text.c:475 src/text.c:613
+#: src/text.c:467 src/text.c:612
 msgid "text delete"
 msgstr "téacs a scriosadh"
 
-#: src/text.c:489 src/text.c:628
-#, fuzzy
-msgid "line wrap"
-msgstr "Timfhilleadh líne"
-
-#: src/text.c:503 src/text.c:636
+#: src/text.c:491 src/text.c:641
 msgid "line join"
 msgstr "líne a cheangal"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:505 src/text.c:657
 msgid "text cut"
 msgstr "téacs a ghearradh"
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:510 src/text.c:661
 msgid "text uncut"
 msgstr "téacs a dhíghearradh"
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:515 src/text.c:623
 msgid "line break"
 msgstr ""
 
-#: src/text.c:532 src/text.c:665
+#: src/text.c:528 src/text.c:672
 msgid "text insert"
 msgstr "téacs a ionsá"
 
-#: src/text.c:550 src/text.c:659
+#: src/text.c:549 src/text.c:665
 msgid "text replace"
 msgstr "téacs a ionadú"
 
-#: src/text.c:557 src/text.c:671
-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:556 src/text.c:679 src/text.c:983
+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:563
+#: src/text.c:561
 #, c-format
 msgid "Undid action (%s)"
 msgstr "Cealaíodh gníomh (%s)"
 
-#: src/text.c:578
+#: src/text.c:580
 msgid "Nothing to re-do!"
 msgstr "Níl faic le hathdhéanamh!"
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
+#: src/text.c:584
+#, fuzzy
+msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
-"Earráid inmheánach: Theip ar shocrú athdhéanta.  Sábháil do chuid oibre"
+"Earráid inmheánach: ní féidir díghearradh a shocrú.  Sábháil do chuid oibre."
 
-#: src/text.c:676
+#: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Athrinneadh gníomh (%s)"
 
-#: src/text.c:766
-msgid "Could not pipe"
-msgstr "Níorbh fhéidir píopa a dhéanamh"
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
+msgid "Could not create pipe"
+msgstr "Níorbh fhéidir píopa a chruthú"
 
-#: src/text.c:793 src/text.c:2636 src/text.c:2788
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "Níorbh fhéidir forc a dhéanamh"
 
-#: src/text.c:941
-msgid "Internal error: can't setup uncut.  Please save your work."
+#: src/text.c:969
+#, fuzzy
+msgid "Internal error: cannot set up uncut.  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:950
-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:1870
+#: src/text.c:1806
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Drochtheaghrán athfhriotail %s: %s"
 
-#: src/text.c:2267
+#: src/text.c:2207
 msgid "Can now UnJustify!"
 msgstr "Is féidir DíChomhfhadú anois!"
 
-#: src/text.c:2462
+#: src/text.c:2404
 msgid "Edit a replacement"
 msgstr "Cuir ionadaí in eagar"
 
-#: src/text.c:2548
-msgid "Could not create pipe"
-msgstr "Níorbh fhéidir píopa a chruthú"
-
-#: src/text.c:2550
+#: src/text.c:2492
 msgid "Creating misspelled word list, please wait..."
 msgstr "Liosta d'fhocail mílitrithe á chruthú; fan go fóill, le do thoil..."
 
-#: src/text.c:2642
+#: src/text.c:2584 src/text.c:3022
 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:2693
+#: src/text.c:2635
 msgid "Error invoking \"spell\""
 msgstr "Earráid agus \"spell\" á thosú"
 
-#: src/text.c:2696
+#: src/text.c:2638
 msgid "Error invoking \"sort -f\""
 msgstr "Earráid agus \"sort -f\" á thosú"
 
-#: src/text.c:2699
+#: src/text.c:2641
 msgid "Error invoking \"uniq\""
 msgstr "Earráid agus \"uniq\" á thosú"
 
-#: src/text.c:2756 src/text.c:2965
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "Chríochnaigh an litreoir"
 
-#: src/text.c:2815
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Earráid agus \"%s\" á thosú"
 
-#: src/text.c:2960
+#: src/text.c:2885
+#, fuzzy
+msgid "Invoking spell checker, please wait"
+msgstr "Rith an litreoir, má tá sé ar fáil"
+
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Theip ar an litreoir: %s"
 
-#: src/text.c:2962
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Theip ar an litreoir: %s: %s"
 
-#: src/text.c:3030
+#: src/text.c:2937
+#, fuzzy
+msgid "No linter defined for this type of file!"
+msgstr "Ná cuir carachtair líne nua ag deireadh comhad"
+
+#: src/text.c:2947
+msgid "Save modified buffer before linting?"
+msgstr ""
+
+#: src/text.c:2969
+msgid "Invoking linter, please wait"
+msgstr ""
+
+#: src/text.c:3125
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr ""
+
+#: src/text.c:3159
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr ""
+
+#: src/text.c:3205
+#, fuzzy
+msgid "At last message"
+msgstr "Taispeáin an teachtaireacht seo"
+
+#: src/text.c:3210
+#, fuzzy
+msgid "At first message"
+msgstr "Taispeáin an teachtaireacht seo"
+
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr ""
+
+#: src/text.c:3275
+msgid "Finished"
+msgstr ""
+
+#: src/text.c:3280
+msgid "Invoking formatter, please wait"
+msgstr ""
+
+#: src/text.c:3360
+msgid "Finished formatting"
+msgstr ""
+
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sFocail: %lu  Línte: %ld  Carachtair: %lu"
 
-#: src/text.c:3031
+#: src/text.c:3439
 msgid "In Selection:  "
 msgstr "Sa Roghnúchán:  "
 
-#: src/utils.c:405 src/utils.c:417
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3453
+msgid "Verbatim Input"
+msgstr "Ionchur Litriúil"
+
+#: src/utils.c:410 src/utils.c:422
 msgid "nano is out of memory!"
 msgstr "cuimhne nano ídithe!"
 
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
-#: src/winio.c:1557
+#: src/winio.c:1583
 msgid "Unicode Input"
 msgstr "Ionchur Unicode"
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2142 src/winio.c:2146
 msgid "Modified"
 msgstr "Athraithe"
 
-#: src/winio.c:2150
+#: src/winio.c:2143
 msgid "View"
 msgstr "Amharc"
 
-#: src/winio.c:2164
+#: src/winio.c:2157
 msgid "DIR:"
 msgstr "COMHADLANN:"
 
-#: src/winio.c:2171
+#: src/winio.c:2164
 msgid "File:"
 msgstr "Comhad:"
 
-#: src/winio.c:3360
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2261
+msgid ""
+"Warning: Modifying a file which is not locked, check directory permission?"
+msgstr ""
+
+#: src/winio.c:3377
 #, 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:3492
+#: src/winio.c:3507
 msgid "The nano text editor"
 msgstr "Eagarthóir téacs nano"
 
-#: src/winio.c:3493
+#: src/winio.c:3508
 msgid "version"
 msgstr "leagan"
 
-#: src/winio.c:3494
+#: src/winio.c:3509
 msgid "Brought to you by:"
 msgstr "Scríofa ag:"
 
-#: src/winio.c:3495
+#: src/winio.c:3510
 msgid "Special thanks to:"
 msgstr "Táimid fíorbhuíoch de:"
 
-#: src/winio.c:3496
+#: src/winio.c:3511
 msgid "The Free Software Foundation"
 msgstr "The Free Software Foundation"
 
-#: src/winio.c:3497
+#: src/winio.c:3512
+msgid "the many translators and the TP"
+msgstr ""
+
+#: src/winio.c:3513
 msgid "For ncurses:"
 msgstr "As ncurses:"
 
-#: src/winio.c:3498
+#: src/winio.c:3514
 msgid "and anyone else we forgot..."
 msgstr "agus de gach duine eile a ndearnamar dearmad orthu..."
 
-#: src/winio.c:3499
+#: src/winio.c:3515
 msgid "Thank you for using nano!"
 msgstr "Go raibh maith agat as úsáid nano!"
 
+#~ msgid "Insert File"
+#~ msgstr "Ionsáigh Comhad"
+
+#~ msgid "Go to previous screen"
+#~ msgstr "Téigh chuig an scáileán roimhe seo"
+
+#~ msgid "Find Other Bracket"
+#~ msgstr "Aimsigh an Lúibín Eile"
+
+# plural flags ignored in my version --kps
+#~ msgid "(ignored, for Pico compatibility)"
+#~ msgstr "(rinneadh neamhshuim orthu seo - comhoiriúnacht le Pico)"
+
+#~ 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 "Missing flag"
+#~ msgstr "Bratach ar iarraidh"
+
 #~ msgid "line split"
 #~ msgstr "líne a scoilt"
 
+#~ msgid "Internal error: unknown type.  Please save your work"
+#~ msgstr "Earráid inmheánach: cineál anaithnid.  Sábháil do chuid oibre"
+
+#~ msgid "Internal error: Redo setup failed.  Please save your work"
+#~ msgstr ""
+#~ "Earráid inmheánach: Theip ar shocrú athdhéanta.  Sábháil do chuid oibre"
+
+#~ msgid "Could not pipe"
+#~ msgstr "Níorbh fhéidir píopa a dhéanamh"
+
 #~ msgid "line cut"
 #~ msgstr "líne a ghearradh"
 
@@ -2208,6 +2494,3 @@ msgstr "Go raibh maith agat as úsáid nano!"
 
 #~ msgid "Duplicate syntax name %s"
 #~ msgstr "Ainm dúblach comhréire %s"
-
-#~ msgid "Could not create temp file: %s"
-#~ msgstr "Níorbh fhéidir comhad sealadach a chruthú: %s"
diff --git a/po/gl.gmo b/po/gl.gmo
index bd6cef8..aba2a0a 100644
--- a/po/gl.gmo
+++ b/po/gl.gmo
diff --git a/po/gl.po b/po/gl.po
index da60242..2de252b 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,633 +1,638 @@
 # Galician translation of nano
-# Copyright (C) 2001, 2002, 2003, 2006, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2006, 2008, 2011, 2012, 2015 Free Software Foundation, Inc.
 # This file is distributed under the same license as the nano package.
+#
 # Jacobo Tarrio <jtarrio@trasno.net>, 2001, 2002, 2003.
-# Francisco Javier Tsao Santin <tsao@enelparaiso.org>, 2006,2008.
+# Francisco Javier Tsao Santín <tsao@enelparaiso.org>, 2006, 2008, 2011, 2012, 2015.
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 2.1.6pre1\n"
+"Project-Id-Version: nano 2.3.99pre4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-22 06:34-0500\n"
-"PO-Revision-Date: 2008-09-23 18:42+0200\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
+"PO-Revision-Date: 2015-03-18 23:36+0100\n"
 "Last-Translator: Francisco Javier Tsao Santín <tsao@enelparaiso.org>\n"
 "Language-Team: Galician <proxecto@trasno.net>\n"
+"Language: gl\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"
 
-#: src/browser.c:220
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:203
 msgid "Go To Directory"
 msgstr "Ir ó Directorio"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:860 src/files.c:2048
-#: src/nano.c:1060 src/search.c:220 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:246 src/browser.c:293
 #, c-format
 msgid "Can't go outside of %s in restricted mode"
 msgstr "Non se pode saír de %s en modo restrinxido"
 
-#: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:722
-#: src/files.c:731 src/files.c:1540 src/files.c:1659 src/files.c:1711
-#: src/files.c:1732 src/files.c:1855 src/files.c:2691 src/rcfile.c:568
-#: src/rcfile.c:1204
+#: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
+#: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
+#: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Erro lendo %s: %s"
 
-#: src/browser.c:303
+#: src/browser.c:283
 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:665 src/browser.c:674
+#: src/browser.c:626 src/browser.c:635
 msgid "(dir)"
 msgstr "(dir)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:632
 msgid "(parent dir)"
 msgstr "(dir pai)"
 
-#: src/browser.c:801 src/search.c:185
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "Busca"
 
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:805 src/search.c:189
-msgid " [Case Sensitive]"
-msgstr " [Sensible ás Maiúsculas/Minúsculas]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:811 src/search.c:195
-msgid " [Regexp]"
-msgstr " [Expreg]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:817 src/search.c:201
-msgid " [Backwards]"
-msgstr " [Cara Atrás]"
-
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "Buscando dende o Principio"
 
-#: src/browser.c:1006 src/browser.c:1039 src/search.c:514 src/search.c:517
-#: src/search.c:574 src/search.c:577
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "Esta é a única aparición"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr "Non hai patrón de busca"
 
-#: src/files.c:125
+#: src/files.c:139
+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:145
+#, 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:165 src/files.c:175 src/files.c:212 src/files.c:222
+#, c-format
+msgid "Error writing lock file %s: %s"
+msgstr "Erro escribindo ficheiro de bloqueo %s: %s"
+
+#: src/files.c:237
+#, c-format
+msgid "Error deleting lock file %s: %s"
+msgstr "Erro borrando ficheiro de bloqueo %s: %s"
+
+#: src/files.c:272
+#, c-format
+msgid "Error opening lock file %s: %s"
+msgstr "Erro abrindo ficheiro de bloqueo %s: %s"
+
+#: src/files.c:282
+#, 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:297
+#, 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:308
+#, c-format
+msgid "Error writing lock file: Directory '%s' doesn't exist"
+msgstr "Erro escribindo ficheiro de bloqueo: Non existe o directorio '%s'"
+
+#: src/files.c:339
 #, 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:234
+#: src/files.c:467
 msgid "No more open file buffers"
 msgstr "Non hai máis ficheiros abertos"
 
-#: src/files.c:250
+#: src/files.c:484
 #, c-format
 msgid "Switched to %s"
 msgstr "Cambiouse a %s"
 
-#: src/files.c:251 src/global.c:469 src/winio.c:2168
+#: src/files.c:485 src/global.c:953 src/winio.c:2161
 msgid "New Buffer"
 msgstr "Novo buffer"
 
-#: src/files.c:633
+#: src/files.c:874
 #, 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:638
-#, fuzzy, c-format
+#: src/files.c:879
+#, 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)"
-msgstr[1] "Léronse %lu liñas (Convertidas dos formatos DOS e Mac)"
+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:644
+#: src/files.c:885
 #, 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:648
-#, fuzzy, c-format
+#: src/files.c:889
+#, 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)"
-msgstr[1] "Léronse %lu liñas (Convertidas de formato Mac)"
+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:654
+#: src/files.c:895
 #, 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:658
-#, fuzzy, c-format
+#: src/files.c:899
+#, 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)"
-msgstr[1] "Léronse %lu liñas (Convertidas do formato DOS)"
+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:664
+#: src/files.c:905
 #, 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:667
+#: src/files.c:908
 #, c-format
 msgid "Read %lu line ( Warning: No write permission)"
 msgid_plural "Read %lu lines (Warning: No write permission)"
-msgstr[0] ""
-msgstr[1] ""
+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:700 src/files.c:736
+#: src/files.c:943 src/files.c:980
 msgid "Reading File"
 msgstr "Lendo o Ficheiro"
 
-#: src/files.c:706
+#: src/files.c:950
 msgid "New File"
 msgstr "Ficheiro Novo"
 
-#: src/files.c:709
+#: src/files.c:953
 #, c-format
 msgid "\"%s\" not found"
 msgstr "Non se atopou \"%s\""
 
-#: src/files.c:717 src/rcfile.c:559 src/rcfile.c:1154 src/rcfile.c:1195
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" é un directorio"
 
-#: src/files.c:718 src/rcfile.c:560 src/rcfile.c:1155 src/rcfile.c:1196
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" é un ficheiro de dispositivo"
 
-#: src/files.c:817
+#: src/files.c:1060
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Comando a executar nun novo buffer [dende %s] "
 
-#: src/files.c:819
+#: src/files.c:1062
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Comando a executar [dende %s] "
 
-#: src/files.c:825
+#: src/files.c:1069
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Ficheiro a inserir nun novo buffer [dende %s] "
 
-#: src/files.c:827
+#: src/files.c:1071
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Ficheiro a inserir [dende %s] "
 
-#: src/files.c:1077
+#: src/files.c:1320
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Tecla non válida no modo sen multibuffer"
 
-#: src/files.c:1486
+#: src/files.c:1622
+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:1746
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Non se pode escribir fóra de %s"
 
-#: src/files.c:1501
+#: src/files.c:1761
 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 "
 "establecendo --nofollow"
 
-#: src/files.c:1581 src/files.c:1603 src/files.c:1621 src/files.c:1632
-#: src/files.c:1640 src/files.c:1667
+#: src/files.c:1843 src/files.c:1868 src/files.c:1886 src/files.c:1899
+#: src/files.c:1910 src/files.c:1939
 #, c-format
 msgid "Error writing backup file %s: %s"
-msgstr "Erro escribindo %s: %s"
+msgstr "Erro escribindo ficheiro de copia de seguridade %s: %s"
 
-#: src/files.c:1582 src/nano.c:701
+#: src/files.c:1844 src/nano.c:719
 msgid "Too many backup files?"
 msgstr "¿Demasiados ficheiros de copia de seguridade?"
 
-#: src/files.c:1687 src/files.c:1744 src/files.c:1763 src/files.c:1775
-#: src/files.c:1799 src/files.c:1817 src/files.c:1827 src/files.c:1863
-#: src/files.c:1868 src/files.c:2764 src/files.c:2773
+#: src/files.c:1959 src/files.c:2016 src/files.c:2035 src/files.c:2047
+#: src/files.c:2071 src/files.c:2089 src/files.c:2099 src/files.c:2135
+#: src/files.c:2140 src/files.c:3101 src/files.c:3110 src/files.c:3133
+#: src/files.c:3145
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Erro writing %s: %s"
 
-#: src/files.c:1721 src/text.c:2929 src/text.c:2941
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Erro escribindo ficheiro temporal: %s"
 
-#: src/files.c:1900
+#: src/files.c:2173
 #, 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:2004
+#: src/files.c:2278
 msgid " [DOS Format]"
 msgstr " [Formato DOS]"
 
-#: src/files.c:2005
+#: src/files.c:2279
 msgid " [Mac Format]"
 msgstr " [Formato Mac]"
 
-#: src/files.c:2007
+#: src/files.c:2281
 msgid " [Backup]"
 msgstr " [CopiaSeg]"
 
-#: src/files.c:2015
+#: src/files.c:2289
 msgid "Prepend Selection to File"
 msgstr "Engadir a Selección ó Ficheiro polo Principio"
 
-#: src/files.c:2016
+#: src/files.c:2290
 msgid "Append Selection to File"
 msgstr "Engadir a Selección ó Ficheiro polo Final"
 
-#: src/files.c:2017
+#: src/files.c:2291
 msgid "Write Selection to File"
 msgstr "Gravar a Selección no Ficheiro"
 
-#: src/files.c:2020
+#: src/files.c:2294
 msgid "File Name to Prepend to"
 msgstr "Ficheiro ó que Engadir polo Principio"
 
-#: src/files.c:2021
+#: src/files.c:2295
 msgid "File Name to Append to"
 msgstr "Ficheiro ó que Engadir polo final"
 
-#: src/files.c:2022
+#: src/files.c:2296
 msgid "File Name to Write"
 msgstr "Ficheiro a Gravar"
 
-#: src/files.c:2153
+#: src/files.c:2427
 msgid "File exists, OVERWRITE ? "
 msgstr "O ficheiro xa existe, ¿SOBREESCRIBIR? "
 
-#: src/files.c:2162
+#: src/files.c:2436
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "¿Gravar ficheiro baixo NOME DIFERENTE? "
 
-#: src/files.c:2173
+#: src/files.c:2450
 msgid "File was modified since you opened it, continue saving ? "
-msgstr ""
+msgstr "O ficheiro foi modificado dende que o abriu, ¿continua gravando?"
 
-#: src/files.c:2611
+#: src/files.c:2882
 msgid "(more)"
 msgstr "(máis)"
 
-#: src/files.c:2694 src/rcfile.c:1220
+#: src/files.c:2974
 #, c-format
 msgid ""
 "\n"
-"Press Enter to continue starting nano.\n"
+"Press Enter to continue\n"
 msgstr ""
 "\n"
-"Prema Enter para seguir iniciando nano.\n"
+"Prema Enter para continuar.\n"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:415 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: src/global.c:416
-msgid "Replace"
-msgstr "Substituir"
+#: src/files.c:2989
+#, c-format
+msgid ""
+"Unable to create directory %s: %s\n"
+"It is required for saving/loading search history or cursor positions.\n"
+msgstr ""
+"Incapaz de crear directorio %s: %s\n"
+"Requírese para gravar/cargar o historial de busca ou posición do cursor\n"
 
-#: src/global.c:417
-msgid "No Replace"
-msgstr "Non Subst"
+#: src/files.c:2995
+#, 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 ""
+"A ruta %s non é un directorio e o necesita ser.\n"
+"Nano será incapaz de cargar ou gravar o historial de busca ou posición do "
+"cursor\n"
 
-#: src/global.c:420
-msgid "Case Sens"
-msgstr "SensMa/min"
+#: src/files.c:3012
+#, 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 ""
+"Detectouse un ficheiro de historial anticuado (%s) que tentei mover\n"
+"á localización preferente (%s) pero topei cun erro: %s"
 
-#: src/global.c:421
-msgid "Backwards"
-msgstr "Cara atrás"
+#: src/files.c:3016
+#, 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 ""
+"Detectouse un ficheiro de historial anticuado (%s) que movín\n"
+"á localización preferente (%s)\n"
+"(lea no FAQ de nano sobre este cambio)"
 
-#: src/global.c:425
-msgid "Regexp"
-msgstr "ExpReg"
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
+#: src/global.c:477
+msgid "Exit"
+msgstr "Saír"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:451
-msgid "PrevHstory"
-msgstr "HistPrevia"
+#: src/global.c:478
+msgid "Close"
+msgstr "Pechar"
 
-#: src/global.c:452
-msgid "NextHstory"
-msgstr "HistSeguin"
+#: src/global.c:479
+msgid "Uncut Text"
+msgstr "RepórTexto"
 
-#: src/global.c:453
-msgid "Go To Text"
-msgstr "Ir a Text"
+#: src/global.c:481
+msgid "Unjustify"
+msgstr "DeXustif"
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:455
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:485
 msgid "WhereIs Next"
 msgstr "U-lo Seguint"
 
-#: src/global.c:457
-msgid "First File"
-msgstr "Pri Ficheiro"
-
-#: src/global.c:458
-msgid "Last File"
-msgstr "Derrad Fich"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:460
-msgid "To Files"
-msgstr "A Ficheiros"
-
-#: src/global.c:462
-msgid "DOS Format"
-msgstr "Formato DOS"
-
-#: src/global.c:463
-msgid "Mac Format"
-msgstr "Formato Mac"
-
-#: src/global.c:464
-msgid "Append"
-msgstr "Engadir ó Final"
-
-#: src/global.c:465
-msgid "Prepend"
-msgstr "Engadir ó Inicio"
-
-#: src/global.c:466
-msgid "Backup File"
-msgstr "Copia Seguridade"
-
-#: src/global.c:467
-msgid "Execute Command"
-msgstr "Executar Comando"
-
-#: src/global.c:471
-msgid "Go To Dir"
-msgstr "Ir ó Directorio"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:480
-msgid "Get Help"
-msgstr "Obter Axud"
-
-#: src/global.c:481
-msgid "Exit"
-msgstr "Saír"
-
-#: src/global.c:482
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:492
 msgid "Where Is"
 msgstr "¿U-lo?"
 
-#: src/global.c:483
-msgid "Prev Page"
-msgstr "Páxina ant"
-
-#: src/global.c:484
-msgid "Next Page"
-msgstr "Páxina seg"
-
-#: src/global.c:485
-msgid "First Line"
-msgstr "Prim liña"
+#: src/global.c:493
+msgid "Replace"
+msgstr "Substituir"
 
-#: src/global.c:486
-msgid "Last Line"
-msgstr "Ult liña"
+#: src/global.c:494
+msgid "Go To Line"
+msgstr "Ir á liña"
 
-#: src/global.c:487
-msgid "Suspend"
-msgstr "Suspender"
+#: src/global.c:495
+msgid "Prev Line"
+msgstr "Liña Ant"
 
-#: src/global.c:489
-msgid "Beg of Par"
-msgstr "Prin Parág"
+#: src/global.c:496
+msgid "Next Line"
+msgstr "Seg Liña"
 
-#: src/global.c:490
-msgid "End of Par"
-msgstr "Fin Parágr"
+#: src/global.c:497
+msgid "Read File"
+msgstr "Ler Fich"
 
-#: src/global.c:491
+#: src/global.c:499
 msgid "FullJstify"
 msgstr "XustComplt"
 
-#: src/global.c:493
+#: src/global.c:501
 msgid "Refresh"
 msgstr "Recargar"
 
-#: src/global.c:495
-msgid "Insert File"
-msgstr "Inser Fich"
-
-#: src/global.c:497
-msgid "Go To Line"
-msgstr "Ir á liña"
-
-#: src/global.c:500
+#. 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:507
 msgid "Justify the current paragraph"
 msgstr "Xustifica-lo parágrafo actual"
 
-#. 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:505
+#: src/global.c:509
 msgid "Cancel the current function"
 msgstr "Cancela-la función actual"
 
-#: src/global.c:506
+#: src/global.c:510
 msgid "Display this help text"
 msgstr "Amosar este texto de axuda"
 
-#: src/global.c:509
+#: src/global.c:513
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Pechar o ficheiro cargado actualmente / Saír de nano"
 
-#: src/global.c:511
+#: src/global.c:515
 msgid "Exit from nano"
 msgstr "Saír de nano"
 
-#: src/global.c:515
+#: src/global.c:519
 msgid "Write the current file to disk"
 msgstr "Grava-lo ficheiro actual no disco"
 
-#: src/global.c:517
+#: src/global.c:521
 msgid "Insert another file into the current one"
 msgstr "Inserir outro ficheiro no actual"
 
-#: src/global.c:519
+#: src/global.c:523
 msgid "Search for a string or a regular expression"
 msgstr "Buscar cadea ou experesión regular"
 
-#: src/global.c:520
-msgid "Go to previous screen"
-msgstr "Pasar á pantalla anterior"
+#: src/global.c:526
+msgid "Search for a string"
+msgstr "Buscar cadea"
 
-#: src/global.c:521
-msgid "Go to next screen"
-msgstr "Pasar á seguinte pantalla"
+#: src/global.c:528
+msgid "Go one screenful up"
+msgstr "Subir unha pantalla"
 
-#: src/global.c:523
+#: src/global.c:529
+msgid "Go one screenful down"
+msgstr "Baixar unha pantalla"
+
+#: src/global.c:531
 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:525
+#: src/global.c:533
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Desfacer corte do buffer de cortado na liña actual"
 
-#: src/global.c:527
+#: src/global.c:534
 msgid "Display the position of the cursor"
 msgstr "Amosa-la posición do cursor"
 
-#: src/global.c:529
+#: src/global.c:536
 msgid "Invoke the spell checker, if available"
 msgstr "Chamar ó corrector ortográfico, se hai un"
 
-#: src/global.c:531
+#: src/global.c:538
 msgid "Replace a string or a regular expression"
 msgstr "Substituir unha cadea ou expresión regular"
 
-#: src/global.c:532
+#: src/global.c:539
 msgid "Go to line and column number"
 msgstr "Ir á liña e columna número"
 
-#: src/global.c:534
-msgid "Mark text at the cursor position"
-msgstr "Marcar texto na posición do cursor"
+#: src/global.c:541
+msgid "Mark text starting from the cursor position"
+msgstr "Marcar texto comenzando na posición do cursor"
 
-#: src/global.c:535
-msgid "Repeat last search"
+#: src/global.c:542
+msgid "Repeat the last search"
 msgstr "Repeti-la última busca"
 
-#: src/global.c:537
+#: src/global.c:544
 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:538
+#: src/global.c:545
 msgid "Indent the current line"
 msgstr "Sangra-la liña actual"
 
-#: src/global.c:539
+#: src/global.c:546
 msgid "Unindent the current line"
 msgstr "Elimina-la sangría da liña actual"
 
-#: src/global.c:540
+#: src/global.c:547
 msgid "Undo the last operation"
 msgstr "Desface-la última operación"
 
-#: src/global.c:541
+#: src/global.c:548
 msgid "Redo the last undone operation"
 msgstr "Reface-la última operación desfeita"
 
-#: src/global.c:543
+#: src/global.c:550
 msgid "Go forward one character"
 msgstr "Avanzar un carácter"
 
-#: src/global.c:544
+#: src/global.c:551
 msgid "Go back one character"
 msgstr "Recuar un carácter"
 
-#: src/global.c:546
+#: src/global.c:553
 msgid "Go forward one word"
 msgstr "Avanzar unha verba"
 
-#: src/global.c:547
+#: src/global.c:554
 msgid "Go back one word"
 msgstr "Recuar unha verba"
 
-#: src/global.c:549
+#: src/global.c:556
 msgid "Go to previous line"
 msgstr "Pasar á liña previa"
 
-#: src/global.c:550
+#: src/global.c:557
 msgid "Go to next line"
 msgstr "Pasar á seguinte liña"
 
-#: src/global.c:551
+#: src/global.c:558
 msgid "Go to beginning of current line"
 msgstr "Pasar ó principio da liña actual"
 
-#: src/global.c:552
+#: src/global.c:559
 msgid "Go to end of current line"
 msgstr "Pasar ó final da liña actual"
 
-#: src/global.c:555
+#: src/global.c:562
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "Pasar ó principio do parágrafo, entón ó parágrafo previo"
 
-#: src/global.c:557
+#: src/global.c:564
 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:560
+#: src/global.c:566
 msgid "Go to the first line of the file"
 msgstr "Pasar á primeira liña do ficheiro"
 
-#: src/global.c:562
+#: src/global.c:567
 msgid "Go to the last line of the file"
 msgstr "Pasar á derradeira liña do ficheiro"
 
-#: src/global.c:564
+#: src/global.c:569
 msgid "Go to the matching bracket"
 msgstr "Pasar ó paréntese correspondente"
 
-#: src/global.c:566
+#: src/global.c:571
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "Desprazar arriba unha liña sen despraza-lo cursor"
 
-#: src/global.c:568
+#: src/global.c:573
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "Desprazar unha liña abaixo sen despraza-lo cursor"
 
-#: src/global.c:572
+#: src/global.c:576
 msgid "Switch to the previous file buffer"
 msgstr "Cambiar ó anterior ficheiro"
 
-#: src/global.c:574
+#: src/global.c:577
 msgid "Switch to the next file buffer"
 msgstr "Cambiar ó seguinte ficheiro"
 
-#: src/global.c:577
+#: src/global.c:579
 msgid "Insert the next keystroke verbatim"
 msgstr "Inseri-la seguinte pulsación literal"
 
-#: src/global.c:579
+#: src/global.c:580
 msgid "Insert a tab at the cursor position"
 msgstr "Inserir unha lingüeta na posición do cursor"
 
@@ -635,333 +640,434 @@ msgstr "Inserir unha lingüeta na posición do cursor"
 msgid "Insert a newline at the cursor position"
 msgstr "Inserir unha nova liña na posición do cursor"
 
-#: src/global.c:583
+#: src/global.c:582
 msgid "Delete the character under the cursor"
 msgstr "Borra-lo carácter baixo do cursor"
 
-#: src/global.c:585
+#: src/global.c:584
 msgid "Delete the character to the left of the cursor"
 msgstr "Borra-lo caracter á esquerda do cursor"
 
-#: src/global.c:588
+#: src/global.c:587
 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:591
+#: src/global.c:590
 msgid "Justify the entire file"
 msgstr "Xustificar todo o ficheiro"
 
-#: src/global.c:595
+#: src/global.c:594
 msgid "Count the number of words, lines, and characters"
 msgstr "Conta-lo número de verbas, liñas e caracteres"
 
-#: src/global.c:598
+#: src/global.c:597
 msgid "Refresh (redraw) the current screen"
 msgstr "Actualiza-la pantalla actual"
 
-#: src/global.c:600
+#: src/global.c:599
 msgid "Suspend the editor (if suspend is enabled)"
 msgstr "Suspende-lo editor (se a suspensión está activada)"
 
-#: src/global.c:603
+#: src/global.c:602
 msgid "Toggle the case sensitivity of the search"
 msgstr "Selector de sensibilidade a maiúsculas/minúsculas na busca"
 
-#: src/global.c:605
+#: src/global.c:604
 msgid "Reverse the direction of the search"
 msgstr "Reverti-la dirección da busca"
 
-#: src/global.c:609
+#: src/global.c:608
 msgid "Toggle the use of regular expressions"
 msgstr "Selector de uso de expresións regulares"
 
-#: src/global.c:613
+#: src/global.c:612
 msgid "Recall the previous search/replace string"
 msgstr "Recupera-la anterior cadea de busca/sustitución"
 
-#: src/global.c:615
+#: src/global.c:614
 msgid "Recall the next search/replace string"
 msgstr "Recupera-la seguinte cadea de busca/sustitución"
 
-#: src/global.c:618
+#: src/global.c:617
 msgid "Go to file browser"
 msgstr "Ir ó navegador de ficheiros"
 
-#: src/global.c:621
+#: src/global.c:620
 msgid "Toggle the use of DOS format"
 msgstr "Selector de uso do formato DOS"
 
-#: src/global.c:622
+#: src/global.c:621
 msgid "Toggle the use of Mac format"
 msgstr "Selector de uso do formato Mac"
 
-#: src/global.c:624
+#: src/global.c:622
 msgid "Toggle appending"
 msgstr "Selector de engadir ó final"
 
-#: src/global.c:625
+#: src/global.c:623
 msgid "Toggle prepending"
 msgstr "Selector de engadir previo"
 
-#: src/global.c:628
+#: src/global.c:624
 msgid "Toggle backing up of the original file"
 msgstr "Selector de copiado de seguridade do ficheiro orixinal"
 
-#: src/global.c:629
+#: src/global.c:625
 msgid "Execute external command"
 msgstr "Executar comando externo"
 
-#: src/global.c:633
+#: src/global.c:628
 msgid "Toggle the use of a new buffer"
 msgstr "Selector de uso dun novo buffer"
 
-#: src/global.c:636
+#: src/global.c:631
 msgid "Exit from the file browser"
 msgstr "Saír do navegador de ficheiros"
 
-#: src/global.c:638
+#: src/global.c:632
 msgid "Go to the first file in the list"
 msgstr "Pasar ó primeiro ficheiro da lista"
 
-#: src/global.c:640
+#: src/global.c:633
 msgid "Go to the last file in the list"
 msgstr "Pasar ó derradeiro ficheiro da lista"
 
-#: src/global.c:641
-#, fuzzy
-msgid "Go to the next file in the list"
-msgstr "Pasar ó derradeiro ficheiro da lista"
-
-#: src/global.c:642
-#, fuzzy
+#: src/global.c:634
 msgid "Go to the previous file in the list"
-msgstr "Pasar ó primeiro ficheiro da lista"
+msgstr "Pasar ó anterior ficheiro da lista"
+
+#: src/global.c:635
+msgid "Go to the next file in the list"
+msgstr "Pasar ó seguinte ficheiro da lista"
 
-#: src/global.c:643
+#: src/global.c:636
 msgid "Go to directory"
 msgstr "Pasar ó directorio"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:670
-msgid "Close"
-msgstr "Pechar"
+#: src/global.c:639
+msgid "Invoke the linter, if available"
+msgstr "Chamar ó analizador de sintaxe, se hai un"
+
+#: src/global.c:640
+msgid "Go to previous linter msg"
+msgstr "Pasar á anterior mensaxe do analizador"
+
+#: src/global.c:641
+msgid "Go to next linter msg"
+msgstr "Pasar á anterior mensaxe do analizador"
+
+#: src/global.c:642
+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:662
+msgid "Get Help"
+msgstr "Obter Axud"
+
+#: src/global.c:665 src/prompt.c:1084
+msgid "Cancel"
+msgstr "Cancelar"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:679
-msgid "WriteOut"
+#: src/global.c:678
+msgid "Write Out"
 msgstr "Gravar"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:704
+msgid "Go To Dir"
+msgstr "Ir ó Directorio"
+
+#: src/global.c:719
+msgid "Cut Text"
+msgstr "CortarText"
+
+#: src/global.c:728
 msgid "Justify"
 msgstr "Xustificar"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:696
-msgid "Read File"
-msgstr "Ler Fich"
+#: src/global.c:733
+msgid "To Spell"
+msgstr "Ortografía"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:713
-msgid "Cut Text"
-msgstr "CortarText"
+#: src/global.c:738
+msgid "To Linter"
+msgstr "Analizador"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:718
-msgid "UnJustify"
-msgstr "DeXustif"
+#: src/global.c:740
+msgid "Formatter"
+msgstr "Formateador"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:723
-msgid "UnCut Text"
-msgstr "RepórTexto"
+#: src/global.c:745
+msgid "Case Sens"
+msgstr "SensMa/min"
+
+#: src/global.c:750
+msgid "Regexp"
+msgstr "ExpReg"
+
+#: src/global.c:755
+msgid "Backwards"
+msgstr "Cara atrás"
+
+#: src/global.c:762
+msgid "No Replace"
+msgstr "Non Subst"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:728 src/global.c:755
+#: src/global.c:770
 msgid "Cur Pos"
 msgstr "PosicAct"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:737
-msgid "To Spell"
-msgstr "Ortografía"
+#: src/global.c:780
+msgid "Prev Page"
+msgstr "Páxina ant"
+
+#: src/global.c:782
+msgid "Next Page"
+msgstr "Páxina seg"
+
+#: src/global.c:785
+msgid "First Line"
+msgstr "Prim liña"
+
+#: src/global.c:787
+msgid "Last Line"
+msgstr "Ult liña"
+
+#: src/global.c:794
+msgid "To Bracket"
+msgstr "Ó delimitador"
 
-#: src/global.c:771
+#: src/global.c:797
 msgid "Mark Text"
 msgstr "Marcar"
 
-#: src/global.c:777
+#: src/global.c:800
 msgid "Copy Text"
 msgstr "Copiar Texto"
 
-#: src/global.c:780
+#: src/global.c:803
 msgid "Indent Text"
 msgstr "Sangrar"
 
-#: src/global.c:783
+#: src/global.c:805
 msgid "Unindent Text"
 msgstr "De-Sangrar"
 
-#: src/global.c:787
+#: src/global.c:808
 msgid "Undo"
 msgstr "Desfacer"
 
-#: src/global.c:790
+#: src/global.c:810
 msgid "Redo"
 msgstr "Refacer"
 
-#: src/global.c:796 src/global.c:800
-msgid "Forward"
-msgstr "Adiante"
-
-#: src/global.c:806 src/global.c:810
+#: src/global.c:814 src/global.c:820
 msgid "Back"
 msgstr "Atrás"
 
-#: src/global.c:817
-msgid "Next Word"
-msgstr "Verba Seg"
+#: src/global.c:816 src/global.c:822
+msgid "Forward"
+msgstr "Adiante"
 
-#: src/global.c:820
+#: src/global.c:827
 msgid "Prev Word"
 msgstr "Verba Ant"
 
-#: src/global.c:824
-msgid "Prev Line"
-msgstr "Liña Ant"
-
-#: src/global.c:827
-msgid "Next Line"
-msgstr "Seg Liña"
+#: src/global.c:829
+msgid "Next Word"
+msgstr "Verba Seg"
 
-#: src/global.c:830
+#: src/global.c:833
 msgid "Home"
 msgstr "Inicio"
 
-#: src/global.c:833
+#: src/global.c:835
 msgid "End"
 msgstr "Fin"
 
-#: src/global.c:845
-msgid "Find Other Bracket"
-msgstr "Busca-la parella"
+#: src/global.c:844
+msgid "Beg of Par"
+msgstr "Prin Parág"
+
+#: src/global.c:846
+msgid "End of Par"
+msgstr "Fin Parágr"
 
-#: src/global.c:848
+#: src/global.c:851
 msgid "Scroll Up"
 msgstr "Desprazar Arriba"
 
-#: src/global.c:851
+#: src/global.c:853
 msgid "Scroll Down"
 msgstr "Desprazar Abaixo"
 
-#: src/global.c:856
-msgid "Previous File"
+#: src/global.c:858
+msgid "Prev File"
 msgstr "Ficheiro Anterior"
 
-#: src/global.c:858
+#: src/global.c:860
 msgid "Next File"
 msgstr "Ficheiro Seguinte"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:862 src/text.c:3045
-msgid "Verbatim Input"
+#: src/global.c:869
+msgid "Verbatim"
 msgstr "Entrada Literal"
 
-#: src/global.c:867
+#: src/global.c:872
 msgid "Tab"
 msgstr "Lingüeta"
 
-#: src/global.c:870
+#: src/global.c:874
 msgid "Enter"
 msgstr "Entrar"
 
-#: src/global.c:873
+#: src/global.c:876
 msgid "Delete"
 msgstr "Borrar"
 
-#: src/global.c:876
+#: src/global.c:878
 msgid "Backspace"
 msgstr "Retroceso"
 
-#: src/global.c:893
+#: src/global.c:888
 msgid "CutTillEnd"
 msgstr "CortarAtaFin"
 
-#: src/global.c:906
+#: src/global.c:898
 msgid "Word Count"
 msgstr "Conta Verbas"
 
-#: src/global.c:1367
+#: src/global.c:905
+msgid "Suspend"
+msgstr "Suspender"
+
+#: src/global.c:910
+msgid "PrevHstory"
+msgstr "HistPrevia"
+
+#: src/global.c:913
+msgid "NextHstory"
+msgstr "HistSeguin"
+
+#: src/global.c:917
+msgid "Go To Text"
+msgstr "Ir a Text"
+
+#: src/global.c:928
+msgid "DOS Format"
+msgstr "Formato DOS"
+
+#: src/global.c:931
+msgid "Mac Format"
+msgstr "Formato Mac"
+
+#: src/global.c:934
+msgid "Append"
+msgstr "Engadir ó Final"
+
+#: src/global.c:936
+msgid "Prepend"
+msgstr "Engadir ó Inicio"
+
+#: src/global.c:939
+msgid "Backup File"
+msgstr "Copia Seguridade"
+
+#: src/global.c:946
+msgid "Execute Command"
+msgstr "Executar Comando"
+
+#: src/global.c:961
+msgid "To Files"
+msgstr "A Ficheiros"
+
+#: src/global.c:964
+msgid "First File"
+msgstr "Pri Ficheiro"
+
+#: src/global.c:966
+msgid "Last File"
+msgstr "Derrad Fich"
+
+#: src/global.c:977
+msgid "Prev Lint Msg"
+msgstr "Msg ant anlzr"
+
+#: src/global.c:979
+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:1227
 msgid "Help mode"
 msgstr "Modo de axuda"
 
-#: src/global.c:1369
+#: src/global.c:1229
 msgid "Constant cursor position display"
 msgstr "Posición do cursor constante"
 
-#: src/global.c:1371
+#: src/global.c:1231
 msgid "Use of one more line for editing"
 msgstr "Uso dunha liña máis para editar"
 
-#: src/global.c:1373
+#: src/global.c:1233
 msgid "Smooth scrolling"
-msgstr "Desprazar suavemente"
+msgstr "Desprazar mainamente"
+
+#: src/global.c:1235
+msgid "Soft wrapping of overlong lines"
+msgstr "Acortado maino de liñas longas"
 
-#: src/global.c:1375
+#: src/global.c:1237
 msgid "Whitespace display"
 msgstr "Amosar espacios en branco"
 
-#: src/global.c:1377
+#: src/global.c:1239
 msgid "Color syntax highlighting"
 msgstr "Salientar sintaxe con cor"
 
-#: src/global.c:1379
+#: src/global.c:1241
 msgid "Smart home key"
 msgstr "Tecla de 'smart home'"
 
-#: src/global.c:1381
+#: src/global.c:1243
 msgid "Auto indent"
 msgstr "Autosangría"
 
-#: src/global.c:1383
+#: src/global.c:1245
 msgid "Cut to end"
 msgstr "Cortar ata o final"
 
-#: src/global.c:1385
-msgid "Long line wrapping"
-msgstr "Axuste de liñas longas"
+#: src/global.c:1247
+msgid "Hard wrapping of overlong lines"
+msgstr "Acortado forte de liñas longas"
 
-#: src/global.c:1387
+#: src/global.c:1249
 msgid "Conversion of typed tabs to spaces"
 msgstr "Conversión de lingüetas escritas a espacios"
 
-#: src/global.c:1389
+#: src/global.c:1251
 msgid "Backup files"
 msgstr "Facer copia de seguridade de ficheiros"
 
-#: src/global.c:1391
+#: src/global.c:1253
 msgid "Multiple file buffers"
 msgstr "Múltiples ficheiros"
 
-#: src/global.c:1393
+#: src/global.c:1255
 msgid "Mouse support"
 msgstr "permitir rato"
 
-#: src/global.c:1395
+#: src/global.c:1257
 msgid "No conversion from DOS/Mac format"
 msgstr "Non facer conversión de formato DOS/Mac"
 
-#: src/global.c:1397
+#: src/global.c:1259
 msgid "Suspension"
 msgstr "Suspensión"
 
-#: src/global.c:1399
-#, fuzzy
-msgid "Soft line wrapping"
-msgstr "Axuste de liñas longas"
-
-#: src/help.c:236
+#: src/help.c:205
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -983,7 +1089,7 @@ msgstr ""
 "Busca:. Premendo Intro sen introducir ningún texto executará a busca "
 "previa.  "
 
-#: src/help.c:245
+#: src/help.c:214
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -997,7 +1103,7 @@ msgstr ""
 " As seguintes teclas de función están dispoñibles en modo Busca:\n"
 "\n"
 
-#: src/help.c:251
+#: src/help.c:220
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1017,7 +1123,7 @@ msgstr ""
 " As seguintes teclas de función están dispoñibles no modo Ir Á Liña:\n"
 "\n"
 
-#: src/help.c:260
+#: src/help.c:229
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1040,7 +1146,7 @@ msgstr ""
 "se cargue nun buffer separado (empregue Meta-< e > para cambiar entre "
 "buffers de ficheiro).  "
 
-#: src/help.c:269
+#: src/help.c:238
 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"
@@ -1056,7 +1162,7 @@ msgstr ""
 "Ficheiro:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:244
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1085,7 +1191,7 @@ msgstr ""
 "Ficheiro:\n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:258
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1111,7 +1217,7 @@ msgstr ""
 "ficheiros:\n"
 "\n"
 
-#: src/help.c:302
+#: src/help.c:271
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1134,16 +1240,16 @@ msgstr ""
 "Busca:. Ó premer Intro sen introducir ningún texto farase a busca anterior.\n"
 "\n"
 
-#: src/help.c:311
+#: src/help.c:280
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
 msgstr ""
-" As seguintes teclas de función están dispoñibles no modo de Busca do "
+" As seguintes teclas de función están dispoñibles no modo de Busca do "
 "Navegador:\n"
 "\n"
 
-#: src/help.c:315
+#: src/help.c:284
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1166,7 +1272,7 @@ msgstr ""
 "Navegador:\n"
 "\n"
 
-#: src/help.c:328
+#: src/help.c:297
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1190,7 +1296,7 @@ msgstr ""
 " Existen as seguintes funcións no modo Corrector Ortográfico:\n"
 "\n"
 
-#: src/help.c:343
+#: src/help.c:312
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1211,7 +1317,7 @@ msgstr ""
 "Externos:\n"
 "\n"
 
-#: src/help.c:356
+#: src/help.c:325
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1231,7 +1337,7 @@ 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:366
+#: src/help.c:335
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1251,7 +1357,7 @@ msgstr ""
 "introducidas usando as teclas Esc, Alt ou Meta dependendo da configuración "
 "do seu teclado.  "
 
-#: src/help.c:375
+#: src/help.c:344
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1265,15 +1371,15 @@ msgstr ""
 "alternativas son amosadas entre parénteses\n"
 "\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:376 src/help.c:448
 msgid "enable/disable"
 msgstr "activar/desactivar"
 
-#: src/nano.c:587
+#: src/nano.c:601
 msgid "Key invalid in view mode"
 msgstr "Tecla non válida en modo ver"
 
-#: src/nano.c:695
+#: src/nano.c:713
 #, c-format
 msgid ""
 "\n"
@@ -1282,7 +1388,7 @@ msgstr ""
 "\n"
 "Gravouse o buffer en %s\n"
 
-#: src/nano.c:697
+#: src/nano.c:715
 #, c-format
 msgid ""
 "\n"
@@ -1291,7 +1397,7 @@ msgstr ""
 "\n"
 "Non se gravou o buffer en %s: %s\n"
 
-#: src/nano.c:700
+#: src/nano.c:718
 #, c-format
 msgid ""
 "\n"
@@ -1300,11 +1406,11 @@ msgstr ""
 "\n"
 "Non se gravou o buffer: %s\n"
 
-#: src/nano.c:723
+#: src/nano.c:743
 msgid "Window size is too small for nano...\n"
 msgstr "A fiestra é pequena de máis para nano...\n"
 
-#: src/nano.c:816
+#: src/nano.c:836
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
@@ -1313,252 +1419,257 @@ msgstr ""
 "Uso: nano [OPCIÓNS] [[+LIÑA, COLUMNA] FICHEIRO]...\n"
 "\n"
 
-#: src/nano.c:819
+#: src/nano.c:839
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Opción\t\tOpción longa GNU\t\tSignificado\n"
 
-#: src/nano.c:821
+#: src/nano.c:841
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Opción\t\tSignificado\n"
 
-#: src/nano.c:824
-msgid "Show this message"
-msgstr "Amosar esta mensaxe"
-
-#: src/nano.c:825
+#: src/nano.c:844
 msgid "+LINE,COLUMN"
 msgstr "+LIÑA, COLUMNA"
 
-#: src/nano.c:826
+#. TRANSLATORS: The next forty or so strings are option descriptions
+#. * for the --help output.  Try to keep them at most 40 characters.
+#: src/nano.c:847
 msgid "Start at line LINE, column COLUMN"
 msgstr "Empezar na liña LIÑA, columna COLUMNA"
 
-#: src/nano.c:828
+#: src/nano.c:849
 msgid "Enable smart home key"
 msgstr "Activar tecla 'smart home'"
 
-#: src/nano.c:829
+#: src/nano.c:850
 msgid "Save backups of existing files"
 msgstr "Gravar copias de seguridade dos ficheiros existentes"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "-C <dir>"
 msgstr "-C <dir>"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<dir>"
 
-#: src/nano.c:831
+#: src/nano.c:852
 msgid "Directory for saving unique backup files"
 msgstr "Directorio para gravar ficheiros de copia de seguridade únicos"
 
-#: src/nano.c:834
+#: src/nano.c:855
 msgid "Use bold instead of reverse video text"
 msgstr "Usar texto groso na vez de texto de video reverso"
 
-#: src/nano.c:837
+#: src/nano.c:858
 msgid "Convert typed tabs to spaces"
 msgstr "Convertir as lingüetas escritas a espacios"
 
-#: src/nano.c:840
+#: src/nano.c:861
 msgid "Enable multiple file buffers"
 msgstr "Admitir varios buffers de ficheiros"
 
-#: src/nano.c:845
+#: src/nano.c:865
+msgid "Use (vim-style) lock files"
+msgstr "Usar ficheiros de bloqueo (estilo vim)"
+
+#: src/nano.c:869
 msgid "Log & read search/replace string history"
 msgstr "Gravar e le-la historia de cadeas a buscar/substituír"
 
-#: src/nano.c:848
+#: src/nano.c:873
 msgid "Don't look at nanorc files"
 msgstr "Non mirar nos ficheiros nanorc"
 
-#: src/nano.c:851
+#: src/nano.c:876
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Solucionar problema de confusión de teclado numérico"
 
-#: src/nano.c:853
+#: src/nano.c:878
 msgid "Don't add newlines to the ends of files"
 msgstr "Non engadir novas liñas ó final dos ficheiros"
 
-#: src/nano.c:856
+#: src/nano.c:881
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Non converti-los ficheiros do formato DOS/Mac"
 
-#: src/nano.c:858
+#: src/nano.c:883
 msgid "Use one more line for editing"
 msgstr "Usar un ou máis liñas para editar"
 
-#: src/nano.c:860
+#: src/nano.c:886
+msgid "Log & read location of cursor position"
+msgstr "Rexistrar e ler a posición do cursor"
+
+#: src/nano.c:889
 msgid "-Q <str>"
 msgstr "-Q <cad>"
 
-#: src/nano.c:860
+#: src/nano.c:889
 msgid "--quotestr=<str>"
 msgstr "--quotestr=<cad>"
 
-#: src/nano.c:861
+#: src/nano.c:890
 msgid "Quoting string"
 msgstr "Cadea de citado"
 
-#: src/nano.c:863
+#: src/nano.c:892
 msgid "Restricted mode"
 msgstr "Modo restrinxido"
 
-#: src/nano.c:866
+#: src/nano.c:895
 msgid "Scroll by line instead of half-screen"
 msgstr "Desprazar liña a liña en vez de media pantalla"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "-T <#cols>"
 msgstr "-T <#cols>"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#cols>"
 
-#: src/nano.c:869
+#: src/nano.c:898
 msgid "Set width of a tab to #cols columns"
 msgstr "Establece-lo ancho de lingüeta a #cols columnas"
 
-#: src/nano.c:871
+#: src/nano.c:900
 msgid "Do quick statusbar blanking"
 msgstr "Facer baleirado rápido da barra de estado"
 
-#: src/nano.c:874
+#: src/nano.c:903
 msgid "Print version information and exit"
 msgstr "Amosar información sobre a versión e saír"
 
-#: src/nano.c:877
+#: src/nano.c:906
 msgid "Detect word boundaries more accurately"
 msgstr "Detectar contornos das verbas máis axeitadamente"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "-Y <str>"
 msgstr "-Y <cad>"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "--syntax=<str>"
 msgstr "--syntax=<cad>"
 
-#: src/nano.c:881
+#: src/nano.c:910
 msgid "Syntax definition to use for coloring"
 msgstr "Definición de sintaxe a empregar para corear"
 
-#: src/nano.c:883
+#: src/nano.c:912
 msgid "Constantly show cursor position"
 msgstr "Amosa-la posición do cursor constantemente"
 
-#: src/nano.c:885
+#: src/nano.c:914
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Arranxa-lo problema de confusión Retroceso/Borrar"
 
-#: src/nano.c:888
+#: src/nano.c:915
+msgid "Show this help text"
+msgstr "Amosar este texto de axuda"
+
+#: src/nano.c:918
 msgid "Automatically indent new lines"
 msgstr "Sangra-las novas liñas automáticamente"
 
-#: src/nano.c:889
+#: src/nano.c:919
 msgid "Cut from cursor to end of line"
 msgstr "Cut from cursor to end of line"
 
-#: src/nano.c:892
+#: src/nano.c:922
 msgid "Don't follow symbolic links, overwrite"
 msgstr "Non segui-las ligazóns simbólicas, sobreescribir"
 
-#: src/nano.c:894
+#: src/nano.c:924
 msgid "Enable the use of the mouse"
 msgstr "Emprega-lo rato"
 
-#: src/nano.c:897
+#: src/nano.c:926
+msgid "Do not read the file (only write it)"
+msgstr "Non ler o ficheiro (só escribir nel)"
+
+#: src/nano.c:928
 msgid "-o <dir>"
 msgstr "-o <dir>"
 
-#: src/nano.c:897
+#: src/nano.c:928
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<dir>"
 
-#: src/nano.c:898
+#: src/nano.c:929
 msgid "Set operating directory"
 msgstr "Establece-lo directorio de traballo"
 
-#: src/nano.c:901
+#: src/nano.c:932
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Conserva-las teclas XON (^Q) e XOFF (^S)"
 
-#: src/nano.c:903
+#: src/nano.c:935
 msgid "Silently ignore startup issues like rc file errors"
-msgstr ""
+msgstr "Iñorar silenciosamente cuestións de inicio como errores no ficherio rc"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "-r <#cols>"
 msgstr "-r <#cols>"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "--fill=<#cols>"
 msgstr "--fill=<#cols>"
 
-#: src/nano.c:906
-msgid "Set wrapping point at column #cols"
-msgstr "Establecer punto de corte na columna #cols"
+#: src/nano.c:939
+msgid "Set hard-wrapping point at column #cols"
+msgstr "Establecer punto de corte forte na columna #cols"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "-s <prog>"
 msgstr "-s <prog>"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "--speller=<prog>"
 msgstr "--speller=<prog>"
 
-#: src/nano.c:910
+#: src/nano.c:943
 msgid "Enable alternate speller"
 msgstr "Usar un corrector ortográfico alternativo"
 
-#: src/nano.c:913
+#: src/nano.c:946
 msgid "Auto save on exit, don't prompt"
 msgstr "Gravar ó saíren, sen preguntar"
 
-#: src/nano.c:915
-msgid "Allow generic undo [EXPERIMENTAL]"
-msgstr ""
-
-#: src/nano.c:918
+#: src/nano.c:947
 msgid "View mode (read-only)"
 msgstr "Modo visualización (só lectura)"
 
-#: src/nano.c:920
-msgid "Don't wrap long lines"
-msgstr "Non corta-las liñas longas"
+#: src/nano.c:949
+msgid "Don't hard-wrap long lines"
+msgstr "Non facer cortado forte liñas longas"
 
-#: src/nano.c:922
+#: src/nano.c:951
 msgid "Don't show the two help lines"
 msgstr "Non amosa-las dúas liñas de axuda"
 
-#: src/nano.c:923
+#: src/nano.c:952
 msgid "Enable suspension"
 msgstr "Permitir suspensión"
 
-#: src/nano.c:924
-#, fuzzy
+#: src/nano.c:954
 msgid "Enable soft line wrapping"
-msgstr "Axuste de liñas longas"
+msgstr "Activar axuste suave de liñas"
 
-#: src/nano.c:928
-msgid "(ignored, for Pico compatibility)"
-msgstr "(iñorado, por compatibilidade con Pico)"
-
-#: src/nano.c:938
+#: src/nano.c:963
 #, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
-msgstr " GNU nano versión %s (compilado %s, %s)\n"
+msgid " GNU nano, version %s\n"
+msgstr " GNU nano versión %s\n"
 
-#: src/nano.c:943
+#: src/nano.c:966
 #, 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:944
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1567,160 +1678,179 @@ msgstr ""
 "\n"
 "Opcións de compilación"
 
-#: src/nano.c:1022
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr "Sentímolo, desactivouse o soporte desta función"
 
-#: src/nano.c:1044
+#: src/nano.c:1125
+msgid "No file name"
+msgstr "Non hai nome de ficheiro"
+
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr ""
 "¿Grava-lo buffer modificado (SE RESPOSTA \"Non\" PERDERANSE OS CAMBIOS)?  "
 
-#: src/nano.c:1088
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
-msgstr ""
+msgstr "Non se puido reabri-la stdin dende o teclado, síntoo\n"
 
-#: src/nano.c:1114
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
-msgstr ""
+msgstr "Lendo dende a stdin, ^C para abortar\n"
 
-#: src/nano.c:1182
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Recibiuse SIGHUP ou SIGTERM\n"
 
-#: src/nano.c:1204
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Empregue \"fg\" para voltar a nano.\n"
 
-#: src/nano.c:1386
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "activado"
 
-#: src/nano.c:1387
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "desactivado"
 
-#: src/nano.c:1548 src/winio.c:1256
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr "Comando Descoñecido"
 
-#: src/nano.c:1674
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "Iñórase XON, hmmmm..."
 
-#: src/nano.c:1679
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "Iñórase XOFF, hmmmm..."
 
-#: src/nano.c:2209 src/rcfile.c:1100
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "O tamaño de lingüeta solicitado \"%s\" non é válido"
 
-#: src/nano.c:2268 src/rcfile.c:1025
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "O tamaño de recheo solicitado \"%s\" non é válido"
 
+#: src/nano.c:2415
+#, 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"
+
 #. 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:1259
+#: src/prompt.c:1055
 msgid "Yy"
 msgstr "SsYy"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1056
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1057
 msgid "Aa"
 msgstr "TtAa"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1071
 msgid "Yes"
 msgstr "Si"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1076
 msgid "All"
 msgstr "Todo"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1081
 msgid "No"
 msgstr "Non"
 
-#: src/rcfile.c:130
+#: src/rcfile.c:137
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Erro en %s na liña %lu: "
 
-#: src/rcfile.c:185
+#: src/rcfile.c:196
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "O argumento '%s' ten un \" sen rematar"
 
-#: src/rcfile.c:212 src/rcfile.c:264 src/rcfile.c:711 src/rcfile.c:768
-#: src/rcfile.c:821
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 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:238 src/search.c:62
+#: src/rcfile.c:249 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Expresión regular \"%s\" incorrecta: %s"
 
-#: src/rcfile.c:258
+#: src/rcfile.c:269
 msgid "Missing syntax name"
 msgstr "Falla o nome da sintaxe"
 
-#: src/rcfile.c:316
+#: src/rcfile.c:340
 msgid "The \"none\" syntax is reserved"
 msgstr "A sintaxe \"none\" está reservada"
 
-#: src/rcfile.c:323
+#: src/rcfile.c:347
 msgid "The \"default\" syntax must take no extensions"
 msgstr "A sintaxe \"default\" non debe tomar extensións"
 
-#: src/rcfile.c:386 src/rcfile.c:483
+#: src/rcfile.c:433
 msgid "Missing key name"
 msgstr "Falla o nome de tecla"
 
-#: src/rcfile.c:398 src/rcfile.c:499
-#, fuzzy
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
-msgstr ""
-"asociacións a combinacións de teclas deben comenzar con \"^\",\"M\", ou \"F"
-"\"\n"
+#: src/rcfile.c:442 src/rcfile.c:453
+msgid "Key name is too short"
+msgstr "O nome da tecla é demasiado curto"
+
+#: src/rcfile.c:463
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
+msgstr "O nome de tecla debe comenzar con \"^\",\"M\", ou \"F\""
+
+#: src/rcfile.c:472
+msgid "Must specify a function to bind the key to"
+msgstr "Debe especifica-la función para asociar á tecla"
 
-#: src/rcfile.c:407
-#, fuzzy
-msgid "Must specify function to bind key to"
-msgstr "Debe especifica-la función para asociar á tecla\n"
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:482
+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:418 src/rcfile.c:510
-#, fuzzy
-msgid "Must specify menu to bind key to (or \"all\")"
-msgstr "Debe especifica-lo menú de asociación de tecla (ou \"all\")\n"
+#: src/rcfile.c:489
+#, 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:496
+#, c-format
+msgid "Cannot map name \"%s\" to a menu"
+msgstr "Non se puido sinalar o nome \"%s\" para un menu"
 
-#: src/rcfile.c:426
-#, fuzzy, c-format
-msgid "Could not map name \"%s\" to a function"
-msgstr "Non se puido sinalar o nome \"%s\" para unha función\n"
+#: src/rcfile.c:528
+#, c-format
+msgid "Function '%s' does not exist in menu '%s'"
+msgstr "A función '%s' non existe no menú '%s'"
 
-#: src/rcfile.c:432 src/rcfile.c:517
-#, fuzzy, c-format
-msgid "Could not map name \"%s\" to a menu"
-msgstr "Non se puido sinalar o nome \"%s\" para un menu\n"
+#: src/rcfile.c:543
+#, c-format
+msgid "Sorry, keystroke \"%s\" may not be rebound"
+msgstr "Síntoo, a combinación \"%s\" non se pode restablecer"
 
-#: src/rcfile.c:454
-#, fuzzy, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
-msgstr "Síntoo, keystr \"%s\" é una asociación ilegal\n"
+#: src/rcfile.c:629
+#, c-format
+msgid "Error expanding %s: %s"
+msgstr "Erro expandindo %s: %s"
 
-#: src/rcfile.c:625
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1735,138 +1865,195 @@ msgstr ""
 "\"black\", co prefixo opcional \"bright\".\n"
 "\"para cores de fronte."
 
-#: src/rcfile.c:647
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
 msgstr ""
 "Non se pode engadir unha directiva de cor sen unha directiva de sintaxe "
 
-#: src/rcfile.c:652
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "Falla o nome da cor"
 
-#: src/rcfile.c:672
-#, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr "A cor de fondo \"%s\" non pode ser relucinte"
-
-#: src/rcfile.c:690 src/rcfile.c:809
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr "Perdeuse a cadea de expreg"
 
-#: src/rcfile.c:762
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\" precisa dun \"end=\" correspondente"
 
-#: src/rcfile.c:804
+#: src/rcfile.c:837
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr "A cor de fondo \"%s\" non pode ser relucinte"
+
+#: src/rcfile.c:865
 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:874
+#: src/rcfile.c:921
+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:926
+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:990
+msgid "Missing linter command"
+msgstr "Falla a directiva de analizador"
+
+#: src/rcfile.c:1010
+msgid "Cannot add formatter without a syntax command"
+msgstr "Non se pode engadir un formateador sen unha directiva de sintaxe "
+
+#: src/rcfile.c:1015
+msgid "Missing formatter command"
+msgstr "Directiva de formato non atopado"
+
+#: src/rcfile.c:1045
 #, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
-msgstr "Erro fatal: non hai teclas sinaladas para a función \"%s\""
+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:876
+#: src/rcfile.c:1047
+#, c-format
 msgid ""
-"Exiting.  Please use nano with the -I option if needed to adjust your nanorc "
-"settings\n"
+"If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
-"Saíndo. Por favor, use nano coa opción -I se precisa axeita-la súa "
-"configuración no nanorc\n"
+"Se o precisa, use nano coa opción -I se precisa axeita-la súa configuración "
+"no nanorc\n"
 
-#: src/rcfile.c:926 src/rcfile.c:935 src/rcfile.c:945
+#: src/rcfile.c:1108
+#, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "Non se puido atopar sintaxe \"%s\" para extender"
+
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
-msgstr "O comando \"%s\" non se permite no ficheiro incluído"
+msgstr "A directiva \"%s\" non se permite no ficheiro incluído"
 
-#: src/rcfile.c:951 src/rcfile.c:1128
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "A sintaxe \"%s\" non ten directiva de cor"
 
-#: src/rcfile.c:966
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
-msgstr "Non se entende o comando \"%s\""
+msgstr "Non se entende a directiva \"%s\""
 
-#: src/rcfile.c:972
-msgid "Missing flag"
-msgstr "Falla o indicador"
+#: src/rcfile.c:1186
+msgid "Missing option"
+msgstr "Opción non atopada"
 
-#: src/rcfile.c:994
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "A opción \"%s\" precisa dun argumento"
 
-#: src/rcfile.c:1012
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr "A opción non é unha cadea multibyte válida"
 
-#: src/rcfile.c:1038 src/rcfile.c:1066 src/rcfile.c:1075
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr "Se requiren caracteres non baleiros"
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr "Se requiren dous caracteres de columna simple"
 
-#: src/rcfile.c:1114
+#: src/rcfile.c:1339
 #, c-format
-msgid "Cannot unset flag \"%s\""
-msgstr "Non se pode desactiva-lo indicador \"%s\""
+msgid "Cannot unset option \"%s\""
+msgstr "Non se pode desactivar opción \"%s\""
 
-#: src/rcfile.c:1123
+#: src/rcfile.c:1345
 #, c-format
-msgid "Unknown flag \"%s\""
-msgstr "Indicador descoñecido \"%s\""
+msgid "Unknown option \"%s\""
+msgstr "Opción descoñecida \"%s\""
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr "¡Non podo atopa-lo meu directorio de inicio! ¡Aaagh!"
 
+#: src/rcfile.c:1442
+#, c-format
+msgid ""
+"\n"
+"Press Enter to continue starting nano.\n"
+msgstr ""
+"\n"
+"Prema Enter para seguir iniciando nano.\n"
+
 #: src/search.c:96
 #, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "non se atopou \"%.*s%s\""
 
-#: src/search.c:205
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/search.c:184
+msgid " [Case Sensitive]"
+msgstr " [Sensible ás Maiúsculas/Minúsculas]"
+
+#: src/search.c:188
+msgid " [Regexp]"
+msgstr " [Expreg]"
+
+#: src/search.c:192
+msgid " [Backwards]"
+msgstr " [Cara Atrás]"
+
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:197
 msgid " (to replace) in selection"
 msgstr "(para substituír) na selección"
 
-#: src/search.c:207
+#: src/search.c:199
 msgid " (to replace)"
 msgstr "(para substituír)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "¿Substituír?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:945
 msgid "Replace with"
 msgstr "Substituír por"
 
-#: src/search.c:1004
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
 msgstr[0] "Fíxose %lu substitución"
 msgstr[1] "Fixéronse %lu substitucións"
 
-#: src/search.c:1034
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr "Introduza liña número, columna número"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
 msgstr "Número de liña ou columna non válida"
 
-#: src/search.c:1214
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "Non hai delimitador"
 
-#: src/search.c:1281
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "Non hai parella do delimitador"
 
@@ -1878,222 +2065,279 @@ msgstr "Marca activada"
 msgid "Mark Unset"
 msgstr "Marca desactivada"
 
-#: src/text.c:443
+#: src/text.c:439
 msgid "Nothing in undo buffer!"
 msgstr "Buffer para desfacer baleiro"
 
-#: src/text.c:455 src/text.c:593
+#: src/text.c:445 src/text.c:590
 #, c-format
-msgid "Internal error: can't match line %d.  Please save your work"
+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 "
 
-#: src/text.c:466 src/text.c:603
+#: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
 msgstr "engadir texto"
 
-#: src/text.c:475 src/text.c:613
+#: src/text.c:467 src/text.c:612
 msgid "text delete"
 msgstr "borrar texto"
 
-#: src/text.c:489 src/text.c:628
-#, fuzzy
-msgid "line wrap"
-msgstr "Axuste de liñas longas"
-
-#: src/text.c:503 src/text.c:636
+#: src/text.c:491 src/text.c:641
 msgid "line join"
 msgstr "unir liña"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:505 src/text.c:657
 msgid "text cut"
 msgstr "cortar texto"
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:510 src/text.c:661
 msgid "text uncut"
 msgstr "repór texto"
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:515 src/text.c:623
 msgid "line break"
-msgstr ""
+msgstr "ruptura de liña"
 
-#: src/text.c:532 src/text.c:665
+#: src/text.c:528 src/text.c:672
 msgid "text insert"
 msgstr "inserir texto"
 
-#: src/text.c:550 src/text.c:659
+#: src/text.c:549 src/text.c:665
 msgid "text replace"
 msgstr "substituir texto"
 
-#: src/text.c:557 src/text.c:671
-msgid "Internal error: unknown type.  Please save your work"
+#: src/text.c:556 src/text.c:679 src/text.c:983
+msgid "Internal error: unknown type.  Please save your work."
 msgstr "Erro interno: tipo descoñecido. Por favor, grave o seu traballo"
 
-#: src/text.c:563
+#: src/text.c:561
 #, c-format
 msgid "Undid action (%s)"
 msgstr "Desfíxose a acción (%s)"
 
-#: src/text.c:578
+#: src/text.c:580
 msgid "Nothing to re-do!"
 msgstr "Nada para refacer"
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
+#: src/text.c:584
+msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
-"Erro interno: fallou a configuracion de refacer. Por favor, grave o seu "
-"traballo "
+"Erro interno: non podo arranxa-la reposición de texto. Por favor, grave o "
+"seu traballo."
 
-#: src/text.c:676
+#: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr "A Acción (%s) refíxose"
 
-#: src/text.c:766
-msgid "Could not pipe"
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
+msgid "Could not create pipe"
 msgstr "Non se puido crear unha canle"
 
-#: src/text.c:793 src/text.c:2636 src/text.c:2788
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "Non se puido iniciar outro proceso"
 
-#: src/text.c:941
-msgid "Internal error: can't setup uncut.  Please save your work."
+#: src/text.c:969
+msgid "Internal error: cannot set up uncut.  Please save your work."
 msgstr ""
 "Erro interno: non podo arranxa-la reposición de texto. Por favor, grave o "
 "seu traballo."
 
-#: src/text.c:950
-msgid "Internal error: unknown type.  Please save your work."
-msgstr "Erro interno: tipo descoñecido. Por favor, grave o seu traballo"
-
-#: src/text.c:1870
+#: src/text.c:1806
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Cadea de cita %s incorrecta: %s"
 
-#: src/text.c:2267
+#: src/text.c:2207
 msgid "Can now UnJustify!"
 msgstr "¡Agora pode De-Xustificar!"
 
-#: src/text.c:2462
+#: src/text.c:2404
 msgid "Edit a replacement"
 msgstr "Editar unha substitución"
 
-#: src/text.c:2548
-msgid "Could not create pipe"
-msgstr "Non se puido crear unha canle"
-
-#: src/text.c:2550
+#: src/text.c:2492
 msgid "Creating misspelled word list, please wait..."
 msgstr "Creando a lista de palabras mal escritas, por favor, espere..."
 
-#: src/text.c:2642
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
 msgstr "Non se puido obte-lo tamaño do buffer da canle"
 
-#: src/text.c:2693
+#: src/text.c:2635
 msgid "Error invoking \"spell\""
 msgstr "Erro ó chamar \"spell\""
 
-#: src/text.c:2696
+#: src/text.c:2638
 msgid "Error invoking \"sort -f\""
 msgstr "Erro ó chamar \"sort -f\""
 
-#: src/text.c:2699
+#: src/text.c:2641
 msgid "Error invoking \"uniq\""
 msgstr "Erro ó chamar \"uniq\""
 
-#: src/text.c:2756 src/text.c:2965
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "Rematou a corrección ortográfica"
 
-#: src/text.c:2815
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Erro ó chamar \"%s\""
 
-#: src/text.c:2960
+#: src/text.c:2885
+msgid "Invoking spell checker, please wait"
+msgstr "Chamar ó corrector ortográfico, agarde, por favor"
+
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Fallou a revisión ortográfica: %s"
 
-#: src/text.c:2962
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Fallou a corrección ortográfica: %s: %s"
 
-#: src/text.c:3030
+#: src/text.c:2937
+msgid "No linter defined for this type of file!"
+msgstr "Non hai definido analizador para este tipo de ficheiros"
+
+#: src/text.c:2947
+msgid "Save modified buffer before linting?"
+msgstr "Gravar o buffer modificado antes da análise"
+
+#: src/text.c:2969
+msgid "Invoking linter, please wait"
+msgstr "Invocando analizador de sintaxe, por favor, espere"
+
+#: src/text.c:3125
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr "Atopáronse 0 liñas analizables pola directiva: %s"
+
+#: src/text.c:3159
+#, 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:3205
+msgid "At last message"
+msgstr "No final da mensaxe"
+
+#: src/text.c:3210
+msgid "At first message"
+msgstr "No comenzo da mensaxe"
+
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr "Erro: non hai formateador definido"
+
+#: src/text.c:3275
+msgid "Finished"
+msgstr "Finalizado"
+
+#: src/text.c:3280
+msgid "Invoking formatter, please wait"
+msgstr "Chamando ó formateador, por favor, agarde"
+
+#: src/text.c:3360
+msgid "Finished formatting"
+msgstr "Finalizou o formateado"
+
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sVerbas: %lu  Liñas: %ld  Caracteres: %lu"
 
-#: src/text.c:3031
+#: src/text.c:3439
 msgid "In Selection:  "
 msgstr "In Selección:  "
 
-#: src/utils.c:405 src/utils.c:417
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3453
+msgid "Verbatim Input"
+msgstr "Entrada Literal"
+
+#: src/utils.c:410 src/utils.c:422
 msgid "nano is out of memory!"
 msgstr "¡A nano esgotóuselle a memoria!"
 
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
-#: src/winio.c:1557
+#: src/winio.c:1583
 msgid "Unicode Input"
 msgstr "Entrada Unicode"
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2142 src/winio.c:2146
 msgid "Modified"
 msgstr "Modificado"
 
-#: src/winio.c:2150
+#: src/winio.c:2143
 msgid "View"
 msgstr "Ver"
 
-#: src/winio.c:2164
+#: src/winio.c:2157
 msgid "DIR:"
 msgstr "DIR:"
 
-#: src/winio.c:2171
+#: src/winio.c:2164
 msgid "File:"
 msgstr "Ficheiro:"
 
-#: src/winio.c:3360
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2261
+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/winio.c:3377
 #, 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:3492
+#: src/winio.c:3507
 msgid "The nano text editor"
 msgstr "O editor de texto nano"
 
-#: src/winio.c:3493
+#: src/winio.c:3508
 msgid "version"
 msgstr "versión"
 
-#: src/winio.c:3494
+#: src/winio.c:3509
 msgid "Brought to you by:"
 msgstr "Por cortesía de:"
 
-#: src/winio.c:3495
+#: src/winio.c:3510
 msgid "Special thanks to:"
 msgstr "Gracias en especial a:"
 
-#: src/winio.c:3496
+#: src/winio.c:3511
 msgid "The Free Software Foundation"
 msgstr "A Free Software Foundation"
 
-#: src/winio.c:3497
+#: src/winio.c:3512
+msgid "the many translators and the TP"
+msgstr "os moitos tradutores e o TP"
+
+#: src/winio.c:3513
 msgid "For ncurses:"
 msgstr "Por ncurses:"
 
-#: src/winio.c:3498
+#: src/winio.c:3514
 msgid "and anyone else we forgot..."
 msgstr "e a todos os que esquencemos..."
 
-#: src/winio.c:3499
+#: src/winio.c:3515
 msgid "Thank you for using nano!"
 msgstr "¡Gracias por usar nano!"
 
-#~ msgid "line split"
-#~ msgstr "dividir liña"
+#~ msgid "Internal error: can't match line %ld.  Please save your work."
+#~ msgstr ""
+#~ "Erro interno: non podo atopar a liña %ld. Por favor, grave o seu traballo "
diff --git a/po/hu.gmo b/po/hu.gmo
index 278074e..2cc590d 100644
--- a/po/hu.gmo
+++ b/po/hu.gmo
diff --git a/po/hu.po b/po/hu.po
index bfbce8f..5a93e0f 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,6 +1,6 @@
-# Hungarian translation of nano
-# This file is distributed under the same license as the nano package.
+# Hungarian translation of nano.
 # Copyright (C) 2001, 2002, 2006, 2008, 2009, 2010 Free Software Foundation, Inc.
+# This file is distributed under the same license as the nano package.
 #
 # Szabolcs Horvath <horvaths@fi.inf.elte.hu>, 2001.
 # Gergely Nagy <algernon@debian.org>, 2002.
@@ -10,116 +10,141 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 2.2.2pre1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-22 06:34-0500\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
 "PO-Revision-Date: 2010-03-03 12:57+0100\n"
 "Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
+"Language: hu\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: KBabel 1.11.4\n"
 
-#: src/browser.c:220
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:203
 msgid "Go To Directory"
 msgstr "Könyvtárváltás"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:860 src/files.c:2048
-#: src/nano.c:1060 src/search.c:220 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Megszakítva"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:246 src/browser.c:293
 #, c-format
 msgid "Can't go outside of %s in restricted mode"
 msgstr "Korlátozott módban nem léphet ki a következőből: %s"
 
-#: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:722
-#: src/files.c:731 src/files.c:1540 src/files.c:1659 src/files.c:1711
-#: src/files.c:1732 src/files.c:1855 src/files.c:2691 src/rcfile.c:568
-#: src/rcfile.c:1204
+#: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
+#: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
+#: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Hiba %s olvasásakor: %s"
 
-#: src/browser.c:303
+#: src/browser.c:283
 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:665 src/browser.c:674
+#: src/browser.c:626 src/browser.c:635
 msgid "(dir)"
 msgstr "(könyvtár)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:632
 msgid "(parent dir)"
 msgstr "(szülőkvt)"
 
-#: src/browser.c:801 src/search.c:185
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "Keresés"
 
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:805 src/search.c:189
-msgid " [Case Sensitive]"
-msgstr " [kis/Nagy]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:811 src/search.c:195
-msgid " [Regexp]"
-msgstr " [Regexp]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:817 src/search.c:201
-msgid " [Backwards]"
-msgstr " [Vissza]"
-
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "A keresés körbeért"
 
-#: src/browser.c:1006 src/browser.c:1039 src/search.c:514 src/search.c:517
-#: src/search.c:574 src/search.c:577
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "Ez az egyetlen előfordulás"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr "Nincs keresési minta"
 
-#: src/files.c:125
+#: src/files.c:139
+msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
+msgstr ""
+
+#: src/files.c:145
+#, c-format
+msgid "Couldn't determine hostname for lock file: %s"
+msgstr ""
+
+#: src/files.c:165 src/files.c:175 src/files.c:212 src/files.c:222
+#, fuzzy, c-format
+msgid "Error writing lock file %s: %s"
+msgstr "Hiba a biztonságimentés-fájl (%s) írásakor: %s"
+
+#: src/files.c:237
+#, fuzzy, c-format
+msgid "Error deleting lock file %s: %s"
+msgstr "Hiba a biztonságimentés-fájl (%s) írásakor: %s"
+
+#: src/files.c:272
+#, fuzzy, c-format
+msgid "Error opening lock file %s: %s"
+msgstr "Hiba a biztonságimentés-fájl (%s) írásakor: %s"
+
+#: src/files.c:282
+#, 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:297
+#, c-format
+msgid "File %s is being edited (by %s with %s, PID %d); continue?"
+msgstr ""
+
+#: src/files.c:308
+#, fuzzy, c-format
+msgid "Error writing lock file: Directory '%s' doesn't exist"
+msgstr "Hiba a biztonságimentés-fájl (%s) írásakor: %s"
+
+#: src/files.c:339
 #, 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:234
+#: src/files.c:467
 msgid "No more open file buffers"
 msgstr "Nincs több nyitott fájlpuffer"
 
-#: src/files.c:250
+#: src/files.c:484
 #, c-format
 msgid "Switched to %s"
 msgstr "Átváltva erre: %s"
 
-#: src/files.c:251 src/global.c:469 src/winio.c:2168
+#: src/files.c:485 src/global.c:953 src/winio.c:2161
 msgid "New Buffer"
 msgstr "Új puffer"
 
-#: src/files.c:633
+#: src/files.c:874
 #, 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:638
+#: src/files.c:879
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
@@ -134,14 +159,14 @@ msgstr[1] ""
 "%lu sor beolvasva (DOS és Mac formátumról átalakítva - Figyelmeztetés: nincs "
 "írásjog)"
 
-#: src/files.c:644
+#: src/files.c:885
 #, 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:648
+#: src/files.c:889
 #, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
@@ -154,14 +179,14 @@ msgstr[1] ""
 "%lu sor beolvasva (Mac formátumról átalakítva - Figyelmeztetés: nincs "
 "írásjog)"
 
-#: src/files.c:654
+#: src/files.c:895
 #, 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:658
+#: src/files.c:899
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
@@ -174,476 +199,436 @@ msgstr[1] ""
 "%lu sor beolvasva (DOS formátumról átalakítva - Figyelmeztetés: nincs "
 "írásjog)"
 
-#: src/files.c:664
+#: src/files.c:905
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "%lu sor beolvasva"
 msgstr[1] "%lu sor beolvasva"
 
-#: src/files.c:667
+#: src/files.c:908
 #, 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:700 src/files.c:736
+#: src/files.c:943 src/files.c:980
 msgid "Reading File"
 msgstr "Fájl beolvasása"
 
-#: src/files.c:706
+#: src/files.c:950
 msgid "New File"
 msgstr "Új fájl"
 
-#: src/files.c:709
+#: src/files.c:953
 #, c-format
 msgid "\"%s\" not found"
 msgstr "„%s” nem található"
 
-#: src/files.c:717 src/rcfile.c:559 src/rcfile.c:1154 src/rcfile.c:1195
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "„%s” egy könyvtár"
 
-#: src/files.c:718 src/rcfile.c:560 src/rcfile.c:1155 src/rcfile.c:1196
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "A(z) „%s” egy eszközfájl"
 
-#: src/files.c:817
+#: src/files.c:1060
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Az új pufferben futtatandó parancs [ebből: %s] "
 
-#: src/files.c:819
+#: src/files.c:1062
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Futtatandó parancs [ebből: %s] "
 
-#: src/files.c:825
+#: src/files.c:1069
 #, 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:827
+#: src/files.c:1071
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Beszúrandó fájl [ebből: %s] "
 
-#: src/files.c:1077
+#: src/files.c:1320
 msgid "Key invalid in non-multibuffer mode"
 msgstr "A billentyű illegális nem többpufferes módban"
 
-#: src/files.c:1486
+#: src/files.c:1622
+msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+msgstr ""
+
+#: src/files.c:1746
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Nem lehet a következőn kívülre írni: %s"
 
-#: src/files.c:1501
+#: src/files.c:1761
 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 "
 "állítva"
 
-#: src/files.c:1581 src/files.c:1603 src/files.c:1621 src/files.c:1632
-#: src/files.c:1640 src/files.c:1667
+#: src/files.c:1843 src/files.c:1868 src/files.c:1886 src/files.c:1899
+#: src/files.c:1910 src/files.c:1939
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Hiba a biztonságimentés-fájl (%s) írásakor: %s"
 
-#: src/files.c:1582 src/nano.c:701
+#: src/files.c:1844 src/nano.c:719
 msgid "Too many backup files?"
 msgstr "Túl sok biztonsági mentés van?"
 
-#: src/files.c:1687 src/files.c:1744 src/files.c:1763 src/files.c:1775
-#: src/files.c:1799 src/files.c:1817 src/files.c:1827 src/files.c:1863
-#: src/files.c:1868 src/files.c:2764 src/files.c:2773
+#: src/files.c:1959 src/files.c:2016 src/files.c:2035 src/files.c:2047
+#: src/files.c:2071 src/files.c:2089 src/files.c:2099 src/files.c:2135
+#: src/files.c:2140 src/files.c:3101 src/files.c:3110 src/files.c:3133
+#: src/files.c:3145
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Hiba „%s” írása közben: %s"
 
-#: src/files.c:1721 src/text.c:2929 src/text.c:2941
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Hiba az ideiglenes fájl írásakor: %s"
 
-#: src/files.c:1900
+#: src/files.c:2173
 #, 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:2004
+#: src/files.c:2278
 msgid " [DOS Format]"
 msgstr " [DOS formátum]"
 
-#: src/files.c:2005
+#: src/files.c:2279
 msgid " [Mac Format]"
 msgstr " [Mac formátum]"
 
-#: src/files.c:2007
+#: src/files.c:2281
 msgid " [Backup]"
 msgstr " [Biztonsági mentés]"
 
-#: src/files.c:2015
+#: src/files.c:2289
 msgid "Prepend Selection to File"
 msgstr "A kiválasztott rész beszúrása a szöveg elé"
 
-#: src/files.c:2016
+#: src/files.c:2290
 msgid "Append Selection to File"
 msgstr "A kiválasztott rész hozzáfűzése a fájlhoz"
 
-#: src/files.c:2017
+#: src/files.c:2291
 msgid "Write Selection to File"
 msgstr "A kiválasztott rész mentése fájlba"
 
-#: src/files.c:2020
+#: src/files.c:2294
 msgid "File Name to Prepend to"
 msgstr "Beszúrás ezen fájl elé"
 
-#: src/files.c:2021
+#: src/files.c:2295
 msgid "File Name to Append to"
 msgstr "Hozzáfűzés ehhez a fájlhoz"
 
-#: src/files.c:2022
+#: src/files.c:2296
 msgid "File Name to Write"
 msgstr "Mentés ebbe a fájlba"
 
-#: src/files.c:2153
+#: src/files.c:2427
 msgid "File exists, OVERWRITE ? "
 msgstr "A fájl már létezik, FELÜLÍRJA? "
 
-#: src/files.c:2162
+#: src/files.c:2436
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "Menti a fájlt MÁS NÉVEN? "
 
-#: src/files.c:2173
+#: src/files.c:2450
 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:2611
+#: src/files.c:2882
 msgid "(more)"
 msgstr "(tovább)"
 
-#: src/files.c:2694 src/rcfile.c:1220
-#, c-format
+#: src/files.c:2974
+#, fuzzy, c-format
 msgid ""
 "\n"
-"Press Enter to continue starting nano.\n"
+"Press Enter to continue\n"
 msgstr ""
 "\n"
 "A nano indításának folytatásához nyomja le az Enter billentyűt.\n"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:415 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Mégsem"
-
-#: src/global.c:416
-msgid "Replace"
-msgstr "Csere"
+#: src/files.c:2989
+#, c-format
+msgid ""
+"Unable to create directory %s: %s\n"
+"It is required for saving/loading search history or cursor positions.\n"
+msgstr ""
 
-#: src/global.c:417
-msgid "No Replace"
-msgstr "Nincs csere"
+#: src/files.c:2995
+#, 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/global.c:420
-msgid "Case Sens"
-msgstr "Kis/Nagy"
+#: src/files.c:3012
+#, 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/global.c:421
-msgid "Backwards"
-msgstr "Vissza"
+#: src/files.c:3016
+#, 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 ""
 
-#: src/global.c:425
-msgid "Regexp"
-msgstr "Regkif"
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
+#: src/global.c:477
+msgid "Exit"
+msgstr "Kilépés"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:451
-msgid "PrevHstory"
-msgstr "ElőzőElőzm"
+#: src/global.c:478
+msgid "Close"
+msgstr "Bezárás"
 
-#: src/global.c:452
-msgid "NextHstory"
-msgstr "KövElőzm"
+#: src/global.c:479
+#, fuzzy
+msgid "Uncut Text"
+msgstr "Beillesztés"
 
-#: src/global.c:453
-msgid "Go To Text"
-msgstr "Ugrás szövegre"
+#: src/global.c:481
+#, fuzzy
+msgid "Unjustify"
+msgstr "Nem sork."
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:455
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:485
 msgid "WhereIs Next"
 msgstr "Következőre"
 
-#: src/global.c:457
-msgid "First File"
-msgstr "Első fájl"
-
-#: src/global.c:458
-msgid "Last File"
-msgstr "Utolsó fájl"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:460
-msgid "To Files"
-msgstr "Tallózás"
-
-#: src/global.c:462
-msgid "DOS Format"
-msgstr "DOS formátum"
-
-#: src/global.c:463
-msgid "Mac Format"
-msgstr "Mac formátum"
-
-#: src/global.c:464
-msgid "Append"
-msgstr "Hozzáfűz"
-
-#: src/global.c:465
-msgid "Prepend"
-msgstr "Elejére beszúrás"
-
-#: src/global.c:466
-msgid "Backup File"
-msgstr "Bizt. fájlmentés"
-
-#: src/global.c:467
-msgid "Execute Command"
-msgstr "Parancs végrehajtása"
-
-#: src/global.c:471
-msgid "Go To Dir"
-msgstr "Könyvtárba"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:480
-msgid "Get Help"
-msgstr "Súgó"
-
-#: src/global.c:481
-msgid "Exit"
-msgstr "Kilépés"
-
-#: src/global.c:482
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:492
 msgid "Where Is"
 msgstr "Keresés"
 
-#: src/global.c:483
-msgid "Prev Page"
-msgstr "Előző old."
-
-#: src/global.c:484
-msgid "Next Page"
-msgstr "Köv. old."
-
-#: src/global.c:485
-msgid "First Line"
-msgstr "Első sor"
+#: src/global.c:493
+msgid "Replace"
+msgstr "Csere"
 
-#: src/global.c:486
-msgid "Last Line"
-msgstr "Utolsó sor"
+#: src/global.c:494
+msgid "Go To Line"
+msgstr "Ugrás sorra"
 
-#: src/global.c:487
-msgid "Suspend"
-msgstr "Felfüggesztés"
+#: src/global.c:495
+msgid "Prev Line"
+msgstr "Előző sor"
 
-#: src/global.c:489
-msgid "Beg of Par"
-msgstr "Bek. kezdete"
+#: src/global.c:496
+msgid "Next Line"
+msgstr "Köv. sor"
 
-#: src/global.c:490
-msgid "End of Par"
-msgstr "Bek. vége"
+#: src/global.c:497
+msgid "Read File"
+msgstr "Beolvasás"
 
-#: src/global.c:491
+#: src/global.c:499
 msgid "FullJstify"
 msgstr "Sorkizár"
 
-#: src/global.c:493
+#: src/global.c:501
 msgid "Refresh"
 msgstr "Frissít"
 
-#: src/global.c:495
-msgid "Insert File"
-msgstr "Fájl beszúrása"
-
-#: src/global.c:497
-msgid "Go To Line"
-msgstr "Ugrás sorra"
-
-#: src/global.c:500
+#. 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:507
 msgid "Justify the current paragraph"
 msgstr "Aktuális bekezdés sorkizárttá rendezése"
 
-#. 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:505
+#: src/global.c:509
 msgid "Cancel the current function"
 msgstr "Aktuális művelet megszakítása"
 
-#: src/global.c:506
+#: src/global.c:510
 msgid "Display this help text"
 msgstr "Ezen súgószöveg megjelenítése"
 
-#: src/global.c:509
+#: src/global.c:513
 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:511
+#: src/global.c:515
 msgid "Exit from nano"
 msgstr "Kilépés a nanoból"
 
-#: src/global.c:515
+#: src/global.c:519
 msgid "Write the current file to disk"
 msgstr "Az aktuális fájl lemezre mentése"
 
-#: src/global.c:517
+#: src/global.c:521
 msgid "Insert another file into the current one"
 msgstr "Másik fájl beszúrása"
 
-#: src/global.c:519
+#: src/global.c:523
 msgid "Search for a string or a regular expression"
 msgstr "Karakterlánc vagy reguláris kifejezés keresése"
 
-#: src/global.c:520
-msgid "Go to previous screen"
-msgstr "Ugrás az előző oldalra"
+#: src/global.c:526
+#, fuzzy
+msgid "Search for a string"
+msgstr "Karakterlánc vagy reguláris kifejezés keresése"
 
-#: src/global.c:521
-msgid "Go to next screen"
+#: src/global.c:528
+#, fuzzy
+msgid "Go one screenful up"
 msgstr "Ugrás a következő oldalra"
 
-#: src/global.c:523
+#: src/global.c:529
+#, fuzzy
+msgid "Go one screenful down"
+msgstr "Ugrás a következő oldalra"
+
+#: src/global.c:531
 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:525
+#: src/global.c:533
 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:527
+#: src/global.c:534
 msgid "Display the position of the cursor"
 msgstr "A kurzor helyének megjelenítése"
 
-#: src/global.c:529
+#: src/global.c:536
 msgid "Invoke the spell checker, if available"
 msgstr "A helyesírás-ellenőrző indítása, ha elérhető"
 
-#: src/global.c:531
+#: src/global.c:538
 msgid "Replace a string or a regular expression"
 msgstr "Karakterlánc vagy reguláris kifejezés cseréje"
 
-#: src/global.c:532
+#: src/global.c:539
 msgid "Go to line and column number"
 msgstr "Ugrás megadott pozícióra"
 
-#: src/global.c:534
-msgid "Mark text at the cursor position"
+#: src/global.c:541
+#, fuzzy
+msgid "Mark text starting from the cursor position"
 msgstr "A kurzornál lévő szöveg kijelölése"
 
-#: src/global.c:535
-msgid "Repeat last search"
+#: src/global.c:542
+#, fuzzy
+msgid "Repeat the last search"
 msgstr "Az utolsó keresés megismétlése"
 
-#: src/global.c:537
+#: src/global.c:544
 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:538
+#: src/global.c:545
 msgid "Indent the current line"
 msgstr "Aktuális sor behúzása"
 
-#: src/global.c:539
+#: src/global.c:546
 msgid "Unindent the current line"
 msgstr "Aktuális sor behúzásának megszüntetése"
 
-#: src/global.c:540
+#: src/global.c:547
 msgid "Undo the last operation"
 msgstr "Utolsó művelet visszavonása"
 
-#: src/global.c:541
+#: src/global.c:548
 msgid "Redo the last undone operation"
 msgstr "Az utoljára visszavont művelet ismétlése"
 
-#: src/global.c:543
+#: src/global.c:550
 msgid "Go forward one character"
 msgstr "Egy karakterrel előre"
 
-#: src/global.c:544
+#: src/global.c:551
 msgid "Go back one character"
 msgstr "Egy karakterrel vissza"
 
-#: src/global.c:546
+#: src/global.c:553
 msgid "Go forward one word"
 msgstr "Egy szóval előre"
 
-#: src/global.c:547
+#: src/global.c:554
 msgid "Go back one word"
 msgstr "Egy szóval vissza"
 
-#: src/global.c:549
+#: src/global.c:556
 msgid "Go to previous line"
 msgstr "Az előző sorra"
 
-#: src/global.c:550
+#: src/global.c:557
 msgid "Go to next line"
 msgstr "A következő sorra"
 
-#: src/global.c:551
+#: src/global.c:558
 msgid "Go to beginning of current line"
 msgstr "A sor elejére"
 
-#: src/global.c:552
+#: src/global.c:559
 msgid "Go to end of current line"
 msgstr "A sor végére"
 
-#: src/global.c:555
+#: src/global.c:562
 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:557
+#: src/global.c:564
 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:560
+#: src/global.c:566
 msgid "Go to the first line of the file"
 msgstr "A fájl első sorára"
 
-#: src/global.c:562
+#: src/global.c:567
 msgid "Go to the last line of the file"
 msgstr "A fájl utolsó sorára"
 
-#: src/global.c:564
+#: src/global.c:569
 msgid "Go to the matching bracket"
 msgstr "Az illeszkedő zárójelre"
 
-#: src/global.c:566
+#: src/global.c:571
 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:568
+#: src/global.c:573
 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:572
+#: src/global.c:576
 msgid "Switch to the previous file buffer"
 msgstr "Váltás az előző fájlpufferre"
 
-#: src/global.c:574
+#: src/global.c:577
 msgid "Switch to the next file buffer"
 msgstr "Váltás a következő fájlpufferre"
 
-#: src/global.c:577
+#: src/global.c:579
 msgid "Insert the next keystroke verbatim"
 msgstr "A következő billentyűleütés szó szerinti beszúrása"
 
-#: src/global.c:579
+#: src/global.c:580
 msgid "Insert a tab at the cursor position"
 msgstr "Tabulátor beszúrása a kurzor helyére"
 
@@ -651,330 +636,448 @@ msgstr "Tabulátor beszúrása a kurzor helyére"
 msgid "Insert a newline at the cursor position"
 msgstr "Új sor beszúrása a kurzor helyére"
 
-#: src/global.c:583
+#: src/global.c:582
 msgid "Delete the character under the cursor"
 msgstr "A kurzor helyén lévő karakter törlése"
 
-#: src/global.c:585
+#: src/global.c:584
 msgid "Delete the character to the left of the cursor"
 msgstr "A kurzor előtt álló karakter törlése"
 
-#: src/global.c:588
+#: src/global.c:587
 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:591
+#: src/global.c:590
 msgid "Justify the entire file"
 msgstr "Az egész fájl sorkizárttá rendezése"
 
-#: src/global.c:595
+#: src/global.c:594
 msgid "Count the number of words, lines, and characters"
 msgstr "A szavak, sorok és karakterek megszámolása"
 
-#: src/global.c:598
+#: src/global.c:597
 msgid "Refresh (redraw) the current screen"
 msgstr "A képernyő frissítése"
 
-#: src/global.c:600
+#: src/global.c:599
 msgid "Suspend the editor (if suspend is enabled)"
 msgstr "A szerkesztő felfüggesztése (ha engedélyezett)"
 
-#: src/global.c:603
+#: src/global.c:602
 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:605
+#: src/global.c:604
 msgid "Reverse the direction of the search"
 msgstr "A keresés irányának megfordítása"
 
-#: src/global.c:609
+#: src/global.c:608
 msgid "Toggle the use of regular expressions"
 msgstr "Reguláris kifejezések használatának átváltása"
 
-#: src/global.c:613
+#: src/global.c:612
 msgid "Recall the previous search/replace string"
 msgstr "Az előző kereső- vagy cserekifejezés előhozása"
 
-#: src/global.c:615
+#: src/global.c:614
 msgid "Recall the next search/replace string"
 msgstr "A következő kereső- vagy cserekifejezés előhozása"
 
-#: src/global.c:618
+#: src/global.c:617
 msgid "Go to file browser"
 msgstr "Tallózás"
 
-#: src/global.c:621
+#: src/global.c:620
 msgid "Toggle the use of DOS format"
 msgstr "DOS formátum használatának átváltása"
 
-#: src/global.c:622
+#: src/global.c:621
 msgid "Toggle the use of Mac format"
 msgstr "Mac formátum használatának átváltása"
 
-#: src/global.c:624
+#: src/global.c:622
 msgid "Toggle appending"
 msgstr "Hozzáfűzés átváltása"
 
-#: src/global.c:625
+#: src/global.c:623
 msgid "Toggle prepending"
 msgstr "Elejére beszúrás átváltása"
 
-#: src/global.c:628
+#: src/global.c:624
 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:629
+#: src/global.c:625
 msgid "Execute external command"
 msgstr "Külső parancs végrehajtása"
 
-#: src/global.c:633
+#: src/global.c:628
 msgid "Toggle the use of a new buffer"
 msgstr "Új puffer használatának átváltása"
 
-#: src/global.c:636
+#: src/global.c:631
 msgid "Exit from the file browser"
 msgstr "Kilépés a fájlböngészőből"
 
-#: src/global.c:638
+#: src/global.c:632
 msgid "Go to the first file in the list"
 msgstr "Ugrás a lista első fájljára"
 
-#: src/global.c:640
+#: src/global.c:633
 msgid "Go to the last file in the list"
 msgstr "Ugrás a lista utolsó fájljára"
 
-#: src/global.c:641
-msgid "Go to the next file in the list"
-msgstr "Ugrás a lista következő fájljára"
-
-#: src/global.c:642
+#: src/global.c:634
 msgid "Go to the previous file in the list"
 msgstr "Ugrás a lista előző fájljára"
 
-#: src/global.c:643
+#: src/global.c:635
+msgid "Go to the next file in the list"
+msgstr "Ugrás a lista következő fájljára"
+
+#: src/global.c:636
 msgid "Go to directory"
 msgstr "Könyvtárváltás"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:670
-msgid "Close"
-msgstr "Bezárás"
+#: src/global.c:639
+#, fuzzy
+msgid "Invoke the linter, if available"
+msgstr "A helyesírás-ellenőrző indítása, ha elérhető"
+
+#: src/global.c:640
+#, fuzzy
+msgid "Go to previous linter msg"
+msgstr "Az előző sorra"
+
+#: src/global.c:641
+#, fuzzy
+msgid "Go to next linter msg"
+msgstr "A következő sorra"
+
+#: src/global.c:642
+#, fuzzy
+msgid "Invoke formatter, if available"
+msgstr "A helyesírás-ellenőrző indítása, ha elérhető"
+
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:662
+msgid "Get Help"
+msgstr "Súgó"
+
+#: src/global.c:665 src/prompt.c:1084
+msgid "Cancel"
+msgstr "Mégsem"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:679
-msgid "WriteOut"
+#: src/global.c:678
+#, fuzzy
+msgid "Write Out"
 msgstr "Mentés"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:704
+msgid "Go To Dir"
+msgstr "Könyvtárba"
+
+#: src/global.c:719
+msgid "Cut Text"
+msgstr "Kivágás"
+
+#: src/global.c:728
 msgid "Justify"
 msgstr "Sorkizárás"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:696
-msgid "Read File"
-msgstr "Beolvasás"
+#: src/global.c:733
+msgid "To Spell"
+msgstr "Helyes-e?"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:713
-msgid "Cut Text"
-msgstr "Kivágás"
+#: src/global.c:738
+#, fuzzy
+msgid "To Linter"
+msgstr "Ugrás sorra"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:718
-msgid "UnJustify"
-msgstr "Nem sork."
+#: src/global.c:740
+#, fuzzy
+msgid "Formatter"
+msgstr "DOS formátum"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:723
-msgid "UnCut Text"
-msgstr "Beillesztés"
+#: src/global.c:745
+msgid "Case Sens"
+msgstr "Kis/Nagy"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:728 src/global.c:755
+#: src/global.c:750
+msgid "Regexp"
+msgstr "Regkif"
+
+#: src/global.c:755
+msgid "Backwards"
+msgstr "Vissza"
+
+#: src/global.c:762
+msgid "No Replace"
+msgstr "Nincs csere"
+
+#: src/global.c:770
 msgid "Cur Pos"
 msgstr "Pozíció"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:737
-msgid "To Spell"
-msgstr "Helyes-e?"
+#: src/global.c:780
+msgid "Prev Page"
+msgstr "Előző old."
+
+#: src/global.c:782
+msgid "Next Page"
+msgstr "Köv. old."
+
+#: src/global.c:785
+msgid "First Line"
+msgstr "Első sor"
+
+#: src/global.c:787
+msgid "Last Line"
+msgstr "Utolsó sor"
+
+#: src/global.c:794
+#, fuzzy
+msgid "To Bracket"
+msgstr "Nem zárójel"
 
-#: src/global.c:771
+#: src/global.c:797
 msgid "Mark Text"
 msgstr "Kijelöl"
 
-#: src/global.c:777
+#: src/global.c:800
 msgid "Copy Text"
 msgstr "Szöveg másolása"
 
-#: src/global.c:780
+#: src/global.c:803
 msgid "Indent Text"
 msgstr "Szövegbehúzás"
 
-#: src/global.c:783
+#: src/global.c:805
 msgid "Unindent Text"
 msgstr "Szövegbehúzás megsz."
 
-#: src/global.c:787
+#: src/global.c:808
 msgid "Undo"
 msgstr "Vissza"
 
-#: src/global.c:790
+#: src/global.c:810
 msgid "Redo"
 msgstr "Újra"
 
-#: src/global.c:796 src/global.c:800
-msgid "Forward"
-msgstr "Előre"
-
-#: src/global.c:806 src/global.c:810
+#: src/global.c:814 src/global.c:820
 msgid "Back"
 msgstr "Vissza"
 
-#: src/global.c:817
-msgid "Next Word"
-msgstr "Köv. szó"
+#: src/global.c:816 src/global.c:822
+msgid "Forward"
+msgstr "Előre"
 
-#: src/global.c:820
+#: src/global.c:827
 msgid "Prev Word"
 msgstr "Előző szó"
 
-#: src/global.c:824
-msgid "Prev Line"
-msgstr "Előző sor"
-
-#: src/global.c:827
-msgid "Next Line"
-msgstr "Köv. sor"
+#: src/global.c:829
+msgid "Next Word"
+msgstr "Köv. szó"
 
-#: src/global.c:830
+#: src/global.c:833
 msgid "Home"
 msgstr "Eleje"
 
-#: src/global.c:833
+#: src/global.c:835
 msgid "End"
 msgstr "Vége"
 
-#: src/global.c:845
-msgid "Find Other Bracket"
-msgstr "Másik zárójel megkeresése"
+#: src/global.c:844
+msgid "Beg of Par"
+msgstr "Bek. kezdete"
+
+#: src/global.c:846
+msgid "End of Par"
+msgstr "Bek. vége"
 
-#: src/global.c:848
+#: src/global.c:851
 msgid "Scroll Up"
 msgstr "Görgetés fel"
 
-#: src/global.c:851
+#: src/global.c:853
 msgid "Scroll Down"
 msgstr "Görgetés le"
 
-#: src/global.c:856
-msgid "Previous File"
+#: src/global.c:858
+#, fuzzy
+msgid "Prev File"
 msgstr "Előző fájl"
 
-#: src/global.c:858
+#: src/global.c:860
 msgid "Next File"
 msgstr "Következő fájl"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:862 src/text.c:3045
-msgid "Verbatim Input"
+#: src/global.c:869
+#, fuzzy
+msgid "Verbatim"
 msgstr "Szó szerinti bevitel"
 
-#: src/global.c:867
+#: src/global.c:872
 msgid "Tab"
 msgstr "Tabulátor"
 
-#: src/global.c:870
+#: src/global.c:874
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:873
+#: src/global.c:876
 msgid "Delete"
 msgstr "Törlés"
 
-#: src/global.c:876
+#: src/global.c:878
 msgid "Backspace"
 msgstr "Visszalép"
 
-#: src/global.c:893
+#: src/global.c:888
 msgid "CutTillEnd"
 msgstr "KivágAVégéig"
 
-#: src/global.c:906
+#: src/global.c:898
 msgid "Word Count"
 msgstr "Szavak száma"
 
-#: src/global.c:1367
+#: src/global.c:905
+msgid "Suspend"
+msgstr "Felfüggesztés"
+
+#: src/global.c:910
+msgid "PrevHstory"
+msgstr "ElőzőElőzm"
+
+#: src/global.c:913
+msgid "NextHstory"
+msgstr "KövElőzm"
+
+#: src/global.c:917
+msgid "Go To Text"
+msgstr "Ugrás szövegre"
+
+#: src/global.c:928
+msgid "DOS Format"
+msgstr "DOS formátum"
+
+#: src/global.c:931
+msgid "Mac Format"
+msgstr "Mac formátum"
+
+#: src/global.c:934
+msgid "Append"
+msgstr "Hozzáfűz"
+
+#: src/global.c:936
+msgid "Prepend"
+msgstr "Elejére beszúrás"
+
+#: src/global.c:939
+msgid "Backup File"
+msgstr "Bizt. fájlmentés"
+
+#: src/global.c:946
+msgid "Execute Command"
+msgstr "Parancs végrehajtása"
+
+#: src/global.c:961
+msgid "To Files"
+msgstr "Tallózás"
+
+#: src/global.c:964
+msgid "First File"
+msgstr "Első fájl"
+
+#: src/global.c:966
+msgid "Last File"
+msgstr "Utolsó fájl"
+
+#: src/global.c:977
+#, fuzzy
+msgid "Prev Lint Msg"
+msgstr "Előző sor"
+
+#: src/global.c:979
+#, fuzzy
+msgid "Next Lint Msg"
+msgstr "Köv. sor"
+
+#. TRANSLATORS: The next seventeen strings are toggle descriptions;
+#. * they are best kept shorter than 40 characters, but may be longer.
+#: src/global.c:1227
 msgid "Help mode"
 msgstr "Súgó mód"
 
-#: src/global.c:1369
+#: src/global.c:1229
 msgid "Constant cursor position display"
 msgstr "Kurzor pozíciójának állandó mutatása"
 
-#: src/global.c:1371
+#: src/global.c:1231
 msgid "Use of one more line for editing"
 msgstr "Eggyel több sor használata a szerkesztéshez"
 
-#: src/global.c:1373
+#: src/global.c:1233
 msgid "Smooth scrolling"
 msgstr "Egyenletes görgetés"
 
-#: src/global.c:1375
+#: src/global.c:1235
+#, fuzzy
+msgid "Soft wrapping of overlong lines"
+msgstr "Ne tördelje a hosszú sorokat"
+
+#: src/global.c:1237
 msgid "Whitespace display"
 msgstr "Üreshely karakterek megjelenítése"
 
-#: src/global.c:1377
+#: src/global.c:1239
 msgid "Color syntax highlighting"
 msgstr "Színes szintaxiskiemelés"
 
-#: src/global.c:1379
+#: src/global.c:1241
 msgid "Smart home key"
 msgstr "Intelligens home billentyű"
 
-#: src/global.c:1381
+#: src/global.c:1243
 msgid "Auto indent"
 msgstr "Automatikus igazítás"
 
-#: src/global.c:1383
+#: src/global.c:1245
 msgid "Cut to end"
 msgstr "Kivágás a végéig"
 
-#: src/global.c:1385
-msgid "Long line wrapping"
-msgstr "Hosszú sorok tördelése"
+#: src/global.c:1247
+#, fuzzy
+msgid "Hard wrapping of overlong lines"
+msgstr "Ne tördelje a hosszú sorokat"
 
-#: src/global.c:1387
+#: src/global.c:1249
 msgid "Conversion of typed tabs to spaces"
 msgstr "Bevitt tabulátorok szóközzé alakítása"
 
-#: src/global.c:1389
+#: src/global.c:1251
 msgid "Backup files"
 msgstr "Fájlok biztonsági mentése"
 
-#: src/global.c:1391
+#: src/global.c:1253
 msgid "Multiple file buffers"
 msgstr "Több fájlpuffer"
 
-#: src/global.c:1393
+#: src/global.c:1255
 msgid "Mouse support"
 msgstr "Egér támogatása"
 
-#: src/global.c:1395
+#: src/global.c:1257
 msgid "No conversion from DOS/Mac format"
 msgstr "Ne legyen átalakítás DOS/Mac formátumból"
 
-#: src/global.c:1397
+#: src/global.c:1259
 msgid "Suspension"
 msgstr "Felfüggesztés"
 
-#: src/global.c:1399
-msgid "Soft line wrapping"
-msgstr "Laza sortördelés"
-
-#: src/help.c:236
+#: src/help.c:205
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -995,7 +1098,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:245
+#: src/help.c:214
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1009,7 +1112,7 @@ msgstr ""
 " Kereső módban a következő funkcióbillentyűk állnak rendelkezésre:\n"
 "\n"
 
-#: src/help.c:251
+#: src/help.c:220
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1029,7 +1132,7 @@ msgstr ""
 " Sorra ugrás módban a következő funkcióbillentyűk állnak rendelkezésre:\n"
 "\n"
 
-#: src/help.c:260
+#: src/help.c:229
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1052,7 +1155,7 @@ msgstr ""
 "külön pufferbe fog betöltődni (melyek között a Meta-< és > gombokkal lehet "
 "navigálni).  "
 
-#: src/help.c:269
+#: src/help.c:238
 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"
@@ -1066,7 +1169,7 @@ msgstr ""
 " Fájlbeszúrás módban a következő funkcióbillentyűk állnak rendelkezésre:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:244
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1095,7 +1198,7 @@ msgstr ""
 " Fájlmentés módban a következő funkcióbillentyűk állnak rendelkezésre:\n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:258
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1120,7 +1223,7 @@ msgstr ""
 " A fájlböngészőben a következő funkcióbillentyűk állnak rendelkezésre:\n"
 "\n"
 
-#: src/help.c:302
+#: src/help.c:271
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1144,7 +1247,7 @@ msgstr ""
 "kerül megismétlésre.\n"
 "\n"
 
-#: src/help.c:311
+#: src/help.c:280
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1152,7 +1255,7 @@ msgstr ""
 " A következő funkcióbillentyűk állnak rendelkezésre keresés módban:\n"
 "\n"
 
-#: src/help.c:315
+#: src/help.c:284
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1175,7 +1278,7 @@ msgstr ""
 "rendelkezésre:\n"
 "\n"
 
-#: src/help.c:328
+#: src/help.c:297
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1200,7 +1303,7 @@ msgstr ""
 "rendelkezésre:\n"
 "\n"
 
-#: src/help.c:343
+#: src/help.c:312
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1221,7 +1324,7 @@ msgstr ""
 " Parancs-végrehajtási módban a következő billentyűk állnak rendelkezésre:\n"
 "\n"
 
-#: src/help.c:356
+#: src/help.c:325
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1241,7 +1344,7 @@ msgstr ""
 "amely az épp szerkesztett fájl mutatja. Az állapotsor alulról a harmadik "
 "sor, és fontos üzeneteket jelenít meg.  "
 
-#: src/help.c:366
+#: src/help.c:335
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1260,7 +1363,7 @@ msgstr ""
 "sorozatai a Meta (M) szimbólum jelöli és az Esc, Alt vagy Meta billentyűk "
 "egyikével vihető be, a billentyűzet beállításaitól függően.  "
 
-#: src/help.c:375
+#: src/help.c:344
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1274,15 +1377,15 @@ msgstr ""
 "billentyűk zárójelben vannak megjelenítve:\n"
 "\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:376 src/help.c:448
 msgid "enable/disable"
 msgstr "be/kikapcsolása"
 
-#: src/nano.c:587
+#: src/nano.c:601
 msgid "Key invalid in view mode"
 msgstr "A billentyű illegális megjelenítés módban"
 
-#: src/nano.c:695
+#: src/nano.c:713
 #, c-format
 msgid ""
 "\n"
@@ -1291,7 +1394,7 @@ msgstr ""
 "\n"
 "A puffer a(z) %s fájlba írva\n"
 
-#: src/nano.c:697
+#: src/nano.c:715
 #, c-format
 msgid ""
 "\n"
@@ -1300,7 +1403,7 @@ msgstr ""
 "\n"
 "A puffer nem lett a(z) %s fájlba írva: %s\n"
 
-#: src/nano.c:700
+#: src/nano.c:718
 #, c-format
 msgid ""
 "\n"
@@ -1309,11 +1412,11 @@ msgstr ""
 "\n"
 "A puffer nem került mentésre: %s\n"
 
-#: src/nano.c:723
+#: src/nano.c:743
 msgid "Window size is too small for nano...\n"
 msgstr "Az ablak mérete túl kicsi a nanonak…\n"
 
-#: src/nano.c:816
+#: src/nano.c:836
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
@@ -1322,279 +1425,287 @@ msgstr ""
 "Használat: nano [KAPCSOLÓK] [[+SOR,OSZLOP] FÁJL]...\n"
 "\n"
 
-#: src/nano.c:819
+#: src/nano.c:839
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Kapcsoló\t\tGNU hosszú kapcsoló\t\tJelentés\n"
 
-#: src/nano.c:821
+#: src/nano.c:841
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Kapcsoló\t\tJelentés\n"
 
-#: src/nano.c:824
-msgid "Show this message"
-msgstr "Ezen üzenet kiírása"
-
-#: src/nano.c:825
+#: src/nano.c:844
 msgid "+LINE,COLUMN"
 msgstr "+SOR,OSZLOP"
 
-#: src/nano.c:826
+#. TRANSLATORS: The next forty or so strings are option descriptions
+#. * for the --help output.  Try to keep them at most 40 characters.
+#: src/nano.c:847
 msgid "Start at line LINE, column COLUMN"
 msgstr "A SOR. sorban és OSZLOP. oszlopban kezd"
 
-#: src/nano.c:828
+#: src/nano.c:849
 msgid "Enable smart home key"
 msgstr "Okos home billentyű engedélyezése"
 
-#: src/nano.c:829
+#: src/nano.c:850
 msgid "Save backups of existing files"
 msgstr ""
 "Meglévő fájlokról biztonsági másolatok\n"
 "\t\t\t\t\t  mentése"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "-C <dir>"
 msgstr "-C <könyvtár>"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<könyvtár>"
 
-#: src/nano.c:831
+#: src/nano.c:852
 msgid "Directory for saving unique backup files"
 msgstr ""
 "Az egyedi biztonsági mentés fájlok\n"
 "\t\t\t\t\t  mentési könyvtára"
 
-#: src/nano.c:834
+#: src/nano.c:855
 msgid "Use bold instead of reverse video text"
 msgstr ""
 "Félkövér használata invertált szöveg\n"
 "\t\t\t\t\t  helyett"
 
-#: src/nano.c:837
+#: src/nano.c:858
 msgid "Convert typed tabs to spaces"
 msgstr ""
 "Beírt tab karakterek átalakítása\n"
 "\t\t\t\t\t  szóközökké"
 
-#: src/nano.c:840
+#: src/nano.c:861
 msgid "Enable multiple file buffers"
 msgstr "Több fájlpuffer engedélyezése"
 
-#: src/nano.c:845
+#: src/nano.c:865
+msgid "Use (vim-style) lock files"
+msgstr ""
+
+#: src/nano.c:869
 msgid "Log & read search/replace string history"
 msgstr ""
 "Keresés/csere előzményeinek naplózása\n"
 "\t\t\t\t\t  és olvasása"
 
-#: src/nano.c:848
+#: src/nano.c:873
 msgid "Don't look at nanorc files"
 msgstr "nanorc fájlok keresésének kihagyása"
 
-#: src/nano.c:851
+#: src/nano.c:876
 msgid "Fix numeric keypad key confusion problem"
 msgstr ""
 "A numerikus billentyűzet zavarainak\n"
 "\t\t\t\t\t  javítása"
 
-#: src/nano.c:853
+#: src/nano.c:878
 msgid "Don't add newlines to the ends of files"
 msgstr "Ne adjon új sorokat a fájlok végéhez"
 
-#: src/nano.c:856
+#: src/nano.c:881
 msgid "Don't convert files from DOS/Mac format"
 msgstr ""
 "Ne alakítsa át a fájlokat DOS/Mac\n"
 "\t\t\t\t\t  formátumról"
 
-#: src/nano.c:858
+#: src/nano.c:883
 msgid "Use one more line for editing"
 msgstr ""
 "Eggyel több sor használata a\n"
 "\t\t\t\t\t  szerkesztéshez"
 
-#: src/nano.c:860
+#: src/nano.c:886
+#, fuzzy
+msgid "Log & read location of cursor position"
+msgstr "Tabulátor beszúrása a kurzor helyére"
+
+#: src/nano.c:889
 msgid "-Q <str>"
 msgstr "-Q <szöveg>"
 
-#: src/nano.c:860
+#: src/nano.c:889
 msgid "--quotestr=<str>"
 msgstr "--quotestr=<szöveg>"
 
-#: src/nano.c:861
+#: src/nano.c:890
 msgid "Quoting string"
 msgstr "Idézetszöveg"
 
-#: src/nano.c:863
+#: src/nano.c:892
 msgid "Restricted mode"
 msgstr "Korlátozott mód"
 
-#: src/nano.c:866
+#: src/nano.c:895
 msgid "Scroll by line instead of half-screen"
 msgstr "Görgetés soronként fél képernyő helyett"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "-T <#cols>"
 msgstr "-T <#oszlop>"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#oszlop>"
 
-#: src/nano.c:869
+#: src/nano.c:898
 msgid "Set width of a tab to #cols columns"
 msgstr ""
 "A tabulátorszélesség legyen #oszlop\n"
 "\t\t\t\t\t  oszlop"
 
-#: src/nano.c:871
+#: src/nano.c:900
 msgid "Do quick statusbar blanking"
 msgstr "Törölje gyorsan az állapotsort"
 
-#: src/nano.c:874
+#: src/nano.c:903
 msgid "Print version information and exit"
 msgstr "Verziószám kiírása és kilépés"
 
-#: src/nano.c:877
+#: src/nano.c:906
 msgid "Detect word boundaries more accurately"
 msgstr "Szóhatárok pontosabb észlelése"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "-Y <str>"
 msgstr "-Y <szöveg>"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "--syntax=<str>"
 msgstr "--syntax=<szöveg>"
 
-#: src/nano.c:881
+#: src/nano.c:910
 msgid "Syntax definition to use for coloring"
 msgstr ""
 "A színezéshez használandó\n"
 "\t\t\t\t\t  szintaxisleírás"
 
-#: src/nano.c:883
+#: src/nano.c:912
 msgid "Constantly show cursor position"
 msgstr "Kurzor pozíciójának állandó mutatása"
 
-#: src/nano.c:885
+#: src/nano.c:914
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Visszatörlés/törlés zavarainak javítása"
 
-#: src/nano.c:888
+#: src/nano.c:915
+#, fuzzy
+msgid "Show this help text"
+msgstr "Ezen súgószöveg megjelenítése"
+
+#: src/nano.c:918
 msgid "Automatically indent new lines"
 msgstr "Új sorok automatikus behúzása"
 
-#: src/nano.c:889
+#: src/nano.c:919
 msgid "Cut from cursor to end of line"
 msgstr "Kivágás a kurzor helyétől a sor végéig"
 
-#: src/nano.c:892
+#: src/nano.c:922
 msgid "Don't follow symbolic links, overwrite"
 msgstr ""
 "Szimbolikus linkek követése helyett\n"
 "\t\t\t\t\t  felülírás"
 
-#: src/nano.c:894
+#: src/nano.c:924
 msgid "Enable the use of the mouse"
 msgstr "Egér használatának engedélyezése"
 
-#: src/nano.c:897
+#: src/nano.c:926
+msgid "Do not read the file (only write it)"
+msgstr ""
+
+#: src/nano.c:928
 msgid "-o <dir>"
 msgstr "-o <könyvtár>"
 
-#: src/nano.c:897
+#: src/nano.c:928
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<könyvtár>"
 
-#: src/nano.c:898
+#: src/nano.c:929
 msgid "Set operating directory"
 msgstr "Munkakönyvtár beállítása"
 
-#: src/nano.c:901
+#: src/nano.c:932
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr ""
 "XON (^Q) és XOFF (^S) billentyűk\n"
 "\t\t\t\t\t  megőrzése"
 
-#: src/nano.c:903
+#: src/nano.c:935
 msgid "Silently ignore startup issues like rc file errors"
 msgstr "Indítási hibák, például rc-fájlhibák csendes mellőzése"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "-r <#cols>"
 msgstr "-r <#oszlop>"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "--fill=<#cols>"
 msgstr "--fill=<#oszlop>"
 
-#: src/nano.c:906
-msgid "Set wrapping point at column #cols"
+#: src/nano.c:939
+#, fuzzy
+msgid "Set hard-wrapping point at column #cols"
 msgstr "Töréspont beállítása a #oszlop oszlopnál"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "-s <prog>"
 msgstr "-s <prog>"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "--speller=<prog>"
 msgstr "--speller=<prog>"
 
-#: src/nano.c:910
+#: src/nano.c:943
 msgid "Enable alternate speller"
 msgstr ""
 "Alternatív helyesírás-ellenőrző\n"
 "\t\t\t\t\t  használata"
 
-#: src/nano.c:913
+#: src/nano.c:946
 msgid "Auto save on exit, don't prompt"
 msgstr "Automatikus mentés kilépéskor"
 
-#: src/nano.c:915
-msgid "Allow generic undo [EXPERIMENTAL]"
-msgstr "Általános visszavonás engedélyezése [KÍSÉRLETI]"
-
-#: src/nano.c:918
+#: src/nano.c:947
 msgid "View mode (read-only)"
 msgstr "Megjelenítés mód (csak olvasható)"
 
-#: src/nano.c:920
-msgid "Don't wrap long lines"
+#: src/nano.c:949
+#, fuzzy
+msgid "Don't hard-wrap long lines"
 msgstr "Ne tördelje a hosszú sorokat"
 
-#: src/nano.c:922
+#: src/nano.c:951
 msgid "Don't show the two help lines"
 msgstr "A két súgósor elrejtése"
 
-#: src/nano.c:923
+#: src/nano.c:952
 msgid "Enable suspension"
 msgstr "Felfüggesztés engedélyezése"
 
-#: src/nano.c:924
+#: src/nano.c:954
 msgid "Enable soft line wrapping"
 msgstr "Laza sortördelés engedélyezése"
 
-#: src/nano.c:928
-msgid "(ignored, for Pico compatibility)"
-msgstr ""
-"(A Pico kompatibilitás érdekében\n"
-"\t\t\t\t\t mellőzve)"
-
-#: src/nano.c:938
-#, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
+#: src/nano.c:963
+#, fuzzy, c-format
+msgid " GNU nano, version %s\n"
 msgstr " GNU nano %s verzió. (fordítva: %s, %s)\n"
 
-#: src/nano.c:943
+#: src/nano.c:966
 #, 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:944
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1603,157 +1714,181 @@ msgstr ""
 "\n"
 " Fordítási kapcsolók:"
 
-#: src/nano.c:1022
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr "Elnézést, a funkció támogatása ki van kapcsolva"
 
-#: src/nano.c:1044
+#: src/nano.c:1125
+msgid "No file name"
+msgstr ""
+
+#: src/nano.c:1136
 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)? "
 
-#: src/nano.c:1088
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "Az stdin nem nyitható újra a billentyűzetről.\n"
 
-#: src/nano.c:1114
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "Olvasás stdinről, ^C megszakítja\n"
 
-#: src/nano.c:1182
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "SIGHUP vagy SIGTERM érkezett\n"
 
-#: src/nano.c:1204
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Az „fg” kiadásával visszatérhet a nanohoz.\n"
 
-#: src/nano.c:1386
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "engedélyezve"
 
-#: src/nano.c:1387
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "kikapcsolva"
 
-#: src/nano.c:1548 src/winio.c:1256
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr "Ismeretlen parancs"
 
-#: src/nano.c:1674
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "XON kihagyva, ej-ej"
 
-#: src/nano.c:1679
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF kihagyva, ej-ej"
 
-#: src/nano.c:2209 src/rcfile.c:1100
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "A kért „%s” tabméret érvénytelen"
 
-#: src/nano.c:2268 src/rcfile.c:1025
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "A kért „%s” kitöltésméret érvénytelen"
 
+#: src/nano.c:2415
+#, c-format
+msgid "Type '%s -h' for a list of available options.\n"
+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:1259
+#: src/prompt.c:1055
 msgid "Yy"
 msgstr "IiYy"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1056
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1057
 msgid "Aa"
 msgstr "MmAa"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1071
 msgid "Yes"
 msgstr "Igen"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1076
 msgid "All"
 msgstr "Mindet"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1081
 msgid "No"
 msgstr "Nem"
 
-#: src/rcfile.c:130
+#: src/rcfile.c:137
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Hiba a(z) %s %lu. sorában: "
 
-#: src/rcfile.c:185
+#: src/rcfile.c:196
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "A(z) „%s” argumentum lezáratlan \" jellel rendelkezik"
 
-#: src/rcfile.c:212 src/rcfile.c:264 src/rcfile.c:711 src/rcfile.c:768
-#: src/rcfile.c:821
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 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:238 src/search.c:62
+#: src/rcfile.c:249 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Hibás regex: „%s”: %s"
 
-#: src/rcfile.c:258
+#: src/rcfile.c:269
 msgid "Missing syntax name"
 msgstr "Hiányzó szintaxisnév"
 
-#: src/rcfile.c:316
+#: src/rcfile.c:340
 msgid "The \"none\" syntax is reserved"
 msgstr "A „nincs” szintaxis fenn van tartva"
 
-#: src/rcfile.c:323
+#: src/rcfile.c:347
 msgid "The \"default\" syntax must take no extensions"
 msgstr "Az „alapértelmezett” szintaxis nem vehet fel kiterjesztéseket"
 
-#: src/rcfile.c:386 src/rcfile.c:483
+#: src/rcfile.c:433
 msgid "Missing key name"
 msgstr "Hiányzó kulcsnév"
 
-#: src/rcfile.c:398 src/rcfile.c:499
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
+#: src/rcfile.c:442 src/rcfile.c:453
+msgid "Key name is too short"
+msgstr ""
+
+#: src/rcfile.c:463
+#, fuzzy
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr ""
 "a billentyűtársításoknak a „^”, „M”, vagy „F” egyikével kell kezdődniük"
 
-#: src/rcfile.c:407
-msgid "Must specify function to bind key to"
+#: src/rcfile.c:472
+#, fuzzy
+msgid "Must specify a function to bind the key to"
 msgstr "Meg kell adnia a funkciót, amelyhez billentyűt kíván kötni"
 
-#: src/rcfile.c:418 src/rcfile.c:510
-msgid "Must specify menu to bind key to (or \"all\")"
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:482
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
-"Meg kell adnia a menüt, amelyhez billentyűt kíván kötni (vagy az „all” "
-"értéket)"
 
-#: src/rcfile.c:426
-#, c-format
-msgid "Could not map name \"%s\" to a function"
+#: src/rcfile.c:489
+#, fuzzy, c-format
+msgid "Cannot map name \"%s\" to a function"
 msgstr "A név („%s”) nem képezhető le funkcióra"
 
-#: src/rcfile.c:432 src/rcfile.c:517
-#, c-format
-msgid "Could not map name \"%s\" to a menu"
+#: src/rcfile.c:496
+#, fuzzy, c-format
+msgid "Cannot map name \"%s\" to a menu"
 msgstr "A név („%s”) nem képezhető le menüre"
 
-#: src/rcfile.c:454
+#: src/rcfile.c:528
 #, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
+msgid "Function '%s' does not exist in menu '%s'"
+msgstr ""
+
+#: src/rcfile.c:543
+#, fuzzy, c-format
+msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "A billentyű-karakterlánc („%s”) nem érvényes kötés"
 
-#: src/rcfile.c:625
+#: src/rcfile.c:629
+#, fuzzy, c-format
+msgid "Error expanding %s: %s"
+msgstr "Hiba %s olvasásakor: %s"
+
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1767,135 +1902,196 @@ msgstr ""
 "„white”, „yellow”, „cyan”, „magenta” és \n"
 "„black”, opcionális „bright” előtaggal az előtérszínekhez."
 
-#: src/rcfile.c:647
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
 msgstr "Nem adható meg színparancs szintaxissor nélkül"
 
-#: src/rcfile.c:652
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "Hiányzik a szín neve"
 
-#: src/rcfile.c:672
-#, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr "A(z) „%s” háttérszín nem lehet világos"
-
-#: src/rcfile.c:690 src/rcfile.c:809
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr "Hiányzó regex karaktersorozat"
 
-#: src/rcfile.c:762
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "„start=” -hoz kell egy megfelelő „end=”"
 
-#: src/rcfile.c:804
+#: src/rcfile.c:837
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr "A(z) „%s” háttérszín nem lehet világos"
+
+#: src/rcfile.c:865
 msgid "Cannot add a header regex without a syntax command"
 msgstr "Nem adható meg fejléc regex szintaxisparancs nélkül"
 
-#: src/rcfile.c:874
-#, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
+#: src/rcfile.c:921
+#, fuzzy
+msgid "Cannot add a magic string regex without a syntax command"
+msgstr "Nem adható meg fejléc regex szintaxisparancs nélkül"
+
+#: src/rcfile.c:926
+#, fuzzy
+msgid "Missing magic string name"
+msgstr "Hiányzó regex karaktersorozat"
+
+#: src/rcfile.c:985
+#, fuzzy
+msgid "Cannot add a linter without a syntax command"
+msgstr "Nem adható meg fejléc regex szintaxisparancs nélkül"
+
+#: src/rcfile.c:990
+#, fuzzy
+msgid "Missing linter command"
+msgstr "Hiányzik a szín neve"
+
+#: src/rcfile.c:1010
+#, fuzzy
+msgid "Cannot add formatter without a syntax command"
+msgstr "Nem adható meg színparancs szintaxissor nélkül"
+
+#: src/rcfile.c:1015
+msgid "Missing formatter command"
+msgstr ""
+
+#: src/rcfile.c:1045
+#, fuzzy, 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”)"
 
-#: src/rcfile.c:876
+#: src/rcfile.c:1047
+#, fuzzy, c-format
 msgid ""
-"Exiting.  Please use nano with the -I option if needed to adjust your nanorc "
-"settings\n"
+"If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
 "Kilépés. 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:926 src/rcfile.c:935 src/rcfile.c:945
+#: src/rcfile.c:1108
+#, fuzzy, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "A név („%s”) nem képezhető le menüre"
+
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, 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:951 src/rcfile.c:1128
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "A(z) „%s” szintaxis nem rendelkezik színparancsokkal"
 
-#: src/rcfile.c:966
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "A(z) „%s” parancs nem értelmezhető"
 
-#: src/rcfile.c:972
-msgid "Missing flag"
-msgstr "Hiányzik a jelző"
+#: src/rcfile.c:1186
+#, fuzzy
+msgid "Missing option"
+msgstr "Hiányzik a szín neve"
 
-#: src/rcfile.c:994
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "A(z) „%s” kapcsoló egy paramétert igényel"
 
-#: src/rcfile.c:1012
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr "A kapcsoló nem érvényes több bájtos karaktersorozat"
 
-#: src/rcfile.c:1038 src/rcfile.c:1066 src/rcfile.c:1075
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr "Nem üres karakterek szükségesek"
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr "Két egyoszlopos karakter szükséges"
 
-#: src/rcfile.c:1114
-#, c-format
-msgid "Cannot unset flag \"%s\""
+#: src/rcfile.c:1339
+#, fuzzy, c-format
+msgid "Cannot unset option \"%s\""
 msgstr "A(z) „%s” jelző nem állítható vissza"
 
-#: src/rcfile.c:1123
-#, c-format
-msgid "Unknown flag \"%s\""
+#: src/rcfile.c:1345
+#, fuzzy, c-format
+msgid "Unknown option \"%s\""
 msgstr "Ismeretlen jelző: „%s”"
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr "Nincs meg a saját könyvtár! Hopp!"
 
+#: src/rcfile.c:1442
+#, c-format
+msgid ""
+"\n"
+"Press Enter to continue starting nano.\n"
+msgstr ""
+"\n"
+"A nano indításának folytatásához nyomja le az Enter billentyűt.\n"
+
 #: src/search.c:96
 #, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "A(z) „%.*s%s” nem található"
 
-#: src/search.c:205
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/search.c:184
+msgid " [Case Sensitive]"
+msgstr " [kis/Nagy]"
+
+#: src/search.c:188
+msgid " [Regexp]"
+msgstr " [Regexp]"
+
+#: src/search.c:192
+msgid " [Backwards]"
+msgstr " [Vissza]"
+
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:197
 msgid " (to replace) in selection"
 msgstr " (cseréhez) a kijelölésben"
 
-#: src/search.c:207
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (cseréhez)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "Lecseréli ezt a találatot?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:945
 msgid "Replace with"
 msgstr "Csere ezzel"
 
-#: src/search.c:1004
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
 msgstr[0] "%lu előfordulás cserélve"
 msgstr[1] "%lu előfordulás cserélve"
 
-#: src/search.c:1034
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr "Kérem a sor, oszlop számát"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
 msgstr "Érvénytelen sor- vagy oszlopszám"
 
-#: src/search.c:1214
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "Nem zárójel"
 
-#: src/search.c:1281
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "Nincs illeszkedő zárójel"
 
@@ -1907,214 +2103,319 @@ msgstr "Kijelölés kezdete"
 msgid "Mark Unset"
 msgstr "Kijelölés vége"
 
-#: src/text.c:443
+#: src/text.c:439
 msgid "Nothing in undo buffer!"
 msgstr "A visszavonási puffer üres!"
 
-#: src/text.c:455 src/text.c:593
-#, c-format
-msgid "Internal error: can't match line %d.  Please save your work"
+#: src/text.c:445 src/text.c:590
+#, fuzzy, 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."
 
-#: src/text.c:466 src/text.c:603
+#: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
 msgstr "szöveg hozzáadása"
 
-#: src/text.c:475 src/text.c:613
+#: src/text.c:467 src/text.c:612
 msgid "text delete"
 msgstr "szöveg törlése"
 
-#: src/text.c:489 src/text.c:628
-msgid "line wrap"
-msgstr "sorok körbefuttatása"
-
-#: src/text.c:503 src/text.c:636
+#: src/text.c:491 src/text.c:641
 msgid "line join"
 msgstr "sorok egyesítése"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:505 src/text.c:657
 msgid "text cut"
 msgstr "szöveg kivágása"
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:510 src/text.c:661
 msgid "text uncut"
 msgstr "kivágás visszavonása"
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:515 src/text.c:623
 msgid "line break"
 msgstr "sortörés"
 
-#: src/text.c:532 src/text.c:665
+#: src/text.c:528 src/text.c:672
 msgid "text insert"
 msgstr "szöveg beszúrása"
 
-#: src/text.c:550 src/text.c:659
+#: src/text.c:549 src/text.c:665
 msgid "text replace"
 msgstr "szöveg cseréje"
 
-#: src/text.c:557 src/text.c:671
-msgid "Internal error: unknown type.  Please save your work"
+#: src/text.c:556 src/text.c:679 src/text.c:983
+msgid "Internal error: unknown type.  Please save your work."
 msgstr "Belső hiba: ismeretlen típus. Mentse a munkáját."
 
-#: src/text.c:563
+#: src/text.c:561
 #, c-format
 msgid "Undid action (%s)"
 msgstr "Művelet visszavonva (%s)"
 
-#: src/text.c:578
+#: src/text.c:580
 msgid "Nothing to re-do!"
 msgstr "Nincs mit ismételni."
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
-msgstr "Belső hiba: a visszavonás beállítása sikertelen. Mentse a munkáját."
+#: src/text.c:584
+#, fuzzy
+msgid "Internal error: cannot set up redo.  Please save your work."
+msgstr ""
+"Belső hiba: a kivágás visszavonása nem állítható be. Mentse a munkáját."
 
-#: src/text.c:676
+#: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Művelet megismételve (%s)"
 
-#: src/text.c:766
-msgid "Could not pipe"
-msgstr "Nem küldhető tovább"
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
+msgid "Could not create pipe"
+msgstr "Nem hozható létre a cső"
 
-#: src/text.c:793 src/text.c:2636 src/text.c:2788
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "Nem forkolható"
 
-#: src/text.c:941
-msgid "Internal error: can't setup uncut.  Please save your work."
+#: src/text.c:969
+#, fuzzy
+msgid "Internal error: cannot set up uncut.  Please save your work."
 msgstr ""
 "Belső hiba: a kivágás visszavonása nem állítható be. Mentse a munkáját."
 
-#: src/text.c:950
-msgid "Internal error: unknown type.  Please save your work."
-msgstr "Belső hiba: ismeretlen típus. Mentse a munkáját."
-
-#: src/text.c:1870
+#: src/text.c:1806
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Hibás idézetszöveg: %s: %s"
 
-#: src/text.c:2267
+#: src/text.c:2207
 msgid "Can now UnJustify!"
 msgstr "Most már lehet nem sorkizárttá tenni!"
 
-#: src/text.c:2462
+#: src/text.c:2404
 msgid "Edit a replacement"
 msgstr "A helyettesítő érték módosítása"
 
-#: src/text.c:2548
-msgid "Could not create pipe"
-msgstr "Nem hozható létre a cső"
-
-#: src/text.c:2550
+#: src/text.c:2492
 msgid "Creating misspelled word list, please wait..."
 msgstr "Elgépelt szavak listájának létrehozása, kis türelmet..."
 
-#: src/text.c:2642
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
 msgstr "Nem kérhető le a csőpuffer mérete"
 
-#: src/text.c:2693
+#: src/text.c:2635
 msgid "Error invoking \"spell\""
 msgstr "Hiba a „spell” meghívásakor"
 
-#: src/text.c:2696
+#: src/text.c:2638
 msgid "Error invoking \"sort -f\""
 msgstr "Hiba a „sort -f” meghívásakor"
 
-#: src/text.c:2699
+#: src/text.c:2641
 msgid "Error invoking \"uniq\""
 msgstr "Hiba a „uniq” meghívásakor"
 
-#: src/text.c:2756 src/text.c:2965
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "A helyesírás-ellenőrzés befejeződött"
 
-#: src/text.c:2815
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Hiba a(z) „%s” meghívásakor"
 
-#: src/text.c:2960
+#: src/text.c:2885
+#, fuzzy
+msgid "Invoking spell checker, please wait"
+msgstr "A helyesírás-ellenőrző indítása, ha elérhető"
+
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "A helyesírás-ellenőrzés meghiúsult: %s"
 
-#: src/text.c:2962
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "A helyesírás-ellenőrzés meghiúsult: %s: %s"
 
-#: src/text.c:3030
+#: src/text.c:2937
+#, fuzzy
+msgid "No linter defined for this type of file!"
+msgstr "Ne adjon új sorokat a fájlok végéhez"
+
+#: src/text.c:2947
+msgid "Save modified buffer before linting?"
+msgstr ""
+
+#: src/text.c:2969
+msgid "Invoking linter, please wait"
+msgstr ""
+
+#: src/text.c:3125
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr ""
+
+#: src/text.c:3159
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr ""
+
+#: src/text.c:3205
+#, fuzzy
+msgid "At last message"
+msgstr "Ezen üzenet kiírása"
+
+#: src/text.c:3210
+#, fuzzy
+msgid "At first message"
+msgstr "Ezen üzenet kiírása"
+
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr ""
+
+#: src/text.c:3275
+msgid "Finished"
+msgstr ""
+
+#: src/text.c:3280
+msgid "Invoking formatter, please wait"
+msgstr ""
+
+#: src/text.c:3360
+msgid "Finished formatting"
+msgstr ""
+
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sSzavak: %lu  Sorok: %ld  Karakterek: %lu"
 
-#: src/text.c:3031
+#: src/text.c:3439
 msgid "In Selection:  "
 msgstr "A kiválasztásban:  "
 
-#: src/utils.c:405 src/utils.c:417
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3453
+msgid "Verbatim Input"
+msgstr "Szó szerinti bevitel"
+
+#: src/utils.c:410 src/utils.c:422
 msgid "nano is out of memory!"
 msgstr "nano: elfogyott a memória!"
 
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
-#: src/winio.c:1557
+#: src/winio.c:1583
 msgid "Unicode Input"
 msgstr "Unicode bevitel"
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2142 src/winio.c:2146
 msgid "Modified"
 msgstr "Módosítva"
 
-#: src/winio.c:2150
+#: src/winio.c:2143
 msgid "View"
 msgstr "Nézet"
 
-#: src/winio.c:2164
+#: src/winio.c:2157
 msgid "DIR:"
 msgstr "Könyvtár:"
 
-#: src/winio.c:2171
+#: src/winio.c:2164
 msgid "File:"
 msgstr "Fájl:"
 
-#: src/winio.c:3360
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2261
+msgid ""
+"Warning: Modifying a file which is not locked, check directory permission?"
+msgstr ""
+
+#: src/winio.c:3377
 #, 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:3492
+#: src/winio.c:3507
 msgid "The nano text editor"
 msgstr "A nano szövegszerkesztő"
 
-#: src/winio.c:3493
+#: src/winio.c:3508
 msgid "version"
 msgstr "verzió"
 
-#: src/winio.c:3494
+#: src/winio.c:3509
 msgid "Brought to you by:"
 msgstr "Fejlesztők:"
 
-#: src/winio.c:3495
+#: src/winio.c:3510
 msgid "Special thanks to:"
 msgstr "Külön köszönet:"
 
-#: src/winio.c:3496
+#: src/winio.c:3511
 msgid "The Free Software Foundation"
 msgstr "A Free Software Foundation"
 
-#: src/winio.c:3497
+#: src/winio.c:3512
+msgid "the many translators and the TP"
+msgstr ""
+
+#: src/winio.c:3513
 msgid "For ncurses:"
 msgstr "Az ncurses számára:"
 
-#: src/winio.c:3498
+#: src/winio.c:3514
 msgid "and anyone else we forgot..."
 msgstr "és mindenkinek, akit kifelejtettünk volna..."
 
-#: src/winio.c:3499
+#: src/winio.c:3515
 msgid "Thank you for using nano!"
 msgstr "Köszönjük, hogy a nano-t választotta!"
+
+#~ msgid "Insert File"
+#~ msgstr "Fájl beszúrása"
+
+#~ msgid "Go to previous screen"
+#~ msgstr "Ugrás az előző oldalra"
+
+#~ msgid "Find Other Bracket"
+#~ msgstr "Másik zárójel megkeresése"
+
+#~ msgid "Long line wrapping"
+#~ msgstr "Hosszú sorok tördelése"
+
+#~ msgid "Soft line wrapping"
+#~ msgstr "Laza sortördelés"
+
+#~ msgid "Allow generic undo [EXPERIMENTAL]"
+#~ msgstr "Általános visszavonás engedélyezése [KÍSÉRLETI]"
+
+#~ msgid "(ignored, for Pico compatibility)"
+#~ msgstr ""
+#~ "(A Pico kompatibilitás érdekében\n"
+#~ "\t\t\t\t\t mellőzve)"
+
+#~ msgid "Must specify menu to bind key to (or \"all\")"
+#~ msgstr ""
+#~ "Meg kell adnia a menüt, amelyhez billentyűt kíván kötni (vagy az „all” "
+#~ "értéket)"
+
+#~ msgid "Missing flag"
+#~ msgstr "Hiányzik a jelző"
+
+#~ msgid "line wrap"
+#~ msgstr "sorok körbefuttatása"
+
+#~ msgid "Internal error: unknown type.  Please save your work"
+#~ msgstr "Belső hiba: ismeretlen típus. Mentse a munkáját."
+
+#~ msgid "Internal error: Redo setup failed.  Please save your work"
+#~ msgstr "Belső hiba: a visszavonás beállítása sikertelen. Mentse a munkáját."
+
+#~ msgid "Could not pipe"
+#~ msgstr "Nem küldhető tovább"
diff --git a/po/id.gmo b/po/id.gmo
index 1c84cd6..944f1f1 100644
--- a/po/id.gmo
+++ b/po/id.gmo
diff --git a/po/id.po b/po/id.po
index 8006e27..ed41f0f 100644
--- a/po/id.po
+++ b/po/id.po
@@ -1,122 +1,147 @@
-# nano 1.2.1 (Indonesian)
+# Indonesian translation of nano.
 # Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-# Tedi Heriyanto <tedi_h@gmx.net>, 2001, 2002, 2003
 #
+# Tedi Heriyanto <tedi_h@gmx.net>, 2001, 2002, 2003
 msgid ""
 msgstr ""
 "Project-Id-Version: nano 1.2.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-22 06:34-0500\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\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"
+"Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: src/browser.c:220
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:203
 #, fuzzy
 msgid "Go To Directory"
 msgstr "Ke Direktori"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:860 src/files.c:2048
-#: src/nano.c:1060 src/search.c:220 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Dibatalkan"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:246 src/browser.c:293
 #, c-format
 msgid "Can't go outside of %s in restricted mode"
 msgstr "Tidak dapat keluar %s dalam mode terbatas"
 
-#: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:722
-#: src/files.c:731 src/files.c:1540 src/files.c:1659 src/files.c:1711
-#: src/files.c:1732 src/files.c:1855 src/files.c:2691 src/rcfile.c:568
-#: src/rcfile.c:1204
+#: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
+#: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
+#: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, fuzzy, c-format
 msgid "Error reading %s: %s"
 msgstr "Quote string buruk %s: %s"
 
-#: src/browser.c:303
+#: src/browser.c:283
 msgid "Can't move up a directory"
 msgstr "Tidak dapat memindahkan direktori"
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:665 src/browser.c:674
+#: src/browser.c:626 src/browser.c:635
 msgid "(dir)"
 msgstr ""
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:632
 msgid "(parent dir)"
 msgstr ""
 
-#: src/browser.c:801 src/search.c:185
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "Cari"
 
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:805 src/search.c:189
-msgid " [Case Sensitive]"
-msgstr " [Case Sensitive]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:811 src/search.c:195
-msgid " [Regexp]"
-msgstr " [Regexp]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:817 src/search.c:201
-msgid " [Backwards]"
-msgstr " [Backwards]"
-
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "Pancarian Di-wrapped"
 
-#: src/browser.c:1006 src/browser.c:1039 src/search.c:514 src/search.c:517
-#: src/search.c:574 src/search.c:577
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "Hanya ini adanya"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr ""
 
-#: src/files.c:125
+#: src/files.c:139
+msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
+msgstr ""
+
+#: src/files.c:145
+#, fuzzy, c-format
+msgid "Couldn't determine hostname for lock file: %s"
+msgstr "Tidak dapat menset permisi %o pada %s: %s"
+
+#: src/files.c:165 src/files.c:175 src/files.c:212 src/files.c:222
+#, fuzzy, c-format
+msgid "Error writing lock file %s: %s"
+msgstr "Kesalahan dalam %s pada baris %d: "
+
+#: src/files.c:237
+#, fuzzy, c-format
+msgid "Error deleting lock file %s: %s"
+msgstr "Kesalahan dalam %s pada baris %d: "
+
+#: src/files.c:272
+#, fuzzy, c-format
+msgid "Error opening lock file %s: %s"
+msgstr "Kesalahan dalam %s pada baris %d: "
+
+#: src/files.c:282
+#, 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:297
+#, c-format
+msgid "File %s is being edited (by %s with %s, PID %d); continue?"
+msgstr ""
+
+#: src/files.c:308
+#, c-format
+msgid "Error writing lock file: Directory '%s' doesn't exist"
+msgstr ""
+
+#: src/files.c:339
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Tidak dapat menyisipkan file dari luar %s"
 
-#: src/files.c:234
+#: src/files.c:467
 #, fuzzy
 msgid "No more open file buffers"
 msgstr "Tidak ada file yang terbuka lagi"
 
-#: src/files.c:250
+#: src/files.c:484
 #, c-format
 msgid "Switched to %s"
 msgstr "Beralih ke %s"
 
-#: src/files.c:251 src/global.c:469 src/winio.c:2168
+#: src/files.c:485 src/global.c:953 src/winio.c:2161
 msgid "New Buffer"
 msgstr "Buffer baru"
 
-#: src/files.c:633
+#: src/files.c:874
 #, 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:638
+#: src/files.c:879
 #, fuzzy, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
@@ -126,13 +151,13 @@ msgid_plural ""
 "permission)"
 msgstr[0] "Baca %d baris (Dikonversi dari format Mac)"
 
-#: src/files.c:644
+#: src/files.c:885
 #, 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:648
+#: src/files.c:889
 #, fuzzy, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
@@ -140,13 +165,13 @@ 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:654
+#: src/files.c:895
 #, 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:658
+#: src/files.c:899
 #, fuzzy, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
@@ -154,506 +179,452 @@ 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:664
+#: src/files.c:905
 #, fuzzy, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "Membaca %d baris"
 
-#: src/files.c:667
+#: src/files.c:908
 #, c-format
 msgid "Read %lu line ( Warning: No write permission)"
 msgid_plural "Read %lu lines (Warning: No write permission)"
 msgstr[0] ""
 
-#: src/files.c:700 src/files.c:736
+#: src/files.c:943 src/files.c:980
 msgid "Reading File"
 msgstr "Membaca File"
 
-#: src/files.c:706
+#: src/files.c:950
 msgid "New File"
 msgstr "File Baru"
 
-#: src/files.c:709
+#: src/files.c:953
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" tidak ditemukan"
 
-#: src/files.c:717 src/rcfile.c:559 src/rcfile.c:1154 src/rcfile.c:1195
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" adalah sebuah direktori"
 
-#: src/files.c:718 src/rcfile.c:560 src/rcfile.c:1155 src/rcfile.c:1196
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, fuzzy, c-format
 msgid "\"%s\" is a device file"
 msgstr "File \"%s\" adalah sebuah file device"
 
-#: src/files.c:817
+#: src/files.c:1060
 #, 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:819
+#: src/files.c:1062
 #, fuzzy, c-format
 msgid "Command to execute [from %s] "
 msgstr "Perintah untuk dieksekusi "
 
-#: src/files.c:825
+#: src/files.c:1069
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "File yang akan disisipkan ke buffer baru [dari %s] "
 
-#: src/files.c:827
+#: src/files.c:1071
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "File yang akan disisipkan [dari %s] "
 
-#: src/files.c:1077
+#: src/files.c:1320
 #, fuzzy
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Kunci ilegal dalam mode non-multibuffer"
 
-#: src/files.c:1486
+#: src/files.c:1622
+msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+msgstr ""
+
+#: src/files.c:1746
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Tidak dapat menulis di luar %s"
 
-#: src/files.c:1501
+#: src/files.c:1761
 msgid "Cannot prepend or append to a symlink with --nofollow set"
 msgstr ""
 
-#: src/files.c:1581 src/files.c:1603 src/files.c:1621 src/files.c:1632
-#: src/files.c:1640 src/files.c:1667
+#: src/files.c:1843 src/files.c:1868 src/files.c:1886 src/files.c:1899
+#: src/files.c:1910 src/files.c:1939
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr ""
 
-#: src/files.c:1582 src/nano.c:701
+#: src/files.c:1844 src/nano.c:719
 #, fuzzy
 msgid "Too many backup files?"
 msgstr ""
 "\n"
 "No %s ditulis (terlalu banyak file backup?)\n"
 
-#: src/files.c:1687 src/files.c:1744 src/files.c:1763 src/files.c:1775
-#: src/files.c:1799 src/files.c:1817 src/files.c:1827 src/files.c:1863
-#: src/files.c:1868 src/files.c:2764 src/files.c:2773
+#: src/files.c:1959 src/files.c:2016 src/files.c:2035 src/files.c:2047
+#: src/files.c:2071 src/files.c:2089 src/files.c:2099 src/files.c:2135
+#: src/files.c:2140 src/files.c:3101 src/files.c:3110 src/files.c:3133
+#: src/files.c:3145
 #, fuzzy, c-format
 msgid "Error writing %s: %s"
 msgstr "Quote string buruk %s: %s"
 
-#: src/files.c:1721 src/text.c:2929 src/text.c:2941
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr ""
 
-#: src/files.c:1900
+#: src/files.c:2173
 #, fuzzy, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "Menulis %d baris"
 
-#: src/files.c:2004
+#: src/files.c:2278
 msgid " [DOS Format]"
 msgstr " [DOS Format]"
 
-#: src/files.c:2005
+#: src/files.c:2279
 msgid " [Mac Format]"
 msgstr " [Mac Format]"
 
-#: src/files.c:2007
+#: src/files.c:2281
 msgid " [Backup]"
 msgstr " [Backup]"
 
-#: src/files.c:2015
+#: src/files.c:2289
 msgid "Prepend Selection to File"
 msgstr "Menambahkan Pilihan ke File"
 
-#: src/files.c:2016
+#: src/files.c:2290
 msgid "Append Selection to File"
 msgstr "Menambahkan Pilihan ke File"
 
-#: src/files.c:2017
+#: src/files.c:2291
 msgid "Write Selection to File"
 msgstr "Menulis Pilihan ke File"
 
-#: src/files.c:2020
+#: src/files.c:2294
 msgid "File Name to Prepend to"
 msgstr "Nama file yang akan ditambah ke"
 
-#: src/files.c:2021
+#: src/files.c:2295
 msgid "File Name to Append to"
 msgstr "Nama file yang akan ditambah ke"
 
-#: src/files.c:2022
+#: src/files.c:2296
 msgid "File Name to Write"
 msgstr "Nama File untuk di-Tulis"
 
-#: src/files.c:2153
+#: src/files.c:2427
 #, fuzzy
 msgid "File exists, OVERWRITE ? "
 msgstr "File ada, DITIMPA ?"
 
-#: src/files.c:2162
+#: src/files.c:2436
 msgid "Save file under DIFFERENT NAME ? "
 msgstr ""
 
-#: src/files.c:2173
+#: src/files.c:2450
 msgid "File was modified since you opened it, continue saving ? "
 msgstr ""
 
-#: src/files.c:2611
+#: src/files.c:2882
 msgid "(more)"
 msgstr "(lagi)"
 
-#: src/files.c:2694 src/rcfile.c:1220
+#: src/files.c:2974
 #, fuzzy, c-format
 msgid ""
 "\n"
-"Press Enter to continue starting nano.\n"
-msgstr ""
-"\n"
-"Tekan return untuk lanjut memulai nano\n"
-
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:415 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Batal"
+"Press Enter to continue\n"
+msgstr "Tekan return untuk lanjut\n"
 
-#: src/global.c:416
-msgid "Replace"
-msgstr "Ganti"
+#: src/files.c:2989
+#, c-format
+msgid ""
+"Unable to create directory %s: %s\n"
+"It is required for saving/loading search history or cursor positions.\n"
+msgstr ""
 
-#: src/global.c:417
-msgid "No Replace"
-msgstr "Tiada Replace"
+#: src/files.c:2995
+#, 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/global.c:420
-msgid "Case Sens"
-msgstr "Case Sens"
+#: src/files.c:3012
+#, 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/global.c:421
-#, fuzzy
-msgid "Backwards"
-msgstr " [Backwards]"
+#: src/files.c:3016
+#, 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 ""
 
-#: src/global.c:425
-msgid "Regexp"
-msgstr "Regexp"
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
+#: src/global.c:477
+msgid "Exit"
+msgstr "Keluar"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:451
-#, fuzzy
-msgid "PrevHstory"
-msgstr "Sejarah"
+#: src/global.c:478
+msgid "Close"
+msgstr "Tutup"
 
-#: src/global.c:452
+#: src/global.c:479
 #, fuzzy
-msgid "NextHstory"
-msgstr "Sejarah"
+msgid "Uncut Text"
+msgstr "UnCut Teks"
 
-#: src/global.c:453
+#: src/global.c:481
 #, fuzzy
-msgid "Go To Text"
-msgstr "Ke baris"
+msgid "Unjustify"
+msgstr "UnJustifikasi"
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:455
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:485
 #, fuzzy
 msgid "WhereIs Next"
 msgstr "Di mana"
 
-#: src/global.c:457
-#, fuzzy
-msgid "First File"
-msgstr "Baris pertama"
-
-#: src/global.c:458
-#, fuzzy
-msgid "Last File"
-msgstr "Baris terakhir"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:460
-msgid "To Files"
-msgstr "Ke File"
-
-#: src/global.c:462
-msgid "DOS Format"
-msgstr "Format DOS"
-
-#: src/global.c:463
-msgid "Mac Format"
-msgstr "Format Mac"
-
-#: src/global.c:464
-msgid "Append"
-msgstr "Tambah"
-
-#: src/global.c:465
-msgid "Prepend"
-msgstr "Tambah"
-
-#: src/global.c:466
-msgid "Backup File"
-msgstr "Backup File"
-
-#: src/global.c:467
-msgid "Execute Command"
-msgstr "Eksekusi Perintah"
-
-#: src/global.c:471
-msgid "Go To Dir"
-msgstr "Ke Direktori"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:480
-msgid "Get Help"
-msgstr "Bantuan"
-
-#: src/global.c:481
-msgid "Exit"
-msgstr "Keluar"
-
-#: src/global.c:482
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:492
 msgid "Where Is"
 msgstr "Di mana"
 
-#: src/global.c:483
-msgid "Prev Page"
-msgstr "Hlm sebelumnya"
-
-#: src/global.c:484
-msgid "Next Page"
-msgstr "Hlm berikutnya"
-
-#: src/global.c:485
-msgid "First Line"
-msgstr "Baris pertama"
+#: src/global.c:493
+msgid "Replace"
+msgstr "Ganti"
 
-#: src/global.c:486
-msgid "Last Line"
-msgstr "Baris terakhir"
+#: src/global.c:494
+msgid "Go To Line"
+msgstr "Ke baris"
 
-#: src/global.c:487
-msgid "Suspend"
-msgstr "Tunda"
+#: src/global.c:495
+#, fuzzy
+msgid "Prev Line"
+msgstr "Hlm sebelumnya"
 
-#: src/global.c:489
-msgid "Beg of Par"
-msgstr ""
+#: src/global.c:496
+#, fuzzy
+msgid "Next Line"
+msgstr "File Sesudahnya"
 
-#: src/global.c:490
-msgid "End of Par"
-msgstr ""
+#: src/global.c:497
+msgid "Read File"
+msgstr "Baca File"
 
-#: src/global.c:491
+#: src/global.c:499
 #, fuzzy
 msgid "FullJstify"
 msgstr "Justifikasi"
 
-#: src/global.c:493
+#: src/global.c:501
 msgid "Refresh"
 msgstr "Refresh"
 
-#: src/global.c:495
-#, fuzzy
-msgid "Insert File"
-msgstr "File Sesudahnya"
-
-#: src/global.c:497
-msgid "Go To Line"
-msgstr "Ke baris"
-
-#: src/global.c:500
+#. 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:507
 msgid "Justify the current paragraph"
 msgstr "Justifikasi paragraf saat ini"
 
-#. 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:505
+#: src/global.c:509
 msgid "Cancel the current function"
 msgstr "Batalkan fungsi ini"
 
-#: src/global.c:506
+#: src/global.c:510
 msgid "Display this help text"
 msgstr ""
 
-#: src/global.c:509
+#: src/global.c:513
 #, fuzzy
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Tutup file yang sedang dimuat/Keluar dari nano"
 
-#: src/global.c:511
+#: src/global.c:515
 msgid "Exit from nano"
 msgstr "Keluar dari nano"
 
-#: src/global.c:515
+#: src/global.c:519
 msgid "Write the current file to disk"
 msgstr "Tulis file sekarang ke disk"
 
-#: src/global.c:517
+#: src/global.c:521
 msgid "Insert another file into the current one"
 msgstr "Sertakan file lain ke file saat ini"
 
-#: src/global.c:519
+#: src/global.c:523
 #, fuzzy
 msgid "Search for a string or a regular expression"
 msgstr "Gunakan Regular expression"
 
-#: src/global.c:520
-#, fuzzy
-msgid "Go to previous screen"
-msgstr "Pindah ke layar sebelumnya"
+#: src/global.c:526
+msgid "Search for a string"
+msgstr ""
 
-#: src/global.c:521
-#, fuzzy
-msgid "Go to next screen"
-msgstr "Pindah ke layar berikutnya"
+#: src/global.c:528
+msgid "Go one screenful up"
+msgstr ""
 
-#: src/global.c:523
+#: src/global.c:529
+msgid "Go one screenful down"
+msgstr ""
+
+#: src/global.c:531
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Hapus baris saat ini dan taruh dalam cutbuffer"
 
-#: src/global.c:525
+#: src/global.c:533
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Kembalikan dari cutbuffer ke baris saat ini"
 
-#: src/global.c:527
+#: src/global.c:534
 #, fuzzy
 msgid "Display the position of the cursor"
 msgstr "Tampilkan posisi kursor"
 
-#: src/global.c:529
+#: src/global.c:536
 msgid "Invoke the spell checker, if available"
 msgstr "Panggil spell checker (jika ada)"
 
-#: src/global.c:531
+#: src/global.c:538
 #, fuzzy
 msgid "Replace a string or a regular expression"
 msgstr "Gunakan Regular expression"
 
-#: src/global.c:532
+#: src/global.c:539
 #, fuzzy
 msgid "Go to line and column number"
 msgstr "Ke nomor baris tertentu"
 
-#: src/global.c:534
+#: src/global.c:541
 #, fuzzy
-msgid "Mark text at the cursor position"
+msgid "Mark text starting from the cursor position"
 msgstr "Tandai teks pada lokasi kursor saat ini"
 
-#: src/global.c:535
-msgid "Repeat last search"
+#: src/global.c:542
+msgid "Repeat the last search"
 msgstr ""
 
-#: src/global.c:537
+#: src/global.c:544
 #, fuzzy
 msgid "Copy 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:545
 #, fuzzy
 msgid "Indent the current line"
 msgstr "Tambahkan ke file saat ini"
 
-#: src/global.c:539
+#: src/global.c:546
 #, fuzzy
 msgid "Unindent the current line"
 msgstr "Tambahkan ke file saat ini"
 
-#: src/global.c:540
+#: src/global.c:547
 msgid "Undo the last operation"
 msgstr ""
 
-#: src/global.c:541
+#: src/global.c:548
 msgid "Redo the last undone operation"
 msgstr ""
 
-#: src/global.c:543
+#: src/global.c:550
 #, fuzzy
 msgid "Go forward one character"
 msgstr "Pindah satu karakter ke depan"
 
-#: src/global.c:544
+#: src/global.c:551
 #, fuzzy
 msgid "Go back one character"
 msgstr "Pindah satu karakter ke belakang"
 
-#: src/global.c:546
+#: src/global.c:553
 #, fuzzy
 msgid "Go forward one word"
 msgstr "Ke depan satu kata"
 
-#: src/global.c:547
+#: src/global.c:554
 #, fuzzy
 msgid "Go back one word"
 msgstr "Ke belakang satu kata"
 
-#: src/global.c:549
+#: src/global.c:556
 #, fuzzy
 msgid "Go to previous line"
 msgstr "Pindah ke layar sebelumnya"
 
-#: src/global.c:550
+#: src/global.c:557
 #, fuzzy
 msgid "Go to next line"
 msgstr "Turun satu baris"
 
-#: src/global.c:551
+#: src/global.c:558
 #, fuzzy
 msgid "Go to beginning of current line"
 msgstr "Pindah ke awal baris ini"
 
-#: src/global.c:552
+#: src/global.c:559
 #, fuzzy
 msgid "Go to end of current line"
 msgstr "Pindah ke akhir baris ini"
 
-#: src/global.c:555
+#: src/global.c:562
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr ""
 
-#: src/global.c:557
+#: src/global.c:564
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr ""
 
-#: src/global.c:560
+#: src/global.c:566
 msgid "Go to the first line of the file"
 msgstr "Ke baris terawal file"
 
-#: src/global.c:562
+#: src/global.c:567
 msgid "Go to the last line of the file"
 msgstr "Ke baris terakhir file"
 
-#: src/global.c:564
+#: src/global.c:569
 #, fuzzy
 msgid "Go to the matching bracket"
 msgstr "Tidak ada tanda kurung yang cocok"
 
-#: src/global.c:566
+#: src/global.c:571
 msgid "Scroll up one line without scrolling the cursor"
 msgstr ""
 
-#: src/global.c:568
+#: src/global.c:573
 msgid "Scroll down one line without scrolling the cursor"
 msgstr ""
 
-#: src/global.c:572
+#: src/global.c:576
 #, fuzzy
 msgid "Switch to the previous file buffer"
 msgstr "Pindah ke layar sebelumnya"
 
-#: src/global.c:574
+#: src/global.c:577
 msgid "Switch to the next file buffer"
 msgstr ""
 
-#: src/global.c:577
+#: src/global.c:579
 msgid "Insert the next keystroke verbatim"
 msgstr ""
 
-#: src/global.c:579
+#: src/global.c:580
 #, fuzzy
 msgid "Insert a tab at the cursor position"
 msgstr "Sertakan carriage return di posisi kursor"
@@ -663,353 +634,469 @@ msgstr "Sertakan carriage return di posisi kursor"
 msgid "Insert a newline at the cursor position"
 msgstr "Sertakan carriage return di posisi kursor"
 
-#: src/global.c:583
+#: src/global.c:582
 msgid "Delete the character under the cursor"
 msgstr "Hapus karakter pada kursor"
 
-#: src/global.c:585
+#: src/global.c:584
 msgid "Delete the character to the left of the cursor"
 msgstr "Hapus satu karakter di kiri kursor"
 
-#: src/global.c:588
+#: src/global.c:587
 #, fuzzy
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Kembalikan dari cutbuffer ke baris saat ini"
 
-#: src/global.c:591
+#: src/global.c:590
 #, fuzzy
 msgid "Justify the entire file"
 msgstr "Justifikasi paragraf saat ini"
 
-#: src/global.c:595
+#: src/global.c:594
 msgid "Count the number of words, lines, and characters"
 msgstr ""
 
-#: src/global.c:598
+#: src/global.c:597
 msgid "Refresh (redraw) the current screen"
 msgstr "Refresh (redraw) layar saat ini"
 
-#: src/global.c:600
+#: src/global.c:599
 msgid "Suspend the editor (if suspend is enabled)"
 msgstr ""
 
-#: src/global.c:603
+#: src/global.c:602
 msgid "Toggle the case sensitivity of the search"
 msgstr ""
 
-#: src/global.c:605
+#: src/global.c:604
 #, fuzzy
 msgid "Reverse the direction of the search"
 msgstr "Tampilkan posisi kursor"
 
-#: src/global.c:609
+#: src/global.c:608
 #, fuzzy
 msgid "Toggle the use of regular expressions"
 msgstr "Gunakan Regular expression"
 
-#: src/global.c:613
+#: src/global.c:612
 #, fuzzy
 msgid "Recall the previous search/replace string"
 msgstr "Edit string search/replace sebelumnya"
 
-#: src/global.c:615
+#: src/global.c:614
 #, fuzzy
 msgid "Recall the next search/replace string"
 msgstr "Edit string search/replace sebelumnya"
 
-#: src/global.c:618
+#: src/global.c:617
 msgid "Go to file browser"
 msgstr "Ke browser file"
 
-#: src/global.c:621
+#: src/global.c:620
 #, fuzzy
 msgid "Toggle the use of DOS format"
 msgstr "Tulis file dalam format DOS"
 
-#: src/global.c:622
+#: src/global.c:621
 #, fuzzy
 msgid "Toggle the use of Mac format"
 msgstr "Tulis file dalam format Mac"
 
-#: src/global.c:624
+#: src/global.c:622
 msgid "Toggle appending"
 msgstr ""
 
-#: src/global.c:625
+#: src/global.c:623
 msgid "Toggle prepending"
 msgstr ""
 
-#: src/global.c:628
+#: src/global.c:624
 msgid "Toggle backing up of the original file"
 msgstr ""
 
-#: src/global.c:629
+#: src/global.c:625
 msgid "Execute external command"
 msgstr "Eksekusi perintah eksternal"
 
-#: src/global.c:633
+#: src/global.c:628
 #, fuzzy
 msgid "Toggle the use of a new buffer"
 msgstr "Pilih insert ke buffer baru"
 
-#: src/global.c:636
+#: src/global.c:631
 #, fuzzy
 msgid "Exit from the file browser"
 msgstr "Ke browser file"
 
-#: src/global.c:638
+#: src/global.c:632
 #, fuzzy
 msgid "Go to the first file in the list"
 msgstr "Ke baris terawal file"
 
-#: src/global.c:640
+#: src/global.c:633
 #, fuzzy
 msgid "Go to the last file in the list"
 msgstr "Ke baris terakhir file"
 
-#: src/global.c:641
+#: src/global.c:634
+#, fuzzy
+msgid "Go to the previous file in the list"
+msgstr "Ke baris terawal file"
+
+#: src/global.c:635
 #, fuzzy
 msgid "Go to the next file in the list"
 msgstr "Ke baris terakhir file"
 
+#: src/global.c:636
+msgid "Go to directory"
+msgstr "Ke Direktori"
+
+#: src/global.c:639
+#, fuzzy
+msgid "Invoke the linter, if available"
+msgstr "Panggil spell checker (jika ada)"
+
+#: src/global.c:640
+#, fuzzy
+msgid "Go to previous linter msg"
+msgstr "Ke nomor baris tertentu"
+
+#: src/global.c:641
+msgid "Go to next linter msg"
+msgstr ""
+
 #: src/global.c:642
 #, fuzzy
-msgid "Go to the previous file in the list"
-msgstr "Ke baris terawal file"
+msgid "Invoke formatter, if available"
+msgstr "Panggil spell checker (jika ada)"
 
-#: src/global.c:643
-msgid "Go to directory"
-msgstr "Ke Direktori"
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:662
+msgid "Get Help"
+msgstr "Bantuan"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:670
-msgid "Close"
-msgstr "Tutup"
+#: src/global.c:665 src/prompt.c:1084
+msgid "Cancel"
+msgstr "Batal"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:679
-msgid "WriteOut"
+#: src/global.c:678
+#, fuzzy
+msgid "Write Out"
 msgstr "Tulis"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:704
+msgid "Go To Dir"
+msgstr "Ke Direktori"
+
+#: src/global.c:719
+msgid "Cut Text"
+msgstr "Ptng Teks"
+
+#: src/global.c:728
 msgid "Justify"
 msgstr "Justifikasi"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:696
-msgid "Read File"
-msgstr "Baca File"
+#: src/global.c:733
+msgid "To Spell"
+msgstr "Mengeja"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:713
-msgid "Cut Text"
-msgstr "Ptng Teks"
+#: src/global.c:738
+#, fuzzy
+msgid "To Linter"
+msgstr "Ke baris"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:718
-msgid "UnJustify"
-msgstr "UnJustifikasi"
+#: src/global.c:740
+#, fuzzy
+msgid "Formatter"
+msgstr "Format DOS"
+
+#: src/global.c:745
+msgid "Case Sens"
+msgstr "Case Sens"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:723
+#: src/global.c:750
+msgid "Regexp"
+msgstr "Regexp"
+
+#: src/global.c:755
 #, fuzzy
-msgid "UnCut Text"
-msgstr "UnCut Teks"
+msgid "Backwards"
+msgstr " [Backwards]"
+
+#: src/global.c:762
+msgid "No Replace"
+msgstr "Tiada Replace"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:728 src/global.c:755
+#: src/global.c:770
 msgid "Cur Pos"
 msgstr "Pos Kursor"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:737
-msgid "To Spell"
-msgstr "Mengeja"
+#: src/global.c:780
+msgid "Prev Page"
+msgstr "Hlm sebelumnya"
 
-#: src/global.c:771
+#: src/global.c:782
+msgid "Next Page"
+msgstr "Hlm berikutnya"
+
+#: src/global.c:785
+msgid "First Line"
+msgstr "Baris pertama"
+
+#: src/global.c:787
+msgid "Last Line"
+msgstr "Baris terakhir"
+
+#: src/global.c:794
+#, fuzzy
+msgid "To Bracket"
+msgstr "Bukan tanda kurung"
+
+#: src/global.c:797
 msgid "Mark Text"
 msgstr "Tandai Teks"
 
-#: src/global.c:777
+#: src/global.c:800
 #, fuzzy
 msgid "Copy Text"
 msgstr "Ptng Teks"
 
-#: src/global.c:780
+#: src/global.c:803
 #, fuzzy
 msgid "Indent Text"
 msgstr "Ptng Teks"
 
-#: src/global.c:783
-#, fuzzy
+#: src/global.c:805
 msgid "Unindent Text"
-msgstr "UnCut Teks"
+msgstr ""
 
-#: src/global.c:787
+#: src/global.c:808
 msgid "Undo"
 msgstr ""
 
-#: src/global.c:790
+#: src/global.c:810
 msgid "Redo"
 msgstr ""
 
-#: src/global.c:796 src/global.c:800
-msgid "Forward"
-msgstr "Depan"
-
-#: src/global.c:806 src/global.c:810
+#: src/global.c:814 src/global.c:820
 msgid "Back"
 msgstr "Belakang"
 
-#: src/global.c:817
-msgid "Next Word"
-msgstr "Kata Berikut"
+#: src/global.c:816 src/global.c:822
+msgid "Forward"
+msgstr "Depan"
 
-#: src/global.c:820
+#: src/global.c:827
 msgid "Prev Word"
 msgstr "Kata Sebelum"
 
-#: src/global.c:824
-#, fuzzy
-msgid "Prev Line"
-msgstr "Hlm sebelumnya"
-
-#: src/global.c:827
-#, fuzzy
-msgid "Next Line"
-msgstr "File Sesudahnya"
+#: src/global.c:829
+msgid "Next Word"
+msgstr "Kata Berikut"
 
-#: src/global.c:830
+#: src/global.c:833
 msgid "Home"
 msgstr "Awal"
 
-#: src/global.c:833
+#: src/global.c:835
 msgid "End"
 msgstr "Akhir"
 
-#: src/global.c:845
-msgid "Find Other Bracket"
-msgstr "Cari Kurung Lain"
+#: src/global.c:844
+msgid "Beg of Par"
+msgstr ""
 
-#: src/global.c:848
-msgid "Scroll Up"
+#: src/global.c:846
+msgid "End of Par"
 msgstr ""
 
 #: src/global.c:851
+msgid "Scroll Up"
+msgstr ""
+
+#: src/global.c:853
 msgid "Scroll Down"
 msgstr ""
 
-#: src/global.c:856
-msgid "Previous File"
+#: src/global.c:858
+#, fuzzy
+msgid "Prev File"
 msgstr "File Sebelumnya"
 
-#: src/global.c:858
+#: src/global.c:860
 msgid "Next File"
 msgstr "File Sesudahnya"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:862 src/text.c:3045
-msgid "Verbatim Input"
+#: src/global.c:869
+msgid "Verbatim"
 msgstr ""
 
-#: src/global.c:867
+#: src/global.c:872
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:870
+#: src/global.c:874
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:873
+#: src/global.c:876
 msgid "Delete"
 msgstr "Hapus"
 
-#: src/global.c:876
+#: src/global.c:878
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/global.c:893
+#: src/global.c:888
 msgid "CutTillEnd"
 msgstr ""
 
-#: src/global.c:906
+#: src/global.c:898
 msgid "Word Count"
 msgstr ""
 
-#: src/global.c:1367
+#: src/global.c:905
+msgid "Suspend"
+msgstr "Tunda"
+
+#: src/global.c:910
+#, fuzzy
+msgid "PrevHstory"
+msgstr "Sejarah"
+
+#: src/global.c:913
+#, fuzzy
+msgid "NextHstory"
+msgstr "Sejarah"
+
+#: src/global.c:917
+#, fuzzy
+msgid "Go To Text"
+msgstr "Ke baris"
+
+#: src/global.c:928
+msgid "DOS Format"
+msgstr "Format DOS"
+
+#: src/global.c:931
+msgid "Mac Format"
+msgstr "Format Mac"
+
+#: src/global.c:934
+msgid "Append"
+msgstr "Tambah"
+
+#: src/global.c:936
+msgid "Prepend"
+msgstr "Tambah"
+
+#: src/global.c:939
+msgid "Backup File"
+msgstr "Backup File"
+
+#: src/global.c:946
+msgid "Execute Command"
+msgstr "Eksekusi Perintah"
+
+#: src/global.c:961
+msgid "To Files"
+msgstr "Ke File"
+
+#: src/global.c:964
+#, fuzzy
+msgid "First File"
+msgstr "Baris pertama"
+
+#: src/global.c:966
+#, fuzzy
+msgid "Last File"
+msgstr "Baris terakhir"
+
+#: src/global.c:977
+msgid "Prev Lint Msg"
+msgstr ""
+
+#: src/global.c:979
+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:1227
 msgid "Help mode"
 msgstr "Mode bantuan"
 
-#: src/global.c:1369
+#: src/global.c:1229
 #, fuzzy
 msgid "Constant cursor position display"
 msgstr "Posisi kursor konstan"
 
-#: src/global.c:1371
+#: src/global.c:1231
 msgid "Use of one more line for editing"
 msgstr ""
 
-#: src/global.c:1373
+#: src/global.c:1233
 msgid "Smooth scrolling"
 msgstr "Scrolling halus"
 
-#: src/global.c:1375
+#: src/global.c:1235
+#, fuzzy
+msgid "Soft wrapping of overlong lines"
+msgstr "Jangan wrap baris panjang"
+
+#: src/global.c:1237
 msgid "Whitespace display"
 msgstr ""
 
-#: src/global.c:1377
+#: src/global.c:1239
 msgid "Color syntax highlighting"
 msgstr "Pewarnaan sintaks"
 
-#: src/global.c:1379
+#: src/global.c:1241
 msgid "Smart home key"
 msgstr ""
 
-#: src/global.c:1381
+#: src/global.c:1243
 msgid "Auto indent"
 msgstr "Inden otomatis"
 
-#: src/global.c:1383
+#: src/global.c:1245
 msgid "Cut to end"
 msgstr "Cut hingga akhir"
 
-#: src/global.c:1385
-msgid "Long line wrapping"
-msgstr ""
+#: src/global.c:1247
+#, fuzzy
+msgid "Hard wrapping of overlong lines"
+msgstr "Jangan wrap baris panjang"
 
-#: src/global.c:1387
+#: src/global.c:1249
 msgid "Conversion of typed tabs to spaces"
 msgstr ""
 
-#: src/global.c:1389
+#: src/global.c:1251
 #, fuzzy
 msgid "Backup files"
 msgstr "Backup File"
 
-#: src/global.c:1391
+#: src/global.c:1253
 msgid "Multiple file buffers"
 msgstr "Buffer file multi"
 
-#: src/global.c:1393
+#: src/global.c:1255
 msgid "Mouse support"
 msgstr "Dukungan mouse"
 
-#: src/global.c:1395
+#: src/global.c:1257
 msgid "No conversion from DOS/Mac format"
 msgstr "Tidak ada konversi dari format DOS/Mac"
 
-#: src/global.c:1397
+#: src/global.c:1259
 #, fuzzy
 msgid "Suspension"
 msgstr "Tunda"
 
-#: src/global.c:1399
-msgid "Soft line wrapping"
-msgstr ""
-
-#: src/help.c:236
+#: src/help.c:205
 #, fuzzy
 msgid ""
 "Search Command Help Text\n"
@@ -1034,7 +1121,7 @@ msgstr ""
 " Tombol-tombol fungsi berikut tersedia dalam mode Search:\n"
 "\n"
 
-#: src/help.c:245
+#: src/help.c:214
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1043,7 +1130,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:251
+#: src/help.c:220
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1063,7 +1150,7 @@ msgstr ""
 " Tombol-tombol fungsi berikut tersedia dalam mode Goto Line:\n"
 "\n"
 
-#: src/help.c:260
+#: src/help.c:229
 #, fuzzy
 msgid ""
 "Insert File Help Text\n"
@@ -1094,7 +1181,7 @@ msgstr ""
 " Kunci-kunci fungsi berikut tersedia dalam mode Insert File:\n"
 "\n"
 
-#: src/help.c:269
+#: src/help.c:238
 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"
@@ -1103,7 +1190,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:275
+#: src/help.c:244
 #, fuzzy
 msgid ""
 "Write File Help Text\n"
@@ -1132,7 +1219,7 @@ msgstr ""
 " Kunci-kunci fungsi berikut tersedia dalam mode Write File:\n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:258
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1156,7 +1243,7 @@ msgstr ""
 " Kunci-kunci fungsi berikut tersedia dalam file browser:\n"
 "\n"
 
-#: src/help.c:302
+#: src/help.c:271
 #, fuzzy
 msgid ""
 "Browser Search Command Help Text\n"
@@ -1182,13 +1269,13 @@ msgstr ""
 " Tombol-tombol fungsi berikut tersedia dalam mode Search:\n"
 "\n"
 
-#: src/help.c:311
+#: src/help.c:280
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
 msgstr ""
 
-#: src/help.c:315
+#: src/help.c:284
 #, fuzzy
 msgid ""
 "Browser Go To Directory Help Text\n"
@@ -1211,7 +1298,7 @@ msgstr ""
 "  Kunci-kunci fungsi berikut tersedia di dalam mode Browser GotoDir :\n"
 "\n"
 
-#: src/help.c:328
+#: src/help.c:297
 #, fuzzy
 msgid ""
 "Spell Check Help Text\n"
@@ -1236,7 +1323,7 @@ msgstr ""
 "Check:\n"
 "\n"
 
-#: src/help.c:343
+#: src/help.c:312
 #, fuzzy
 msgid ""
 "Execute Command Help Text\n"
@@ -1256,7 +1343,7 @@ msgstr ""
 " Kunci-kunci berikut tersedia dalam mode ini:\n"
 "\n"
 
-#: src/help.c:356
+#: src/help.c:325
 #, fuzzy
 msgid ""
 "Main nano help text\n"
@@ -1286,7 +1373,7 @@ msgstr ""
 "ditunjukkan dalam tanda kurung:\n"
 "\n"
 
-#: src/help.c:366
+#: src/help.c:335
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1297,7 +1384,7 @@ msgid ""
 "Alt, or Meta key depending on your keyboard setup.  "
 msgstr ""
 
-#: src/help.c:375
+#: src/help.c:344
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1306,16 +1393,16 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:376 src/help.c:448
 msgid "enable/disable"
 msgstr "enable/disable"
 
-#: src/nano.c:587
+#: src/nano.c:601
 #, fuzzy
 msgid "Key invalid in view mode"
 msgstr "Kunci ilegal dalam mode VIEW"
 
-#: src/nano.c:695
+#: src/nano.c:713
 #, c-format
 msgid ""
 "\n"
@@ -1324,7 +1411,7 @@ msgstr ""
 "\n"
 "Buffer ditulis ke %s\n"
 
-#: src/nano.c:697
+#: src/nano.c:715
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -1333,7 +1420,7 @@ msgstr ""
 "\n"
 "Buffer ditulis ke %s\n"
 
-#: src/nano.c:700
+#: src/nano.c:718
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -1342,286 +1429,291 @@ msgstr ""
 "\n"
 "Buffer ditulis ke %s\n"
 
-#: src/nano.c:723
+#: src/nano.c:743
 msgid "Window size is too small for nano...\n"
 msgstr "Ukuran window terlalu kecil bagi nano...\n"
 
-#: src/nano.c:816
+#: src/nano.c:836
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
 "\n"
 msgstr ""
 
-#: src/nano.c:819
+#: src/nano.c:839
 #, fuzzy, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Opsi\t\tOpsi Panjang\t\tArti\n"
 
-#: src/nano.c:821
+#: src/nano.c:841
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Opsi\t\tArti\n"
 
-#: src/nano.c:824
-msgid "Show this message"
-msgstr "Tampilkan pesan ini"
-
-#: src/nano.c:825
+#: src/nano.c:844
 msgid "+LINE,COLUMN"
 msgstr ""
 
-#: src/nano.c:826
+#. TRANSLATORS: The next forty or so strings are option descriptions
+#. * for the --help output.  Try to keep them at most 40 characters.
+#: src/nano.c:847
 #, fuzzy
 msgid "Start at line LINE, column COLUMN"
 msgstr "Mulai pada nomor baris LINE"
 
-#: src/nano.c:828
+#: src/nano.c:849
 #, fuzzy
 msgid "Enable smart home key"
 msgstr "Aktifkan mouse"
 
-#: src/nano.c:829
+#: src/nano.c:850
 #, fuzzy
 msgid "Save backups of existing files"
 msgstr "Backup file yang ada ketika menyimpan"
 
-#: src/nano.c:830
-#, fuzzy
+#: src/nano.c:851
 msgid "-C <dir>"
-msgstr "-o [dir]"
+msgstr ""
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "--backupdir=<dir>"
 msgstr ""
 
-#: src/nano.c:831
+#: src/nano.c:852
 msgid "Directory for saving unique backup files"
 msgstr ""
 
-#: src/nano.c:834
+#: src/nano.c:855
 msgid "Use bold instead of reverse video text"
 msgstr ""
 
-#: src/nano.c:837
+#: src/nano.c:858
 msgid "Convert typed tabs to spaces"
 msgstr ""
 
-#: src/nano.c:840
+#: src/nano.c:861
 msgid "Enable multiple file buffers"
 msgstr "Aktifkan multiple file buffer"
 
-#: src/nano.c:845
+#: src/nano.c:865
+msgid "Use (vim-style) lock files"
+msgstr ""
+
+#: src/nano.c:869
 msgid "Log & read search/replace string history"
 msgstr "Log dan baca sejarah pencarian/penggantian string"
 
-#: src/nano.c:848
+#: src/nano.c:873
 msgid "Don't look at nanorc files"
 msgstr "Jangan lihat file nanorc"
 
-#: src/nano.c:851
+#: src/nano.c:876
 msgid "Fix numeric keypad key confusion problem"
 msgstr ""
 
-#: src/nano.c:853
+#: src/nano.c:878
 msgid "Don't add newlines to the ends of files"
 msgstr ""
 
-#: src/nano.c:856
+#: src/nano.c:881
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Jangan konversi file dari format DOS/Mac"
 
-#: src/nano.c:858
+#: src/nano.c:883
 msgid "Use one more line for editing"
 msgstr ""
 
-#: src/nano.c:860
+#: src/nano.c:886
 #, fuzzy
+msgid "Log & read location of cursor position"
+msgstr "Posisi kursor konstan"
+
+#: src/nano.c:889
 msgid "-Q <str>"
-msgstr "-Q [str]"
+msgstr ""
 
-#: src/nano.c:860
+#: src/nano.c:889
 #, fuzzy
 msgid "--quotestr=<str>"
 msgstr "--quotestr=[str]"
 
-#: src/nano.c:861
+#: src/nano.c:890
 #, fuzzy
 msgid "Quoting string"
 msgstr "String kuote, default \"> \""
 
-#: src/nano.c:863
+#: src/nano.c:892
 msgid "Restricted mode"
 msgstr ""
 
-#: src/nano.c:866
+#: src/nano.c:895
 msgid "Scroll by line instead of half-screen"
 msgstr ""
 
-#: src/nano.c:868
+#: src/nano.c:897
 #, fuzzy
 msgid "-T <#cols>"
 msgstr "-r [#cols]"
 
-#: src/nano.c:868
+#: src/nano.c:897
 #, fuzzy
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=[num]"
 
-#: src/nano.c:869
+#: src/nano.c:898
 #, fuzzy
 msgid "Set width of a tab to #cols columns"
 msgstr "Set lebar tab ke num"
 
-#: src/nano.c:871
+#: src/nano.c:900
 msgid "Do quick statusbar blanking"
 msgstr ""
 
-#: src/nano.c:874
+#: src/nano.c:903
 msgid "Print version information and exit"
 msgstr "Cetak informasi versi dan keluar"
 
-#: src/nano.c:877
+#: src/nano.c:906
 msgid "Detect word boundaries more accurately"
 msgstr ""
 
-#: src/nano.c:880
-#, fuzzy
+#: src/nano.c:909
 msgid "-Y <str>"
-msgstr "-Y [str]"
+msgstr ""
 
-#: src/nano.c:880
+#: src/nano.c:909
 #, fuzzy
 msgid "--syntax=<str>"
 msgstr "--syntax [str]"
 
-#: src/nano.c:881
+#: src/nano.c:910
 #, fuzzy
 msgid "Syntax definition to use for coloring"
 msgstr "Definisi sintaks untuk digunakan"
 
-#: src/nano.c:883
+#: src/nano.c:912
 msgid "Constantly show cursor position"
 msgstr "Menampilkan posisi kursor secara konstan"
 
-#: src/nano.c:885
+#: src/nano.c:914
 msgid "Fix Backspace/Delete confusion problem"
 msgstr ""
 
-#: src/nano.c:888
+#: src/nano.c:915
+#, fuzzy
+msgid "Show this help text"
+msgstr "Tampilkan pesan ini"
+
+#: src/nano.c:918
 msgid "Automatically indent new lines"
 msgstr "Inden baris baru secara otomatis"
 
-#: src/nano.c:889
+#: src/nano.c:919
 #, fuzzy
 msgid "Cut from cursor to end of line"
 msgstr "Biarkan ^K memotong dari kursor hingga akhir baris"
 
-#: src/nano.c:892
+#: src/nano.c:922
 msgid "Don't follow symbolic links, overwrite"
 msgstr "Jangan ikuti link simbolik, timpa"
 
-#: src/nano.c:894
+#: src/nano.c:924
 #, fuzzy
 msgid "Enable the use of the mouse"
 msgstr "Aktifkan mouse"
 
-#: src/nano.c:897
-#, fuzzy
+#: src/nano.c:926
+msgid "Do not read the file (only write it)"
+msgstr ""
+
+#: src/nano.c:928
 msgid "-o <dir>"
-msgstr "-o [dir]"
+msgstr ""
 
-#: src/nano.c:897
+#: src/nano.c:928
 #, fuzzy
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=[dir]"
 
-#: src/nano.c:898
+#: src/nano.c:929
 msgid "Set operating directory"
 msgstr "Set direktori operasi"
 
-#: src/nano.c:901
+#: src/nano.c:932
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Preserve kunci XON (^Q) dan XOFF (^S)"
 
-#: src/nano.c:903
+#: src/nano.c:935
 msgid "Silently ignore startup issues like rc file errors"
 msgstr ""
 
-#: src/nano.c:905
+#: src/nano.c:938
 #, fuzzy
 msgid "-r <#cols>"
 msgstr "-r [#cols]"
 
-#: src/nano.c:905
+#: src/nano.c:938
 #, fuzzy
 msgid "--fill=<#cols>"
 msgstr "--fill=[#cols]"
 
-#: src/nano.c:906
-msgid "Set wrapping point at column #cols"
+#: src/nano.c:939
+msgid "Set hard-wrapping point at column #cols"
 msgstr ""
 
-#: src/nano.c:909
+#: src/nano.c:942
 #, fuzzy
 msgid "-s <prog>"
 msgstr "-s [prog]"
 
-#: src/nano.c:909
+#: src/nano.c:942
 #, fuzzy
 msgid "--speller=<prog>"
 msgstr "--speller=[prog]"
 
-#: src/nano.c:910
+#: src/nano.c:943
 msgid "Enable alternate speller"
 msgstr "Aktifkan speller alternatif"
 
-#: src/nano.c:913
+#: src/nano.c:946
 msgid "Auto save on exit, don't prompt"
 msgstr "Auto save saat keluar, jangan tanya"
 
-#: src/nano.c:915
-msgid "Allow generic undo [EXPERIMENTAL]"
-msgstr ""
-
-#: src/nano.c:918
+#: src/nano.c:947
 #, fuzzy
 msgid "View mode (read-only)"
 msgstr "Mode view (hanya baca)"
 
-#: src/nano.c:920
-msgid "Don't wrap long lines"
+#: src/nano.c:949
+#, fuzzy
+msgid "Don't hard-wrap long lines"
 msgstr "Jangan wrap baris panjang"
 
-#: src/nano.c:922
+#: src/nano.c:951
 #, fuzzy
 msgid "Don't show the two help lines"
 msgstr "Jangan tampilkan jendela bantuan"
 
-#: src/nano.c:923
+#: src/nano.c:952
 #, fuzzy
 msgid "Enable suspension"
 msgstr "Aktifkan suspend"
 
-#: src/nano.c:924
+#: src/nano.c:954
 msgid "Enable soft line wrapping"
 msgstr ""
 
-#: src/nano.c:928
-msgid "(ignored, for Pico compatibility)"
-msgstr "(abaikan, untuk kompatibilitas dengan Pico)"
-
-#: src/nano.c:938
-#, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
+#: src/nano.c:963
+#, fuzzy, c-format
+msgid " GNU nano, version %s\n"
 msgstr "GNU nano versi %s (dikompilasi %s, %s)\n"
 
-#: src/nano.c:943
+#: src/nano.c:966
 #, 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:944
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1630,157 +1722,181 @@ msgstr ""
 "\n"
 " Option kompilasi:"
 
-#: src/nano.c:1022
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr "Maaf, dukungan untuk fungsi ini telah ditiadakan"
 
-#: src/nano.c:1044
+#: src/nano.c:1125
+msgid "No file name"
+msgstr ""
+
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "Simpan buffer termodifikasi (JAWAB \"No\" AKAN MENGHAPUS PERUBAHAN) ?"
 
-#: src/nano.c:1088
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr ""
 
-#: src/nano.c:1114
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr ""
 
-#: src/nano.c:1182
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Menerima SIGHUP atau SIGTERM\n"
 
-#: src/nano.c:1204
+#: src/nano.c:1301
 #, fuzzy, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Gunakan \"fg\" untuk kembali ke nano"
 
-#: src/nano.c:1386
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "adakan"
 
-#: src/nano.c:1387
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "tiadakan"
 
-#: src/nano.c:1548 src/winio.c:1256
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr ""
 
-#: src/nano.c:1674
+#: src/nano.c:1747
 #, fuzzy
 msgid "XON ignored, mumble mumble"
 msgstr "XON diabaikan, mumble mumble."
 
-#: src/nano.c:1679
+#: src/nano.c:1752
 #, fuzzy
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF diabaikan, mumble mumble."
 
-#: src/nano.c:2209 src/rcfile.c:1100
+#: src/nano.c:2310 src/rcfile.c:1325
 #, fuzzy, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "ukuran tab yang diminta %d tidak valid"
 
-#: src/nano.c:2268 src/rcfile.c:1025
+#: src/nano.c:2374 src/rcfile.c:1250
 #, fuzzy, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "ukuran fill yang diminta %d tidak valid"
 
+#: src/nano.c:2415
+#, c-format
+msgid "Type '%s -h' for a list of available options.\n"
+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:1259
+#: src/prompt.c:1055
 msgid "Yy"
 msgstr "Yy"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1056
 msgid "Nn"
 msgstr "Tt"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1057
 msgid "Aa"
 msgstr "Aa"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1071
 msgid "Yes"
 msgstr "Ya"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1076
 msgid "All"
 msgstr "Semua"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1081
 msgid "No"
 msgstr "Tidak"
 
-#: src/rcfile.c:130
+#: src/rcfile.c:137
 #, fuzzy, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Kesalahan dalam %s pada baris %d: "
 
-#: src/rcfile.c:185
+#: src/rcfile.c:196
 #, fuzzy, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "argumen %s telah selesai.\""
 
-#: src/rcfile.c:212 src/rcfile.c:264 src/rcfile.c:711 src/rcfile.c:768
-#: src/rcfile.c:821
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 #, 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:238 src/search.c:62
+#: src/rcfile.c:249 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Regex jelek \"%s\": %s"
 
-#: src/rcfile.c:258
+#: src/rcfile.c:269
 msgid "Missing syntax name"
 msgstr "Nama sintaks tidak ada"
 
-#: src/rcfile.c:316
+#: src/rcfile.c:340
 msgid "The \"none\" syntax is reserved"
 msgstr ""
 
-#: src/rcfile.c:323
+#: src/rcfile.c:347
 msgid "The \"default\" syntax must take no extensions"
 msgstr ""
 
-#: src/rcfile.c:386 src/rcfile.c:483
+#: src/rcfile.c:433
 #, fuzzy
 msgid "Missing key name"
 msgstr "Nama sintaks tidak ada"
 
-#: src/rcfile.c:398 src/rcfile.c:499
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
+#: src/rcfile.c:442 src/rcfile.c:453
+msgid "Key name is too short"
 msgstr ""
 
-#: src/rcfile.c:407
-msgid "Must specify function to bind key to"
+#: src/rcfile.c:463
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr ""
 
-#: src/rcfile.c:418 src/rcfile.c:510
-msgid "Must specify menu to bind key to (or \"all\")"
+#: src/rcfile.c:472
+msgid "Must specify a function to bind the key to"
 msgstr ""
 
-#: src/rcfile.c:426
-#, fuzzy, c-format
-msgid "Could not map name \"%s\" to a function"
-msgstr "Tidak dapat membuka %s untuk menulis: %s"
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:482
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
+msgstr ""
 
-#: src/rcfile.c:432 src/rcfile.c:517
-#, fuzzy, c-format
-msgid "Could not map name \"%s\" to a menu"
-msgstr "Tidak dapat memanggil \"%s\""
+#: src/rcfile.c:489
+#, c-format
+msgid "Cannot map name \"%s\" to a function"
+msgstr ""
+
+#: src/rcfile.c:496
+#, c-format
+msgid "Cannot map name \"%s\" to a menu"
+msgstr ""
 
-#: src/rcfile.c:454
+#: src/rcfile.c:528
 #, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
+msgid "Function '%s' does not exist in menu '%s'"
 msgstr ""
 
-#: src/rcfile.c:625
+#: src/rcfile.c:543
+#, c-format
+msgid "Sorry, keystroke \"%s\" may not be rebound"
+msgstr ""
+
+#: src/rcfile.c:629
+#, c-format
+msgid "Error expanding %s: %s"
+msgstr ""
+
+#: src/rcfile.c:672
 #, fuzzy, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1794,137 +1910,197 @@ msgstr ""
 "\"white\", \"yellow\", \"cyan\", \"magenta\" dan \n"
 "\"black\", dengan prefiks opsional \"bright\".\n"
 
-#: src/rcfile.c:647
+#: src/rcfile.c:694
 #, fuzzy
 msgid "Cannot add a color command without a syntax command"
 msgstr "Tidak dapat menambah direktif warna tanpa baris sintaks"
 
-#: src/rcfile.c:652
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "Nama warna tidak ada"
 
-#: src/rcfile.c:672
-#, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr ""
-
-#: src/rcfile.c:690 src/rcfile.c:809
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr ""
 
-#: src/rcfile.c:762
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\" membutuhkan \"end=\" yang sesuai"
 
-#: src/rcfile.c:804
+#: src/rcfile.c:837
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr ""
+
+#: src/rcfile.c:865
 #, fuzzy
 msgid "Cannot add a header regex without a syntax command"
 msgstr "Tidak dapat menambah direktif warna tanpa baris sintaks"
 
-#: src/rcfile.c:874
+#: src/rcfile.c:921
+#, fuzzy
+msgid "Cannot add a magic string regex without a syntax command"
+msgstr "Tidak dapat menambah direktif warna tanpa baris sintaks"
+
+#: src/rcfile.c:926
+#, 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:1010
+#, fuzzy
+msgid "Cannot add formatter without a syntax command"
+msgstr "Tidak dapat menambah direktif warna tanpa baris sintaks"
+
+#: src/rcfile.c:1015
+msgid "Missing formatter command"
+msgstr ""
+
+#: src/rcfile.c:1045
 #, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
+msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr ""
 
-#: src/rcfile.c:876
+#: src/rcfile.c:1047
+#, c-format
 msgid ""
-"Exiting.  Please use nano with the -I option if needed to adjust your nanorc "
-"settings\n"
+"If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
 
-#: src/rcfile.c:926 src/rcfile.c:935 src/rcfile.c:945
+#: src/rcfile.c:1108
+#, fuzzy, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "Tidak dapat membuka %s untuk menulis: %s"
+
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr ""
 
-#: src/rcfile.c:951 src/rcfile.c:1128
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr ""
 
-#: src/rcfile.c:966
+#: src/rcfile.c:1171
 #, fuzzy, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Perintah %s tidak dipahami"
 
-#: src/rcfile.c:972
+#: src/rcfile.c:1186
 #, fuzzy
-msgid "Missing flag"
+msgid "Missing option"
 msgstr "Nama warna tidak ada"
 
-#: src/rcfile.c:994
+#: src/rcfile.c:1208
 #, fuzzy, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "opsi %s membutuhkan sebuah argumen"
 
-#: src/rcfile.c:1012
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr ""
 
-#: src/rcfile.c:1038 src/rcfile.c:1066 src/rcfile.c:1075
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr ""
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr ""
 
-#: src/rcfile.c:1114
+#: src/rcfile.c:1339
 #, fuzzy, c-format
-msgid "Cannot unset flag \"%s\""
-msgstr "unset flag %d!\n"
+msgid "Cannot unset option \"%s\""
+msgstr "Tidak dapat menganti ukuran jendela atas"
 
-#: src/rcfile.c:1123
+#: src/rcfile.c:1345
 #, c-format
-msgid "Unknown flag \"%s\""
+msgid "Unknown option \"%s\""
 msgstr ""
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr "Saya tidak dapat menemukan direktori home!  Wah!"
 
+#: src/rcfile.c:1442
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Press Enter to continue starting nano.\n"
+msgstr ""
+"\n"
+"Tekan return untuk lanjut memulai nano\n"
+
 #: src/search.c:96
 #, fuzzy, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "\"%s\" tidak ditemukan"
 
-#: src/search.c:205
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/search.c:184
+msgid " [Case Sensitive]"
+msgstr " [Case Sensitive]"
+
+#: src/search.c:188
+msgid " [Regexp]"
+msgstr " [Regexp]"
+
+#: src/search.c:192
+msgid " [Backwards]"
+msgstr " [Backwards]"
+
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:197
 #, fuzzy
 msgid " (to replace) in selection"
 msgstr " (ganti)"
 
-#: src/search.c:207
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (ganti)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "Ganti kata ini?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:945
 msgid "Replace with"
 msgstr "Ganti dengan"
 
-#: src/search.c:1004
+#: src/search.c:986
 #, fuzzy, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
 msgstr[0] "%d tempat terganti"
 
-#: src/search.c:1034
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1027
 #, fuzzy
 msgid "Enter line number, column number"
 msgstr "Masukkan nomor baris"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
 msgstr ""
 
-#: src/search.c:1214
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "Bukan tanda kurung"
 
-#: src/search.c:1281
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "Tidak ada tanda kurung yang cocok"
 
@@ -1937,223 +2113,281 @@ msgstr "Set Tanda"
 msgid "Mark Unset"
 msgstr "Unset Tanda"
 
-#: src/text.c:443
+#: src/text.c:439
 msgid "Nothing in undo buffer!"
 msgstr ""
 
-#: src/text.c:455 src/text.c:593
+#: src/text.c:445 src/text.c:590
 #, c-format
-msgid "Internal error: can't match line %d.  Please save your work"
+msgid "Internal error: can't match line %d.  Please save your work."
 msgstr ""
 
-#: src/text.c:466 src/text.c:603
+#: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
 msgstr ""
 
-#: src/text.c:475 src/text.c:613
+#: src/text.c:467 src/text.c:612
 #, fuzzy
 msgid "text delete"
 msgstr "File Sesudahnya"
 
-#: src/text.c:489 src/text.c:628
-msgid "line wrap"
-msgstr ""
-
-#: src/text.c:503 src/text.c:636
+#: src/text.c:491 src/text.c:641
 msgid "line join"
 msgstr ""
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:505 src/text.c:657
 msgid "text cut"
 msgstr ""
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:510 src/text.c:661
 msgid "text uncut"
 msgstr ""
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:515 src/text.c:623
 msgid "line break"
 msgstr ""
 
-#: src/text.c:532 src/text.c:665
+#: src/text.c:528 src/text.c:672
 #, fuzzy
 msgid "text insert"
 msgstr "File Sesudahnya"
 
-#: src/text.c:550 src/text.c:659
+#: src/text.c:549 src/text.c:665
 #, fuzzy
 msgid "text replace"
 msgstr " (ganti)"
 
-#: src/text.c:557 src/text.c:671
-msgid "Internal error: unknown type.  Please save your work"
+#: src/text.c:556 src/text.c:679 src/text.c:983
+msgid "Internal error: unknown type.  Please save your work."
 msgstr ""
 
-#: src/text.c:563
+#: src/text.c:561
 #, c-format
 msgid "Undid action (%s)"
 msgstr ""
 
-#: src/text.c:578
+#: src/text.c:580
 msgid "Nothing to re-do!"
 msgstr ""
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
+#: src/text.c:584
+msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
 
-#: src/text.c:676
+#: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr ""
 
-#: src/text.c:766
-msgid "Could not pipe"
-msgstr "Tidak dapat mem-pipe"
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
+msgid "Could not create pipe"
+msgstr "Tidak dapat membuat pipe"
 
-#: src/text.c:793 src/text.c:2636 src/text.c:2788
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "Tidak dapat mem-fork"
 
-#: src/text.c:941
-msgid "Internal error: can't setup uncut.  Please save your work."
-msgstr ""
-
-#: src/text.c:950
-msgid "Internal error: unknown type.  Please save your work."
+#: src/text.c:969
+msgid "Internal error: cannot set up uncut.  Please save your work."
 msgstr ""
 
-#: src/text.c:1870
+#: src/text.c:1806
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Quote string buruk %s: %s"
 
-#: src/text.c:2267
+#: src/text.c:2207
 msgid "Can now UnJustify!"
 msgstr "Sekarang dapat melakukan UnJustify"
 
-#: src/text.c:2462
+#: src/text.c:2404
 msgid "Edit a replacement"
 msgstr "Edit pengganti"
 
-#: src/text.c:2548
-msgid "Could not create pipe"
-msgstr "Tidak dapat membuat pipe"
-
-#: src/text.c:2550
+#: src/text.c:2492
 msgid "Creating misspelled word list, please wait..."
 msgstr "Membuat daftar kata yang misspelled, silakan tunggu..."
 
-#: src/text.c:2642
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
 msgstr "Tidak dapat menentukan ukuran buffer pipe"
 
-#: src/text.c:2693
+#: src/text.c:2635
 msgid "Error invoking \"spell\""
 msgstr "Gagal memanggil \"spell\""
 
-#: src/text.c:2696
+#: src/text.c:2638
 msgid "Error invoking \"sort -f\""
 msgstr "Gagal memanggil \"sort -f\""
 
-#: src/text.c:2699
+#: src/text.c:2641
 msgid "Error invoking \"uniq\""
 msgstr "Gagal memanggil \"uniq\""
 
-#: src/text.c:2756 src/text.c:2965
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "Selesai memeriksa ejaan"
 
-#: src/text.c:2815
+#: src/text.c:2759 src/text.c:3340
 #, fuzzy, c-format
 msgid "Error invoking \"%s\""
 msgstr "Gagal memanggil \"spell\""
 
-#: src/text.c:2960
+#: src/text.c:2885
+#, fuzzy
+msgid "Invoking spell checker, please wait"
+msgstr "Panggil spell checker (jika ada)"
+
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Spell checking gagal: %s"
 
-#: src/text.c:2962
+#: src/text.c:2904
 #, fuzzy, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Spell checking gagal: %s"
 
-#: src/text.c:3030
+#: src/text.c:2937
+msgid "No linter defined for this type of file!"
+msgstr ""
+
+#: src/text.c:2947
+msgid "Save modified buffer before linting?"
+msgstr ""
+
+#: src/text.c:2969
+msgid "Invoking linter, please wait"
+msgstr ""
+
+#: src/text.c:3125
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr ""
+
+#: src/text.c:3159
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr ""
+
+#: src/text.c:3205
+#, fuzzy
+msgid "At last message"
+msgstr "Tampilkan pesan ini"
+
+#: src/text.c:3210
+#, fuzzy
+msgid "At first message"
+msgstr "Tampilkan pesan ini"
+
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr ""
+
+#: src/text.c:3275
+msgid "Finished"
+msgstr ""
+
+#: src/text.c:3280
+msgid "Invoking formatter, please wait"
+msgstr ""
+
+#: src/text.c:3360
+msgid "Finished formatting"
+msgstr ""
+
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr ""
 
-#: src/text.c:3031
+#: src/text.c:3439
 #, fuzzy
 msgid "In Selection:  "
 msgstr "Menambahkan Pilihan ke File"
 
-#: src/utils.c:405 src/utils.c:417
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3453
+msgid "Verbatim Input"
+msgstr ""
+
+#: src/utils.c:410 src/utils.c:422
 msgid "nano is out of memory!"
 msgstr "nano kehabisan memori!"
 
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
-#: src/winio.c:1557
+#: src/winio.c:1583
 msgid "Unicode Input"
 msgstr ""
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2142 src/winio.c:2146
 #, fuzzy
 msgid "Modified"
 msgstr " Dimodifikasi "
 
-#: src/winio.c:2150
+#: src/winio.c:2143
 #, fuzzy
 msgid "View"
 msgstr " View "
 
-#: src/winio.c:2164
+#: src/winio.c:2157
 #, fuzzy
 msgid "DIR:"
 msgstr " DIR: "
 
-#: src/winio.c:2171
+#: src/winio.c:2164
 #, fuzzy
 msgid "File:"
 msgstr "File: "
 
-#: src/winio.c:3360
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2261
+msgid ""
+"Warning: Modifying a file which is not locked, check directory permission?"
+msgstr ""
+
+#: src/winio.c:3377
 #, 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:3492
+#: src/winio.c:3507
 msgid "The nano text editor"
 msgstr "Nano teks editor"
 
-#: src/winio.c:3493
+#: src/winio.c:3508
 #, fuzzy
 msgid "version"
 msgstr "versi "
 
-#: src/winio.c:3494
+#: src/winio.c:3509
 msgid "Brought to you by:"
 msgstr "Dibuat untuk anda oleh:"
 
-#: src/winio.c:3495
+#: src/winio.c:3510
 msgid "Special thanks to:"
 msgstr "Ucapan terima kasih khusus kepada:"
 
-#: src/winio.c:3496
+#: src/winio.c:3511
 msgid "The Free Software Foundation"
 msgstr "The Free Software Foundation"
 
-#: src/winio.c:3497
+#: src/winio.c:3512
+msgid "the many translators and the TP"
+msgstr ""
+
+#: src/winio.c:3513
 msgid "For ncurses:"
 msgstr "Untuk ncurses:"
 
-#: src/winio.c:3498
+#: src/winio.c:3514
 msgid "and anyone else we forgot..."
 msgstr "dan orang lain yang kami lupa...."
 
-#: src/winio.c:3499
+#: src/winio.c:3515
 #, fuzzy
 msgid "Thank you for using nano!"
 msgstr "Terima kasih telah menggunakan nano!\n"
@@ -2209,12 +2443,9 @@ msgstr "Terima kasih telah menggunakan nano!\n"
 #~ msgid "Could not reopen %s: %s"
 #~ msgstr "Tidak dapat membuka kembali %s: %s"
 
-#~ msgid "Could not open %s for prepend: %s"
+#~ msgid "Could not open %s for writing: %s"
 #~ msgstr "Tidak dapat membuka %s untuk menulis: %s"
 
-#~ msgid "Could not set permissions %o on %s: %s"
-#~ msgstr "Tidak dapat menset permisi %o pada %s: %s"
-
 #~ msgid "Can't open \"%s\": %s"
 #~ msgstr "Tidak dapat membuka \"%s\": %s"
 
@@ -2251,6 +2482,9 @@ msgstr "Terima kasih telah menggunakan nano!\n"
 #~ msgid "Search for text within the editor"
 #~ msgstr "Cari teks dalam editor"
 
+#~ msgid "Move to the next screen"
+#~ msgstr "Pindah ke layar berikutnya"
+
 #~ msgid "Move up one line"
 #~ msgstr "Naik satu baris"
 
@@ -2290,6 +2524,9 @@ msgstr "Terima kasih telah menggunakan nano!\n"
 #~ msgid "Down"
 #~ msgstr "Turun"
 
+#~ msgid "Find Other Bracket"
+#~ msgstr "Cari Kurung Lain"
+
 #~ msgid "Direction"
 #~ msgstr "Arah"
 
@@ -2316,30 +2553,45 @@ msgstr "Terima kasih telah menggunakan nano!\n"
 #~ msgid "Use alternate keypad routines"
 #~ msgstr "Gunakan rutin keypad alternatif"
 
+#~ msgid "-Q [str]"
+#~ msgstr "-Q [str]"
+
 #~ msgid "Do regular expression searches"
 #~ msgstr "Lakukan pencarian ekspresi reguler"
 
 #~ msgid "-T [num]"
 #~ msgstr "-T [num]"
 
+#~ msgid "-Y [str]"
+#~ msgstr "-Y [str]"
+
+#~ msgid "-o [dir]"
+#~ msgstr "-o [dir]"
+
 #~ msgid "Set fill cols to (wrap lines at) #cols"
 #~ msgstr "Set fill cols ke (wrap baris di) #cols"
 
+#~ msgid "(ignored, for Pico compatibility)"
+#~ msgstr "(abaikan, untuk kompatibilitas dengan Pico)"
+
+#~ msgid "Could not pipe"
+#~ msgstr "Tidak dapat mem-pipe"
+
 #~ msgid "current->data now = \"%s\"\n"
 #~ msgstr "current->data sekarang =\"%s\"\n"
 
 #~ msgid "After, data = \"%s\"\n"
 #~ msgstr "Setelah, data= \"%s\"\n"
 
+#~ msgid "Could not invoke \"%s\""
+#~ msgstr "Tidak dapat memanggil \"%s\""
+
 #~ msgid "Could not create a temporary filename: %s"
 #~ msgstr "Tidak dapat membuat nama file sementara: %s"
 
 #~ msgid "Spell checking failed: unable to write temp file!"
 #~ msgstr "Spell checking gagal: tidak dapat menulis file temp!"
 
-#~ msgid "Cannot resize top win"
-#~ msgstr "Tidak dapat menganti ukuran jendela atas"
-
 #~ msgid "Cannot move top win"
 #~ msgstr "Tidak dapat memindahkan jendela atas"
 
@@ -2414,6 +2666,9 @@ msgstr "Terima kasih telah menggunakan nano!\n"
 #~ msgid "set flag %d!\n"
 #~ msgstr "set flag %d!\n"
 
+#~ msgid "unset flag %d!\n"
+#~ msgstr "unset flag %d!\n"
+
 #~ msgid "Errors found in .nanorc file"
 #~ msgstr "Kesalahan ditemukan dalam file .nanorc"
 
@@ -2509,9 +2764,6 @@ msgstr "Terima kasih telah menggunakan nano!\n"
 #~ "tentang perubahan ini...\n"
 #~ "\n"
 
-#~ msgid "Press return to continue\n"
-#~ msgstr "Tekan return untuk lanjut\n"
-
 #~ msgid "Generic error"
 #~ msgstr "Kesalahan generik"
 
diff --git a/po/it.gmo b/po/it.gmo
index f96a5e5..7b8bd4c 100644
--- a/po/it.gmo
+++ b/po/it.gmo
diff --git a/po/it.po b/po/it.po
index fa6d980..9cb9338 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,123 +1,151 @@
 # Italian messages for nano.
-# Copyright (C) 2001-2006, 2008, 2009, 2010 Free Software Foundation, Inc.
+# 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-2010.
-# $Id: it.po,v 1.116 2006/06/09 09:37:06 jordi Exp $
 #
+# Marco Colombo <m.colombo@ed.ac.uk>, 2001-2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 2.2.4pre2\n"
+"Project-Id-Version: nano 2.3.99pre4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-22 06:34-0500\n"
-"PO-Revision-Date: 2010-04-07 18:30+0100\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
+"PO-Revision-Date: 2015-03-19 10:22+0000\n"
 "Last-Translator: Marco Colombo <m.colombo@ed.ac.uk>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
+"Language: it\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"
 
-#: src/browser.c:220
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:203
 msgid "Go To Directory"
 msgstr "Vai alla directory"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:860 src/files.c:2048
-#: src/nano.c:1060 src/search.c:220 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Annullato"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:246 src/browser.c:293
 #, c-format
 msgid "Can't go outside of %s in restricted mode"
 msgstr "Impossibile uscire da %s in modalità ristretta"
 
-#: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:722
-#: src/files.c:731 src/files.c:1540 src/files.c:1659 src/files.c:1711
-#: src/files.c:1732 src/files.c:1855 src/files.c:2691 src/rcfile.c:568
-#: src/rcfile.c:1204
+#: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
+#: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
+#: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Errore durante la lettura di %s: %s"
 
-#: src/browser.c:303
+#: src/browser.c:283
 msgid "Can't move up a directory"
 msgstr "Impossibile risalire la directory"
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:665 src/browser.c:674
+#: src/browser.c:626 src/browser.c:635
 msgid "(dir)"
 msgstr "(dir)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:632
 msgid "(parent dir)"
 msgstr "(dir super)"
 
-#: src/browser.c:801 src/search.c:185
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "Ricerca"
 
-# FIXME
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:805 src/search.c:189
-msgid " [Case Sensitive]"
-msgstr " [Maiuscole/Minuscole]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:811 src/search.c:195
-msgid " [Regexp]"
-msgstr " [Espressione regolare]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:817 src/search.c:201
-msgid " [Backwards]"
-msgstr " [All'indietro]"
-
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "Ricerca ricominciata"
 
-#: src/browser.c:1006 src/browser.c:1039 src/search.c:514 src/search.c:517
-#: src/search.c:574 src/search.c:577
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "Questa è l'unica occorrenza"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr "Nessun pattern di ricerca attivo"
 
-#: src/files.c:125
+#: src/files.c:139
+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:145
+#, 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:165 src/files.c:175 src/files.c:212 src/files.c:222
+#, c-format
+msgid "Error writing lock file %s: %s"
+msgstr "Errore durante la scrittura del file di lock %s: %s"
+
+#: src/files.c:237
+#, c-format
+msgid "Error deleting lock file %s: %s"
+msgstr "Errore durante l'eliminazione del file di lock %s: %s"
+
+#: src/files.c:272
+#, c-format
+msgid "Error opening lock file %s: %s"
+msgstr "Errore durante l'apertura del file di lock %s: %s"
+
+#: src/files.c:282
+#, 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:297
+#, 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:308
+#, c-format
+msgid "Error writing lock file: Directory '%s' doesn't exist"
+msgstr ""
+"Errore durante la scrittura del file di lock: directory \"%s\" non esiste"
+
+#: src/files.c:339
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Impossibile inserire il file dall'esterno di %s"
 
-#: src/files.c:234
+#: src/files.c:467
 msgid "No more open file buffers"
 msgstr "Nessun altro buffer aperto"
 
-#: src/files.c:250
+#: src/files.c:484
 #, c-format
 msgid "Switched to %s"
 msgstr "Passato a %s"
 
-#: src/files.c:251 src/global.c:469 src/winio.c:2168
+#: src/files.c:485 src/global.c:953 src/winio.c:2161
 msgid "New Buffer"
 msgstr "Nuovo buffer"
 
-#: src/files.c:633
+#: src/files.c:874
 #, 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:638
+#: src/files.c:879
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
@@ -132,14 +160,14 @@ msgstr[1] ""
 "Lette %lu righe (Convertite dal formato DOS e Mac - Senza permesso di "
 "scrittura)"
 
-#: src/files.c:644
+#: src/files.c:885
 #, 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:648
+#: src/files.c:889
 #, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
@@ -150,14 +178,14 @@ msgstr[0] ""
 msgstr[1] ""
 "Lette %lu righe (Convertite dal formato Mac - Senza permesso di scrittura)"
 
-#: src/files.c:654
+#: src/files.c:895
 #, 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:658
+#: src/files.c:899
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
@@ -168,479 +196,441 @@ msgstr[0] ""
 msgstr[1] ""
 "Lette %lu righe (Convertite dal formato DOS - Senza permesso di scrittura)"
 
-#: src/files.c:664
+#: src/files.c:905
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "Letta %lu riga"
 msgstr[1] "Lette %lu righe"
 
-#: src/files.c:667
+#: src/files.c:908
 #, 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:700 src/files.c:736
+#: src/files.c:943 src/files.c:980
 msgid "Reading File"
 msgstr "Lettura file"
 
-#: src/files.c:706
+#: src/files.c:950
 msgid "New File"
 msgstr "Nuovo file"
 
-#: src/files.c:709
+#: src/files.c:953
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" non trovato"
 
-#: src/files.c:717 src/rcfile.c:559 src/rcfile.c:1154 src/rcfile.c:1195
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" è una directory"
 
-#: src/files.c:718 src/rcfile.c:560 src/rcfile.c:1155 src/rcfile.c:1196
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" è un file di device"
 
-#: src/files.c:817
+#: src/files.c:1060
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Comando da eseguire in un nuovo buffer [da %s] "
 
-#: src/files.c:819
+#: src/files.c:1062
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Comando da eseguire [da %s] "
 
-#: src/files.c:825
+#: src/files.c:1069
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "File da inserire in un nuovo buffer [da %s] "
 
-#: src/files.c:827
+#: src/files.c:1071
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "File da inserire [da %s] "
 
-#: src/files.c:1077
+#: src/files.c:1320
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Chiave non valida in modalità non multibuffer"
 
-#: src/files.c:1486
+#: src/files.c:1622
+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:1746
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Impossibile salvare fuori da %s"
 
-#: src/files.c:1501
+#: src/files.c:1761
 msgid "Cannot prepend or append to a symlink with --nofollow set"
 msgstr "Impossibile aggiungere in testa/coda a un collegamento con --nofollow"
 
-#: src/files.c:1581 src/files.c:1603 src/files.c:1621 src/files.c:1632
-#: src/files.c:1640 src/files.c:1667
+#: src/files.c:1843 src/files.c:1868 src/files.c:1886 src/files.c:1899
+#: src/files.c:1910 src/files.c:1939
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Errore durante la scrittura del file di backup %s: %s"
 
-#: src/files.c:1582 src/nano.c:701
+#: src/files.c:1844 src/nano.c:719
 msgid "Too many backup files?"
 msgstr "Troppi file di backup?"
 
-#: src/files.c:1687 src/files.c:1744 src/files.c:1763 src/files.c:1775
-#: src/files.c:1799 src/files.c:1817 src/files.c:1827 src/files.c:1863
-#: src/files.c:1868 src/files.c:2764 src/files.c:2773
+#: src/files.c:1959 src/files.c:2016 src/files.c:2035 src/files.c:2047
+#: src/files.c:2071 src/files.c:2089 src/files.c:2099 src/files.c:2135
+#: src/files.c:2140 src/files.c:3101 src/files.c:3110 src/files.c:3133
+#: src/files.c:3145
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Errore durante la scrittura di %s: %s"
 
-#: src/files.c:1721 src/text.c:2929 src/text.c:2941
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Errore durante la scrittura del file temporaneo: %s"
 
-#: src/files.c:1900
+#: src/files.c:2173
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "Scritta %lu riga"
 msgstr[1] "Scritte %lu righe"
 
-#: src/files.c:2004
+#: src/files.c:2278
 msgid " [DOS Format]"
 msgstr " [Formato DOS]"
 
-#: src/files.c:2005
+#: src/files.c:2279
 msgid " [Mac Format]"
 msgstr " [Formato Mac]"
 
-#: src/files.c:2007
+#: src/files.c:2281
 msgid " [Backup]"
 msgstr " [Backup]"
 
-#: src/files.c:2015
+#: src/files.c:2289
 msgid "Prepend Selection to File"
 msgstr "Inserisce selezione in testa al file"
 
-#: src/files.c:2016
+#: src/files.c:2290
 msgid "Append Selection to File"
 msgstr "Accoda selezione al file"
 
-#: src/files.c:2017
+#: src/files.c:2291
 msgid "Write Selection to File"
 msgstr "Salva selezione nel file"
 
-#: src/files.c:2020
+#: src/files.c:2294
 msgid "File Name to Prepend to"
 msgstr "Nome del file in cui inserire in testa"
 
-#: src/files.c:2021
+#: src/files.c:2295
 msgid "File Name to Append to"
 msgstr "Nome del file a cui accodare"
 
-#: src/files.c:2022
+#: src/files.c:2296
 msgid "File Name to Write"
 msgstr "Nome del file in cui salvare"
 
-#: src/files.c:2153
+#: src/files.c:2427
 msgid "File exists, OVERWRITE ? "
 msgstr "Il file esiste, SOVRASCRIVERE?"
 
-#: src/files.c:2162
+#: src/files.c:2436
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "Salvare il file con un NOME DIFFERENTE?"
 
-#: src/files.c:2173
+#: src/files.c:2450
 msgid "File was modified since you opened it, continue saving ? "
 msgstr "Il file è stato modificato dall'apertura. Continuare a salvare? "
 
-#: src/files.c:2611
+#: src/files.c:2882
 msgid "(more)"
 msgstr "(ancora)"
 
-#: src/files.c:2694 src/rcfile.c:1220
+#: src/files.c:2974
 #, c-format
 msgid ""
 "\n"
-"Press Enter to continue starting nano.\n"
+"Press Enter to continue\n"
 msgstr ""
 "\n"
-"Premere Invio per continuare l'avvio di nano.\n"
-
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:415 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Annulla"
+"Premere Invio per continuare\n"
 
-#: src/global.c:416
-msgid "Replace"
-msgstr "Sostituisci"
+#: src/files.c:2989
+#, c-format
+msgid ""
+"Unable to create directory %s: %s\n"
+"It is required for saving/loading search history or cursor positions.\n"
+msgstr ""
+"Impossibile creare la directory %s: %s\n"
+"È richiesta per salvare/caricare le ricerche o le posizioni del cursore.\n"
 
-#: src/global.c:417
-msgid "No Replace"
-msgstr "Non sost."
+#: src/files.c:2995
+#, 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 ""
+"Il percorso %s non è una directory, ma è necessario che lo sia.\n"
+"Nano non sarà in grado di caricare o salvare le ricerche o le posizioni del "
+"cursore.\n"
 
-# FIXME
-#: src/global.c:420
-msgid "Case Sens"
-msgstr "Maius/Minus"
+#: src/files.c:3012
+#, 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 ""
+"Riscontrato un file di nano obsoleto (%s): si è cercato di spostarlo\n"
+"al percorso preferito (%s) ma si è verificato un errore: %s"
 
-#: src/global.c:421
-msgid "Backwards"
-msgstr "Indietro"
+#: src/files.c:3016
+#, 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 ""
+"Trovato un file di nano obsoleto (%s) e spostato nel percorso\n"
+"preferito (%s)\n"
+"(vedere la FAQ di nano a proposito di questo cambiamento)"
 
-#: src/global.c:425
-msgid "Regexp"
-msgstr "Espr.Reg."
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
+#: src/global.c:477
+msgid "Exit"
+msgstr "Esci"
 
-# FIXME
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:451
-msgid "PrevHstory"
-msgstr "Precedente"
+#: src/global.c:478
+msgid "Close"
+msgstr "Chiudi"
 
-# FIXME
-#: src/global.c:452
-msgid "NextHstory"
-msgstr "Successivo"
+#: src/global.c:479
+msgid "Uncut Text"
+msgstr "Incolla"
 
-#: src/global.c:453
-msgid "Go To Text"
-msgstr "Vai al testo"
+#: src/global.c:481
+msgid "Unjustify"
+msgstr "Degiustif."
 
 # FIXME
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:455
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:485
 msgid "WhereIs Next"
 msgstr "Successivo"
 
-#: src/global.c:457
-msgid "First File"
-msgstr "Primo file"
-
-#: src/global.c:458
-msgid "Last File"
-msgstr "Ultimo file"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:460
-msgid "To Files"
-msgstr "Sfoglia"
-
-#: src/global.c:462
-msgid "DOS Format"
-msgstr "Formato DOS"
-
-#: src/global.c:463
-msgid "Mac Format"
-msgstr "Formato Mac"
-
-#: src/global.c:464
-msgid "Append"
-msgstr "Accoda"
-
-#: src/global.c:465
-msgid "Prepend"
-msgstr "Scrivi in testa"
-
-#: src/global.c:466
-msgid "Backup File"
-msgstr "File di backup"
-
-#: src/global.c:467
-msgid "Execute Command"
-msgstr "Esegui comando"
-
-#: src/global.c:471
-msgid "Go To Dir"
-msgstr "Vai alla directory"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:480
-msgid "Get Help"
-msgstr "Guida"
-
-#: src/global.c:481
-msgid "Exit"
-msgstr "Esci"
-
-#: src/global.c:482
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:492
 msgid "Where Is"
 msgstr "Cerca"
 
-#: src/global.c:483
-msgid "Prev Page"
-msgstr "Pag Prec."
-
-#: src/global.c:484
-msgid "Next Page"
-msgstr "Pag Succ."
-
-#: src/global.c:485
-msgid "First Line"
-msgstr "Prima riga"
+#: src/global.c:493
+msgid "Replace"
+msgstr "Sostituisci"
 
-#: src/global.c:486
-msgid "Last Line"
-msgstr "Ultima riga"
+#: src/global.c:494
+msgid "Go To Line"
+msgstr "Vai a riga"
 
-#: src/global.c:487
-msgid "Suspend"
-msgstr "Sospendi"
+#: src/global.c:495
+msgid "Prev Line"
+msgstr "Riga prec."
 
-#: src/global.c:489
-msgid "Beg of Par"
-msgstr "Iniz.Par."
+#: src/global.c:496
+msgid "Next Line"
+msgstr "Riga succ."
 
-#: src/global.c:490
-msgid "End of Par"
-msgstr "Fine Par."
+#: src/global.c:497
+msgid "Read File"
+msgstr "Inserisci"
 
-#: src/global.c:491
+#: src/global.c:499
 msgid "FullJstify"
 msgstr "Giust.File"
 
-#: src/global.c:493
+#: src/global.c:501
 msgid "Refresh"
 msgstr "Aggiorna"
 
-#: src/global.c:495
-msgid "Insert File"
-msgstr "Inserisci file"
-
-#: src/global.c:497
-msgid "Go To Line"
-msgstr "Vai a riga"
-
-#: src/global.c:500
+#. 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:507
 msgid "Justify the current paragraph"
 msgstr "Giustifica il paragrafo corrente"
 
-#. 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:505
+#: src/global.c:509
 msgid "Cancel the current function"
 msgstr "Annulla la funzione corrente"
 
-#: src/global.c:506
+#: src/global.c:510
 msgid "Display this help text"
 msgstr "Mostra questo messaggio di aiuto"
 
-#: src/global.c:509
+#: src/global.c:513
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Chiude il file corrente / Esce da nano"
 
-#: src/global.c:511
+#: src/global.c:515
 msgid "Exit from nano"
 msgstr "Esce da nano"
 
-#: src/global.c:515
+#: src/global.c:519
 msgid "Write the current file to disk"
 msgstr "Salva il file corrente su disco"
 
-#: src/global.c:517
+#: src/global.c:521
 msgid "Insert another file into the current one"
 msgstr "Inserisce un altro file nel corrente"
 
-#: src/global.c:519
+#: src/global.c:523
 msgid "Search for a string or a regular expression"
 msgstr "Cerca una stringa o un'espressione regolare"
 
-#: src/global.c:520
-msgid "Go to previous screen"
+#: src/global.c:526
+msgid "Search for a string"
+msgstr "Cerca una stringa"
+
+#: src/global.c:528
+msgid "Go one screenful up"
 msgstr "Va alla schermata precedente"
 
-#: src/global.c:521
-msgid "Go to next screen"
+#: src/global.c:529
+msgid "Go one screenful down"
 msgstr "Va alla schermata successiva"
 
-#: src/global.c:523
+#: src/global.c:531
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Taglia la riga corrente e la memorizza nel cutbuffer"
 
-#: src/global.c:525
+#: src/global.c:533
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Incolla dal cutbuffer nella riga corrente"
 
-#: src/global.c:527
+#: src/global.c:534
 msgid "Display the position of the cursor"
 msgstr "Mostra la posizione del cursore"
 
-#: src/global.c:529
+#: src/global.c:536
 msgid "Invoke the spell checker, if available"
 msgstr "Esegue il correttore ortografico, se disponibile"
 
-#: src/global.c:531
+#: src/global.c:538
 msgid "Replace a string or a regular expression"
 msgstr "Sostituisce una stringa o un'espressione regolare"
 
-#: src/global.c:532
+#: src/global.c:539
 msgid "Go to line and column number"
 msgstr "Va a un numero di riga e di colonna specifico"
 
-#: src/global.c:534
-msgid "Mark text at the cursor position"
-msgstr "Marca testo alla posizione del cursore"
+#: src/global.c:541
+msgid "Mark text starting from the cursor position"
+msgstr "Marca testo partendo dalla posizione del cursore"
 
-#: src/global.c:535
-msgid "Repeat last search"
+#: src/global.c:542
+msgid "Repeat the last search"
 msgstr "Ripete l'ultima ricerca"
 
-#: src/global.c:537
+#: src/global.c:544
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "Copia la riga corrente e la memorizza nel cutbuffer"
 
-#: src/global.c:538
+#: src/global.c:545
 msgid "Indent the current line"
 msgstr "Applica indentazione alla riga corrente"
 
-#: src/global.c:539
+#: src/global.c:546
 msgid "Unindent the current line"
 msgstr "Toglie indentazione dalla riga corrente"
 
-#: src/global.c:540
+#: src/global.c:547
 msgid "Undo the last operation"
 msgstr "Annulla l'ultima operazione"
 
-#: src/global.c:541
+#: src/global.c:548
 msgid "Redo the last undone operation"
 msgstr "Ripete l'ultima operazione"
 
-#: src/global.c:543
+#: src/global.c:550
 msgid "Go forward one character"
 msgstr "Avanza di un carattere"
 
-#: src/global.c:544
+#: src/global.c:551
 msgid "Go back one character"
 msgstr "Arretra di un carattere"
 
-#: src/global.c:546
+#: src/global.c:553
 msgid "Go forward one word"
 msgstr "Avanza di una parola"
 
-#: src/global.c:547
+#: src/global.c:554
 msgid "Go back one word"
 msgstr "Arretra di una parola"
 
-#: src/global.c:549
+#: src/global.c:556
 msgid "Go to previous line"
 msgstr "Va alla riga precedente"
 
-#: src/global.c:550
+#: src/global.c:557
 msgid "Go to next line"
 msgstr "Va alla riga successiva"
 
-#: src/global.c:551
+#: src/global.c:558
 msgid "Go to beginning of current line"
 msgstr "Va all'inizio della riga corrente"
 
-#: src/global.c:552
+#: src/global.c:559
 msgid "Go to end of current line"
 msgstr "Va alla fine della riga corrente"
 
-#: src/global.c:555
+#: src/global.c:562
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "Va all'inizio del paragrafo; poi al paragrafo precedente"
 
-#: src/global.c:557
+#: src/global.c:564
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr "Va alla fine del paragrafo; poi al paragrafo successivo"
 
-#: src/global.c:560
+#: src/global.c:566
 msgid "Go to the first line of the file"
 msgstr "Va alla prima riga del file"
 
-#: src/global.c:562
+#: src/global.c:567
 msgid "Go to the last line of the file"
 msgstr "Va all'ultima riga del file"
 
-#: src/global.c:564
+#: src/global.c:569
 msgid "Go to the matching bracket"
 msgstr "Va alla parentesi corrispondente"
 
-#: src/global.c:566
+#: src/global.c:571
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "Scorre in alto di una riga senza muovere il cursore"
 
-#: src/global.c:568
+#: src/global.c:573
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "Scorre in basso di una riga senza muovere il cursore"
 
-#: src/global.c:572
+#: src/global.c:576
 msgid "Switch to the previous file buffer"
 msgstr "Va al buffer precedente"
 
-#: src/global.c:574
+#: src/global.c:577
 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:577
+#: src/global.c:579
 msgid "Insert the next keystroke verbatim"
 msgstr "Inserisce un carattere letteralmente"
 
-#: src/global.c:579
+#: src/global.c:580
 msgid "Insert a tab at the cursor position"
 msgstr "Inserisce una tabulazione alla posizione del cursore"
 
@@ -648,340 +638,446 @@ msgstr "Inserisce una tabulazione alla posizione del cursore"
 msgid "Insert a newline at the cursor position"
 msgstr "Inserisce un ritorno a capo alla posizione del cursore"
 
-#: src/global.c:583
+#: src/global.c:582
 msgid "Delete the character under the cursor"
 msgstr "Elimina il carattere sotto il cursore"
 
-#: src/global.c:585
+#: src/global.c:584
 msgid "Delete the character to the left of the cursor"
 msgstr "Elimina il carattere a sinistra del cursore"
 
-#: src/global.c:588
+#: src/global.c:587
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Taglia dal cursore alla fine del file"
 
-#: src/global.c:591
+#: src/global.c:590
 msgid "Justify the entire file"
 msgstr "Giustifica l'intero file"
 
-#: src/global.c:595
+#: src/global.c:594
 msgid "Count the number of words, lines, and characters"
 msgstr "Conta il numero di parole, righe e caratteri"
 
-#: src/global.c:598
+#: src/global.c:597
 msgid "Refresh (redraw) the current screen"
 msgstr "Aggiorna la schermata corrente"
 
-#: src/global.c:600
+#: src/global.c:599
 msgid "Suspend the editor (if suspend is enabled)"
 msgstr "Sospende l'editor (se la sospensione è abilitata)"
 
 # FIXME
-#: src/global.c:603
+#: src/global.c:602
 msgid "Toggle the case sensitivity of the search"
 msgstr "Considera maiuscole/minuscole nella ricerca"
 
-#: src/global.c:605
+#: src/global.c:604
 msgid "Reverse the direction of the search"
 msgstr "Inverte la direzione di ricerca"
 
 # FIXME
-#: src/global.c:609
+#: src/global.c:608
 msgid "Toggle the use of regular expressions"
 msgstr "Attiva/disattiva uso di espressioni regolari"
 
-#: src/global.c:613
+#: src/global.c:612
 msgid "Recall the previous search/replace string"
 msgstr "Richiama la stringa di ricerca/sostituzione precedente"
 
-#: src/global.c:615
+#: src/global.c:614
 msgid "Recall the next search/replace string"
 msgstr "Richiama la stringa di ricerca/sostituzione successiva"
 
-#: src/global.c:618
+#: src/global.c:617
 msgid "Go to file browser"
 msgstr "Va al browser di file"
 
 # FIXME
-#: src/global.c:621
+#: src/global.c:620
 msgid "Toggle the use of DOS format"
 msgstr "Usa il formato DOS"
 
 # FIXME
-#: src/global.c:622
+#: src/global.c:621
 msgid "Toggle the use of Mac format"
 msgstr "Usa il formato Mac"
 
-#: src/global.c:624
+#: src/global.c:622
 msgid "Toggle appending"
 msgstr "Attiva/disattiva scrittura in coda al file"
 
-#: src/global.c:625
+#: src/global.c:623
 msgid "Toggle prepending"
 msgstr "Attiva/disattiva scrittura in testa al file"
 
-#: src/global.c:628
+#: src/global.c:624
 msgid "Toggle backing up of the original file"
 msgstr "Attiva/disattiva creazione copia di backup del file originale"
 
-#: src/global.c:629
+#: src/global.c:625
 msgid "Execute external command"
 msgstr "Esegue un comando esterno"
 
 # FIXME
-#: src/global.c:633
+#: src/global.c:628
 msgid "Toggle the use of a new buffer"
 msgstr "Usa un nuovo buffer"
 
-#: src/global.c:636
+#: src/global.c:631
 msgid "Exit from the file browser"
 msgstr "Esce dal browser di file"
 
-#: src/global.c:638
+#: src/global.c:632
 msgid "Go to the first file in the list"
 msgstr "Va al primo file dell'elenco"
 
-#: src/global.c:640
+#: src/global.c:633
 msgid "Go to the last file in the list"
 msgstr "Va all'ultimo file dell'elenco"
 
-#: src/global.c:641
-msgid "Go to the next file in the list"
-msgstr "Va al prossimo file dell'elenco"
-
-#: src/global.c:642
+#: src/global.c:634
 msgid "Go to the previous file in the list"
 msgstr "Va al precedente file dell'elenco"
 
+#: src/global.c:635
+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:643
+#: src/global.c:636
 msgid "Go to directory"
 msgstr "Va alla directory"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:670
-msgid "Close"
-msgstr "Chiudi"
+#: src/global.c:639
+msgid "Invoke the linter, if available"
+msgstr "Esegue il linter, se disponibile"
+
+#: src/global.c:640
+msgid "Go to previous linter msg"
+msgstr "Va alla messaggio precedente del linter"
+
+#: src/global.c:641
+msgid "Go to next linter msg"
+msgstr "Va al messaggio successivo del linter"
+
+#: src/global.c:642
+msgid "Invoke formatter, if available"
+msgstr "Esegue il formattatore, se disponibile"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:679
-msgid "WriteOut"
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:662
+msgid "Get Help"
+msgstr "Guida"
+
+#: src/global.c:665 src/prompt.c:1084
+msgid "Cancel"
+msgstr "Annulla"
+
+#: src/global.c:678
+msgid "Write Out"
 msgstr "Salva"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:704
+msgid "Go To Dir"
+msgstr "Vai alla directory"
+
+#: src/global.c:719
+msgid "Cut Text"
+msgstr "Taglia"
+
+#: src/global.c:728
 msgid "Justify"
 msgstr "Giustifica"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:696
-msgid "Read File"
-msgstr "Inserisci"
+#: src/global.c:733
+msgid "To Spell"
+msgstr "Ortografia"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:713
-msgid "Cut Text"
-msgstr "Taglia"
+#: src/global.c:738
+msgid "To Linter"
+msgstr "Linter"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:718
-msgid "UnJustify"
-msgstr "DeGiustif."
+#: src/global.c:740
+msgid "Formatter"
+msgstr "Formattatore"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:723
-msgid "UnCut Text"
-msgstr "Incolla"
+# FIXME
+#: src/global.c:745
+msgid "Case Sens"
+msgstr "Maius/Minus"
+
+#: src/global.c:750
+msgid "Regexp"
+msgstr "Espr.Reg."
+
+#: src/global.c:755
+msgid "Backwards"
+msgstr "Indietro"
+
+#: src/global.c:762
+msgid "No Replace"
+msgstr "Non sost."
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:728 src/global.c:755
+#: src/global.c:770
 msgid "Cur Pos"
 msgstr "Posizione"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:737
-msgid "To Spell"
-msgstr "Ortografia"
+#: src/global.c:780
+msgid "Prev Page"
+msgstr "Pag Prec."
 
-#: src/global.c:771
+#: src/global.c:782
+msgid "Next Page"
+msgstr "Pag Succ."
+
+#: src/global.c:785
+msgid "First Line"
+msgstr "Prima riga"
+
+#: src/global.c:787
+msgid "Last Line"
+msgstr "Ultima riga"
+
+#: src/global.c:794
+msgid "To Bracket"
+msgstr "Parentesi"
+
+#: src/global.c:797
 msgid "Mark Text"
 msgstr "Marca testo"
 
-#: src/global.c:777
+#: src/global.c:800
 msgid "Copy Text"
 msgstr "Copia"
 
-#: src/global.c:780
+#: src/global.c:803
 msgid "Indent Text"
 msgstr "Indenta"
 
 # FIXME
-#: src/global.c:783
+#: src/global.c:805
 msgid "Unindent Text"
 msgstr "Deindenta"
 
-#: src/global.c:787
+#: src/global.c:808
 msgid "Undo"
 msgstr "Annulla"
 
-#: src/global.c:790
+#: src/global.c:810
 msgid "Redo"
 msgstr "Ripeti"
 
-#: src/global.c:796 src/global.c:800
-msgid "Forward"
-msgstr "Avanti"
-
-#: src/global.c:806 src/global.c:810
+#: src/global.c:814 src/global.c:820
 msgid "Back"
 msgstr "Indietro"
 
-#: src/global.c:817
-msgid "Next Word"
-msgstr "Parola succ."
+#: src/global.c:816 src/global.c:822
+msgid "Forward"
+msgstr "Avanti"
 
-#: src/global.c:820
+#: src/global.c:827
 msgid "Prev Word"
 msgstr "Parola prec."
 
-#: src/global.c:824
-msgid "Prev Line"
-msgstr "Riga prec."
-
-#: src/global.c:827
-msgid "Next Line"
-msgstr "Riga succ."
+#: src/global.c:829
+msgid "Next Word"
+msgstr "Parola succ."
 
-#: src/global.c:830
+#: src/global.c:833
 msgid "Home"
 msgstr "Inizio"
 
-#: src/global.c:833
+#: src/global.c:835
 msgid "End"
 msgstr "Fine"
 
-#: src/global.c:845
-msgid "Find Other Bracket"
-msgstr "Trova la parentesi corrispondente"
+#: src/global.c:844
+msgid "Beg of Par"
+msgstr "Iniz.Par."
 
-#: src/global.c:848
+#: src/global.c:846
+msgid "End of Par"
+msgstr "Fine Par."
+
+#: src/global.c:851
 msgid "Scroll Up"
 msgstr "Scorri su"
 
-#: src/global.c:851
+#: src/global.c:853
 msgid "Scroll Down"
 msgstr "Scorri giù"
 
-#: src/global.c:856
-msgid "Previous File"
+#: src/global.c:858
+msgid "Prev File"
 msgstr "File prec."
 
-#: src/global.c:858
+#: src/global.c:860
 msgid "Next File"
 msgstr "File succ."
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:862 src/text.c:3045
-msgid "Verbatim Input"
-msgstr "Input letterale"
+#: src/global.c:869
+msgid "Verbatim"
+msgstr "Letterale"
 
-#: src/global.c:867
+#: src/global.c:872
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:870
+#: src/global.c:874
 msgid "Enter"
 msgstr "Invio"
 
-#: src/global.c:873
+#: src/global.c:876
 msgid "Delete"
 msgstr "Elimina"
 
-#: src/global.c:876
+#: src/global.c:878
 msgid "Backspace"
 msgstr "Backspace"
 
 # FIXME
-#: src/global.c:893
+#: src/global.c:888
 msgid "CutTillEnd"
 msgstr "TagliaAFine"
 
-#: src/global.c:906
+#: src/global.c:898
 msgid "Word Count"
 msgstr "Conta parole"
 
-#: src/global.c:1367
+#: src/global.c:905
+msgid "Suspend"
+msgstr "Sospendi"
+
+# FIXME
+#: src/global.c:910
+msgid "PrevHstory"
+msgstr "Precedente"
+
+# FIXME
+#: src/global.c:913
+msgid "NextHstory"
+msgstr "Successivo"
+
+#: src/global.c:917
+msgid "Go To Text"
+msgstr "Vai al testo"
+
+#: src/global.c:928
+msgid "DOS Format"
+msgstr "Formato DOS"
+
+#: src/global.c:931
+msgid "Mac Format"
+msgstr "Formato Mac"
+
+#: src/global.c:934
+msgid "Append"
+msgstr "Accoda"
+
+#: src/global.c:936
+msgid "Prepend"
+msgstr "Scrivi in testa"
+
+#: src/global.c:939
+msgid "Backup File"
+msgstr "File di backup"
+
+#: src/global.c:946
+msgid "Execute Command"
+msgstr "Esegui comando"
+
+#: src/global.c:961
+msgid "To Files"
+msgstr "Sfoglia"
+
+#: src/global.c:964
+msgid "First File"
+msgstr "Primo file"
+
+#: src/global.c:966
+msgid "Last File"
+msgstr "Ultimo file"
+
+#: src/global.c:977
+msgid "Prev Lint Msg"
+msgstr "Msg lint prec."
+
+#: src/global.c:979
+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:1227
 msgid "Help mode"
 msgstr "Barra dei comandi"
 
-#: src/global.c:1369
+#: src/global.c:1229
 msgid "Constant cursor position display"
 msgstr "Mostra sempre la posizione del cursore"
 
 # FIXME
-#: src/global.c:1371
+#: src/global.c:1231
 msgid "Use of one more line for editing"
 msgstr "Usa una riga in più per le modifiche"
 
-#: src/global.c:1373
+#: src/global.c:1233
 msgid "Smooth scrolling"
 msgstr "Scorrimento continuo"
 
-#: src/global.c:1375
+#: src/global.c:1235
+msgid "Soft wrapping of overlong lines"
+msgstr "A capo automatico morbido delle righe lunghe"
+
+#: src/global.c:1237
 msgid "Whitespace display"
 msgstr "Mostra spazi bianchi"
 
-#: src/global.c:1377
+#: src/global.c:1239
 msgid "Color syntax highlighting"
 msgstr "Sintassi colorata"
 
-#: src/global.c:1379
+#: src/global.c:1241
 msgid "Smart home key"
 msgstr "Tasto Inizio intelligente"
 
-#: src/global.c:1381
+#: src/global.c:1243
 msgid "Auto indent"
 msgstr "Indentazione automatica"
 
-#: src/global.c:1383
+#: src/global.c:1245
 msgid "Cut to end"
 msgstr "Taglia fino a fine riga"
 
-#: src/global.c:1385
-msgid "Long line wrapping"
-msgstr "A capo automatico"
+#: src/global.c:1247
+msgid "Hard wrapping of overlong lines"
+msgstr "A capo automatico delle righe lunghe"
 
-#: src/global.c:1387
+#: src/global.c:1249
 msgid "Conversion of typed tabs to spaces"
 msgstr "Conversione delle tabulazioni in spazi"
 
-#: src/global.c:1389
+#: src/global.c:1251
 msgid "Backup files"
 msgstr "File di backup"
 
-#: src/global.c:1391
+#: src/global.c:1253
 msgid "Multiple file buffers"
 msgstr "File multipli"
 
-#: src/global.c:1393
+#: src/global.c:1255
 msgid "Mouse support"
 msgstr "Supporto per il mouse"
 
-#: src/global.c:1395
+#: src/global.c:1257
 msgid "No conversion from DOS/Mac format"
 msgstr "Nessuna conversione dai formati DOS/Mac"
 
-#: src/global.c:1397
+#: src/global.c:1259
 msgid "Suspension"
 msgstr "Sospensione"
 
-# FIXME
-#: src/global.c:1399
-msgid "Soft line wrapping"
-msgstr "A capo morbido"
-
-#: src/help.c:236
+#: src/help.c:205
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1003,7 +1099,7 @@ msgstr ""
 "prompt di ricerca. Premendo Invio senza inserire nulla, verrà eseguita la "
 "ricerca precedente. "
 
-#: src/help.c:245
+#: src/help.c:214
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1017,7 +1113,7 @@ msgstr ""
 " Le seguenti funzioni sono disponibili in modalità Cerca:\n"
 "\n"
 
-#: src/help.c:251
+#: src/help.c:220
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1037,7 +1133,7 @@ msgstr ""
 " Le seguenti funzioni sono disponibili in modalità Vai a Riga:\n"
 "\n"
 
-#: src/help.c:260
+#: src/help.c:229
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1060,7 +1156,7 @@ msgstr ""
 "provocherà il caricamento in un buffer separato (usare Meta-< e > per "
 "muoversi tra i buffer). "
 
-#: src/help.c:269
+#: src/help.c:238
 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"
@@ -1074,7 +1170,7 @@ msgstr ""
 " Le seguenti funzioni sono disponibili in modalità Inserisci:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:244
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1101,7 +1197,7 @@ msgstr ""
 "\n"
 " Le seguenti funzioni sono disponibili in modalità Salva:\n"
 
-#: src/help.c:289
+#: src/help.c:258
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1125,7 +1221,7 @@ msgstr ""
 " Le seguenti funzioni sono disponibili nel file browser\n"
 "\n"
 
-#: src/help.c:302
+#: src/help.c:271
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1150,7 +1246,7 @@ msgstr ""
 "\n"
 
 # FIXME
-#: src/help.c:311
+#: src/help.c:280
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1158,7 +1254,7 @@ msgstr ""
 "Le seguenti funzioni sono disponibili in modalità Cerca:\n"
 "\n"
 
-#: src/help.c:315
+#: src/help.c:284
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1180,7 +1276,7 @@ msgstr ""
 " Le seguenti funzioni sono disponibili in modalità Vai alla Directory:\n"
 "\n"
 
-#: src/help.c:328
+#: src/help.c:297
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1204,7 +1300,7 @@ msgstr ""
 " Le seguenti funzioni sono disponibili in modalità Ortografia:\n"
 "\n"
 
-#: src/help.c:343
+#: src/help.c:312
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1224,7 +1320,7 @@ msgstr ""
 " Le seguenti funzioni sono disponibili in modalità Esegui comando:\n"
 "\n"
 
-#: src/help.c:356
+#: src/help.c:325
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1244,7 +1340,7 @@ 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:366
+#: src/help.c:335
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1263,7 +1359,7 @@ msgstr ""
 "(M) possono essere inserite usato alternativamente il tasto Esc, Alt o Meta, "
 "a seconda della configurazione della tastiera.  "
 
-#: src/help.c:375
+#: src/help.c:344
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1277,15 +1373,15 @@ msgstr ""
 "sequenze alternative sono mostrate tra parentesi:\n"
 "\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:376 src/help.c:448
 msgid "enable/disable"
 msgstr "abilita/disabilita"
 
-#: src/nano.c:587
+#: src/nano.c:601
 msgid "Key invalid in view mode"
 msgstr "Chiave non valida in modalità Visualizza"
 
-#: src/nano.c:695
+#: src/nano.c:713
 #, c-format
 msgid ""
 "\n"
@@ -1294,7 +1390,7 @@ msgstr ""
 "\n"
 "Buffer scritto su %s\n"
 
-#: src/nano.c:697
+#: src/nano.c:715
 #, c-format
 msgid ""
 "\n"
@@ -1303,7 +1399,7 @@ msgstr ""
 "\n"
 "Buffer scritto su %s: %s\n"
 
-#: src/nano.c:700
+#: src/nano.c:718
 #, c-format
 msgid ""
 "\n"
@@ -1312,11 +1408,11 @@ msgstr ""
 "\n"
 "Buffer scritto: %s\n"
 
-#: src/nano.c:723
+#: src/nano.c:743
 msgid "Window size is too small for nano...\n"
 msgstr "La finestra è troppo piccola per nano...\n"
 
-#: src/nano.c:816
+#: src/nano.c:836
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
@@ -1325,261 +1421,265 @@ msgstr ""
 "Uso: nano [OPZIONI] [[+RIGA,COLONNA] FILE]...\n"
 "\n"
 
-#: src/nano.c:819
+#: src/nano.c:839
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Opzione\t\tOpzione lunga\t\tSignificato\n"
 
-#: src/nano.c:821
+#: src/nano.c:841
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Opzione\t\tSignificato\n"
 
-#: src/nano.c:824
-msgid "Show this message"
-msgstr "Mostra questo messaggio"
-
-#: src/nano.c:825
+#: src/nano.c:844
 msgid "+LINE,COLUMN"
 msgstr "+RIGA,COLONNA"
 
-#: src/nano.c:826
+#. TRANSLATORS: The next forty or so strings are option descriptions
+#. * for the --help output.  Try to keep them at most 40 characters.
+#: src/nano.c:847
 msgid "Start at line LINE, column COLUMN"
 msgstr "Inizia alla riga numero RIGA, colonna numero COLONNA"
 
-#: src/nano.c:828
+#: src/nano.c:849
 msgid "Enable smart home key"
 msgstr "Abilita il tasto Inizio intelligente"
 
 # Questo messaggio è stato tradotto come uno simile più in alto.
-#: src/nano.c:829
+#: src/nano.c:850
 msgid "Save backups of existing files"
 msgstr "Crea una copia di backup dei file esistenti"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "-C <dir>"
 msgstr "-C <dir>"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<dir>"
 
-#: src/nano.c:831
+#: src/nano.c:852
 msgid "Directory for saving unique backup files"
 msgstr "Directory in cui salvare i file di backup"
 
 # FIXME
-#: src/nano.c:834
+#: src/nano.c:855
 msgid "Use bold instead of reverse video text"
 msgstr "Usa grassetto invece di testo inverso"
 
-#: src/nano.c:837
+#: src/nano.c:858
 msgid "Convert typed tabs to spaces"
 msgstr "Converte le tabulazioni in spazi"
 
-#: src/nano.c:840
+#: src/nano.c:861
 msgid "Enable multiple file buffers"
 msgstr "Abilita buffer multipli"
 
-#: src/nano.c:845
+#: src/nano.c:865
+msgid "Use (vim-style) lock files"
+msgstr "Usa file di lock come vim"
+
+#: src/nano.c:869
 msgid "Log & read search/replace string history"
-msgstr "Salva le stringhe di ricerca/sostituzione"
+msgstr "Salva e leggi le stringhe di ricerca/sostituzione"
 
-#: src/nano.c:848
+#: src/nano.c:873
 msgid "Don't look at nanorc files"
 msgstr "Non considera i file nanorc"
 
-#: src/nano.c:851
+#: src/nano.c:876
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Risolve il problema di confusione del tastierino numerico"
 
 # FIXME
-#: src/nano.c:853
+#: src/nano.c:878
 msgid "Don't add newlines to the ends of files"
 msgstr "Non aggiunge caratteri newline in fondo ai file"
 
-#: src/nano.c:856
+#: src/nano.c:881
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Non converte i file dai formati DOS/Mac"
 
 # FIXME
-#: src/nano.c:858
+#: src/nano.c:883
 msgid "Use one more line for editing"
 msgstr "Usa una riga in più per le modifiche"
 
-#: src/nano.c:860
+#: src/nano.c:886
+msgid "Log & read location of cursor position"
+msgstr "Salva e legge la posizione del cursore"
+
+#: src/nano.c:889
 msgid "-Q <str>"
 msgstr "-Q <str>"
 
-#: src/nano.c:860
+#: src/nano.c:889
 msgid "--quotestr=<str>"
 msgstr "--quotestr=<str>"
 
-#: src/nano.c:861
+#: src/nano.c:890
 msgid "Quoting string"
 msgstr "Stringa di quoting"
 
-#: src/nano.c:863
+#: src/nano.c:892
 msgid "Restricted mode"
 msgstr "Modalità ristretta"
 
-#: src/nano.c:866
+#: src/nano.c:895
 msgid "Scroll by line instead of half-screen"
 msgstr "Scorrimento a ogni riga invece che a ogni metà schermata"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "-T <#cols>"
 msgstr "-T <#cols>"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#cols>"
 
-#: src/nano.c:869
+#: src/nano.c:898
 msgid "Set width of a tab to #cols columns"
 msgstr "Imposta la lunghezza della tabulazione a #cols"
 
 # FIXME
-#: src/nano.c:871
+#: src/nano.c:900
 msgid "Do quick statusbar blanking"
 msgstr "Svuota la barra di stato velocemente"
 
-#: src/nano.c:874
+#: src/nano.c:903
 msgid "Print version information and exit"
 msgstr "Stampa informazioni sulla versione ed esce"
 
-#: src/nano.c:877
+#: src/nano.c:906
 msgid "Detect word boundaries more accurately"
 msgstr "Rileva più precisamente i limiti delle parole"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "-Y <str>"
 msgstr "-Y <str>"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "--syntax=<str>"
 msgstr "--syntax=<str>"
 
-#: src/nano.c:881
+#: src/nano.c:910
 msgid "Syntax definition to use for coloring"
 msgstr "Definizione di sintassi da usare per la colorazione"
 
-#: src/nano.c:883
+#: src/nano.c:912
 msgid "Constantly show cursor position"
 msgstr "Mostra sempre la posizione del cursore"
 
-#: src/nano.c:885
+#: src/nano.c:914
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Risolve il problema Backspace/Canc"
 
-#: src/nano.c:888
+#: src/nano.c:915
+msgid "Show this help text"
+msgstr "Mostra questo messaggio di aiuto"
+
+#: src/nano.c:918
 msgid "Automatically indent new lines"
 msgstr "Indenta automaticamente le nuove righe"
 
-#: src/nano.c:889
+#: src/nano.c:919
 msgid "Cut from cursor to end of line"
 msgstr "Taglia dal cursore a fine riga"
 
-#: src/nano.c:892
+#: src/nano.c:922
 msgid "Don't follow symbolic links, overwrite"
 msgstr "Non segue i collegamenti simbolici, sovrascrive"
 
-#: src/nano.c:894
+#: src/nano.c:924
 msgid "Enable the use of the mouse"
 msgstr "Abilita l'uso del mouse"
 
-#: src/nano.c:897
+#: src/nano.c:926
+msgid "Do not read the file (only write it)"
+msgstr "Non legge il file (solo scrittura)"
+
+#: src/nano.c:928
 msgid "-o <dir>"
 msgstr "-o <dir>"
 
-#: src/nano.c:897
+#: src/nano.c:928
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<dir>"
 
-#: src/nano.c:898
+#: src/nano.c:929
 msgid "Set operating directory"
 msgstr "Imposta la directory operativa"
 
-#: src/nano.c:901
+#: src/nano.c:932
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Rispetta XON (^Q) e XOFF (^S)"
 
-#: src/nano.c:903
+#: src/nano.c:935
 msgid "Silently ignore startup issues like rc file errors"
 msgstr "Ignora i problemi all'avvio come gli errori nel file rc"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "-r <#cols>"
 msgstr "-r <#cols>"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "--fill=<#cols>"
 msgstr "--fill=<#cols>"
 
 # FIXME
-#: src/nano.c:906
-msgid "Set wrapping point at column #cols"
+#: src/nano.c:939
+msgid "Set hard-wrapping point at column #cols"
 msgstr "Imposta l'interruzione delle righe a #cols"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "-s <prog>"
 msgstr "-s <prog>"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "--speller=<prog>"
 msgstr "--speller=<prog>"
 
-#: src/nano.c:910
+#: src/nano.c:943
 msgid "Enable alternate speller"
 msgstr "Attiva correttore ortografico alternativo"
 
-#: src/nano.c:913
+#: src/nano.c:946
 msgid "Auto save on exit, don't prompt"
 msgstr "Salvataggio automatico in uscita senza conferma"
 
-# FIXME
-#: src/nano.c:915
-msgid "Allow generic undo [EXPERIMENTAL]"
-msgstr "Abilita annullamento generico (SPERIMENTALE)"
-
 # "Visualizza" è il nome della modalità. Appare in alto a destra.
-#: src/nano.c:918
+#: src/nano.c:947
 msgid "View mode (read-only)"
 msgstr "Visualizza (sola lettura)"
 
-#: src/nano.c:920
-msgid "Don't wrap long lines"
+#: src/nano.c:949
+msgid "Don't hard-wrap long lines"
 msgstr "Non interrompe le righe lunghe"
 
-#: src/nano.c:922
+#: src/nano.c:951
 msgid "Don't show the two help lines"
 msgstr "Non mostra la barra dei comandi"
 
-#: src/nano.c:923
+#: src/nano.c:952
 msgid "Enable suspension"
 msgstr "Abilita sospensione"
 
 # FIXME
-#: src/nano.c:924
+#: src/nano.c:954
 msgid "Enable soft line wrapping"
 msgstr "Abilita interruzione morbida delle righe"
 
-# NdT: Più di un'opzione viene ignorata.
-#: src/nano.c:928
-msgid "(ignored, for Pico compatibility)"
-msgstr "(ignorate, per compatibilità con Pico)"
-
-#: src/nano.c:938
+#: src/nano.c:963
 #, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
-msgstr " GNU nano versione %s (compilato %s, %s)\n"
+msgid " GNU nano, version %s\n"
+msgstr " GNU nano versione %s\n"
 
-#: src/nano.c:943
+#: src/nano.c:966
 #, 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:944
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1588,155 +1688,178 @@ msgstr ""
 "\n"
 " Opzioni di compilazione:"
 
-#: src/nano.c:1022
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr "Il supporto per questa funzionalità è stato disabilitato"
 
-#: src/nano.c:1044
+#: src/nano.c:1125
+msgid "No file name"
+msgstr "Nessun nome di file"
+
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr ""
 "Salvare il buffer modificato? (RISPONDERE \"No\" PER ANNULLARE LE MODIFICHE) "
 
-#: src/nano.c:1088
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "Impossibile riaprire stdin da tastiera\n"
 
-#: src/nano.c:1114
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "Lettura dallo stdin, ^C per interrompere\n"
 
-#: src/nano.c:1182
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Ricevuto SIGHUP o SIGTERM\n"
 
-#: src/nano.c:1204
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Usare \"fg\" per tornare a nano.\n"
 
-#: src/nano.c:1386
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "abilitato"
 
-#: src/nano.c:1387
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "disabilitato"
 
-#: src/nano.c:1548 src/winio.c:1256
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr "Comando sconosciuto"
 
-#: src/nano.c:1674
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "XON ignorato, mmm..."
 
-#: src/nano.c:1679
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF ignorato, mmm..."
 
-#: src/nano.c:2209 src/rcfile.c:1100
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Lunghezza della tabulazione \"%s\" non valida"
 
-#: src/nano.c:2268 src/rcfile.c:1025
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Lunghezza del riempimento \"%s\" non valida"
 
+#: src/nano.c:2415
+#, c-format
+msgid "Type '%s -h' for a list of available options.\n"
+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:1259
+#: src/prompt.c:1055
 msgid "Yy"
 msgstr "SsYy"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1056
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1057
 msgid "Aa"
 msgstr "Tt"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1071
 msgid "Yes"
 msgstr "Sì"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1076
 msgid "All"
 msgstr "Tutti"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1081
 msgid "No"
 msgstr "No"
 
-#: src/rcfile.c:130
+#: src/rcfile.c:137
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Errore in %s alla riga %lu: "
 
-#: src/rcfile.c:185
+#: src/rcfile.c:196
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "L'argomento \"%s\" ha un \" non terminato"
 
-#: src/rcfile.c:212 src/rcfile.c:264 src/rcfile.c:711 src/rcfile.c:768
-#: src/rcfile.c:821
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
 msgstr "L'espressione regolare deve iniziare e finire con il carattere \""
 
-#: src/rcfile.c:238 src/search.c:62
+#: src/rcfile.c:249 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Espressione regolare non corretta \"%s\": %s"
 
-#: src/rcfile.c:258
+#: src/rcfile.c:269
 msgid "Missing syntax name"
 msgstr "Nome di sintassi mancante"
 
-#: src/rcfile.c:316
+#: src/rcfile.c:340
 msgid "The \"none\" syntax is reserved"
 msgstr "La sintassi \"none\" è riservata"
 
-#: src/rcfile.c:323
+#: src/rcfile.c:347
 msgid "The \"default\" syntax must take no extensions"
 msgstr "La sintassi \"default\" non accetta estensioni"
 
-#: src/rcfile.c:386 src/rcfile.c:483
+#: src/rcfile.c:433
 msgid "Missing key name"
 msgstr "Nome di chiave mancante"
 
-#: src/rcfile.c:398 src/rcfile.c:499
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
-msgstr "le chiavi devono cominciare con \"^\", \"M\", o \"F\""
+#: src/rcfile.c:442 src/rcfile.c:453
+msgid "Key name is too short"
+msgstr "Il nome di chiave è troppo corto"
+
+#: src/rcfile.c:463
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
+msgstr "I nomi di chiavi devono cominciare con \"^\", \"M\", o \"F\""
 
-#: src/rcfile.c:407
-msgid "Must specify function to bind key to"
+#: src/rcfile.c:472
+msgid "Must specify a function to bind the key to"
 msgstr "Occorre specificare una funzione a cui associare la chiave"
 
-#: src/rcfile.c:418 src/rcfile.c:510
-msgid "Must specify menu to bind key to (or \"all\")"
-msgstr "Occorre specificare un menù a cui associare la chiave (oppure \"all\")"
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:482
+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:426
+#: src/rcfile.c:489
 #, c-format
-msgid "Could not map name \"%s\" to a function"
+msgid "Cannot map name \"%s\" to a function"
 msgstr "Impossibile associare il nome \"%s\" a una funzione"
 
-#: src/rcfile.c:432 src/rcfile.c:517
+#: src/rcfile.c:496
 #, c-format
-msgid "Could not map name \"%s\" to a menu"
+msgid "Cannot map name \"%s\" to a menu"
 msgstr "Impossibile associare il nome \"%s\" a un menù"
 
-# FIXME
-#: src/rcfile.c:454
+#: src/rcfile.c:528
+#, c-format
+msgid "Function '%s' does not exist in menu '%s'"
+msgstr "La funzione \"%s\" non esiste nel menù \"%s\""
+
+#: src/rcfile.c:543
+#, c-format
+msgid "Sorry, keystroke \"%s\" may not be rebound"
+msgstr "La chiave \"%s\" non può essere reimpostata"
+
+#: src/rcfile.c:629
 #, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
-msgstr "La chiave \"%s\" è un binding non consentito"
+msgid "Error expanding %s: %s"
+msgstr "Errore durante l'espansione di %s: %s"
 
-#: src/rcfile.c:625
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1751,139 +1874,199 @@ msgstr ""
 "\"black\", con il prefisso opzionale \"bright\"\n"
 "per i colori di primo piano."
 
-#: src/rcfile.c:647
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
 msgstr ""
 "Impossibile aggiungere una direttiva di colore senza una riga di sintassi"
 
-#: src/rcfile.c:652
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "Nome del colore mancante"
 
-#: src/rcfile.c:672
-#, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr "Il colore di sfondo \"%s\" non può essere \"bright\""
-
-#: src/rcfile.c:690 src/rcfile.c:809
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr "Stringa di espressione regolare mancante"
 
-#: src/rcfile.c:762
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\" richiede un \"end=\" corrispondente"
 
+#: src/rcfile.c:837
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr "Il colore di sfondo \"%s\" non può essere \"bright\""
+
 # FIXME
-#: src/rcfile.c:804
+#: src/rcfile.c:865
 msgid "Cannot add a header regex without a syntax command"
 msgstr ""
 "Impossibile aggiungere un'intestazione regex senza una riga di sintassi"
 
-#: src/rcfile.c:874
+# FIXME
+#: src/rcfile.c:921
+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:926
+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:990
+msgid "Missing linter command"
+msgstr "Comando del linter mancante"
+
+#: src/rcfile.c:1010
+msgid "Cannot add formatter without a syntax command"
+msgstr "Impossibile aggiungere un formattatore senza una riga di sintassi"
+
+#: src/rcfile.c:1015
+msgid "Missing formatter command"
+msgstr "Comando del formattatore mancante"
+
+#: src/rcfile.c:1045
 #, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
-msgstr "Errore fatale: nessuna chiave associata alla funzione \"%s\""
+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:876
+#: src/rcfile.c:1047
+#, c-format
 msgid ""
-"Exiting.  Please use nano with the -I option if needed to adjust your nanorc "
-"settings\n"
+"If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
-"Uscita. Usare nano con l'opzione -I se occorre modificare le impostazioni di "
-"nanorc\n"
+"Usare nano con l'opzione -I se occorre modificare le impostazioni di "
+"nanorc.\n"
+
+#: src/rcfile.c:1108
+#, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "Impossibile trovare sintassi \"%s\" da estendere"
 
 # FIXME
-#: src/rcfile.c:926 src/rcfile.c:935 src/rcfile.c:945
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Comando \"%s\" non permesso nel file incluso"
 
-#: src/rcfile.c:951 src/rcfile.c:1128
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "La sintassi \"%s\" non ha direttive di colore"
 
-#: src/rcfile.c:966
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Comando \"%s\" non riconosciuto"
 
-#: src/rcfile.c:972
-msgid "Missing flag"
-msgstr "Flag mancante"
+#: src/rcfile.c:1186
+msgid "Missing option"
+msgstr "Opzione mancante"
 
-#: src/rcfile.c:994
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "L'opzione \"%s\" richiede un argomento"
 
-#: src/rcfile.c:1012
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr "L'opzione non è una stringa multibyte valida"
 
-#: src/rcfile.c:1038 src/rcfile.c:1066 src/rcfile.c:1075
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr "Sono richiesti caratteri non di spaziatura"
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr "Sono richiesti due caratteri a colonna singola"
 
-#: src/rcfile.c:1114
+#: src/rcfile.c:1339
 #, c-format
-msgid "Cannot unset flag \"%s\""
-msgstr "Impossibile rimuovere il flag \"%s\""
+msgid "Cannot unset option \"%s\""
+msgstr "Impossibile rimuovere l'opzione \"%s\""
 
-#: src/rcfile.c:1123
+#: src/rcfile.c:1345
 #, c-format
-msgid "Unknown flag \"%s\""
-msgstr "Flag \"%s\" sconosciuto"
+msgid "Unknown option \"%s\""
+msgstr "Opzione \"%s\" sconosciuta"
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr "Impossibile trovare la directory home."
 
+#: src/rcfile.c:1442
+#, c-format
+msgid ""
+"\n"
+"Press Enter to continue starting nano.\n"
+msgstr ""
+"\n"
+"Premere Invio per continuare l'avvio di nano.\n"
+
 #: src/search.c:96
 #, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "\"%.*s%s\" non trovato"
 
-#: src/search.c:205
+# FIXME
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/search.c:184
+msgid " [Case Sensitive]"
+msgstr " [Maiuscole/Minuscole]"
+
+#: src/search.c:188
+msgid " [Regexp]"
+msgstr " [Espressione regolare]"
+
+#: src/search.c:192
+msgid " [Backwards]"
+msgstr " [All'indietro]"
+
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:197
 msgid " (to replace) in selection"
 msgstr " (sostituisci) nella selezione"
 
-#: src/search.c:207
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (sostituisci)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "Sostituire questa occorrenza?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:945
 msgid "Replace with"
 msgstr "Sostituire con"
 
-#: src/search.c:1004
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
 msgstr[0] "%lu sostituzione effettuata"
 msgstr[1] "%lu sostituzioni effettuate"
 
-#: src/search.c:1034
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr "Inserire il numero di riga, numero di colonna"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
 msgstr "Numero di riga o di colonna non valido"
 
-#: src/search.c:1214
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "Non è una parentesi"
 
-#: src/search.c:1281
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "Parentesi corrispondente non trovata"
 
@@ -1895,269 +2078,280 @@ msgstr "Marcatura impostata"
 msgid "Mark Unset"
 msgstr "Marcatura disattivata"
 
-#: src/text.c:443
+#: src/text.c:439
 msgid "Nothing in undo buffer!"
 msgstr "Buffer di annullamento vuoto."
 
 # FIXME
-#: src/text.c:455 src/text.c:593
+#: src/text.c:445 src/text.c:590
 #, c-format
-msgid "Internal error: can't match line %d.  Please save your work"
+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"
+"il lavoro."
 
-#: src/text.c:466 src/text.c:603
+#: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
 msgstr "aggiunta testo"
 
-#: src/text.c:475 src/text.c:613
+#: src/text.c:467 src/text.c:612
 msgid "text delete"
 msgstr "rimozione testo"
 
-# FIXME
-#: src/text.c:489 src/text.c:628
-msgid "line wrap"
-msgstr "a capo riga"
-
-#: src/text.c:503 src/text.c:636
+#: src/text.c:491 src/text.c:641
 msgid "line join"
 msgstr "unione riga"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:505 src/text.c:657
 msgid "text cut"
 msgstr "taglio testo"
 
 # FIXME
-#: src/text.c:518 src/text.c:655
+#: src/text.c:510 src/text.c:661
 msgid "text uncut"
 msgstr "incolla testo"
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:515 src/text.c:623
 msgid "line break"
 msgstr "interruzione riga"
 
-#: src/text.c:532 src/text.c:665
+#: src/text.c:528 src/text.c:672
 msgid "text insert"
 msgstr "inserimento testo"
 
-#: src/text.c:550 src/text.c:659
+#: src/text.c:549 src/text.c:665
 msgid "text replace"
 msgstr "sostituzione testo"
 
-#: src/text.c:557 src/text.c:671
-msgid "Internal error: unknown type.  Please save your work"
-msgstr "Errore interno: tipo sconosciuto. Salvare il lavoro"
+#: src/text.c:556 src/text.c:679 src/text.c:983
+msgid "Internal error: unknown type.  Please save your work."
+msgstr "Errore interno: tipo sconosciuto. Salvare il lavoro."
 
-#: src/text.c:563
+#: src/text.c:561
 #, c-format
 msgid "Undid action (%s)"
 msgstr "Azione annullata (%s)"
 
-#: src/text.c:578
+#: src/text.c:580
 msgid "Nothing to re-do!"
 msgstr "Niente da ripetere."
 
-# FIXME
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
-msgstr "Errore interno: ripetizione non riuscita. Salvare il lavoro"
+#: src/text.c:584
+msgid "Internal error: cannot set up redo.  Please save your work."
+msgstr "Errore interno: impossibile ripetere. Salvare il lavoro."
 
-#: src/text.c:676
+#: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Ripetuta azione (%s)"
 
-#: src/text.c:766
-msgid "Could not pipe"
-msgstr "Impossibile effettuare una pipe"
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
+msgid "Could not create pipe"
+msgstr "Impossibile creare la pipe"
 
-#: src/text.c:793 src/text.c:2636 src/text.c:2788
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "Impossibile effettuare un fork"
 
-# FIXME
-#: src/text.c:941
-msgid "Internal error: can't setup uncut.  Please save your work."
+#: src/text.c:969
+msgid "Internal error: cannot set up uncut.  Please save your work."
 msgstr "Errore interno: impossibile incollare. Salvare il lavoro."
 
-#: src/text.c:950
-msgid "Internal error: unknown type.  Please save your work."
-msgstr "Errore interno: tipo sconosciuto. Salvare il lavoro."
-
-#: src/text.c:1870
+#: src/text.c:1806
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Stringa di quoting non corretta %s: %s"
 
-#: src/text.c:2267
+#: src/text.c:2207
 msgid "Can now UnJustify!"
 msgstr "È ora possibile togliere la giustificazione."
 
-#: src/text.c:2462
+#: src/text.c:2404
 msgid "Edit a replacement"
 msgstr "Modifica sostituzione"
 
-#: src/text.c:2548
-msgid "Could not create pipe"
-msgstr "Impossibile creare la pipe"
-
-#: src/text.c:2550
+#: src/text.c:2492
 msgid "Creating misspelled word list, please wait..."
 msgstr "Creazione della lista delle parole non corrette, attendere..."
 
-#: src/text.c:2642
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
 msgstr "Impossibile ottenere la dimensione del buffer della pipe"
 
-#: src/text.c:2693
+#: src/text.c:2635
 msgid "Error invoking \"spell\""
 msgstr "Errore nel chiamare \"spell\""
 
-#: src/text.c:2696
+#: src/text.c:2638
 msgid "Error invoking \"sort -f\""
 msgstr "Errore nel chiamare \"sort -f\""
 
-#: src/text.c:2699
+#: src/text.c:2641
 msgid "Error invoking \"uniq\""
 msgstr "Errore nel chiamare \"uniq\""
 
-#: src/text.c:2756 src/text.c:2965
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "Controllo ortografico terminato"
 
-#: src/text.c:2815
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Errore nel chiamare \"%s\""
 
-#: src/text.c:2960
+#: src/text.c:2885
+msgid "Invoking spell checker, please wait"
+msgstr "Esecuzione del correttore ortografico, attendere"
+
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Controllo ortografico non riuscito: %s"
 
-#: src/text.c:2962
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Controllo ortografico non riuscito: %s: %s"
 
-#: src/text.c:3030
+#: src/text.c:2937
+msgid "No linter defined for this type of file!"
+msgstr "Nessun linter definito per questo tipo di file!"
+
+#: src/text.c:2947
+msgid "Save modified buffer before linting?"
+msgstr "Salvare il buffer prima dell'esecuzione del linter?"
+
+#: src/text.c:2969
+msgid "Invoking linter, please wait"
+msgstr "Esecuzione del linter, attendere"
+
+#: src/text.c:3125
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr "Ricevute 0 righe dal comando: %s"
+
+#: src/text.c:3159
+#, 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:3205
+msgid "At last message"
+msgstr "Ultimo messaggio"
+
+#: src/text.c:3210
+msgid "At first message"
+msgstr "Primo messaggio"
+
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr "Errore: nessun formattatore definito"
+
+#: src/text.c:3275
+msgid "Finished"
+msgstr "Completato"
+
+#: src/text.c:3280
+msgid "Invoking formatter, please wait"
+msgstr "Esecuzione del formattatore, attendere"
+
+#: src/text.c:3360
+msgid "Finished formatting"
+msgstr "Formattazione completata"
+
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sParole: %lu  Righe: %ld  Caratteri: %lu"
 
-#: src/text.c:3031
+#: src/text.c:3439
 msgid "In Selection:  "
 msgstr "Nella selezione:  "
 
-#: src/utils.c:405 src/utils.c:417
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3453
+msgid "Verbatim Input"
+msgstr "Input letterale"
+
+#: src/utils.c:410 src/utils.c:422
 msgid "nano is out of memory!"
 msgstr "nano ha esaurito la memoria."
 
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
-#: src/winio.c:1557
+#: src/winio.c:1583
 msgid "Unicode Input"
 msgstr "Input Unicode"
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2142 src/winio.c:2146
 msgid "Modified"
 msgstr "Modificato"
 
-#: src/winio.c:2150
+#: src/winio.c:2143
 msgid "View"
 msgstr "Visualizza"
 
-#: src/winio.c:2164
+#: src/winio.c:2157
 msgid "DIR:"
 msgstr "Dir:"
 
-#: src/winio.c:2171
+#: src/winio.c:2164
 msgid "File:"
 msgstr "File:"
 
-#: src/winio.c:3360
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2261
+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/winio.c:3377
 #, 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:3492
+#: src/winio.c:3507
 msgid "The nano text editor"
 msgstr "L'editor di testi nano"
 
-#: src/winio.c:3493
+#: src/winio.c:3508
 msgid "version"
 msgstr "versione"
 
-#: src/winio.c:3494
+#: src/winio.c:3509
 msgid "Brought to you by:"
 msgstr "Creato per voi da:"
 
-#: src/winio.c:3495
+#: src/winio.c:3510
 msgid "Special thanks to:"
 msgstr "Ringraziamenti speciali a:"
 
-#: src/winio.c:3496
+#: src/winio.c:3511
 msgid "The Free Software Foundation"
 msgstr "La Free Software Foundation"
 
-#: src/winio.c:3497
+#: src/winio.c:3512
+msgid "the many translators and the TP"
+msgstr "i numeriso traduttori e il Translation Project"
+
+#: src/winio.c:3513
 msgid "For ncurses:"
 msgstr "Per ncurses:"
 
-#: src/winio.c:3498
+#: src/winio.c:3514
 msgid "and anyone else we forgot..."
 msgstr "e chiunque altro abbiamo dimenticato..."
 
-#: src/winio.c:3499
+#: src/winio.c:3515
 msgid "Thank you for using nano!"
 msgstr "Grazie di usare nano!"
 
-#~ msgid "Error writing backup file %s: File owner mismatch"
+#~ msgid "Internal error: can't match line %ld.  Please save your work."
 #~ msgstr ""
-#~ "Errore scrivendo il file di backup %s: il proprietario non corrisponde"
-
-#~ msgid "line split"
-#~ msgstr "divisione riga"
-
-#~ msgid "Set fill cols to (wrap lines at) #cols"
-#~ msgstr "Configura riempimento colonne (interrompe righe) a #cols"
-
-#~ msgid "No lines selected, nothing to do!"
-#~ msgstr "Nessuna riga selezionata, niente da fare!"
-
-#~ msgid "Refusing zero-length regex match"
-#~ msgstr "Rifiutato il risultato di un'espressione regolare di lunghezza 0"
-
-#~ msgid "Make the current search/replace go backwards"
-#~ msgstr "Ricerca/sostituzione all'indietro"
-
-#~ msgid "Prepend to the current file"
-#~ msgstr "Scrive in testa al file corrente"
-
-#~ msgid "Back up original file when saving"
-#~ msgstr "Crea una copia di backup al salvataggio"
-
-#~ msgid "Insert into new buffer"
-#~ msgstr "Inserisce in un nuovo buffer"
-
-#~ msgid "Prepending to %s failed: %s"
-#~ msgstr "Inserimento in testa a %s non riuscito: %s"
-
-#~ msgid "Invoke the help menu"
-#~ msgstr "Mostra la guida"
-
-#~ msgid "Search for text within the editor"
-#~ msgstr "Cerca testo all'interno dell'editor"
-
-#~ msgid "Replace text within the editor"
-#~ msgstr "Sostituisce testo all'interno dell'editor"
-
-#~ msgid "Find matching bracket"
-#~ msgstr "Trova la parentesi corrispondente"
-
-#~ msgid "Duplicate syntax name %s"
-#~ msgstr "Nome della sintassi %s duplicato"
-
-#~ msgid "Could not create temp file: %s"
-#~ msgstr "Impossibile creare file temporaneo: %s"
+#~ "Errore interno: corrispondenza della riga %ld non trovata. Salvare il "
+#~ "lavoro."
diff --git a/po/ja.gmo b/po/ja.gmo
new file mode 100644
index 0000000..a98ef82
--- /dev/null
+++ b/po/ja.gmo
diff --git a/po/ja.po b/po/ja.po
new file mode 100644
index 0000000..6d08a24
--- /dev/null
+++ b/po/ja.po
@@ -0,0 +1,2351 @@
+# Japanese messages for nano
+# Copyright (C) 2011 Free Software Foundation, Inc.
+# This file is distributed under the same license as the nano package.
+#
+# Yasuaki Taniguchi <yasuakit@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: nano 2.3.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\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"
+"Language: ja\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:203
+msgid "Go To Directory"
+msgstr "ディレクトリへ移動"
+
+#: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
+msgid "Cancelled"
+msgstr "取り消しました"
+
+#: src/browser.c:246 src/browser.c:293
+#, c-format
+msgid "Can't go outside of %s in restricted mode"
+msgstr "制限モードでは %s の外部へ移動できません"
+
+#: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
+#: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
+#: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
+#: src/rcfile.c:590 src/rcfile.c:1426
+#, c-format
+msgid "Error reading %s: %s"
+msgstr "%s: %s の読み込みに失敗しました"
+
+#: src/browser.c:283
+msgid "Can't move up a directory"
+msgstr "上位のディレクトリへ移動できません"
+
+#. TRANSLATORS: Try to keep this at most 7
+#. * characters.
+#: src/browser.c:626 src/browser.c:635
+msgid "(dir)"
+msgstr "(dir)"
+
+#. TRANSLATORS: Try to keep this at most 12
+#. * characters.
+#: src/browser.c:632
+msgid "(parent dir)"
+msgstr "(parent dir)"
+
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:759 src/search.c:181
+msgid "Search"
+msgstr "検索"
+
+#: src/browser.c:812 src/search.c:382
+msgid "Search Wrapped"
+msgstr "先頭から検索します"
+
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
+msgid "This is the only occurrence"
+msgstr "他に見つかりません"
+
+#: src/browser.c:915 src/search.c:569
+msgid "No current search pattern"
+msgstr "検索語が指定されていません"
+
+#: src/files.c:139
+msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
+msgstr ""
+
+#: src/files.c:145
+#, c-format
+msgid "Couldn't determine hostname for lock file: %s"
+msgstr ""
+
+#: src/files.c:165 src/files.c:175 src/files.c:212 src/files.c:222
+#, fuzzy, c-format
+msgid "Error writing lock file %s: %s"
+msgstr "バックアップファイル %s の書き込みエラー: %s"
+
+#: src/files.c:237
+#, fuzzy, c-format
+msgid "Error deleting lock file %s: %s"
+msgstr "バックアップファイル %s の書き込みエラー: %s"
+
+#: src/files.c:272
+#, fuzzy, c-format
+msgid "Error opening lock file %s: %s"
+msgstr "バックアップファイル %s の書き込みエラー: %s"
+
+#: src/files.c:282
+#, 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:297
+#, c-format
+msgid "File %s is being edited (by %s with %s, PID %d); continue?"
+msgstr ""
+
+#: src/files.c:308
+#, fuzzy, c-format
+msgid "Error writing lock file: Directory '%s' doesn't exist"
+msgstr "バックアップファイル %s の書き込みエラー: %s"
+
+#: src/files.c:339
+#, c-format
+msgid "Can't insert file from outside of %s"
+msgstr "%s の外部からファイルを挿入できません"
+
+#: src/files.c:467
+msgid "No more open file buffers"
+msgstr "ファイルを開くためのバッファがありません"
+
+#: src/files.c:484
+#, c-format
+msgid "Switched to %s"
+msgstr "%s に切り替えます"
+
+#: src/files.c:485 src/global.c:953 src/winio.c:2161
+msgid "New Buffer"
+msgstr "新しいバッファ"
+
+#: src/files.c:874
+#, 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:879
+#, 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:885
+#, 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:889
+#, 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:895
+#, 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:899
+#, 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:905
+#, c-format
+msgid "Read %lu line"
+msgid_plural "Read %lu lines"
+msgstr[0] "%lu 行を読み込みます"
+
+#: src/files.c:908
+#, 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:943 src/files.c:980
+msgid "Reading File"
+msgstr "ファイルを読み込んでいます"
+
+#: src/files.c:950
+msgid "New File"
+msgstr "新しいファイル"
+
+#: src/files.c:953
+#, c-format
+msgid "\"%s\" not found"
+msgstr "\"%s\" が見つかりません"
+
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
+#, c-format
+msgid "\"%s\" is a directory"
+msgstr "\"%s\" はディレクトリです"
+
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
+#, c-format
+msgid "\"%s\" is a device file"
+msgstr "\"%s\" はデバイスファイルです"
+
+#: src/files.c:1060
+#, c-format
+msgid "Command to execute in new buffer [from %s] "
+msgstr "新しいバッファでコマンドを実行 [from %s] "
+
+#: src/files.c:1062
+#, c-format
+msgid "Command to execute [from %s] "
+msgstr "コマンドを実行 [from %s] "
+
+#: src/files.c:1069
+#, c-format
+msgid "File to insert into new buffer [from %s] "
+msgstr "新しいバッファへファイルを読み込み [from %s] "
+
+#: src/files.c:1071
+#, c-format
+msgid "File to insert [from %s] "
+msgstr "現在のバッファへファイルを読み込み [from %s] "
+
+#: src/files.c:1320
+msgid "Key invalid in non-multibuffer mode"
+msgstr "マルチバッファモードでの無効キー"
+
+#: src/files.c:1622
+msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+msgstr ""
+"バックアップファイルの書き込みに失敗しました。保存を継続しますか? (分からない"
+"場合は N としてください) "
+
+#: src/files.c:1746
+#, c-format
+msgid "Can't write outside of %s"
+msgstr "%s の外部から書き込めません"
+
+#: src/files.c:1761
+msgid "Cannot prepend or append to a symlink with --nofollow set"
+msgstr "--nofollow が設定されている状態ではリンク先を変更できません"
+
+#: src/files.c:1843 src/files.c:1868 src/files.c:1886 src/files.c:1899
+#: src/files.c:1910 src/files.c:1939
+#, c-format
+msgid "Error writing backup file %s: %s"
+msgstr "バックアップファイル %s の書き込みエラー: %s"
+
+#: src/files.c:1844 src/nano.c:719
+msgid "Too many backup files?"
+msgstr "バックアップファイルが多すぎませんか?"
+
+#: src/files.c:1959 src/files.c:2016 src/files.c:2035 src/files.c:2047
+#: src/files.c:2071 src/files.c:2089 src/files.c:2099 src/files.c:2135
+#: src/files.c:2140 src/files.c:3101 src/files.c:3110 src/files.c:3133
+#: src/files.c:3145
+#, c-format
+msgid "Error writing %s: %s"
+msgstr "%s の書き込みエラー: %s"
+
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
+#, c-format
+msgid "Error writing temp file: %s"
+msgstr "テンポラリファイルの書き込みエラー: %s"
+
+#: src/files.c:2173
+#, c-format
+msgid "Wrote %lu line"
+msgid_plural "Wrote %lu lines"
+msgstr[0] "%lu 行を書き込みました"
+
+#: src/files.c:2278
+msgid " [DOS Format]"
+msgstr " [DOS フォーマット]"
+
+#: src/files.c:2279
+msgid " [Mac Format]"
+msgstr " [Mac フォーマット]"
+
+#: src/files.c:2281
+msgid " [Backup]"
+msgstr " [バックアップ]"
+
+#: src/files.c:2289
+msgid "Prepend Selection to File"
+msgstr "ファイルの先頭に追加"
+
+#: src/files.c:2290
+msgid "Append Selection to File"
+msgstr "ファイルの末尾に追加"
+
+#: src/files.c:2291
+msgid "Write Selection to File"
+msgstr "ファイルに書き込み"
+
+#: src/files.c:2294
+msgid "File Name to Prepend to"
+msgstr "先頭に追加するファイル"
+
+#: src/files.c:2295
+msgid "File Name to Append to"
+msgstr "末尾に追加するファイル"
+
+#: src/files.c:2296
+msgid "File Name to Write"
+msgstr "書き込むファイル"
+
+#: src/files.c:2427
+msgid "File exists, OVERWRITE ? "
+msgstr "ファイルを上書きしてよいですか？ "
+
+#: src/files.c:2436
+msgid "Save file under DIFFERENT NAME ? "
+msgstr "違う名前で保存しますか？ "
+
+#: src/files.c:2450
+msgid "File was modified since you opened it, continue saving ? "
+msgstr "ファイルを開いた後に修正が入りました、保存しますか？ "
+
+#: src/files.c:2882
+msgid "(more)"
+msgstr "(続き)"
+
+#: src/files.c:2974
+#, c-format
+msgid ""
+"\n"
+"Press Enter to continue\n"
+msgstr ""
+"\n"
+"継続するために Enter を押してください\n"
+
+#: src/files.c:2989
+#, fuzzy, c-format
+msgid ""
+"Unable to create directory %s: %s\n"
+"It is required for saving/loading search history or cursor positions.\n"
+msgstr ""
+"ディレクトリ %s の作成に失敗しました: %s\n"
+"これは検索履歴およびカーソル位置の保存に必要なディレクトリです。\n"
+
+#: src/files.c:2995
+#, fuzzy, 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 ""
+"パス %s はディレクトリである必要がありますが、ディレクトリではありません\n"
+"Nano は検索およびカーソル位置履歴の読み込みと保存ができません。\n"
+
+#: src/files.c:3012
+#, 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:3016
+#, 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 ""
+
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
+#: src/global.c:477
+msgid "Exit"
+msgstr "終了"
+
+#: src/global.c:478
+msgid "Close"
+msgstr "閉じる"
+
+#: src/global.c:479
+#, fuzzy
+msgid "Uncut Text"
+msgstr "貼り付け"
+
+#: src/global.c:481
+#, fuzzy
+msgid "Unjustify"
+msgstr "両端揃え"
+
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:485
+msgid "WhereIs Next"
+msgstr "次へ移動"
+
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:492
+msgid "Where Is"
+msgstr "移動"
+
+#: src/global.c:493
+msgid "Replace"
+msgstr "置換"
+
+#: src/global.c:494
+msgid "Go To Line"
+msgstr "行を指定"
+
+#: src/global.c:495
+msgid "Prev Line"
+msgstr "前の行"
+
+#: src/global.c:496
+msgid "Next Line"
+msgstr "次の行"
+
+#: src/global.c:497
+msgid "Read File"
+msgstr "読み込み"
+
+#: src/global.c:499
+msgid "FullJstify"
+msgstr "全て均等化"
+
+#: src/global.c:501
+msgid "Refresh"
+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:507
+msgid "Justify the current paragraph"
+msgstr "段落を均等化"
+
+#: src/global.c:509
+msgid "Cancel the current function"
+msgstr "動作を取り消します"
+
+#: src/global.c:510
+msgid "Display this help text"
+msgstr "ヘルプを表示"
+
+#: src/global.c:513
+msgid "Close the current file buffer / Exit from nano"
+msgstr "現在のファイルを閉じて nano を終了"
+
+#: src/global.c:515
+msgid "Exit from nano"
+msgstr "nano を終了"
+
+#: src/global.c:519
+msgid "Write the current file to disk"
+msgstr "現在のファイルをディスクへ書き込み"
+
+#: src/global.c:521
+msgid "Insert another file into the current one"
+msgstr "ファイルから読み込み"
+
+#: src/global.c:523
+msgid "Search for a string or a regular expression"
+msgstr "正規表現で文字列を検索"
+
+#: src/global.c:526
+#, fuzzy
+msgid "Search for a string"
+msgstr "正規表現で文字列を検索"
+
+#: src/global.c:528
+#, fuzzy
+msgid "Go one screenful up"
+msgstr "次のページへ移動"
+
+#: src/global.c:529
+#, fuzzy
+msgid "Go one screenful down"
+msgstr "次のページへ移動"
+
+#: src/global.c:531
+msgid "Cut the current line and store it in the cutbuffer"
+msgstr "行の切り取り"
+
+#: src/global.c:533
+msgid "Uncut from the cutbuffer into the current line"
+msgstr "貼り付け"
+
+#: src/global.c:534
+msgid "Display the position of the cursor"
+msgstr "カーソル位置を表示"
+
+#: src/global.c:536
+msgid "Invoke the spell checker, if available"
+msgstr "スペルチェッカを起動 (利用可能な場合)"
+
+#: src/global.c:538
+msgid "Replace a string or a regular expression"
+msgstr "正規表現置換"
+
+#: src/global.c:539
+msgid "Go to line and column number"
+msgstr "指定位置へ移動"
+
+#: src/global.c:541
+#, fuzzy
+msgid "Mark text starting from the cursor position"
+msgstr "現在位置をマーク"
+
+#: src/global.c:542
+#, fuzzy
+msgid "Repeat the last search"
+msgstr "次を検索"
+
+#: src/global.c:544
+msgid "Copy the current line and store it in the cutbuffer"
+msgstr "行のコピー"
+
+#: src/global.c:545
+msgid "Indent the current line"
+msgstr "行のインデント"
+
+#: src/global.c:546
+msgid "Unindent the current line"
+msgstr "インデントの削除"
+
+#: src/global.c:547
+msgid "Undo the last operation"
+msgstr "直前の操作を取り消す (undo)"
+
+#: src/global.c:548
+msgid "Redo the last undone operation"
+msgstr "取り消した直前の操作をやり直す (redo)"
+
+#: src/global.c:550
+msgid "Go forward one character"
+msgstr "次の文字へ進む"
+
+#: src/global.c:551
+msgid "Go back one character"
+msgstr "前の文字へ戻る"
+
+#: src/global.c:553
+msgid "Go forward one word"
+msgstr "次の単語へ進む"
+
+#: src/global.c:554
+msgid "Go back one word"
+msgstr "前の単語へ戻る"
+
+#: src/global.c:556
+msgid "Go to previous line"
+msgstr "前の行へ移動する"
+
+#: src/global.c:557
+msgid "Go to next line"
+msgstr "次の行へ移動する"
+
+#: src/global.c:558
+msgid "Go to beginning of current line"
+msgstr "現在行の先頭へ移動"
+
+#: src/global.c:559
+msgid "Go to end of current line"
+msgstr "現在行の末尾へ移動"
+
+#: src/global.c:562
+msgid "Go to beginning of paragraph; then of previous paragraph"
+msgstr "段落の先頭へ移動、カーソルがその位置にある場合その前の段落へ移動"
+
+#: src/global.c:564
+msgid "Go just beyond end of paragraph; then of next paragraph"
+msgstr ""
+"段落の末尾の次の位置へ移動、カーソルがその位置にある場合その次の段落へ移動"
+
+#: src/global.c:566
+msgid "Go to the first line of the file"
+msgstr "ファイルの先頭行へ移動"
+
+#: src/global.c:567
+msgid "Go to the last line of the file"
+msgstr "ファイルの最終行へ移動"
+
+#: src/global.c:569
+msgid "Go to the matching bracket"
+msgstr "対応する括弧へ移動"
+
+#: src/global.c:571
+msgid "Scroll up one line without scrolling the cursor"
+msgstr "カーソル位置を変えずにバッファを一行逆スクロールさせる"
+
+#: src/global.c:573
+msgid "Scroll down one line without scrolling the cursor"
+msgstr "カーソル位置を変えずにバッファを一行スクロールさせる"
+
+#: src/global.c:576
+msgid "Switch to the previous file buffer"
+msgstr "前のバッファに切替え"
+
+#: src/global.c:577
+msgid "Switch to the next file buffer"
+msgstr "次のバッファに切替え"
+
+#: src/global.c:579
+msgid "Insert the next keystroke verbatim"
+msgstr "次のキーを逐語的に入力"
+
+#: src/global.c:580
+msgid "Insert a tab at the cursor position"
+msgstr "タブ文字の挿入"
+
+#: src/global.c:581
+msgid "Insert a newline at the cursor position"
+msgstr "行の挿入"
+
+#: src/global.c:582
+msgid "Delete the character under the cursor"
+msgstr "カーソル位置の文字を削除"
+
+#: src/global.c:584
+msgid "Delete the character to the left of the cursor"
+msgstr "カーソルの前の文字を削除"
+
+#: src/global.c:587
+msgid "Cut from the cursor position to the end of the file"
+msgstr "カーソル位置からファイル終端までを切り取り"
+
+#: src/global.c:590
+msgid "Justify the entire file"
+msgstr "ファイル全体を均等化"
+
+#: src/global.c:594
+msgid "Count the number of words, lines, and characters"
+msgstr "単語数、行数、文字数を表示"
+
+#: src/global.c:597
+msgid "Refresh (redraw) the current screen"
+msgstr "画面の更新"
+
+#: src/global.c:599
+msgid "Suspend the editor (if suspend is enabled)"
+msgstr "編集を一時中断する (有効な場合)"
+
+#: src/global.c:602
+msgid "Toggle the case sensitivity of the search"
+msgstr "検索時に大文字小文字を区別をするかしないかを切り替える"
+
+#: src/global.c:604
+msgid "Reverse the direction of the search"
+msgstr "検索方向の順逆を切り替える"
+
+#: src/global.c:608
+msgid "Toggle the use of regular expressions"
+msgstr "正規表現を使用するかしないかを切り替える"
+
+#: src/global.c:612
+msgid "Recall the previous search/replace string"
+msgstr "前の検索文字 / 置換文字列を呼び出す"
+
+#: src/global.c:614
+msgid "Recall the next search/replace string"
+msgstr "次の検索文字 / 置換文字列を呼び出す"
+
+#: src/global.c:617
+msgid "Go to file browser"
+msgstr "ファイルブラウザの起動"
+
+#: src/global.c:620
+msgid "Toggle the use of DOS format"
+msgstr "DOS フォーマットに切替え"
+
+#: src/global.c:621
+msgid "Toggle the use of Mac format"
+msgstr "Mac フォーマットに切替え"
+
+#: src/global.c:622
+msgid "Toggle appending"
+msgstr "ファイル末尾に追加する動作に切り替える"
+
+#: src/global.c:623
+msgid "Toggle prepending"
+msgstr "ファイル先頭に追加する動作に切り替える"
+
+#: src/global.c:624
+msgid "Toggle backing up of the original file"
+msgstr "元ファイルのバックアップを作成する動作に切り替える"
+
+#: src/global.c:625
+msgid "Execute external command"
+msgstr "外部コマンドの実行"
+
+#: src/global.c:628
+msgid "Toggle the use of a new buffer"
+msgstr "新しいバッファに切替え"
+
+#: src/global.c:631
+msgid "Exit from the file browser"
+msgstr "ファイルブラウザの終了"
+
+#: src/global.c:632
+msgid "Go to the first file in the list"
+msgstr "リストの先頭に移動"
+
+#: src/global.c:633
+msgid "Go to the last file in the list"
+msgstr "リストの末尾に移動"
+
+#: src/global.c:634
+msgid "Go to the previous file in the list"
+msgstr "リストの前のファイルへ移動"
+
+#: src/global.c:635
+msgid "Go to the next file in the list"
+msgstr "リストの次のファイルへ移動"
+
+#: src/global.c:636
+msgid "Go to directory"
+msgstr "ディレクトリに移動"
+
+#: src/global.c:639
+#, fuzzy
+msgid "Invoke the linter, if available"
+msgstr "スペルチェッカを起動 (利用可能な場合)"
+
+#: src/global.c:640
+#, fuzzy
+msgid "Go to previous linter msg"
+msgstr "前の行へ移動する"
+
+#: src/global.c:641
+#, fuzzy
+msgid "Go to next linter msg"
+msgstr "次の行へ移動する"
+
+#: src/global.c:642
+#, fuzzy
+msgid "Invoke formatter, if available"
+msgstr "スペルチェッカを起動 (利用可能な場合)"
+
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:662
+msgid "Get Help"
+msgstr "ヘルプ"
+
+#: src/global.c:665 src/prompt.c:1084
+msgid "Cancel"
+msgstr "取消"
+
+#: src/global.c:678
+#, fuzzy
+msgid "Write Out"
+msgstr "保存"
+
+#: src/global.c:704
+msgid "Go To Dir"
+msgstr "ディレクトリに移動"
+
+#: src/global.c:719
+msgid "Cut Text"
+msgstr "切り取り"
+
+#: src/global.c:728
+msgid "Justify"
+msgstr "両端揃え"
+
+#: src/global.c:733
+msgid "To Spell"
+msgstr "スペル確認"
+
+#: src/global.c:738
+#, fuzzy
+msgid "To Linter"
+msgstr "行を指定"
+
+#: src/global.c:740
+#, fuzzy
+msgid "Formatter"
+msgstr "DOS フォーマット"
+
+#: src/global.c:745
+msgid "Case Sens"
+msgstr "大/小文字"
+
+#: src/global.c:750
+msgid "Regexp"
+msgstr "正規表現"
+
+#: src/global.c:755
+msgid "Backwards"
+msgstr "後方に"
+
+#: src/global.c:762
+msgid "No Replace"
+msgstr "置換しない"
+
+#: src/global.c:770
+msgid "Cur Pos"
+msgstr "位置"
+
+#: src/global.c:780
+msgid "Prev Page"
+msgstr "前のページ"
+
+#: src/global.c:782
+msgid "Next Page"
+msgstr "次のページ"
+
+#: src/global.c:785
+msgid "First Line"
+msgstr "先頭行"
+
+#: src/global.c:787
+msgid "Last Line"
+msgstr "最終行"
+
+#: src/global.c:794
+#, fuzzy
+msgid "To Bracket"
+msgstr "大括弧ではありません"
+
+#: src/global.c:797
+msgid "Mark Text"
+msgstr "マーク"
+
+#: src/global.c:800
+msgid "Copy Text"
+msgstr "コピー"
+
+#: src/global.c:803
+msgid "Indent Text"
+msgstr "インデント"
+
+#: src/global.c:805
+msgid "Unindent Text"
+msgstr "インデント削除"
+
+#: src/global.c:808
+msgid "Undo"
+msgstr "Undo"
+
+#: src/global.c:810
+msgid "Redo"
+msgstr "Redo"
+
+#: src/global.c:814 src/global.c:820
+msgid "Back"
+msgstr "戻る"
+
+#: src/global.c:816 src/global.c:822
+msgid "Forward"
+msgstr "進む"
+
+#: src/global.c:827
+msgid "Prev Word"
+msgstr "前の単語"
+
+#: src/global.c:829
+msgid "Next Word"
+msgstr "次の単語"
+
+#: src/global.c:833
+msgid "Home"
+msgstr "先頭"
+
+#: src/global.c:835
+msgid "End"
+msgstr "末尾"
+
+#: src/global.c:844
+msgid "Beg of Par"
+msgstr "段落の始点"
+
+#: src/global.c:846
+msgid "End of Par"
+msgstr "段落の終点"
+
+#: src/global.c:851
+msgid "Scroll Up"
+msgstr "上にスクロール"
+
+#: src/global.c:853
+msgid "Scroll Down"
+msgstr "下にスクロール"
+
+#: src/global.c:858
+#, fuzzy
+msgid "Prev File"
+msgstr "前のファイル"
+
+#: src/global.c:860
+msgid "Next File"
+msgstr "次のファイル"
+
+#: src/global.c:869
+#, fuzzy
+msgid "Verbatim"
+msgstr "逐次入力"
+
+#: src/global.c:872
+msgid "Tab"
+msgstr "タブ"
+
+#: src/global.c:874
+msgid "Enter"
+msgstr "Enter"
+
+#: src/global.c:876
+msgid "Delete"
+msgstr "削除"
+
+#: src/global.c:878
+msgid "Backspace"
+msgstr "バックスペース"
+
+#: src/global.c:888
+msgid "CutTillEnd"
+msgstr "末尾まで切り取り"
+
+#: src/global.c:898
+msgid "Word Count"
+msgstr "単語の合計数"
+
+#: src/global.c:905
+msgid "Suspend"
+msgstr ""
+
+#: src/global.c:910
+msgid "PrevHstory"
+msgstr "前の履歴"
+
+#: src/global.c:913
+msgid "NextHstory"
+msgstr "次の履歴"
+
+#: src/global.c:917
+msgid "Go To Text"
+msgstr "検索"
+
+#: src/global.c:928
+msgid "DOS Format"
+msgstr "DOS フォーマット"
+
+#: src/global.c:931
+msgid "Mac Format"
+msgstr "Mac フォーマット"
+
+#: src/global.c:934
+msgid "Append"
+msgstr "末尾に追加"
+
+#: src/global.c:936
+msgid "Prepend"
+msgstr "先頭に追加"
+
+#: src/global.c:939
+msgid "Backup File"
+msgstr "バックアップ"
+
+#: src/global.c:946
+msgid "Execute Command"
+msgstr "コマンドを実行"
+
+#: src/global.c:961
+msgid "To Files"
+msgstr "ファイラ"
+
+#: src/global.c:964
+msgid "First File"
+msgstr "先頭へ"
+
+#: src/global.c:966
+msgid "Last File"
+msgstr "末尾へ"
+
+#: src/global.c:977
+#, fuzzy
+msgid "Prev Lint Msg"
+msgstr "前の行"
+
+#: src/global.c:979
+#, 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:1227
+msgid "Help mode"
+msgstr "ヘルプ"
+
+#: src/global.c:1229
+msgid "Constant cursor position display"
+msgstr "常にカーソル位置を表示"
+
+#: src/global.c:1231
+msgid "Use of one more line for editing"
+msgstr "編集用に一行余分に使用する"
+
+#: src/global.c:1233
+msgid "Smooth scrolling"
+msgstr "スムーズなスクロール"
+
+#: src/global.c:1235
+#, fuzzy
+msgid "Soft wrapping of overlong lines"
+msgstr "長い行の折り返しを禁止"
+
+#: src/global.c:1237
+msgid "Whitespace display"
+msgstr "空白を表示"
+
+#: src/global.c:1239
+msgid "Color syntax highlighting"
+msgstr "単語の強調"
+
+#: src/global.c:1241
+msgid "Smart home key"
+msgstr "スマートホームキー"
+
+#: src/global.c:1243
+msgid "Auto indent"
+msgstr "自動インデント"
+
+#: src/global.c:1245
+msgid "Cut to end"
+msgstr "改行の前まで削除"
+
+#: src/global.c:1247
+#, fuzzy
+msgid "Hard wrapping of overlong lines"
+msgstr "長い行の折り返しを禁止"
+
+#: src/global.c:1249
+msgid "Conversion of typed tabs to spaces"
+msgstr "タブをスペースに変換"
+
+#: src/global.c:1251
+msgid "Backup files"
+msgstr "バックアップファイル"
+
+#: src/global.c:1253
+msgid "Multiple file buffers"
+msgstr "複数のバッファ"
+
+#: src/global.c:1255
+msgid "Mouse support"
+msgstr "マウスのサポート"
+
+#: src/global.c:1257
+msgid "No conversion from DOS/Mac format"
+msgstr "DOS/Mac フォーマットを変換しない"
+
+#: src/global.c:1259
+msgid "Suspension"
+msgstr "一時中断"
+
+#: src/help.c:205
+msgid ""
+"Search Command Help Text\n"
+"\n"
+" Enter the words or characters you would like to search for, and then press "
+"Enter.  If there is a match for the text you entered, the screen will be "
+"updated to the location of the nearest match for the search string.\n"
+"\n"
+" The previous search string will be shown in brackets after the search "
+"prompt.  Hitting Enter without entering any text will perform the previous "
+"search.  "
+msgstr ""
+"検索コマンドのヘルプ\n"
+"\n"
+" 検索したい単語か文字を入力してエンターを押してください。もし検索語にマッチす"
+"るテキストが見つかったならば、カーソルが見つかったテキストの位置へ移動しま"
+"す。\n"
+"\n"
+" テキストを検索する方向は検索プロンプトの表示で見分けることができます。検索語"
+"を何も入力せずにエンターを押すと、前回の検索語が使用されます。  "
+
+#: src/help.c:214
+msgid ""
+"If you have selected text with the mark and then search to replace, only "
+"matches in the selected text will be replaced.\n"
+"\n"
+" The following function keys are available in Search mode:\n"
+"\n"
+msgstr ""
+"テキストの置換を行う場合は、選択範囲内のテキストに対してのみマッチが行われま"
+"す。\n"
+"\n"
+" 検索モードでは以下のファンクションキーが使用できます。\n"
+"\n"
+
+#: src/help.c:220
+msgid ""
+"Go To Line Help Text\n"
+"\n"
+" Enter the line number that you wish to go to and hit Enter.  If there are "
+"fewer lines of text than the number you entered, you will be brought to the "
+"last line of the file.\n"
+"\n"
+" The following function keys are available in Go To Line mode:\n"
+"\n"
+msgstr ""
+"指定行へ移動のヘルプ\n"
+"\n"
+" 移動した行番号を入力してエンターを押してください。もしテキスト全体の行数より"
+"も大きい数字を入力した場合は、最終行へ移動します。\n"
+"\n"
+" 指定行へ移動するモードでは以下のファンクションキーが使用できます。\n"
+"\n"
+
+#: src/help.c:229
+msgid ""
+"Insert File Help Text\n"
+"\n"
+" Type in the name of a file to be inserted into the current file buffer at "
+"the current cursor location.\n"
+"\n"
+" If you have compiled nano with multiple file buffer support, and enable "
+"multiple file buffers with the -F or --multibuffer command line flags, the "
+"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 ""
+"ファイルからの読み込みのヘルプ\n"
+"\n"
+" 読み込むファイル名を入力してください。ファイルは現在のバッファのカーソル位置"
+"へ読み込まれます。\n"
+"\n"
+" もしnanoがマルチプルバッファのサポートを有効にしてコンパイルされており、-Fま"
+"たは--multibufferオプションをつけて実行されているならば、ファイルは別のバッ"
+"ファに読み込まれます(Meta-<とMeta->キーでバッファを切り替えることができま"
+"す)。  "
+
+#: src/help.c:238
+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"
+"\n"
+" The following function keys are available in Insert File mode:\n"
+"\n"
+msgstr ""
+"もし別の空のバッファが必要ならば、ファイル名を入力せずにエンターを押すか、存"
+"在しないファイル名を入力してからエンターを押してください。\n"
+"\n"
+" ファイルからの読み込みモードでは以下のファンクションキーが使用できます。\n"
+"\n"
+
+#: src/help.c:244
+msgid ""
+"Write File Help Text\n"
+"\n"
+" Type the name that you wish to save the current file as and press Enter to "
+"save the file.\n"
+"\n"
+" If you have selected text with the mark, you will be prompted to save only "
+"the selected portion to a separate file.  To reduce the chance of "
+"overwriting the current file with just a portion of it, the current filename "
+"is not the default in this mode.\n"
+"\n"
+" The following function keys are available in Write File mode:\n"
+"\n"
+msgstr ""
+"ファイルへの書き込みのヘルプ\n"
+"\n"
+" 保存するファイル名を入力してエンターキーを押してください。\n"
+"\n"
+" もしテキストを選択した状態であった場合、選択した部分を別のファイルに書き込む"
+"ことができます。ファイルを上書きしてしまう危険を少なくするため、現在のファイ"
+"ル名がデフォルトで入力されていることはありません。\n"
+"\n"
+" ファイルへの書き込みモードでは以下のファンクションキーが使用できます。\n"
+"\n"
+
+#: src/help.c:258
+msgid ""
+"File Browser Help Text\n"
+"\n"
+" The file browser is used to visually browse the directory structure to "
+"select a file for reading or writing.  You may use the arrow keys or Page Up/"
+"Down to browse through the files, and S or Enter to choose the selected file "
+"or enter the selected directory.  To move up one level, select the directory "
+"called \"..\" at the top of the file list.\n"
+"\n"
+" The following function keys are available in the file browser:\n"
+"\n"
+msgstr ""
+"ファイルブラウザのヘルプ\n"
+"\n"
+" ファイルブラウザはディレクトリ構造をビジュアルに表示し、読み込みまたは書き込"
+"み対象となるファイルの選択を容易にします。矢印キーかPageUp/Downキーでファイル"
+"を選択し、Sキーかエンターキーで決定します。親ディレクトリへ移動したい場合はリ"
+"ストの先頭にある\"..\"を選択してください。\n"
+"\n"
+" ファイルブラウザでは以下のファンクションキーが使用できます。\n"
+"\n"
+
+#: src/help.c:271
+msgid ""
+"Browser Search Command Help Text\n"
+"\n"
+" Enter the words or characters you would like to search for, and then press "
+"Enter.  If there is a match for the text you entered, the screen will be "
+"updated to the location of the nearest match for the search string.\n"
+"\n"
+" The previous search string will be shown in brackets after the search "
+"prompt.  Hitting Enter without entering any text will perform the previous "
+"search.\n"
+"\n"
+msgstr ""
+"検索コマンド（ファイルブラウザ）のヘルプ\n"
+"\n"
+" 検索したい文字か単語を入力してエンターキーを押してください。入力にマッチする"
+"ファイルまたはディレクトリが見つかった場合、該当するファイルまたはディレクト"
+"リへカーソルが移動します。\n"
+"\n"
+" 検索プロンプトの後の括弧の中には、前回検索された語が表示されています。新たな"
+"検索語を入力せずにエンターキーを押すと、再度その語で検索を行います。\n"
+"\n"
+
+#: src/help.c:280
+msgid ""
+" The following function keys are available in Browser Search mode:\n"
+"\n"
+msgstr ""
+" ファイルブラウザの検索コマンドでは以下のファンクションキーが使用できます。\n"
+"\n"
+
+#: src/help.c:284
+msgid ""
+"Browser Go To Directory Help Text\n"
+"\n"
+" Enter the name of the directory you would like to browse to.\n"
+"\n"
+" If tab completion has not been disabled, you can use the Tab key to "
+"(attempt to) automatically complete the directory name.\n"
+"\n"
+" The following function keys are available in Browser Go To Directory mode:\n"
+"\n"
+msgstr ""
+"ディレクトリへ移動コマンド（ファイルブラウザ）のヘルプ\n"
+"\n"
+" 移動したいディレクトリの名前を入力してエンターキーを押してください。\n"
+"\n"
+" Tab補完機能が有効になっているならば、Tabキーを押すことでディレクトリ名を自動"
+"的に補完することができます。\n"
+"\n"
+" ファイルブラウザのディレクトリへ移動コマンドでは以下のファンクションキーが使"
+"用できます。\n"
+"\n"
+
+#: src/help.c:297
+msgid ""
+"Spell Check Help Text\n"
+"\n"
+" The spell checker checks the spelling of all text in the current file.  "
+"When an unknown word is encountered, it is highlighted and a replacement can "
+"be edited.  It will then prompt to replace every instance of the given "
+"misspelled word in the current file, or, if you have selected text with the "
+"mark, in the selected text.\n"
+"\n"
+" The following function keys are available in Spell Check mode:\n"
+"\n"
+msgstr ""
+"スペルチェックのヘルプ\n"
+"\n"
+" スペルチェッカは現在のファイルの中の全ての単語をチェックします。もし未知の単"
+"語が見つかったならば、スペルチェッカは該当する部分を強調表示して編集用のプロ"
+"ンプトを表示します。単語を修正してエンターキーを押すと、該当する部分が修正し"
+"た単語と置き換えられます。もしテキストの一部分を選択した状態であった場合、ス"
+"ペルチェッカは選択範囲内のテキストのみを対象に動作します。\n"
+"\n"
+" スペルチェックでは以下のファンクションキーが使用できます。\n"
+"\n"
+
+#: src/help.c:312
+msgid ""
+"Execute Command Help Text\n"
+"\n"
+" This mode allows you to insert the output of a command run by the shell "
+"into the current buffer (or a new buffer in multiple file buffer mode).  If "
+"you need another blank buffer, do not enter any command.\n"
+"\n"
+" The following function keys are available in Execute Command mode:\n"
+"\n"
+msgstr ""
+"コマンド実行のヘルプ\n"
+"\n"
+" このモードでは、シェルから実行されたコマンドの出力を現在のバッファ (もしく"
+"は、複数ファイルバッファモードでは新しいバッファ) に挿入することができます。"
+"空のバッファが必要な場合は、コマンドを入力しないでください。\n"
+"\n"
+" コマンド実行モードでは以下のファンクションキーが使用できます。\n"
+"\n"
+
+#: src/help.c:325
+msgid ""
+"Main nano help text\n"
+"\n"
+" The nano editor is designed to emulate the functionality and ease-of-use of "
+"the UW Pico text editor.  There are four main sections of the editor.  The "
+"top line shows the program version, the current filename being edited, and "
+"whether or not the file has been modified.  Next is the main editor window "
+"showing the file being edited.  The status line is the third line from the "
+"bottom and shows important messages.  "
+msgstr ""
+"nanoのヘルプ\n"
+"\n"
+" nanoはワシントン大学で開発されたPicoエディタの機能性と使いやすさを見習って開"
+"発されました。nanoの画面には4つのセクションがあり、一番上の行にはnanoのバー"
+"ジョン、編集中のファイル名、最後に保存されてから変更が行われたか否かが表示さ"
+"れています。次にファイルを編集する領域があります。下から三行目はステータス行"
+"で、重要なメッセージが表示されます。  "
+
+#: src/help.c:335
+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.  "
+msgstr ""
+"画面下部の二行には、一般的に使われるショートカットキーが表示されています。\n"
+"\n"
+" ショートカットキーの記法は以下の通りです。(^)で表記されているショートカット"
+"はCtrlキーを押すか、Escキーを二回続けて押すことを表してします。(M-)で表記され"
+"ているショートカットはAltキー、Escキーなどのメタキーを押すことを表していま"
+"す。  "
+
+#: src/help.c:344
+msgid ""
+"Also, pressing Esc twice and then typing a three-digit decimal number from "
+"000 to 255 will enter the character with the corresponding value.  The "
+"following keystrokes are available in the main editor window.  Alternative "
+"keys are shown in parentheses:\n"
+"\n"
+msgstr ""
+"また、Escキーを二回押した後に000から255までの十進数を入力することで、コードに"
+"対応する文字を入力することができます。以下のキーストロークは主なエディタの"
+"ウィンドウで使用できます。代替のキーストロークは括弧で囲って表記されます。\n"
+"\n"
+
+#: src/help.c:376 src/help.c:448
+msgid "enable/disable"
+msgstr "有効/無効"
+
+#: src/nano.c:601
+msgid "Key invalid in view mode"
+msgstr "ビューモードでそのキー入力は無効です"
+
+#: src/nano.c:713
+#, c-format
+msgid ""
+"\n"
+"Buffer written to %s\n"
+msgstr ""
+"\n"
+"バッファを %s へ書き込みました\n"
+
+#: src/nano.c:715
+#, c-format
+msgid ""
+"\n"
+"Buffer not written to %s: %s\n"
+msgstr ""
+"\n"
+"バッファを書き込めません %s: %s\n"
+
+#: src/nano.c:718
+#, c-format
+msgid ""
+"\n"
+"Buffer not written: %s\n"
+msgstr ""
+"\n"
+"バッファを %s へ書き込めません\n"
+
+#: src/nano.c:743
+msgid "Window size is too small for nano...\n"
+msgstr "ウィンドウのサイズが小さすぎます\n"
+
+#: src/nano.c:836
+#, c-format
+msgid ""
+"Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
+"\n"
+msgstr ""
+"使用法: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
+"\n"
+
+#: src/nano.c:839
+#, c-format
+msgid "Option\t\tGNU long option\t\tMeaning\n"
+msgstr "オプション\t\tGNUの長い形式のオプション\t\t説明\n"
+
+#: src/nano.c:841
+#, c-format
+msgid "Option\t\tMeaning\n"
+msgstr "オプション\t\t説明\n"
+
+#: src/nano.c:844
+msgid "+LINE,COLUMN"
+msgstr "+行,列"
+
+#. TRANSLATORS: The next forty or so strings are option descriptions
+#. * for the --help output.  Try to keep them at most 40 characters.
+#: src/nano.c:847
+msgid "Start at line LINE, column COLUMN"
+msgstr "起動時のカーソル位置 (行,列)"
+
+#: src/nano.c:849
+msgid "Enable smart home key"
+msgstr "スマートホームキー有効"
+
+#: src/nano.c:850
+msgid "Save backups of existing files"
+msgstr "既存ファイルのバックアップを保存する"
+
+#: src/nano.c:851
+msgid "-C <dir>"
+msgstr "-C <dir>"
+
+#: src/nano.c:851
+msgid "--backupdir=<dir>"
+msgstr "--backupdir=<dir>"
+
+#: src/nano.c:852
+msgid "Directory for saving unique backup files"
+msgstr "バックアップファイルを作成するディレクトリ"
+
+#: src/nano.c:855
+msgid "Use bold instead of reverse video text"
+msgstr "反転文字を太字で表示"
+
+#: src/nano.c:858
+msgid "Convert typed tabs to spaces"
+msgstr "タブをスペースに変換"
+
+#: src/nano.c:861
+msgid "Enable multiple file buffers"
+msgstr "複数ファイルバッファ有効"
+
+#: src/nano.c:865
+msgid "Use (vim-style) lock files"
+msgstr ""
+
+#: src/nano.c:869
+msgid "Log & read search/replace string history"
+msgstr "検索/置換した文字列の履歴を記録および読み取り"
+
+#: src/nano.c:873
+msgid "Don't look at nanorc files"
+msgstr "nanorc ファイルを参照しない"
+
+#: src/nano.c:876
+msgid "Fix numeric keypad key confusion problem"
+msgstr "テンキーパッドの混乱の問題を修正する"
+
+#: src/nano.c:878
+msgid "Don't add newlines to the ends of files"
+msgstr "ファイル末尾に空行を追加しない"
+
+#: src/nano.c:881
+msgid "Don't convert files from DOS/Mac format"
+msgstr "DOS/Mac フォーマットを変換しない"
+
+#: src/nano.c:883
+msgid "Use one more line for editing"
+msgstr "編集エリアを一行広くする"
+
+#: src/nano.c:886
+msgid "Log & read location of cursor position"
+msgstr "カーソル位置を記録・読み込みする"
+
+#: src/nano.c:889
+msgid "-Q <str>"
+msgstr "-Q <str>"
+
+#: src/nano.c:889
+msgid "--quotestr=<str>"
+msgstr "--quotestr=<str>"
+
+#: src/nano.c:890
+msgid "Quoting string"
+msgstr ""
+
+#: src/nano.c:892
+msgid "Restricted mode"
+msgstr "制限モード"
+
+#: src/nano.c:895
+msgid "Scroll by line instead of half-screen"
+msgstr "半画面ずつではなく1行ずつスクロールする"
+
+#: src/nano.c:897
+msgid "-T <#cols>"
+msgstr "-T <#cols>"
+
+#: src/nano.c:897
+msgid "--tabsize=<#cols>"
+msgstr "--tabsize=<#cols>"
+
+#: src/nano.c:898
+msgid "Set width of a tab to #cols columns"
+msgstr "タブ幅を #cols で指定"
+
+#: src/nano.c:900
+msgid "Do quick statusbar blanking"
+msgstr "ステータスバーの表示を早く消す"
+
+#: src/nano.c:903
+msgid "Print version information and exit"
+msgstr "バージョン情報を表示して終了する"
+
+#: src/nano.c:906
+msgid "Detect word boundaries more accurately"
+msgstr "単語の境界を正確に抽出する"
+
+#: src/nano.c:909
+msgid "-Y <str>"
+msgstr "-Y <str>"
+
+#: src/nano.c:909
+msgid "--syntax=<str>"
+msgstr "--syntax=<str>"
+
+#: src/nano.c:910
+msgid "Syntax definition to use for coloring"
+msgstr "表示色を決めるための構文定義"
+
+#: src/nano.c:912
+msgid "Constantly show cursor position"
+msgstr "常にカーソル位置を表示"
+
+#: src/nano.c:914
+msgid "Fix Backspace/Delete confusion problem"
+msgstr "Del キーをバックスペースとして扱う"
+
+#: src/nano.c:915
+#, fuzzy
+msgid "Show this help text"
+msgstr "ヘルプを表示"
+
+#: src/nano.c:918
+msgid "Automatically indent new lines"
+msgstr "改行で自動インデント"
+
+#: src/nano.c:919
+msgid "Cut from cursor to end of line"
+msgstr "行削除時に改行文字を削除しない"
+
+#: src/nano.c:922
+msgid "Don't follow symbolic links, overwrite"
+msgstr "上書き時にシンボリックリンクを辿らない"
+
+#: src/nano.c:924
+msgid "Enable the use of the mouse"
+msgstr "マウスを有効にする"
+
+#: src/nano.c:926
+msgid "Do not read the file (only write it)"
+msgstr ""
+
+#: src/nano.c:928
+msgid "-o <dir>"
+msgstr "-o <dir>"
+
+#: src/nano.c:928
+msgid "--operatingdir=<dir>"
+msgstr "--operatingdir=<dir>"
+
+#: src/nano.c:929
+msgid "Set operating directory"
+msgstr "作業ディレクトリを指定"
+
+#: src/nano.c:932
+msgid "Preserve XON (^Q) and XOFF (^S) keys"
+msgstr "XON (^Q) および XOFF (^S) キーを維持する"
+
+#: src/nano.c:935
+msgid "Silently ignore startup issues like rc file errors"
+msgstr "rcファイルエラーなど起動時の問題を無視する"
+
+#: src/nano.c:938
+msgid "-r <#cols>"
+msgstr "-r <#cols>"
+
+#: src/nano.c:938
+msgid "--fill=<#cols>"
+msgstr "--fill=<#cols>"
+
+#: src/nano.c:939
+#, fuzzy
+msgid "Set hard-wrapping point at column #cols"
+msgstr "折り返し桁数を指定する"
+
+#: src/nano.c:942
+msgid "-s <prog>"
+msgstr "-s <prog>"
+
+#: src/nano.c:942
+msgid "--speller=<prog>"
+msgstr "--speller=<prog>"
+
+#: src/nano.c:943
+msgid "Enable alternate speller"
+msgstr "別のスペルチェッカを指定する"
+
+#: src/nano.c:946
+msgid "Auto save on exit, don't prompt"
+msgstr "終了時に破棄の問い合わせをしない"
+
+#: src/nano.c:947
+msgid "View mode (read-only)"
+msgstr "ビューモード(読み込み専用)"
+
+#: src/nano.c:949
+#, fuzzy
+msgid "Don't hard-wrap long lines"
+msgstr "長い行の折り返しを禁止"
+
+#: src/nano.c:951
+msgid "Don't show the two help lines"
+msgstr "キーのガイドを表示しない"
+
+#: src/nano.c:952
+msgid "Enable suspension"
+msgstr "一時中断を有効化する"
+
+#: src/nano.c:954
+msgid "Enable soft line wrapping"
+msgstr "穏やかな行の折り返しを有効にする"
+
+#: src/nano.c:963
+#, fuzzy, c-format
+msgid " GNU nano, version %s\n"
+msgstr " GNU nano バージョン %s (コンパイル日時: %s, %s)\n"
+
+#: src/nano.c:966
+#, 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:967
+#, c-format
+msgid ""
+"\n"
+" Compiled options:"
+msgstr ""
+"\n"
+" コンパイルオプション:"
+
+#: src/nano.c:1096
+msgid "Sorry, support for this function has been disabled"
+msgstr "その機能は無効です"
+
+#: src/nano.c:1125
+msgid "No file name"
+msgstr ""
+
+#: src/nano.c:1136
+msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
+msgstr "変更されたバッファを保存しますか (保存しないと変更は破棄されます)？ "
+
+#: src/nano.c:1189
+msgid "Couldn't reopen stdin from keyboard, sorry\n"
+msgstr "申し訳ありませんが、キーボードからの標準入力を再オープンできません。\n"
+
+#: src/nano.c:1213
+#, c-format
+msgid "Reading from stdin, ^C to abort\n"
+msgstr "標準入力から読み込んでいます。中止する場合は ^C を入力してください\n"
+
+#: src/nano.c:1279
+msgid "Received SIGHUP or SIGTERM\n"
+msgstr "SIGHUP ないし SIGTERM を受信しました\n"
+
+#: src/nano.c:1301
+#, c-format
+msgid "Use \"fg\" to return to nano.\n"
+msgstr "\"fg\" とタイプすることで nano を再開できます。\n"
+
+#: src/nano.c:1481
+msgid "enabled"
+msgstr "使用する"
+
+#: src/nano.c:1481
+msgid "disabled"
+msgstr "使用しない"
+
+#: src/nano.c:1635 src/winio.c:1283
+msgid "Unknown Command"
+msgstr "不明なコマンド"
+
+#: src/nano.c:1747
+msgid "XON ignored, mumble mumble"
+msgstr "XON は効かないよ・・・ぶつぶつ"
+
+#: src/nano.c:1752
+msgid "XOFF ignored, mumble mumble"
+msgstr "XOFF は効かないよ・・・ぶつぶつ"
+
+#: src/nano.c:2310 src/rcfile.c:1325
+#, c-format
+msgid "Requested tab size \"%s\" is invalid"
+msgstr "要求されたタブのサイズ \"%s\" は不正です"
+
+#: src/nano.c:2374 src/rcfile.c:1250
+#, c-format
+msgid "Requested fill size \"%s\" is invalid"
+msgstr "要求されたサイズ \"%s\" は不正です"
+
+#: src/nano.c:2415
+#, c-format
+msgid "Type '%s -h' for a list of available options.\n"
+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:1055
+msgid "Yy"
+msgstr "Yy"
+
+#: src/prompt.c:1056
+msgid "Nn"
+msgstr "Nn"
+
+#: src/prompt.c:1057
+msgid "Aa"
+msgstr "Aa"
+
+#: src/prompt.c:1071
+msgid "Yes"
+msgstr "はい"
+
+#: src/prompt.c:1076
+msgid "All"
+msgstr "全て"
+
+#: src/prompt.c:1081
+msgid "No"
+msgstr "いいえ"
+
+#: src/rcfile.c:137
+#, c-format
+msgid "Error in %s on line %lu: "
+msgstr "エラー検出 %s の %lu 行目: "
+
+#: src/rcfile.c:196
+#, c-format
+msgid "Argument '%s' has an unterminated \""
+msgstr "引数 '%s' は \" で終端していません"
+
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
+msgid "Regex strings must begin and end with a \" character"
+msgstr "正規表現文字列は \" で括ってください"
+
+#: src/rcfile.c:249 src/search.c:62
+#, c-format
+msgid "Bad regex \"%s\": %s"
+msgstr "不正な正規表現 \"%s\": %s"
+
+#: src/rcfile.c:269
+msgid "Missing syntax name"
+msgstr "構文名がありません"
+
+#: src/rcfile.c:340
+msgid "The \"none\" syntax is reserved"
+msgstr "\"none\" 構文は予約語です"
+
+#: src/rcfile.c:347
+msgid "The \"default\" syntax must take no extensions"
+msgstr ""
+
+#: src/rcfile.c:433
+msgid "Missing key name"
+msgstr "キー名がみつかりません"
+
+#: src/rcfile.c:442 src/rcfile.c:453
+msgid "Key name is too short"
+msgstr ""
+
+#: src/rcfile.c:463
+#, fuzzy
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
+msgstr "キーバインドは \"^\", \"M\" ないし \"F\" で始めてください"
+
+#: src/rcfile.c:472
+#, fuzzy
+msgid "Must specify a function to bind the key to"
+msgstr ""
+"キーバインドを有効にするメニューを指定してください (もしくは \"all\" を指定し"
+"てください)"
+
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:482
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
+msgstr ""
+
+#: src/rcfile.c:489
+#, fuzzy, c-format
+msgid "Cannot map name \"%s\" to a function"
+msgstr "\"%s\" に対応する機能はありません"
+
+#: src/rcfile.c:496
+#, fuzzy, c-format
+msgid "Cannot map name \"%s\" to a menu"
+msgstr "\"%s\" に対応するメニューはありません"
+
+#: src/rcfile.c:528
+#, c-format
+msgid "Function '%s' does not exist in menu '%s'"
+msgstr ""
+
+#: src/rcfile.c:543
+#, fuzzy, c-format
+msgid "Sorry, keystroke \"%s\" may not be rebound"
+msgstr "申し訳ありませんが、キー \"%s\" は無効なバインディングです"
+
+#: src/rcfile.c:629
+#, fuzzy, c-format
+msgid "Error expanding %s: %s"
+msgstr "%s: %s の読み込みに失敗しました"
+
+#: src/rcfile.c:672
+#, c-format
+msgid ""
+"Color \"%s\" not understood.\n"
+"Valid colors are \"green\", \"red\", \"blue\",\n"
+"\"white\", \"yellow\", \"cyan\", \"magenta\" and\n"
+"\"black\", with the optional prefix \"bright\"\n"
+"for foreground colors."
+msgstr ""
+"色\"%s\"はサポートされていません。\n"
+"前景色に使用できる色は\"green\"、\"red\"\n"
+"\"blue\"、\"white\"、\"yellow\"、\"cyan\"\n"
+"\"magenta\"、\"black\"で、それぞれに任意で\n"
+"接頭語\"bright\"をつけることが出来ます。"
+
+#: src/rcfile.c:694
+msgid "Cannot add a color command without a syntax command"
+msgstr ""
+
+#: src/rcfile.c:699
+msgid "Missing color name"
+msgstr "色の名前がありません"
+
+#: src/rcfile.c:709 src/rcfile.c:870
+msgid "Missing regex string"
+msgstr "正規表現文字列がみつかりません"
+
+#: src/rcfile.c:785
+msgid "\"start=\" requires a corresponding \"end=\""
+msgstr "\"start=\" には対応する \"end=\" が必要です"
+
+#: src/rcfile.c:837
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr "背景色 \"%s\" が明るい色ではありません"
+
+#: src/rcfile.c:865
+msgid "Cannot add a header regex without a syntax command"
+msgstr ""
+
+#: src/rcfile.c:921
+msgid "Cannot add a magic string regex without a syntax command"
+msgstr ""
+
+#: src/rcfile.c:926
+msgid "Missing magic string name"
+msgstr ""
+
+#: src/rcfile.c:985
+msgid "Cannot add a linter without a syntax command"
+msgstr ""
+
+#: src/rcfile.c:990
+#, fuzzy
+msgid "Missing linter command"
+msgstr "色の名前がありません"
+
+#: src/rcfile.c:1010
+msgid "Cannot add formatter without a syntax command"
+msgstr ""
+
+#: src/rcfile.c:1015
+msgid "Missing formatter command"
+msgstr ""
+
+#: src/rcfile.c:1045
+#, fuzzy, c-format
+msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
+msgstr "致命的なエラー: \"%s\" の機能に対応するキーがありません"
+
+#: src/rcfile.c:1047
+#, fuzzy, c-format
+msgid ""
+"If needed, use nano with the -I option to adjust your nanorc settings.\n"
+msgstr ""
+"終了します。nanorc の設定を調整する必要がある場合は、 -I オプションを指定し"
+"て nano を使用してください。\n"
+
+#: src/rcfile.c:1108
+#, fuzzy, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "\"%s\" に対応するメニューはありません"
+
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
+#, c-format
+msgid "Command \"%s\" not allowed in included file"
+msgstr "コマンド \"%s\" はインクルードファイル内では許可されていません"
+
+#: src/rcfile.c:1149 src/rcfile.c:1350
+#, c-format
+msgid "Syntax \"%s\" has no color commands"
+msgstr "構文 \"%s\" は色のコマンドではありません"
+
+#: src/rcfile.c:1171
+#, c-format
+msgid "Command \"%s\" not understood"
+msgstr "コマンド \"%s\" を解釈できません"
+
+#: src/rcfile.c:1186
+#, fuzzy
+msgid "Missing option"
+msgstr "色の名前がありません"
+
+#: src/rcfile.c:1208
+#, c-format
+msgid "Option \"%s\" requires an argument"
+msgstr "オプション \"%s\" には引数が必要です"
+
+#: src/rcfile.c:1226
+msgid "Option is not a valid multibyte string"
+msgstr "オプションが有効なマルチバイト文字ではありません"
+
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
+msgid "Non-blank characters required"
+msgstr "非空白類文字が必要です"
+
+#: src/rcfile.c:1273
+msgid "Two single-column characters required"
+msgstr ""
+
+#: src/rcfile.c:1339
+#, fuzzy, c-format
+msgid "Cannot unset option \"%s\""
+msgstr "\"%s\" フラグを解除できません"
+
+#: src/rcfile.c:1345
+#, fuzzy, c-format
+msgid "Unknown option \"%s\""
+msgstr "未知のフラグ \"%s\""
+
+#: src/rcfile.c:1404
+msgid "I can't find my home directory!  Wah!"
+msgstr "ホームディレクトリが見つかりません"
+
+#: src/rcfile.c:1442
+#, c-format
+msgid ""
+"\n"
+"Press Enter to continue starting nano.\n"
+msgstr ""
+"\n"
+"エンターキーで開始します\n"
+
+#: src/search.c:96
+#, c-format
+msgid "\"%.*s%s\" not found"
+msgstr "\"%.*s%s\" が見つかりません"
+
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/search.c:184
+msgid " [Case Sensitive]"
+msgstr " [大文字と小文字を区別する]"
+
+#: src/search.c:188
+msgid " [Regexp]"
+msgstr " [正規表現]"
+
+#: src/search.c:192
+msgid " [Backwards]"
+msgstr " [戻る]"
+
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:197
+msgid " (to replace) in selection"
+msgstr ""
+
+#: src/search.c:199
+msgid " (to replace)"
+msgstr ""
+
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:769
+msgid "Replace this instance?"
+msgstr ""
+
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:945
+msgid "Replace with"
+msgstr "置換候補"
+
+#: src/search.c:986
+#, c-format
+msgid "Replaced %lu occurrence"
+msgid_plural "Replaced %lu occurrences"
+msgstr[0] "%lu 個置換されました"
+
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1027
+msgid "Enter line number, column number"
+msgstr "行番号と列番号を入力"
+
+#: src/search.c:1054
+msgid "Invalid line or column number"
+msgstr "無効な行または列番号です"
+
+#: src/search.c:1207
+msgid "Not a bracket"
+msgstr "大括弧ではありません"
+
+#: src/search.c:1274
+msgid "No matching bracket"
+msgstr "大括弧が一致しません"
+
+#: src/text.c:54
+msgid "Mark Set"
+msgstr "マークセット"
+
+#: src/text.c:58
+msgid "Mark Unset"
+msgstr "マーク解除"
+
+#: src/text.c:439
+msgid "Nothing in undo buffer!"
+msgstr "undo バッファに何もありません!"
+
+#: src/text.c:445 src/text.c:590
+#, fuzzy, c-format
+msgid "Internal error: can't match line %d.  Please save your work."
+msgstr "内部エラー: 行 %d が一致しません。作業を保存してください"
+
+#: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
+msgid "text add"
+msgstr "テキストの追加"
+
+#: src/text.c:467 src/text.c:612
+msgid "text delete"
+msgstr "テキストの削除"
+
+#: src/text.c:491 src/text.c:641
+msgid "line join"
+msgstr "行の結合"
+
+#: src/text.c:505 src/text.c:657
+msgid "text cut"
+msgstr "テキストの切り取り"
+
+#: src/text.c:510 src/text.c:661
+msgid "text uncut"
+msgstr "テキストの貼り付け"
+
+#: src/text.c:515 src/text.c:623
+msgid "line break"
+msgstr "改行"
+
+#: src/text.c:528 src/text.c:672
+msgid "text insert"
+msgstr "テキスト挿入"
+
+#: src/text.c:549 src/text.c:665
+msgid "text replace"
+msgstr "テキストの置換"
+
+#: src/text.c:556 src/text.c:679 src/text.c:983
+msgid "Internal error: unknown type.  Please save your work."
+msgstr "内部エラー: 不明な型です。作業を保存してください。"
+
+#: src/text.c:561
+#, c-format
+msgid "Undid action (%s)"
+msgstr "操作 (%s) を取り消しました"
+
+#: src/text.c:580
+msgid "Nothing to re-do!"
+msgstr "やり直す操作はありません!"
+
+#: src/text.c:584
+#, fuzzy
+msgid "Internal error: cannot set up redo.  Please save your work."
+msgstr "内部エラー: uncut のセットアップに失敗しました。作業を保存してください"
+
+#: src/text.c:684
+#, c-format
+msgid "Redid action (%s)"
+msgstr "操作 (%s) をやり直しました"
+
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
+msgid "Could not create pipe"
+msgstr "pipe を作成できません"
+
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
+msgid "Could not fork"
+msgstr "forkできません"
+
+#: src/text.c:969
+#, fuzzy
+msgid "Internal error: cannot set up uncut.  Please save your work."
+msgstr "内部エラー: uncut のセットアップに失敗しました。作業を保存してください"
+
+#: src/text.c:1806
+#, c-format
+msgid "Bad quote string %s: %s"
+msgstr ""
+
+#: src/text.c:2207
+msgid "Can now UnJustify!"
+msgstr ""
+
+#: src/text.c:2404
+msgid "Edit a replacement"
+msgstr ""
+
+#: src/text.c:2492
+msgid "Creating misspelled word list, please wait..."
+msgstr "スペルミスのある単語リストを作成しています。しばらくお待ちください..."
+
+#: src/text.c:2584 src/text.c:3022
+msgid "Could not get size of pipe buffer"
+msgstr "pipe バッファのサイズを取得できませんでした"
+
+#: src/text.c:2635
+msgid "Error invoking \"spell\""
+msgstr "\"spell\" の呼び出しに失敗"
+
+#: src/text.c:2638
+msgid "Error invoking \"sort -f\""
+msgstr "\"sort -f\" の呼び出しに失敗"
+
+#: src/text.c:2641
+msgid "Error invoking \"uniq\""
+msgstr "\"uniq\" の呼び出しに失敗"
+
+#: src/text.c:2696 src/text.c:2907
+msgid "Finished checking spelling"
+msgstr "スペルチェック完了"
+
+#: src/text.c:2759 src/text.c:3340
+#, c-format
+msgid "Error invoking \"%s\""
+msgstr "\"%s\" の呼び出しに失敗"
+
+#: src/text.c:2885
+#, fuzzy
+msgid "Invoking spell checker, please wait"
+msgstr "スペルチェッカを起動 (利用可能な場合)"
+
+#: src/text.c:2902
+#, c-format
+msgid "Spell checking failed: %s"
+msgstr "スペルチェック失敗: %s"
+
+#: src/text.c:2904
+#, c-format
+msgid "Spell checking failed: %s: %s"
+msgstr "スペルチェック失敗: %s: %s"
+
+#: src/text.c:2937
+#, fuzzy
+msgid "No linter defined for this type of file!"
+msgstr "ファイル末尾に空行を追加しない"
+
+#: src/text.c:2947
+msgid "Save modified buffer before linting?"
+msgstr ""
+
+#: src/text.c:2969
+msgid "Invoking linter, please wait"
+msgstr ""
+
+#: src/text.c:3125
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr ""
+
+#: src/text.c:3159
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr ""
+
+#: src/text.c:3205
+#, fuzzy
+msgid "At last message"
+msgstr "このメッセージを表示"
+
+#: src/text.c:3210
+#, fuzzy
+msgid "At first message"
+msgstr "このメッセージを表示"
+
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr ""
+
+#: src/text.c:3275
+msgid "Finished"
+msgstr ""
+
+#: src/text.c:3280
+msgid "Invoking formatter, please wait"
+msgstr ""
+
+#: src/text.c:3360
+msgid "Finished formatting"
+msgstr ""
+
+#: src/text.c:3438
+#, c-format
+msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
+msgstr "%s単語数: %lu  行数: %ld  文字数: %lu"
+
+#: src/text.c:3439
+msgid "In Selection:  "
+msgstr "選択範囲内:  "
+
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3453
+msgid "Verbatim Input"
+msgstr "逐次入力"
+
+#: src/utils.c:410 src/utils.c:422
+msgid "nano is out of memory!"
+msgstr "nano のメモリが足りなくなりました!"
+
+#. TRANSLATORS: This is displayed during the input of a
+#. * six-digit hexadecimal Unicode character code.
+#: src/winio.c:1583
+msgid "Unicode Input"
+msgstr "ユニコード入力"
+
+#: src/winio.c:2142 src/winio.c:2146
+msgid "Modified"
+msgstr "変更済み"
+
+#: src/winio.c:2143
+msgid "View"
+msgstr "表示"
+
+#: src/winio.c:2157
+msgid "DIR:"
+msgstr "ディレクトリ:"
+
+#: src/winio.c:2164
+msgid "File:"
+msgstr "ファイル:"
+
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2261
+msgid ""
+"Warning: Modifying a file which is not locked, check directory permission?"
+msgstr ""
+
+#: src/winio.c:3377
+#, 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:3507
+msgid "The nano text editor"
+msgstr "nano テキストエディタ"
+
+#: src/winio.c:3508
+msgid "version"
+msgstr "バージョン"
+
+#: src/winio.c:3509
+msgid "Brought to you by:"
+msgstr "貢献してくれた方々:"
+
+#: src/winio.c:3510
+msgid "Special thanks to:"
+msgstr "スペシャルサンクス:"
+
+#: src/winio.c:3511
+msgid "The Free Software Foundation"
+msgstr "The Free Software Foundation"
+
+#: src/winio.c:3512
+msgid "the many translators and the TP"
+msgstr ""
+
+#: src/winio.c:3513
+msgid "For ncurses:"
+msgstr "ncurses に関して:"
+
+#: src/winio.c:3514
+msgid "and anyone else we forgot..."
+msgstr "および他のすべての方々..."
+
+#: src/winio.c:3515
+msgid "Thank you for using nano!"
+msgstr "nano を使用していただきありがとうございます!"
+
+#~ msgid "Insert File"
+#~ msgstr "ファイルを挿入"
+
+#~ msgid "Go to previous screen"
+#~ msgstr "前のページへ移動"
+
+#~ msgid "Find Other Bracket"
+#~ msgstr "対応する括弧を探す"
+
+#~ msgid "Long line wrapping"
+#~ msgstr "長い行を折り返す"
+
+#~ msgid "Allow generic undo [EXPERIMENTAL]"
+#~ msgstr "一般的な undo を許可する [実験的]"
+
+#~ msgid "(ignored, for Pico compatibility)"
+#~ msgstr "(Pico との互換性のためのオプション。無視されます)"
+
+#~ msgid "Missing flag"
+#~ msgstr "フラグがみつかりません"
+
+#~ msgid "line wrap"
+#~ msgstr "行の折り返し"
+
+#~ msgid "Internal error: unknown type.  Please save your work"
+#~ msgstr "内部エラー: 不明な型です。作業を保存してください"
+
+#~ msgid "Internal error: Redo setup failed.  Please save your work"
+#~ msgstr ""
+#~ "内部エラー: redo のセットアップに失敗しました。作業を保存してください"
+
+#~ msgid "Could not pipe"
+#~ msgstr "pipe できません"
diff --git a/po/ms.gmo b/po/ms.gmo
index ef75adf..5db8eac 100644
--- a/po/ms.gmo
+++ b/po/ms.gmo
diff --git a/po/ms.po b/po/ms.po
index c42ed74..950e917 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -1,121 +1,146 @@
 # Nano Editor Bahasa Melayu (Malay) (ms).
 # Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 # This file is distributed under the same license as the nano package.
-# Sharuzzaman Ahmat Raslan <sharuzzaman@myrealbox.com>, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009.
 #
+# Sharuzzaman Ahmat Raslan <sharuzzaman@myrealbox.com>, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: nano 2.1.7pre1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-22 06:34-0500\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
 "PO-Revision-Date: 2009-01-06 00:48+0800\n"
 "Last-Translator: Sharuzzaman Ahmat Raslan <sharuzzaman@myrealbox.com>\n"
 "Language-Team: Malay <translation-team-ms@lists.sourceforge.net>\n"
+"Language: ms\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: KBabel 1.3.1\n"
 
-#: src/browser.c:220
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:203
 msgid "Go To Directory"
 msgstr "Pergi Ke Direktori"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:860 src/files.c:2048
-#: src/nano.c:1060 src/search.c:220 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Dibatalkan"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:246 src/browser.c:293
 #, c-format
 msgid "Can't go outside of %s in restricted mode"
 msgstr "Tidak boleh ke luar dari %s dalam mod terhad"
 
-#: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:722
-#: src/files.c:731 src/files.c:1540 src/files.c:1659 src/files.c:1711
-#: src/files.c:1732 src/files.c:1855 src/files.c:2691 src/rcfile.c:568
-#: src/rcfile.c:1204
+#: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
+#: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
+#: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Ralat membaca %s: %s"
 
-#: src/browser.c:303
+#: src/browser.c:283
 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:665 src/browser.c:674
+#: src/browser.c:626 src/browser.c:635
 msgid "(dir)"
 msgstr "(dir)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:632
 msgid "(parent dir)"
 msgstr "(dir induk)"
 
-#: src/browser.c:801 src/search.c:185
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "Cari"
 
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:805 src/search.c:189
-msgid " [Case Sensitive]"
-msgstr " [Case Sensitif]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:811 src/search.c:195
-msgid " [Regexp]"
-msgstr " [Regexp]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:817 src/search.c:201
-msgid " [Backwards]"
-msgstr " [Undur]"
-
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "Pancarian diulangi dari awal"
 
-#: src/browser.c:1006 src/browser.c:1039 src/search.c:514 src/search.c:517
-#: src/search.c:574 src/search.c:577
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "Hanya inilah sahaja yang dijumpai"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr "Tiada corak carian semasa"
 
-#: src/files.c:125
+#: src/files.c:139
+msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
+msgstr ""
+
+#: src/files.c:145
+#, c-format
+msgid "Couldn't determine hostname for lock file: %s"
+msgstr ""
+
+#: src/files.c:165 src/files.c:175 src/files.c:212 src/files.c:222
+#, fuzzy, c-format
+msgid "Error writing lock file %s: %s"
+msgstr "Ralat menulis fail salinan %s: %s"
+
+#: src/files.c:237
+#, fuzzy, c-format
+msgid "Error deleting lock file %s: %s"
+msgstr "Ralat menulis fail salinan %s: %s"
+
+#: src/files.c:272
+#, fuzzy, c-format
+msgid "Error opening lock file %s: %s"
+msgstr "Ralat menulis fail salinan %s: %s"
+
+#: src/files.c:282
+#, 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:297
+#, c-format
+msgid "File %s is being edited (by %s with %s, PID %d); continue?"
+msgstr ""
+
+#: src/files.c:308
+#, fuzzy, c-format
+msgid "Error writing lock file: Directory '%s' doesn't exist"
+msgstr "Ralat menulis fail salinan %s: %s"
+
+#: src/files.c:339
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Tidak dapat memasukkan fail luar daripada %s"
 
-#: src/files.c:234
+#: src/files.c:467
 msgid "No more open file buffers"
 msgstr "Tiada lagi buffer fail terbuka"
 
-#: src/files.c:250
+#: src/files.c:484
 #, c-format
 msgid "Switched to %s"
 msgstr "Ditukar kepada %s"
 
-#: src/files.c:251 src/global.c:469 src/winio.c:2168
+#: src/files.c:485 src/global.c:953 src/winio.c:2161
 msgid "New Buffer"
 msgstr "Buffer Baru"
 
-#: src/files.c:633
+#: src/files.c:874
 #, 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:638
+#: src/files.c:879
 #, fuzzy, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
@@ -125,13 +150,13 @@ msgid_plural ""
 "permission)"
 msgstr[0] "%lu baris dibaca (Ditukar daripada format Mac dan DOS)"
 
-#: src/files.c:644
+#: src/files.c:885
 #, 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:648
+#: src/files.c:889
 #, fuzzy, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
@@ -139,13 +164,13 @@ 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:654
+#: src/files.c:895
 #, 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:658
+#: src/files.c:899
 #, fuzzy, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
@@ -153,473 +178,433 @@ 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:664
+#: src/files.c:905
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "%lu baris dibaca"
 
-#: src/files.c:667
+#: src/files.c:908
 #, c-format
 msgid "Read %lu line ( Warning: No write permission)"
 msgid_plural "Read %lu lines (Warning: No write permission)"
 msgstr[0] ""
 
-#: src/files.c:700 src/files.c:736
+#: src/files.c:943 src/files.c:980
 msgid "Reading File"
 msgstr "Membaca fail"
 
-#: src/files.c:706
+#: src/files.c:950
 msgid "New File"
 msgstr "Fail Baru"
 
-#: src/files.c:709
+#: src/files.c:953
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" tidak dijumpai"
 
-#: src/files.c:717 src/rcfile.c:559 src/rcfile.c:1154 src/rcfile.c:1195
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" adalah sebuah direktori"
 
-#: src/files.c:718 src/rcfile.c:560 src/rcfile.c:1155 src/rcfile.c:1196
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" adalah sebuah fail peranti"
 
-#: src/files.c:817
+#: src/files.c:1060
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Arahan untuk dilaksanakan dalam buffer baru [daripada %s] "
 
-#: src/files.c:819
+#: src/files.c:1062
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Arahan untuk dilaksanakan [dari %s]"
 
-#: src/files.c:825
+#: src/files.c:1069
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Fail untuk dimasukkan kedalam buffer baru [daripada %s] "
 
-#: src/files.c:827
+#: src/files.c:1071
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Fail untuk dimasukkan [daripada %s] "
 
-#: src/files.c:1077
+#: src/files.c:1320
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Kekunci tidak sah dalam mod bukan multibuffer"
 
-#: src/files.c:1486
+#: src/files.c:1622
+msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+msgstr ""
+
+#: src/files.c:1746
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Tidak dapat menulis diluar daripada %s"
 
-#: src/files.c:1501
+#: src/files.c:1761
 msgid "Cannot prepend or append to a symlink with --nofollow set"
 msgstr "Tidak dapat tambah awal atau tambah ke symlink dengan set --nofollow"
 
-#: src/files.c:1581 src/files.c:1603 src/files.c:1621 src/files.c:1632
-#: src/files.c:1640 src/files.c:1667
+#: src/files.c:1843 src/files.c:1868 src/files.c:1886 src/files.c:1899
+#: src/files.c:1910 src/files.c:1939
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Ralat menulis fail salinan %s: %s"
 
-#: src/files.c:1582 src/nano.c:701
+#: src/files.c:1844 src/nano.c:719
 msgid "Too many backup files?"
 msgstr "Terlalu banyak fail salinan?"
 
-#: src/files.c:1687 src/files.c:1744 src/files.c:1763 src/files.c:1775
-#: src/files.c:1799 src/files.c:1817 src/files.c:1827 src/files.c:1863
-#: src/files.c:1868 src/files.c:2764 src/files.c:2773
+#: src/files.c:1959 src/files.c:2016 src/files.c:2035 src/files.c:2047
+#: src/files.c:2071 src/files.c:2089 src/files.c:2099 src/files.c:2135
+#: src/files.c:2140 src/files.c:3101 src/files.c:3110 src/files.c:3133
+#: src/files.c:3145
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Ralat menulis %s: %s"
 
-#: src/files.c:1721 src/text.c:2929 src/text.c:2941
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Ralat menulis fail sementara: %s"
 
-#: src/files.c:1900
+#: src/files.c:2173
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "%lu baris ditulis"
 
-#: src/files.c:2004
+#: src/files.c:2278
 msgid " [DOS Format]"
 msgstr " [Format DOS]"
 
-#: src/files.c:2005
+#: src/files.c:2279
 msgid " [Mac Format]"
 msgstr " [Format Mac]"
 
-#: src/files.c:2007
+#: src/files.c:2281
 msgid " [Backup]"
 msgstr " [Salinan]"
 
-#: src/files.c:2015
+#: src/files.c:2289
 msgid "Prepend Selection to File"
 msgstr "Tambahan Awalan Pilihan ke Fail"
 
-#: src/files.c:2016
+#: src/files.c:2290
 msgid "Append Selection to File"
 msgstr "Tambahan Akhiran Pilihan ke Fail"
 
-#: src/files.c:2017
+#: src/files.c:2291
 msgid "Write Selection to File"
 msgstr "Tulis Pilihan ke Fail"
 
-#: src/files.c:2020
+#: src/files.c:2294
 msgid "File Name to Prepend to"
 msgstr "Nama Fail untuk di Tambah Awalan"
 
-#: src/files.c:2021
+#: src/files.c:2295
 msgid "File Name to Append to"
 msgstr "Nama Fail untuk di Tambah Akhiran"
 
-#: src/files.c:2022
+#: src/files.c:2296
 msgid "File Name to Write"
 msgstr "Nama Fail untuk di Tulis"
 
-#: src/files.c:2153
+#: src/files.c:2427
 msgid "File exists, OVERWRITE ? "
 msgstr "Fail telah wujud, TINDIH ? "
 
-#: src/files.c:2162
+#: src/files.c:2436
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "Simpan fail dengan NAMA BERLAINAN ? "
 
-#: src/files.c:2173
+#: src/files.c:2450
 msgid "File was modified since you opened it, continue saving ? "
 msgstr "Fail telah diubahsuai semenjak anda membukanya, teruskan menyimpan ?"
 
-#: src/files.c:2611
+#: src/files.c:2882
 msgid "(more)"
 msgstr "(lagi)"
 
-#: src/files.c:2694 src/rcfile.c:1220
-#, c-format
+#: src/files.c:2974
+#, fuzzy, c-format
 msgid ""
 "\n"
-"Press Enter to continue starting nano.\n"
+"Press Enter to continue\n"
 msgstr ""
 "\n"
 "Tekan Enter untuk meneruskan memulakan nano.\n"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:415 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Batal"
-
-#: src/global.c:416
-msgid "Replace"
-msgstr "Ganti"
+#: src/files.c:2989
+#, c-format
+msgid ""
+"Unable to create directory %s: %s\n"
+"It is required for saving/loading search history or cursor positions.\n"
+msgstr ""
 
-#: src/global.c:417
-msgid "No Replace"
-msgstr "Jangan Ganti"
+#: src/files.c:2995
+#, 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/global.c:420
-msgid "Case Sens"
-msgstr "Case Sens"
+#: src/files.c:3012
+#, 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/global.c:421
-msgid "Backwards"
-msgstr "Kebelakang"
+#: src/files.c:3016
+#, 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 ""
 
-#: src/global.c:425
-msgid "Regexp"
-msgstr "Regexp"
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
+#: src/global.c:477
+msgid "Exit"
+msgstr "Keluar"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:451
-msgid "PrevHstory"
-msgstr "SjrhUndur"
+#: src/global.c:478
+msgid "Close"
+msgstr "Tutup"
 
-#: src/global.c:452
-msgid "NextHstory"
-msgstr "SjrhMaju"
+#: src/global.c:479
+#, fuzzy
+msgid "Uncut Text"
+msgstr "Nyahpotong Teks"
 
-#: src/global.c:453
-msgid "Go To Text"
-msgstr "Ke Teks"
+#: src/global.c:481
+#, fuzzy
+msgid "Unjustify"
+msgstr "UnJustifikasi"
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:455
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:485
 msgid "WhereIs Next"
 msgstr "Dimana Seterusnya"
 
-#: src/global.c:457
-msgid "First File"
-msgstr "Fail Pertama"
-
-#: src/global.c:458
-msgid "Last File"
-msgstr "Fail Terakhir"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:460
-msgid "To Files"
-msgstr "Ke Fail"
-
-#: src/global.c:462
-msgid "DOS Format"
-msgstr "Format DOS"
-
-#: src/global.c:463
-msgid "Mac Format"
-msgstr "Format Mac"
-
-#: src/global.c:464
-msgid "Append"
-msgstr "Tambah"
-
-#: src/global.c:465
-msgid "Prepend"
-msgstr "Tambahan awalan"
-
-#: src/global.c:466
-msgid "Backup File"
-msgstr "Fail Salinan"
-
-#: src/global.c:467
-msgid "Execute Command"
-msgstr "Laksanakan Arahan"
-
-#: src/global.c:471
-msgid "Go To Dir"
-msgstr "Pergi Ke Dir"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:480
-msgid "Get Help"
-msgstr "Bantuan"
-
-#: src/global.c:481
-msgid "Exit"
-msgstr "Keluar"
-
-#: src/global.c:482
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:492
 msgid "Where Is"
 msgstr "Di mana"
 
-#: src/global.c:483
-msgid "Prev Page"
-msgstr "Terdahulu"
-
-#: src/global.c:484
-msgid "Next Page"
-msgstr "Berikut"
-
-#: src/global.c:485
-msgid "First Line"
-msgstr "Brs Awal"
+#: src/global.c:493
+msgid "Replace"
+msgstr "Ganti"
 
-#: src/global.c:486
-msgid "Last Line"
-msgstr "Brs Akhir"
+#: src/global.c:494
+msgid "Go To Line"
+msgstr "Ke Baris"
 
-#: src/global.c:487
-msgid "Suspend"
-msgstr "Gantung"
+#: src/global.c:495
+msgid "Prev Line"
+msgstr "Baris Terdahulu"
 
-#: src/global.c:489
-msgid "Beg of Par"
-msgstr "Minta untuk Par"
+#: src/global.c:496
+msgid "Next Line"
+msgstr "Baris Berikut"
 
-#: src/global.c:490
-msgid "End of Par"
-msgstr "Pengakhir Par"
+#: src/global.c:497
+msgid "Read File"
+msgstr "Baca Fail"
 
-#: src/global.c:491
+#: src/global.c:499
 msgid "FullJstify"
 msgstr "JustifiPenuh"
 
-#: src/global.c:493
+#: src/global.c:501
 msgid "Refresh"
 msgstr "Segarkan"
 
-#: src/global.c:495
-msgid "Insert File"
-msgstr "Selit Fail"
-
-#: src/global.c:497
-msgid "Go To Line"
-msgstr "Ke Baris"
-
-#: src/global.c:500
+#. 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:507
 msgid "Justify the current paragraph"
 msgstr "Justifikasi perenggan semasa"
 
-#. 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:505
+#: src/global.c:509
 msgid "Cancel the current function"
 msgstr "Batal fungsi semasa"
 
-#: src/global.c:506
+#: src/global.c:510
 msgid "Display this help text"
 msgstr "Papar teks bantuan ini"
 
-#: src/global.c:509
+#: src/global.c:513
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Tutup fail penimbal semasa / Keluar dari nano"
 
-#: src/global.c:511
+#: src/global.c:515
 msgid "Exit from nano"
 msgstr "Keluar dari nano"
 
-#: src/global.c:515
+#: src/global.c:519
 msgid "Write the current file to disk"
 msgstr "Tulis fail semasa ke cakera"
 
-#: src/global.c:517
+#: src/global.c:521
 msgid "Insert another file into the current one"
 msgstr "Masukkan fail lain ke file semasa"
 
-#: src/global.c:519
+#: src/global.c:523
 msgid "Search for a string or a regular expression"
 msgstr "Cari rentetan atau regular expression"
 
-#: src/global.c:520
-msgid "Go to previous screen"
-msgstr "Pergi ke skrin terdahulu"
+#: src/global.c:526
+#, fuzzy
+msgid "Search for a string"
+msgstr "Cari rentetan atau regular expression"
+
+#: src/global.c:528
+#, fuzzy
+msgid "Go one screenful up"
+msgstr "Pergi ke skrin berikutnya"
 
-#: src/global.c:521
-msgid "Go to next screen"
+#: src/global.c:529
+#, fuzzy
+msgid "Go one screenful down"
 msgstr "Pergi ke skrin berikutnya"
 
-#: src/global.c:523
+#: src/global.c:531
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Potong baris semasa dan simpan dalam cutbuffer"
 
-#: src/global.c:525
+#: src/global.c:533
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Kembalikan dari cutbuffer ke baris semasa"
 
-#: src/global.c:527
+#: src/global.c:534
 msgid "Display the position of the cursor"
 msgstr "Papar posisi kursor"
 
-#: src/global.c:529
+#: src/global.c:536
 msgid "Invoke the spell checker, if available"
 msgstr "Panggil penyemak ejaan, jika ada"
 
-#: src/global.c:531
+#: src/global.c:538
 msgid "Replace a string or a regular expression"
 msgstr "Ganti rentetan atau regular expression"
 
-#: src/global.c:532
+#: src/global.c:539
 msgid "Go to line and column number"
 msgstr "Pergi ke nombor baris dan lajur"
 
-#: src/global.c:534
-msgid "Mark text at the cursor position"
+#: src/global.c:541
+#, fuzzy
+msgid "Mark text starting from the cursor position"
 msgstr "Tanda teks pada lokasi kursor"
 
-#: src/global.c:535
-msgid "Repeat last search"
+#: src/global.c:542
+#, fuzzy
+msgid "Repeat the last search"
 msgstr "Ulang carian terakhir"
 
-#: src/global.c:537
+#: src/global.c:544
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "Salin baris semasa dan simpan dalam cutbuffer"
 
-#: src/global.c:538
+#: src/global.c:545
 msgid "Indent the current line"
 msgstr "Inden baris semasa"
 
-#: src/global.c:539
+#: src/global.c:546
 msgid "Unindent the current line"
 msgstr "Nyahindent baris semasa"
 
-#: src/global.c:540
+#: src/global.c:547
 msgid "Undo the last operation"
 msgstr "Nyahbuat tindakan terakhir"
 
-#: src/global.c:541
+#: src/global.c:548
 msgid "Redo the last undone operation"
 msgstr "Buat semula tindakan nyahbuat terakhir"
 
-#: src/global.c:543
+#: src/global.c:550
 msgid "Go forward one character"
 msgstr "Maju ke depan satu aksara"
 
-#: src/global.c:544
+#: src/global.c:551
 msgid "Go back one character"
 msgstr "Undur ke belakang satu aksara"
 
-#: src/global.c:546
+#: src/global.c:553
 msgid "Go forward one word"
 msgstr "Maju ke depan satu perkataan"
 
-#: src/global.c:547
+#: src/global.c:554
 msgid "Go back one word"
 msgstr "Undur belakang satu perkataan"
 
-#: src/global.c:549
+#: src/global.c:556
 msgid "Go to previous line"
 msgstr "Pergi ke baris terdahulu"
 
-#: src/global.c:550
+#: src/global.c:557
 msgid "Go to next line"
 msgstr "Pergi ke baris berikutnya"
 
-#: src/global.c:551
+#: src/global.c:558
 msgid "Go to beginning of current line"
 msgstr "Pergi ke permulaan baris semasa"
 
-#: src/global.c:552
+#: src/global.c:559
 msgid "Go to end of current line"
 msgstr "Pergi ke penghujung baris semasa"
 
-#: src/global.c:555
+#: src/global.c:562
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr ""
 "Pergi hingga ke permulaan perenggan semasa; kemudian ke perenggan sebelumnya"
 
-#: src/global.c:557
+#: src/global.c:564
 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:560
+#: src/global.c:566
 msgid "Go to the first line of the file"
 msgstr "Pergi ke baris pertama fail"
 
-#: src/global.c:562
+#: src/global.c:567
 msgid "Go to the last line of the file"
 msgstr "Pergi ke baris terakhir fail"
 
-#: src/global.c:564
+#: src/global.c:569
 msgid "Go to the matching bracket"
 msgstr "Pergi ke braket sepadan"
 
-#: src/global.c:566
+#: src/global.c:571
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "Skrol atas satu baris tanpa skrol kursor"
 
-#: src/global.c:568
+#: src/global.c:573
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "Skrol bawah satu baris tanpa skrol kursor"
 
-#: src/global.c:572
+#: src/global.c:576
 msgid "Switch to the previous file buffer"
 msgstr "Tukar ke buffer fail terdahulu"
 
-#: src/global.c:574
+#: src/global.c:577
 msgid "Switch to the next file buffer"
 msgstr "Tukar ke buffer fail berikut"
 
-#: src/global.c:577
+#: src/global.c:579
 msgid "Insert the next keystroke verbatim"
 msgstr "Selit kekunci seterusnya setiap satu"
 
-#: src/global.c:579
+#: src/global.c:580
 msgid "Insert a tab at the cursor position"
 msgstr "Masukkan tab di kedudukan kursor"
 
@@ -627,333 +612,450 @@ msgstr "Masukkan tab di kedudukan kursor"
 msgid "Insert a newline at the cursor position"
 msgstr "Masukkan baris baru di kedudukan kursor"
 
-#: src/global.c:583
+#: src/global.c:582
 msgid "Delete the character under the cursor"
 msgstr "Padam aksara dibawah kursor"
 
-#: src/global.c:585
+#: src/global.c:584
 msgid "Delete the character to the left of the cursor"
 msgstr "Padam aksara di kiri kursor"
 
-#: src/global.c:588
+#: src/global.c:587
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Potong dari kedudukan kursor hingga ke akhir fail"
 
-#: src/global.c:591
+#: src/global.c:590
 msgid "Justify the entire file"
 msgstr "Justifi keseluruhan fail"
 
-#: src/global.c:595
+#: src/global.c:594
 msgid "Count the number of words, lines, and characters"
 msgstr "Kira jumlah perkataan, baris, dan aksara"
 
-#: src/global.c:598
+#: src/global.c:597
 msgid "Refresh (redraw) the current screen"
 msgstr "Segarkan (lukis semula) skrin semasa"
 
-#: src/global.c:600
+#: src/global.c:599
 msgid "Suspend the editor (if suspend is enabled)"
 msgstr "Gantung penyunting (jika gantung dihidupkan)"
 
-#: src/global.c:603
+#: src/global.c:602
 msgid "Toggle the case sensitivity of the search"
 msgstr "Toggle pencarian case sensitif"
 
-#: src/global.c:605
+#: src/global.c:604
 msgid "Reverse the direction of the search"
 msgstr "Terbalikkan arah carian"
 
-#: src/global.c:609
+#: src/global.c:608
 msgid "Toggle the use of regular expressions"
 msgstr "Toggle penggunaan ungkapan nalar"
 
-#: src/global.c:613
+#: src/global.c:612
 msgid "Recall the previous search/replace string"
 msgstr "Panggil semula rentetan cari/ganti terdahulu"
 
-#: src/global.c:615
+#: src/global.c:614
 msgid "Recall the next search/replace string"
 msgstr "Panggil semula rentetan cari/ganti seterusnya"
 
-#: src/global.c:618
+#: src/global.c:617
 msgid "Go to file browser"
 msgstr "Pergi ke pelayar fail"
 
-#: src/global.c:621
+#: src/global.c:620
 msgid "Toggle the use of DOS format"
 msgstr "Toggle penggunaan format DOS"
 
-#: src/global.c:622
+#: src/global.c:621
 msgid "Toggle the use of Mac format"
 msgstr "Toggle penggunaan format Mac"
 
-#: src/global.c:624
+#: src/global.c:622
 msgid "Toggle appending"
 msgstr "Toggle tambahan akhiran"
 
-#: src/global.c:625
+#: src/global.c:623
 msgid "Toggle prepending"
 msgstr "Toggle tambahan awalan"
 
-#: src/global.c:628
+#: src/global.c:624
 msgid "Toggle backing up of the original file"
 msgstr "Toggle salinan fail asal"
 
-#: src/global.c:629
+#: src/global.c:625
 msgid "Execute external command"
 msgstr "Laksanakan arahan luaran"
 
-#: src/global.c:633
+#: src/global.c:628
 msgid "Toggle the use of a new buffer"
 msgstr "Toggle kegunaan buffer baru"
 
-#: src/global.c:636
+#: src/global.c:631
 msgid "Exit from the file browser"
 msgstr "Keluar dari pelayar fail"
 
-#: src/global.c:638
+#: src/global.c:632
 msgid "Go to the first file in the list"
 msgstr "Pergi ke fail pertama dalam senarai"
 
-#: src/global.c:640
+#: src/global.c:633
 msgid "Go to the last file in the list"
 msgstr "Pergi ke fail terakhir dalam senarai"
 
-#: src/global.c:641
+#: src/global.c:634
+#, fuzzy
+msgid "Go to the previous file in the list"
+msgstr "Pergi ke fail pertama dalam senarai"
+
+#: src/global.c:635
 #, fuzzy
 msgid "Go to the next file in the list"
 msgstr "Pergi ke fail terakhir dalam senarai"
 
+#: src/global.c:636
+msgid "Go to directory"
+msgstr "Pergi ke direktori"
+
+#: src/global.c:639
+#, fuzzy
+msgid "Invoke the linter, if available"
+msgstr "Panggil penyemak ejaan, jika ada"
+
+#: src/global.c:640
+#, fuzzy
+msgid "Go to previous linter msg"
+msgstr "Pergi ke baris terdahulu"
+
+#: src/global.c:641
+#, fuzzy
+msgid "Go to next linter msg"
+msgstr "Pergi ke baris berikutnya"
+
 #: src/global.c:642
 #, fuzzy
-msgid "Go to the previous file in the list"
-msgstr "Pergi ke fail pertama dalam senarai"
+msgid "Invoke formatter, if available"
+msgstr "Panggil penyemak ejaan, jika ada"
 
-#: src/global.c:643
-msgid "Go to directory"
-msgstr "Pergi ke direktori"
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:662
+msgid "Get Help"
+msgstr "Bantuan"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:670
-msgid "Close"
-msgstr "Tutup"
+#: src/global.c:665 src/prompt.c:1084
+msgid "Cancel"
+msgstr "Batal"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:679
-msgid "WriteOut"
+#: src/global.c:678
+#, fuzzy
+msgid "Write Out"
 msgstr "Tulis"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:704
+msgid "Go To Dir"
+msgstr "Pergi Ke Dir"
+
+#: src/global.c:719
+msgid "Cut Text"
+msgstr "Kerat Teks"
+
+#: src/global.c:728
 msgid "Justify"
 msgstr "Justifikasi"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:696
-msgid "Read File"
-msgstr "Baca Fail"
+#: src/global.c:733
+msgid "To Spell"
+msgstr "Ke Pengeja"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:713
-msgid "Cut Text"
-msgstr "Kerat Teks"
+#: src/global.c:738
+#, fuzzy
+msgid "To Linter"
+msgstr "Ke Baris"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:718
-msgid "UnJustify"
-msgstr "UnJustifikasi"
+#: src/global.c:740
+#, fuzzy
+msgid "Formatter"
+msgstr "Format DOS"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:723
-msgid "UnCut Text"
-msgstr "Nyahpotong Teks"
+#: src/global.c:745
+msgid "Case Sens"
+msgstr "Case Sens"
+
+#: src/global.c:750
+msgid "Regexp"
+msgstr "Regexp"
+
+#: src/global.c:755
+msgid "Backwards"
+msgstr "Kebelakang"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:728 src/global.c:755
+#: src/global.c:762
+msgid "No Replace"
+msgstr "Jangan Ganti"
+
+#: src/global.c:770
 msgid "Cur Pos"
 msgstr "Pos Kursor"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:737
-msgid "To Spell"
-msgstr "Ke Pengeja"
+#: src/global.c:780
+msgid "Prev Page"
+msgstr "Terdahulu"
+
+#: src/global.c:782
+msgid "Next Page"
+msgstr "Berikut"
+
+#: src/global.c:785
+msgid "First Line"
+msgstr "Brs Awal"
+
+#: src/global.c:787
+msgid "Last Line"
+msgstr "Brs Akhir"
 
-#: src/global.c:771
+#: src/global.c:794
+#, fuzzy
+msgid "To Bracket"
+msgstr "Bukan kurungan"
+
+#: src/global.c:797
 msgid "Mark Text"
 msgstr "Tanda Teks"
 
-#: src/global.c:777
+#: src/global.c:800
 msgid "Copy Text"
 msgstr "Salin Teks"
 
-#: src/global.c:780
+#: src/global.c:803
 msgid "Indent Text"
 msgstr "Teks Indent"
 
-#: src/global.c:783
+#: src/global.c:805
 msgid "Unindent Text"
 msgstr "Teks Tidak Indent"
 
-#: src/global.c:787
+#: src/global.c:808
 msgid "Undo"
 msgstr "Nyahbuat"
 
-#: src/global.c:790
+#: src/global.c:810
 msgid "Redo"
 msgstr "Buat semula"
 
-#: src/global.c:796 src/global.c:800
-msgid "Forward"
-msgstr "Maju"
-
-#: src/global.c:806 src/global.c:810
+#: src/global.c:814 src/global.c:820
 msgid "Back"
 msgstr "Undur"
 
-#: src/global.c:817
-msgid "Next Word"
-msgstr "Perkataan Selepas"
+#: src/global.c:816 src/global.c:822
+msgid "Forward"
+msgstr "Maju"
 
-#: src/global.c:820
+#: src/global.c:827
 msgid "Prev Word"
 msgstr "Perkataan Terdahulu"
 
-#: src/global.c:824
-msgid "Prev Line"
-msgstr "Baris Terdahulu"
-
-#: src/global.c:827
-msgid "Next Line"
-msgstr "Baris Berikut"
+#: src/global.c:829
+msgid "Next Word"
+msgstr "Perkataan Selepas"
 
-#: src/global.c:830
+#: src/global.c:833
 msgid "Home"
 msgstr "Asal"
 
-#: src/global.c:833
+#: src/global.c:835
 msgid "End"
 msgstr "Akhir"
 
-#: src/global.c:845
-msgid "Find Other Bracket"
-msgstr "Cari Lain-lain Tanda Kurungan"
+#: src/global.c:844
+msgid "Beg of Par"
+msgstr "Minta untuk Par"
+
+#: src/global.c:846
+msgid "End of Par"
+msgstr "Pengakhir Par"
 
-#: src/global.c:848
+#: src/global.c:851
 msgid "Scroll Up"
 msgstr "Skrol Atas"
 
-#: src/global.c:851
+#: src/global.c:853
 msgid "Scroll Down"
 msgstr "Skrol Bawah"
 
-#: src/global.c:856
-msgid "Previous File"
+#: src/global.c:858
+#, fuzzy
+msgid "Prev File"
 msgstr "Fail Sebelum"
 
-#: src/global.c:858
+#: src/global.c:860
 msgid "Next File"
 msgstr "Fail Selepas"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:862 src/text.c:3045
-msgid "Verbatim Input"
+#: src/global.c:869
+#, fuzzy
+msgid "Verbatim"
 msgstr "Masukan Verbatim"
 
-#: src/global.c:867
+#: src/global.c:872
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:870
+#: src/global.c:874
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:873
+#: src/global.c:876
 msgid "Delete"
 msgstr "Padam"
 
-#: src/global.c:876
+#: src/global.c:878
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/global.c:893
+#: src/global.c:888
 msgid "CutTillEnd"
 msgstr "PtngHnggAkhr"
 
-#: src/global.c:906
+#: src/global.c:898
 msgid "Word Count"
 msgstr "Kiraan Perkataan"
 
-#: src/global.c:1367
+#: src/global.c:905
+msgid "Suspend"
+msgstr "Gantung"
+
+#: src/global.c:910
+msgid "PrevHstory"
+msgstr "SjrhUndur"
+
+#: src/global.c:913
+msgid "NextHstory"
+msgstr "SjrhMaju"
+
+#: src/global.c:917
+msgid "Go To Text"
+msgstr "Ke Teks"
+
+#: src/global.c:928
+msgid "DOS Format"
+msgstr "Format DOS"
+
+#: src/global.c:931
+msgid "Mac Format"
+msgstr "Format Mac"
+
+#: src/global.c:934
+msgid "Append"
+msgstr "Tambah"
+
+#: src/global.c:936
+msgid "Prepend"
+msgstr "Tambahan awalan"
+
+#: src/global.c:939
+msgid "Backup File"
+msgstr "Fail Salinan"
+
+#: src/global.c:946
+msgid "Execute Command"
+msgstr "Laksanakan Arahan"
+
+#: src/global.c:961
+msgid "To Files"
+msgstr "Ke Fail"
+
+#: src/global.c:964
+msgid "First File"
+msgstr "Fail Pertama"
+
+#: src/global.c:966
+msgid "Last File"
+msgstr "Fail Terakhir"
+
+#: src/global.c:977
+#, fuzzy
+msgid "Prev Lint Msg"
+msgstr "Baris Terdahulu"
+
+#: src/global.c:979
+#, fuzzy
+msgid "Next Lint Msg"
+msgstr "Baris Berikut"
+
+#. TRANSLATORS: The next seventeen strings are toggle descriptions;
+#. * they are best kept shorter than 40 characters, but may be longer.
+#: src/global.c:1227
 msgid "Help mode"
 msgstr "Mod bantuan"
 
-#: src/global.c:1369
+#: src/global.c:1229
 msgid "Constant cursor position display"
 msgstr "Paparan posisi tetap kursor"
 
-#: src/global.c:1371
+#: src/global.c:1231
 msgid "Use of one more line for editing"
 msgstr "Guna satu lagi baris untuk menyunting"
 
-#: src/global.c:1373
+#: src/global.c:1233
 msgid "Smooth scrolling"
 msgstr "Gulungan lancar"
 
-#: src/global.c:1375
+#: src/global.c:1235
+#, fuzzy
+msgid "Soft wrapping of overlong lines"
+msgstr "Jangan lilit baris panjang"
+
+#: src/global.c:1237
 msgid "Whitespace display"
 msgstr "Papar ruangputih"
 
-#: src/global.c:1377
+#: src/global.c:1239
 msgid "Color syntax highlighting"
 msgstr "Sorotan warna sintaks"
 
-#: src/global.c:1379
+#: src/global.c:1241
 msgid "Smart home key"
 msgstr "Kekunci Home pintar"
 
-#: src/global.c:1381
+#: src/global.c:1243
 msgid "Auto indent"
 msgstr "Auto indent"
 
-#: src/global.c:1383
+#: src/global.c:1245
 msgid "Cut to end"
 msgstr "Potong hingga akhir"
 
-#: src/global.c:1385
-msgid "Long line wrapping"
-msgstr "Lilit baris panjang"
+#: src/global.c:1247
+#, fuzzy
+msgid "Hard wrapping of overlong lines"
+msgstr "Jangan lilit baris panjang"
 
-#: src/global.c:1387
+#: src/global.c:1249
 msgid "Conversion of typed tabs to spaces"
 msgstr "Penukaran tab ditaip kepada ruang"
 
-#: src/global.c:1389
+#: src/global.c:1251
 msgid "Backup files"
 msgstr "Salinan fail"
 
-#: src/global.c:1391
+#: src/global.c:1253
 msgid "Multiple file buffers"
 msgstr "Buffer fail berganda"
 
-#: src/global.c:1393
+#: src/global.c:1255
 msgid "Mouse support"
 msgstr "Sokongan tetikus"
 
-#: src/global.c:1395
+#: src/global.c:1257
 msgid "No conversion from DOS/Mac format"
 msgstr "Tiada pertukaran dari format DOS/Mac"
 
-#: src/global.c:1397
+#: src/global.c:1259
 msgid "Suspension"
 msgstr "Gantungan"
 
-#: src/global.c:1399
-#, fuzzy
-msgid "Soft line wrapping"
-msgstr "Lilit baris panjang"
-
-#: src/help.c:236
+#: src/help.c:205
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -975,7 +1077,7 @@ msgstr ""
 "carian.  Menekan Enter tanpa memasukkan sebarang teks akan melaksanakan "
 "carian terdahulu."
 
-#: src/help.c:245
+#: src/help.c:214
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -989,7 +1091,7 @@ msgstr ""
 " Kekunci fungsi berikut terdapat didalam mod Cari:\n"
 "\n"
 
-#: src/help.c:251
+#: src/help.c:220
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1009,7 +1111,7 @@ msgstr ""
 " Kekunci fungsi berikut terdapat didalam mod Pergi Ke Baris:\n"
 "\n"
 
-#: src/help.c:260
+#: src/help.c:229
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1032,7 +1134,7 @@ msgstr ""
 "menyebabkannya dimuatkan ke dalam buffer berlainan (guna Meta-< dan > untuk "
 "menukar diantara buffer fail)."
 
-#: src/help.c:269
+#: src/help.c:238
 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"
@@ -1046,7 +1148,7 @@ msgstr ""
 " Kekunci fungsi berikut terdapat didalam mod Sisipan Fail:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:244
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1074,7 +1176,7 @@ msgstr ""
 " Kekunci fungsi berikut terdapat didalam mod Menulis Fail:\n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:258
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1098,7 +1200,7 @@ msgstr ""
 " Kekunci fungsi berikut terdapat didalam pelayar fail:\n"
 "\n"
 
-#: src/help.c:302
+#: src/help.c:271
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1122,7 +1224,7 @@ msgstr ""
 "carian terdahulu.\n"
 "\n"
 
-#: src/help.c:311
+#: src/help.c:280
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1130,7 +1232,7 @@ msgstr ""
 " Kekunci fungsi berikut terdapat dalam mod Pencarian Pelayar:\n"
 "\n"
 
-#: src/help.c:315
+#: src/help.c:284
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1153,7 +1255,7 @@ msgstr ""
 "  Kekunci fungsi berikut terdapat didalam mod Pelayar Pergi ke Direktori:\n"
 "\n"
 
-#: src/help.c:328
+#: src/help.c:297
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1177,7 +1279,7 @@ msgstr ""
 " Kekunci fungsi berikut terdapat didalam mod Penyemak Ejaan:\n"
 "\n"
 
-#: src/help.c:343
+#: src/help.c:312
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1198,7 +1300,7 @@ msgstr ""
 " Kekunci fungsi berikut terdapat didalam mod Laksana Arahan:\n"
 "\n"
 
-#: src/help.c:356
+#: src/help.c:325
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1218,7 +1320,7 @@ msgstr ""
 "penyunting yang menunjukkan fail yang sedang disunting.  Baris status adalah "
 "baris ketiga dari bawah dan menunjukkan mesej-mesej penting."
 
-#: src/help.c:366
+#: src/help.c:335
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1238,7 +1340,7 @@ msgstr ""
 "menggunakan kekunci Esc, Alt atau Meta bergantung pada tetapan papan kekunci "
 "anda."
 
-#: src/help.c:375
+#: src/help.c:344
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1252,15 +1354,15 @@ msgstr ""
 "dalam kurungan:\n"
 "\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:376 src/help.c:448
 msgid "enable/disable"
 msgstr "enable/disable"
 
-#: src/nano.c:587
+#: src/nano.c:601
 msgid "Key invalid in view mode"
 msgstr "Kekunci tidak sah dalam mod lihat"
 
-#: src/nano.c:695
+#: src/nano.c:713
 #, c-format
 msgid ""
 "\n"
@@ -1269,7 +1371,7 @@ msgstr ""
 "\n"
 "Buffer ditulis ke %s\n"
 
-#: src/nano.c:697
+#: src/nano.c:715
 #, c-format
 msgid ""
 "\n"
@@ -1278,7 +1380,7 @@ msgstr ""
 "\n"
 "Buffer tidak ditulis ke %s: %s\n"
 
-#: src/nano.c:700
+#: src/nano.c:718
 #, c-format
 msgid ""
 "\n"
@@ -1287,11 +1389,11 @@ msgstr ""
 "\n"
 "Buffer tidak ditulis: %s\n"
 
-#: src/nano.c:723
+#: src/nano.c:743
 msgid "Window size is too small for nano...\n"
 msgstr "Saiz tetingkap terlalu kecil bagi nano...\n"
 
-#: src/nano.c:816
+#: src/nano.c:836
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
@@ -1300,252 +1402,262 @@ msgstr ""
 "Penggunaan: nano [PILIHAN] [[+BARIS[,LAJUR]] FAIL]...\n"
 "\n"
 
-#: src/nano.c:819
+#: src/nano.c:839
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Pilihan\t\tPilihan panjang GNU\t\tMaksud\n"
 
-#: src/nano.c:821
+#: src/nano.c:841
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Pilihan\t\tMakna\n"
 
-#: src/nano.c:824
-msgid "Show this message"
-msgstr "Papar mesej ini"
-
-#: src/nano.c:825
+#: src/nano.c:844
 msgid "+LINE,COLUMN"
 msgstr "+BARIS,LAJUR"
 
-#: src/nano.c:826
+#. TRANSLATORS: The next forty or so strings are option descriptions
+#. * for the --help output.  Try to keep them at most 40 characters.
+#: src/nano.c:847
 msgid "Start at line LINE, column COLUMN"
 msgstr "Mula pada baris BARIS, lajur LAJUR"
 
-#: src/nano.c:828
+#: src/nano.c:849
 msgid "Enable smart home key"
 msgstr "Aktifkan kekunci home pintar"
 
-#: src/nano.c:829
+#: src/nano.c:850
 msgid "Save backups of existing files"
 msgstr "Simpan salinan fail sediawujud"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "-C <dir>"
 msgstr "-C <dir>"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<dir>"
 
-#: src/nano.c:831
+#: src/nano.c:852
 msgid "Directory for saving unique backup files"
 msgstr "Direktori untuk menyimpan fail salinan unik"
 
-#: src/nano.c:834
+#: src/nano.c:855
 msgid "Use bold instead of reverse video text"
 msgstr "Guna tebal berbanding teks video terbalik"
 
-#: src/nano.c:837
+#: src/nano.c:858
 msgid "Convert typed tabs to spaces"
 msgstr "Tukar tab ditaip kepada ruang"
 
-#: src/nano.c:840
+#: src/nano.c:861
 msgid "Enable multiple file buffers"
 msgstr "Benarkan beberapa buffer fail"
 
-#: src/nano.c:845
+#: src/nano.c:865
+msgid "Use (vim-style) lock files"
+msgstr ""
+
+#: src/nano.c:869
 msgid "Log & read search/replace string history"
 msgstr "Tulis & baca sejarah carian/gantian rentetan"
 
-#: src/nano.c:848
+#: src/nano.c:873
 msgid "Don't look at nanorc files"
 msgstr "Jangan lihat pada fail nanorc"
 
-#: src/nano.c:851
+#: src/nano.c:876
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Betulkan masalah kekeliruan pad kekunci bernombor"
 
-#: src/nano.c:853
+#: src/nano.c:878
 msgid "Don't add newlines to the ends of files"
 msgstr "Jangan tambah baris baru pada penghujung fail"
 
-#: src/nano.c:856
+#: src/nano.c:881
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Jangan tukar fail dari format DOS/Mac"
 
-#: src/nano.c:858
+#: src/nano.c:883
 msgid "Use one more line for editing"
 msgstr "Guna satu lagi baris untuk menyunting"
 
-#: src/nano.c:860
+#: src/nano.c:886
+#, fuzzy
+msgid "Log & read location of cursor position"
+msgstr "Masukkan tab di kedudukan kursor"
+
+#: src/nano.c:889
 msgid "-Q <str>"
 msgstr "-Q <str>"
 
-#: src/nano.c:860
+#: src/nano.c:889
 msgid "--quotestr=<str>"
 msgstr "--quotestr=<str>"
 
-#: src/nano.c:861
+#: src/nano.c:890
 msgid "Quoting string"
 msgstr "Rentetan petikan"
 
-#: src/nano.c:863
+#: src/nano.c:892
 msgid "Restricted mode"
 msgstr "Mod terhad"
 
-#: src/nano.c:866
+#: src/nano.c:895
 msgid "Scroll by line instead of half-screen"
 msgstr "Gulung mengikut baris berbanding separuh skrin"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "-T <#cols>"
 msgstr "-T <#cols>"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#cols>"
 
-#: src/nano.c:869
+#: src/nano.c:898
 msgid "Set width of a tab to #cols columns"
 msgstr "Tetapkan lebar tab dalam ke #lajur lajur"
 
-#: src/nano.c:871
+#: src/nano.c:900
 msgid "Do quick statusbar blanking"
 msgstr "Laksana pengosongan bar status pantas"
 
-#: src/nano.c:874
+#: src/nano.c:903
 msgid "Print version information and exit"
 msgstr "Papar maklumat versi dan keluar"
 
-#: src/nano.c:877
+#: src/nano.c:906
 msgid "Detect word boundaries more accurately"
 msgstr "Kesan sempadan perkataan lebih tepat"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "-Y <str>"
 msgstr "-Y <str>"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "--syntax=<str>"
 msgstr "--syntax=<str>"
 
-#: src/nano.c:881
+#: src/nano.c:910
 msgid "Syntax definition to use for coloring"
 msgstr "Takrifan sintaks untuk digunakan bagi mewarna"
 
-#: src/nano.c:883
+#: src/nano.c:912
 msgid "Constantly show cursor position"
 msgstr "Sentiasa papar kedudukan kursor"
 
-#: src/nano.c:885
+#: src/nano.c:914
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Betulkan masalah kekeliruan Backspace/Delete"
 
-#: src/nano.c:888
+#: src/nano.c:915
+#, fuzzy
+msgid "Show this help text"
+msgstr "Papar teks bantuan ini"
+
+#: src/nano.c:918
 msgid "Automatically indent new lines"
 msgstr "Indent baris baru secara automatik"
 
-#: src/nano.c:889
+#: src/nano.c:919
 msgid "Cut from cursor to end of line"
 msgstr "Potong dari kursor hingga ke akhir baris"
 
-#: src/nano.c:892
+#: src/nano.c:922
 msgid "Don't follow symbolic links, overwrite"
 msgstr "Jangan ikut pautan simbolik, tulisemula"
 
-#: src/nano.c:894
+#: src/nano.c:924
 msgid "Enable the use of the mouse"
 msgstr "Aktifkan penggunaan tetikus"
 
-#: src/nano.c:897
+#: src/nano.c:926
+msgid "Do not read the file (only write it)"
+msgstr ""
+
+#: src/nano.c:928
 msgid "-o <dir>"
 msgstr "-o <dir>"
 
-#: src/nano.c:897
+#: src/nano.c:928
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<dir>"
 
-#: src/nano.c:898
+#: src/nano.c:929
 msgid "Set operating directory"
 msgstr "Tetapkan direktori operasi"
 
-#: src/nano.c:901
+#: src/nano.c:932
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Pelihara kekunci XON (^Q) dan XOFF (^S)"
 
-#: src/nano.c:903
+#: src/nano.c:935
 msgid "Silently ignore startup issues like rc file errors"
 msgstr ""
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "-r <#cols>"
 msgstr "-r <#cols>"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "--fill=<#cols>"
 msgstr "--fill=<#cols>"
 
-#: src/nano.c:906
-msgid "Set wrapping point at column #cols"
+#: src/nano.c:939
+#, fuzzy
+msgid "Set hard-wrapping point at column #cols"
 msgstr "Tetapkan titik gulungan pada lajur #lajur"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "-s <prog>"
 msgstr "-s <prog>"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "--speller=<prog>"
 msgstr "--speller=<prog>"
 
-#: src/nano.c:910
+#: src/nano.c:943
 msgid "Enable alternate speller"
 msgstr "Aktifkan pengeja lain"
 
-#: src/nano.c:913
+#: src/nano.c:946
 msgid "Auto save on exit, don't prompt"
 msgstr "Auto simpan ketika keluar, jangan maklum"
 
-#: src/nano.c:915
-msgid "Allow generic undo [EXPERIMENTAL]"
-msgstr ""
-
-#: src/nano.c:918
+#: src/nano.c:947
 msgid "View mode (read-only)"
 msgstr "Mod lihat (baca sahaja)"
 
-#: src/nano.c:920
-msgid "Don't wrap long lines"
+#: src/nano.c:949
+#, fuzzy
+msgid "Don't hard-wrap long lines"
 msgstr "Jangan lilit baris panjang"
 
-#: src/nano.c:922
+#: src/nano.c:951
 msgid "Don't show the two help lines"
 msgstr "Jangan papar dua baris bantuan"
 
-#: src/nano.c:923
+#: src/nano.c:952
 msgid "Enable suspension"
 msgstr "Aktifkan gantungan"
 
-#: src/nano.c:924
+#: src/nano.c:954
 #, fuzzy
 msgid "Enable soft line wrapping"
 msgstr "Lilit baris panjang"
 
-#: src/nano.c:928
-msgid "(ignored, for Pico compatibility)"
-msgstr "(diabaikan, untuk kesesuaian Pico)"
-
-#: src/nano.c:938
-#, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
+#: src/nano.c:963
+#, fuzzy, c-format
+msgid " GNU nano, version %s\n"
 msgstr " GNU nano versi %s (compiled %s, %s)\n"
 
-#: src/nano.c:943
+#: src/nano.c:966
 #, 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:944
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1554,157 +1666,180 @@ msgstr ""
 "\n"
 " Pilihan kompilasi:"
 
-#: src/nano.c:1022
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr "Maaf, sokongan untuk fungsi ini telah dimatikan"
 
-#: src/nano.c:1044
+#: src/nano.c:1125
+msgid "No file name"
+msgstr ""
+
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr ""
 "Simpan buffer ubahsuai (JAWAB \"Tidak\" AKAN MENGHILANGKAN PERUBAHAN) ? "
 
-#: src/nano.c:1088
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr ""
 
-#: src/nano.c:1114
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr ""
 
-#: src/nano.c:1182
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "SIGHUP atau SIGTERM diterima\n"
 
-#: src/nano.c:1204
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Guna \"fg\" untuk kembali ke nano.\n"
 
-#: src/nano.c:1386
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "dihidupkan"
 
-#: src/nano.c:1387
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "dimatikan"
 
-#: src/nano.c:1548 src/winio.c:1256
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr "Arahan Tidak Diketahui"
 
-#: src/nano.c:1674
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "XON diabaikan, mumble mumble"
 
-#: src/nano.c:1679
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF diabaikan, mumble mumble"
 
-#: src/nano.c:2209 src/rcfile.c:1100
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Saiz tab \"%s\" yang diminta tidak sah"
 
-#: src/nano.c:2268 src/rcfile.c:1025
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Saiz isian \"%s\" yang diminta tidak sah"
 
+#: src/nano.c:2415
+#, c-format
+msgid "Type '%s -h' for a list of available options.\n"
+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:1259
+#: src/prompt.c:1055
 msgid "Yy"
 msgstr "Yy"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1056
 msgid "Nn"
 msgstr "Tt"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1057
 msgid "Aa"
 msgstr "Ss"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1071
 msgid "Yes"
 msgstr "Ya"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1076
 msgid "All"
 msgstr "Semua"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1081
 msgid "No"
 msgstr "Tidak"
 
-#: src/rcfile.c:130
+#: src/rcfile.c:137
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Ralat dalam %s pada baris %lu: "
 
-#: src/rcfile.c:185
+#: src/rcfile.c:196
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "Hujah '%s' tiada pengakhiran \""
 
-#: src/rcfile.c:212 src/rcfile.c:264 src/rcfile.c:711 src/rcfile.c:768
-#: src/rcfile.c:821
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Rentetan regex mesti bermula dan tamat dengan aksara \""
 
-#: src/rcfile.c:238 src/search.c:62
+#: src/rcfile.c:249 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Regex tidak sah \"%s\": %s"
 
-#: src/rcfile.c:258
+#: src/rcfile.c:269
 msgid "Missing syntax name"
 msgstr "Nama sintaks tiada"
 
-#: src/rcfile.c:316
+#: src/rcfile.c:340
 msgid "The \"none\" syntax is reserved"
 msgstr "Sintaks \"none\" adalah dikhaskan"
 
-#: src/rcfile.c:323
+#: src/rcfile.c:347
 msgid "The \"default\" syntax must take no extensions"
 msgstr "Sintaks \"default\" mesti tidak mempunyai sambungan"
 
-#: src/rcfile.c:386 src/rcfile.c:483
+#: src/rcfile.c:433
 msgid "Missing key name"
 msgstr "Nama kekunci hilang"
 
-#: src/rcfile.c:398 src/rcfile.c:499
+#: src/rcfile.c:442 src/rcfile.c:453
+msgid "Key name is too short"
+msgstr ""
+
+#: src/rcfile.c:463
 #, fuzzy
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr "ikatankekunci mesti bermula dengan \"^\", \"M\", atau \"F\"\n"
 
-#: src/rcfile.c:407
+#: src/rcfile.c:472
 #, fuzzy
-msgid "Must specify function to bind key to"
+msgid "Must specify a function to bind the key to"
 msgstr "Mesti menyatakan fungsi untuk mengikat kekunci ke\n"
 
-#: src/rcfile.c:418 src/rcfile.c:510
-#, fuzzy
-msgid "Must specify menu to bind key to (or \"all\")"
-msgstr "Mesti menyatakan kekunci ikat ke menu (atau \"semua\")\n"
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:482
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
+msgstr ""
 
-#: src/rcfile.c:426
+#: src/rcfile.c:489
 #, fuzzy, c-format
-msgid "Could not map name \"%s\" to a function"
+msgid "Cannot map name \"%s\" to a function"
 msgstr "Tidak dapat memetakan nama \"%s\" ke fungsi\n"
 
-#: src/rcfile.c:432 src/rcfile.c:517
+#: src/rcfile.c:496
 #, fuzzy, c-format
-msgid "Could not map name \"%s\" to a menu"
+msgid "Cannot map name \"%s\" to a menu"
 msgstr "Tidak dapat memetakan nama \"%s\" ke menu\n"
 
-#: src/rcfile.c:454
+#: src/rcfile.c:528
+#, c-format
+msgid "Function '%s' does not exist in menu '%s'"
+msgstr ""
+
+#: src/rcfile.c:543
 #, fuzzy, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
+msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "Maaf, kekunci \"%s\" adalah ikatan tidak sah\n"
 
-#: src/rcfile.c:625
+#: src/rcfile.c:629
+#, fuzzy, c-format
+msgid "Error expanding %s: %s"
+msgstr "Ralat membaca %s: %s"
+
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1719,134 +1854,195 @@ msgstr ""
 "\"black\", dengan prefiks pilihan \"bright\"\n"
 "untuk warna latar hadapan."
 
-#: src/rcfile.c:647
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
 msgstr "Tidak dapat menambah arahan warna tanpa arahan sintaks"
 
-#: src/rcfile.c:652
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "Nama warna tiada"
 
-#: src/rcfile.c:672
-#, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr "Warna latarbelakang \"%s\" tidak boleh terang"
-
-#: src/rcfile.c:690 src/rcfile.c:809
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr "Rentetan regex hilang"
 
-#: src/rcfile.c:762
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\" memerlukan padanan \"end=\""
 
-#: src/rcfile.c:804
+#: src/rcfile.c:837
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr "Warna latarbelakang \"%s\" tidak boleh terang"
+
+#: src/rcfile.c:865
 msgid "Cannot add a header regex without a syntax command"
 msgstr "Tidak dapat menambah pengepala regex tanpa arahan sintaks"
 
-#: src/rcfile.c:874
-#, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
+#: src/rcfile.c:921
+#, fuzzy
+msgid "Cannot add a magic string regex without a syntax command"
+msgstr "Tidak dapat menambah pengepala regex tanpa arahan sintaks"
+
+#: src/rcfile.c:926
+#, fuzzy
+msgid "Missing magic string name"
+msgstr "Rentetan regex hilang"
+
+#: 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:990
+#, fuzzy
+msgid "Missing linter command"
+msgstr "Nama warna tiada"
+
+#: src/rcfile.c:1010
+#, fuzzy
+msgid "Cannot add formatter without a syntax command"
+msgstr "Tidak dapat menambah arahan warna tanpa arahan sintaks"
+
+#: src/rcfile.c:1015
+msgid "Missing formatter command"
+msgstr ""
+
+#: src/rcfile.c:1045
+#, 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:876
+#: src/rcfile.c:1047
+#, fuzzy, c-format
 msgid ""
-"Exiting.  Please use nano with the -I option if needed to adjust your nanorc "
-"settings\n"
+"If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
 "Keluar. Sila guna nano dengan pilihan -I jika perlu untuk mengubah tetapan "
 "nanorc anda\n"
 
-#: src/rcfile.c:926 src/rcfile.c:935 src/rcfile.c:945
+#: src/rcfile.c:1108
+#, fuzzy, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "Tidak dapat memetakan nama \"%s\" ke menu\n"
+
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Arahan \"%s\" tidak dibenarkan dalam fail diselitkan"
 
-#: src/rcfile.c:951 src/rcfile.c:1128
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Sintaks \"%s\" tidak mempunyai arahan warna"
 
-#: src/rcfile.c:966
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Arahan \"%s\" tidak difahami"
 
-#: src/rcfile.c:972
-msgid "Missing flag"
-msgstr "Penanda hilang"
+#: src/rcfile.c:1186
+#, fuzzy
+msgid "Missing option"
+msgstr "Nama warna tiada"
 
-#: src/rcfile.c:994
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Pilihan \"%s\" memerlukan hujah"
 
-#: src/rcfile.c:1012
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr "Pilihan bukan rentetan pelbagai byte yang sah"
 
-#: src/rcfile.c:1038 src/rcfile.c:1066 src/rcfile.c:1075
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr "Aksara bukan-kosong diperlukan"
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr "Dua aksara satu-lajur diperlukan"
 
-#: src/rcfile.c:1114
-#, c-format
-msgid "Cannot unset flag \"%s\""
+#: src/rcfile.c:1339
+#, fuzzy, c-format
+msgid "Cannot unset option \"%s\""
 msgstr "Tidak dapat nyahtetap penanda \"%s\""
 
-#: src/rcfile.c:1123
-#, c-format
-msgid "Unknown flag \"%s\""
+#: src/rcfile.c:1345
+#, fuzzy, c-format
+msgid "Unknown option \"%s\""
 msgstr "Penanda \"%s\" tidak diketahui"
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr "Saya tidak dapat mencari direktori utama!  Wah!"
 
+#: src/rcfile.c:1442
+#, c-format
+msgid ""
+"\n"
+"Press Enter to continue starting nano.\n"
+msgstr ""
+"\n"
+"Tekan Enter untuk meneruskan memulakan nano.\n"
+
 #: src/search.c:96
 #, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "\"%.*s%s\" tidak dijumpai"
 
-#: src/search.c:205
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/search.c:184
+msgid " [Case Sensitive]"
+msgstr " [Case Sensitif]"
+
+#: src/search.c:188
+msgid " [Regexp]"
+msgstr " [Regexp]"
+
+#: src/search.c:192
+msgid " [Backwards]"
+msgstr " [Undur]"
+
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:197
 msgid " (to replace) in selection"
 msgstr " (untuk mengganti) dalam pilihan"
 
-#: src/search.c:207
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (untuk mengganti)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "Ganti dikedudukan ini?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:945
 msgid "Replace with"
 msgstr "Ganti dengan"
 
-#: src/search.c:1004
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
 msgstr[0] "%lu tempat telah diganti"
 
-#: src/search.c:1034
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr "Masukkan nombor baris, nombor lajur"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
 msgstr "Nombor baris atau lajur tidak sah"
 
-#: src/search.c:1214
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "Bukan kurungan"
 
-#: src/search.c:1281
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "Tiada padanan kurungan"
 
@@ -1858,218 +2054,306 @@ msgstr "Tetapkan Tanda"
 msgid "Mark Unset"
 msgstr "Nyahtetap Tanda"
 
-#: src/text.c:443
+#: src/text.c:439
 msgid "Nothing in undo buffer!"
 msgstr "Tiada apa dalam buffer nyahbuat!"
 
-#: src/text.c:455 src/text.c:593
-#, c-format
-msgid "Internal error: can't match line %d.  Please save your work"
+#: src/text.c:445 src/text.c:590
+#, 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"
 
-#: src/text.c:466 src/text.c:603
+#: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
 msgstr "tambah teks"
 
-#: src/text.c:475 src/text.c:613
+#: src/text.c:467 src/text.c:612
 msgid "text delete"
 msgstr "padam teks"
 
-#: src/text.c:489 src/text.c:628
-#, fuzzy
-msgid "line wrap"
-msgstr "Lilit baris panjang"
-
-#: src/text.c:503 src/text.c:636
+#: src/text.c:491 src/text.c:641
 msgid "line join"
 msgstr "gabung baris"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:505 src/text.c:657
 msgid "text cut"
 msgstr "potong teks"
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:510 src/text.c:661
 msgid "text uncut"
 msgstr "nyahpotong teks"
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:515 src/text.c:623
 msgid "line break"
 msgstr ""
 
-#: src/text.c:532 src/text.c:665
+#: src/text.c:528 src/text.c:672
 msgid "text insert"
 msgstr "selit teks"
 
-#: src/text.c:550 src/text.c:659
+#: src/text.c:549 src/text.c:665
 msgid "text replace"
 msgstr "ganti teks"
 
-#: src/text.c:557 src/text.c:671
-msgid "Internal error: unknown type.  Please save your work"
-msgstr "Ralat dalaman: jenis tidak diketahui. Sila simpan kerja anda"
+#: src/text.c:556 src/text.c:679 src/text.c:983
+msgid "Internal error: unknown type.  Please save your work."
+msgstr "Ralat dalaman: jenis tidak diketahui. Sila simpan kerja anda."
 
-#: src/text.c:563
+#: src/text.c:561
 #, c-format
 msgid "Undid action (%s)"
 msgstr "Nyahbuat tindakan (%s)"
 
-#: src/text.c:578
+#: src/text.c:580
 msgid "Nothing to re-do!"
 msgstr "Tiada apa hendak di ulangbuat!"
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
-msgstr "Ralat dalaman: tetapan buat semula gagal. Sila simpan kerja anda"
+#: src/text.c:584
+#, 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:676
+#: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Ulangbuat tindakan (%s)"
 
-#: src/text.c:766
-msgid "Could not pipe"
-msgstr "Tidak dapat menyalurkan"
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
+msgid "Could not create pipe"
+msgstr "Tidak dapat mencipta paip"
 
-#: src/text.c:793 src/text.c:2636 src/text.c:2788
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "Tidak dapat mencabang"
 
-#: src/text.c:941
-msgid "Internal error: can't setup uncut.  Please save your work."
+#: src/text.c:969
+#, fuzzy
+msgid "Internal error: cannot set up uncut.  Please save your work."
 msgstr ""
 "Ralat dalaman: tidak dapat menetapkan nyahpotong. Sila simpan kerja anda."
 
-#: src/text.c:950
-msgid "Internal error: unknown type.  Please save your work."
-msgstr "Ralat dalaman: jenis tidak diketahui. Sila simpan kerja anda."
-
-#: src/text.c:1870
+#: src/text.c:1806
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Petikan rentetan tidak sesuai %s: %s"
 
-#: src/text.c:2267
+#: src/text.c:2207
 msgid "Can now UnJustify!"
 msgstr "Sekarang boleh UnJustify!"
 
-#: src/text.c:2462
+#: src/text.c:2404
 msgid "Edit a replacement"
 msgstr "Ubah penggantian"
 
-#: src/text.c:2548
-msgid "Could not create pipe"
-msgstr "Tidak dapat mencipta paip"
-
-#: src/text.c:2550
+#: src/text.c:2492
 msgid "Creating misspelled word list, please wait..."
 msgstr "Menghasilkan senarai perkataan salah eja, sila tunggu..."
 
-#: src/text.c:2642
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
 msgstr "Tidak dapat memperoleh saiz buffer paip"
 
-#: src/text.c:2693
+#: src/text.c:2635
 msgid "Error invoking \"spell\""
 msgstr "Ralat melaksanakan \"spell\""
 
-#: src/text.c:2696
+#: src/text.c:2638
 msgid "Error invoking \"sort -f\""
 msgstr "Ralat melaksanakan \"sort -f\""
 
-#: src/text.c:2699
+#: src/text.c:2641
 msgid "Error invoking \"uniq\""
 msgstr "Ralat melaksanakan \"uniq\""
 
-#: src/text.c:2756 src/text.c:2965
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "Selesai memeriksa ejaan"
 
-#: src/text.c:2815
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Ralat melaksanakan \"%s\""
 
-#: src/text.c:2960
+#: src/text.c:2885
+#, fuzzy
+msgid "Invoking spell checker, please wait"
+msgstr "Panggil penyemak ejaan, jika ada"
+
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Semakan ejaan gagal: %s"
 
-#: src/text.c:2962
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Semakan ejaan gagal: %s: %s"
 
-#: src/text.c:3030
+#: src/text.c:2937
+#, fuzzy
+msgid "No linter defined for this type of file!"
+msgstr "Jangan tambah baris baru pada penghujung fail"
+
+#: src/text.c:2947
+msgid "Save modified buffer before linting?"
+msgstr ""
+
+#: src/text.c:2969
+msgid "Invoking linter, please wait"
+msgstr ""
+
+#: src/text.c:3125
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr ""
+
+#: src/text.c:3159
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr ""
+
+#: src/text.c:3205
+#, fuzzy
+msgid "At last message"
+msgstr "Papar mesej ini"
+
+#: src/text.c:3210
+#, fuzzy
+msgid "At first message"
+msgstr "Papar mesej ini"
+
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr ""
+
+#: src/text.c:3275
+msgid "Finished"
+msgstr ""
+
+#: src/text.c:3280
+msgid "Invoking formatter, please wait"
+msgstr ""
+
+#: src/text.c:3360
+msgid "Finished formatting"
+msgstr ""
+
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sPerkataan: %lu  Baris: %ld  Aksara: %lu"
 
-#: src/text.c:3031
+#: src/text.c:3439
 msgid "In Selection:  "
 msgstr "Dalam Pilihan:"
 
-#: src/utils.c:405 src/utils.c:417
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3453
+msgid "Verbatim Input"
+msgstr "Masukan Verbatim"
+
+#: src/utils.c:410 src/utils.c:422
 msgid "nano is out of memory!"
 msgstr "nano tidak cukup memori!"
 
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
-#: src/winio.c:1557
+#: src/winio.c:1583
 msgid "Unicode Input"
 msgstr "Masukan Unicode"
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2142 src/winio.c:2146
 msgid "Modified"
 msgstr "Diubahsuai"
 
-#: src/winio.c:2150
+#: src/winio.c:2143
 msgid "View"
 msgstr "Lihat"
 
-#: src/winio.c:2164
+#: src/winio.c:2157
 msgid "DIR:"
 msgstr "DIR:"
 
-#: src/winio.c:2171
+#: src/winio.c:2164
 msgid "File:"
 msgstr "Fail:"
 
-#: src/winio.c:3360
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2261
+msgid ""
+"Warning: Modifying a file which is not locked, check directory permission?"
+msgstr ""
+
+#: src/winio.c:3377
 #, 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:3492
+#: src/winio.c:3507
 msgid "The nano text editor"
 msgstr "Penyunting teks nano"
 
-#: src/winio.c:3493
+#: src/winio.c:3508
 msgid "version"
 msgstr "versi"
 
-#: src/winio.c:3494
+#: src/winio.c:3509
 msgid "Brought to you by:"
 msgstr "Dibawakan kepada anda oleh:"
 
-#: src/winio.c:3495
+#: src/winio.c:3510
 msgid "Special thanks to:"
 msgstr "Terima kasih khas kepada:"
 
-#: src/winio.c:3496
+#: src/winio.c:3511
 msgid "The Free Software Foundation"
 msgstr "The Free Software Foundation"
 
-#: src/winio.c:3497
+#: src/winio.c:3512
+msgid "the many translators and the TP"
+msgstr ""
+
+#: src/winio.c:3513
 msgid "For ncurses:"
 msgstr "Untuk ncurses:"
 
-#: src/winio.c:3498
+#: src/winio.c:3514
 msgid "and anyone else we forgot..."
 msgstr "dan sesiapa yang kami lupa...."
 
-#: src/winio.c:3499
+#: src/winio.c:3515
 msgid "Thank you for using nano!"
 msgstr "Terima kasih kerana menggunakan nano!"
 
+#~ msgid "Insert File"
+#~ msgstr "Selit Fail"
+
+#~ msgid "Go to previous screen"
+#~ msgstr "Pergi ke skrin terdahulu"
+
+#~ msgid "Find Other Bracket"
+#~ msgstr "Cari Lain-lain Tanda Kurungan"
+
+#~ msgid "(ignored, for Pico compatibility)"
+#~ msgstr "(diabaikan, untuk kesesuaian Pico)"
+
+#~ msgid "Must specify menu bind key to (or \"all\")\n"
+#~ msgstr "Mesti menyatakan kekunci ikat ke menu (atau \"semua\")\n"
+
+#~ msgid "Missing flag"
+#~ msgstr "Penanda hilang"
+
 #~ msgid "line split"
 #~ msgstr "pisah baris"
+
+#~ msgid "Internal error: unknown type.  Please save your work"
+#~ msgstr "Ralat dalaman: jenis tidak diketahui. Sila simpan kerja anda"
+
+#~ msgid "Internal error: Redo setup failed.  Please save your work"
+#~ msgstr "Ralat dalaman: tetapan buat semula gagal. Sila simpan kerja anda"
+
+#~ msgid "Could not pipe"
+#~ msgstr "Tidak dapat menyalurkan"
diff --git a/po/nano.pot b/po/nano.pot
index f8dac69..5c6f0b8 100644
--- a/po/nano.pot
+++ b/po/nano.pot
@@ -8,115 +8,140 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-22 06:34-0500\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: src/browser.c:220
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:203
 msgid "Go To Directory"
 msgstr ""
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:860 src/files.c:2048
-#: src/nano.c:1060 src/search.c:220 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr ""
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:246 src/browser.c:293
 #, c-format
 msgid "Can't go outside of %s in restricted mode"
 msgstr ""
 
-#: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:722
-#: src/files.c:731 src/files.c:1540 src/files.c:1659 src/files.c:1711
-#: src/files.c:1732 src/files.c:1855 src/files.c:2691 src/rcfile.c:568
-#: src/rcfile.c:1204
+#: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
+#: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
+#: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
 msgstr ""
 
-#: src/browser.c:303
+#: src/browser.c:283
 msgid "Can't move up a directory"
 msgstr ""
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:665 src/browser.c:674
+#: src/browser.c:626 src/browser.c:635
 msgid "(dir)"
 msgstr ""
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:632
 msgid "(parent dir)"
 msgstr ""
 
-#: src/browser.c:801 src/search.c:185
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr ""
 
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:805 src/search.c:189
-msgid " [Case Sensitive]"
+#: src/browser.c:812 src/search.c:382
+msgid "Search Wrapped"
 msgstr ""
 
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:811 src/search.c:195
-msgid " [Regexp]"
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
+msgid "This is the only occurrence"
 msgstr ""
 
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:817 src/search.c:201
-msgid " [Backwards]"
+#: src/browser.c:915 src/search.c:569
+msgid "No current search pattern"
 msgstr ""
 
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
-msgid "Search Wrapped"
+#: src/files.c:139
+msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
 msgstr ""
 
-#: src/browser.c:1006 src/browser.c:1039 src/search.c:514 src/search.c:517
-#: src/search.c:574 src/search.c:577
-msgid "This is the only occurrence"
+#: src/files.c:145
+#, c-format
+msgid "Couldn't determine hostname for lock file: %s"
 msgstr ""
 
-#: src/browser.c:1042 src/search.c:583
-msgid "No current search pattern"
+#: src/files.c:165 src/files.c:175 src/files.c:212 src/files.c:222
+#, c-format
+msgid "Error writing lock file %s: %s"
+msgstr ""
+
+#: src/files.c:237
+#, c-format
+msgid "Error deleting lock file %s: %s"
+msgstr ""
+
+#: src/files.c:272
+#, c-format
+msgid "Error opening lock file %s: %s"
+msgstr ""
+
+#: src/files.c:282
+#, 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:297
+#, c-format
+msgid "File %s is being edited (by %s with %s, PID %d); continue?"
 msgstr ""
 
-#: src/files.c:125
+#: src/files.c:308
+#, c-format
+msgid "Error writing lock file: Directory '%s' doesn't exist"
+msgstr ""
+
+#: src/files.c:339
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr ""
 
-#: src/files.c:234
+#: src/files.c:467
 msgid "No more open file buffers"
 msgstr ""
 
-#: src/files.c:250
+#: src/files.c:484
 #, c-format
 msgid "Switched to %s"
 msgstr ""
 
-#: src/files.c:251 src/global.c:469 src/winio.c:2168
+#: src/files.c:485 src/global.c:953 src/winio.c:2161
 msgid "New Buffer"
 msgstr ""
 
-#: src/files.c:633
+#: src/files.c:874
 #, 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:638
+#: src/files.c:879
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
@@ -127,14 +152,14 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/files.c:644
+#: src/files.c:885
 #, 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:648
+#: src/files.c:889
 #, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
@@ -143,14 +168,14 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/files.c:654
+#: src/files.c:895
 #, 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:658
+#: src/files.c:899
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
@@ -159,472 +184,425 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/files.c:664
+#: src/files.c:905
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/files.c:667
+#: src/files.c:908
 #, 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:700 src/files.c:736
+#: src/files.c:943 src/files.c:980
 msgid "Reading File"
 msgstr ""
 
-#: src/files.c:706
+#: src/files.c:950
 msgid "New File"
 msgstr ""
 
-#: src/files.c:709
+#: src/files.c:953
 #, c-format
 msgid "\"%s\" not found"
 msgstr ""
 
-#: src/files.c:717 src/rcfile.c:559 src/rcfile.c:1154 src/rcfile.c:1195
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr ""
 
-#: src/files.c:718 src/rcfile.c:560 src/rcfile.c:1155 src/rcfile.c:1196
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr ""
 
-#: src/files.c:817
+#: src/files.c:1060
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr ""
 
-#: src/files.c:819
+#: src/files.c:1062
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr ""
 
-#: src/files.c:825
+#: src/files.c:1069
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr ""
 
-#: src/files.c:827
+#: src/files.c:1071
 #, c-format
 msgid "File to insert [from %s] "
 msgstr ""
 
-#: src/files.c:1077
+#: src/files.c:1320
 msgid "Key invalid in non-multibuffer mode"
 msgstr ""
 
-#: src/files.c:1486
+#: src/files.c:1622
+msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+msgstr ""
+
+#: src/files.c:1746
 #, c-format
 msgid "Can't write outside of %s"
 msgstr ""
 
-#: src/files.c:1501
+#: src/files.c:1761
 msgid "Cannot prepend or append to a symlink with --nofollow set"
 msgstr ""
 
-#: src/files.c:1581 src/files.c:1603 src/files.c:1621 src/files.c:1632
-#: src/files.c:1640 src/files.c:1667
+#: src/files.c:1843 src/files.c:1868 src/files.c:1886 src/files.c:1899
+#: src/files.c:1910 src/files.c:1939
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr ""
 
-#: src/files.c:1582 src/nano.c:701
+#: src/files.c:1844 src/nano.c:719
 msgid "Too many backup files?"
 msgstr ""
 
-#: src/files.c:1687 src/files.c:1744 src/files.c:1763 src/files.c:1775
-#: src/files.c:1799 src/files.c:1817 src/files.c:1827 src/files.c:1863
-#: src/files.c:1868 src/files.c:2764 src/files.c:2773
+#: src/files.c:1959 src/files.c:2016 src/files.c:2035 src/files.c:2047
+#: src/files.c:2071 src/files.c:2089 src/files.c:2099 src/files.c:2135
+#: src/files.c:2140 src/files.c:3101 src/files.c:3110 src/files.c:3133
+#: src/files.c:3145
 #, c-format
 msgid "Error writing %s: %s"
 msgstr ""
 
-#: src/files.c:1721 src/text.c:2929 src/text.c:2941
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr ""
 
-#: src/files.c:1900
+#: src/files.c:2173
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/files.c:2004
+#: src/files.c:2278
 msgid " [DOS Format]"
 msgstr ""
 
-#: src/files.c:2005
+#: src/files.c:2279
 msgid " [Mac Format]"
 msgstr ""
 
-#: src/files.c:2007
+#: src/files.c:2281
 msgid " [Backup]"
 msgstr ""
 
-#: src/files.c:2015
+#: src/files.c:2289
 msgid "Prepend Selection to File"
 msgstr ""
 
-#: src/files.c:2016
+#: src/files.c:2290
 msgid "Append Selection to File"
 msgstr ""
 
-#: src/files.c:2017
+#: src/files.c:2291
 msgid "Write Selection to File"
 msgstr ""
 
-#: src/files.c:2020
+#: src/files.c:2294
 msgid "File Name to Prepend to"
 msgstr ""
 
-#: src/files.c:2021
+#: src/files.c:2295
 msgid "File Name to Append to"
 msgstr ""
 
-#: src/files.c:2022
+#: src/files.c:2296
 msgid "File Name to Write"
 msgstr ""
 
-#: src/files.c:2153
+#: src/files.c:2427
 msgid "File exists, OVERWRITE ? "
 msgstr ""
 
-#: src/files.c:2162
+#: src/files.c:2436
 msgid "Save file under DIFFERENT NAME ? "
 msgstr ""
 
-#: src/files.c:2173
+#: src/files.c:2450
 msgid "File was modified since you opened it, continue saving ? "
 msgstr ""
 
-#: src/files.c:2611
+#: src/files.c:2882
 msgid "(more)"
 msgstr ""
 
-#: src/files.c:2694 src/rcfile.c:1220
+#: src/files.c:2974
 #, c-format
 msgid ""
 "\n"
-"Press Enter to continue starting nano.\n"
-msgstr ""
-
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:415 src/prompt.c:1288
-msgid "Cancel"
+"Press Enter to continue\n"
 msgstr ""
 
-#: src/global.c:416
-msgid "Replace"
+#: src/files.c:2989
+#, c-format
+msgid ""
+"Unable to create directory %s: %s\n"
+"It is required for saving/loading search history or cursor positions.\n"
 msgstr ""
 
-#: src/global.c:417
-msgid "No Replace"
+#: src/files.c:2995
+#, 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/global.c:420
-msgid "Case Sens"
+#: src/files.c:3012
+#, 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/global.c:421
-msgid "Backwards"
+#: src/files.c:3016
+#, 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 ""
 
-#: src/global.c:425
-msgid "Regexp"
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
+#: src/global.c:477
+msgid "Exit"
 msgstr ""
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:451
-msgid "PrevHstory"
+#: src/global.c:478
+msgid "Close"
 msgstr ""
 
-#: src/global.c:452
-msgid "NextHstory"
+#: src/global.c:479
+msgid "Uncut Text"
 msgstr ""
 
-#: src/global.c:453
-msgid "Go To Text"
+#: src/global.c:481
+msgid "Unjustify"
 msgstr ""
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:455
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:485
 msgid "WhereIs Next"
 msgstr ""
 
-#: src/global.c:457
-msgid "First File"
-msgstr ""
-
-#: src/global.c:458
-msgid "Last File"
-msgstr ""
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:460
-msgid "To Files"
-msgstr ""
-
-#: src/global.c:462
-msgid "DOS Format"
-msgstr ""
-
-#: src/global.c:463
-msgid "Mac Format"
-msgstr ""
-
-#: src/global.c:464
-msgid "Append"
-msgstr ""
-
-#: src/global.c:465
-msgid "Prepend"
-msgstr ""
-
-#: src/global.c:466
-msgid "Backup File"
-msgstr ""
-
-#: src/global.c:467
-msgid "Execute Command"
-msgstr ""
-
-#: src/global.c:471
-msgid "Go To Dir"
-msgstr ""
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:480
-msgid "Get Help"
-msgstr ""
-
-#: src/global.c:481
-msgid "Exit"
-msgstr ""
-
-#: src/global.c:482
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:492
 msgid "Where Is"
 msgstr ""
 
-#: src/global.c:483
-msgid "Prev Page"
-msgstr ""
-
-#: src/global.c:484
-msgid "Next Page"
-msgstr ""
-
-#: src/global.c:485
-msgid "First Line"
+#: src/global.c:493
+msgid "Replace"
 msgstr ""
 
-#: src/global.c:486
-msgid "Last Line"
+#: src/global.c:494
+msgid "Go To Line"
 msgstr ""
 
-#: src/global.c:487
-msgid "Suspend"
+#: src/global.c:495
+msgid "Prev Line"
 msgstr ""
 
-#: src/global.c:489
-msgid "Beg of Par"
+#: src/global.c:496
+msgid "Next Line"
 msgstr ""
 
-#: src/global.c:490
-msgid "End of Par"
+#: src/global.c:497
+msgid "Read File"
 msgstr ""
 
-#: src/global.c:491
+#: src/global.c:499
 msgid "FullJstify"
 msgstr ""
 
-#: src/global.c:493
+#: src/global.c:501
 msgid "Refresh"
 msgstr ""
 
-#: src/global.c:495
-msgid "Insert File"
-msgstr ""
-
-#: src/global.c:497
-msgid "Go To Line"
-msgstr ""
-
-#: src/global.c:500
+#. 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:507
 msgid "Justify the current paragraph"
 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:505
+#: src/global.c:509
 msgid "Cancel the current function"
 msgstr ""
 
-#: src/global.c:506
+#: src/global.c:510
 msgid "Display this help text"
 msgstr ""
 
-#: src/global.c:509
+#: src/global.c:513
 msgid "Close the current file buffer / Exit from nano"
 msgstr ""
 
-#: src/global.c:511
+#: src/global.c:515
 msgid "Exit from nano"
 msgstr ""
 
-#: src/global.c:515
+#: src/global.c:519
 msgid "Write the current file to disk"
 msgstr ""
 
-#: src/global.c:517
+#: src/global.c:521
 msgid "Insert another file into the current one"
 msgstr ""
 
-#: src/global.c:519
+#: src/global.c:523
 msgid "Search for a string or a regular expression"
 msgstr ""
 
-#: src/global.c:520
-msgid "Go to previous screen"
+#: src/global.c:526
+msgid "Search for a string"
 msgstr ""
 
-#: src/global.c:521
-msgid "Go to next screen"
+#: src/global.c:528
+msgid "Go one screenful up"
 msgstr ""
 
-#: src/global.c:523
+#: src/global.c:529
+msgid "Go one screenful down"
+msgstr ""
+
+#: src/global.c:531
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr ""
 
-#: src/global.c:525
+#: src/global.c:533
 msgid "Uncut from the cutbuffer into the current line"
 msgstr ""
 
-#: src/global.c:527
+#: src/global.c:534
 msgid "Display the position of the cursor"
 msgstr ""
 
-#: src/global.c:529
+#: src/global.c:536
 msgid "Invoke the spell checker, if available"
 msgstr ""
 
-#: src/global.c:531
+#: src/global.c:538
 msgid "Replace a string or a regular expression"
 msgstr ""
 
-#: src/global.c:532
+#: src/global.c:539
 msgid "Go to line and column number"
 msgstr ""
 
-#: src/global.c:534
-msgid "Mark text at the cursor position"
+#: src/global.c:541
+msgid "Mark text starting from the cursor position"
 msgstr ""
 
-#: src/global.c:535
-msgid "Repeat last search"
+#: src/global.c:542
+msgid "Repeat the last search"
 msgstr ""
 
-#: src/global.c:537
+#: src/global.c:544
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr ""
 
-#: src/global.c:538
+#: src/global.c:545
 msgid "Indent the current line"
 msgstr ""
 
-#: src/global.c:539
+#: src/global.c:546
 msgid "Unindent the current line"
 msgstr ""
 
-#: src/global.c:540
+#: src/global.c:547
 msgid "Undo the last operation"
 msgstr ""
 
-#: src/global.c:541
+#: src/global.c:548
 msgid "Redo the last undone operation"
 msgstr ""
 
-#: src/global.c:543
+#: src/global.c:550
 msgid "Go forward one character"
 msgstr ""
 
-#: src/global.c:544
+#: src/global.c:551
 msgid "Go back one character"
 msgstr ""
 
-#: src/global.c:546
+#: src/global.c:553
 msgid "Go forward one word"
 msgstr ""
 
-#: src/global.c:547
+#: src/global.c:554
 msgid "Go back one word"
 msgstr ""
 
-#: src/global.c:549
+#: src/global.c:556
 msgid "Go to previous line"
 msgstr ""
 
-#: src/global.c:550
+#: src/global.c:557
 msgid "Go to next line"
 msgstr ""
 
-#: src/global.c:551
+#: src/global.c:558
 msgid "Go to beginning of current line"
 msgstr ""
 
-#: src/global.c:552
+#: src/global.c:559
 msgid "Go to end of current line"
 msgstr ""
 
-#: src/global.c:555
+#: src/global.c:562
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr ""
 
-#: src/global.c:557
+#: src/global.c:564
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr ""
 
-#: src/global.c:560
+#: src/global.c:566
 msgid "Go to the first line of the file"
 msgstr ""
 
-#: src/global.c:562
+#: src/global.c:567
 msgid "Go to the last line of the file"
 msgstr ""
 
-#: src/global.c:564
+#: src/global.c:569
 msgid "Go to the matching bracket"
 msgstr ""
 
-#: src/global.c:566
+#: src/global.c:571
 msgid "Scroll up one line without scrolling the cursor"
 msgstr ""
 
-#: src/global.c:568
+#: src/global.c:573
 msgid "Scroll down one line without scrolling the cursor"
 msgstr ""
 
-#: src/global.c:572
+#: src/global.c:576
 msgid "Switch to the previous file buffer"
 msgstr ""
 
-#: src/global.c:574
+#: src/global.c:577
 msgid "Switch to the next file buffer"
 msgstr ""
 
-#: src/global.c:577
+#: src/global.c:579
 msgid "Insert the next keystroke verbatim"
 msgstr ""
 
-#: src/global.c:579
+#: src/global.c:580
 msgid "Insert a tab at the cursor position"
 msgstr ""
 
@@ -632,330 +610,434 @@ msgstr ""
 msgid "Insert a newline at the cursor position"
 msgstr ""
 
-#: src/global.c:583
+#: src/global.c:582
 msgid "Delete the character under the cursor"
 msgstr ""
 
-#: src/global.c:585
+#: src/global.c:584
 msgid "Delete the character to the left of the cursor"
 msgstr ""
 
-#: src/global.c:588
+#: src/global.c:587
 msgid "Cut from the cursor position to the end of the file"
 msgstr ""
 
-#: src/global.c:591
+#: src/global.c:590
 msgid "Justify the entire file"
 msgstr ""
 
-#: src/global.c:595
+#: src/global.c:594
 msgid "Count the number of words, lines, and characters"
 msgstr ""
 
-#: src/global.c:598
+#: src/global.c:597
 msgid "Refresh (redraw) the current screen"
 msgstr ""
 
-#: src/global.c:600
+#: src/global.c:599
 msgid "Suspend the editor (if suspend is enabled)"
 msgstr ""
 
-#: src/global.c:603
+#: src/global.c:602
 msgid "Toggle the case sensitivity of the search"
 msgstr ""
 
-#: src/global.c:605
+#: src/global.c:604
 msgid "Reverse the direction of the search"
 msgstr ""
 
-#: src/global.c:609
+#: src/global.c:608
 msgid "Toggle the use of regular expressions"
 msgstr ""
 
-#: src/global.c:613
+#: src/global.c:612
 msgid "Recall the previous search/replace string"
 msgstr ""
 
-#: src/global.c:615
+#: src/global.c:614
 msgid "Recall the next search/replace string"
 msgstr ""
 
-#: src/global.c:618
+#: src/global.c:617
 msgid "Go to file browser"
 msgstr ""
 
-#: src/global.c:621
+#: src/global.c:620
 msgid "Toggle the use of DOS format"
 msgstr ""
 
-#: src/global.c:622
+#: src/global.c:621
 msgid "Toggle the use of Mac format"
 msgstr ""
 
-#: src/global.c:624
+#: src/global.c:622
 msgid "Toggle appending"
 msgstr ""
 
-#: src/global.c:625
+#: src/global.c:623
 msgid "Toggle prepending"
 msgstr ""
 
-#: src/global.c:628
+#: src/global.c:624
 msgid "Toggle backing up of the original file"
 msgstr ""
 
-#: src/global.c:629
+#: src/global.c:625
 msgid "Execute external command"
 msgstr ""
 
-#: src/global.c:633
+#: src/global.c:628
 msgid "Toggle the use of a new buffer"
 msgstr ""
 
-#: src/global.c:636
+#: src/global.c:631
 msgid "Exit from the file browser"
 msgstr ""
 
-#: src/global.c:638
+#: src/global.c:632
 msgid "Go to the first file in the list"
 msgstr ""
 
-#: src/global.c:640
+#: src/global.c:633
 msgid "Go to the last file in the list"
 msgstr ""
 
-#: src/global.c:641
+#: src/global.c:634
+msgid "Go to the previous file in the list"
+msgstr ""
+
+#: src/global.c:635
 msgid "Go to the next file in the list"
 msgstr ""
 
+#: src/global.c:636
+msgid "Go to directory"
+msgstr ""
+
+#: src/global.c:639
+msgid "Invoke the linter, if available"
+msgstr ""
+
+#: src/global.c:640
+msgid "Go to previous linter msg"
+msgstr ""
+
+#: src/global.c:641
+msgid "Go to next linter msg"
+msgstr ""
+
 #: src/global.c:642
-msgid "Go to the previous file in the list"
+msgid "Invoke formatter, if available"
 msgstr ""
 
-#: src/global.c:643
-msgid "Go to directory"
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:662
+msgid "Get Help"
 msgstr ""
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:670
-msgid "Close"
+#: src/global.c:665 src/prompt.c:1084
+msgid "Cancel"
+msgstr ""
+
+#: src/global.c:678
+msgid "Write Out"
+msgstr ""
+
+#: src/global.c:704
+msgid "Go To Dir"
 msgstr ""
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:679
-msgid "WriteOut"
+#: src/global.c:719
+msgid "Cut Text"
 msgstr ""
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:728
 msgid "Justify"
 msgstr ""
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:696
-msgid "Read File"
+#: src/global.c:733
+msgid "To Spell"
 msgstr ""
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:713
-msgid "Cut Text"
+#: src/global.c:738
+msgid "To Linter"
+msgstr ""
+
+#: src/global.c:740
+msgid "Formatter"
 msgstr ""
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:718
-msgid "UnJustify"
+#: src/global.c:745
+msgid "Case Sens"
 msgstr ""
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:723
-msgid "UnCut Text"
+#: src/global.c:750
+msgid "Regexp"
+msgstr ""
+
+#: src/global.c:755
+msgid "Backwards"
+msgstr ""
+
+#: src/global.c:762
+msgid "No Replace"
 msgstr ""
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:728 src/global.c:755
+#: src/global.c:770
 msgid "Cur Pos"
 msgstr ""
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:737
-msgid "To Spell"
+#: src/global.c:780
+msgid "Prev Page"
+msgstr ""
+
+#: src/global.c:782
+msgid "Next Page"
+msgstr ""
+
+#: src/global.c:785
+msgid "First Line"
+msgstr ""
+
+#: src/global.c:787
+msgid "Last Line"
+msgstr ""
+
+#: src/global.c:794
+msgid "To Bracket"
 msgstr ""
 
-#: src/global.c:771
+#: src/global.c:797
 msgid "Mark Text"
 msgstr ""
 
-#: src/global.c:777
+#: src/global.c:800
 msgid "Copy Text"
 msgstr ""
 
-#: src/global.c:780
+#: src/global.c:803
 msgid "Indent Text"
 msgstr ""
 
-#: src/global.c:783
+#: src/global.c:805
 msgid "Unindent Text"
 msgstr ""
 
-#: src/global.c:787
+#: src/global.c:808
 msgid "Undo"
 msgstr ""
 
-#: src/global.c:790
+#: src/global.c:810
 msgid "Redo"
 msgstr ""
 
-#: src/global.c:796 src/global.c:800
-msgid "Forward"
-msgstr ""
-
-#: src/global.c:806 src/global.c:810
+#: src/global.c:814 src/global.c:820
 msgid "Back"
 msgstr ""
 
-#: src/global.c:817
-msgid "Next Word"
+#: src/global.c:816 src/global.c:822
+msgid "Forward"
 msgstr ""
 
-#: src/global.c:820
+#: src/global.c:827
 msgid "Prev Word"
 msgstr ""
 
-#: src/global.c:824
-msgid "Prev Line"
-msgstr ""
-
-#: src/global.c:827
-msgid "Next Line"
+#: src/global.c:829
+msgid "Next Word"
 msgstr ""
 
-#: src/global.c:830
+#: src/global.c:833
 msgid "Home"
 msgstr ""
 
-#: src/global.c:833
+#: src/global.c:835
 msgid "End"
 msgstr ""
 
-#: src/global.c:845
-msgid "Find Other Bracket"
+#: src/global.c:844
+msgid "Beg of Par"
 msgstr ""
 
-#: src/global.c:848
-msgid "Scroll Up"
+#: src/global.c:846
+msgid "End of Par"
 msgstr ""
 
 #: src/global.c:851
-msgid "Scroll Down"
+msgid "Scroll Up"
 msgstr ""
 
-#: src/global.c:856
-msgid "Previous File"
+#: src/global.c:853
+msgid "Scroll Down"
 msgstr ""
 
 #: src/global.c:858
+msgid "Prev File"
+msgstr ""
+
+#: src/global.c:860
 msgid "Next File"
 msgstr ""
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:862 src/text.c:3045
-msgid "Verbatim Input"
+#: src/global.c:869
+msgid "Verbatim"
 msgstr ""
 
-#: src/global.c:867
+#: src/global.c:872
 msgid "Tab"
 msgstr ""
 
-#: src/global.c:870
+#: src/global.c:874
 msgid "Enter"
 msgstr ""
 
-#: src/global.c:873
+#: src/global.c:876
 msgid "Delete"
 msgstr ""
 
-#: src/global.c:876
+#: src/global.c:878
 msgid "Backspace"
 msgstr ""
 
-#: src/global.c:893
+#: src/global.c:888
 msgid "CutTillEnd"
 msgstr ""
 
-#: src/global.c:906
+#: src/global.c:898
 msgid "Word Count"
 msgstr ""
 
-#: src/global.c:1367
+#: src/global.c:905
+msgid "Suspend"
+msgstr ""
+
+#: src/global.c:910
+msgid "PrevHstory"
+msgstr ""
+
+#: src/global.c:913
+msgid "NextHstory"
+msgstr ""
+
+#: src/global.c:917
+msgid "Go To Text"
+msgstr ""
+
+#: src/global.c:928
+msgid "DOS Format"
+msgstr ""
+
+#: src/global.c:931
+msgid "Mac Format"
+msgstr ""
+
+#: src/global.c:934
+msgid "Append"
+msgstr ""
+
+#: src/global.c:936
+msgid "Prepend"
+msgstr ""
+
+#: src/global.c:939
+msgid "Backup File"
+msgstr ""
+
+#: src/global.c:946
+msgid "Execute Command"
+msgstr ""
+
+#: src/global.c:961
+msgid "To Files"
+msgstr ""
+
+#: src/global.c:964
+msgid "First File"
+msgstr ""
+
+#: src/global.c:966
+msgid "Last File"
+msgstr ""
+
+#: src/global.c:977
+msgid "Prev Lint Msg"
+msgstr ""
+
+#: src/global.c:979
+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:1227
 msgid "Help mode"
 msgstr ""
 
-#: src/global.c:1369
+#: src/global.c:1229
 msgid "Constant cursor position display"
 msgstr ""
 
-#: src/global.c:1371
+#: src/global.c:1231
 msgid "Use of one more line for editing"
 msgstr ""
 
-#: src/global.c:1373
+#: src/global.c:1233
 msgid "Smooth scrolling"
 msgstr ""
 
-#: src/global.c:1375
+#: src/global.c:1235
+msgid "Soft wrapping of overlong lines"
+msgstr ""
+
+#: src/global.c:1237
 msgid "Whitespace display"
 msgstr ""
 
-#: src/global.c:1377
+#: src/global.c:1239
 msgid "Color syntax highlighting"
 msgstr ""
 
-#: src/global.c:1379
+#: src/global.c:1241
 msgid "Smart home key"
 msgstr ""
 
-#: src/global.c:1381
+#: src/global.c:1243
 msgid "Auto indent"
 msgstr ""
 
-#: src/global.c:1383
+#: src/global.c:1245
 msgid "Cut to end"
 msgstr ""
 
-#: src/global.c:1385
-msgid "Long line wrapping"
+#: src/global.c:1247
+msgid "Hard wrapping of overlong lines"
 msgstr ""
 
-#: src/global.c:1387
+#: src/global.c:1249
 msgid "Conversion of typed tabs to spaces"
 msgstr ""
 
-#: src/global.c:1389
+#: src/global.c:1251
 msgid "Backup files"
 msgstr ""
 
-#: src/global.c:1391
+#: src/global.c:1253
 msgid "Multiple file buffers"
 msgstr ""
 
-#: src/global.c:1393
+#: src/global.c:1255
 msgid "Mouse support"
 msgstr ""
 
-#: src/global.c:1395
+#: src/global.c:1257
 msgid "No conversion from DOS/Mac format"
 msgstr ""
 
-#: src/global.c:1397
+#: src/global.c:1259
 msgid "Suspension"
 msgstr ""
 
-#: src/global.c:1399
-msgid "Soft line wrapping"
-msgstr ""
-
-#: src/help.c:236
+#: src/help.c:205
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -968,7 +1050,7 @@ msgid ""
 "search.  "
 msgstr ""
 
-#: src/help.c:245
+#: src/help.c:214
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -977,7 +1059,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:251
+#: src/help.c:220
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -989,7 +1071,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:260
+#: src/help.c:229
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1002,7 +1084,7 @@ msgid ""
 "into a separate buffer (use Meta-< and > to switch between file buffers).  "
 msgstr ""
 
-#: src/help.c:269
+#: src/help.c:238
 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"
@@ -1011,7 +1093,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:275
+#: src/help.c:244
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1027,7 +1109,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:289
+#: src/help.c:258
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1041,7 +1123,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:302
+#: src/help.c:271
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1055,13 +1137,13 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:311
+#: src/help.c:280
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
 msgstr ""
 
-#: src/help.c:315
+#: src/help.c:284
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1074,7 +1156,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:328
+#: src/help.c:297
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1088,7 +1170,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:343
+#: src/help.c:312
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1100,7 +1182,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:356
+#: src/help.c:325
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1112,7 +1194,7 @@ msgid ""
 "bottom and shows important messages.  "
 msgstr ""
 
-#: src/help.c:366
+#: src/help.c:335
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1123,7 +1205,7 @@ msgid ""
 "Alt, or Meta key depending on your keyboard setup.  "
 msgstr ""
 
-#: src/help.c:375
+#: src/help.c:344
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1132,444 +1214,474 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:376 src/help.c:448
 msgid "enable/disable"
 msgstr ""
 
-#: src/nano.c:587
+#: src/nano.c:601
 msgid "Key invalid in view mode"
 msgstr ""
 
-#: src/nano.c:695
+#: src/nano.c:713
 #, c-format
 msgid ""
 "\n"
 "Buffer written to %s\n"
 msgstr ""
 
-#: src/nano.c:697
+#: src/nano.c:715
 #, c-format
 msgid ""
 "\n"
 "Buffer not written to %s: %s\n"
 msgstr ""
 
-#: src/nano.c:700
+#: src/nano.c:718
 #, c-format
 msgid ""
 "\n"
 "Buffer not written: %s\n"
 msgstr ""
 
-#: src/nano.c:723
+#: src/nano.c:743
 msgid "Window size is too small for nano...\n"
 msgstr ""
 
-#: src/nano.c:816
+#: src/nano.c:836
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
 "\n"
 msgstr ""
 
-#: src/nano.c:819
+#: src/nano.c:839
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr ""
 
-#: src/nano.c:821
+#: src/nano.c:841
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr ""
 
-#: src/nano.c:824
-msgid "Show this message"
-msgstr ""
-
-#: src/nano.c:825
+#: src/nano.c:844
 msgid "+LINE,COLUMN"
 msgstr ""
 
-#: src/nano.c:826
+#. TRANSLATORS: The next forty or so strings are option descriptions
+#. * for the --help output.  Try to keep them at most 40 characters.
+#: src/nano.c:847
 msgid "Start at line LINE, column COLUMN"
 msgstr ""
 
-#: src/nano.c:828
+#: src/nano.c:849
 msgid "Enable smart home key"
 msgstr ""
 
-#: src/nano.c:829
+#: src/nano.c:850
 msgid "Save backups of existing files"
 msgstr ""
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "-C <dir>"
 msgstr ""
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "--backupdir=<dir>"
 msgstr ""
 
-#: src/nano.c:831
+#: src/nano.c:852
 msgid "Directory for saving unique backup files"
 msgstr ""
 
-#: src/nano.c:834
+#: src/nano.c:855
 msgid "Use bold instead of reverse video text"
 msgstr ""
 
-#: src/nano.c:837
+#: src/nano.c:858
 msgid "Convert typed tabs to spaces"
 msgstr ""
 
-#: src/nano.c:840
+#: src/nano.c:861
 msgid "Enable multiple file buffers"
 msgstr ""
 
-#: src/nano.c:845
+#: src/nano.c:865
+msgid "Use (vim-style) lock files"
+msgstr ""
+
+#: src/nano.c:869
 msgid "Log & read search/replace string history"
 msgstr ""
 
-#: src/nano.c:848
+#: src/nano.c:873
 msgid "Don't look at nanorc files"
 msgstr ""
 
-#: src/nano.c:851
+#: src/nano.c:876
 msgid "Fix numeric keypad key confusion problem"
 msgstr ""
 
-#: src/nano.c:853
+#: src/nano.c:878
 msgid "Don't add newlines to the ends of files"
 msgstr ""
 
-#: src/nano.c:856
+#: src/nano.c:881
 msgid "Don't convert files from DOS/Mac format"
 msgstr ""
 
-#: src/nano.c:858
+#: src/nano.c:883
 msgid "Use one more line for editing"
 msgstr ""
 
-#: src/nano.c:860
+#: src/nano.c:886
+msgid "Log & read location of cursor position"
+msgstr ""
+
+#: src/nano.c:889
 msgid "-Q <str>"
 msgstr ""
 
-#: src/nano.c:860
+#: src/nano.c:889
 msgid "--quotestr=<str>"
 msgstr ""
 
-#: src/nano.c:861
+#: src/nano.c:890
 msgid "Quoting string"
 msgstr ""
 
-#: src/nano.c:863
+#: src/nano.c:892
 msgid "Restricted mode"
 msgstr ""
 
-#: src/nano.c:866
+#: src/nano.c:895
 msgid "Scroll by line instead of half-screen"
 msgstr ""
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "-T <#cols>"
 msgstr ""
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "--tabsize=<#cols>"
 msgstr ""
 
-#: src/nano.c:869
+#: src/nano.c:898
 msgid "Set width of a tab to #cols columns"
 msgstr ""
 
-#: src/nano.c:871
+#: src/nano.c:900
 msgid "Do quick statusbar blanking"
 msgstr ""
 
-#: src/nano.c:874
+#: src/nano.c:903
 msgid "Print version information and exit"
 msgstr ""
 
-#: src/nano.c:877
+#: src/nano.c:906
 msgid "Detect word boundaries more accurately"
 msgstr ""
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "-Y <str>"
 msgstr ""
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "--syntax=<str>"
 msgstr ""
 
-#: src/nano.c:881
+#: src/nano.c:910
 msgid "Syntax definition to use for coloring"
 msgstr ""
 
-#: src/nano.c:883
+#: src/nano.c:912
 msgid "Constantly show cursor position"
 msgstr ""
 
-#: src/nano.c:885
+#: src/nano.c:914
 msgid "Fix Backspace/Delete confusion problem"
 msgstr ""
 
-#: src/nano.c:888
+#: src/nano.c:915
+msgid "Show this help text"
+msgstr ""
+
+#: src/nano.c:918
 msgid "Automatically indent new lines"
 msgstr ""
 
-#: src/nano.c:889
+#: src/nano.c:919
 msgid "Cut from cursor to end of line"
 msgstr ""
 
-#: src/nano.c:892
+#: src/nano.c:922
 msgid "Don't follow symbolic links, overwrite"
 msgstr ""
 
-#: src/nano.c:894
+#: src/nano.c:924
 msgid "Enable the use of the mouse"
 msgstr ""
 
-#: src/nano.c:897
+#: src/nano.c:926
+msgid "Do not read the file (only write it)"
+msgstr ""
+
+#: src/nano.c:928
 msgid "-o <dir>"
 msgstr ""
 
-#: src/nano.c:897
+#: src/nano.c:928
 msgid "--operatingdir=<dir>"
 msgstr ""
 
-#: src/nano.c:898
+#: src/nano.c:929
 msgid "Set operating directory"
 msgstr ""
 
-#: src/nano.c:901
+#: src/nano.c:932
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr ""
 
-#: src/nano.c:903
+#: src/nano.c:935
 msgid "Silently ignore startup issues like rc file errors"
 msgstr ""
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "-r <#cols>"
 msgstr ""
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "--fill=<#cols>"
 msgstr ""
 
-#: src/nano.c:906
-msgid "Set wrapping point at column #cols"
+#: src/nano.c:939
+msgid "Set hard-wrapping point at column #cols"
 msgstr ""
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "-s <prog>"
 msgstr ""
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "--speller=<prog>"
 msgstr ""
 
-#: src/nano.c:910
+#: src/nano.c:943
 msgid "Enable alternate speller"
 msgstr ""
 
-#: src/nano.c:913
+#: src/nano.c:946
 msgid "Auto save on exit, don't prompt"
 msgstr ""
 
-#: src/nano.c:915
-msgid "Allow generic undo [EXPERIMENTAL]"
-msgstr ""
-
-#: src/nano.c:918
+#: src/nano.c:947
 msgid "View mode (read-only)"
 msgstr ""
 
-#: src/nano.c:920
-msgid "Don't wrap long lines"
+#: src/nano.c:949
+msgid "Don't hard-wrap long lines"
 msgstr ""
 
-#: src/nano.c:922
+#: src/nano.c:951
 msgid "Don't show the two help lines"
 msgstr ""
 
-#: src/nano.c:923
+#: src/nano.c:952
 msgid "Enable suspension"
 msgstr ""
 
-#: src/nano.c:924
+#: src/nano.c:954
 msgid "Enable soft line wrapping"
 msgstr ""
 
-#: src/nano.c:928
-msgid "(ignored, for Pico compatibility)"
-msgstr ""
-
-#: src/nano.c:938
+#: src/nano.c:963
 #, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
+msgid " GNU nano, version %s\n"
 msgstr ""
 
-#: src/nano.c:943
+#: src/nano.c:966
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr ""
 
-#: src/nano.c:944
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
 " Compiled options:"
 msgstr ""
 
-#: src/nano.c:1022
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr ""
 
-#: src/nano.c:1044
+#: src/nano.c:1125
+msgid "No file name"
+msgstr ""
+
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr ""
 
-#: src/nano.c:1088
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr ""
 
-#: src/nano.c:1114
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr ""
 
-#: src/nano.c:1182
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr ""
 
-#: src/nano.c:1204
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr ""
 
-#: src/nano.c:1386
+#: src/nano.c:1481
 msgid "enabled"
 msgstr ""
 
-#: src/nano.c:1387
+#: src/nano.c:1481
 msgid "disabled"
 msgstr ""
 
-#: src/nano.c:1548 src/winio.c:1256
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr ""
 
-#: src/nano.c:1674
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr ""
 
-#: src/nano.c:1679
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr ""
 
-#: src/nano.c:2209 src/rcfile.c:1100
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr ""
 
-#: src/nano.c:2268 src/rcfile.c:1025
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr ""
 
+#: src/nano.c:2415
+#, c-format
+msgid "Type '%s -h' for a list of available options.\n"
+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:1259
+#: src/prompt.c:1055
 msgid "Yy"
 msgstr ""
 
-#: src/prompt.c:1260
+#: src/prompt.c:1056
 msgid "Nn"
 msgstr ""
 
-#: src/prompt.c:1261
+#: src/prompt.c:1057
 msgid "Aa"
 msgstr ""
 
-#: src/prompt.c:1275
+#: src/prompt.c:1071
 msgid "Yes"
 msgstr ""
 
-#: src/prompt.c:1280
+#: src/prompt.c:1076
 msgid "All"
 msgstr ""
 
-#: src/prompt.c:1285
+#: src/prompt.c:1081
 msgid "No"
 msgstr ""
 
-#: src/rcfile.c:130
+#: src/rcfile.c:137
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr ""
 
-#: src/rcfile.c:185
+#: src/rcfile.c:196
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr ""
 
-#: src/rcfile.c:212 src/rcfile.c:264 src/rcfile.c:711 src/rcfile.c:768
-#: src/rcfile.c:821
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
 msgstr ""
 
-#: src/rcfile.c:238 src/search.c:62
+#: src/rcfile.c:249 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr ""
 
-#: src/rcfile.c:258
+#: src/rcfile.c:269
 msgid "Missing syntax name"
 msgstr ""
 
-#: src/rcfile.c:316
+#: src/rcfile.c:340
 msgid "The \"none\" syntax is reserved"
 msgstr ""
 
-#: src/rcfile.c:323
+#: src/rcfile.c:347
 msgid "The \"default\" syntax must take no extensions"
 msgstr ""
 
-#: src/rcfile.c:386 src/rcfile.c:483
+#: src/rcfile.c:433
 msgid "Missing key name"
 msgstr ""
 
-#: src/rcfile.c:398 src/rcfile.c:499
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
+#: src/rcfile.c:442 src/rcfile.c:453
+msgid "Key name is too short"
+msgstr ""
+
+#: src/rcfile.c:463
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
+msgstr ""
+
+#: src/rcfile.c:472
+msgid "Must specify a function to bind the key to"
+msgstr ""
+
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:482
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
 
-#: src/rcfile.c:407
-msgid "Must specify function to bind key to"
+#: src/rcfile.c:489
+#, c-format
+msgid "Cannot map name \"%s\" to a function"
 msgstr ""
 
-#: src/rcfile.c:418 src/rcfile.c:510
-msgid "Must specify menu to bind key to (or \"all\")"
+#: src/rcfile.c:496
+#, c-format
+msgid "Cannot map name \"%s\" to a menu"
 msgstr ""
 
-#: src/rcfile.c:426
+#: src/rcfile.c:528
 #, c-format
-msgid "Could not map name \"%s\" to a function"
+msgid "Function '%s' does not exist in menu '%s'"
 msgstr ""
 
-#: src/rcfile.c:432 src/rcfile.c:517
+#: src/rcfile.c:543
 #, c-format
-msgid "Could not map name \"%s\" to a menu"
+msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr ""
 
-#: src/rcfile.c:454
+#: src/rcfile.c:629
 #, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
+msgid "Error expanding %s: %s"
 msgstr ""
 
-#: src/rcfile.c:625
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1579,133 +1691,186 @@ msgid ""
 "for foreground colors."
 msgstr ""
 
-#: src/rcfile.c:647
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
 msgstr ""
 
-#: src/rcfile.c:652
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr ""
 
-#: src/rcfile.c:672
+#: src/rcfile.c:709 src/rcfile.c:870
+msgid "Missing regex string"
+msgstr ""
+
+#: src/rcfile.c:785
+msgid "\"start=\" requires a corresponding \"end=\""
+msgstr ""
+
+#: src/rcfile.c:837
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
 msgstr ""
 
-#: src/rcfile.c:690 src/rcfile.c:809
-msgid "Missing regex string"
+#: src/rcfile.c:865
+msgid "Cannot add a header regex without a syntax command"
 msgstr ""
 
-#: src/rcfile.c:762
-msgid "\"start=\" requires a corresponding \"end=\""
+#: src/rcfile.c:921
+msgid "Cannot add a magic string regex without a syntax command"
 msgstr ""
 
-#: src/rcfile.c:804
-msgid "Cannot add a header regex without a syntax command"
+#: src/rcfile.c:926
+msgid "Missing magic string name"
 msgstr ""
 
-#: src/rcfile.c:874
+#: src/rcfile.c:985
+msgid "Cannot add a linter without a syntax command"
+msgstr ""
+
+#: src/rcfile.c:990
+msgid "Missing linter command"
+msgstr ""
+
+#: src/rcfile.c:1010
+msgid "Cannot add formatter without a syntax command"
+msgstr ""
+
+#: src/rcfile.c:1015
+msgid "Missing formatter command"
+msgstr ""
+
+#: src/rcfile.c:1045
 #, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
+msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr ""
 
-#: src/rcfile.c:876
+#: src/rcfile.c:1047
+#, c-format
 msgid ""
-"Exiting.  Please use nano with the -I option if needed to adjust your nanorc "
-"settings\n"
+"If needed, use nano with the -I option to adjust your nanorc settings.\n"
+msgstr ""
+
+#: src/rcfile.c:1108
+#, c-format
+msgid "Could not find syntax \"%s\" to extend"
 msgstr ""
 
-#: src/rcfile.c:926 src/rcfile.c:935 src/rcfile.c:945
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr ""
 
-#: src/rcfile.c:951 src/rcfile.c:1128
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr ""
 
-#: src/rcfile.c:966
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr ""
 
-#: src/rcfile.c:972
-msgid "Missing flag"
+#: src/rcfile.c:1186
+msgid "Missing option"
 msgstr ""
 
-#: src/rcfile.c:994
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr ""
 
-#: src/rcfile.c:1012
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr ""
 
-#: src/rcfile.c:1038 src/rcfile.c:1066 src/rcfile.c:1075
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr ""
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr ""
 
-#: src/rcfile.c:1114
+#: src/rcfile.c:1339
 #, c-format
-msgid "Cannot unset flag \"%s\""
+msgid "Cannot unset option \"%s\""
 msgstr ""
 
-#: src/rcfile.c:1123
+#: src/rcfile.c:1345
 #, c-format
-msgid "Unknown flag \"%s\""
+msgid "Unknown option \"%s\""
 msgstr ""
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr ""
 
+#: src/rcfile.c:1442
+#, c-format
+msgid ""
+"\n"
+"Press Enter to continue starting nano.\n"
+msgstr ""
+
 #: src/search.c:96
 #, c-format
 msgid "\"%.*s%s\" not found"
 msgstr ""
 
-#: src/search.c:205
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/search.c:184
+msgid " [Case Sensitive]"
+msgstr ""
+
+#: src/search.c:188
+msgid " [Regexp]"
+msgstr ""
+
+#: src/search.c:192
+msgid " [Backwards]"
+msgstr ""
+
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:197
 msgid " (to replace) in selection"
 msgstr ""
 
-#: src/search.c:207
+#: src/search.c:199
 msgid " (to replace)"
 msgstr ""
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr ""
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:945
 msgid "Replace with"
 msgstr ""
 
-#: src/search.c:1004
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/search.c:1034
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr ""
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
 msgstr ""
 
-#: src/search.c:1214
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr ""
 
-#: src/search.c:1281
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr ""
 
@@ -1717,213 +1882,268 @@ msgstr ""
 msgid "Mark Unset"
 msgstr ""
 
-#: src/text.c:443
+#: src/text.c:439
 msgid "Nothing in undo buffer!"
 msgstr ""
 
-#: src/text.c:455 src/text.c:593
+#: src/text.c:445 src/text.c:590
 #, c-format
-msgid "Internal error: can't match line %d.  Please save your work"
+msgid "Internal error: can't match line %d.  Please save your work."
 msgstr ""
 
-#: src/text.c:466 src/text.c:603
+#: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
 msgstr ""
 
-#: src/text.c:475 src/text.c:613
+#: src/text.c:467 src/text.c:612
 msgid "text delete"
 msgstr ""
 
-#: src/text.c:489 src/text.c:628
-msgid "line wrap"
-msgstr ""
-
-#: src/text.c:503 src/text.c:636
+#: src/text.c:491 src/text.c:641
 msgid "line join"
 msgstr ""
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:505 src/text.c:657
 msgid "text cut"
 msgstr ""
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:510 src/text.c:661
 msgid "text uncut"
 msgstr ""
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:515 src/text.c:623
 msgid "line break"
 msgstr ""
 
-#: src/text.c:532 src/text.c:665
+#: src/text.c:528 src/text.c:672
 msgid "text insert"
 msgstr ""
 
-#: src/text.c:550 src/text.c:659
+#: src/text.c:549 src/text.c:665
 msgid "text replace"
 msgstr ""
 
-#: src/text.c:557 src/text.c:671
-msgid "Internal error: unknown type.  Please save your work"
+#: src/text.c:556 src/text.c:679 src/text.c:983
+msgid "Internal error: unknown type.  Please save your work."
 msgstr ""
 
-#: src/text.c:563
+#: src/text.c:561
 #, c-format
 msgid "Undid action (%s)"
 msgstr ""
 
-#: src/text.c:578
+#: src/text.c:580
 msgid "Nothing to re-do!"
 msgstr ""
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
+#: src/text.c:584
+msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
 
-#: src/text.c:676
+#: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr ""
 
-#: src/text.c:766
-msgid "Could not pipe"
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
+msgid "Could not create pipe"
 msgstr ""
 
-#: src/text.c:793 src/text.c:2636 src/text.c:2788
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr ""
 
-#: src/text.c:941
-msgid "Internal error: can't setup uncut.  Please save your work."
-msgstr ""
-
-#: src/text.c:950
-msgid "Internal error: unknown type.  Please save your work."
+#: src/text.c:969
+msgid "Internal error: cannot set up uncut.  Please save your work."
 msgstr ""
 
-#: src/text.c:1870
+#: src/text.c:1806
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr ""
 
-#: src/text.c:2267
+#: src/text.c:2207
 msgid "Can now UnJustify!"
 msgstr ""
 
-#: src/text.c:2462
+#: src/text.c:2404
 msgid "Edit a replacement"
 msgstr ""
 
-#: src/text.c:2548
-msgid "Could not create pipe"
-msgstr ""
-
-#: src/text.c:2550
+#: src/text.c:2492
 msgid "Creating misspelled word list, please wait..."
 msgstr ""
 
-#: src/text.c:2642
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
 msgstr ""
 
-#: src/text.c:2693
+#: src/text.c:2635
 msgid "Error invoking \"spell\""
 msgstr ""
 
-#: src/text.c:2696
+#: src/text.c:2638
 msgid "Error invoking \"sort -f\""
 msgstr ""
 
-#: src/text.c:2699
+#: src/text.c:2641
 msgid "Error invoking \"uniq\""
 msgstr ""
 
-#: src/text.c:2756 src/text.c:2965
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr ""
 
-#: src/text.c:2815
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr ""
 
-#: src/text.c:2960
+#: src/text.c:2885
+msgid "Invoking spell checker, please wait"
+msgstr ""
+
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr ""
 
-#: src/text.c:2962
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr ""
 
-#: src/text.c:3030
+#: src/text.c:2937
+msgid "No linter defined for this type of file!"
+msgstr ""
+
+#: src/text.c:2947
+msgid "Save modified buffer before linting?"
+msgstr ""
+
+#: src/text.c:2969
+msgid "Invoking linter, please wait"
+msgstr ""
+
+#: src/text.c:3125
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr ""
+
+#: src/text.c:3159
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr ""
+
+#: src/text.c:3205
+msgid "At last message"
+msgstr ""
+
+#: src/text.c:3210
+msgid "At first message"
+msgstr ""
+
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr ""
+
+#: src/text.c:3275
+msgid "Finished"
+msgstr ""
+
+#: src/text.c:3280
+msgid "Invoking formatter, please wait"
+msgstr ""
+
+#: src/text.c:3360
+msgid "Finished formatting"
+msgstr ""
+
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr ""
 
-#: src/text.c:3031
+#: src/text.c:3439
 msgid "In Selection:  "
 msgstr ""
 
-#: src/utils.c:405 src/utils.c:417
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3453
+msgid "Verbatim Input"
+msgstr ""
+
+#: src/utils.c:410 src/utils.c:422
 msgid "nano is out of memory!"
 msgstr ""
 
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
-#: src/winio.c:1557
+#: src/winio.c:1583
 msgid "Unicode Input"
 msgstr ""
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2142 src/winio.c:2146
 msgid "Modified"
 msgstr ""
 
-#: src/winio.c:2150
+#: src/winio.c:2143
 msgid "View"
 msgstr ""
 
-#: src/winio.c:2164
+#: src/winio.c:2157
 msgid "DIR:"
 msgstr ""
 
-#: src/winio.c:2171
+#: src/winio.c:2164
 msgid "File:"
 msgstr ""
 
-#: src/winio.c:3360
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2261
+msgid ""
+"Warning: Modifying a file which is not locked, check directory permission?"
+msgstr ""
+
+#: src/winio.c:3377
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr ""
 
-#: src/winio.c:3492
+#: src/winio.c:3507
 msgid "The nano text editor"
 msgstr ""
 
-#: src/winio.c:3493
+#: src/winio.c:3508
 msgid "version"
 msgstr ""
 
-#: src/winio.c:3494
+#: src/winio.c:3509
 msgid "Brought to you by:"
 msgstr ""
 
-#: src/winio.c:3495
+#: src/winio.c:3510
 msgid "Special thanks to:"
 msgstr ""
 
-#: src/winio.c:3496
+#: src/winio.c:3511
 msgid "The Free Software Foundation"
 msgstr ""
 
-#: src/winio.c:3497
+#: src/winio.c:3512
+msgid "the many translators and the TP"
+msgstr ""
+
+#: src/winio.c:3513
 msgid "For ncurses:"
 msgstr ""
 
-#: src/winio.c:3498
+#: src/winio.c:3514
 msgid "and anyone else we forgot..."
 msgstr ""
 
-#: src/winio.c:3499
+#: src/winio.c:3515
 msgid "Thank you for using nano!"
 msgstr ""
diff --git a/po/nb.gmo b/po/nb.gmo
index b1b5ffa..5408896 100644
--- a/po/nb.gmo
+++ b/po/nb.gmo
diff --git a/po/nb.po b/po/nb.po
index 9f57f40..9915663 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,985 +1,1072 @@
-# Norwegian bokm�l message catalogs for GNU nano.
+# Norwegian Bokmål message catalog for GNU nano.
 # Copyright (C) 2001, 2002 Free Software Foundation, Inc.
-# Eivind Kj�rstad <ekj@vestdata.no>, 2001.
-# Stig E Sand� <stig@ii.uib.no>, 2002.
-# Geir Helland <pjallabais@users.sourceforge.net>, 2004
-# $Id: nb.po,v 1.3 2002/01/23 01:06:20 astyanax Exp $
+# This file is distributed under the same license as the nano package.
 #
+# Eivind Kjørstad <ekj@vestdata.no>, 2001.
+# Stig E Sandø <stig@ii.uib.no>, 2002.
+# Geir Helland <pjallabais@users.sourceforge.net>, 2004
+# Johnny A. Solbu <johnny@solbu.net>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 1.9.99pre0\n"
+"Project-Id-Version: nano 2.3.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-22 06:34-0500\n"
-"PO-Revision-Date: 2006-10-16 23:09+0200\n"
-"Last-Translator: Geir Helland <pjallabais@users.sourceforge.net>\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
+"PO-Revision-Date: 2014-07-18 20:37+0100\n"
+"Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n"
 "Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
+"Language: nb\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\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.5.4\n"
 
-#: src/browser.c:220
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:203
 msgid "Go To Directory"
-msgstr "G� til katalog"
+msgstr "Gå til katalog"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:860 src/files.c:2048
-#: src/nano.c:1060 src/search.c:220 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Avbrutt"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:246 src/browser.c:293
 #, c-format
 msgid "Can't go outside of %s in restricted mode"
-msgstr "Kan ikke g� utenfor %s i begrenset modus"
+msgstr "Kan ikke gå utenfor %s i begrenset modus"
 
-#: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:722
-#: src/files.c:731 src/files.c:1540 src/files.c:1659 src/files.c:1711
-#: src/files.c:1732 src/files.c:1855 src/files.c:2691 src/rcfile.c:568
-#: src/rcfile.c:1204
+#: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
+#: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
+#: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
-msgstr "Lesefeil p� %s: %s"
+msgstr "Lesefeil på %s: %s"
 
-#: src/browser.c:303
+#: src/browser.c:283
 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:665 src/browser.c:674
+#: src/browser.c:626 src/browser.c:635
 msgid "(dir)"
 msgstr "(kat)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:632
 msgid "(parent dir)"
 msgstr "(foreldrekatalog)"
 
-#: src/browser.c:801 src/search.c:185
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
-msgstr "S�k"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:805 src/search.c:189
-msgid " [Case Sensitive]"
-msgstr " [Ta hensyn til store/sm� bokstaver]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:811 src/search.c:195
-msgid " [Regexp]"
-msgstr " [Regul�rt uttrykk]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:817 src/search.c:201
-msgid " [Backwards]"
-msgstr " [Bakover]"
+msgstr "Søk"
 
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
-msgstr "S�ket gikk rundt"
+msgstr "Søket gikk rundt"
 
-#: src/browser.c:1006 src/browser.c:1039 src/search.c:514 src/search.c:517
-#: src/search.c:574 src/search.c:577
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "Dette er eneste forekomst"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
-msgstr "Tomt s�kem�nster"
+msgstr "Tomt søkemønster"
+
+#: src/files.c:139
+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:145
+#, c-format
+msgid "Couldn't determine hostname for lock file: %s"
+msgstr "Finner ikke ut vertsnavnet for låsefilen: %s"
+
+#: src/files.c:165 src/files.c:175 src/files.c:212 src/files.c:222
+#, c-format
+msgid "Error writing lock file %s: %s"
+msgstr "Feil ved skriving til låssfil %s: %s"
+
+#: src/files.c:237
+#, c-format
+msgid "Error deleting lock file %s: %s"
+msgstr "Feil ved sletting av låsefil %s: %s"
+
+#: src/files.c:272
+#, c-format
+msgid "Error opening lock file %s: %s"
+msgstr "Feil ved åpning av låsefil %s: %s"
 
-#: src/files.c:125
+#: src/files.c:282
+#, 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:297
+#, c-format
+msgid "File %s is being edited (by %s with %s, PID %d); continue?"
+msgstr ""
+
+#: src/files.c:308
+#, c-format
+msgid "Error writing lock file: Directory '%s' doesn't exist"
+msgstr "Feil ved skriving til låssfil: Mappen «%s» finnes ikke"
+
+#: src/files.c:339
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Kan ikke sette inn fil fra utsiden av %s"
 
-#: src/files.c:234
+#: src/files.c:467
 msgid "No more open file buffers"
-msgstr "Ikke flere �pne filbuffer"
+msgstr "Ikke flere åpne filbuffer"
 
-#: src/files.c:250
+#: src/files.c:484
 #, c-format
 msgid "Switched to %s"
 msgstr "Byttet til %s"
 
-#: src/files.c:251 src/global.c:469 src/winio.c:2168
+#: src/files.c:485 src/global.c:953 src/winio.c:2161
 msgid "New Buffer"
 msgstr "Ny buffer"
 
-#: src/files.c:633
+#: src/files.c:874
 #, 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:638
-#, fuzzy, c-format
+#: src/files.c:879
+#, 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)"
-msgstr[1] "Leste %lu linjer (Konvertert fra DOS og Mac-format)"
+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:644
+#: src/files.c:885
 #, 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:648
-#, fuzzy, c-format
+#: src/files.c:889
+#, 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)"
-msgstr[1] "Leste %lu linjer (Konvertert fra Mac-format)"
+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:654
+#: src/files.c:895
 #, 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:658
-#, fuzzy, c-format
+#: src/files.c:899
+#, 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)"
-msgstr[1] "Leste %lu linjer (Konvertert fra DOS-format)"
+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:664
+#: src/files.c:905
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "Leste %lu linje"
 msgstr[1] "Leste %lu linjer"
 
-#: src/files.c:667
+#: src/files.c:908
 #, c-format
 msgid "Read %lu line ( Warning: No write permission)"
 msgid_plural "Read %lu lines (Warning: No write permission)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Les %lu linje (Advarsel: Ingen skrivetilgang)"
+msgstr[1] "Les %lu linjer (Advarsel: Ingen skrivetilgang)"
 
-#: src/files.c:700 src/files.c:736
+#: src/files.c:943 src/files.c:980
 msgid "Reading File"
 msgstr "Leser fil"
 
-#: src/files.c:706
+#: src/files.c:950
 msgid "New File"
 msgstr "Ny fil"
 
-#: src/files.c:709
+#: src/files.c:953
 #, c-format
 msgid "\"%s\" not found"
-msgstr "\"%s\" ikke funnet"
+msgstr "«%s» ikke funnet"
 
-#: src/files.c:717 src/rcfile.c:559 src/rcfile.c:1154 src/rcfile.c:1195
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
-msgstr "\"%s\" er en katalog"
+msgstr "«%s» er en katalog"
 
 # "enhet" = "device", kanskje, men det er litt forvirrande
-#: src/files.c:718 src/rcfile.c:560 src/rcfile.c:1155 src/rcfile.c:1196
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
-msgstr "\"%s\" er en enhetsfil (device)"
+msgstr "«%s» er en enhetsfil (device)"
 
-#: src/files.c:817
+#: src/files.c:1060
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
-msgstr "Kommando som skal kj�res i nytt buffer [fra %s] "
+msgstr "Kommando som skal kjøres i nytt buffer [fra %s] "
 
-#: src/files.c:819
+#: src/files.c:1062
 #, c-format
 msgid "Command to execute [from %s] "
-msgstr "Kommando som skal kj�res [fra %s] "
+msgstr "Kommando som skal kjøres [fra %s] "
 
-#: src/files.c:825
+#: src/files.c:1069
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Fil som skal settes inn [fra %s] "
 
-#: src/files.c:827
+#: src/files.c:1071
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Fil som skal settes inn [fra %s] "
 
-#: src/files.c:1077
+#: src/files.c:1320
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Tasten er ugyldig utenfor multibuffer-modus"
 
-#: src/files.c:1486
+#: src/files.c:1622
+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:1746
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Kan ikke skrive utenfor %s"
 
-#: src/files.c:1501
+#: src/files.c:1761
 msgid "Cannot prepend or append to a symlink with --nofollow set"
 msgstr ""
 "Kan ikke prependere eller appendere til en symbolsk lenke med --nofollow satt"
 
-#: src/files.c:1581 src/files.c:1603 src/files.c:1621 src/files.c:1632
-#: src/files.c:1640 src/files.c:1667
-#, fuzzy, c-format
+#: src/files.c:1843 src/files.c:1868 src/files.c:1886 src/files.c:1899
+#: src/files.c:1910 src/files.c:1939
+#, c-format
 msgid "Error writing backup file %s: %s"
-msgstr "Feil ved skriving til midlertidlig fil: %s"
+msgstr "Feil ved skriving av backup-fil %s: %s"
 
-#: src/files.c:1582 src/nano.c:701
+#: src/files.c:1844 src/nano.c:719
 msgid "Too many backup files?"
 msgstr "For mange sikkerhetskopier?"
 
-#: src/files.c:1687 src/files.c:1744 src/files.c:1763 src/files.c:1775
-#: src/files.c:1799 src/files.c:1817 src/files.c:1827 src/files.c:1863
-#: src/files.c:1868 src/files.c:2764 src/files.c:2773
+#: src/files.c:1959 src/files.c:2016 src/files.c:2035 src/files.c:2047
+#: src/files.c:2071 src/files.c:2089 src/files.c:2099 src/files.c:2135
+#: src/files.c:2140 src/files.c:3101 src/files.c:3110 src/files.c:3133
+#: src/files.c:3145
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Skrivefeil %s: %s"
 
-#: src/files.c:1721 src/text.c:2929 src/text.c:2941
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Feil ved skriving til midlertidlig fil: %s"
 
-#: src/files.c:1900
+#: src/files.c:2173
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "Skrev %lu linje"
 msgstr[1] "Skrev %lu linjer"
 
-#: src/files.c:2004
+#: src/files.c:2278
 msgid " [DOS Format]"
 msgstr " [DOS Format]"
 
-#: src/files.c:2005
+#: src/files.c:2279
 msgid " [Mac Format]"
-msgstr " {Mac Format]"
+msgstr " [Mac Format]"
 
-#: src/files.c:2007
+#: src/files.c:2281
 msgid " [Backup]"
 msgstr " [Sikkerhetskopi]"
 
-#: src/files.c:2015
+#: src/files.c:2289
 msgid "Prepend Selection to File"
-msgstr "Legg til valgt omr�de f�rst i fil"
+msgstr "Legg til valgt område først i fil"
 
-#: src/files.c:2016
+#: src/files.c:2290
 msgid "Append Selection to File"
-msgstr "Legg til valgt omr�de sist i fil"
+msgstr "Legg til valgt område sist i fil"
 
-#: src/files.c:2017
+#: src/files.c:2291
 msgid "Write Selection to File"
-msgstr "Skriv valgt omr�de til fil"
+msgstr "Skriv valgt område til fil"
 
-#: src/files.c:2020
+#: src/files.c:2294
 msgid "File Name to Prepend to"
-msgstr "Filnavn det skal legges til p� slutten av"
+msgstr "Filnavn det skal legges til på slutten av"
 
-#: src/files.c:2021
+#: src/files.c:2295
 msgid "File Name to Append to"
-msgstr "Filnavn det skal legges til f�rst i"
+msgstr "Filnavn det skal legges til først i"
 
-#: src/files.c:2022
+#: src/files.c:2296
 msgid "File Name to Write"
 msgstr "Filnavn som skal skrives til"
 
-#: src/files.c:2153
+#: src/files.c:2427
 msgid "File exists, OVERWRITE ? "
 msgstr "Filen finnes, SKRIVE OVER ? "
 
-#: src/files.c:2162
+#: src/files.c:2436
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "Lagre filen under et ANNET NAVN ? "
 
-#: src/files.c:2173
+#: src/files.c:2450
 msgid "File was modified since you opened it, continue saving ? "
-msgstr ""
+msgstr "Filen ble endret etter at du åpnet den, fortsette å lagre?"
 
-#: src/files.c:2611
+#: src/files.c:2882
 msgid "(more)"
 msgstr "(mer)"
 
-#: src/files.c:2694 src/rcfile.c:1220
+#: src/files.c:2974
 #, c-format
 msgid ""
 "\n"
-"Press Enter to continue starting nano.\n"
+"Press Enter to continue\n"
 msgstr ""
 "\n"
-"Trykk linjeskift for � fortsette oppstarten av nano\n"
+"Trykk linjeskift for å fortsette\n"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:415 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Avbryt"
-
-#: src/global.c:416
-msgid "Replace"
-msgstr "Erstatt"
+#: src/files.c:2989
+#, c-format
+msgid ""
+"Unable to create directory %s: %s\n"
+"It is required for saving/loading search history or cursor positions.\n"
+msgstr ""
+"Kan ikke opprette mappe %s: %s\n"
+"Det er nødvendig for lagring/lasting av søkehistorikk eller "
+"markørposisjoner\n"
 
-#: src/global.c:417
-msgid "No Replace"
-msgstr "Ikke erstatt"
+#: src/files.c:2995
+#, 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 ""
+"Stien %s er ikke en katalog, det må det være.\n"
+"Nano vil være ute av stand til å laste eller lagre søk- eller "
+"markørposisjonhistorikk\n"
 
-#: src/global.c:420
-msgid "Case Sens"
-msgstr "F�lsomt for store/sm� bokstavar"
+#: src/files.c:3012
+#, 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 ""
+"Oppdaget en eldre nano historiefil (%s) som jeg prøvde å flytte\n"
+"til den ønskede plasseringen (%s), men oppdaget en feil: %s"
 
-#: src/global.c:421
-msgid "Backwards"
-msgstr "Bakover"
+#: src/files.c:3016
+#, 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 ""
+"Oppdaget en eldre nano historiefil (%s) som jeg flyttet\n"
+"til den ønskede plasseringen (%s)\n"
+"(se nano FAQ om denne endringen)"
 
-#: src/global.c:425
-msgid "Regexp"
-msgstr "Regul�rt uttrykk"
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
+#: src/global.c:477
+msgid "Exit"
+msgstr "Avslutt"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:451
-msgid "PrevHstory"
-msgstr "ForrigeHistorie"
+#: src/global.c:478
+msgid "Close"
+msgstr "Lukk"
 
-#: src/global.c:452
-msgid "NextHstory"
-msgstr "NesteHistorie"
+#: src/global.c:479
+msgid "Uncut Text"
+msgstr "Angre «klipp ut»"
 
-#: src/global.c:453
-msgid "Go To Text"
-msgstr "G� til tekst"
+#: src/global.c:481
+msgid "Unjustify"
+msgstr "Avjuster"
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:455
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:485
 msgid "WhereIs Next"
 msgstr "Finn neste"
 
-#: src/global.c:457
-msgid "First File"
-msgstr "F�rste fil"
-
-#: src/global.c:458
-msgid "Last File"
-msgstr "Siste fil"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:460
-msgid "To Files"
-msgstr "Til filer"
-
-#: src/global.c:462
-msgid "DOS Format"
-msgstr "DOS Format"
-
-#: src/global.c:463
-msgid "Mac Format"
-msgstr "Mac Format"
-
-#: src/global.c:464
-msgid "Append"
-msgstr "Legg til etter"
-
-#: src/global.c:465
-msgid "Prepend"
-msgstr "Legg til f�r"
-
-#: src/global.c:466
-msgid "Backup File"
-msgstr "Sikkerhetskopi"
-
-#: src/global.c:467
-msgid "Execute Command"
-msgstr "Eksekver kommando"
-
-#: src/global.c:471
-msgid "Go To Dir"
-msgstr "G� til katalog"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:480
-msgid "Get Help"
-msgstr "Hjelp"
-
-#: src/global.c:481
-msgid "Exit"
-msgstr "Avslutt"
-
-#: src/global.c:482
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:492
 msgid "Where Is"
 msgstr "Finn"
 
-#: src/global.c:483
-msgid "Prev Page"
-msgstr "Forrige side"
+#: src/global.c:493
+msgid "Replace"
+msgstr "Erstatt"
 
-#: src/global.c:484
-msgid "Next Page"
-msgstr "Neste side"
+#: src/global.c:494
+msgid "Go To Line"
+msgstr "Gå til linje"
 
-#: src/global.c:485
-msgid "First Line"
-msgstr "F�rste linje"
+#: src/global.c:495
+msgid "Prev Line"
+msgstr "Forrige side"
 
-#: src/global.c:486
-msgid "Last Line"
+#: src/global.c:496
+msgid "Next Line"
 msgstr "Siste linje"
 
-#: src/global.c:487
-#, fuzzy
-msgid "Suspend"
-msgstr "Legg i bakgrunnen"
-
-#: src/global.c:489
-msgid "Beg of Par"
-msgstr "Avsn. start"
-
-#: src/global.c:490
-msgid "End of Par"
-msgstr "Avsn. slutt"
+#: src/global.c:497
+msgid "Read File"
+msgstr "Les fil"
 
-#: src/global.c:491
+#: src/global.c:499
 msgid "FullJstify"
 msgstr "JusterAlt"
 
-#: src/global.c:493
+#: src/global.c:501
 msgid "Refresh"
 msgstr "Oppfrisk"
 
-#: src/global.c:495
-msgid "Insert File"
-msgstr "Sett inn fil"
-
-#: src/global.c:497
-msgid "Go To Line"
-msgstr "G� til linje"
-
-#: src/global.c:500
+#. 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:507
 msgid "Justify the current paragraph"
 msgstr "Juster gjeldende avsnitt"
 
-#. 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:505
+#: src/global.c:509
 msgid "Cancel the current function"
 msgstr "Avbryt gjeldende funksjon"
 
-#: src/global.c:506
+#: src/global.c:510
 msgid "Display this help text"
 msgstr "Vis denne hjelpeteksten"
 
-#: src/global.c:509
+#: src/global.c:513
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Lukk gjeldende filbuffer/ Avslutt nano"
 
-#: src/global.c:511
+#: src/global.c:515
 msgid "Exit from nano"
 msgstr "Avslutt nano"
 
-#: src/global.c:515
+#: src/global.c:519
 msgid "Write the current file to disk"
-msgstr "Lagre n�v�rende fil"
+msgstr "Lagre nåværende fil"
 
-#: src/global.c:517
+#: src/global.c:521
 msgid "Insert another file into the current one"
 msgstr "Sett inn en annen fil i denne"
 
-#: src/global.c:519
+#: src/global.c:523
 msgid "Search for a string or a regular expression"
-msgstr "S�k etter streng eller regul�rt uttrykk"
+msgstr "Søk etter streng eller regulært uttrykk"
 
-#: src/global.c:520
-#, fuzzy
-msgid "Go to previous screen"
-msgstr "G� til forrige skjerm"
+#: src/global.c:526
+msgid "Search for a string"
+msgstr "Søk etter streng"
 
-#: src/global.c:521
-#, fuzzy
-msgid "Go to next screen"
-msgstr "G� til neste skjerm"
+#: src/global.c:528
+msgid "Go one screenful up"
+msgstr "Gå en skjerm opp"
 
-#: src/global.c:523
+#: src/global.c:529
+msgid "Go one screenful down"
+msgstr "Gå en skjerm ned"
+
+#: src/global.c:531
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Klipp denne linjen og lagre den i klippebufferet"
 
-#: src/global.c:525
+#: src/global.c:533
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Sett inn klippebufferet her"
 
-#: src/global.c:527
+#: src/global.c:534
 msgid "Display the position of the cursor"
 msgstr "Vis pekerposisjon"
 
-#: src/global.c:529
+#: src/global.c:536
 msgid "Invoke the spell checker, if available"
 msgstr "Start stavesjekk, dersom tilgjengelig"
 
-#: src/global.c:531
+#: src/global.c:538
 msgid "Replace a string or a regular expression"
-msgstr "Erstatt streng eller regul�rt uttrykk"
+msgstr "Erstatt streng eller regulært uttrykk"
 
-#: src/global.c:532
+#: src/global.c:539
 msgid "Go to line and column number"
-msgstr "G� til linje- og kolonnenummer"
+msgstr "Gå til linje- og kolonnenummer"
 
-#: src/global.c:534
-msgid "Mark text at the cursor position"
-msgstr "Marker teksten ved mark�ren"
+#: src/global.c:541
+msgid "Mark text starting from the cursor position"
+msgstr "Marker tekst fra markørposisjonen"
 
-#: src/global.c:535
-msgid "Repeat last search"
-msgstr "Gjenta siste s�k"
+#: src/global.c:542
+msgid "Repeat the last search"
+msgstr "Gjenta siste søk"
 
-#: src/global.c:537
+#: src/global.c:544
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "Kopier gjeldende linje og lagre i utklippstavlen"
 
-#: src/global.c:538
+#: src/global.c:545
 msgid "Indent the current line"
 msgstr "Indenter gjeldende linje"
 
-#: src/global.c:539
+#: src/global.c:546
 msgid "Unindent the current line"
 msgstr "Fjern indentering fra gjeldende linje"
 
-#: src/global.c:540
+#: src/global.c:547
 msgid "Undo the last operation"
-msgstr ""
+msgstr "Angre siste handling"
 
-#: src/global.c:541
+#: src/global.c:548
 msgid "Redo the last undone operation"
-msgstr ""
+msgstr "Gjør om siste angre-operasjon"
 
-#: src/global.c:543
-#, fuzzy
+#: src/global.c:550
 msgid "Go forward one character"
-msgstr "Ett tegn frem"
+msgstr "Gå tett tegn frem"
 
-#: src/global.c:544
-#, fuzzy
+#: src/global.c:551
 msgid "Go back one character"
-msgstr "Ett tegn tilbake"
+msgstr "Gå ett tegn tilbake"
 
-#: src/global.c:546
-#, fuzzy
+#: src/global.c:553
 msgid "Go forward one word"
-msgstr "Til neste ord"
+msgstr "Gå til neste ord"
 
-#: src/global.c:547
-#, fuzzy
+#: src/global.c:554
 msgid "Go back one word"
-msgstr "Til forrige ord"
+msgstr "Gå til forrige ord"
 
-#: src/global.c:549
-#, fuzzy
+#: src/global.c:556
 msgid "Go to previous line"
-msgstr "Til forrige linje"
+msgstr "Gå til forrige linje"
 
-#: src/global.c:550
-#, fuzzy
+#: src/global.c:557
 msgid "Go to next line"
-msgstr "Til neste linje"
+msgstr "Gå til neste linje"
 
-#: src/global.c:551
-#, fuzzy
+#: src/global.c:558
 msgid "Go to beginning of current line"
-msgstr "Til begynnelsen av linjen"
+msgstr "Gå til begynnelsen av linjen"
 
-#: src/global.c:552
-#, fuzzy
+#: src/global.c:559
 msgid "Go to end of current line"
-msgstr "Flytt til slutten av linjen"
+msgstr "Gå til slutten av linjen"
 
-#: src/global.c:555
-#, fuzzy
+#: src/global.c:562
 msgid "Go to beginning of paragraph; then of previous paragraph"
-msgstr "Til begynnelsen av gjeldende avsnitt"
+msgstr "Gå til begynnelsen av avsnittet, deretter forrige avsnitt"
 
-#: src/global.c:557
-#, fuzzy
+#: src/global.c:564
 msgid "Go just beyond end of paragraph; then of next paragraph"
-msgstr "Til slutten av gjeldende avsnitt"
+msgstr "Gå akkurat utenfor slutten av avsnittet, deretter neste avsnitt"
 
-#: src/global.c:560
-#, fuzzy
+#: src/global.c:566
 msgid "Go to the first line of the file"
-msgstr "Til f�rste linje i filen"
+msgstr "Gå til første linje i filen"
 
-#: src/global.c:562
-#, fuzzy
+#: src/global.c:567
 msgid "Go to the last line of the file"
-msgstr "Til siste linje i filen"
+msgstr "Gå til siste linje i filen"
 
-#: src/global.c:564
-#, fuzzy
+#: src/global.c:569
 msgid "Go to the matching bracket"
-msgstr "Til samsvarende klamme"
+msgstr "Gå til matchende brakett"
 
-#: src/global.c:566
+#: src/global.c:571
 msgid "Scroll up one line without scrolling the cursor"
-msgstr "Rull opp en linje uten � flytte mark�ren"
+msgstr "Rull opp en linje uten å flytte markøren"
 
-#: src/global.c:568
+#: src/global.c:573
 msgid "Scroll down one line without scrolling the cursor"
-msgstr "Rull ned en linje uten � flytte mark�ren"
+msgstr "Rull ned en linje uten å flytte markøren"
 
-#: src/global.c:572
+#: src/global.c:576
 msgid "Switch to the previous file buffer"
 msgstr "Bytt til forrige buffer"
 
-#: src/global.c:574
+#: src/global.c:577
 msgid "Switch to the next file buffer"
 msgstr "Bytt til neste buffer"
 
-#: src/global.c:577
+#: src/global.c:579
 msgid "Insert the next keystroke verbatim"
 msgstr "Sett inn ett og ett tegn"
 
-#: src/global.c:579
+#: src/global.c:580
 msgid "Insert a tab at the cursor position"
-msgstr "Sett inn tabulatortegn ved mark�ren"
+msgstr "Sett inn tabulatortegn ved markøren"
 
 #: src/global.c:581
 msgid "Insert a newline at the cursor position"
-msgstr "Sett inn et linjeskift ved mark�ren"
+msgstr "Sett inn et linjeskift ved markøren"
 
-#: src/global.c:583
+#: src/global.c:582
 msgid "Delete the character under the cursor"
 msgstr "Slett tegnet under peker"
 
-#: src/global.c:585
+#: src/global.c:584
 msgid "Delete the character to the left of the cursor"
 msgstr "Slett tegnet til venstre for peker"
 
-#: src/global.c:588
+#: src/global.c:587
 msgid "Cut from the cursor position to the end of the file"
-msgstr "Kutt fra mark�ren til slutten av filen"
+msgstr "Kutt fra markøren til slutten av filen"
 
-#: src/global.c:591
+#: src/global.c:590
 msgid "Justify the entire file"
 msgstr "Juster hele filen"
 
-#: src/global.c:595
+#: src/global.c:594
 msgid "Count the number of words, lines, and characters"
 msgstr "Tell antall ord, linjer og tegn"
 
-#: src/global.c:598
+#: src/global.c:597
 msgid "Refresh (redraw) the current screen"
-msgstr "Tegn skjermen p� nytt"
+msgstr "Tegn skjermen på nytt"
 
-#: src/global.c:600
+#: src/global.c:599
 msgid "Suspend the editor (if suspend is enabled)"
-msgstr ""
+msgstr "Suspender editoren (hvis suspender er aktivert)"
 
-#: src/global.c:603
+#: src/global.c:602
 msgid "Toggle the case sensitivity of the search"
-msgstr "Inverter valg for skille mellom sm� og store bokstaver i s�k"
+msgstr "Inverter valg for skille mellom små og store bokstaver i søk"
 
-#: src/global.c:605
+#: src/global.c:604
 msgid "Reverse the direction of the search"
-msgstr "Reverser s�keretning"
+msgstr "Reverser søkeretning"
 
-#: src/global.c:609
+#: src/global.c:608
 msgid "Toggle the use of regular expressions"
-msgstr "Regul�re uttrykk av/p�"
+msgstr "Regulære uttrykk av/på"
 
-#: src/global.c:613
+#: src/global.c:612
 msgid "Recall the previous search/replace string"
-msgstr "Hent tilbake forrige s�k-/erstatt tekst"
+msgstr "Hent tilbake forrige søk-/erstatt tekst"
 
-#: src/global.c:615
+#: src/global.c:614
 msgid "Recall the next search/replace string"
-msgstr "Hent tilbake neste s�k-/erstatt tekst"
+msgstr "Hent tilbake neste søk-/erstatt tekst"
 
-#: src/global.c:618
+#: src/global.c:617
 msgid "Go to file browser"
-msgstr "G� til fil-leser"
+msgstr "Gå til fil-leser"
 
-#: src/global.c:621
+#: src/global.c:620
 msgid "Toggle the use of DOS format"
-msgstr "DOS filformat av/p�"
+msgstr "DOS filformat av/på"
 
-#: src/global.c:622
+#: src/global.c:621
 msgid "Toggle the use of Mac format"
-msgstr "Mac filformat av/p�"
+msgstr "Mac filformat av/på"
 
-#: src/global.c:624
+#: src/global.c:622
 msgid "Toggle appending"
 msgstr "Inverter valg for appendering"
 
-#: src/global.c:625
+#: src/global.c:623
 msgid "Toggle prepending"
 msgstr "Inverter valg for prependering"
 
-#: src/global.c:628
+#: src/global.c:624
 msgid "Toggle backing up of the original file"
 msgstr "Inverter valg for sikkerhetskopi av orginalfil"
 
-#: src/global.c:629
+#: src/global.c:625
 msgid "Execute external command"
 msgstr "Eksekver ekstern kommando"
 
-#: src/global.c:633
+#: src/global.c:628
 msgid "Toggle the use of a new buffer"
-msgstr "Bruk nytt buffer av/p�"
+msgstr "Bruk nytt buffer av/på"
 
-#: src/global.c:636
+#: src/global.c:631
 msgid "Exit from the file browser"
-msgstr "G� ut av fil-leser"
+msgstr "Gå ut av fil-leser"
 
-#: src/global.c:638
+#: src/global.c:632
 msgid "Go to the first file in the list"
-msgstr "G� til f�rste linje i listen"
+msgstr "Gå til første linje i listen"
 
-#: src/global.c:640
+#: src/global.c:633
 msgid "Go to the last file in the list"
-msgstr "G� til siste linje i listen"
+msgstr "Gå til siste linje i listen"
 
-#: src/global.c:641
-#, fuzzy
+#: src/global.c:634
+msgid "Go to the previous file in the list"
+msgstr "Gå til forrige fil i listen"
+
+#: src/global.c:635
 msgid "Go to the next file in the list"
-msgstr "G� til siste linje i listen"
+msgstr "Gå til neste fil i listen"
+
+#: src/global.c:636
+msgid "Go to directory"
+msgstr "Gå til katalog"
+
+#: src/global.c:639
+msgid "Invoke the linter, if available"
+msgstr "Start linter, hvis tilgjengelig"
+
+#: src/global.c:640
+msgid "Go to previous linter msg"
+msgstr "Gå til forrige lintermelding"
+
+#: src/global.c:641
+msgid "Go to next linter msg"
+msgstr "Gå til neste lintermelding"
 
 #: src/global.c:642
 #, fuzzy
-msgid "Go to the previous file in the list"
-msgstr "G� til f�rste linje i listen"
+msgid "Invoke formatter, if available"
+msgstr "Start linter, hvis tilgjengelig"
 
-#: src/global.c:643
-msgid "Go to directory"
-msgstr "G� til katalog"
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:662
+msgid "Get Help"
+msgstr "Hjelp"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:670
-msgid "Close"
-msgstr "Lukk"
+#: src/global.c:665 src/prompt.c:1084
+msgid "Cancel"
+msgstr "Avbryt"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:679
-msgid "WriteOut"
+#: src/global.c:678
+msgid "Write Out"
 msgstr "Lagre"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:704
+msgid "Go To Dir"
+msgstr "Gå til katalog"
+
+#: src/global.c:719
+msgid "Cut Text"
+msgstr "Klipp ut"
+
+#: src/global.c:728
 msgid "Justify"
 msgstr "Juster"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:696
-msgid "Read File"
-msgstr "Les fil"
+#: src/global.c:733
+msgid "To Spell"
+msgstr "Staving"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:713
-msgid "Cut Text"
-msgstr "Klipp ut"
+#: src/global.c:738
+msgid "To Linter"
+msgstr "Til linter"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:718
-msgid "UnJustify"
-msgstr "Avjuster"
+#: src/global.c:740
+#, fuzzy
+msgid "Formatter"
+msgstr "DOS Format"
+
+#: src/global.c:745
+msgid "Case Sens"
+msgstr "Følsomt for store/små bokstavar"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:723
-msgid "UnCut Text"
-msgstr "Angre \"klipp ut\""
+#: src/global.c:750
+msgid "Regexp"
+msgstr "Regulært uttrykk"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:728 src/global.c:755
+#: src/global.c:755
+msgid "Backwards"
+msgstr "Bakover"
+
+#: src/global.c:762
+msgid "No Replace"
+msgstr "Ikke erstatt"
+
+#: src/global.c:770
 msgid "Cur Pos"
 msgstr "Posisjon"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:737
-msgid "To Spell"
-msgstr "Staving"
+#: src/global.c:780
+msgid "Prev Page"
+msgstr "Forrige side"
+
+#: src/global.c:782
+msgid "Next Page"
+msgstr "Neste side"
+
+#: src/global.c:785
+msgid "First Line"
+msgstr "Første linje"
+
+#: src/global.c:787
+msgid "Last Line"
+msgstr "Siste linje"
 
-#: src/global.c:771
+#: src/global.c:794
+msgid "To Bracket"
+msgstr "Til klamme"
+
+#: src/global.c:797
 msgid "Mark Text"
 msgstr "Marker tekst"
 
-#: src/global.c:777
+#: src/global.c:800
 msgid "Copy Text"
 msgstr "Kopier tekst"
 
-#: src/global.c:780
+#: src/global.c:803
 msgid "Indent Text"
-msgstr "Indenter"
+msgstr "Rykk inn tekst"
 
-#: src/global.c:783
+#: src/global.c:805
 msgid "Unindent Text"
-msgstr "Angre \"indenter\""
+msgstr "Angre «innrykk»"
 
-#: src/global.c:787
+#: src/global.c:808
 msgid "Undo"
-msgstr ""
+msgstr "Angre"
 
-#: src/global.c:790
+#: src/global.c:810
 msgid "Redo"
-msgstr ""
-
-#: src/global.c:796 src/global.c:800
-msgid "Forward"
-msgstr "Fremover"
+msgstr "Gjør om"
 
-#: src/global.c:806 src/global.c:810
+#: src/global.c:814 src/global.c:820
 msgid "Back"
 msgstr "Bakover"
 
-#: src/global.c:817
-msgid "Next Word"
-msgstr "Neste ord"
+#: src/global.c:816 src/global.c:822
+msgid "Forward"
+msgstr "Fremover"
 
-#: src/global.c:820
+#: src/global.c:827
 msgid "Prev Word"
 msgstr "Forrige ord"
 
-#: src/global.c:824
-msgid "Prev Line"
-msgstr "Forrige side"
-
-#: src/global.c:827
-msgid "Next Line"
-msgstr "Siste linje"
+#: src/global.c:829
+msgid "Next Word"
+msgstr "Neste ord"
 
-#: src/global.c:830
+#: src/global.c:833
 msgid "Home"
 msgstr "Hjem"
 
-#: src/global.c:833
+#: src/global.c:835
 msgid "End"
 msgstr "Bunn"
 
-#: src/global.c:845
-msgid "Find Other Bracket"
-msgstr "Finn den andre klammen"
+#: src/global.c:844
+msgid "Beg of Par"
+msgstr "Avsn. start"
 
-#: src/global.c:848
+#: src/global.c:846
+msgid "End of Par"
+msgstr "Avsn. slutt"
+
+#: src/global.c:851
 msgid "Scroll Up"
 msgstr "Rull opp"
 
-#: src/global.c:851
+#: src/global.c:853
 msgid "Scroll Down"
 msgstr "Rull ned"
 
-#: src/global.c:856
-msgid "Previous File"
+#: src/global.c:858
+msgid "Prev File"
 msgstr "Forrige fil"
 
-#: src/global.c:858
+#: src/global.c:860
 msgid "Next File"
 msgstr "Neste fil"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:862 src/text.c:3045
-msgid "Verbatim Input"
-msgstr "Legg inn ord for ord"
+#: src/global.c:869
+msgid "Verbatim"
+msgstr "Ordrett"
 
-#: src/global.c:867
+#: src/global.c:872
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:870
+#: src/global.c:874
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:873
+#: src/global.c:876
 msgid "Delete"
 msgstr "Slett"
 
-#: src/global.c:876
+#: src/global.c:878
 msgid "Backspace"
 msgstr "Slettetast"
 
-#: src/global.c:893
+#: src/global.c:888
 msgid "CutTillEnd"
 msgstr "Kutt Til Slutt"
 
-#: src/global.c:906
+#: src/global.c:898
 msgid "Word Count"
 msgstr "Antall ord"
 
-#: src/global.c:1367
+#: src/global.c:905
+msgid "Suspend"
+msgstr "Suspender"
+
+#: src/global.c:910
+msgid "PrevHstory"
+msgstr "ForrigeHistorie"
+
+#: src/global.c:913
+msgid "NextHstory"
+msgstr "NesteHistorie"
+
+#: src/global.c:917
+msgid "Go To Text"
+msgstr "Gå til tekst"
+
+#: src/global.c:928
+msgid "DOS Format"
+msgstr "DOS Format"
+
+#: src/global.c:931
+msgid "Mac Format"
+msgstr "Mac Format"
+
+#: src/global.c:934
+msgid "Append"
+msgstr "Legg til etter"
+
+#: src/global.c:936
+msgid "Prepend"
+msgstr "Legg til før"
+
+#: src/global.c:939
+msgid "Backup File"
+msgstr "Sikkerhetskopi"
+
+#: src/global.c:946
+msgid "Execute Command"
+msgstr "Eksekver kommando"
+
+#: src/global.c:961
+msgid "To Files"
+msgstr "Til filer"
+
+#: src/global.c:964
+msgid "First File"
+msgstr "Første fil"
+
+#: src/global.c:966
+msgid "Last File"
+msgstr "Siste fil"
+
+#: src/global.c:977
+msgid "Prev Lint Msg"
+msgstr "Forrige Lint-melding"
+
+#: src/global.c:979
+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:1227
 msgid "Help mode"
 msgstr "Hjelp-modus"
 
-#: src/global.c:1369
+#: src/global.c:1229
 msgid "Constant cursor position display"
-msgstr "L�s mark�rposisjon"
+msgstr "Lås markørposisjon"
 
-#: src/global.c:1371
+#: src/global.c:1231
 msgid "Use of one more line for editing"
 msgstr "Bruk mer plass til editering"
 
-#: src/global.c:1373
+#: src/global.c:1233
 msgid "Smooth scrolling"
 msgstr "Jevn tekstrulling"
 
-#: src/global.c:1375
+#: src/global.c:1235
+msgid "Soft wrapping of overlong lines"
+msgstr "Myk bryting av lange linjer"
+
+#: src/global.c:1237
 msgid "Whitespace display"
 msgstr "Vis usynlige tegn (mellomrom, tab, linjeskift osv.)"
 
-#: src/global.c:1377
+#: src/global.c:1239
 msgid "Color syntax highlighting"
 msgstr "Fremhev syntaks ved hjelp av farger"
 
-#: src/global.c:1379
+#: src/global.c:1241
 msgid "Smart home key"
 msgstr "Smart home tast"
 
-#: src/global.c:1381
+#: src/global.c:1243
 msgid "Auto indent"
 msgstr "Automatisk indentering"
 
-#: src/global.c:1383
+#: src/global.c:1245
 msgid "Cut to end"
 msgstr "Klipp til slutten"
 
-#: src/global.c:1385
-msgid "Long line wrapping"
-msgstr "Automatisk linjeskift"
+#: src/global.c:1247
+msgid "Hard wrapping of overlong lines"
+msgstr "Hard bryting av lange linjer"
 
-#: src/global.c:1387
+#: src/global.c:1249
 msgid "Conversion of typed tabs to spaces"
 msgstr "Konverter tabulator til mellomslag"
 
-#: src/global.c:1389
+#: src/global.c:1251
 msgid "Backup files"
 msgstr "Sikkerhetskopier"
 
-#: src/global.c:1391
+#: src/global.c:1253
 msgid "Multiple file buffers"
 msgstr "Flere filbuffere"
 
-#: src/global.c:1393
+#: src/global.c:1255
 msgid "Mouse support"
-msgstr "Musest�tte"
+msgstr "Musestøtte"
 
-#: src/global.c:1395
+#: src/global.c:1257
 msgid "No conversion from DOS/Mac format"
 msgstr "Ingen konvertering fra DOS/Mac format"
 
-#: src/global.c:1397
+#: src/global.c:1259
 msgid "Suspension"
 msgstr "Legg i bakgrunnen"
 
-#: src/global.c:1399
-#, fuzzy
-msgid "Soft line wrapping"
-msgstr "Automatisk linjeskift"
-
-#: src/help.c:236
+#: src/help.c:205
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -991,16 +1078,16 @@ msgid ""
 "prompt.  Hitting Enter without entering any text will perform the previous "
 "search.  "
 msgstr ""
-"S�kekommando hjelpetekst\n"
+"Søkekommando hjelpetekst\n"
 "\n"
-" Skriv inn ord eller tegn du �nsker � s�ke etter og trykk linjskift. Dersom "
-"s�keteksten forekommer i teksten vil skjermen oppdateres og mark�ren flyttes "
-"til den f�rste forekomsten.\n"
+" Skriv inn ord eller tegn du ønsker å søke etter og trykk linjskift. Dersom "
+"søketeksten forekommer i teksten vil skjermen oppdateres og markøren flyttes "
+"til den første forekomsten.\n"
 "\n"
-"Forrige s�ketekst vises i braketter etter s�kepromptet. Trykk linjeskift "
-"uten � skrive inn ny s�ketekst for � gjenta forrige s�k."
+"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:245
+#: src/help.c:214
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1008,12 +1095,12 @@ msgid ""
 " The following function keys are available in Search mode:\n"
 "\n"
 msgstr ""
-"Dersom du har valgt tekst med merket og s� valgt s�k og erstatt, s� vil kun "
+"Dersom du har valgt tekst med merket og så valgt søk og erstatt, så vil kun "
 "treff i den markerte teksten bli erstattet.\n"
 "\n"
-"F�lgende funksjonstaster er tilgjengelig i S�kemodus:\n"
+"Følgende funksjonstaster er tilgjengelig i Søkemodus:\n"
 
-#: src/help.c:251
+#: src/help.c:220
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1024,16 +1111,16 @@ msgid ""
 " The following function keys are available in Go To Line mode:\n"
 "\n"
 msgstr ""
-"G� Til Linje hjelpetekst\n"
+"Gå Til Linje hjelpetekst\n"
 "\n"
-"Skriv inn linjenummere du �nsker � g� til og trykk linjeskift. Dersom det er "
-"f�rre linjer enn nummeret du angav vil du flyttes til den siste linjen i "
+"Skriv inn linjenummere du ønsker å gå til og trykk linjeskift. Dersom det er "
+"færre linjer enn nummeret du angav vil du flyttes til den siste linjen i "
 "filen.\n"
 "\n"
-"F�lgende funksjonstaster er tilgjengelig i G� Til Linje modus:\n"
+"Følgende funksjonstaster er tilgjengelig i Gå Til Linje modus:\n"
 "\n"
 
-#: src/help.c:260
+#: src/help.c:229
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1047,15 +1134,15 @@ msgid ""
 msgstr ""
 "Hjelp til sett inn fil\n"
 "\n"
-"Skriv inn navnet p� filen som skal settes inn ved mark�ren i det gjeldende "
+"Skriv inn navnet på filen som skal settes inn ved markøren i det gjeldende "
 "bufferet.\n"
 "\n"
-"Dersom du har kompilert nano med st�tte for flere filbuffer, og aktivisert "
-"dette med -F eller --multibuffer kommandolinjeflagget, Meta-F av/p� bryteren "
+"Dersom du har kompilert nano med støtte for flere filbuffer, og aktivisert "
+"dette med -F eller --multibuffer kommandolinjeflagget, Meta-F av/på bryteren "
 "eller i nanorc filen vil filen som settes inn lastes i et eget buffer. Bruk "
-"Meta-< og > til � bytte mellom buffer."
+"Meta-< og > til å bytte mellom buffer."
 
-#: src/help.c:269
+#: src/help.c:238
 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"
@@ -1063,13 +1150,13 @@ msgid ""
 " The following function keys are available in Insert File mode:\n"
 "\n"
 msgstr ""
-"Dersom du trenger et nytt blankt buffer m� du enten la v�re � skrive inn noe "
-"filnavn, eller skrive inn navnet p� en fil som ikke eksisterer f�r du "
+"Dersom du trenger et nytt blankt buffer må du enten la være å skrive inn noe "
+"filnavn, eller skrive inn navnet på en fil som ikke eksisterer før du "
 "trykker Linjeskift.\n"
 "\n"
-" F�lgende funksjonstaster er tilgjengelig i Sett Inn Fil modus.\n"
+" Følgende funksjonstaster er tilgjengelig i Sett Inn Fil modus.\n"
 
-#: src/help.c:275
+#: src/help.c:244
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1086,16 +1173,16 @@ msgid ""
 msgstr ""
 "Hjelpetekst til Lagre Fil\n"
 "\n"
-"Skriv inn navnet du �nsker � lagre gjeldende fil med, og trykk linjeskift.\n"
+"Skriv inn navnet du ønsker å lagre gjeldende fil med, og trykk linjeskift.\n"
 "\n"
-"Dersom du har markert tekst i bufferet vil du f� sp�rsm�l om du kun �nsker � "
-"lagre denne delen til en egen til. For � redusere sjansen for � overskrive "
-"filen du arbeider med vil ikke det gamle filnavnet v�re forvalgt her.\n"
+"Dersom du har markert tekst i bufferet vil du få spørsmål om du kun ønsker å "
+"lagre denne delen til en egen til. For å redusere sjansen for å overskrive "
+"filen du arbeider med vil ikke det gamle filnavnet være forvalgt her.\n"
 "\n"
-"F�lgende funksjonstaster er tilgjengelig i Lagre Fil modus:\n"
+"Følgende funksjonstaster er tilgjengelig i Lagre Fil modus:\n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:258
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1112,14 +1199,14 @@ msgstr ""
 "\n"
 "Med fil-leseren kan du se igjennom katalogstrukturen og velge en fil\n"
 "for lesing eller skriving. Du kan bruke piltastene eller Page Up/Down\n"
-"for � se igjennom filer, og S eller Linjeskift for � velge den angitte\n"
-"filen eller katalogen. For � flytte deg opp et niv� velger du\n"
-"katalogen kalt \\\"..\\\" �verst i fillisten.\n"
+"for å se igjennom filer, og S eller Linjeskift for å velge den angitte\n"
+"filen eller katalogen. For å flytte deg opp et nivå velger du\n"
+"katalogen kalt «..» øverst i fillisten.\n"
 "\n"
-"F�lgende funksjonstaster er tilgjengelig i fil-leseren: \n"
+"Følgende funksjonstaster er tilgjengelig i fil-leseren: \n"
 "\n"
 
-#: src/help.c:302
+#: src/help.c:271
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1132,24 +1219,24 @@ msgid ""
 "search.\n"
 "\n"
 msgstr ""
-"S�kekommando hjelpetekst\n"
+"Søkekommando hjelpetekst\n"
 "\n"
-" Skriv inn ord eller tegn du �nsker � s�ke etter og trykk linjskift. Dersom "
-"s�keteksten forekommer i teksten vil skjermen oppdateres og mark�ren flyttes "
-"til den f�rste forekomsten.\n"
+" Skriv inn ord eller tegn du ønsker å søke etter og trykk linjskift. Dersom "
+"søketeksten forekommer i teksten vil skjermen oppdateres og markøren flyttes "
+"til den første forekomsten.\n"
 "\n"
-"Forrige s�ketekst vises i braketter etter s�kepromptet. Trykk linjeskift "
-"uten � skrive inn ny s�ketekst for � gjenta forrige s�k.\n"
+"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:311
+#: src/help.c:280
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
 msgstr ""
-"F�lgende funksjontaster er tilgjengelig i s�kemodus:\\\n"
+"Følgende funksjontaster er tilgjengelig i søkemodus:\\\n"
 "\n"
 
-#: src/help.c:315
+#: src/help.c:284
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1161,16 +1248,16 @@ msgid ""
 " The following function keys are available in Browser Go To Directory mode:\n"
 "\n"
 msgstr ""
-"G� til Dir hjelpetekst\n"
+"Gå til Dir hjelpetekst\n"
 "\n"
-"Skriv inn stien til katalogen du vil se p�.\n"
+"Skriv inn stien til katalogen du vil se på.\n"
 "\n"
 "Dersom tabulator-komplementasjon ikke er deaktivert kan du bruke tab-tasten\n"
-"til � (fors�ke �) automatisk fullf�re katalognavnet.\n"
+"til å (forsøke å) automatisk fullføre katalognavnet.\n"
 "\n"
-"F�lgende funksjonstaster er definert for G� til Dir modus:\n"
+"Følgende funksjonstaster er definert for Gå til Dir modus:\n"
 
-#: src/help.c:328
+#: src/help.c:297
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1185,17 +1272,16 @@ msgid ""
 msgstr ""
 "Stavekontroll hjelpetekts\n"
 "\n"
-"Stavekontrollen g�r igjennom all tekst i gjeldende filbuffer. N�r den kommer "
+"Stavekontrollen går igjennom all tekst i gjeldende filbuffer. Når den kommer "
 "over et ukjent ord vil dette utheves og en erstattning kan skrives inn. Den "
-"vil s� sp�rre deg om du �nsker � erstatte alle forekomster av det "
+"vil så spørre deg om du ønsker å erstatte alle forekomster av det "
 "feilstavede ordet i filen, eller om du har markert et utvalg av teksten, i "
 "den utvalgte teksten.\n"
 "\n"
-"F�lgende funksjonstaster er definert for stavekontroll modus:\n"
+"Følgende funksjonstaster er definert for stavekontroll modus:\n"
 "\n"
 
-#: src/help.c:343
-#, fuzzy
+#: src/help.c:312
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1206,18 +1292,16 @@ msgid ""
 " The following function keys are available in Execute Command mode:\n"
 "\n"
 msgstr ""
-"Hjelpetekst til Ekstern Kommando\n"
+"Hjelpetekst til Kjør Kommando\n"
 "\n"
-"Denne menyen lar deg sette resultatet (STDOUT) av kommandoer kj�rt i "
-"skallet\n"
-"inn i gjeldende filbuffer (eller i et nytt buffer i multibuffer modus). "
-"Dersom du vil ha et nytt buffer skriver du ikke inn noen kommando, bare "
-"trykk linjeskift.\n"
+"Denne modusen lar deg sette inn resultatet (STDUT) av kommandoer kjørt i "
+"skallet inn i gjeldende filbuffer (eller i en ny buffer i multibuffer-"
+"modus). Dersom du vil ha en ny buffer skriver du ikke inn noen kommando.\n"
 "\n"
-"F�lgende funksjonstaster er definert for Ekstern Kommando modus:\n"
+"Følgende funksjonstaster er definert for Kjør Kommando-modus:\n"
 "\n"
 
-#: src/help.c:356
+#: src/help.c:325
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1230,17 +1314,17 @@ msgid ""
 msgstr ""
 " Nano hjelpetekst\n"
 "\n"
-" Nano tekstredigeringsprogram er designet for � etterligne funksjonaliteten "
-"og bruksm�ten for universitetet i Washington sitt Pico-program.  Der er fire "
-"hovedomr�der i dette programmet: Den �verste linjen viser versjonsnummeret "
-"og navnet p� filen som blir redigert. Nedenfor er hovedvinduet som viser "
+" Nano tekstredigeringsprogram er designet for å etterligne funksjonaliteten "
+"og bruksmåten for universitetet i Washington sitt Pico-program.  Der er fire "
+"hovedområder i dette programmet: Den øverste linjen viser versjonsnummeret "
+"og navnet på filen som blir redigert. Nedenfor er hovedvinduet som viser "
 "filen som blir endret. Status-linja er den 3. linjen nedenfra og viser "
 "viktige meldinger. De to nederste linjene viser de vanligste snarveiene i "
 "programmet.\n"
 "\n"
 " "
 
-#: src/help.c:366
+#: src/help.c:335
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1254,12 +1338,12 @@ msgstr ""
 "programmet.\n"
 "\n"
 "Notasjonen for snarveier er: Kontroll-tast sekvenser vises her som Caret (^) "
-"symbolet. Det legges inn enten ved � bruke Kontroll-tasten, eller ved � "
+"symbolet. Det legges inn enten ved å bruke Kontroll-tasten, eller ved å "
 "trykke Escape (Esc) tasten to ganger. Escape-tast sekvenser vises som Meta "
 "(M) symbolet og kan legges inn med enten Esc, Alt eller Meta tasten, "
 "avhengig av hvordan tastaturoppsettet ditt er."
 
-#: src/help.c:375
+#: src/help.c:344
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1267,20 +1351,20 @@ msgid ""
 "keys are shown in parentheses:\n"
 "\n"
 msgstr ""
-"I tillegg kan man legge inn tegn ved � trykke Esc to ganger og s� skrive inn "
-"en tretalls desimalkode mellom 000 og 255. F�lgende kastetrykk er "
+"I tillegg kan man legge inn tegn ved å trykke Esc to ganger og så skrive inn "
+"en tretalls desimalkode mellom 000 og 255. Følgende kastetrykk er "
 "tilgjengelig i hovedvinduet. Alternative taster viss i parantes:\n"
 "\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:376 src/help.c:448
 msgid "enable/disable"
-msgstr "skru p�/av"
+msgstr "skru på/av"
 
-#: src/nano.c:587
+#: src/nano.c:601
 msgid "Key invalid in view mode"
 msgstr "Tasten er ikke gyldig i visninsmodus"
 
-#: src/nano.c:695
+#: src/nano.c:713
 #, c-format
 msgid ""
 "\n"
@@ -1289,7 +1373,7 @@ msgstr ""
 "\n"
 "Buffer lagret til %s\n"
 
-#: src/nano.c:697
+#: src/nano.c:715
 #, c-format
 msgid ""
 "\n"
@@ -1298,7 +1382,7 @@ msgstr ""
 "\n"
 "Buffer ble ikke lagret til %s: %s\n"
 
-#: src/nano.c:700
+#: src/nano.c:718
 #, c-format
 msgid ""
 "\n"
@@ -1307,11 +1391,11 @@ msgstr ""
 "\n"
 "Buffer ikkr lagret: %s\n"
 
-#: src/nano.c:723
+#: src/nano.c:743
 msgid "Window size is too small for nano...\n"
 msgstr "Vinduet er for lite for Nano...\n"
 
-#: src/nano.c:816
+#: src/nano.c:836
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
@@ -1320,252 +1404,257 @@ msgstr ""
 "Bruk: nano [valg] [[+LINJE,KOLONNE] FIL]...\n"
 "\n"
 
-#: src/nano.c:819
+#: src/nano.c:839
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Valg\t\tGNU lang brukervalg\t\tBetydning\n"
 
-#: src/nano.c:821
+#: src/nano.c:841
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Opsjon\t\tBetydning\n"
 
-#: src/nano.c:824
-msgid "Show this message"
-msgstr "Vis denne meldingen"
-
-#: src/nano.c:825
+#: src/nano.c:844
 msgid "+LINE,COLUMN"
 msgstr "+LINJE,KOLONNE"
 
-#: src/nano.c:826
+#. TRANSLATORS: The next forty or so strings are option descriptions
+#. * for the --help output.  Try to keep them at most 40 characters.
+#: src/nano.c:847
 msgid "Start at line LINE, column COLUMN"
-msgstr "Start p� linje nummer LINJE, kolonne KOLONNE"
+msgstr "Start på linje nummer LINJE, kolonne KOLONNE"
 
-#: src/nano.c:828
+#: src/nano.c:849
 msgid "Enable smart home key"
 msgstr "Aktiver smart home tast"
 
-#: src/nano.c:829
+#: src/nano.c:850
 msgid "Save backups of existing files"
 msgstr "Ta sikkerhetskopier av eksisterende filer"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "-C <dir>"
 msgstr "-C <kat>"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<kat>"
 
-#: src/nano.c:831
+#: src/nano.c:852
 msgid "Directory for saving unique backup files"
 msgstr "Katalog for lagring av unike sikkerhetskopier"
 
-#: src/nano.c:834
+#: src/nano.c:855
 msgid "Use bold instead of reverse video text"
 msgstr "Bruk fet, ikke invertert tekst"
 
-#: src/nano.c:837
+#: src/nano.c:858
 msgid "Convert typed tabs to spaces"
 msgstr "Konverter skrevne tabulatorer til mellomslag"
 
-#: src/nano.c:840
+#: src/nano.c:861
 msgid "Enable multiple file buffers"
-msgstr "Muliggj�r flere filbuffere"
+msgstr "Muliggjør flere filbuffere"
 
-#: src/nano.c:845
+#: src/nano.c:865
+msgid "Use (vim-style) lock files"
+msgstr "Bruk (vim-stil) låsefiler"
+
+#: src/nano.c:869
 msgid "Log & read search/replace string history"
-msgstr "Logg og les historie med S�k/Erstatt tekster"
+msgstr "Logg og les historie med Søk/Erstatt tekster"
 
-#: src/nano.c:848
+#: src/nano.c:873
 msgid "Don't look at nanorc files"
-msgstr "Ikke se p� nanorc filer"
+msgstr "Ikke se på nanorc filer"
 
-#: src/nano.c:851
+#: src/nano.c:876
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Fiks forvirringen rundt numerisk tastatus"
 
-#: src/nano.c:853
+#: src/nano.c:878
 msgid "Don't add newlines to the ends of files"
 msgstr "Legg ikke til linjeskift sist i filer"
 
-#: src/nano.c:856
+#: src/nano.c:881
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Ikke konverter filer fra DOS/Mac format"
 
-#: src/nano.c:858
+#: src/nano.c:883
 msgid "Use one more line for editing"
 msgstr "Bruk en ekstra linje til tekstbehandling"
 
-#: src/nano.c:860
+#: src/nano.c:886
+msgid "Log & read location of cursor position"
+msgstr "Logg og les plasseringen av markøren"
+
+#: src/nano.c:889
 msgid "-Q <str>"
 msgstr "-Q <tekst>"
 
-#: src/nano.c:860
+#: src/nano.c:889
 msgid "--quotestr=<str>"
 msgstr "--quotestr=<tekst>"
 
-#: src/nano.c:861
+#: src/nano.c:890
 msgid "Quoting string"
 msgstr "Kvoteringtekst"
 
-#: src/nano.c:863
+#: src/nano.c:892
 msgid "Restricted mode"
 msgstr "Begrenset modus"
 
-#: src/nano.c:866
+#: src/nano.c:895
 msgid "Scroll by line instead of half-screen"
-msgstr ""
+msgstr "Bla etter linje i stedet for halvskjerm"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "-T <#cols>"
 msgstr "-T <#kolonner>"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#kolonner>"
 
-#: src/nano.c:869
+#: src/nano.c:898
 msgid "Set width of a tab to #cols columns"
-msgstr "Sett bredden p� en tab til # kolonner"
+msgstr "Sett bredden på en tab til # kolonner"
 
-#: src/nano.c:871
+#: src/nano.c:900
 msgid "Do quick statusbar blanking"
 msgstr "Bruk hurtig blanking av statuslinjen"
 
-#: src/nano.c:874
+#: src/nano.c:903
 msgid "Print version information and exit"
 msgstr "Skriv versjonsnummeret og avslutt"
 
-#: src/nano.c:877
+#: src/nano.c:906
 msgid "Detect word boundaries more accurately"
-msgstr "Detekter ordskille mer n�yektig"
+msgstr "Detekter ordskille mer nøyektig"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "-Y <str>"
 msgstr "-Y <tekst>"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "--syntax=<str>"
 msgstr "--syntax=<tekst>"
 
-#: src/nano.c:881
+#: src/nano.c:910
 msgid "Syntax definition to use for coloring"
 msgstr "Syntaksdefinisjon for fargekoding"
 
-#: src/nano.c:883
+#: src/nano.c:912
 msgid "Constantly show cursor position"
-msgstr "Vis alltid mark�rposisjonen"
+msgstr "Vis alltid markørposisjonen"
 
-#: src/nano.c:885
+#: src/nano.c:914
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Fiks forvirringen rundt Backspace/Delete"
 
-#: src/nano.c:888
+#: src/nano.c:915
+msgid "Show this help text"
+msgstr "Vis denne hjelpeteksten"
+
+#: src/nano.c:918
 msgid "Automatically indent new lines"
 msgstr "Indenter nye linjer automatisk"
 
-#: src/nano.c:889
+#: src/nano.c:919
 msgid "Cut from cursor to end of line"
-msgstr "Kutt fra mark�ren til slutten av linjen"
+msgstr "Kutt fra markøren til slutten av linjen"
 
-#: src/nano.c:892
+#: src/nano.c:922
 msgid "Don't follow symbolic links, overwrite"
-msgstr "Ikke f�lg symbolske linkar, skriv over"
+msgstr "Ikke følg symbolske linkar, skriv over"
 
-#: src/nano.c:894
+#: src/nano.c:924
 msgid "Enable the use of the mouse"
-msgstr "Aktiver musst�tte"
+msgstr "Aktiver musstøtte"
 
-#: src/nano.c:897
+#: src/nano.c:926
+msgid "Do not read the file (only write it)"
+msgstr "Ikke les filen (bare skriv den)"
+
+#: src/nano.c:928
 msgid "-o <dir>"
 msgstr "-o <kat>"
 
-#: src/nano.c:897
+#: src/nano.c:928
 msgid "--operatingdir=<dir>"
 msgstr "--operatiingdir=<kat>"
 
-#: src/nano.c:898
+#: src/nano.c:929
 msgid "Set operating directory"
 msgstr "Sett gjeldende katalog"
 
-#: src/nano.c:901
+#: src/nano.c:932
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Behold XON (^Q) og XOFF (^S) tegn"
 
-#: src/nano.c:903
+#: src/nano.c:935
 msgid "Silently ignore startup issues like rc file errors"
-msgstr ""
+msgstr "Stille ignorere oppstartsproblemer som rc-filfeil"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "-r <#cols>"
 msgstr "-r <#kolonner>"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "--fill=<#cols>"
 msgstr "--fill=<#kolonner>"
 
-#: src/nano.c:906
-msgid "Set wrapping point at column #cols"
-msgstr "Sett linjebryting p� kolonne # kolonner"
+#: src/nano.c:939
+msgid "Set hard-wrapping point at column #cols"
+msgstr "Sett hard linjebryting ved kolonne # kolonner"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "-s <prog>"
 msgstr "-s <prog>"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "--speller=<prog>"
 msgstr "--speller=<prog>"
 
-#: src/nano.c:910
+#: src/nano.c:943
 msgid "Enable alternate speller"
 msgstr "Bruk alternativt program for stavekontroll"
 
-#: src/nano.c:913
+#: src/nano.c:946
 msgid "Auto save on exit, don't prompt"
-msgstr "Autolagre ved avslutning uten sp�rsm�l"
+msgstr "Autolagre ved avslutning uten spørsmål"
 
-#: src/nano.c:915
-msgid "Allow generic undo [EXPERIMENTAL]"
-msgstr ""
-
-#: src/nano.c:918
+#: src/nano.c:947
 msgid "View mode (read-only)"
 msgstr "Visninsgmodus (kun lesetilgang)"
 
-#: src/nano.c:920
-msgid "Don't wrap long lines"
-msgstr "Ikke bryt lange linjer"
+#: src/nano.c:949
+msgid "Don't hard-wrap long lines"
+msgstr "Ikke hardbryt lange linjer"
 
-#: src/nano.c:922
+#: src/nano.c:951
 msgid "Don't show the two help lines"
 msgstr "Ikke vis hjelpelinjene"
 
-#: src/nano.c:923
+#: src/nano.c:952
 msgid "Enable suspension"
 msgstr "Tillat suspendering"
 
-#: src/nano.c:924
-#, fuzzy
+#: src/nano.c:954
 msgid "Enable soft line wrapping"
-msgstr "Automatisk linjeskift"
-
-#: src/nano.c:928
-msgid "(ignored, for Pico compatibility)"
-msgstr "(ignorert, for kompatibilitet med Pico)"
+msgstr "Aktiver myk linjebryting"
 
-#: src/nano.c:938
-#, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
+#: src/nano.c:963
+#, fuzzy, c-format
+msgid " GNU nano, version %s\n"
 msgstr "GNU nano versjon %s (kompilert %s, %s)\n"
 
-#: src/nano.c:943
+#: src/nano.c:966
 #, 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:944
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1574,154 +1663,177 @@ msgstr ""
 "\n"
 " Kompilerte opsjoner:"
 
-#: src/nano.c:1022
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
-msgstr "Beklager, st�tte for denne funksjonen er deaktivert"
+msgstr "Beklager, støtte for denne funksjonen er deaktivert"
+
+#: src/nano.c:1125
+msgid "No file name"
+msgstr "Ingen filnavn"
 
-#: src/nano.c:1044
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
-msgstr "Lagre endret buffer (\"No\" VIL MISTE ENDRINGENE) ? "
+msgstr "Lagre endret buffer («NEI» VIL ØDELEGGE ENDRINGENR) ? "
 
-#: src/nano.c:1088
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
-msgstr ""
+msgstr "Kunne ikke gjenåpne standard inn fra tastaturet, beklager\n"
 
-#: src/nano.c:1114
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
-msgstr ""
+msgstr "Leser fra standard inn, ^C for å avbryte\n"
 
-#: src/nano.c:1182
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Mottok SIGHUP eller SIGTERM\n"
 
-#: src/nano.c:1204
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
-msgstr "Bruk \"fg\" for � returnere til nano\n"
+msgstr "Bruk «fg» for å returnere til nano\n"
 
-#: src/nano.c:1386
+#: src/nano.c:1481
 msgid "enabled"
-msgstr "p�"
+msgstr "på"
 
-#: src/nano.c:1387
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "av"
 
-#: src/nano.c:1548 src/winio.c:1256
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr "Ukjent kommando"
 
-#: src/nano.c:1674
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "XON ignorert, mumle mumle."
 
-#: src/nano.c:1679
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF ignorert, mumle mumle."
 
-#: src/nano.c:2209 src/rcfile.c:1100
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
-msgstr "Angitt tabulatorst�rrels \"%s\" er ugyldig"
+msgstr "Angitt tabulatorstørrelse «%s» er ugyldig"
 
-#: src/nano.c:2268 src/rcfile.c:1025
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
-msgstr "Foresl�tt fyllbredden \"%s\" er ugyldig"
+msgstr "Foreslått fyllbredde «%s» er ugyldig"
+
+#: src/nano.c:2415
+#, c-format
+msgid "Type '%s -h' for a list of available options.\n"
+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:1259
+#: src/prompt.c:1055
 msgid "Yy"
 msgstr "JjYy"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1056
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1057
 msgid "Aa"
 msgstr "Aa"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1071
 msgid "Yes"
 msgstr "Ja"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1076
 msgid "All"
 msgstr "Alle"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1081
 msgid "No"
 msgstr "Nei"
 
-#: src/rcfile.c:130
+#: src/rcfile.c:137
 #, c-format
 msgid "Error in %s on line %lu: "
-msgstr "Feil i %s p� linje %lu: "
+msgstr "Feil i %s på linje %lu: "
 
-#: src/rcfile.c:185
+#: src/rcfile.c:196
 #, c-format
 msgid "Argument '%s' has an unterminated \""
-msgstr "Atrument '%s' har uterminert \""
+msgstr "Argument '%s' har en uterminert \""
 
-#: src/rcfile.c:212 src/rcfile.c:264 src/rcfile.c:711 src/rcfile.c:768
-#: src/rcfile.c:821
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
-msgstr "Strenger med reguttrykk m� begynne med et \" tegn"
+msgstr "Strenger med reg-uttrykk må begynne med et \"-tegn"
 
-#: src/rcfile.c:238 src/search.c:62
+#: src/rcfile.c:249 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
-msgstr "Ugyldig reguttrykk \"%s\": %s"
+msgstr "Ugyldig reg-uttrykk «%s»: %s"
 
-#: src/rcfile.c:258
+#: src/rcfile.c:269
 msgid "Missing syntax name"
 msgstr "Mangler syntaksnavn"
 
-#: src/rcfile.c:316
+#: src/rcfile.c:340
 msgid "The \"none\" syntax is reserved"
-msgstr "Syntaksen \"none\" (ingen) er reservert"
+msgstr "Syntaksen «none» (ingen) er reservert"
 
-#: src/rcfile.c:323
+#: src/rcfile.c:347
 msgid "The \"default\" syntax must take no extensions"
-msgstr "Syntaksen \"default\" (forvalgt) kan ikke ta utvidelser"
+msgstr "Syntaksen «default» (forvalgt) kan ikke ta utvidelser"
 
-#: src/rcfile.c:386 src/rcfile.c:483
-#, fuzzy
+#: src/rcfile.c:433
 msgid "Missing key name"
-msgstr "Mangler syntaksnavn"
+msgstr "Mangler tastenavn"
 
-#: src/rcfile.c:398 src/rcfile.c:499
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
-msgstr ""
+#: src/rcfile.c:442 src/rcfile.c:453
+msgid "Key name is too short"
+msgstr "Tastenavnet er for kort"
 
-#: src/rcfile.c:407
-msgid "Must specify function to bind key to"
-msgstr ""
+#: src/rcfile.c:463
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
+msgstr "Tastebindinger må begynne med «^», «M», eller «F»"
 
-#: src/rcfile.c:418 src/rcfile.c:510
-msgid "Must specify menu to bind key to (or \"all\")"
-msgstr ""
+#: src/rcfile.c:472
+msgid "Must specify a function to bind the key to"
+msgstr "Må spesifisere en funksjon å binde tasten til"
 
-#: src/rcfile.c:426
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:482
+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:489
 #, c-format
-msgid "Could not map name \"%s\" to a function"
-msgstr ""
+msgid "Cannot map name \"%s\" to a function"
+msgstr "Kunne ikke tilordne navn «%s» til en funksjon"
 
-#: src/rcfile.c:432 src/rcfile.c:517
-#, fuzzy, c-format
-msgid "Could not map name \"%s\" to a menu"
-msgstr "Kunne ikke starte \"%s\""
+#: src/rcfile.c:496
+#, c-format
+msgid "Cannot map name \"%s\" to a menu"
+msgstr "Kunne ikke tilordne navn «%s» til en meny"
 
-#: src/rcfile.c:454
+#: src/rcfile.c:528
 #, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
-msgstr ""
+msgid "Function '%s' does not exist in menu '%s'"
+msgstr "Funksjon «%s» eksisterer ikke i meny «%s»"
+
+#: src/rcfile.c:543
+#, c-format
+msgid "Sorry, keystroke \"%s\" may not be rebound"
+msgstr "Beklager, tastekombinasjonen «%s» kan ikke rebindes"
 
-#: src/rcfile.c:625
+#: src/rcfile.c:629
+#, c-format
+msgid "Error expanding %s: %s"
+msgstr "Feil ved utviding %s: %s"
+
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1730,142 +1842,199 @@ msgid ""
 "\"black\", with the optional prefix \"bright\"\n"
 "for foreground colors."
 msgstr ""
-"Farge %s forst�s ikke.\n"
-"Gyldige farger er \"green\" (gr�nn), \"red\" (r�d),\n"
-"\"blue\" (bl�), \"white\" (hvit), \"yellow\" (gul),\n"
-"\"cyan\" (turkis), \"magenta\" (fiolett) og \"black\"\n"
-"(sort), med valgfritt prefiks \"bright\" (lys)\n"
-"p� forgrunnsfarver."
-
-#: src/rcfile.c:647
+"Farge %s forstås ikke.\n"
+"Gyldige farger er «green» (grønn), «red» (rød),\n"
+"«blue» (blå), «white» (hvit), «yellow» (gul),\n"
+"«cyan» (turkis), «magenta» (fiolett) og «black»\n"
+"(sort), med valgfritt prefiks «bright» (lys)\n"
+"på forgrunnsfarver."
+
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
 msgstr "Kan ikke legge til et fargedirektiv uten en syntakskommando"
 
-#: src/rcfile.c:652
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "Mangler farvenavn"
 
-#: src/rcfile.c:672
+#: src/rcfile.c:709 src/rcfile.c:870
+msgid "Missing regex string"
+msgstr "Regulært uttrykk mangler"
+
+#: src/rcfile.c:785
+msgid "\"start=\" requires a corresponding \"end=\""
+msgstr "«start=» forutsetter et korresponderende «end=»"
+
+#: src/rcfile.c:837
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
-msgstr "Bakgrunnsfargen %s kan ikke v�re lys"
+msgstr "Bakgrunnsfargen %s kan ikke være lys"
 
-#: src/rcfile.c:690 src/rcfile.c:809
-msgid "Missing regex string"
-msgstr "Regul�rt uttrykk mangler"
+#: src/rcfile.c:865
+msgid "Cannot add a header regex without a syntax command"
+msgstr "Kan ikke legge til topptekst-regex uten syntakskommando"
 
-#: src/rcfile.c:762
-msgid "\"start=\" requires a corresponding \"end=\""
-msgstr "\"start= forutsetter et korresponderende \"end=\""
+#: src/rcfile.c:921
+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:804
+#: src/rcfile.c:926
+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:990
+msgid "Missing linter command"
+msgstr "Mangler linter-kommando"
+
+#: src/rcfile.c:1010
 #, fuzzy
-msgid "Cannot add a header regex without a syntax command"
-msgstr "Kan ikke legge til et fargedirektiv uten en syntakskommando"
+msgid "Cannot add formatter without a syntax command"
+msgstr "Kan ikke legge til linter uten en syntakskommando"
+
+#: src/rcfile.c:1015
+#, fuzzy
+msgid "Missing formatter command"
+msgstr "Mangler linter-kommando"
 
-#: src/rcfile.c:874
+#: src/rcfile.c:1045
 #, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
-msgstr ""
+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:876
+#: src/rcfile.c:1047
+#, c-format
 msgid ""
-"Exiting.  Please use nano with the -I option if needed to adjust your nanorc "
-"settings\n"
+"If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
+"Hvis nødvendig, bruk nano med -I alternativ for å justere nanorc-"
+"innstillinger.\n"
 
-#: src/rcfile.c:926 src/rcfile.c:935 src/rcfile.c:945
+#: src/rcfile.c:1108
+#, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "Kunne ikke finne syntax «%s» å forlenge"
+
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
-msgstr "Kommandoen \"%s\" tillates ikke i inkludert fil"
+msgstr "Kommandoen «%s» tillates ikke i inkludert fil"
 
-#: src/rcfile.c:951 src/rcfile.c:1128
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
-msgstr "Syntaksen \"%s\" har ingen farvekommandoer"
+msgstr "Syntaksen «%s» har ingen fargekommandoer"
 
-#: src/rcfile.c:966
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
-msgstr "kommando \"%s\" ikke forst�tt"
+msgstr "kommando «%s» ikke forstått"
 
-#: src/rcfile.c:972
-msgid "Missing flag"
+#: src/rcfile.c:1186
+msgid "Missing option"
 msgstr "Mangler flagg"
 
-#: src/rcfile.c:994
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
-msgstr "Valg \"%s\" krever et argument"
+msgstr "Valg «%s» krever et argument"
 
-#: src/rcfile.c:1012
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr "Brukervalget er ikke gyldig for flerbyte strenger"
 
-#: src/rcfile.c:1038 src/rcfile.c:1066 src/rcfile.c:1075
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
-msgstr "M� ha tegn som ikke er tabulator eller mellomslag"
+msgstr "Må ha tegn som ikke er tabulator eller mellomslag"
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr "To enkelt-tegn kreves"
 
-#: src/rcfile.c:1114
+#: src/rcfile.c:1339
 #, c-format
-msgid "Cannot unset flag \"%s\""
-msgstr "Kan ikke skru av flagget \"%s\""
+msgid "Cannot unset option \"%s\""
+msgstr "Kan ikke tilbakestille flagg «%s»"
 
-#: src/rcfile.c:1123
+#: src/rcfile.c:1345
 #, c-format
-msgid "Unknown flag \"%s\""
-msgstr "Ukjent flagg \"%s\""
+msgid "Unknown option \"%s\""
+msgstr "Ukjent flagg «%s»"
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr "Finner ikke hjemmekatalogen! Buhu!"
 
+#: src/rcfile.c:1442
+#, c-format
+msgid ""
+"\n"
+"Press Enter to continue starting nano.\n"
+msgstr ""
+"\n"
+"Trykk linjeskift for å fortsette oppstarten av nano\n"
+
 #: src/search.c:96
 #, c-format
 msgid "\"%.*s%s\" not found"
-msgstr "\"%.*s%s\" ikke funnet"
+msgstr "«%.*s%s» ikke funnet"
+
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/search.c:184
+msgid " [Case Sensitive]"
+msgstr " [Ta hensyn til store/små bokstaver]"
+
+#: src/search.c:188
+msgid " [Regexp]"
+msgstr " [Regulært uttrykk]"
 
-#: src/search.c:205
+#: src/search.c:192
+msgid " [Backwards]"
+msgstr " [Bakover]"
+
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:197
 msgid " (to replace) in selection"
-msgstr " (� erstatte) i seksjon"
+msgstr " (å erstatte) i seksjon"
 
-#: src/search.c:207
+#: src/search.c:199
 msgid " (to replace)"
-msgstr " (� erstatte)"
+msgstr " (å erstatte)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "Erstatt dette tilfellet?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:945
 msgid "Replace with"
 msgstr "Erstatt med"
 
-#: src/search.c:1004
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
 msgstr[0] "Erstattet %lu tilfelle"
 msgstr[1] "Erstattet %lu tilfeller"
 
-#: src/search.c:1034
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr "Skriv linjenummer, kolonnenummer"
 
-#: src/search.c:1061
-#, fuzzy
+#: src/search.c:1054
 msgid "Invalid line or column number"
-msgstr "Skriv linjenummer, kolonnenummer"
+msgstr "Ugyldig linje eller kolonnenummer"
 
-#: src/search.c:1214
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "Ikke en klamme"
 
-#: src/search.c:1281
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "Ingen matchende klamme"
 
@@ -1877,227 +2046,326 @@ msgstr "Merke satt"
 msgid "Mark Unset"
 msgstr "Fjern merke"
 
-#: src/text.c:443
+#: src/text.c:439
 msgid "Nothing in undo buffer!"
-msgstr ""
+msgstr "Ingenting i angrebuffer!"
 
-#: src/text.c:455 src/text.c:593
+#: src/text.c:445 src/text.c:590
 #, c-format
-msgid "Internal error: can't match line %d.  Please save your work"
-msgstr ""
+msgid "Internal error: can't match line %d.  Please save your work."
+msgstr "Intern feil: kan ikke matche linje %d. Vennligst lagre arbeidet ditt"
 
-#: src/text.c:466 src/text.c:603
+#: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
-msgstr ""
+msgstr "Legg til tekst"
 
-#: src/text.c:475 src/text.c:613
-#, fuzzy
+#: src/text.c:467 src/text.c:612
 msgid "text delete"
-msgstr "Neste fil"
+msgstr "slett tekst"
 
-#: src/text.c:489 src/text.c:628
-#, fuzzy
-msgid "line wrap"
-msgstr "Automatisk linjeskift"
-
-#: src/text.c:503 src/text.c:636
+#: src/text.c:491 src/text.c:641
 msgid "line join"
-msgstr ""
+msgstr "linjesammenføy"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:505 src/text.c:657
 msgid "text cut"
-msgstr ""
+msgstr "klipp tekst"
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:510 src/text.c:661
 msgid "text uncut"
-msgstr ""
+msgstr "Angre «klipp ut»"
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:515 src/text.c:623
 msgid "line break"
-msgstr ""
+msgstr "linjeskift"
 
-#: src/text.c:532 src/text.c:665
-#, fuzzy
+#: src/text.c:528 src/text.c:672
 msgid "text insert"
-msgstr "Siste linje"
+msgstr "sett inn tekst"
 
-#: src/text.c:550 src/text.c:659
-#, fuzzy
+#: src/text.c:549 src/text.c:665
 msgid "text replace"
-msgstr " (� erstatte)"
+msgstr "erstatt tekst"
 
-#: src/text.c:557 src/text.c:671
-msgid "Internal error: unknown type.  Please save your work"
-msgstr ""
+#: src/text.c:556 src/text.c:679 src/text.c:983
+msgid "Internal error: unknown type.  Please save your work."
+msgstr "Intern feil: ukjent type. Vennligst lagre arbeidet ditt."
 
-#: src/text.c:563
+#: src/text.c:561
 #, c-format
 msgid "Undid action (%s)"
-msgstr ""
+msgstr "Angret handling (%s)"
 
-#: src/text.c:578
+#: src/text.c:580
 msgid "Nothing to re-do!"
-msgstr ""
+msgstr "Ingenting å omgjøre"
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
+#: src/text.c:584
+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:676
+#: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
-msgstr ""
+msgstr "Omgjorde handling (%s)"
 
-#: src/text.c:766
-msgid "Could not pipe"
-msgstr "Kunne ikke pipe"
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
+msgid "Could not create pipe"
+msgstr "Kunne ikke opprette pipe"
 
-#: src/text.c:793 src/text.c:2636 src/text.c:2788
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "Kunne ikke forke"
 
-#: src/text.c:941
-msgid "Internal error: can't setup uncut.  Please save your work."
+#: src/text.c:969
+msgid "Internal error: cannot set up uncut.  Please save your work."
 msgstr ""
+"Intern feil: kan ikke sette opp «angre klipp ut». Vennligst lagre arbeidet "
+"ditt."
 
-#: src/text.c:950
-msgid "Internal error: unknown type.  Please save your work."
-msgstr ""
-
-#: src/text.c:1870
+#: src/text.c:1806
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Ugyldig kvoteringstekst %s: %s"
 
-#: src/text.c:2267
+#: src/text.c:2207
 msgid "Can now UnJustify!"
-msgstr "Du kan n� avjustere!"
+msgstr "Du kan nå avjustere!"
 
-#: src/text.c:2462
+#: src/text.c:2404
 msgid "Edit a replacement"
 msgstr "Rediger erstatning"
 
-#: src/text.c:2548
-msgid "Could not create pipe"
-msgstr "Kunne ikke opprette pipe"
-
-#: src/text.c:2550
+#: src/text.c:2492
 msgid "Creating misspelled word list, please wait..."
 msgstr "Oppretter ordliste for feilstavelser, vennligst vent..."
 
-#: src/text.c:2642
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
-msgstr "Kunne ikke finne st�rrelse p� pipe buffer"
+msgstr "Kunne ikke finne størrelse på pipe buffer"
 
-#: src/text.c:2693
+#: src/text.c:2635
 msgid "Error invoking \"spell\""
-msgstr "Feil ved start av \"ispell\""
+msgstr "Feil ved start av «ispell»"
 
-#: src/text.c:2696
+#: src/text.c:2638
 msgid "Error invoking \"sort -f\""
-msgstr "Feil ved start av \"sort -f\""
+msgstr "Feil ved start av zsort -f»"
 
-#: src/text.c:2699
+#: src/text.c:2641
 msgid "Error invoking \"uniq\""
-msgstr "Feil ved start av \"uniq\""
+msgstr "Feil ved start av «uniq»"
 
-#: src/text.c:2756 src/text.c:2965
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
-msgstr "Stavekontroll fullf�rt"
+msgstr "Stavekontroll fullført"
 
-#: src/text.c:2815
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
-msgstr "Feil ved start av \"%s\""
+msgstr "Feil ved start av «%s»"
+
+#: src/text.c:2885
+msgid "Invoking spell checker, please wait"
+msgstr "Start stavesjekk, vennligst vent"
 
-#: src/text.c:2960
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Stavekontroll feilet: %s"
 
-#: src/text.c:2962
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Stavekontroll feilet: %s: %s"
 
-#: src/text.c:3030
+#: src/text.c:2937
+msgid "No linter defined for this type of file!"
+msgstr "Ingen linter definert for denne filtypen!"
+
+#: src/text.c:2947
+msgid "Save modified buffer before linting?"
+msgstr "Lagre endret buffer før linting?"
+
+#: src/text.c:2969
+msgid "Invoking linter, please wait"
+msgstr "Starter linter, vennligst vent"
+
+#: src/text.c:3125
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr "Fikk 0 maskinlesbare linjer fra kommando: %s"
+
+#: src/text.c:3159
+#, 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:3205
+msgid "At last message"
+msgstr "Ved siste melding"
+
+#: src/text.c:3210
+msgid "At first message"
+msgstr "Ved første melding"
+
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr ""
+
+#: src/text.c:3275
+msgid "Finished"
+msgstr ""
+
+#: src/text.c:3280
+#, fuzzy
+msgid "Invoking formatter, please wait"
+msgstr "Starter linter, vennligst vent"
+
+#: src/text.c:3360
+msgid "Finished formatting"
+msgstr ""
+
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sOrd: %lu Linjer: %ld Tegn: %lu"
 
-#: src/text.c:3031
+#: src/text.c:3439
 msgid "In Selection:  "
 msgstr "I seksjon:  "
 
-#: src/utils.c:405 src/utils.c:417
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3453
+msgid "Verbatim Input"
+msgstr "Legg inn ord for ord"
+
+#: src/utils.c:410 src/utils.c:422
 msgid "nano is out of memory!"
 msgstr "nano er tom for minne!"
 
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
-#: src/winio.c:1557
+#: src/winio.c:1583
 msgid "Unicode Input"
 msgstr "Unikode inndata"
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2142 src/winio.c:2146
 msgid "Modified"
 msgstr "Endret"
 
-#: src/winio.c:2150
+#: src/winio.c:2143
 msgid "View"
 msgstr "Vis"
 
-#: src/winio.c:2164
+#: src/winio.c:2157
 msgid "DIR:"
 msgstr "KAT: "
 
-#: src/winio.c:2171
+#: src/winio.c:2164
 msgid "File:"
 msgstr "Fil:"
 
-#: src/winio.c:3360
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2261
+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/winio.c:3377
 #, 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:3492
+#: src/winio.c:3507
 msgid "The nano text editor"
 msgstr "Tekstbehandleren nano"
 
-#: src/winio.c:3493
+#: src/winio.c:3508
 msgid "version"
 msgstr "versjon"
 
-#: src/winio.c:3494
+#: src/winio.c:3509
 msgid "Brought to you by:"
 msgstr "Brakt til deg av:"
 
-#: src/winio.c:3495
+#: src/winio.c:3510
 msgid "Special thanks to:"
 msgstr "Mange takk til:"
 
 # Oversette dette ?
-#: src/winio.c:3496
+#: src/winio.c:3511
 msgid "The Free Software Foundation"
-msgstr "The Free Sofware Foundation"
+msgstr "The Free Software Foundation"
+
+#: src/winio.c:3512
+msgid "the many translators and the TP"
+msgstr ""
 
-#: src/winio.c:3497
+#: src/winio.c:3513
 msgid "For ncurses:"
 msgstr "For ncurses:"
 
-#: src/winio.c:3498
+#: src/winio.c:3514
 msgid "and anyone else we forgot..."
 msgstr "og alle de andre vi glemte..."
 
-#: src/winio.c:3499
+#: src/winio.c:3515
 msgid "Thank you for using nano!"
 msgstr "Takk for at du bruker nano!"
 
+#~ msgid "Internal error: can't match line %ld.  Please save your work."
+#~ msgstr ""
+#~ "Intern feil: kan ikke matche linje %ld. Vennligst lagre arbeidet ditt"
+
+#~ msgid "line wrap"
+#~ msgstr "linjebryting"
+
+#~ msgid "Insert File"
+#~ msgstr "Sett inn fil"
+
+#~ msgid "Go to previous screen"
+#~ msgstr "Gå til forrige skjerm"
+
+#~ msgid "Find Other Bracket"
+#~ msgstr "Finn den andre klammen"
+
+#~ msgid "Long line wrapping"
+#~ msgstr "Automatisk linjeskift"
+
+#~ msgid "Soft line wrapping"
+#~ msgstr "Myk linjebryting"
+
+#~ msgid "Allow generic undo [EXPERIMENTAL]"
+#~ msgstr "Tillat generell angre [EKSPERIMENTELL]"
+
+#~ msgid "(ignored, for Pico compatibility)"
+#~ msgstr "(ignorert, for kompatibilitet med Pico)"
+
+#~ msgid "Must specify menu to bind key to (or \"all\")"
+#~ msgstr "Må spesifisere menyen å binde tasten til (eller «alt»"
+
+#~ msgid "Missing flag"
+#~ msgstr "Mangler flagg"
+
+#~ msgid "Internal error: unknown type.  Please save your work"
+#~ msgstr "Intern feil: ukjent type. Vennligst lagre arbeidet ditt"
+
+#~ msgid "Internal error: Redo setup failed.  Please save your work"
+#~ msgstr ""
+#~ "Intern feil: Gjenta oppsett mislyktes. Vennligst lagre arbeidet ditt"
+
+#~ msgid "Could not pipe"
+#~ msgstr "Kunne ikke pipe"
+
 #~ msgid "Space"
 #~ msgstr "Mellomrom"
 
 #~ msgid "Come on, be reasonable"
-#~ msgstr "Kom igjen, v�r litt samarbeidsvillig"
+#~ msgstr "Kom igjen, vær litt samarbeidsvillig"
 
 #~ msgid "Direction"
 #~ msgstr "Retning"
@@ -2106,7 +2374,7 @@ msgstr "Takk for at du bruker nano!"
 #~ msgstr "Vis hjelpemenyen"
 
 #~ msgid "Search for text within the editor"
-#~ msgstr "S�k etter tekst"
+#~ msgstr "Søk etter tekst"
 
 #~ msgid "Replace text within the editor"
 #~ msgstr "Erstatt tekst i editoren"
@@ -2115,13 +2383,13 @@ msgstr "Takk for at du bruker nano!"
 #~ msgstr "Finn andre klamme"
 
 #~ msgid "Make the current search/replace case (in)sensitive"
-#~ msgstr "Gj�r gjeldande s�k uten � ta hensyn til store/sm� bokstavar"
+#~ msgstr "Gjør gjeldande søk uten å ta hensyn til store/små bokstavar"
 
 #~ msgid "Make the current search/replace go backwards"
-#~ msgstr "Gj�r gjeldande s�k mot begynnelsen av teksten"
+#~ msgstr "Gjør gjeldande søk mot begynnelsen av teksten"
 
 #~ msgid "Prepend to the current file"
-#~ msgstr "Legg til f�rst i n�v�rende fil"
+#~ msgstr "Legg til først i nåværende fil"
 
 #~ msgid "Back up original file when saving"
 #~ msgstr "Ta sikkerhetskopi av orginalfil ved lagring"
@@ -2160,7 +2428,7 @@ msgstr "Takk for at du bruker nano!"
 #~ msgstr "Bruk mer plass til redigering"
 
 #~ msgid "Do regular expression searches"
-#~ msgstr "Tillat regul�re uttrykk i s�k"
+#~ msgstr "Tillat regulære uttrykk i søk"
 
 #~ msgid "Set fill cols to (wrap lines at) #cols"
 #~ msgstr "Bryt linjer ved posisjon #cols"
@@ -2168,8 +2436,5 @@ msgstr "Takk for at du bruker nano!"
 #~ msgid "Verbatim input"
 #~ msgstr "Legg inn ord for ord"
 
-#~ msgid "Could not create temp file: %s"
-#~ msgstr "Kunne ikke oprette midlertidig fil: %s"
-
 #~ msgid "Refusing zero-length regex match"
 #~ msgstr "Nekter null-lengde regex treff"
diff --git a/po/nl.gmo b/po/nl.gmo
index 8067d6f..ed47033 100644
--- a/po/nl.gmo
+++ b/po/nl.gmo
diff --git a/po/nl.po b/po/nl.po
index 5ac381e..31aaca4 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,125 +1,157 @@
-# Dutch translations for nano.
-# Copyright (C) 2010 Free Software Foundation, Inc.
+# Dutch translations for GNU nano.
+# Copyright (C) 2015 Free Software Foundation, Inc.
 # This file is distributed under the same license as the nano package.
 #
-# Guus Sliepen <guus@sliepen.eu.org>, 2003.
-# Reinout van Schouwen <reinout@cs.vu.nl>, 2005.
+# "Roses are red, violets are blue,
+# #NSA loves privacy rights and
+# absolutely everything about you."
+#
+# Benno Schulenberg <benno@vertaalt.nl>, 2005, 2006, 2007, 2008, 2010, 2011, 2013, 2014, 2015.
 # Erwin Poeze <erwin.poeze@gmail.com>, 2009.
-# Benno Schulenberg <benno@vertaalt.nl>, 2005, 2006, 2007, 2008, 2010.
+# Reinout van Schouwen <reinout@cs.vu.nl>, 2005.
+# Guus Sliepen <guus@sliepen.eu.org>, 2003.
 msgid ""
 msgstr ""
-"Project-Id-Version: nano-2.2.4pre2\n"
+"Project-Id-Version: nano-2.3.99pre4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-22 06:34-0500\n"
-"PO-Revision-Date: 2010-04-09 20:25+0200\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
+"PO-Revision-Date: 2015-03-19 11:06+0100\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
+"Language: nl\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: Lokalize 1.0\n"
 
-#: src/browser.c:220
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:203
 msgid "Go To Directory"
 msgstr "Naar map"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:860 src/files.c:2048
-#: src/nano.c:1060 src/search.c:220 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Geannuleerd"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:246 src/browser.c:293
 #, c-format
 msgid "Can't go outside of %s in restricted mode"
 msgstr "Kan in beperkte modus niet buiten %s gaan"
 
-#: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:722
-#: src/files.c:731 src/files.c:1540 src/files.c:1659 src/files.c:1711
-#: src/files.c:1732 src/files.c:1855 src/files.c:2691 src/rcfile.c:568
-#: src/rcfile.c:1204
+#: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
+#: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
+#: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Fout tijdens lezen van %s: %s"
 
-#: src/browser.c:303
+#: src/browser.c:283
 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:665 src/browser.c:674
+#: src/browser.c:626 src/browser.c:635
 msgid "(dir)"
 msgstr "(map)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:632
 msgid "(parent dir)"
 msgstr "(oudermap)"
 
-#: src/browser.c:801 src/search.c:185
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "Zoeken"
 
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:805 src/search.c:189
-msgid " [Case Sensitive]"
-msgstr " [Hoofdlettergevoelig]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:811 src/search.c:195
-msgid " [Regexp]"
-msgstr " [Reg.exp.]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:817 src/search.c:201
-msgid " [Backwards]"
-msgstr " [Achterwaarts]"
-
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "Rondgelopen"
 
-#: src/browser.c:1006 src/browser.c:1039 src/search.c:514 src/search.c:517
-#: src/search.c:574 src/search.c:577
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "Dit is de enige overeenkomst"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr "Nog geen zoekpatroon bekend"
 
-#: src/files.c:125
+#: src/files.c:139
+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:145
+#, c-format
+msgid "Couldn't determine hostname for lock file: %s"
+msgstr "Kan hostnaam voor vergrendelingsbestand niet bepalen: %s"
+
+#: src/files.c:165 src/files.c:175 src/files.c:212 src/files.c:222
+#, c-format
+msgid "Error writing lock file %s: %s"
+msgstr "Fout bij schrijven van vergrendelingsbestand %s: %s"
+
+#: src/files.c:237
+#, c-format
+msgid "Error deleting lock file %s: %s"
+msgstr "Fout bij verwijderen van vergrendelingsbestand %s: %s"
+
+#: src/files.c:272
+#, c-format
+msgid "Error opening lock file %s: %s"
+msgstr "Fout bij openen van vergrendelingsbestand %s: %s"
+
+#: src/files.c:282
+#, 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:297
+#, 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:308
+#, c-format
+msgid "Error writing lock file: Directory '%s' doesn't exist"
+msgstr "Fout bij schrijven van vergrendelingsbestand: map %s bestaat niet"
+
+#: src/files.c:339
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Kan bestand van buiten %s niet invoegen"
 
-#: src/files.c:234
+#: src/files.c:467
 msgid "No more open file buffers"
 msgstr "Geen andere open buffers"
 
-#: src/files.c:250
+#: src/files.c:484
 #, c-format
 msgid "Switched to %s"
 msgstr "Overgeschakeld naar %s"
 
-#: src/files.c:251 src/global.c:469 src/winio.c:2168
+#: src/files.c:485 src/global.c:953 src/winio.c:2161
 msgid "New Buffer"
 msgstr "Nieuwe buffer"
 
-#: src/files.c:633
+#: src/files.c:874
 #, 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:638
+#: src/files.c:879
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
@@ -134,14 +166,14 @@ msgstr[1] ""
 "%lu regels gelezen (omgezet uit DOS- en Mac-indeling - waarschuwing: geen "
 "schrijfrechten)"
 
-#: src/files.c:644
+#: src/files.c:885
 #, 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:648
+#: src/files.c:889
 #, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
@@ -154,14 +186,14 @@ msgstr[1] ""
 "%lu regels gelezen (omgezet uit Mac-indeling - waarschuwing: geen "
 "schrijfrechten)"
 
-#: src/files.c:654
+#: src/files.c:895
 #, 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:658
+#: src/files.c:899
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
@@ -174,805 +206,874 @@ msgstr[1] ""
 "%lu regels gelezen (omgezet uit DOS-indeling - waarschuwing: geen "
 "schrijfrechten)"
 
-#: src/files.c:664
+#: src/files.c:905
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "%lu regel gelezen"
 msgstr[1] "%lu regels gelezen"
 
-#: src/files.c:667
+#: src/files.c:908
 #, c-format
 msgid "Read %lu line ( Warning: No write permission)"
 msgid_plural "Read %lu lines (Warning: No write permission)"
 msgstr[0] "%lu regel ingelezen (waarschuwing: geen schrijfrechten)"
 msgstr[1] "%lu regels ingelezen (waarschuwing: geen schrijfrechten)"
 
-#: src/files.c:700 src/files.c:736
+#: src/files.c:943 src/files.c:980
 msgid "Reading File"
 msgstr "Inlezen van bestand"
 
-#: src/files.c:706
+#: src/files.c:950
 msgid "New File"
 msgstr "Nieuw bestand"
 
-#: src/files.c:709
+#: src/files.c:953
 #, c-format
 msgid "\"%s\" not found"
 msgstr "'%s' is niet gevonden"
 
-#: src/files.c:717 src/rcfile.c:559 src/rcfile.c:1154 src/rcfile.c:1195
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "'%s' is een map"
 
-#: src/files.c:718 src/rcfile.c:560 src/rcfile.c:1155 src/rcfile.c:1196
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "'%s' is een apparaat"
 
-#: src/files.c:817
+#: src/files.c:1060
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "In nieuwe buffer uit te voeren opdracht [vanuit %s] "
 
-#: src/files.c:819
+#: src/files.c:1062
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Uit te voeren opdracht [vanuit %s] "
 
-#: src/files.c:825
+#: src/files.c:1069
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "In nieuwe buffer in te voegen bestand [vanuit %s] "
 
-#: src/files.c:827
+#: src/files.c:1071
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "In te voegen bestand [vanuit %s] "
 
-#: src/files.c:1077
+#: src/files.c:1320
 msgid "Key invalid in non-multibuffer mode"
 msgstr "In Kijkmodus is deze toets alleen geldig in multibuffermodus"
 
-#: src/files.c:1486
+#: src/files.c:1622
+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:1746
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Kan buiten %s niets opslaan"
 
-#: src/files.c:1501
+#: src/files.c:1761
 msgid "Cannot prepend or append to a symlink with --nofollow set"
 msgstr "Kan met '--nofollow' niet aan een symbolische koppeling toevoegen"
 
-#: src/files.c:1581 src/files.c:1603 src/files.c:1621 src/files.c:1632
-#: src/files.c:1640 src/files.c:1667
+#: src/files.c:1843 src/files.c:1868 src/files.c:1886 src/files.c:1899
+#: src/files.c:1910 src/files.c:1939
 #, c-format
 msgid "Error writing backup file %s: %s"
-msgstr "Fout tijdens schrijven van tijdelijk bestand %s: %s"
+msgstr "Fout tijdens schrijven van reservekopiebestand %s: %s"
 
-#: src/files.c:1582 src/nano.c:701
+#: src/files.c:1844 src/nano.c:719
 msgid "Too many backup files?"
 msgstr "Te veel reservekopieën?"
 
-#: src/files.c:1687 src/files.c:1744 src/files.c:1763 src/files.c:1775
-#: src/files.c:1799 src/files.c:1817 src/files.c:1827 src/files.c:1863
-#: src/files.c:1868 src/files.c:2764 src/files.c:2773
+#: src/files.c:1959 src/files.c:2016 src/files.c:2035 src/files.c:2047
+#: src/files.c:2071 src/files.c:2089 src/files.c:2099 src/files.c:2135
+#: src/files.c:2140 src/files.c:3101 src/files.c:3110 src/files.c:3133
+#: src/files.c:3145
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Fout tijdens schrijven van %s: %s"
 
-#: src/files.c:1721 src/text.c:2929 src/text.c:2941
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Fout tijdens schrijven van tijdelijk bestand: %s"
 
-#: src/files.c:1900
+#: src/files.c:2173
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "%lu regel geschreven"
 msgstr[1] "%lu regels geschreven"
 
-#: src/files.c:2004
+#: src/files.c:2278
 msgid " [DOS Format]"
 msgstr " [DOS-indeling]"
 
-#: src/files.c:2005
+#: src/files.c:2279
 msgid " [Mac Format]"
 msgstr " [Mac-indeling]"
 
-#: src/files.c:2007
+#: src/files.c:2281
 msgid " [Backup]"
 msgstr " [Kopie maken]"
 
-#: src/files.c:2015
+#: src/files.c:2289
 msgid "Prepend Selection to File"
 msgstr "Selectie toevoegen vooraan bestand"
 
-#: src/files.c:2016
+#: src/files.c:2290
 msgid "Append Selection to File"
 msgstr "Selectie toevoegen achteraan bestand"
 
-#: src/files.c:2017
+#: src/files.c:2291
 msgid "Write Selection to File"
 msgstr "Selectie opslaan in bestand"
 
-#: src/files.c:2020
+#: src/files.c:2294
 msgid "File Name to Prepend to"
 msgstr "Vooraan toevoegen aan bestand"
 
-#: src/files.c:2021
+#: src/files.c:2295
 msgid "File Name to Append to"
 msgstr "Achteraan toevoegen aan bestand"
 
-#: src/files.c:2022
+#: src/files.c:2296
 msgid "File Name to Write"
 msgstr "Opslaan in bestand"
 
-#: src/files.c:2153
+#: src/files.c:2427
 msgid "File exists, OVERWRITE ? "
 msgstr "Bestand bestaat al; OVERSCHRIJVEN? "
 
-#: src/files.c:2162
+#: src/files.c:2436
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "Bestand opslaan onder een ANDERE NAAM? "
 
-#: src/files.c:2173
+#: src/files.c:2450
 msgid "File was modified since you opened it, continue saving ? "
 msgstr "Bestand is gewijzigd na opening; doorgaan met opslaan? "
 
-#: src/files.c:2611
+#: src/files.c:2882
 msgid "(more)"
 msgstr "(meer)"
 
-#: src/files.c:2694 src/rcfile.c:1220
+#: src/files.c:2974
 #, c-format
 msgid ""
 "\n"
-"Press Enter to continue starting nano.\n"
+"Press Enter to continue\n"
 msgstr ""
 "\n"
-"Druk op Enter om verder te gaan met het starten van nano.\n"
+"Druk op Enter om verder te gaan.\n"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:415 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Annuleren"
-
-#: src/global.c:416
-msgid "Replace"
-msgstr "Vervangen"
+#: src/files.c:2989
+#, c-format
+msgid ""
+"Unable to create directory %s: %s\n"
+"It is required for saving/loading search history or cursor positions.\n"
+msgstr ""
+"Kan map %s niet aanmaken: %s\n"
+"Deze is vereist voor opslaan en inlezen van zoekgeschiedenis en "
+"cursorposities.\n"
 
-#: src/global.c:417
-msgid "No Replace"
-msgstr "Zoeken"
+#: src/files.c:2995
+#, 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 ""
+"Pad %s is geen map maar moet dit zijn.\n"
+"Nano kan nu de zoekgeschiedenis en cursorposities niet opslaan noch "
+"inlezen.\n"
 
-#: src/global.c:420
-msgid "Case Sens"
-msgstr "Hfdlgevoelig"
+#: src/files.c:3012
+#, 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 ""
+"Er werd een oud nano-geschiedenisbestand gevonden (%s);\n"
+"maar bij het verplaatsen ervan naar de voorkeurslocatie (%s)\n"
+"trad er een fout op: %s"
 
-#: src/global.c:421
-msgid "Backwards"
-msgstr "Achterwaarts"
+#: src/files.c:3016
+#, 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 ""
+"Er werd een oud nano-geschiedenisbestand gevonden (%s);\n"
+"deze is nu naar de voorkeurslocatie (%s) verplaatst.\n"
+"(Zie de nano-FAQ voor uitleg over deze verandering.)"
 
-#: src/global.c:425
-msgid "Regexp"
-msgstr "Reg.exp."
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
+#: src/global.c:477
+msgid "Exit"
+msgstr "Afsluiten"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:451
-msgid "PrevHstory"
-msgstr "Vorige"
+#: src/global.c:478
+msgid "Close"
+msgstr "Sluiten"
 
-#: src/global.c:452
-msgid "NextHstory"
-msgstr "Volgende"
+#: src/global.c:479
+msgid "Uncut Text"
+msgstr "Plakken"
 
-#: src/global.c:453
-msgid "Go To Text"
-msgstr "Zoeken"
+#: src/global.c:481
+msgid "Unjustify"
+msgstr "onUitvullen"
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:455
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:485
 msgid "WhereIs Next"
 msgstr "Verderzoeken"
 
-#: src/global.c:457
-msgid "First File"
-msgstr "Naar top"
-
-#: src/global.c:458
-msgid "Last File"
-msgstr "Naar eind"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:460
-msgid "To Files"
-msgstr "Bestandenlijst"
-
-#: src/global.c:462
-msgid "DOS Format"
-msgstr "DOS-indeling"
-
-#: src/global.c:463
-msgid "Mac Format"
-msgstr "Mac-indeling"
-
-#: src/global.c:464
-msgid "Append"
-msgstr "Achtertoevoegen"
-
-#: src/global.c:465
-msgid "Prepend"
-msgstr "Voortoevoegen"
-
-#: src/global.c:466
-msgid "Backup File"
-msgstr "Reservekopie"
-
-#: src/global.c:467
-msgid "Execute Command"
-msgstr "Opdracht uitvoeren"
-
-#: src/global.c:471
-msgid "Go To Dir"
-msgstr "Naar map..."
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:480
-msgid "Get Help"
-msgstr "Hulp"
-
-#: src/global.c:481
-msgid "Exit"
-msgstr "Afsluiten"
-
-#: src/global.c:482
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:492
 msgid "Where Is"
 msgstr "Zoeken"
 
-#: src/global.c:483
-msgid "Prev Page"
-msgstr "Blad terug"
-
-#: src/global.c:484
-msgid "Next Page"
-msgstr "Blad verder"
-
-#: src/global.c:485
-msgid "First Line"
-msgstr "Naar top"
+#: src/global.c:493
+msgid "Replace"
+msgstr "Vervangen"
 
-#: src/global.c:486
-msgid "Last Line"
-msgstr "Naar eind"
+#: src/global.c:494
+msgid "Go To Line"
+msgstr "Naar regel..."
 
-#: src/global.c:487
-msgid "Suspend"
-msgstr "Pauzeren"
+#: src/global.c:495
+msgid "Prev Line"
+msgstr "Regel terug"
 
-#: src/global.c:489
-msgid "Beg of Par"
-msgstr "Beg.v.alinea"
+#: src/global.c:496
+msgid "Next Line"
+msgstr "Regel verder"
 
-#: src/global.c:490
-msgid "End of Par"
-msgstr "Eind v.alinea"
+#: src/global.c:497
+msgid "Read File"
+msgstr "Inlezen"
 
-#: src/global.c:491
+#: src/global.c:499
 msgid "FullJstify"
 msgstr "VolUitvullen"
 
-#: src/global.c:493
+#: src/global.c:501
 msgid "Refresh"
 msgstr "Verversen"
 
-#: src/global.c:495
-msgid "Insert File"
-msgstr "Bestand invoegen"
-
-#: src/global.c:497
-msgid "Go To Line"
-msgstr "Naar regel..."
-
-#: src/global.c:500
-msgid "Justify the current paragraph"
-msgstr "Huidige alinea uitvullen"
-
 #. 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:505
+#: src/global.c:507
+msgid "Justify the current paragraph"
+msgstr "huidige alinea uitvullen"
+
+#: src/global.c:509
 msgid "Cancel the current function"
-msgstr "Huidige functie annuleren"
+msgstr "huidige functie annuleren"
 
-#: src/global.c:506
+#: src/global.c:510
 msgid "Display this help text"
-msgstr "Deze hulptekst tonen"
+msgstr "deze hulptekst tonen en stoppen"
 
-#: src/global.c:509
+#: src/global.c:513
 msgid "Close the current file buffer / Exit from nano"
-msgstr "Huidige buffer sluiten / Nano afsluiten"
+msgstr "huidige buffer sluiten / nano afsluiten"
 
-#: src/global.c:511
+#: src/global.c:515
 msgid "Exit from nano"
-msgstr "Nano afsluiten"
+msgstr "nano afsluiten"
 
-#: src/global.c:515
+#: src/global.c:519
 msgid "Write the current file to disk"
-msgstr "Huidige buffer op schijf opslaan"
+msgstr "huidige buffer op schijf opslaan"
 
-#: src/global.c:517
+#: src/global.c:521
 msgid "Insert another file into the current one"
-msgstr "Een ander bestand in het huidige invoegen"
+msgstr "een ander bestand in het huidige invoegen"
 
-#: src/global.c:519
+#: src/global.c:523
 msgid "Search for a string or a regular expression"
-msgstr "Tekst zoeken"
+msgstr "tekst zoeken (of een reguliere expressie)"
 
-#: src/global.c:520
-msgid "Go to previous screen"
-msgstr "Een schermvol terugscrollen"
+#: src/global.c:526
+msgid "Search for a string"
+msgstr "deel van naam zoeken"
 
-#: src/global.c:521
-msgid "Go to next screen"
-msgstr "Een schermvol verderscrollen"
+#: src/global.c:528
+msgid "Go one screenful up"
+msgstr "een schermvol terugscrollen"
 
-#: src/global.c:523
+#: src/global.c:529
+msgid "Go one screenful down"
+msgstr "een schermvol verderscrollen"
+
+#: src/global.c:531
 msgid "Cut the current line and store it in the cutbuffer"
-msgstr "Huidige regel knippen en bewaren in knipbuffer"
+msgstr "huidige regel knippen en bewaren in knipbuffer"
 
-#: src/global.c:525
+#: src/global.c:533
 msgid "Uncut from the cutbuffer into the current line"
-msgstr "Plakken vanuit knipbuffer naar de huidige regel"
+msgstr "plakken vanuit knipbuffer naar de huidige regel"
 
-#: src/global.c:527
+#: src/global.c:534
 msgid "Display the position of the cursor"
-msgstr "Huidige cursorpositie tonen"
+msgstr "huidige cursorpositie tonen"
 
-#: src/global.c:529
+#: src/global.c:536
 msgid "Invoke the spell checker, if available"
-msgstr "Spellingscontrole oproepen (indien beschikbaar)"
+msgstr "spellingscontrole aanroepen (indien beschikbaar)"
 
-#: src/global.c:531
+#: src/global.c:538
 msgid "Replace a string or a regular expression"
-msgstr "Tekst vervangen"
+msgstr "tekst vervangen (of een reguliere expressie)"
 
-#: src/global.c:532
+#: src/global.c:539
 msgid "Go to line and column number"
-msgstr "Naar op te geven regelnummer en kolomnummer gaan"
+msgstr "naar op te geven regelnummer (en kolomnummer) gaan"
 
-#: src/global.c:534
-msgid "Mark text at the cursor position"
-msgstr "Tekst markeren vanaf huidige cursorpositie"
+#: src/global.c:541
+msgid "Mark text starting from the cursor position"
+msgstr "tekst markeren vanaf huidige cursorpositie"
 
-#: src/global.c:535
-msgid "Repeat last search"
-msgstr "Laatste zoekactie herhalen"
+#: src/global.c:542
+msgid "Repeat the last search"
+msgstr "laatste zoekactie herhalen"
 
-#: src/global.c:537
+#: src/global.c:544
 msgid "Copy the current line and store it in the cutbuffer"
-msgstr "Huidige regel kopiëren naar knipbuffer"
+msgstr "huidige regel kopiëren naar knipbuffer"
 
-#: src/global.c:538
+#: src/global.c:545
 msgid "Indent the current line"
-msgstr "Huidige regel laten inspringen"
+msgstr "huidige regel laten inspringen"
 
-#: src/global.c:539
+#: src/global.c:546
 msgid "Unindent the current line"
-msgstr "Huidige regel laten terugspringen"
+msgstr "huidige regel laten terugspringen"
 
-#: src/global.c:540
+#: src/global.c:547
 msgid "Undo the last operation"
-msgstr "De laatste bewerking ongedaan maken"
+msgstr "de laatste bewerking ongedaan maken"
 
-#: src/global.c:541
+#: src/global.c:548
 msgid "Redo the last undone operation"
-msgstr "De laatst ongedaangemaakte bewerking herdoen"
+msgstr "de laatst ongedaangemaakte bewerking herdoen"
 
-#: src/global.c:543
+#: src/global.c:550
 msgid "Go forward one character"
-msgstr "Eén teken vooruit"
+msgstr "één teken vooruit"
 
-#: src/global.c:544
+#: src/global.c:551
 msgid "Go back one character"
-msgstr "Eén teken achteruit"
+msgstr "één teken achteruit"
 
-#: src/global.c:546
+#: src/global.c:553
 msgid "Go forward one word"
-msgstr "Eén woord vooruit"
+msgstr "één woord vooruit"
 
-#: src/global.c:547
+#: src/global.c:554
 msgid "Go back one word"
-msgstr "Eén woord achteruit"
+msgstr "één woord achteruit"
 
-#: src/global.c:549
+#: src/global.c:556
 msgid "Go to previous line"
-msgstr "Naar de voorgaande regel"
+msgstr "naar de voorgaande regel"
 
-#: src/global.c:550
+#: src/global.c:557
 msgid "Go to next line"
-msgstr "Naar de volgende regel"
+msgstr "naar de volgende regel"
 
-#: src/global.c:551
+#: src/global.c:558
 msgid "Go to beginning of current line"
-msgstr "Naar het begin van de huidige regel"
+msgstr "naar het begin van de huidige regel"
 
-#: src/global.c:552
+#: src/global.c:559
 msgid "Go to end of current line"
-msgstr "Naar het eind van de huidige regel"
+msgstr "naar het eind van de huidige regel"
 
-#: src/global.c:555
+#: src/global.c:562
 msgid "Go to beginning of paragraph; then of previous paragraph"
-msgstr "Naar het begin van huidige alinea; daarna naar vorige"
+msgstr "naar het begin van huidige alinea; daarna naar vorige"
 
-#: src/global.c:557
+#: src/global.c:564
 msgid "Go just beyond end of paragraph; then of next paragraph"
-msgstr "Naar het eind van huidige alinea; daarna naar volgende"
+msgstr "naar het eind van huidige alinea; daarna naar volgende"
 
-#: src/global.c:560
+#: src/global.c:566
 msgid "Go to the first line of the file"
-msgstr "Naar de eerste regel (top) van het bestand"
+msgstr "naar de eerste regel (top) van het bestand"
 
-#: src/global.c:562
+#: src/global.c:567
 msgid "Go to the last line of the file"
-msgstr "Naar de laatste regel (eind) van het bestand"
+msgstr "naar de laatste regel (eind) van het bestand"
 
-#: src/global.c:564
+#: src/global.c:569
 msgid "Go to the matching bracket"
-msgstr "Naar bijbehorend haakje gaan"
+msgstr "naar bijbehorend haakje gaan"
 
-#: src/global.c:566
+#: src/global.c:571
 msgid "Scroll up one line without scrolling the cursor"
-msgstr "Eén regel terugscrollen (cursor niet verplaatsen)"
+msgstr "één regel terugscrollen (cursor niet verplaatsen)"
 
-#: src/global.c:568
+#: src/global.c:573
 msgid "Scroll down one line without scrolling the cursor"
-msgstr "Eén regel vooruitscrollen (cursor niet verplaatsen)"
+msgstr "één regel vooruitscrollen (cursor niet verplaatsen)"
 
-#: src/global.c:572
+#: src/global.c:576
 msgid "Switch to the previous file buffer"
-msgstr "Naar voorgaande bestandsbuffer schakelen"
+msgstr "overschakelen naar voorgaande bestandsbuffer"
 
-#: src/global.c:574
+#: src/global.c:577
 msgid "Switch to the next file buffer"
-msgstr "Naar volgende bestandsbuffer schakelen"
+msgstr "overschakelen naar volgende bestandsbuffer"
 
-#: src/global.c:577
+#: src/global.c:579
 msgid "Insert the next keystroke verbatim"
-msgstr "Eerstvolgende toetsaanslag verbatim invoegen"
+msgstr "eerstvolgende toetsaanslag verbatim invoegen"
 
-#: src/global.c:579
+#: src/global.c:580
 msgid "Insert a tab at the cursor position"
-msgstr "Een tab invoegen op de cursorpositie"
+msgstr "een tab invoegen op de cursorpositie"
 
 #: src/global.c:581
 msgid "Insert a newline at the cursor position"
-msgstr "Een regeleinde invoegen op de cursorpositie"
+msgstr "een regeleinde invoegen op de cursorpositie"
 
-#: src/global.c:583
+#: src/global.c:582
 msgid "Delete the character under the cursor"
-msgstr "Het teken onder de cursor verwijderen"
+msgstr "het teken onder de cursor verwijderen"
 
-#: src/global.c:585
+#: src/global.c:584
 msgid "Delete the character to the left of the cursor"
-msgstr "Het teken links van de cursor verwijderen"
+msgstr "het teken links van de cursor verwijderen"
 
-#: src/global.c:588
+#: src/global.c:587
 msgid "Cut from the cursor position to the end of the file"
-msgstr "De hele rest van het bestand knippen (vanaf de cursor)"
+msgstr "de hele rest van het bestand knippen (vanaf de cursor)"
 
-#: src/global.c:591
+#: src/global.c:590
 msgid "Justify the entire file"
-msgstr "Het gehele bestand uitvullen"
+msgstr "het gehele bestand uitvullen"
 
-#: src/global.c:595
+#: src/global.c:594
 msgid "Count the number of words, lines, and characters"
-msgstr "Aantal woorden, regels en tekens in het bestand tellen"
+msgstr "aantal woorden, regels en tekens in het bestand tellen"
 
-#: src/global.c:598
+#: src/global.c:597
 msgid "Refresh (redraw) the current screen"
-msgstr "Het scherm verversen (opnieuw tekenen)"
+msgstr "het scherm verversen (opnieuw tekenen)"
 
-#: src/global.c:600
+#: src/global.c:599
 msgid "Suspend the editor (if suspend is enabled)"
-msgstr "De editor laten pauzeren (indien ingeschakeld)"
+msgstr "de editor laten pauzeren (indien ingeschakeld)"
 
-#: src/global.c:603
+#: src/global.c:602
 msgid "Toggle the case sensitivity of the search"
-msgstr "Hoofdlettergevoeligheid aan-/uitzetten"
+msgstr "hoofdlettergevoeligheid aan-/uitzetten"
 
-#: src/global.c:605
+#: src/global.c:604
 msgid "Reverse the direction of the search"
-msgstr "De zoekrichting omdraaien"
+msgstr "de zoekrichting omdraaien"
 
-#: src/global.c:609
+#: src/global.c:608
 msgid "Toggle the use of regular expressions"
-msgstr "Gebruik van reguliere expressies aan-/uitzetten"
+msgstr "gebruik van reguliere expressies aan-/uitzetten"
 
-#: src/global.c:613
+#: src/global.c:612
 msgid "Recall the previous search/replace string"
-msgstr "Vorige zoek-/vervangtekst oproepen"
+msgstr "eerdere zoek-/vervangtekst oproepen"
 
-#: src/global.c:615
+#: src/global.c:614
 msgid "Recall the next search/replace string"
-msgstr "Volgende zoek-/vervangtekst oproepen"
+msgstr "latere zoek-/vervangtekst oproepen"
 
-#: src/global.c:618
+#: src/global.c:617
 msgid "Go to file browser"
-msgstr "Bestandenlijst oproepen"
+msgstr "bestandenlijst oproepen"
 
-#: src/global.c:621
+#: src/global.c:620
 msgid "Toggle the use of DOS format"
 msgstr "DOS-indeling aan-/uitzetten"
 
-#: src/global.c:622
+#: src/global.c:621
 msgid "Toggle the use of Mac format"
 msgstr "Mac-indeling aan-/uitzetten"
 
-#: src/global.c:624
+#: src/global.c:622
 msgid "Toggle appending"
-msgstr "Achteraantoevoegen aan-/uitzetten"
+msgstr "achteraantoevoegen aan-/uitzetten"
 
-#: src/global.c:625
+#: src/global.c:623
 msgid "Toggle prepending"
-msgstr "Vooraantoevoegen aan-/uitzetten"
+msgstr "vooraantoevoegen aan-/uitzetten"
 
-#: src/global.c:628
+#: src/global.c:624
 msgid "Toggle backing up of the original file"
-msgstr "Maken van reservekopieën aan-/uitzetten"
+msgstr "maken van reservekopieën aan-/uitzetten"
 
-#: src/global.c:629
+#: src/global.c:625
 msgid "Execute external command"
-msgstr "Externe opdracht uitvoeren"
+msgstr "externe opdracht uitvoeren"
 
-#: src/global.c:633
+#: src/global.c:628
 msgid "Toggle the use of a new buffer"
-msgstr "Gebruik van een nieuwe buffer aan-/uitzetten"
+msgstr "gebruik van een nieuwe buffer aan-/uitzetten"
 
-#: src/global.c:636
+#: src/global.c:631
 msgid "Exit from the file browser"
-msgstr "Bestandenlijst verlaten"
+msgstr "bestandenlijst verlaten"
 
-#: src/global.c:638
+#: src/global.c:632
 msgid "Go to the first file in the list"
-msgstr "Naar het eerste bestand in de lijst gaan"
+msgstr "naar het eerste bestand in de lijst gaan"
 
-#: src/global.c:640
+#: src/global.c:633
 msgid "Go to the last file in the list"
-msgstr "Naar het laatste bestand in de lijst gaan"
+msgstr "naar het laatste bestand in de lijst gaan"
 
-#: src/global.c:641
+#: src/global.c:634
+msgid "Go to the previous file in the list"
+msgstr "naar het vorige bestand in de lijst gaan"
+
+#: src/global.c:635
 msgid "Go to the next file in the list"
-msgstr "Naar het volgende bestand in de lijst gaan"
+msgstr "naar het volgende bestand in de lijst gaan"
+
+#: src/global.c:636
+msgid "Go to directory"
+msgstr "naar een op te geven map gaan"
+
+#: src/global.c:639
+msgid "Invoke the linter, if available"
+msgstr "een linter aanroepen (syntaxcontrole, indien beschikbaar)"
+
+#: src/global.c:640
+msgid "Go to previous linter msg"
+msgstr "naar de voorgaande lintermelding springen"
+
+#: src/global.c:641
+msgid "Go to next linter msg"
+msgstr "naar de volgende lintermelding springen"
 
 #: src/global.c:642
-msgid "Go to the previous file in the list"
-msgstr "Naar het vorige bestand in de lijst gaan"
+msgid "Invoke formatter, if available"
+msgstr "een opmaakprogramma aanroepen (indien beschikbaar)"
 
-#: src/global.c:643
-msgid "Go to directory"
-msgstr "Naar een op te geven map gaan"
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:662
+msgid "Get Help"
+msgstr "Hulp"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:670
-msgid "Close"
-msgstr "Sluiten"
+#: src/global.c:665 src/prompt.c:1084
+msgid "Cancel"
+msgstr "Annuleren"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:679
-msgid "WriteOut"
+#: src/global.c:678
+msgid "Write Out"
 msgstr "Opslaan"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:704
+msgid "Go To Dir"
+msgstr "Naar map..."
+
+#: src/global.c:719
+msgid "Cut Text"
+msgstr "Knippen"
+
+#: src/global.c:728
 msgid "Justify"
 msgstr "Uitvullen"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:696
-msgid "Read File"
-msgstr "Inlezen"
+#: src/global.c:733
+msgid "To Spell"
+msgstr "Spelling"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:713
-msgid "Cut Text"
-msgstr "Knippen"
+#: src/global.c:738
+msgid "To Linter"
+msgstr "Linter"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:718
-msgid "UnJustify"
-msgstr "onUitvullen"
+#: src/global.c:740
+msgid "Formatter"
+msgstr "Opmaker"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:723
-msgid "UnCut Text"
-msgstr "Plakken"
+#: src/global.c:745
+msgid "Case Sens"
+msgstr "Hfdlgevoelig"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:728 src/global.c:755
+#: src/global.c:750
+msgid "Regexp"
+msgstr "Reg.exp."
+
+#: src/global.c:755
+msgid "Backwards"
+msgstr "Achterwaarts"
+
+#: src/global.c:762
+msgid "No Replace"
+msgstr "Zoeken"
+
+#: src/global.c:770
 msgid "Cur Pos"
 msgstr "Positie"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:737
-msgid "To Spell"
-msgstr "Spelling"
+#: src/global.c:780
+msgid "Prev Page"
+msgstr "Blad terug"
+
+#: src/global.c:782
+msgid "Next Page"
+msgstr "Blad verder"
+
+#: src/global.c:785
+msgid "First Line"
+msgstr "Naar top"
 
-#: src/global.c:771
+#: src/global.c:787
+msgid "Last Line"
+msgstr "Naar eind"
+
+#: src/global.c:794
+msgid "To Bracket"
+msgstr "Naar haakje"
+
+#: src/global.c:797
 msgid "Mark Text"
 msgstr "Markeren"
 
-#: src/global.c:777
+#: src/global.c:800
 msgid "Copy Text"
 msgstr "Kopiëren"
 
-#: src/global.c:780
+#: src/global.c:803
 msgid "Indent Text"
 msgstr "Inspringen"
 
-#: src/global.c:783
+#: src/global.c:805
 msgid "Unindent Text"
 msgstr "Terugspringen"
 
-#: src/global.c:787
+#: src/global.c:808
 msgid "Undo"
 msgstr "Ongedaan maken"
 
-#: src/global.c:790
+#: src/global.c:810
 msgid "Redo"
 msgstr "Herdoen"
 
-#: src/global.c:796 src/global.c:800
-msgid "Forward"
-msgstr "Vooruit"
-
-#: src/global.c:806 src/global.c:810
+#: src/global.c:814 src/global.c:820
 msgid "Back"
 msgstr "Terug"
 
-#: src/global.c:817
-msgid "Next Word"
-msgstr "Woord verder"
+#: src/global.c:816 src/global.c:822
+msgid "Forward"
+msgstr "Vooruit"
 
-#: src/global.c:820
+#: src/global.c:827
 msgid "Prev Word"
 msgstr "Woord terug"
 
-#: src/global.c:824
-msgid "Prev Line"
-msgstr "Regel terug"
-
-#: src/global.c:827
-msgid "Next Line"
-msgstr "Regel verder"
+#: src/global.c:829
+msgid "Next Word"
+msgstr "Woord verder"
 
-#: src/global.c:830
+#: src/global.c:833
 msgid "Home"
 msgstr "Begin"
 
-#: src/global.c:833
+#: src/global.c:835
 msgid "End"
 msgstr "Eind"
 
-#: src/global.c:845
-msgid "Find Other Bracket"
-msgstr "Naar bijbehorend haakje"
+#: src/global.c:844
+msgid "Beg of Par"
+msgstr "Beg.v.alinea"
+
+#: src/global.c:846
+msgid "End of Par"
+msgstr "Eind v.alinea"
 
-#: src/global.c:848
+#: src/global.c:851
 msgid "Scroll Up"
 msgstr "Omhoog scrollen"
 
-#: src/global.c:851
+#: src/global.c:853
 msgid "Scroll Down"
 msgstr "Omlaag scrollen"
 
-#: src/global.c:856
-msgid "Previous File"
+#: src/global.c:858
+msgid "Prev File"
 msgstr "Vorig bestand"
 
-#: src/global.c:858
+#: src/global.c:860
 msgid "Next File"
 msgstr "Volgend bestand"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:862 src/text.c:3045
-msgid "Verbatim Input"
-msgstr "Verbatim invoer"
+#: src/global.c:869
+msgid "Verbatim"
+msgstr "Verbatim"
 
-#: src/global.c:867
+#: src/global.c:872
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:870
+#: src/global.c:874
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:873
+#: src/global.c:876
 msgid "Delete"
-msgstr "Verwijderen"
+msgstr "Delete"
 
-#: src/global.c:876
+#: src/global.c:878
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/global.c:893
+#: src/global.c:888
 msgid "CutTillEnd"
 msgstr "RestKnippen"
 
-#: src/global.c:906
+#: src/global.c:898
 msgid "Word Count"
 msgstr "Woordentelling"
 
-#: src/global.c:1367
+#: src/global.c:905
+msgid "Suspend"
+msgstr "Pauzeren"
+
+#: src/global.c:910
+msgid "PrevHstory"
+msgstr "Eerdere"
+
+#: src/global.c:913
+msgid "NextHstory"
+msgstr "Latere"
+
+#: src/global.c:917
+msgid "Go To Text"
+msgstr "Zoeken"
+
+#: src/global.c:928
+msgid "DOS Format"
+msgstr "DOS-indeling"
+
+#: src/global.c:931
+msgid "Mac Format"
+msgstr "Mac-indeling"
+
+#: src/global.c:934
+msgid "Append"
+msgstr "Achtertoevoegen"
+
+#: src/global.c:936
+msgid "Prepend"
+msgstr "Voortoevoegen"
+
+#: src/global.c:939
+msgid "Backup File"
+msgstr "Reservekopie"
+
+#: src/global.c:946
+msgid "Execute Command"
+msgstr "Opdracht uitvoeren"
+
+#: src/global.c:961
+msgid "To Files"
+msgstr "Bestandenlijst"
+
+#: src/global.c:964
+msgid "First File"
+msgstr "Naar top"
+
+#: src/global.c:966
+msgid "Last File"
+msgstr "Naar eind"
+
+#: src/global.c:977
+msgid "Prev Lint Msg"
+msgstr "Vorige Lint"
+
+#: src/global.c:979
+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:1227
 msgid "Help mode"
 msgstr "Hulpregels"
 
-#: src/global.c:1369
+#: src/global.c:1229
 msgid "Constant cursor position display"
 msgstr "Voortdurende cursorpositieweergave"
 
-#: src/global.c:1371
+#: src/global.c:1231
 msgid "Use of one more line for editing"
 msgstr "Extra regel voor bewerkingsvenster"
 
-#: src/global.c:1373
+#: src/global.c:1233
 msgid "Smooth scrolling"
 msgstr "Per regel scrollen"
 
-#: src/global.c:1375
+#: src/global.c:1235
+msgid "Soft wrapping of overlong lines"
+msgstr "Zachte terugloop van te lange regels"
+
+#: src/global.c:1237
 msgid "Whitespace display"
 msgstr "Weergave van witruimte"
 
-#: src/global.c:1377
+#: src/global.c:1239
 msgid "Color syntax highlighting"
 msgstr "Syntaxaanduiding met kleuren"
 
-#: src/global.c:1379
+#: src/global.c:1241
 msgid "Smart home key"
 msgstr "Slimme Home-toets"
 
-#: src/global.c:1381
+#: src/global.c:1243
 msgid "Auto indent"
 msgstr "Automatisch inspringen"
 
-#: src/global.c:1383
+#: src/global.c:1245
 msgid "Cut to end"
-msgstr "Knippen vanaf cursor"
+msgstr "Knippen vanaf cursor tot regeleinde"
 
-#: src/global.c:1385
-msgid "Long line wrapping"
-msgstr "Terugloop van lange regels"
+#: src/global.c:1247
+msgid "Hard wrapping of overlong lines"
+msgstr "Afbreking van lange regels"
 
-#: src/global.c:1387
+#: src/global.c:1249
 msgid "Conversion of typed tabs to spaces"
 msgstr "Omzetting van getypte tabs naar spaties"
 
-#: src/global.c:1389
+#: src/global.c:1251
 msgid "Backup files"
 msgstr "Reservekopieën maken"
 
-#: src/global.c:1391
+#: src/global.c:1253
 msgid "Multiple file buffers"
 msgstr "Meerdere bestandsbuffers"
 
-#: src/global.c:1393
+#: src/global.c:1255
 msgid "Mouse support"
 msgstr "Muisondersteuning"
 
-#: src/global.c:1395
+#: src/global.c:1257
 msgid "No conversion from DOS/Mac format"
 msgstr "Geen omzetting uit DOS/Mac-indeling"
 
-#: src/global.c:1397
+#: src/global.c:1259
 msgid "Suspension"
 msgstr "Proces-pauzering"
 
-#: src/global.c:1399
-msgid "Soft line wrapping"
-msgstr "Zachte terugloop van lange regels"
-
-#: src/help.c:236
+#: src/help.c:205
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -994,7 +1095,7 @@ msgstr ""
 "getoond: op Enter drukken zonder tekst in te voeren herhaalt deze vorige "
 "zoekopdracht.  "
 
-#: src/help.c:245
+#: src/help.c:214
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1008,7 +1109,7 @@ msgstr ""
 " De volgende toetsen zijn beschikbaar in 'Zoek/vervang'-modus:\n"
 "\n"
 
-#: src/help.c:251
+#: src/help.c:220
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1028,7 +1129,7 @@ msgstr ""
 " De volgende toetsen zijn beschikbaar in 'Naar regel'-modus:\n"
 "\n"
 
-#: src/help.c:260
+#: src/help.c:229
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1051,7 +1152,7 @@ msgstr ""
 "aparte buffer geladen.  Gebruik dan Meta-< en > om tussen bestandsbuffers te "
 "schakelen.  "
 
-#: src/help.c:269
+#: src/help.c:238
 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"
@@ -1065,7 +1166,7 @@ msgstr ""
 " De volgende toetsen zijn beschikbaar in 'Bestand invoegen'-modus:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:244
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1093,7 +1194,7 @@ msgstr ""
 " De volgende toetsen zijn beschikbaar in 'Bestand opslaan'-modus:\n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:258
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1118,7 +1219,7 @@ msgstr ""
 " De volgende toetsen zijn beschikbaar in 'Bestandenlijst'-modus:\n"
 "\n"
 
-#: src/help.c:302
+#: src/help.c:271
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1142,7 +1243,7 @@ msgstr ""
 "zoekopdracht.\n"
 "\n"
 
-#: src/help.c:311
+#: src/help.c:280
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1150,7 +1251,7 @@ msgstr ""
 " De volgende toetsen zijn beschikbaar in 'Bestand zoeken'-modus:\n"
 "\n"
 
-#: src/help.c:315
+#: src/help.c:284
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1172,7 +1273,7 @@ msgstr ""
 " De volgende toetsen zijn beschikbaar in 'Naar map'-modus:\n"
 "\n"
 
-#: src/help.c:328
+#: src/help.c:297
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1197,7 +1298,7 @@ msgstr ""
 " De volgende toetsen zijn beschikbaar in 'Spellingscontrole'-modus:\n"
 "\n"
 
-#: src/help.c:343
+#: src/help.c:312
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1217,7 +1318,7 @@ msgstr ""
 " De volgende toetsen zijn beschikbaar in 'Externe opdracht'-modus:\n"
 "\n"
 
-#: src/help.c:356
+#: src/help.c:325
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1238,7 +1339,7 @@ msgstr ""
 "wordt.  De derde regel van onderen is de statusregel en toont belangrijke "
 "berichten.  "
 
-#: src/help.c:366
+#: src/help.c:335
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1257,7 +1358,7 @@ msgstr ""
 "worden ingevoerd met Esc of Alt of Meta, afhankelijk van uw "
 "toetsenbordinstelling.  "
 
-#: src/help.c:375
+#: src/help.c:344
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1272,15 +1373,15 @@ msgstr ""
 "(alternatieve toetscombinaties staan tussen haakjes):\n"
 "\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:376 src/help.c:448
 msgid "enable/disable"
 msgstr "aan-/uitzetten"
 
-#: src/nano.c:587
+#: src/nano.c:601
 msgid "Key invalid in view mode"
 msgstr "Toets is ongeldig in Kijkmodus"
 
-#: src/nano.c:695
+#: src/nano.c:713
 #, c-format
 msgid ""
 "\n"
@@ -1289,7 +1390,7 @@ msgstr ""
 "\n"
 "Buffer is geschreven naar %s\n"
 
-#: src/nano.c:697
+#: src/nano.c:715
 #, c-format
 msgid ""
 "\n"
@@ -1298,7 +1399,7 @@ msgstr ""
 "\n"
 "Buffer is niet geschreven naar %s: %s\n"
 
-#: src/nano.c:700
+#: src/nano.c:718
 #, c-format
 msgid ""
 "\n"
@@ -1307,11 +1408,11 @@ msgstr ""
 "\n"
 "Buffer is niet geschreven: %s\n"
 
-#: src/nano.c:723
+#: src/nano.c:743
 msgid "Window size is too small for nano...\n"
 msgstr "Schermformaat is te klein voor nano...\n"
 
-#: src/nano.c:816
+#: src/nano.c:836
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
@@ -1320,253 +1421,259 @@ msgstr ""
 "Gebruik:  nano [OPTIES] [[+REGEL[,KOLOM]] BESTAND]...\n"
 "\n"
 
-#: src/nano.c:819
+#: src/nano.c:839
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Optie\t\tLange optie\t\t  Betekenis\n"
 
-#: src/nano.c:821
+#: src/nano.c:841
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Optie\t\t  Betekenis\n"
 
-#: src/nano.c:824
-msgid "Show this message"
-msgstr "deze hulptekst tonen en stoppen"
-
-#: src/nano.c:825
+#: src/nano.c:844
 msgid "+LINE,COLUMN"
 msgstr "+REGEL[,KOLOM]"
 
-#: src/nano.c:826
+#. TRANSLATORS: The next forty or so strings are option descriptions
+#. * for the --help output.  Try to keep them at most 40 characters.
+#: src/nano.c:847
 msgid "Start at line LINE, column COLUMN"
 msgstr "op deze regel (en deze kolom) beginnen"
 
-#: src/nano.c:828
+#: src/nano.c:849
 msgid "Enable smart home key"
 msgstr "slimme Home-toets inschakelen"
 
-#: src/nano.c:829
+#: src/nano.c:850
 msgid "Save backups of existing files"
 msgstr "van bestaand bestand reservekopie maken"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "-C <dir>"
 msgstr "-C <map>"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<map>"
 
-#: src/nano.c:831
+#: src/nano.c:852
 msgid "Directory for saving unique backup files"
 msgstr "map voor opslaan van reservekopieën"
 
-#: src/nano.c:834
+#: src/nano.c:855
 msgid "Use bold instead of reverse video text"
 msgstr "vet in plaats van invers gebruiken"
 
-#: src/nano.c:837
+#: src/nano.c:858
 msgid "Convert typed tabs to spaces"
 msgstr "getypte tabs omzetten naar spaties"
 
-#: src/nano.c:840
+#: src/nano.c:861
 msgid "Enable multiple file buffers"
 msgstr "meerdere bestandsbuffers aanzetten"
 
-#: src/nano.c:845
+#: src/nano.c:865
+msgid "Use (vim-style) lock files"
+msgstr "vergrendelingsbestanden gebruiken (à la vim)"
+
+#: src/nano.c:869
 msgid "Log & read search/replace string history"
 msgstr "zoek/vervangteksten bewaren en gebruiken"
 
-#: src/nano.c:848
+#: src/nano.c:873
 msgid "Don't look at nanorc files"
 msgstr "eventuele nanorc-bestanden negeren"
 
-#: src/nano.c:851
+#: src/nano.c:876
 msgid "Fix numeric keypad key confusion problem"
 msgstr "toetsverwarring numeriek bordje oplossen"
 
-#: src/nano.c:853
+#: src/nano.c:878
 msgid "Don't add newlines to the ends of files"
 msgstr "geen regeleindeteken toevoegen aan slot"
 
-#: src/nano.c:856
+#: src/nano.c:881
 msgid "Don't convert files from DOS/Mac format"
 msgstr "bestand niet omzetten uit DOS/Mac-opmaak"
 
-#: src/nano.c:858
+#: src/nano.c:883
 msgid "Use one more line for editing"
 msgstr "bewerkingsvenster een beetje vergroten"
 
-#: src/nano.c:860
+#: src/nano.c:886
+msgid "Log & read location of cursor position"
+msgstr "cursorpositie opslaan en later herstellen"
+
+#: src/nano.c:889
 msgid "-Q <str>"
 msgstr "-Q <tekens>"
 
-#: src/nano.c:860
+#: src/nano.c:889
 msgid "--quotestr=<str>"
 msgstr "--quotestr=<tekens>"
 
-#: src/nano.c:861
+#: src/nano.c:890
 msgid "Quoting string"
 msgstr "te herkennen aanhaaltekens"
 
-#: src/nano.c:863
+#: src/nano.c:892
 msgid "Restricted mode"
 msgstr "beperkte modus"
 
-#: src/nano.c:866
+#: src/nano.c:895
 msgid "Scroll by line instead of half-screen"
 msgstr "per regel scrollen i.p.v. half scherm"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "-T <#cols>"
-msgstr "-T <#kolommen>"
+msgstr "-T <getal>"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "--tabsize=<#cols>"
-msgstr "--tabsize=<#kolommen>"
+msgstr "--tabsize=<getal>"
 
-#: src/nano.c:869
+#: src/nano.c:898
 msgid "Set width of a tab to #cols columns"
 msgstr "te gebruiken tabbreedte"
 
-#: src/nano.c:871
+#: src/nano.c:900
 msgid "Do quick statusbar blanking"
 msgstr "de statusregel snel wissen"
 
-#: src/nano.c:874
+#: src/nano.c:903
 msgid "Print version information and exit"
 msgstr "programmaversie tonen en stoppen"
 
-#: src/nano.c:877
+#: src/nano.c:906
 msgid "Detect word boundaries more accurately"
 msgstr "woordgrenzen nauwkeuriger bepalen"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "-Y <str>"
 msgstr "-Y <naam>"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "--syntax=<str>"
 msgstr "--syntax=<naam>"
 
-#: src/nano.c:881
+#: src/nano.c:910
 msgid "Syntax definition to use for coloring"
 msgstr "te gebruiken syntax (voor kleuring)"
 
-#: src/nano.c:883
+#: src/nano.c:912
 msgid "Constantly show cursor position"
 msgstr "cursorpositie voortdurend tonen"
 
-#: src/nano.c:885
+#: src/nano.c:914
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Backspace/Delete-verwarring oplossen"
 
-#: src/nano.c:888
+#: src/nano.c:915
+msgid "Show this help text"
+msgstr "deze hulptekst tonen en stoppen"
+
+#: src/nano.c:918
 msgid "Automatically indent new lines"
 msgstr "automatisch inspringen van nieuwe regels"
 
-#: src/nano.c:889
+#: src/nano.c:919
 msgid "Cut from cursor to end of line"
-msgstr "^K knipt vanaf cursor i.p.v. hele regel"
+msgstr "vanaf cursor knippen i.p.v. hele regel"
 
-#: src/nano.c:892
+#: src/nano.c:922
 msgid "Don't follow symbolic links, overwrite"
 msgstr "symbolische koppelingen overschrijven"
 
-#: src/nano.c:894
+#: src/nano.c:924
 msgid "Enable the use of the mouse"
 msgstr "gebruik van de muis mogelijk maken"
 
-#: src/nano.c:897
+#: src/nano.c:926
+msgid "Do not read the file (only write it)"
+msgstr "bestand niet lezen (alleen schrijven)"
+
+#: src/nano.c:928
 msgid "-o <dir>"
 msgstr "-o <map>"
 
-#: src/nano.c:897
+#: src/nano.c:928
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<map>"
 
-#: src/nano.c:898
+#: src/nano.c:929
 msgid "Set operating directory"
 msgstr "deze werkmap gebruiken"
 
-#: src/nano.c:901
+#: src/nano.c:932
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "XON- en XOFF-toetsen behouden (^Q en ^S)"
 
-#: src/nano.c:903
+#: src/nano.c:935
 msgid "Silently ignore startup issues like rc file errors"
 msgstr "opstartproblemen zoals rc-fouten negeren"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "-r <#cols>"
-msgstr "-r <#kolommen>"
+msgstr "-r <getal>"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "--fill=<#cols>"
-msgstr "--fill=<#kolommen>"
+msgstr "--fill=<getal>"
 
-#: src/nano.c:906
-msgid "Set wrapping point at column #cols"
+#: src/nano.c:939
+msgid "Set hard-wrapping point at column #cols"
 msgstr "te gebruiken afbreek-/uitvulbreedte"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "-s <prog>"
 msgstr "-s <programma>"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "--speller=<prog>"
 msgstr "--speller=<programma>"
 
-#: src/nano.c:910
+#: src/nano.c:943
 msgid "Enable alternate speller"
 msgstr "deze spellingscontroleur gebruiken"
 
-#: src/nano.c:913
+#: src/nano.c:946
 msgid "Auto save on exit, don't prompt"
 msgstr "automatisch opslaan bij afsluiten"
 
-#: src/nano.c:915
-msgid "Allow generic undo [EXPERIMENTAL]"
-msgstr "ongedaanmaken toestaan (EXPERIMENTEEL)"
-
-#: src/nano.c:918
+#: src/nano.c:947
 msgid "View mode (read-only)"
 msgstr "kijkmodus (alleen lezen, geen bewerking)"
 
-#: src/nano.c:920
-msgid "Don't wrap long lines"
+#: src/nano.c:949
+msgid "Don't hard-wrap long lines"
 msgstr "lange regels niet afbreken"
 
-#: src/nano.c:922
+#: src/nano.c:951
 msgid "Don't show the two help lines"
 msgstr "niet de twee hulpregels tonen"
 
-#: src/nano.c:923
+#: src/nano.c:952
 msgid "Enable suspension"
 msgstr "pauzeren van editor toestaan"
 
-#: src/nano.c:924
+#: src/nano.c:954
 msgid "Enable soft line wrapping"
-msgstr "rest van lange regels tonen op volgende"
-
-#: src/nano.c:928
-msgid "(ignored, for Pico compatibility)"
-msgstr "(genegeerd, maar herkend wegens Pico)"
+msgstr "rest van te lange regels tonen op volgende"
 
-#: src/nano.c:938
+#: src/nano.c:963
 #, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
-msgstr " GNU nano  versie %s  (gecompileerd %s, %s)\n"
+msgid " GNU nano, version %s\n"
+msgstr " GNU nano, versie %s\n"
 
-#: src/nano.c:943
+#: src/nano.c:966
 #, 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:944
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1575,156 +1682,180 @@ msgstr ""
 "\n"
 " Compilatie-opties:"
 
-#: src/nano.c:1022
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr "Ondersteuning voor deze functie is uitgeschakeld"
 
-#: src/nano.c:1044
+#: src/nano.c:1125
+msgid "No file name"
+msgstr "Geen bestandsnaam"
+
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr ""
 "Gewijzigde buffer opslaan? (bij \"Nee\" gaan ALLE WIJZIGINGEN VERLOREN) "
 
-#: src/nano.c:1088
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "Kan standaardinvoer vanaf toetsenbord niet heropenen\n"
 
-#: src/nano.c:1114
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "Lezen van standaardinvoer; ^C om af te breken\n"
 
-#: src/nano.c:1182
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "SIGHUP of SIGTERM ontvangen\n"
 
-#: src/nano.c:1204
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Gebruik 'fg' om terug te keren naar nano.\n"
 
-#: src/nano.c:1386
+#: src/nano.c:1481
 msgid "enabled"
-msgstr "is aangezet"
+msgstr " (aangezet)"
 
-#: src/nano.c:1387
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "is uitgezet"
 
-#: src/nano.c:1548 src/winio.c:1256
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr "Onbekend commando"
 
-#: src/nano.c:1674
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "XON genegeerd; mmm-mmm"
 
-#: src/nano.c:1679
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF genegeerd; mmm-mmm"
 
-#: src/nano.c:2209 src/rcfile.c:1100
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Gevraagde tabgrootte '%s' is ongeldig"
 
-#: src/nano.c:2268 src/rcfile.c:1025
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Gevraagde uitvulbreedte '%s' is ongeldig"
 
+#: src/nano.c:2415
+#, c-format
+msgid "Type '%s -h' for a list of available options.\n"
+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:1259
+#: src/prompt.c:1055
 msgid "Yy"
 msgstr "JjYy"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1056
 msgid "Nn"
 msgstr "NnNn"
 
 # Accepteert ook de "O" van "Overal":
-#: src/prompt.c:1261
+#: src/prompt.c:1057
 msgid "Aa"
 msgstr "AaOo"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1071
 msgid "Yes"
 msgstr "Ja"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1076
 msgid "All"
 msgstr "Alle"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1081
 msgid "No"
 msgstr "Nee"
 
-#: src/rcfile.c:130
+#: src/rcfile.c:137
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Fout in %s op regel %lu: "
 
-#: src/rcfile.c:185
+#: src/rcfile.c:196
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "Argument '%s' heeft een ongepaarde \""
 
-#: src/rcfile.c:212 src/rcfile.c:264 src/rcfile.c:711 src/rcfile.c:768
-#: src/rcfile.c:821
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Reg.exp.-reeksen moeten beginnen en eindigen met een \"-teken"
 
-#: src/rcfile.c:238 src/search.c:62
+#: src/rcfile.c:249 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Onjuiste reguliere expressie '%s': %s"
 
-#: src/rcfile.c:258
+#: src/rcfile.c:269
 msgid "Missing syntax name"
 msgstr "Ontbrekende syntaxnaam"
 
-#: src/rcfile.c:316
+#: src/rcfile.c:340
 msgid "The \"none\" syntax is reserved"
 msgstr "Het woordje 'none' is gereserveerd"
 
-#: src/rcfile.c:323
+#: src/rcfile.c:347
 msgid "The \"default\" syntax must take no extensions"
 msgstr "Bij het woordje 'default' horen geen extensies"
 
-#: src/rcfile.c:386 src/rcfile.c:483
+#: src/rcfile.c:433
 msgid "Missing key name"
 msgstr "Ontbrekende toetsnaam"
 
-#: src/rcfile.c:398 src/rcfile.c:499
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
-msgstr "Toetsbindingen moeten beginnen met \"^\", \"M\", of \"F\""
+#: src/rcfile.c:442 src/rcfile.c:453
+msgid "Key name is too short"
+msgstr "Toetsnaam is te kort"
+
+#: src/rcfile.c:463
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
+msgstr "Toetsnaam moet beginnen met \"^\", \"M\", of \"F\""
 
-#: src/rcfile.c:407
-msgid "Must specify function to bind key to"
+#: src/rcfile.c:472
+msgid "Must specify a function to bind the key to"
 msgstr "Functie waaraan de toets gebonden moet worden ontbreekt"
 
-#: src/rcfile.c:418 src/rcfile.c:510
-msgid "Must specify menu to bind key to (or \"all\")"
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:482
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
-"Menu waarin de toets moet worden gebonden moet worden opgegeven (of \"all\")"
+"Menu waarin de toets gebonden/ontbonden moet worden ontbreekt (of \"all\")"
 
-#: src/rcfile.c:426
+#: src/rcfile.c:489
 #, c-format
-msgid "Could not map name \"%s\" to a function"
+msgid "Cannot map name \"%s\" to a function"
 msgstr "Kan in naam '%s' geen functie herkennen"
 
-#: src/rcfile.c:432 src/rcfile.c:517
+#: src/rcfile.c:496
 #, c-format
-msgid "Could not map name \"%s\" to a menu"
+msgid "Cannot map name \"%s\" to a menu"
 msgstr "Kan in naam '%s' geen menu herkennen"
 
-#: src/rcfile.c:454
+#: src/rcfile.c:528
+#, c-format
+msgid "Function '%s' does not exist in menu '%s'"
+msgstr "Functie '%s' bestaat niet in menu '%s'"
+
+#: src/rcfile.c:543
 #, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
+msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "Toets '%s' mag niet herbonden worden"
 
-#: src/rcfile.c:625
+#: src/rcfile.c:629
+#, c-format
+msgid "Error expanding %s: %s"
+msgstr "Fout bij expanderen van %s: %s"
+
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1738,134 +1869,191 @@ msgstr ""
 "'magenta', 'yellow', 'cyan', 'black' en 'white',\n"
 "met voor voorgrondkleuren het optionele voorvoegsel 'bright'."
 
-#: src/rcfile.c:647
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
 msgstr "Kan geen 'color'-commando verwerken zonder een 'syntax'-commando"
 
-#: src/rcfile.c:652
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "Ontbrekende kleurnaam"
 
-#: src/rcfile.c:672
-#, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr "Achtergrondkleur '%s' kan niet 'bright' zijn"
-
-#: src/rcfile.c:690 src/rcfile.c:809
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr "Ontbrekende reg.exp.-tekenreeks"
 
-#: src/rcfile.c:762
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "'start=' vereist een bijbehorende 'end='"
 
-#: src/rcfile.c:804
+#: src/rcfile.c:837
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr "Achtergrondkleur '%s' kan niet 'bright' zijn"
+
+#: src/rcfile.c:865
 msgid "Cannot add a header regex without a syntax command"
 msgstr "Kan geen topregel-expressie verwerken zonder een 'syntax'-commando"
 
-#: src/rcfile.c:874
+#: src/rcfile.c:921
+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:926
+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:990
+msgid "Missing linter command"
+msgstr "Ontbrekend commando bij 'linter'"
+
+#: src/rcfile.c:1010
+msgid "Cannot add formatter without a syntax command"
+msgstr "Kan geen opmaker toevoegen zonder een 'syntax'-commando"
+
+#: src/rcfile.c:1015
+msgid "Missing formatter command"
+msgstr "Ontbrekend commando bij 'formatter'"
+
+#: src/rcfile.c:1045
 #, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
-msgstr "Fatale fout: aan functie '%s' is geen toets gebonden"
+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:876
+#: src/rcfile.c:1047
+#, c-format
 msgid ""
-"Exiting.  Please use nano with the -I option if needed to adjust your nanorc "
-"settings\n"
-msgstr ""
-"Gestopt.  Start eventueel nano met optie -I om uw nanorc te corrigeren.\n"
+"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:1108
+#, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "Kan geen syntax '%s' vinden om aan toe te voegen"
 
-#: src/rcfile.c:926 src/rcfile.c:935 src/rcfile.c:945
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Commando '%s' is niet toegestaan in 'include'-bestand"
 
-#: src/rcfile.c:951 src/rcfile.c:1128
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Bij syntax '%s' ontbreken 'color'-commando's"
 
-#: src/rcfile.c:966
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Commando '%s' is onbekend"
 
-#: src/rcfile.c:972
-msgid "Missing flag"
-msgstr "Ontbrekende vlag"
+#: src/rcfile.c:1186
+msgid "Missing option"
+msgstr "Ontbrekende optie"
 
-#: src/rcfile.c:994
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Optie '%s' vereist een argument"
 
-#: src/rcfile.c:1012
+# FIXME: option *argument* is meant
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
-msgstr "Optie is geen geldige multibyte-tekenreeks"
+msgstr "Argument is geen geldige multibyte-tekenreeks"
 
-#: src/rcfile.c:1038 src/rcfile.c:1066 src/rcfile.c:1075
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
-msgstr "Niet-blanco tekens vereist"
+msgstr "Niet-blanco tekens zijn vereist"
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
-msgstr "Twee enkelkoloms-tekens vereist"
+msgstr "Twee enkelkoloms-tekens zijn vereist"
 
-#: src/rcfile.c:1114
+#: src/rcfile.c:1339
 #, c-format
-msgid "Cannot unset flag \"%s\""
-msgstr "Kan vlag '%s' niet uitzetten"
+msgid "Cannot unset option \"%s\""
+msgstr "Kan optie '%s' niet uitzetten"
 
-#: src/rcfile.c:1123
+#: src/rcfile.c:1345
 #, c-format
-msgid "Unknown flag \"%s\""
-msgstr "Onbekende vlag '%s'"
+msgid "Unknown option \"%s\""
+msgstr "Onbekende optie '%s'"
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr "Kan de thuismap niet vinden!  Boehoe!"
 
+#: src/rcfile.c:1442
+#, c-format
+msgid ""
+"\n"
+"Press Enter to continue starting nano.\n"
+msgstr ""
+"\n"
+"Druk op Enter om verder te gaan met het starten van nano.\n"
+
 #: src/search.c:96
 #, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "'%.*s%s' niet gevonden"
 
-#: src/search.c:205
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/search.c:184
+msgid " [Case Sensitive]"
+msgstr " [Hoofdlettergevoelig]"
+
+#: src/search.c:188
+msgid " [Regexp]"
+msgstr " [Reg.exp.]"
+
+#: src/search.c:192
+msgid " [Backwards]"
+msgstr " [Achterwaarts]"
+
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:197
 msgid " (to replace) in selection"
 msgstr " (om te vervangen) in selectie"
 
-#: src/search.c:207
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (om te vervangen)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "Deze overeenkomst vervangen?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:945
 msgid "Replace with"
 msgstr "Vervangen door"
 
-#: src/search.c:1004
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
 msgstr[0] "%lu overeenkomst vervangen"
 msgstr[1] "%lu overeenkomsten vervangen"
 
-#: src/search.c:1034
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr "Geef regelnummer, kolomnummer"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
 msgstr "Ongeldig regel- of kolomnummer"
 
-#: src/search.c:1214
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "Is geen haakje"
 
-#: src/search.c:1281
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "Geen overeenkomend haakje"
 
@@ -1877,217 +2065,316 @@ msgstr "Markering is aangezet"
 msgid "Mark Unset"
 msgstr "Uitgezet"
 
-#: src/text.c:443
+#: src/text.c:439
 msgid "Nothing in undo buffer!"
 msgstr "Er is niets om ongedaan te maken"
 
-#: src/text.c:455 src/text.c:593
+# FIXME: make identical to other -- %ld
+#: src/text.c:445 src/text.c:590
 #, c-format
-msgid "Internal error: can't match line %d.  Please save your work"
+msgid "Internal error: can't match line %d.  Please save your work."
 msgstr "*Interne fout*: kan regel %d niet vinden.  Sla uw werk op."
 
-#: src/text.c:466 src/text.c:603
+#: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
 msgstr "teksttoevoeging"
 
-#: src/text.c:475 src/text.c:613
+#: src/text.c:467 src/text.c:612
 msgid "text delete"
 msgstr "tekstverwijdering"
 
-#: src/text.c:489 src/text.c:628
-msgid "line wrap"
-msgstr "regelterugloop"
-
-#: src/text.c:503 src/text.c:636
+#: src/text.c:491 src/text.c:641
 msgid "line join"
 msgstr "regelsamenvoeging"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:505 src/text.c:657
 msgid "text cut"
 msgstr "tekstwegneming"
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:510 src/text.c:661
 msgid "text uncut"
 msgstr "tekstterugplaatsing"
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:515 src/text.c:623
 msgid "line break"
-msgstr "regeleinde"
+msgstr "regelafbreking"
 
-#: src/text.c:532 src/text.c:665
+#: src/text.c:528 src/text.c:672
 msgid "text insert"
 msgstr "tekstinvoeging"
 
-#: src/text.c:550 src/text.c:659
+#: src/text.c:549 src/text.c:665
 msgid "text replace"
 msgstr "tekstvervanging"
 
-#: src/text.c:557 src/text.c:671
-msgid "Internal error: unknown type.  Please save your work"
+#: src/text.c:556 src/text.c:679 src/text.c:983
+msgid "Internal error: unknown type.  Please save your work."
 msgstr "*Interne fout*: onbekend type.  Sla uw werk op."
 
-#: src/text.c:563
+#: src/text.c:561
 #, c-format
 msgid "Undid action (%s)"
 msgstr "Bewerking (%s) is ongedaan gemaakt"
 
-#: src/text.c:578
+#: src/text.c:580
 msgid "Nothing to re-do!"
 msgstr "Er is niets om opnieuw te doen"
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
+#: src/text.c:584
+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:676
+#: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Bewerking (%s) is opnieuw gedaan"
 
-#: src/text.c:766
-msgid "Could not pipe"
-msgstr "Kan niet doorsluizen"
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
+msgid "Could not create pipe"
+msgstr "Kan geen pijp aanmaken"
 
-#: src/text.c:793 src/text.c:2636 src/text.c:2788
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "Kan geen nieuw proces starten"
 
-#: src/text.c:941
-msgid "Internal error: can't setup uncut.  Please save your work."
+#: src/text.c:969
+msgid "Internal error: cannot set up uncut.  Please save your work."
 msgstr "*Interne fout*: kan terugplaatsing niet voorbereiden.  Sla uw werk op."
 
-#: src/text.c:950
-msgid "Internal error: unknown type.  Please save your work."
-msgstr "*Interne fout*: onbekend type.  Sla uw werk op."
-
-#: src/text.c:1870
+#: src/text.c:1806
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Ongeldige aanhaaltekens-tekenreeks '%s': %s"
 
-#: src/text.c:2267
+#: src/text.c:2207
 msgid "Can now UnJustify!"
-msgstr "Kan nu ON^Uitvullen!"
+msgstr "Kan nu onuitvullen!"
 
-#: src/text.c:2462
+#: src/text.c:2404
 msgid "Edit a replacement"
 msgstr "Vervanging bewerken"
 
-#: src/text.c:2548
-msgid "Could not create pipe"
-msgstr "Kan geen pijp aanmaken"
-
-#: src/text.c:2550
+#: src/text.c:2492
 msgid "Creating misspelled word list, please wait..."
-msgstr "Aanmaken van lijst van verkeerd gespelde woorden, even geduld..."
+msgstr "Aanmaken van lijst van verkeerd gespelde woorden; even geduld..."
 
-#: src/text.c:2642
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
 msgstr "Kan grootte van doorsluisbuffer niet bepalen"
 
-#: src/text.c:2693
+#: src/text.c:2635
 msgid "Error invoking \"spell\""
-msgstr "Fout tijdens aanroepen van 'spell'"
+msgstr "Fout bij aanroepen van 'spell'"
 
-#: src/text.c:2696
+#: src/text.c:2638
 msgid "Error invoking \"sort -f\""
-msgstr "Fout tijdens aanroepen van 'sort -f'"
+msgstr "Fout bij aanroepen van 'sort -f'"
 
-#: src/text.c:2699
+#: src/text.c:2641
 msgid "Error invoking \"uniq\""
-msgstr "Fout tijdens aanroepen van 'uniq'"
+msgstr "Fout bij aanroepen van 'uniq'"
 
-#: src/text.c:2756 src/text.c:2965
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "Spellingscontrole is voltooid"
 
-#: src/text.c:2815
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
-msgstr "Fout tijdens aanroepen van '%s'"
+msgstr "Fout bij aanroepen van '%s'"
+
+#: src/text.c:2885
+msgid "Invoking spell checker, please wait"
+msgstr "Aanroepen van spellingscontrole; even geduld..."
 
-#: src/text.c:2960
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Spellingscontrole is mislukt: %s"
 
-#: src/text.c:2962
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Spellingscontrole is mislukt: %s: %s"
 
-#: src/text.c:3030
+#: src/text.c:2937
+msgid "No linter defined for this type of file!"
+msgstr "Er is geen linter gedefinieerd voor dit type bestand"
+
+#: src/text.c:2947
+msgid "Save modified buffer before linting?"
+msgstr "Gewijzigd buffer opslaan alvorens te linten?"
+
+#: src/text.c:2969
+msgid "Invoking linter, please wait"
+msgstr "Aanroepen van de linter; even geduld..."
+
+#: src/text.c:3125
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr "Kreeg nul ontleedbare regels terug van commando '%s'"
+
+#: src/text.c:3159
+#, 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:3205
+msgid "At last message"
+msgstr "Dit is de laatste melding"
+
+#: src/text.c:3210
+msgid "At first message"
+msgstr "Dit is de eerste melding"
+
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr "Fout: geen 'formatter' gedefinieerd"
+
+#: src/text.c:3275
+msgid "Finished"
+msgstr "Klaar"
+
+#: src/text.c:3280
+msgid "Invoking formatter, please wait"
+msgstr "Aanroepen van de opmaker; even geduld..."
+
+#: src/text.c:3360
+msgid "Finished formatting"
+msgstr "Het opmaken is klaar"
+
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%swoorden: %lu  regels: %ld  tekens: %lu"
 
-#: src/text.c:3031
+#: src/text.c:3439
 msgid "In Selection:  "
 msgstr "In de selectie:  "
 
-#: src/utils.c:405 src/utils.c:417
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3453
+msgid "Verbatim Input"
+msgstr "Verbatim invoer"
+
+#: src/utils.c:410 src/utils.c:422
 msgid "nano is out of memory!"
 msgstr "Onvoldoende geheugen beschikbaar voor nano!"
 
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
-#: src/winio.c:1557
+#: src/winio.c:1583
 msgid "Unicode Input"
 msgstr "Invoer van Unicode"
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2142 src/winio.c:2146
 msgid "Modified"
 msgstr "Gewijzigd"
 
-#: src/winio.c:2150
+#: src/winio.c:2143
 msgid "View"
 msgstr "Kijken"
 
-#: src/winio.c:2164
+#: src/winio.c:2157
 msgid "DIR:"
 msgstr "Map:"
 
-#: src/winio.c:2171
+#: src/winio.c:2164
 msgid "File:"
 msgstr "Bestand:"
 
-#: src/winio.c:3360
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2261
+msgid ""
+"Warning: Modifying a file which is not locked, check directory permission?"
+msgstr ""
+"Waarschuwing: wijzigen van onvergrendeld bestand; maptoegangsrechten "
+"controleren?"
+
+#: src/winio.c:3377
 #, 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:3492
+#: src/winio.c:3507
 msgid "The nano text editor"
 msgstr "De nano-teksteditor"
 
-#: src/winio.c:3493
+#: src/winio.c:3508
 msgid "version"
 msgstr "versie"
 
-#: src/winio.c:3494
+#: src/winio.c:3509
 msgid "Brought to you by:"
 msgstr "U bezorgd door:"
 
-#: src/winio.c:3495
+#: src/winio.c:3510
 msgid "Special thanks to:"
 msgstr "Met speciale dank aan:"
 
-#: src/winio.c:3496
+#: src/winio.c:3511
 msgid "The Free Software Foundation"
 msgstr "de Free Software Foundation"
 
-#: src/winio.c:3497
+#: src/winio.c:3512
+msgid "the many translators and the TP"
+msgstr "de vele vertalers en de TP"
+
+#: src/winio.c:3513
 msgid "For ncurses:"
 msgstr "Voor ncurses:"
 
-#: src/winio.c:3498
+#: src/winio.c:3514
 msgid "and anyone else we forgot..."
 msgstr "en iedereen die we vergeten zijn..."
 
-#: src/winio.c:3499
+#: src/winio.c:3515
 msgid "Thank you for using nano!"
 msgstr "Dank u voor het gebruiken van nano!"
 
+#~ msgid "Internal error: can't match line %ld.  Please save your work."
+#~ msgstr "*Interne fout*: kan regel %ld niet vinden.  Sla uw werk op."
+
+#~ msgid " GNU nano version %s (compiled %s, %s)\n"
+#~ msgstr " GNU nano  versie %s  (gecompileerd %s, %s)\n"
+
+#~ msgid "line wrap"
+#~ msgstr "regelterugloop"
+
+#~ msgid "Allow generic undo [EXPERIMENTAL]"
+#~ msgstr "ongedaanmaken toestaan (EXPERIMENTEEL)"
+
+#~ msgid "Insert File"
+#~ msgstr "Bestand invoegen"
+
+#~ msgid "Go to previous screen"
+#~ msgstr "Een schermvol terugscrollen"
+
+#~ msgid "Find Other Bracket"
+#~ msgstr "Naar bijbehorend haakje"
+
+#~ msgid "Long line wrapping"
+#~ msgstr "Terugloop van lange regels"
+
+#~ msgid "Soft line wrapping"
+#~ msgstr "Zachte terugloop van lange regels"
+
+#~ msgid "(ignored, for Pico compatibility)"
+#~ msgstr "(genegeerd, maar herkend wegens Pico)"
+
+#~ msgid "Must specify menu to bind key to (or \"all\")"
+#~ msgstr ""
+#~ "Menu waarin de toets moet worden gebonden moet worden opgegeven (of \"all"
+#~ "\")"
+
+#~ msgid "Missing flag"
+#~ msgstr "Ontbrekende vlag"
+
+#~ msgid "Could not pipe"
+#~ msgstr "Kan niet doorsluizen"
+
 #~ msgid "Error writing backup file %s: File owner mismatch"
 #~ msgstr ""
 #~ "Fout tijdens schrijven van reservekopiebestand %s: een ander is eigenaar"
diff --git a/po/nn.gmo b/po/nn.gmo
index ba1708b..f24e80d 100644
--- a/po/nn.gmo
+++ b/po/nn.gmo
diff --git a/po/nn.po b/po/nn.po
index 157d4a7..94b1bae 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -1,123 +1,148 @@
 # nano - Norwegian translation
 # Copyright (C) 2002 Free Software Foundation, Inc.
+#
 # Eivind Kj�rstad <ekj@vestdata.no>, 2001.
 # Svein O. Benn�s <svein@norge.no>, 2002.
 # Kjetil Torgrim Homme <kjetilho@linpro.no>, 2002.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: nano 1.1.7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-22 06:34-0500\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/browser.c:220
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:203
 #, fuzzy
 msgid "Go To Directory"
 msgstr "G� til katalog"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:860 src/files.c:2048
-#: src/nano.c:1060 src/search.c:220 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Avbrote"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:246 src/browser.c:293
 #, c-format
 msgid "Can't go outside of %s in restricted mode"
 msgstr "Kan ikkje g� utanfor %s i avgrensa modus"
 
-#: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:722
-#: src/files.c:731 src/files.c:1540 src/files.c:1659 src/files.c:1711
-#: src/files.c:1732 src/files.c:1855 src/files.c:2691 src/rcfile.c:568
-#: src/rcfile.c:1204
+#: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
+#: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
+#: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
 msgstr ""
 
-#: src/browser.c:303
+#: src/browser.c:283
 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:665 src/browser.c:674
+#: src/browser.c:626 src/browser.c:635
 msgid "(dir)"
 msgstr ""
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:632
 msgid "(parent dir)"
 msgstr ""
 
-#: src/browser.c:801 src/search.c:185
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "S�k"
 
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:805 src/search.c:189
-msgid " [Case Sensitive]"
-msgstr " [Skil store/sm�]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:811 src/search.c:195
-msgid " [Regexp]"
-msgstr " [Reguttrykk]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:817 src/search.c:201
-msgid " [Backwards]"
-msgstr " [Bakover]"
-
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "S�ket gjekk rundt"
 
-#: src/browser.c:1006 src/browser.c:1039 src/search.c:514 src/search.c:517
-#: src/search.c:574 src/search.c:577
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "Dette er einaste forekomst"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr ""
 
-#: src/files.c:125
+#: src/files.c:139
+msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
+msgstr ""
+
+#: src/files.c:145
+#, fuzzy, c-format
+msgid "Couldn't determine hostname for lock file: %s"
+msgstr "Kunne ikkje setja tilgangsniv� %o p� %s: %s"
+
+#: src/files.c:165 src/files.c:175 src/files.c:212 src/files.c:222
+#, fuzzy, c-format
+msgid "Error writing lock file %s: %s"
+msgstr "Feil i %s p� linje %d: "
+
+#: src/files.c:237
+#, fuzzy, c-format
+msgid "Error deleting lock file %s: %s"
+msgstr "Feil i %s p� linje %d: "
+
+#: src/files.c:272
+#, fuzzy, c-format
+msgid "Error opening lock file %s: %s"
+msgstr "Feil i %s p� linje %d: "
+
+#: src/files.c:282
+#, 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:297
+#, c-format
+msgid "File %s is being edited (by %s with %s, PID %d); continue?"
+msgstr ""
+
+#: src/files.c:308
+#, c-format
+msgid "Error writing lock file: Directory '%s' doesn't exist"
+msgstr ""
+
+#: src/files.c:339
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Kan ikkje setja inn fil fr� utanfor %s"
 
-#: src/files.c:234
+#: src/files.c:467
 #, fuzzy
 msgid "No more open file buffers"
 msgstr "Ingen fleire opne filer"
 
-#: src/files.c:250
+#: src/files.c:484
 #, c-format
 msgid "Switched to %s"
 msgstr "Bytta til %s"
 
-#: src/files.c:251 src/global.c:469 src/winio.c:2168
+#: src/files.c:485 src/global.c:953 src/winio.c:2161
 msgid "New Buffer"
 msgstr "Ny buffer"
 
-#: src/files.c:633
+#: src/files.c:874
 #, 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:638
+#: src/files.c:879
 #, fuzzy, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
@@ -128,14 +153,14 @@ msgid_plural ""
 msgstr[0] "Leste %d linjer (p� Mac-format)"
 msgstr[1] "Leste %d linjer (p� Mac-format)"
 
-#: src/files.c:644
+#: src/files.c:885
 #, 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:648
+#: src/files.c:889
 #, fuzzy, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
@@ -144,14 +169,14 @@ msgid_plural ""
 msgstr[0] "Leste %d linjer (p� Mac-format)"
 msgstr[1] "Leste %d linjer (p� Mac-format)"
 
-#: src/files.c:654
+#: src/files.c:895
 #, 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:658
+#: src/files.c:899
 #, fuzzy, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
@@ -160,515 +185,463 @@ msgid_plural ""
 msgstr[0] "Leste %d linjer (p� DOS-format)"
 msgstr[1] "Leste %d linjer (p� DOS-format)"
 
-#: src/files.c:664
+#: src/files.c:905
 #, 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:667
+#: src/files.c:908
 #, 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:700 src/files.c:736
+#: src/files.c:943 src/files.c:980
 msgid "Reading File"
 msgstr "Les fil"
 
-#: src/files.c:706
+#: src/files.c:950
 msgid "New File"
 msgstr "Ny fil"
 
-#: src/files.c:709
+#: src/files.c:953
 #, c-format
 msgid "\"%s\" not found"
 msgstr "�%s� ikkje funne"
 
-#: src/files.c:717 src/rcfile.c:559 src/rcfile.c:1154 src/rcfile.c:1195
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, fuzzy, c-format
 msgid "\"%s\" is a directory"
 msgstr "Fila �%s� er ein katalog"
 
 # "enhet" = "device", kanskje, men det er litt forvirrande
-#: src/files.c:718 src/rcfile.c:560 src/rcfile.c:1155 src/rcfile.c:1196
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, fuzzy, c-format
 msgid "\"%s\" is a device file"
 msgstr "Fila �%s� er ikkje ei vanleg fil"
 
-#: src/files.c:817
+#: src/files.c:1060
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr ""
 
-#: src/files.c:819
+#: src/files.c:1062
 #, fuzzy, c-format
 msgid "Command to execute [from %s] "
 msgstr "Fila som skal setjast inn [fr� %s] "
 
-#: src/files.c:825
+#: src/files.c:1069
 #, fuzzy, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Fila som skal setjast inn [fr� %s] "
 
-#: src/files.c:827
+#: src/files.c:1071
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Fila som skal setjast inn [fr� %s] "
 
-#: src/files.c:1077
+#: src/files.c:1320
 #, fuzzy
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Tasten er ugyldig utan fleire buffer"
 
-#: src/files.c:1486
+#: src/files.c:1622
+msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+msgstr ""
+
+#: src/files.c:1746
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Kan ikkje skriva utanfor %s"
 
-#: src/files.c:1501
+#: src/files.c:1761
 msgid "Cannot prepend or append to a symlink with --nofollow set"
 msgstr ""
 
-#: src/files.c:1581 src/files.c:1603 src/files.c:1621 src/files.c:1632
-#: src/files.c:1640 src/files.c:1667
+#: src/files.c:1843 src/files.c:1868 src/files.c:1886 src/files.c:1899
+#: src/files.c:1910 src/files.c:1939
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr ""
 
-#: src/files.c:1582 src/nano.c:701
+#: src/files.c:1844 src/nano.c:719
 #, fuzzy
 msgid "Too many backup files?"
 msgstr ""
 "\n"
 "%s vart ikkje lagra (for mange sikringskopiar?)\n"
 
-#: src/files.c:1687 src/files.c:1744 src/files.c:1763 src/files.c:1775
-#: src/files.c:1799 src/files.c:1817 src/files.c:1827 src/files.c:1863
-#: src/files.c:1868 src/files.c:2764 src/files.c:2773
+#: src/files.c:1959 src/files.c:2016 src/files.c:2035 src/files.c:2047
+#: src/files.c:2071 src/files.c:2089 src/files.c:2099 src/files.c:2135
+#: src/files.c:2140 src/files.c:3101 src/files.c:3110 src/files.c:3133
+#: src/files.c:3145
 #, c-format
 msgid "Error writing %s: %s"
 msgstr ""
 
-#: src/files.c:1721 src/text.c:2929 src/text.c:2941
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr ""
 
-#: src/files.c:1900
+#: src/files.c:2173
 #, 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:2004
+#: src/files.c:2278
 msgid " [DOS Format]"
 msgstr " [DOS-format]"
 
-#: src/files.c:2005
+#: src/files.c:2279
 msgid " [Mac Format]"
 msgstr " [Mac-format]"
 
-#: src/files.c:2007
+#: src/files.c:2281
 #, fuzzy
 msgid " [Backup]"
 msgstr " [Bakover]"
 
-#: src/files.c:2015
+#: src/files.c:2289
 #, fuzzy
 msgid "Prepend Selection to File"
 msgstr "Legg til valt omr�de p� slutten av fil"
 
-#: src/files.c:2016
+#: src/files.c:2290
 msgid "Append Selection to File"
 msgstr "Legg til valt omr�de p� slutten av fil"
 
-#: src/files.c:2017
+#: src/files.c:2291
 msgid "Write Selection to File"
 msgstr "Lagra valt omr�de til fil"
 
-#: src/files.c:2020
+#: src/files.c:2294
 #, fuzzy
 msgid "File Name to Prepend to"
 msgstr "Namn p� fil som skal leggjast til"
 
-#: src/files.c:2021
+#: src/files.c:2295
 #, fuzzy
 msgid "File Name to Append to"
 msgstr "Namn p� fil som skal leggjast til"
 
-#: src/files.c:2022
+#: src/files.c:2296
 msgid "File Name to Write"
 msgstr "Namn p� fila som skal lagrast"
 
-#: src/files.c:2153
+#: src/files.c:2427
 #, fuzzy
 msgid "File exists, OVERWRITE ? "
 msgstr "Fila eksisterer, SKRIV OVER?"
 
-#: src/files.c:2162
+#: src/files.c:2436
 msgid "Save file under DIFFERENT NAME ? "
 msgstr ""
 
-#: src/files.c:2173
+#: src/files.c:2450
 msgid "File was modified since you opened it, continue saving ? "
 msgstr ""
 
-#: src/files.c:2611
+#: src/files.c:2882
 msgid "(more)"
 msgstr "(meir)"
 
-#: src/files.c:2694 src/rcfile.c:1220
+#: src/files.c:2974
 #, fuzzy, c-format
 msgid ""
 "\n"
-"Press Enter to continue starting nano.\n"
+"Press Enter to continue\n"
 msgstr ""
 "\n"
 "Trykk Enter for � halda fram lastinga av nano\n"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:415 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Avbryt"
-
-#: src/global.c:416
-msgid "Replace"
-msgstr "Erstatt"
-
-#: src/global.c:417
-msgid "No Replace"
-msgstr "Inga erstatting"
-
-#: src/global.c:420
-msgid "Case Sens"
-msgstr "Store/sm�"
-
-#: src/global.c:421
-#, fuzzy
-msgid "Backwards"
-msgstr " [Bakover]"
-
-#: src/global.c:425
-msgid "Regexp"
-msgstr "Reguttrykk"
-
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:451
-msgid "PrevHstory"
+#: src/files.c:2989
+#, c-format
+msgid ""
+"Unable to create directory %s: %s\n"
+"It is required for saving/loading search history or cursor positions.\n"
 msgstr ""
 
-#: src/global.c:452
-msgid "NextHstory"
+#: src/files.c:2995
+#, 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/global.c:453
-msgid "Go To Text"
+#: src/files.c:3012
+#, 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 ""
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:455
-#, fuzzy
-msgid "WhereIs Next"
-msgstr "Finn"
-
-#: src/global.c:457
-#, fuzzy
-msgid "First File"
-msgstr "F�rste linje"
-
-#: src/global.c:458
-#, fuzzy
-msgid "Last File"
-msgstr "Siste linje"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:460
-msgid "To Files"
-msgstr "Til filer"
-
-#: src/global.c:462
-msgid "DOS Format"
-msgstr "DOS-format"
+#: src/files.c:3016
+#, 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 ""
 
-#: src/global.c:463
-msgid "Mac Format"
-msgstr "Mac-format"
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
+#: src/global.c:477
+msgid "Exit"
+msgstr "Avslutt"
 
-#: src/global.c:464
-msgid "Append"
-msgstr "Legg til"
+#: src/global.c:478
+msgid "Close"
+msgstr "Lukk"
 
-#: src/global.c:465
+#: src/global.c:479
 #, fuzzy
-msgid "Prepend"
-msgstr "Legg til"
+msgid "Uncut Text"
+msgstr "U-klipp"
 
-#: src/global.c:466
+#: src/global.c:481
 #, fuzzy
-msgid "Backup File"
-msgstr "Les fil"
-
-#: src/global.c:467
-msgid "Execute Command"
-msgstr ""
+msgid "Unjustify"
+msgstr "U-ombrekk"
 
-#: src/global.c:471
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:485
 #, fuzzy
-msgid "Go To Dir"
-msgstr "G� til katalog"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:480
-msgid "Get Help"
-msgstr "Hjelp"
-
-#: src/global.c:481
-msgid "Exit"
-msgstr "Avslutt"
+msgid "WhereIs Next"
+msgstr "Finn"
 
-#: src/global.c:482
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:492
 msgid "Where Is"
 msgstr "Finn"
 
-#: src/global.c:483
-msgid "Prev Page"
-msgstr "F�rre side"
-
-#: src/global.c:484
-msgid "Next Page"
-msgstr "Neste side"
-
-#: src/global.c:485
-msgid "First Line"
-msgstr "F�rste linje"
+#: src/global.c:493
+msgid "Replace"
+msgstr "Erstatt"
 
-#: src/global.c:486
-msgid "Last Line"
-msgstr "Siste linje"
+#: src/global.c:494
+#, fuzzy
+msgid "Go To Line"
+msgstr "G� til linje"
 
-#: src/global.c:487
-msgid "Suspend"
-msgstr "Legg i bakgrunnen"
+#: src/global.c:495
+#, fuzzy
+msgid "Prev Line"
+msgstr "F�rre side"
 
-#: src/global.c:489
-msgid "Beg of Par"
-msgstr ""
+#: src/global.c:496
+#, fuzzy
+msgid "Next Line"
+msgstr "Neste fil"
 
-#: src/global.c:490
-msgid "End of Par"
-msgstr ""
+#: src/global.c:497
+msgid "Read File"
+msgstr "Les fil"
 
-#: src/global.c:491
+#: src/global.c:499
 #, fuzzy
 msgid "FullJstify"
 msgstr "Brekk om"
 
-#: src/global.c:493
+#: src/global.c:501
 msgid "Refresh"
 msgstr "Frisk opp"
 
-#: src/global.c:495
-#, fuzzy
-msgid "Insert File"
-msgstr "Neste fil"
-
-#: src/global.c:497
-#, fuzzy
-msgid "Go To Line"
-msgstr "G� til linje"
-
-#: src/global.c:500
+#. 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:507
 msgid "Justify the current paragraph"
 msgstr "Brekk om avsnittet"
 
-#. 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:505
+#: src/global.c:509
 msgid "Cancel the current function"
 msgstr "Avbryt gjeldande funksjon"
 
-#: src/global.c:506
+#: src/global.c:510
 msgid "Display this help text"
 msgstr ""
 
-#: src/global.c:509
+#: src/global.c:513
 #, fuzzy
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Lukk gjeldande fil/Avslutt nano"
 
-#: src/global.c:511
+#: src/global.c:515
 msgid "Exit from nano"
 msgstr "Avslutt nano"
 
-#: src/global.c:515
+#: src/global.c:519
 msgid "Write the current file to disk"
 msgstr "Lagra gjeldande fil"
 
-#: src/global.c:517
+#: src/global.c:521
 msgid "Insert another file into the current one"
 msgstr "Sett inn ei anna fil i denne"
 
-#: src/global.c:519
+#: src/global.c:523
 msgid "Search for a string or a regular expression"
 msgstr ""
 
-#: src/global.c:520
-#, fuzzy
-msgid "Go to previous screen"
-msgstr "G� til f�rre skjerm"
+#: src/global.c:526
+msgid "Search for a string"
+msgstr ""
 
-#: src/global.c:521
-#, fuzzy
-msgid "Go to next screen"
-msgstr "G� til neste skjerm"
+#: src/global.c:528
+msgid "Go one screenful up"
+msgstr ""
 
-#: src/global.c:523
+#: src/global.c:529
+msgid "Go one screenful down"
+msgstr ""
+
+#: src/global.c:531
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Klipp ut denne linja og lagra ho i utklippsbufferet"
 
-#: src/global.c:525
+#: src/global.c:533
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Set inn utklippsbufferet her"
 
-#: src/global.c:527
+#: src/global.c:534
 #, fuzzy
 msgid "Display the position of the cursor"
 msgstr "Vis mark�rposisjonen"
 
-#: src/global.c:529
+#: src/global.c:536
 #, fuzzy
 msgid "Invoke the spell checker, if available"
 msgstr "Start stavekontroll (om tilgjengeleg)"
 
-#: src/global.c:531
+#: src/global.c:538
 #, fuzzy
 msgid "Replace a string or a regular expression"
 msgstr "Erstatt feila: ukjent deluttrykk!"
 
-#: src/global.c:532
+#: src/global.c:539
 #, fuzzy
 msgid "Go to line and column number"
 msgstr "Hopp til eit linjenummer"
 
-#: src/global.c:534
+#: src/global.c:541
 #, fuzzy
-msgid "Mark text at the cursor position"
+msgid "Mark text starting from the cursor position"
 msgstr "Marker teksten ved mark�ren"
 
-#: src/global.c:535
-msgid "Repeat last search"
+#: src/global.c:542
+msgid "Repeat the last search"
 msgstr ""
 
-#: src/global.c:537
+#: src/global.c:544
 #, 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:538
+#: src/global.c:545
 #, fuzzy
 msgid "Indent the current line"
 msgstr "Legg til noverande fil"
 
-#: src/global.c:539
+#: src/global.c:546
 #, fuzzy
 msgid "Unindent the current line"
 msgstr "Legg til noverande fil"
 
-#: src/global.c:540
+#: src/global.c:547
 msgid "Undo the last operation"
 msgstr ""
 
-#: src/global.c:541
+#: src/global.c:548
 msgid "Redo the last undone operation"
 msgstr ""
 
-#: src/global.c:543
+#: src/global.c:550
 #, fuzzy
 msgid "Go forward one character"
 msgstr "G� ein bokstav fram"
 
-#: src/global.c:544
+#: src/global.c:551
 #, fuzzy
 msgid "Go back one character"
 msgstr "G� ein bokstav attende"
 
-#: src/global.c:546
+#: src/global.c:553
 #, fuzzy
 msgid "Go forward one word"
 msgstr "G� ein bokstav fram"
 
-#: src/global.c:547
+#: src/global.c:554
 #, fuzzy
 msgid "Go back one word"
 msgstr "G� ein bokstav attende"
 
-#: src/global.c:549
+#: src/global.c:556
 #, fuzzy
 msgid "Go to previous line"
 msgstr "G� til f�rre skjerm"
 
-#: src/global.c:550
+#: src/global.c:557
 #, fuzzy
 msgid "Go to next line"
 msgstr "G� ei linje ned"
 
-#: src/global.c:551
+#: src/global.c:558
 #, fuzzy
 msgid "Go to beginning of current line"
 msgstr "G� til starten av linja"
 
-#: src/global.c:552
+#: src/global.c:559
 #, fuzzy
 msgid "Go to end of current line"
 msgstr "G� til slutten av linja"
 
-#: src/global.c:555
+#: src/global.c:562
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr ""
 
-#: src/global.c:557
+#: src/global.c:564
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr ""
 
-#: src/global.c:560
+#: src/global.c:566
 msgid "Go to the first line of the file"
 msgstr "G� til f�rste linje i fila"
 
-#: src/global.c:562
+#: src/global.c:567
 msgid "Go to the last line of the file"
 msgstr "G� til siste linje i fila"
 
-#: src/global.c:564
+#: src/global.c:569
 #, fuzzy
 msgid "Go to the matching bracket"
 msgstr "Inga motsvarande klamme"
 
-#: src/global.c:566
+#: src/global.c:571
 msgid "Scroll up one line without scrolling the cursor"
 msgstr ""
 
-#: src/global.c:568
+#: src/global.c:573
 msgid "Scroll down one line without scrolling the cursor"
 msgstr ""
 
-#: src/global.c:572
+#: src/global.c:576
 #, fuzzy
 msgid "Switch to the previous file buffer"
 msgstr "G� til f�rre skjerm"
 
-#: src/global.c:574
+#: src/global.c:577
 msgid "Switch to the next file buffer"
 msgstr ""
 
-#: src/global.c:577
+#: src/global.c:579
 msgid "Insert the next keystroke verbatim"
 msgstr ""
 
-#: src/global.c:579
+#: src/global.c:580
 #, fuzzy
 msgid "Insert a tab at the cursor position"
 msgstr "Sett inn eit linjeskift"
@@ -678,352 +651,466 @@ msgstr "Sett inn eit linjeskift"
 msgid "Insert a newline at the cursor position"
 msgstr "Sett inn eit linjeskift"
 
-#: src/global.c:583
+#: src/global.c:582
 msgid "Delete the character under the cursor"
 msgstr "Slett bokstaven under mark�ren"
 
-#: src/global.c:585
+#: src/global.c:584
 msgid "Delete the character to the left of the cursor"
 msgstr "Slett bokstaven til venstre for mark�ren"
 
-#: src/global.c:588
+#: src/global.c:587
 #, fuzzy
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Set inn utklippsbufferet her"
 
-#: src/global.c:591
+#: src/global.c:590
 #, fuzzy
 msgid "Justify the entire file"
 msgstr "Brekk om avsnittet"
 
-#: src/global.c:595
+#: src/global.c:594
 msgid "Count the number of words, lines, and characters"
 msgstr ""
 
-#: src/global.c:598
+#: src/global.c:597
 msgid "Refresh (redraw) the current screen"
 msgstr "Teikn skjermen p� nytt"
 
-#: src/global.c:600
+#: src/global.c:599
 msgid "Suspend the editor (if suspend is enabled)"
 msgstr ""
 
-#: src/global.c:603
+#: src/global.c:602
 #, fuzzy
 msgid "Toggle the case sensitivity of the search"
 msgstr "S�k (skil mellom store og sm� bokstavar)"
 
-#: src/global.c:605
+#: src/global.c:604
 #, fuzzy
 msgid "Reverse the direction of the search"
 msgstr "Vis mark�rposisjonen"
 
-#: src/global.c:609
+#: src/global.c:608
 #, fuzzy
 msgid "Toggle the use of regular expressions"
 msgstr "Bruk regul�re uttrykk"
 
-#: src/global.c:613
+#: src/global.c:612
 #, fuzzy
 msgid "Recall the previous search/replace string"
 msgstr "G� til f�rre skjerm"
 
-#: src/global.c:615
+#: src/global.c:614
 msgid "Recall the next search/replace string"
 msgstr ""
 
-#: src/global.c:618
+#: src/global.c:617
 msgid "Go to file browser"
 msgstr "G� til fillesar"
 
-#: src/global.c:621
+#: src/global.c:620
 #, fuzzy
 msgid "Toggle the use of DOS format"
 msgstr "Skriv fila p� DOS-format"
 
-#: src/global.c:622
+#: src/global.c:621
 #, fuzzy
 msgid "Toggle the use of Mac format"
 msgstr "Skriv fila p� Mac-format"
 
-#: src/global.c:624
+#: src/global.c:622
 msgid "Toggle appending"
 msgstr ""
 
-#: src/global.c:625
+#: src/global.c:623
 msgid "Toggle prepending"
 msgstr ""
 
-#: src/global.c:628
+#: src/global.c:624
 msgid "Toggle backing up of the original file"
 msgstr ""
 
-#: src/global.c:629
+#: src/global.c:625
 msgid "Execute external command"
 msgstr ""
 
-#: src/global.c:633
+#: src/global.c:628
 msgid "Toggle the use of a new buffer"
 msgstr ""
 
-#: src/global.c:636
+#: src/global.c:631
 #, fuzzy
 msgid "Exit from the file browser"
 msgstr "G� til fillesar"
 
-#: src/global.c:638
+#: src/global.c:632
 #, fuzzy
 msgid "Go to the first file in the list"
 msgstr "G� til f�rste linje i fila"
 
-#: src/global.c:640
+#: src/global.c:633
 #, fuzzy
 msgid "Go to the last file in the list"
 msgstr "G� til siste linje i fila"
 
-#: src/global.c:641
-#, fuzzy
-msgid "Go to the next file in the list"
-msgstr "G� til siste linje i fila"
-
-#: src/global.c:642
+#: src/global.c:634
 #, fuzzy
 msgid "Go to the previous file in the list"
 msgstr "G� til f�rste linje i fila"
 
-#: src/global.c:643
+#: src/global.c:635
+#, fuzzy
+msgid "Go to the next file in the list"
+msgstr "G� til siste linje i fila"
+
+#: src/global.c:636
 #, fuzzy
 msgid "Go to directory"
 msgstr "G� til katalog"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:670
-msgid "Close"
-msgstr "Lukk"
+#: src/global.c:639
+#, fuzzy
+msgid "Invoke the linter, if available"
+msgstr "Start stavekontroll (om tilgjengeleg)"
+
+#: src/global.c:640
+msgid "Go to previous linter msg"
+msgstr ""
+
+#: src/global.c:641
+msgid "Go to next linter msg"
+msgstr ""
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:679
-msgid "WriteOut"
+#: src/global.c:642
+#, 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:662
+msgid "Get Help"
+msgstr "Hjelp"
+
+#: src/global.c:665 src/prompt.c:1084
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: src/global.c:678
+#, fuzzy
+msgid "Write Out"
 msgstr "Lagra"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:704
+#, fuzzy
+msgid "Go To Dir"
+msgstr "G� til katalog"
+
+#: src/global.c:719
+msgid "Cut Text"
+msgstr "Klipp"
+
+#: src/global.c:728
 msgid "Justify"
 msgstr "Brekk om"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:696
-msgid "Read File"
-msgstr "Les fil"
+#: src/global.c:733
+msgid "To Spell"
+msgstr "Staving"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:713
-msgid "Cut Text"
-msgstr "Klipp"
+#: src/global.c:738
+#, fuzzy
+msgid "To Linter"
+msgstr "G� til linje"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:718
-msgid "UnJustify"
-msgstr "U-ombrekk"
+#: src/global.c:740
+#, fuzzy
+msgid "Formatter"
+msgstr "DOS-format"
+
+#: src/global.c:745
+msgid "Case Sens"
+msgstr "Store/sm�"
+
+#: src/global.c:750
+msgid "Regexp"
+msgstr "Reguttrykk"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:723
+#: src/global.c:755
 #, fuzzy
-msgid "UnCut Text"
-msgstr "U-klipp"
+msgid "Backwards"
+msgstr " [Bakover]"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:728 src/global.c:755
+#: src/global.c:762
+msgid "No Replace"
+msgstr "Inga erstatting"
+
+#: src/global.c:770
 msgid "Cur Pos"
 msgstr "Posisjon"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:737
-msgid "To Spell"
-msgstr "Staving"
+#: src/global.c:780
+msgid "Prev Page"
+msgstr "F�rre side"
+
+#: src/global.c:782
+msgid "Next Page"
+msgstr "Neste side"
 
-#: src/global.c:771
+#: src/global.c:785
+msgid "First Line"
+msgstr "F�rste linje"
+
+#: src/global.c:787
+msgid "Last Line"
+msgstr "Siste linje"
+
+#: src/global.c:794
+#, fuzzy
+msgid "To Bracket"
+msgstr "Ikkje ei klamme"
+
+#: src/global.c:797
 msgid "Mark Text"
 msgstr "Merk tekst"
 
-#: src/global.c:777
+#: src/global.c:800
 #, fuzzy
 msgid "Copy Text"
 msgstr "Klipp"
 
-#: src/global.c:780
+#: src/global.c:803
 #, fuzzy
 msgid "Indent Text"
 msgstr "Klipp"
 
-#: src/global.c:783
-#, fuzzy
+#: src/global.c:805
 msgid "Unindent Text"
-msgstr "U-klipp"
+msgstr ""
 
-#: src/global.c:787
+#: src/global.c:808
 msgid "Undo"
 msgstr ""
 
-#: src/global.c:790
+#: src/global.c:810
 msgid "Redo"
 msgstr ""
 
-#: src/global.c:796 src/global.c:800
-msgid "Forward"
-msgstr "Framover"
-
-#: src/global.c:806 src/global.c:810
+#: src/global.c:814 src/global.c:820
 msgid "Back"
 msgstr "Bakover"
 
-#: src/global.c:817
-msgid "Next Word"
-msgstr ""
+#: src/global.c:816 src/global.c:822
+msgid "Forward"
+msgstr "Framover"
 
-#: src/global.c:820
+#: src/global.c:827
 msgid "Prev Word"
 msgstr ""
 
-#: src/global.c:824
-#, fuzzy
-msgid "Prev Line"
-msgstr "F�rre side"
-
-#: src/global.c:827
-#, fuzzy
-msgid "Next Line"
-msgstr "Neste fil"
+#: src/global.c:829
+msgid "Next Word"
+msgstr ""
 
-#: src/global.c:830
+#: src/global.c:833
 msgid "Home"
 msgstr "Home"
 
-#: src/global.c:833
+#: src/global.c:835
 msgid "End"
 msgstr "End"
 
-#: src/global.c:845
-msgid "Find Other Bracket"
-msgstr "Finn den andre klamma"
+#: src/global.c:844
+msgid "Beg of Par"
+msgstr ""
+
+#: src/global.c:846
+msgid "End of Par"
+msgstr ""
 
-#: src/global.c:848
+#: src/global.c:851
 msgid "Scroll Up"
 msgstr ""
 
-#: src/global.c:851
+#: src/global.c:853
 msgid "Scroll Down"
 msgstr ""
 
-#: src/global.c:856
-msgid "Previous File"
+#: src/global.c:858
+#, fuzzy
+msgid "Prev File"
 msgstr "F�rre fil"
 
-#: src/global.c:858
+#: src/global.c:860
 msgid "Next File"
 msgstr "Neste fil"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:862 src/text.c:3045
-msgid "Verbatim Input"
+#: src/global.c:869
+msgid "Verbatim"
 msgstr ""
 
-#: src/global.c:867
+#: src/global.c:872
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:870
+#: src/global.c:874
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:873
+#: src/global.c:876
 msgid "Delete"
 msgstr "Delete"
 
-#: src/global.c:876
+#: src/global.c:878
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/global.c:893
+#: src/global.c:888
 msgid "CutTillEnd"
 msgstr ""
 
-#: src/global.c:906
+#: src/global.c:898
 msgid "Word Count"
 msgstr ""
 
-#: src/global.c:1367
+#: src/global.c:905
+msgid "Suspend"
+msgstr "Legg i bakgrunnen"
+
+#: src/global.c:910
+msgid "PrevHstory"
+msgstr ""
+
+#: src/global.c:913
+msgid "NextHstory"
+msgstr ""
+
+#: src/global.c:917
+msgid "Go To Text"
+msgstr ""
+
+#: src/global.c:928
+msgid "DOS Format"
+msgstr "DOS-format"
+
+#: src/global.c:931
+msgid "Mac Format"
+msgstr "Mac-format"
+
+#: src/global.c:934
+msgid "Append"
+msgstr "Legg til"
+
+#: src/global.c:936
+#, fuzzy
+msgid "Prepend"
+msgstr "Legg til"
+
+#: src/global.c:939
+#, fuzzy
+msgid "Backup File"
+msgstr "Les fil"
+
+#: src/global.c:946
+msgid "Execute Command"
+msgstr ""
+
+#: src/global.c:961
+msgid "To Files"
+msgstr "Til filer"
+
+#: src/global.c:964
+#, fuzzy
+msgid "First File"
+msgstr "F�rste linje"
+
+#: src/global.c:966
+#, fuzzy
+msgid "Last File"
+msgstr "Siste linje"
+
+#: src/global.c:977
+msgid "Prev Lint Msg"
+msgstr ""
+
+#: src/global.c:979
+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:1227
 msgid "Help mode"
 msgstr "Hjelpetekst"
 
-#: src/global.c:1369
+#: src/global.c:1229
 #, fuzzy
 msgid "Constant cursor position display"
 msgstr "Fast mark�rposisjon"
 
-#: src/global.c:1371
+#: src/global.c:1231
 msgid "Use of one more line for editing"
 msgstr ""
 
-#: src/global.c:1373
+#: src/global.c:1233
 msgid "Smooth scrolling"
 msgstr "Jamn linjerulling"
 
-#: src/global.c:1375
+#: src/global.c:1235
+#, fuzzy
+msgid "Soft wrapping of overlong lines"
+msgstr " -w \t\tIkkje bryt lange linjer\n"
+
+#: src/global.c:1237
 msgid "Whitespace display"
 msgstr ""
 
-#: src/global.c:1377
+#: src/global.c:1239
 msgid "Color syntax highlighting"
 msgstr ""
 
-#: src/global.c:1379
+#: src/global.c:1241
 msgid "Smart home key"
 msgstr ""
 
-#: src/global.c:1381
+#: src/global.c:1243
 msgid "Auto indent"
 msgstr "Automatisk innrykk"
 
-#: src/global.c:1383
+#: src/global.c:1245
 msgid "Cut to end"
 msgstr "Klipp til slutten"
 
-#: src/global.c:1385
-msgid "Long line wrapping"
+#: src/global.c:1247
+msgid "Hard wrapping of overlong lines"
 msgstr ""
 
-#: src/global.c:1387
+#: src/global.c:1249
 msgid "Conversion of typed tabs to spaces"
 msgstr ""
 
-#: src/global.c:1389
+#: src/global.c:1251
 msgid "Backup files"
 msgstr ""
 
-#: src/global.c:1391
+#: src/global.c:1253
 msgid "Multiple file buffers"
 msgstr "Mange filbuffer"
 
-#: src/global.c:1393
+#: src/global.c:1255
 msgid "Mouse support"
 msgstr "Musest�tte"
 
-#: src/global.c:1395
+#: src/global.c:1257
 msgid "No conversion from DOS/Mac format"
 msgstr "Inga omsetjing fr� DOS/Mac-format"
 
-#: src/global.c:1397
+#: src/global.c:1259
 #, fuzzy
 msgid "Suspension"
 msgstr "Legg i bakgrunnen"
 
-#: src/global.c:1399
-msgid "Soft line wrapping"
-msgstr ""
-
-#: src/help.c:236
+#: src/help.c:205
 #, fuzzy
 msgid ""
 "Search Command Help Text\n"
@@ -1051,7 +1138,7 @@ msgstr ""
 " F�lgjande funksjonstastar er tilgjengelege i s�kjemodus:\n"
 "\n"
 
-#: src/help.c:245
+#: src/help.c:214
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1060,7 +1147,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:251
+#: src/help.c:220
 #, fuzzy
 msgid ""
 "Go To Line Help Text\n"
@@ -1081,7 +1168,7 @@ msgstr ""
 " F�lgjande funksjonstastar er tilgjengelege i G� til linje-modus:\n"
 "\n"
 
-#: src/help.c:260
+#: src/help.c:229
 #, fuzzy
 msgid ""
 "Insert File Help Text\n"
@@ -1109,7 +1196,7 @@ msgstr ""
 " F�lgjande funksjonstastar er tilgjengelege i Set inn fil-modus:\n"
 "\n"
 
-#: src/help.c:269
+#: src/help.c:238
 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"
@@ -1118,7 +1205,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:275
+#: src/help.c:244
 #, fuzzy
 msgid ""
 "Write File Help Text\n"
@@ -1146,7 +1233,7 @@ msgstr ""
 " F�lgjande funksjonstastar er tilgjengelege i Lagre fil-modus:\n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:258
 #, fuzzy
 msgid ""
 "File Browser Help Text\n"
@@ -1171,7 +1258,7 @@ msgstr ""
 " F�lgjande funksjonstastar er tilgjengelege i filutforskaren:\n"
 "\n"
 
-#: src/help.c:302
+#: src/help.c:271
 #, fuzzy
 msgid ""
 "Browser Search Command Help Text\n"
@@ -1200,13 +1287,13 @@ msgstr ""
 " F�lgjande funksjonstastar er tilgjengelege i s�kjemodus:\n"
 "\n"
 
-#: src/help.c:311
+#: src/help.c:280
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
 msgstr ""
 
-#: src/help.c:315
+#: src/help.c:284
 #, fuzzy
 msgid ""
 "Browser Go To Directory Help Text\n"
@@ -1229,7 +1316,7 @@ msgstr ""
 " F�lgjande funksjonstastar er tilgjengelege i G� til katalog-modus:\n"
 "\n"
 
-#: src/help.c:328
+#: src/help.c:297
 #, fuzzy
 msgid ""
 "Spell Check Help Text\n"
@@ -1252,7 +1339,7 @@ msgstr ""
 " F�lgjande andre funksjonar er tilgjengelege i stavesjekkingsmodus:\n"
 "\n"
 
-#: src/help.c:343
+#: src/help.c:312
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1264,7 +1351,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:356
+#: src/help.c:325
 #, fuzzy
 msgid ""
 "Main nano help text\n"
@@ -1291,7 +1378,7 @@ msgstr ""
 "tastaturoppsettet ditt. Dei f�lgjande tastetrykkja er tilgjengelege i "
 "hovudvindauget. Valfrie tastar er vist i parentes:\n"
 
-#: src/help.c:366
+#: src/help.c:335
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1302,7 +1389,7 @@ msgid ""
 "Alt, or Meta key depending on your keyboard setup.  "
 msgstr ""
 
-#: src/help.c:375
+#: src/help.c:344
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1311,17 +1398,17 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:376 src/help.c:448
 #, fuzzy
 msgid "enable/disable"
 msgstr "%s skru p�/av"
 
-#: src/nano.c:587
+#: src/nano.c:601
 #, fuzzy
 msgid "Key invalid in view mode"
 msgstr "Tasten er ulovleg i VIS-modus"
 
-#: src/nano.c:695
+#: src/nano.c:713
 #, c-format
 msgid ""
 "\n"
@@ -1330,7 +1417,7 @@ msgstr ""
 "\n"
 "Buffer lagra til %s\n"
 
-#: src/nano.c:697
+#: src/nano.c:715
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -1339,7 +1426,7 @@ msgstr ""
 "\n"
 "Buffer lagra til %s\n"
 
-#: src/nano.c:700
+#: src/nano.c:718
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -1348,279 +1435,285 @@ msgstr ""
 "\n"
 "Buffer lagra til %s\n"
 
-#: src/nano.c:723
+#: src/nano.c:743
 #, fuzzy
 msgid "Window size is too small for nano...\n"
 msgstr "Vindauget er for lite for Nano..."
 
-#: src/nano.c:816
+#: src/nano.c:836
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
 "\n"
 msgstr ""
 
-#: src/nano.c:819
+#: src/nano.c:839
 #, fuzzy, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Opsjon\t\tLang opsjon\t\tTyding\n"
 
-#: src/nano.c:821
+#: src/nano.c:841
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Opsjon\t\tTyding\n"
 
-#: src/nano.c:824
-#, fuzzy
-msgid "Show this message"
-msgstr " -h \t\tVis denne meldinga\n"
-
-#: src/nano.c:825
+#: src/nano.c:844
 msgid "+LINE,COLUMN"
 msgstr ""
 
-#: src/nano.c:826
+#. TRANSLATORS: The next forty or so strings are option descriptions
+#. * for the --help output.  Try to keep them at most 40 characters.
+#: src/nano.c:847
 msgid "Start at line LINE, column COLUMN"
 msgstr ""
 
-#: src/nano.c:828
+#: src/nano.c:849
 msgid "Enable smart home key"
 msgstr ""
 
-#: src/nano.c:829
+#: src/nano.c:850
 msgid "Save backups of existing files"
 msgstr ""
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "-C <dir>"
 msgstr ""
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "--backupdir=<dir>"
 msgstr ""
 
-#: src/nano.c:831
+#: src/nano.c:852
 msgid "Directory for saving unique backup files"
 msgstr ""
 
-#: src/nano.c:834
+#: src/nano.c:855
 msgid "Use bold instead of reverse video text"
 msgstr ""
 
-#: src/nano.c:837
+#: src/nano.c:858
 msgid "Convert typed tabs to spaces"
 msgstr ""
 
-#: src/nano.c:840
+#: src/nano.c:861
 #, fuzzy
 msgid "Enable multiple file buffers"
 msgstr " -F \t\tSkru p� fleire filbuffer\n"
 
-#: src/nano.c:845
+#: src/nano.c:865
+msgid "Use (vim-style) lock files"
+msgstr ""
+
+#: src/nano.c:869
 msgid "Log & read search/replace string history"
 msgstr ""
 
-#: src/nano.c:848
+#: src/nano.c:873
 msgid "Don't look at nanorc files"
 msgstr ""
 
-#: src/nano.c:851
+#: src/nano.c:876
 msgid "Fix numeric keypad key confusion problem"
 msgstr ""
 
-#: src/nano.c:853
+#: src/nano.c:878
 msgid "Don't add newlines to the ends of files"
 msgstr ""
 
-#: src/nano.c:856
+#: src/nano.c:881
 #, fuzzy
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Inga omsetjing fr� DOS/Mac-format"
 
-#: src/nano.c:858
+#: src/nano.c:883
 msgid "Use one more line for editing"
 msgstr ""
 
-#: src/nano.c:860
+#: src/nano.c:886
+#, fuzzy
+msgid "Log & read location of cursor position"
+msgstr "Fast mark�rposisjon"
+
+#: src/nano.c:889
 msgid "-Q <str>"
 msgstr ""
 
-#: src/nano.c:860
+#: src/nano.c:889
 msgid "--quotestr=<str>"
 msgstr ""
 
-#: src/nano.c:861
+#: src/nano.c:890
 msgid "Quoting string"
 msgstr ""
 
-#: src/nano.c:863
+#: src/nano.c:892
 msgid "Restricted mode"
 msgstr ""
 
-#: src/nano.c:866
+#: src/nano.c:895
 msgid "Scroll by line instead of half-screen"
 msgstr ""
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "-T <#cols>"
 msgstr ""
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "--tabsize=<#cols>"
 msgstr ""
 
-#: src/nano.c:869
+#: src/nano.c:898
 #, fuzzy
 msgid "Set width of a tab to #cols columns"
 msgstr " -T [TAL]\tSet breidda p� tabulator til TAL\n"
 
-#: src/nano.c:871
+#: src/nano.c:900
 msgid "Do quick statusbar blanking"
 msgstr ""
 
-#: src/nano.c:874
+#: src/nano.c:903
 #, fuzzy
 msgid "Print version information and exit"
 msgstr " -V \t\tSkriv ut versjonsnummer og avslutt\n"
 
-#: src/nano.c:877
+#: src/nano.c:906
 msgid "Detect word boundaries more accurately"
 msgstr ""
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "-Y <str>"
 msgstr ""
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "--syntax=<str>"
 msgstr ""
 
-#: src/nano.c:881
+#: src/nano.c:910
 msgid "Syntax definition to use for coloring"
 msgstr ""
 
-#: src/nano.c:883
+#: src/nano.c:912
 #, fuzzy
 msgid "Constantly show cursor position"
 msgstr " -c \t\tFast mark�rposisjon\n"
 
-#: src/nano.c:885
+#: src/nano.c:914
 msgid "Fix Backspace/Delete confusion problem"
 msgstr ""
 
-#: src/nano.c:888
+#: src/nano.c:915
+msgid "Show this help text"
+msgstr ""
+
+#: src/nano.c:918
 #, fuzzy
 msgid "Automatically indent new lines"
 msgstr " -i \t\tAutomatisk linjeinnrykk\n"
 
-#: src/nano.c:889
+#: src/nano.c:919
 #, fuzzy
 msgid "Cut from cursor to end of line"
 msgstr " -k \t\tLat ^K klippe fr� mark�ren og ut linja\n"
 
-#: src/nano.c:892
+#: src/nano.c:922
 #, fuzzy
 msgid "Don't follow symbolic links, overwrite"
 msgstr " -l \t\tF�lg ikkje symbolske lenker, skriv over\n"
 
-#: src/nano.c:894
+#: src/nano.c:924
 msgid "Enable the use of the mouse"
 msgstr ""
 
-#: src/nano.c:897
+#: src/nano.c:926
+msgid "Do not read the file (only write it)"
+msgstr ""
+
+#: src/nano.c:928
 msgid "-o <dir>"
 msgstr ""
 
-#: src/nano.c:897
+#: src/nano.c:928
 msgid "--operatingdir=<dir>"
 msgstr ""
 
-#: src/nano.c:898
+#: src/nano.c:929
 #, fuzzy
 msgid "Set operating directory"
 msgstr " -o [kat] \tSet aktiv filkatalog\n"
 
-#: src/nano.c:901
+#: src/nano.c:932
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr ""
 
-#: src/nano.c:903
+#: src/nano.c:935
 msgid "Silently ignore startup issues like rc file errors"
 msgstr ""
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "-r <#cols>"
 msgstr ""
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "--fill=<#cols>"
 msgstr ""
 
-#: src/nano.c:906
-msgid "Set wrapping point at column #cols"
+#: src/nano.c:939
+msgid "Set hard-wrapping point at column #cols"
 msgstr ""
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "-s <prog>"
 msgstr ""
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "--speller=<prog>"
 msgstr ""
 
-#: src/nano.c:910
+#: src/nano.c:943
 #, fuzzy
 msgid "Enable alternate speller"
 msgstr " -s [PROG]  \tBruk PROG til stavesjekk\n"
 
-#: src/nano.c:913
+#: src/nano.c:946
 #, fuzzy
 msgid "Auto save on exit, don't prompt"
 msgstr " -t \t\tLagra utan � sp�rja ved avslutning\n"
 
-#: src/nano.c:915
-msgid "Allow generic undo [EXPERIMENTAL]"
-msgstr ""
-
-#: src/nano.c:918
+#: src/nano.c:947
 #, fuzzy
 msgid "View mode (read-only)"
 msgstr " -v \t\tVis-modus (berre lesing)\n"
 
-#: src/nano.c:920
+#: src/nano.c:949
 #, fuzzy
-msgid "Don't wrap long lines"
+msgid "Don't hard-wrap long lines"
 msgstr " -w \t\tIkkje bryt lange linjer\n"
 
-#: src/nano.c:922
+#: src/nano.c:951
 #, fuzzy
 msgid "Don't show the two help lines"
 msgstr " -x \t\tIkkje vis hjelpevindu\n"
 
-#: src/nano.c:923
+#: src/nano.c:952
 #, fuzzy
 msgid "Enable suspension"
 msgstr " -z \t\tTillat � leggja programmet i bakgrunnen\n"
 
-#: src/nano.c:924
+#: src/nano.c:954
 msgid "Enable soft line wrapping"
 msgstr ""
 
-#: src/nano.c:928
-msgid "(ignored, for Pico compatibility)"
-msgstr ""
-
-#: src/nano.c:938
-#, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
+#: src/nano.c:963
+#, fuzzy, c-format
+msgid " GNU nano, version %s\n"
 msgstr "GNU nano versjon %s (kompilert %s, %s)\n"
 
-#: src/nano.c:943
+#: src/nano.c:966
 #, 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:944
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1629,157 +1722,182 @@ msgstr ""
 "\n"
 " Kompilerte tillegg:"
 
-#: src/nano.c:1022
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr ""
 
-#: src/nano.c:1044
+#: src/nano.c:1125
+#, fuzzy
+msgid "No file name"
+msgstr "filnamnet er %s"
+
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "Lagra endra buffer (\"No\" VIL MISSA ENDRINGANE)? "
 
-#: src/nano.c:1088
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr ""
 
-#: src/nano.c:1114
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr ""
 
-#: src/nano.c:1182
+#: src/nano.c:1279
 #, fuzzy
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Mottok SIGHUP"
 
-#: src/nano.c:1204
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr ""
 
-#: src/nano.c:1386
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "p�"
 
-#: src/nano.c:1387
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "av"
 
-#: src/nano.c:1548 src/winio.c:1256
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr ""
 
-#: src/nano.c:1674
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr ""
 
-#: src/nano.c:1679
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr ""
 
-#: src/nano.c:2209 src/rcfile.c:1100
+#: src/nano.c:2310 src/rcfile.c:1325
 #, fuzzy, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "tab-breidda du foreslo (%d) er for smal"
 
-#: src/nano.c:2268 src/rcfile.c:1025
+#: src/nano.c:2374 src/rcfile.c:1250
 #, fuzzy, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "fyllbreidda du foreslo (%d) er for smal"
 
+#: src/nano.c:2415
+#, c-format
+msgid "Type '%s -h' for a list of available options.\n"
+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:1259
+#: src/prompt.c:1055
 msgid "Yy"
 msgstr "JjYy"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1056
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1057
 msgid "Aa"
 msgstr "Aa"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1071
 msgid "Yes"
 msgstr "Ja"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1076
 msgid "All"
 msgstr "Alle"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1081
 msgid "No"
 msgstr "Nei"
 
-#: src/rcfile.c:130
+#: src/rcfile.c:137
 #, fuzzy, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Feil i %s p� linje %d: "
 
-#: src/rcfile.c:185
+#: src/rcfile.c:196
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr ""
 
-#: src/rcfile.c:212 src/rcfile.c:264 src/rcfile.c:711 src/rcfile.c:768
-#: src/rcfile.c:821
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 #, fuzzy
 msgid "Regex strings must begin and end with a \" character"
 msgstr "reguttrykk m� starte og slutte med eit \"-teikn\n"
 
-#: src/rcfile.c:238 src/search.c:62
+#: src/rcfile.c:249 src/search.c:62
 #, fuzzy, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Kan ikkje opna �%s�: %s"
 
-#: src/rcfile.c:258
+#: src/rcfile.c:269
 #, fuzzy
 msgid "Missing syntax name"
 msgstr "Fargenamnet manglar"
 
-#: src/rcfile.c:316
+#: src/rcfile.c:340
 msgid "The \"none\" syntax is reserved"
 msgstr ""
 
-#: src/rcfile.c:323
+#: src/rcfile.c:347
 msgid "The \"default\" syntax must take no extensions"
 msgstr ""
 
-#: src/rcfile.c:386 src/rcfile.c:483
+#: src/rcfile.c:433
 #, fuzzy
 msgid "Missing key name"
 msgstr "Fargenamnet manglar"
 
-#: src/rcfile.c:398 src/rcfile.c:499
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
+#: src/rcfile.c:442 src/rcfile.c:453
+msgid "Key name is too short"
 msgstr ""
 
-#: src/rcfile.c:407
-msgid "Must specify function to bind key to"
+#: src/rcfile.c:463
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr ""
 
-#: src/rcfile.c:418 src/rcfile.c:510
-msgid "Must specify menu to bind key to (or \"all\")"
+#: src/rcfile.c:472
+msgid "Must specify a function to bind the key to"
 msgstr ""
 
-#: src/rcfile.c:426
-#, fuzzy, c-format
-msgid "Could not map name \"%s\" to a function"
-msgstr "Kunne ikkje opna %s for skriving: %s"
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:482
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
+msgstr ""
+
+#: src/rcfile.c:489
+#, c-format
+msgid "Cannot map name \"%s\" to a function"
+msgstr ""
 
-#: src/rcfile.c:432 src/rcfile.c:517
+#: src/rcfile.c:496
 #, c-format
-msgid "Could not map name \"%s\" to a menu"
+msgid "Cannot map name \"%s\" to a menu"
 msgstr ""
 
-#: src/rcfile.c:454
+#: src/rcfile.c:528
 #, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
+msgid "Function '%s' does not exist in menu '%s'"
 msgstr ""
 
-#: src/rcfile.c:625
+#: src/rcfile.c:543
+#, c-format
+msgid "Sorry, keystroke \"%s\" may not be rebound"
+msgstr ""
+
+#: src/rcfile.c:629
+#, c-format
+msgid "Error expanding %s: %s"
+msgstr ""
+
+#: src/rcfile.c:672
 #, fuzzy, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1793,139 +1911,196 @@ 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:647
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
 msgstr ""
 
-#: src/rcfile.c:652
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "Fargenamnet manglar"
 
-#: src/rcfile.c:672
-#, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr ""
-
-#: src/rcfile.c:690 src/rcfile.c:809
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr ""
 
-#: src/rcfile.c:762
+#: src/rcfile.c:785
 #, fuzzy
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr ""
 "\n"
 "\tfor kvar �start=� m� der vera ein �end=�"
 
-#: src/rcfile.c:804
+#: src/rcfile.c:837
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr ""
+
+#: src/rcfile.c:865
 msgid "Cannot add a header regex without a syntax command"
 msgstr ""
 
-#: src/rcfile.c:874
+#: src/rcfile.c:921
+msgid "Cannot add a magic string regex without a syntax command"
+msgstr ""
+
+#: src/rcfile.c:926
+#, fuzzy
+msgid "Missing magic string name"
+msgstr "Fargenamnet manglar"
+
+#: src/rcfile.c:985
+msgid "Cannot add a linter without a syntax command"
+msgstr ""
+
+#: src/rcfile.c:990
+#, fuzzy
+msgid "Missing linter command"
+msgstr "Fargenamnet manglar"
+
+#: src/rcfile.c:1010
+msgid "Cannot add formatter without a syntax command"
+msgstr ""
+
+#: src/rcfile.c:1015
+msgid "Missing formatter command"
+msgstr ""
+
+#: src/rcfile.c:1045
 #, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
+msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr ""
 
-#: src/rcfile.c:876
+#: src/rcfile.c:1047
+#, c-format
 msgid ""
-"Exiting.  Please use nano with the -I option if needed to adjust your nanorc "
-"settings\n"
+"If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
 
-#: src/rcfile.c:926 src/rcfile.c:935 src/rcfile.c:945
+#: src/rcfile.c:1108
+#, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr ""
+
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr ""
 
-#: src/rcfile.c:951 src/rcfile.c:1128
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr ""
 
-#: src/rcfile.c:966
+#: src/rcfile.c:1171
 #, fuzzy, c-format
 msgid "Command \"%s\" not understood"
 msgstr "kommandoen %s er ikkje forst�eleg"
 
-#: src/rcfile.c:972
+#: src/rcfile.c:1186
 #, fuzzy
-msgid "Missing flag"
+msgid "Missing option"
 msgstr "Fargenamnet manglar"
 
-#: src/rcfile.c:994
+#: src/rcfile.c:1208
 #, fuzzy, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "opsjonen %s krev eit argument"
 
-#: src/rcfile.c:1012
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr ""
 
-#: src/rcfile.c:1038 src/rcfile.c:1066 src/rcfile.c:1075
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr ""
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr ""
 
-#: src/rcfile.c:1114
+#: src/rcfile.c:1339
 #, fuzzy, c-format
-msgid "Cannot unset flag \"%s\""
-msgstr "skru av flagget %d!\n"
+msgid "Cannot unset option \"%s\""
+msgstr "Kan ikkje endra storleik p� toppvindauget"
 
-#: src/rcfile.c:1123
+#: src/rcfile.c:1345
 #, c-format
-msgid "Unknown flag \"%s\""
+msgid "Unknown option \"%s\""
 msgstr ""
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr ""
 
+#: src/rcfile.c:1442
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Press Enter to continue starting nano.\n"
+msgstr ""
+"\n"
+"Trykk Enter for � halda fram lastinga av nano\n"
+
 #: src/search.c:96
 #, fuzzy, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "�%s� ikkje funne"
 
-#: src/search.c:205
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/search.c:184
+msgid " [Case Sensitive]"
+msgstr " [Skil store/sm�]"
+
+#: src/search.c:188
+msgid " [Regexp]"
+msgstr " [Reguttrykk]"
+
+#: src/search.c:192
+msgid " [Backwards]"
+msgstr " [Bakover]"
+
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:197
 #, fuzzy
 msgid " (to replace) in selection"
 msgstr " (� erstatta)"
 
-#: src/search.c:207
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (� erstatta)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "Erstatta dette tilfellet?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:945
 msgid "Replace with"
 msgstr "Erstatt med"
 
-#: src/search.c:1004
+#: src/search.c:986
 #, fuzzy, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
 msgstr[0] "Erstatta %d tilfelle"
 msgstr[1] "Erstatta %d tilfelle"
 
-#: src/search.c:1034
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1027
 #, fuzzy
 msgid "Enter line number, column number"
 msgstr "Skriv linjenummer"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
 msgstr ""
 
-#: src/search.c:1214
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "Ikkje ei klamme"
 
-#: src/search.c:1281
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "Inga motsvarande klamme"
 
@@ -1938,226 +2113,281 @@ msgstr "Merke sett"
 msgid "Mark Unset"
 msgstr "Merke fjerna"
 
-#: src/text.c:443
+#: src/text.c:439
 msgid "Nothing in undo buffer!"
 msgstr ""
 
-#: src/text.c:455 src/text.c:593
+#: src/text.c:445 src/text.c:590
 #, c-format
-msgid "Internal error: can't match line %d.  Please save your work"
+msgid "Internal error: can't match line %d.  Please save your work."
 msgstr ""
 
-#: src/text.c:466 src/text.c:603
+#: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
 msgstr ""
 
-#: src/text.c:475 src/text.c:613
+#: src/text.c:467 src/text.c:612
 #, fuzzy
 msgid "text delete"
 msgstr "Neste fil"
 
-#: src/text.c:489 src/text.c:628
-msgid "line wrap"
-msgstr ""
-
-#: src/text.c:503 src/text.c:636
+#: src/text.c:491 src/text.c:641
 msgid "line join"
 msgstr ""
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:505 src/text.c:657
 msgid "text cut"
 msgstr ""
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:510 src/text.c:661
 msgid "text uncut"
 msgstr ""
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:515 src/text.c:623
 msgid "line break"
 msgstr ""
 
-#: src/text.c:532 src/text.c:665
+#: src/text.c:528 src/text.c:672
 #, fuzzy
 msgid "text insert"
 msgstr "Neste fil"
 
-#: src/text.c:550 src/text.c:659
+#: src/text.c:549 src/text.c:665
 #, fuzzy
 msgid "text replace"
 msgstr " (� erstatta)"
 
-#: src/text.c:557 src/text.c:671
-msgid "Internal error: unknown type.  Please save your work"
+#: src/text.c:556 src/text.c:679 src/text.c:983
+msgid "Internal error: unknown type.  Please save your work."
 msgstr ""
 
-#: src/text.c:563
+#: src/text.c:561
 #, c-format
 msgid "Undid action (%s)"
 msgstr ""
 
-#: src/text.c:578
+#: src/text.c:580
 msgid "Nothing to re-do!"
 msgstr ""
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
+#: src/text.c:584
+msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
 
-#: src/text.c:676
+#: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr ""
 
-#: src/text.c:766
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
 #, fuzzy
-msgid "Could not pipe"
-msgstr "Kunne ikkje lukka %s: %s"
+msgid "Could not create pipe"
+msgstr "Kunne ikkje oppretta mellombels fil: %s"
 
-#: src/text.c:793 src/text.c:2636 src/text.c:2788
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 #, fuzzy
 msgid "Could not fork"
 msgstr "Kunne ikkje lukka %s: %s"
 
-#: src/text.c:941
-msgid "Internal error: can't setup uncut.  Please save your work."
+#: src/text.c:969
+msgid "Internal error: cannot set up uncut.  Please save your work."
 msgstr ""
 
-#: src/text.c:950
-msgid "Internal error: unknown type.  Please save your work."
-msgstr ""
-
-#: src/text.c:1870
+#: src/text.c:1806
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr ""
 
-#: src/text.c:2267
+#: src/text.c:2207
 msgid "Can now UnJustify!"
 msgstr "Du kan no gjera om ombrekkinga!"
 
-#: src/text.c:2462
+#: src/text.c:2404
 msgid "Edit a replacement"
 msgstr "Rediger erstatning"
 
-#: src/text.c:2548
-#, fuzzy
-msgid "Could not create pipe"
-msgstr "Kunne ikkje oppretta mellombels fil: %s"
-
-#: src/text.c:2550
+#: src/text.c:2492
 msgid "Creating misspelled word list, please wait..."
 msgstr ""
 
-#: src/text.c:2642
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
 msgstr ""
 
-#: src/text.c:2693
+#: src/text.c:2635
 msgid "Error invoking \"spell\""
 msgstr ""
 
-#: src/text.c:2696
+#: src/text.c:2638
 msgid "Error invoking \"sort -f\""
 msgstr ""
 
-#: src/text.c:2699
+#: src/text.c:2641
 msgid "Error invoking \"uniq\""
 msgstr ""
 
-#: src/text.c:2756 src/text.c:2965
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "Stavekontroll fullf�rt"
 
-#: src/text.c:2815
+#: src/text.c:2759 src/text.c:3340
 #, fuzzy, c-format
 msgid "Error invoking \"%s\""
 msgstr "Feil i %s p� linje %d: "
 
-#: src/text.c:2960
+#: src/text.c:2885
+#, fuzzy
+msgid "Invoking spell checker, please wait"
+msgstr "Start stavekontroll (om tilgjengeleg)"
+
+#: src/text.c:2902
 #, fuzzy, c-format
 msgid "Spell checking failed: %s"
 msgstr "Stavekontroll feila"
 
-#: src/text.c:2962
+#: src/text.c:2904
 #, fuzzy, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Stavekontroll feila"
 
-#: src/text.c:3030
+#: src/text.c:2937
+msgid "No linter defined for this type of file!"
+msgstr ""
+
+#: src/text.c:2947
+msgid "Save modified buffer before linting?"
+msgstr ""
+
+#: src/text.c:2969
+msgid "Invoking linter, please wait"
+msgstr ""
+
+#: src/text.c:3125
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr ""
+
+#: src/text.c:3159
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr ""
+
+#: src/text.c:3205
+msgid "At last message"
+msgstr ""
+
+#: src/text.c:3210
+msgid "At first message"
+msgstr ""
+
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr ""
+
+#: src/text.c:3275
+msgid "Finished"
+msgstr ""
+
+#: src/text.c:3280
+msgid "Invoking formatter, please wait"
+msgstr ""
+
+#: src/text.c:3360
+msgid "Finished formatting"
+msgstr ""
+
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr ""
 
-#: src/text.c:3031
+#: src/text.c:3439
 #, fuzzy
 msgid "In Selection:  "
 msgstr "Legg til valt omr�de p� slutten av fil"
 
-#: src/utils.c:405 src/utils.c:417
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3453
+msgid "Verbatim Input"
+msgstr ""
+
+#: src/utils.c:410 src/utils.c:422
 #, fuzzy
 msgid "nano is out of memory!"
 msgstr "nano: malloc: tom for minne!"
 
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
-#: src/winio.c:1557
+#: src/winio.c:1583
 msgid "Unicode Input"
 msgstr ""
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2142 src/winio.c:2146
 msgid "Modified"
 msgstr "Endra"
 
-#: src/winio.c:2150
+#: src/winio.c:2143
 msgid "View"
 msgstr ""
 
-#: src/winio.c:2164
+#: src/winio.c:2157
 #, fuzzy
 msgid "DIR:"
 msgstr " KAT: "
 
-#: src/winio.c:2171
+#: src/winio.c:2164
 #, fuzzy
 msgid "File:"
 msgstr "Fil: "
 
-#: src/winio.c:3360
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2261
+msgid ""
+"Warning: Modifying a file which is not locked, check directory permission?"
+msgstr ""
+
+#: src/winio.c:3377
 #, 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:3492
+#: src/winio.c:3507
 msgid "The nano text editor"
 msgstr "Teksteditoren nano"
 
-#: src/winio.c:3493
+#: src/winio.c:3508
 #, fuzzy
 msgid "version"
 msgstr "versjon "
 
-#: src/winio.c:3494
+#: src/winio.c:3509
 msgid "Brought to you by:"
 msgstr "Gjeve til deg av:"
 
-#: src/winio.c:3495
+#: src/winio.c:3510
 msgid "Special thanks to:"
 msgstr "Spesiell takk til:"
 
 # Oversette dette ?
-#: src/winio.c:3496
+#: src/winio.c:3511
 msgid "The Free Software Foundation"
 msgstr "Free Sofware Foundation"
 
-#: src/winio.c:3497
+#: src/winio.c:3512
+msgid "the many translators and the TP"
+msgstr ""
+
+#: src/winio.c:3513
 msgid "For ncurses:"
 msgstr ""
 
-#: src/winio.c:3498
+#: src/winio.c:3514
 msgid "and anyone else we forgot..."
 msgstr "og alle dei andre vi gl�ymde..."
 
-#: src/winio.c:3499
+#: src/winio.c:3515
 #, fuzzy
 msgid "Thank you for using nano!"
 msgstr "Takk for at du brukar nano!\n"
@@ -2174,17 +2404,14 @@ msgstr "Takk for at du brukar nano!\n"
 #~ msgid "File to insert [from ./] "
 #~ msgstr "Fila som skal setjast inn [fr� ./] "
 
-#~ msgid "filename is %s"
-#~ msgstr "filnamnet er %s"
-
 #~ msgid "Could not open file for writing: %s"
 #~ msgstr "Kunne ikkje opna fila for skriving: %s"
 
 #~ msgid "Wrote >%s\n"
 #~ msgstr "Skreiv >%s\n"
 
-#~ msgid "Could not set permissions %o on %s: %s"
-#~ msgstr "Kunne ikkje setja tilgangsniv� %o p� %s: %s"
+#~ msgid "Could not open %s for writing: %s"
+#~ msgstr "Kunne ikkje opna %s for skriving: %s"
 
 #~ msgid "Can't visit parent in restricted mode"
 #~ msgstr "Kan ikkje g� til foreldrekatalogen i avgrensa modus"
@@ -2222,6 +2449,9 @@ msgstr "Takk for at du brukar nano!\n"
 #~ msgid "Search for text within the editor"
 #~ msgstr "S�k etter tekst"
 
+#~ msgid "Move to the next screen"
+#~ msgstr "G� til neste skjerm"
+
 #~ msgid "Move up one line"
 #~ msgstr "G� ei linje opp"
 
@@ -2249,6 +2479,9 @@ msgstr "Takk for at du brukar nano!\n"
 #~ msgid "Down"
 #~ msgstr "Ned"
 
+#~ msgid "Find Other Bracket"
+#~ msgstr "Finn den andre klamma"
+
 #~ msgid "Direction"
 #~ msgstr "Retning"
 
@@ -2368,6 +2601,9 @@ msgstr "Takk for at du brukar nano!\n"
 #~ msgid " -S\t\tSmooth scrolling\n"
 #~ msgstr " -S\t\tJamn linjerulling\n"
 
+#~ msgid " -h \t\tShow this message\n"
+#~ msgstr " -h \t\tVis denne meldinga\n"
+
 #~ msgid " -m \t\tEnable mouse\n"
 #~ msgstr " -m \t\tSkru p� musest�tte\n"
 
@@ -2392,9 +2628,6 @@ 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 "Cannot resize top win"
-#~ msgstr "Kan ikkje endra storleik p� toppvindauget"
-
 #~ msgid "Cannot move top win"
 #~ msgstr "Kan ikke flytta toppvindauget"
 
@@ -2447,6 +2680,9 @@ msgstr "Takk for at du brukar nano!\n"
 #~ msgid "set flag %d!\n"
 #~ msgstr "sett flagget %d!\n"
 
+#~ msgid "unset flag %d!\n"
+#~ msgstr "skru av flagget %d!\n"
+
 #~ msgid "Errors found in .nanorc file"
 #~ msgstr "Feil funne i .nanorc fila"
 
diff --git a/po/pl.gmo b/po/pl.gmo
index 9f8b38f..7b9ff88 100644
--- a/po/pl.gmo
+++ b/po/pl.gmo
diff --git a/po/pl.po b/po/pl.po
index 85a1103..c54002c 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,119 +1,142 @@
 # Polish translations for the nano editor messages
+# Copyright (C) 2014 Free Software Foundation, Inc.
 # This file is distributed under the same license as the nano package.
-# Copyright (C) 2010 Free Software Foundation, Inc.
 #
-# Sergey Poznyakoff <gray@gnu.org>, 2010
-# Wojciech Kotwica <wkotwica@post.pl>, 2002
-# based on uncompleted translation nano_1.0.6 by
 # Cezary Sliwa <sliwa@cft.edu.pl>, 2001.
-#
+# Wojciech Kotwica <wkotwica@post.pl>, 2002.
+# Sergey Poznyakoff <gray@gnu.org>, 2010, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 2.2.4pre2\n"
+"Project-Id-Version: nano 2.3.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-22 06:34-0500\n"
-"PO-Revision-Date: 2010-04-21 19:16+0300\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
+"PO-Revision-Date: 2014-09-02 08:57+0300\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-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:220
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:203
 msgid "Go To Directory"
 msgstr "Przejd� do katalogu"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:860 src/files.c:2048
-#: src/nano.c:1060 src/search.c:220 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Anulowano"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:246 src/browser.c:293
 #, 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:277 src/browser.c:324 src/browser.c:347 src/files.c:722
-#: src/files.c:731 src/files.c:1540 src/files.c:1659 src/files.c:1711
-#: src/files.c:1732 src/files.c:1855 src/files.c:2691 src/rcfile.c:568
-#: src/rcfile.c:1204
+#: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
+#: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
+#: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "B��d odczytu %s: %s"
 
-#: src/browser.c:303
+#: src/browser.c:283
 msgid "Can't move up a directory"
-msgstr "Nie mo�na przej�� katalog wy�ej"
+msgstr "Nie mo�na przej�� do katalogu wy�ej"
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:665 src/browser.c:674
+#: src/browser.c:626 src/browser.c:635
 msgid "(dir)"
 msgstr "(kat)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:632
 msgid "(parent dir)"
 msgstr "(kat nad)"
 
-#: src/browser.c:801 src/search.c:185
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "Szukaj"
 
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:805 src/search.c:189
-msgid " [Case Sensitive]"
-msgstr " [Uwzgl.wielk.liter]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:811 src/search.c:195
-msgid " [Regexp]"
-msgstr " [Wyr.reg.]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:817 src/search.c:201
-msgid " [Backwards]"
-msgstr " [Wstecz]"
-
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "Wyszukiwanie min�o granic� pliku - kontynuowane od pocz�tku (ko�ca)"
 
-#: src/browser.c:1006 src/browser.c:1039 src/search.c:514 src/search.c:517
-#: src/search.c:574 src/search.c:577
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "To jedyne wyst�pienie"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr "Brak wzorca wyszukiwania"
 
-#: src/files.c:125
+#: src/files.c:139
+msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
+msgstr "Nie mo�na ustali� u�ytkownika pliku blokowania (b��d getpwuid())"
+
+#: src/files.c:145
+#, c-format
+msgid "Couldn't determine hostname for lock file: %s"
+msgstr "Nie mo�na ustali� nazwy hosta do blokowania: %s"
+
+#: src/files.c:165 src/files.c:175 src/files.c:212 src/files.c:222
+#, c-format
+msgid "Error writing lock file %s: %s"
+msgstr "B��d zapisu pliku blokowania %s: %s"
+
+#: src/files.c:237
+#, c-format
+msgid "Error deleting lock file %s: %s"
+msgstr "B��d usuwania pliku blokowania %s: %s"
+
+#: src/files.c:272
+#, c-format
+msgid "Error opening lock file %s: %s"
+msgstr "B��d otwierania pliku blokowania %s: %s"
+
+#: src/files.c:282
+#, c-format
+msgid "Error reading lock file %s: Not enough data read"
+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:297
+#, c-format
+msgid "File %s is being edited (by %s with %s, PID %d); continue?"
+msgstr ""
+
+#: src/files.c:308
+#, c-format
+msgid "Error writing lock file: Directory '%s' doesn't exist"
+msgstr "B��d zapisu pliku blokowania: Katalog '%s' nie istnieje"
+
+#: src/files.c:339
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Nie mo�na wstawi� pliku spoza %s "
 
-#: src/files.c:234
+#: src/files.c:467
 msgid "No more open file buffers"
 msgstr "Nie ma wi�cej otwartych bufor�w"
 
-#: src/files.c:250
+#: src/files.c:484
 #, c-format
 msgid "Switched to %s"
 msgstr "Prze��czono na %s"
 
-#: src/files.c:251 src/global.c:469 src/winio.c:2168
+#: src/files.c:485 src/global.c:953 src/winio.c:2161
 msgid "New Buffer"
 msgstr "Nowy bufor"
 
-#: src/files.c:633
+#: src/files.c:874
 #, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
@@ -121,7 +144,7 @@ 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:638
+#: src/files.c:879
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
@@ -139,7 +162,7 @@ msgstr[2] ""
 "Wczytano %lu linii (przekonwertowane z formatu DOS i Mac - Ostrze�enie: brak "
 "pozwolenia na zapis)"
 
-#: src/files.c:644
+#: src/files.c:885
 #, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
@@ -147,7 +170,7 @@ 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:648
+#: src/files.c:889
 #, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
@@ -163,7 +186,7 @@ msgstr[2] ""
 "Wczytano %lu linii (przekonwertowane z formatu Mac - Ostrze�enie: brak "
 "pozwolenia na zapis)"
 
-#: src/files.c:654
+#: src/files.c:895
 #, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
@@ -171,7 +194,7 @@ 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:658
+#: src/files.c:899
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
@@ -187,7 +210,7 @@ msgstr[2] ""
 "Wczytano %lu linii (przekonwertowane z formatu DOS - Ostrze�enie: brak "
 "pozwolenia na zapis)"
 
-#: src/files.c:664
+#: src/files.c:905
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
@@ -195,7 +218,7 @@ msgstr[0] "Wczytano %lu lini�"
 msgstr[1] "Wczytano %lu linie"
 msgstr[2] "Wczytano %lu linii"
 
-#: src/files.c:667
+#: src/files.c:908
 #, c-format
 msgid "Read %lu line ( Warning: No write permission)"
 msgid_plural "Read %lu lines (Warning: No write permission)"
@@ -203,86 +226,95 @@ 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:700 src/files.c:736
+#: src/files.c:943 src/files.c:980
 msgid "Reading File"
 msgstr "Wczytywanie pliku"
 
-#: src/files.c:706
+#: src/files.c:950
 msgid "New File"
 msgstr "Nowy plik"
 
-#: src/files.c:709
+#: src/files.c:953
 #, c-format
 msgid "\"%s\" not found"
 msgstr "Nie znaleziono \"%s\""
 
-#: src/files.c:717 src/rcfile.c:559 src/rcfile.c:1154 src/rcfile.c:1195
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" jest katalogiem"
 
-#: src/files.c:718 src/rcfile.c:560 src/rcfile.c:1155 src/rcfile.c:1196
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" jest plikiem urz�dzenia"
 
-#: src/files.c:817
+#: src/files.c:1060
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Polecenie do wykonania w nowym buforze [z %s] "
 
-#: src/files.c:819
+#: src/files.c:1062
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Polecenie do wykonania [z %s] "
 
-#: src/files.c:825
+#: src/files.c:1069
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Plik do wstawienia do nowego bufora [z %s] "
 
-#: src/files.c:827
+#: src/files.c:1071
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Plik do wstawienia [z %s] "
 
-#: src/files.c:1077
+#: src/files.c:1320
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Klawisz niedozwolony w trybie innym ni� wielu bufor�w"
 
-#: src/files.c:1486
+#: src/files.c:1622
+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 "
+"nie\n"
+"jeste� pewien)"
+
+#: src/files.c:1746
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Nie mo�na zapisa� poza %s"
 
-#: src/files.c:1501
+#: src/files.c:1761
 msgid "Cannot prepend or append to a symlink with --nofollow set"
 msgstr ""
 "Nie mo�na dopisywa� do ��cza symbolicznego przy w��czonej opcji --nofollow"
 
-#: src/files.c:1581 src/files.c:1603 src/files.c:1621 src/files.c:1632
-#: src/files.c:1640 src/files.c:1667
+#: src/files.c:1843 src/files.c:1868 src/files.c:1886 src/files.c:1899
+#: src/files.c:1910 src/files.c:1939
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "B��d zapisu kopii zapasowej %s: %s"
 
-#: src/files.c:1582 src/nano.c:701
+#: src/files.c:1844 src/nano.c:719
 msgid "Too many backup files?"
 msgstr "Za wiele kopii zapasowych?"
 
-#: src/files.c:1687 src/files.c:1744 src/files.c:1763 src/files.c:1775
-#: src/files.c:1799 src/files.c:1817 src/files.c:1827 src/files.c:1863
-#: src/files.c:1868 src/files.c:2764 src/files.c:2773
+#: src/files.c:1959 src/files.c:2016 src/files.c:2035 src/files.c:2047
+#: src/files.c:2071 src/files.c:2089 src/files.c:2099 src/files.c:2135
+#: src/files.c:2140 src/files.c:3101 src/files.c:3110 src/files.c:3133
+#: src/files.c:3145
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "B��d zapisu %s: %s"
 
-#: src/files.c:1721 src/text.c:2929 src/text.c:2941
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "B��d zapisu pliku tymczasowego: %s"
 
-#: src/files.c:1900
+#: src/files.c:2173
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
@@ -290,375 +322,333 @@ msgstr[0] "Zapisano %lu lini�"
 msgstr[1] "Zapisano %lu linie"
 msgstr[2] "Zapisano %lu linii"
 
-#: src/files.c:2004
+#: src/files.c:2278
 msgid " [DOS Format]"
 msgstr " [format DOS]"
 
-#: src/files.c:2005
+#: src/files.c:2279
 msgid " [Mac Format]"
 msgstr " [format Mac]"
 
-#: src/files.c:2007
+#: src/files.c:2281
 msgid " [Backup]"
 msgstr " [Kopia zap.]"
 
-#: src/files.c:2015
+#: src/files.c:2289
 msgid "Prepend Selection to File"
 msgstr "Wpisz wyb�r na pocz�tek pliku"
 
-#: src/files.c:2016
+#: src/files.c:2290
 msgid "Append Selection to File"
 msgstr "Dopisz wyb�r do pliku"
 
-#: src/files.c:2017
+#: src/files.c:2291
 msgid "Write Selection to File"
 msgstr "Zapisz wyb�r do pliku"
 
-#: src/files.c:2020
+#: src/files.c:2294
 msgid "File Name to Prepend to"
 msgstr "Nazwa pliku do wpisania"
 
-#: src/files.c:2021
+#: src/files.c:2295
 msgid "File Name to Append to"
 msgstr "Nazwa pliku do dopisania"
 
-#: src/files.c:2022
+#: src/files.c:2296
 msgid "File Name to Write"
 msgstr "Nazwa pliku do zapisu"
 
-#: src/files.c:2153
+#: src/files.c:2427
 msgid "File exists, OVERWRITE ? "
 msgstr "Plik istnieje, ZAMAZA� ? "
 
-#: src/files.c:2162
+#: src/files.c:2436
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "Zapisa� plik pod INN� NAZW� ? "
 
-#: src/files.c:2173
+#: src/files.c:2450
 msgid "File was modified since you opened it, continue saving ? "
 msgstr "Plik zosta� zmodyfikowany po otworzeniu, kontynuowa� zapis ? "
 
-#: src/files.c:2611
+#: src/files.c:2882
 msgid "(more)"
 msgstr "(wi�cej)"
 
-#: src/files.c:2694 src/rcfile.c:1220
+#: src/files.c:2974
 #, c-format
 msgid ""
 "\n"
-"Press Enter to continue starting nano.\n"
+"Press Enter to continue\n"
 msgstr ""
 "\n"
-"Naci�nij return aby kontynuowa� rozruch nano.\n"
-
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:415 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Anuluj"
+"Naci�nij Enter aby kontynuowa�\n"
 
-#: src/global.c:416
-msgid "Replace"
-msgstr "Zast�p"
+#: src/files.c:2989
+#, 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"
 
-#: src/global.c:417
-msgid "No Replace"
-msgstr "Nie zast."
+#: src/files.c:2995
+#, 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"
+"kursora.\n"
 
-#: src/global.c:420
-msgid "Case Sens"
-msgstr "Wielk.liter"
+#: src/files.c:3012
+#, 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"
 
-#: src/global.c:421
-msgid "Backwards"
-msgstr "Wstecz"
+#: src/files.c:3016
+#, 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 ""
+"Znaleziono stary plik historii nano (%s) oraz przeniesiono\n"
+"go do preferowanego miejsca (%s)\n"
+"(patrz FAQ nano co do tej zmiany)"
 
-#: src/global.c:425
-msgid "Regexp"
-msgstr "Wyr.reg."
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
+#: src/global.c:477
+msgid "Exit"
+msgstr "Wyjd�"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:451
-msgid "PrevHstory"
-msgstr "Poprz.Hist"
+#: src/global.c:478
+msgid "Close"
+msgstr "Zamknij"
 
-#: src/global.c:452
-msgid "NextHstory"
-msgstr "Nast.Hist"
+#: src/global.c:479
+msgid "Uncut Text"
+msgstr "Odn�w Tekst"
 
-#: src/global.c:453
-msgid "Go To Text"
-msgstr "Przejd� do tekstu"
+#: src/global.c:481
+msgid "Unjustify"
+msgstr "Cofnij just."
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:455
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:485
 msgid "WhereIs Next"
 msgstr "Szukaj Zn�w"
 
-#: src/global.c:457
-msgid "First File"
-msgstr "Pierw.Plik"
-
-#: src/global.c:458
-msgid "Last File"
-msgstr "Ost.Plik"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:460
-msgid "To Files"
-msgstr "Pliki"
-
-#: src/global.c:462
-msgid "DOS Format"
-msgstr "Format DOS"
-
-#: src/global.c:463
-msgid "Mac Format"
-msgstr "Format Mac"
-
-#: src/global.c:464
-msgid "Append"
-msgstr "Dopisz"
-
-#: src/global.c:465
-msgid "Prepend"
-msgstr "Wpisz"
-
-#: src/global.c:466
-msgid "Backup File"
-msgstr "Kopia zapas."
-
-#: src/global.c:467
-msgid "Execute Command"
-msgstr "Wywo�aj polecenie"
-
-#: src/global.c:471
-msgid "Go To Dir"
-msgstr "Przejd� do katalogu"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:480
-msgid "Get Help"
-msgstr "Pomoc"
-
-#: src/global.c:481
-msgid "Exit"
-msgstr "Wyjd�"
-
-#: src/global.c:482
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:492
 msgid "Where Is"
 msgstr "Wyszukaj"
 
-#: src/global.c:483
-msgid "Prev Page"
-msgstr "Poprz.str."
-
-#: src/global.c:484
-msgid "Next Page"
-msgstr "Nast.str."
-
-#: src/global.c:485
-msgid "First Line"
-msgstr "Pierw.lin."
+#: src/global.c:493
+msgid "Replace"
+msgstr "Zast�p"
 
-#: src/global.c:486
-msgid "Last Line"
-msgstr "Ost.lin."
+#: src/global.c:494
+msgid "Go To Line"
+msgstr "Przejd� do linii"
 
-#: src/global.c:487
-msgid "Suspend"
-msgstr "Zawie�"
+#: src/global.c:495
+msgid "Prev Line"
+msgstr "Poprz.lin."
 
-#: src/global.c:489
-msgid "Beg of Par"
-msgstr "PoczAkapit"
+#: src/global.c:496
+msgid "Next Line"
+msgstr "Nast. lin."
 
-#: src/global.c:490
-msgid "End of Par"
-msgstr "KonAkapit"
+#: src/global.c:497
+msgid "Read File"
+msgstr "Wczyt.plik"
 
-#: src/global.c:491
+#: src/global.c:499
 msgid "FullJstify"
 msgstr "Wyjustuj"
 
-#: src/global.c:493
+#: src/global.c:501
 msgid "Refresh"
 msgstr "Od�wie�"
 
-#: src/global.c:495
-msgid "Insert File"
-msgstr "Wstaw plik"
-
-#: src/global.c:497
-msgid "Go To Line"
-msgstr "Przejd� do linii"
-
-#: src/global.c:500
+#. 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:507
 msgid "Justify the current paragraph"
 msgstr "Wyjustuj bie��cy akapit"
 
-#. 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:505
+#: src/global.c:509
 msgid "Cancel the current function"
 msgstr "Anuluj bie��c� funkcj�"
 
-#: src/global.c:506
+#: src/global.c:510
 msgid "Display this help text"
 msgstr "Wy�wietla ten tekst pomocy"
 
-#: src/global.c:509
+#: src/global.c:513
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Zamknij bie��cy bufor / Wyjd� z nano"
 
-#: src/global.c:511
+#: src/global.c:515
 msgid "Exit from nano"
 msgstr "Wyjd� z nano"
 
-#: src/global.c:515
+#: src/global.c:519
 msgid "Write the current file to disk"
 msgstr "Zapisz bie��cy plik na dysku"
 
-#: src/global.c:517
+#: src/global.c:521
 msgid "Insert another file into the current one"
 msgstr "Wstaw do bie��cego pliku zawarto�� innego pliku"
 
-#: src/global.c:519
+#: src/global.c:523
 msgid "Search for a string or a regular expression"
 msgstr "Szukaj �a�cucha lub wyra�enia regularnego"
 
-#: src/global.c:520
-msgid "Go to previous screen"
+#: src/global.c:526
+msgid "Search for a string"
+msgstr "Szukaj �a�cucha"
+
+#: src/global.c:528
+msgid "Go one screenful up"
 msgstr "Przejd� do poprzedniego ekranu"
 
-#: src/global.c:521
-msgid "Go to next screen"
+#: src/global.c:529
+msgid "Go one screenful down"
 msgstr "Przejd� do nast�pnego ekranu"
 
-#: src/global.c:523
+#: src/global.c:531
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Wytnij bie��c� lini� i przechowaj w buforze wycinania"
 
-#: src/global.c:525
+#: src/global.c:533
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Wklej zawarto�� bufora wycinania w bie��cej linii"
 
-#: src/global.c:527
+#: src/global.c:534
 msgid "Display the position of the cursor"
 msgstr "Poka� informacj� o pozycji kursora"
 
-#: src/global.c:529
+#: src/global.c:536
 msgid "Invoke the spell checker, if available"
 msgstr "Wywo�aj sprawdzanie pisowni, je�li dost�pne"
 
-#: src/global.c:531
+#: src/global.c:538
 msgid "Replace a string or a regular expression"
 msgstr "Zamie� �a�cuch lub wyra�enie regularne"
 
-#: src/global.c:532
+#: src/global.c:539
 msgid "Go to line and column number"
 msgstr "Przejd� do linii i kolumny"
 
-#: src/global.c:534
-msgid "Mark text at the cursor position"
+#: src/global.c:541
+msgid "Mark text starting from the cursor position"
 msgstr "Ustaw znacznik w bie��cym po�o�eniu kursora"
 
-#: src/global.c:535
-msgid "Repeat last search"
+#: src/global.c:542
+msgid "Repeat the last search"
 msgstr "Powt�rz ostatnie wyszukiwanie"
 
-#: src/global.c:537
+#: src/global.c:544
 msgid "Copy the current line and store it in the cutbuffer"
-msgstr "Wytnij bie��c� lini� i przechowaj w buforze wycinania"
+msgstr "Skopiuj bie��c� lini� i przechowaj w buforze wycinania"
 
-#: src/global.c:538
+#: src/global.c:545
 msgid "Indent the current line"
 msgstr "Wyr�wnaj bie��c� lini�"
 
-#: src/global.c:539
+#: src/global.c:546
 msgid "Unindent the current line"
 msgstr "Usu� wci�cia z bie��cej linii"
 
-#: src/global.c:540
+#: src/global.c:547
 msgid "Undo the last operation"
 msgstr "Odwo�aj ostatni� operacj�"
 
-#: src/global.c:541
+#: src/global.c:548
 msgid "Redo the last undone operation"
 msgstr "Odtw�rz ostatni� operacj�"
 
-#: src/global.c:543
+#: src/global.c:550
 msgid "Go forward one character"
 msgstr "Przejd� o znak do przodu"
 
-#: src/global.c:544
+#: src/global.c:551
 msgid "Go back one character"
 msgstr "Przejd� o znak wstecz"
 
-#: src/global.c:546
+#: src/global.c:553
 msgid "Go forward one word"
 msgstr "Przejd� o s�owo do przodu"
 
-#: src/global.c:547
+#: src/global.c:554
 msgid "Go back one word"
 msgstr "Przejd� o s�owo wstecz"
 
-#: src/global.c:549
+#: src/global.c:556
 msgid "Go to previous line"
 msgstr "Przejd� do poprzedniej linii"
 
-#: src/global.c:550
+#: src/global.c:557
 msgid "Go to next line"
 msgstr "Przejd� do nast�pnej linii"
 
-#: src/global.c:551
+#: src/global.c:558
 msgid "Go to beginning of current line"
 msgstr "Przejd� na pocz�tek bie��cej linii"
 
-#: src/global.c:552
+#: src/global.c:559
 msgid "Go to end of current line"
 msgstr "Przejd� na koniec bie��cej linii"
 
-#: src/global.c:555
+#: src/global.c:562
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "Przejd� na pocz�tek akapitu; potem na pocz�tek poprzedniego akapitu"
 
-#: src/global.c:557
+#: src/global.c:564
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr "Przejd� w koniec akapitu; potem w koniec nast�pnego akapitu"
 
-#: src/global.c:560
+#: src/global.c:566
 msgid "Go to the first line of the file"
 msgstr "Przejd� do pierwszej linii pliku"
 
-#: src/global.c:562
+#: src/global.c:567
 msgid "Go to the last line of the file"
 msgstr "Przejd� do ostatniej linii pliku"
 
-#: src/global.c:564
+#: src/global.c:569
 msgid "Go to the matching bracket"
 msgstr "Przejd� do parzystego nawiasu"
 
-#: src/global.c:566
+#: src/global.c:571
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "Przewi� na jedn� lini� w g�r� bez przesuni�cia kursora"
 
-#: src/global.c:568
+#: src/global.c:573
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "Przewi� na jedn� lini� w d� bez przesuni�cia kursora"
 
-#: src/global.c:572
+#: src/global.c:576
 msgid "Switch to the previous file buffer"
 msgstr "Przejd� do poprzedniego bufora"
 
-#: src/global.c:574
+#: src/global.c:577
 msgid "Switch to the next file buffer"
 msgstr "Przejd� do nast�pnego bufora"
 
-#: src/global.c:577
+#: src/global.c:579
 msgid "Insert the next keystroke verbatim"
 msgstr "Wstaw nast�pne naci�ni�cie klawisza dos�ownie"
 
-#: src/global.c:579
+#: src/global.c:580
 msgid "Insert a tab at the cursor position"
 msgstr "Wstaw znak tabulacji na pozycji kursora"
 
@@ -666,330 +656,436 @@ msgstr "Wstaw znak tabulacji na pozycji kursora"
 msgid "Insert a newline at the cursor position"
 msgstr "Wstaw znak nowej linii na pozycji kursora"
 
-#: src/global.c:583
+#: src/global.c:582
 msgid "Delete the character under the cursor"
 msgstr "Usu� znak na pozycji kursora"
 
-#: src/global.c:585
+#: src/global.c:584
 msgid "Delete the character to the left of the cursor"
 msgstr "Usu� znak na lewo od kursora"
 
-#: src/global.c:588
+#: src/global.c:587
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Wytnij wszystko z pozycji kursora po koniec pliku"
 
-#: src/global.c:591
+#: src/global.c:590
 msgid "Justify the entire file"
 msgstr "Wyjustuj ca�y plik"
 
-#: src/global.c:595
+#: src/global.c:594
 msgid "Count the number of words, lines, and characters"
 msgstr "Policz ilo�� s��w, linii i znak�w"
 
-#: src/global.c:598
+#: src/global.c:597
 msgid "Refresh (redraw) the current screen"
 msgstr "Od�wie� (ponownie wy�wietl) bie��cy ekran"
 
-#: src/global.c:600
+#: src/global.c:599
 msgid "Suspend the editor (if suspend is enabled)"
 msgstr "Zawie� edytor (je�eli zawieszenie jest w��czone)"
 
-#: src/global.c:603
+#: src/global.c:602
 msgid "Toggle the case sensitivity of the search"
 msgstr "Prze��cz uwzgl�dnienie rozmiaru znak�w pod czas wyszukiwania"
 
-#: src/global.c:605
+#: src/global.c:604
 msgid "Reverse the direction of the search"
 msgstr "Odwr�� kierunek wyszukiwania"
 
-#: src/global.c:609
+#: src/global.c:608
 msgid "Toggle the use of regular expressions"
 msgstr "Prze��cz u�ycie wyra�e� regularnych"
 
-#: src/global.c:613
+#: src/global.c:612
 msgid "Recall the previous search/replace string"
 msgstr "Przywr�� poprzednie �a�cuchy wyszukiwania/zamiany"
 
-#: src/global.c:615
+#: src/global.c:614
 msgid "Recall the next search/replace string"
 msgstr "Przywr�� nast�pne �a�cuchy wyszukiwania/zamiany"
 
-#: src/global.c:618
+#: src/global.c:617
 msgid "Go to file browser"
 msgstr "Poka� przegl�dark� plik�w"
 
-#: src/global.c:621
+#: src/global.c:620
 msgid "Toggle the use of DOS format"
 msgstr "Prze��cz u�ycie formatu DOS"
 
-#: src/global.c:622
+#: src/global.c:621
 msgid "Toggle the use of Mac format"
 msgstr "Prze��cz u�ycie formatu Mac"
 
-#: src/global.c:624
+#: src/global.c:622
 msgid "Toggle appending"
 msgstr "Prze��cz dopisywanie w koniec"
 
-#: src/global.c:625
+#: src/global.c:623
 msgid "Toggle prepending"
 msgstr "Prze��cz dopisywanie na pocz�tek"
 
-#: src/global.c:628
+#: src/global.c:624
 msgid "Toggle backing up of the original file"
 msgstr "Prze��cz utworzenie kopii zapasowych oryginalnego pliku"
 
-#: src/global.c:629
+#: src/global.c:625
 msgid "Execute external command"
 msgstr "Wywo�aj polecenie zewn�trzne"
 
-#: src/global.c:633
+#: src/global.c:628
 msgid "Toggle the use of a new buffer"
 msgstr "Prze��cz u�ycie nowego bufora"
 
-#: src/global.c:636
+#: src/global.c:631
 msgid "Exit from the file browser"
 msgstr "Wyjd� z przegl�darki plik�w"
 
-#: src/global.c:638
+#: src/global.c:632
 msgid "Go to the first file in the list"
 msgstr "Przejd� do pierwszego pliku na li�cie"
 
-#: src/global.c:640
+#: src/global.c:633
 msgid "Go to the last file in the list"
 msgstr "Przejd� do ostatniego pliku na li�cie"
 
-#: src/global.c:641
-msgid "Go to the next file in the list"
-msgstr "Przejd� do nast�pnego pliku na li�cie"
-
-#: src/global.c:642
+#: src/global.c:634
 msgid "Go to the previous file in the list"
 msgstr "Przejd� do poprzedniego pliku na li�cie"
 
-#: src/global.c:643
+#: src/global.c:635
+msgid "Go to the next file in the list"
+msgstr "Przejd� do nast�pnego pliku na li�cie"
+
+#: src/global.c:636
 msgid "Go to directory"
 msgstr "Przejd� do katalogu"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:670
-msgid "Close"
-msgstr "Zamknij"
+#: src/global.c:639
+msgid "Invoke the linter, if available"
+msgstr "Wywo�aj sprawdzanie sk�adni, je�li dost�pne"
+
+#: src/global.c:640
+msgid "Go to previous linter msg"
+msgstr "Przejd� do poprzedniej linii"
+
+#: src/global.c:641
+msgid "Go to next linter msg"
+msgstr "Przejd� do nast�pnej linii"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:679
-msgid "WriteOut"
+#: src/global.c:642
+#, fuzzy
+msgid "Invoke formatter, if available"
+msgstr "Wywo�aj sprawdzanie sk�adni, je�li dost�pne"
+
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:662
+msgid "Get Help"
+msgstr "Pomoc"
+
+#: src/global.c:665 src/prompt.c:1084
+msgid "Cancel"
+msgstr "Anuluj"
+
+#: src/global.c:678
+msgid "Write Out"
 msgstr "Zapisz"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:704
+msgid "Go To Dir"
+msgstr "Do kat."
+
+#: src/global.c:719
+msgid "Cut Text"
+msgstr "Wytnij"
+
+#: src/global.c:728
 msgid "Justify"
 msgstr "Wyjustuj"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:696
-msgid "Read File"
-msgstr "Wczyt.plik"
+#: src/global.c:733
+msgid "To Spell"
+msgstr "Pisownia"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:713
-msgid "Cut Text"
-msgstr "Wytnij"
+#: src/global.c:738
+msgid "To Linter"
+msgstr "Sk�adnia"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:718
-msgid "UnJustify"
-msgstr "Cofnij just."
+#: src/global.c:740
+#, fuzzy
+msgid "Formatter"
+msgstr "Format DOS"
+
+#: src/global.c:745
+msgid "Case Sens"
+msgstr "Wielk.liter"
+
+#: src/global.c:750
+msgid "Regexp"
+msgstr "Wyr.reg."
+
+#: src/global.c:755
+msgid "Backwards"
+msgstr "Wstecz"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:723
-msgid "UnCut Text"
-msgstr "Wklej"
+#: src/global.c:762
+msgid "No Replace"
+msgstr "Nie zast."
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:728 src/global.c:755
+#: src/global.c:770
 msgid "Cur Pos"
 msgstr "Bie�.poz."
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:737
-msgid "To Spell"
-msgstr "Pisownia"
+#: src/global.c:780
+msgid "Prev Page"
+msgstr "Poprz.str."
 
-#: src/global.c:771
+#: src/global.c:782
+msgid "Next Page"
+msgstr "Nast.str."
+
+#: src/global.c:785
+msgid "First Line"
+msgstr "Pierw.lin."
+
+#: src/global.c:787
+msgid "Last Line"
+msgstr "Ost.lin."
+
+#: src/global.c:794
+msgid "To Bracket"
+msgstr "Do nawiasu"
+
+#: src/global.c:797
 msgid "Mark Text"
 msgstr "Zaznacz"
 
-#: src/global.c:777
+#: src/global.c:800
 msgid "Copy Text"
 msgstr "Kopiuj"
 
-#: src/global.c:780
+#: src/global.c:803
 msgid "Indent Text"
 msgstr "Wci�cie"
 
-#: src/global.c:783
+#: src/global.c:805
 msgid "Unindent Text"
 msgstr "Usu� Wci�cia"
 
-#: src/global.c:787
+#: src/global.c:808
 msgid "Undo"
 msgstr "Odwo�aj"
 
-#: src/global.c:790
+#: src/global.c:810
 msgid "Redo"
 msgstr "Odtw�rz"
 
-#: src/global.c:796 src/global.c:800
-msgid "Forward"
-msgstr "W prz�d"
-
-#: src/global.c:806 src/global.c:810
+#: src/global.c:814 src/global.c:820
 msgid "Back"
 msgstr "Wstecz"
 
-#: src/global.c:817
-msgid "Next Word"
-msgstr "Nast.s�owo"
+#: src/global.c:816 src/global.c:822
+msgid "Forward"
+msgstr "W prz�d"
 
-#: src/global.c:820
+#: src/global.c:827
 msgid "Prev Word"
 msgstr "Poprz.s�owo"
 
-#: src/global.c:824
-msgid "Prev Line"
-msgstr "Poprz.lin."
-
-#: src/global.c:827
-msgid "Next Line"
-msgstr "Nast. lin."
+#: src/global.c:829
+msgid "Next Word"
+msgstr "Nast.s�owo"
 
-#: src/global.c:830
+#: src/global.c:833
 msgid "Home"
 msgstr "Pocz�tek"
 
-#: src/global.c:833
+#: src/global.c:835
 msgid "End"
 msgstr "Koniec"
 
-#: src/global.c:845
-msgid "Find Other Bracket"
-msgstr "Znajd� nawias do pary"
+#: src/global.c:844
+msgid "Beg of Par"
+msgstr "PoczAkapit"
 
-#: src/global.c:848
-msgid "Scroll Up"
-msgstr "Przewi� w g�r�"
+#: src/global.c:846
+msgid "End of Par"
+msgstr "KonAkapit"
 
 #: src/global.c:851
-msgid "Scroll Down"
-msgstr "Przewi� w d�"
+msgid "Scroll Up"
+msgstr "W g�r�"
 
-#: src/global.c:856
-msgid "Previous File"
-msgstr "Poprzedni plik"
+#: src/global.c:853
+msgid "Scroll Down"
+msgstr "W d�"
 
 #: src/global.c:858
+msgid "Prev File"
+msgstr "Plik poprz."
+
+#: src/global.c:860
 msgid "Next File"
-msgstr "Nast�pny plik"
+msgstr "Plik nast."
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:862 src/text.c:3045
-msgid "Verbatim Input"
-msgstr "wprowadzanie dos�owne"
+#: src/global.c:869
+msgid "Verbatim"
+msgstr "Dos�ownie"
 
-#: src/global.c:867
+#: src/global.c:872
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:870
+#: src/global.c:874
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:873
+#: src/global.c:876
 msgid "Delete"
 msgstr "Usu�"
 
-#: src/global.c:876
+#: src/global.c:878
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/global.c:893
+#: src/global.c:888
 msgid "CutTillEnd"
 msgstr "WytnDoKonc"
 
-#: src/global.c:906
+#: src/global.c:898
 msgid "Word Count"
 msgstr "Ilo�� s��w"
 
-#: src/global.c:1367
+#: src/global.c:905
+msgid "Suspend"
+msgstr "Zawie�"
+
+#: src/global.c:910
+msgid "PrevHstory"
+msgstr "Poprz.Hist"
+
+#: src/global.c:913
+msgid "NextHstory"
+msgstr "Nast.Hist"
+
+#: src/global.c:917
+msgid "Go To Text"
+msgstr "Do tekstu"
+
+#: src/global.c:928
+msgid "DOS Format"
+msgstr "Format DOS"
+
+#: src/global.c:931
+msgid "Mac Format"
+msgstr "Format Mac"
+
+#: src/global.c:934
+msgid "Append"
+msgstr "Dopisz"
+
+#: src/global.c:936
+msgid "Prepend"
+msgstr "Wpisz"
+
+#: src/global.c:939
+msgid "Backup File"
+msgstr "Kopia zapas."
+
+#: src/global.c:946
+msgid "Execute Command"
+msgstr "Wywo�aj polecenie"
+
+#: src/global.c:961
+msgid "To Files"
+msgstr "Pliki"
+
+#: src/global.c:964
+msgid "First File"
+msgstr "Pierw.Plik"
+
+#: src/global.c:966
+msgid "Last File"
+msgstr "Ost.Plik"
+
+#: src/global.c:977
+msgid "Prev Lint Msg"
+msgstr "Lint:Poprz.lin."
+
+#: src/global.c:979
+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:1227
 msgid "Help mode"
 msgstr "Tryb pomocy"
 
-#: src/global.c:1369
+#: src/global.c:1229
 msgid "Constant cursor position display"
 msgstr "Sta�e po�o�enie kursora"
 
-#: src/global.c:1371
+#: src/global.c:1231
 msgid "Use of one more line for editing"
 msgstr "U�ycie dodatkowej linii do redagowania"
 
-#: src/global.c:1373
+#: src/global.c:1233
 msgid "Smooth scrolling"
 msgstr "P�ynne przewijanie"
 
-#: src/global.c:1375
+#: src/global.c:1235
+msgid "Soft wrapping of overlong lines"
+msgstr "Mi�kkie zawijanie d�ugich linii"
+
+#: src/global.c:1237
 msgid "Whitespace display"
 msgstr "Wy�wietlanie bia�ych znak�w"
 
-#: src/global.c:1377
+#: src/global.c:1239
 msgid "Color syntax highlighting"
 msgstr "Kolorowanie sk�adni"
 
-#: src/global.c:1379
+#: src/global.c:1241
 msgid "Smart home key"
 msgstr "Rozumny klawisz \"w pocz�tek\""
 
-#: src/global.c:1381
+#: src/global.c:1243
 msgid "Auto indent"
 msgstr "Auto wci�cia"
 
-#: src/global.c:1383
+#: src/global.c:1245
 msgid "Cut to end"
 msgstr "Wytnij do ko�ca"
 
-#: src/global.c:1385
-msgid "Long line wrapping"
-msgstr "Zawijanie d�ugich linii"
+#: src/global.c:1247
+msgid "Hard wrapping of overlong lines"
+msgstr "Twarde zawijanie d�ugich linii"
 
-#: src/global.c:1387
+#: src/global.c:1249
 msgid "Conversion of typed tabs to spaces"
 msgstr "Przetworzenie tabulacji na spacji"
 
-#: src/global.c:1389
+#: src/global.c:1251
 msgid "Backup files"
 msgstr "Kopie zapasowe"
 
-#: src/global.c:1391
+#: src/global.c:1253
 msgid "Multiple file buffers"
 msgstr "Wiele bufor�w plikowych"
 
-#: src/global.c:1393
+#: src/global.c:1255
 msgid "Mouse support"
 msgstr "Obs�uga myszy"
 
-#: src/global.c:1395
+#: src/global.c:1257
 msgid "No conversion from DOS/Mac format"
 msgstr "Bez konwersji z formatu DOS/Mac"
 
-#: src/global.c:1397
+#: src/global.c:1259
 msgid "Suspension"
 msgstr "Zawie�"
 
-#: src/global.c:1399
-msgid "Soft line wrapping"
-msgstr "Mi�kkie zawijanie linii"
-
-#: src/help.c:236
+#: src/help.c:205
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1011,7 +1107,7 @@ msgstr ""
 "szukany �a�cuch. Naci�ni�cie Enter bez wprowadzania tekstu spowoduje "
 "wykonanie poprzedniego szukania.  "
 
-#: src/help.c:245
+#: src/help.c:214
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1025,7 +1121,7 @@ msgstr ""
 " W trybie szukania dost�pne s� nast�puj�ce klawisze funkcyjne:\n"
 "\n"
 
-#: src/help.c:251
+#: src/help.c:220
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1045,7 +1141,7 @@ msgstr ""
 "funkcyjne:\n"
 "\n"
 
-#: src/help.c:260
+#: src/help.c:229
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1067,7 +1163,7 @@ msgstr ""
 "pliku nanorc, wstawianie pliku spowoduje wczytanie go do oddzielnego bufora "
 "(u�yj Meta-< i > do prze��czania si� mi�dzy buforami plikowymi.  "
 
-#: src/help.c:269
+#: src/help.c:238
 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"
@@ -1081,7 +1177,7 @@ msgstr ""
 "W trybie wstawiania pliku dost�pne s� nast�puj�ce klawisze funkcyjne:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:244
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1108,7 +1204,7 @@ msgstr ""
 " W trybie zapisu pliku dost�pne s� nast�puj�ce klawisze funkcyjne:\n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:258
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1133,7 +1229,7 @@ msgstr ""
 " W przegl�darce plik�w dost�pne s� nast�puj�ce klawisze funkcyjne:\n"
 "\n"
 
-#: src/help.c:302
+#: src/help.c:271
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1157,7 +1253,7 @@ msgstr ""
 "wykonanie poprzedniego szukania.\n"
 "\n"
 
-#: src/help.c:311
+#: src/help.c:280
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1165,7 +1261,7 @@ msgstr ""
 " W trybie wyszukiwania dost�pne s� nast�puj�ce klawisze funkcyjne:\n"
 "\n"
 
-#: src/help.c:315
+#: src/help.c:284
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1189,7 +1285,7 @@ msgstr ""
 "klawisze funkcyjne:\n"
 "\n"
 
-#: src/help.c:328
+#: src/help.c:297
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1213,7 +1309,7 @@ msgstr ""
 " W trybie sprawdzania pisowni dost�pne s� nast�puj�ce klawisze funkcyjne:\n"
 "\n"
 
-#: src/help.c:343
+#: src/help.c:312
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1234,7 +1330,7 @@ msgstr ""
 " W tym trybie dost�pne s� nast�puj�ce klawisze:\n"
 "\n"
 
-#: src/help.c:356
+#: src/help.c:325
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1254,7 +1350,7 @@ msgstr ""
 "zawiera edytowany tekst. Trzecia linia od do�u, czyli linia stanu, s�u�y do "
 "wy�wietlania wa�nych komunikat�w. "
 
-#: src/help.c:366
+#: src/help.c:335
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1272,7 +1368,7 @@ msgstr ""
 "zale�nie od uk�adu klawiatury jednym z klawiszy Esc, Alt lub Meta, s� "
 "oznaczone Meta (M-). "
 
-#: src/help.c:375
+#: src/help.c:344
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1287,15 +1383,15 @@ msgstr ""
 "Klawisze alternatywne uj�to w nawiasy:\n"
 "\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:376 src/help.c:448
 msgid "enable/disable"
 msgstr "w��cz/wy��cz"
 
-#: src/nano.c:587
+#: src/nano.c:601
 msgid "Key invalid in view mode"
 msgstr "Klawisz niedozwolony w trybie przegl�dania"
 
-#: src/nano.c:695
+#: src/nano.c:713
 #, c-format
 msgid ""
 "\n"
@@ -1304,7 +1400,7 @@ msgstr ""
 "\n"
 "Bufor zapisany w %s\n"
 
-#: src/nano.c:697
+#: src/nano.c:715
 #, c-format
 msgid ""
 "\n"
@@ -1313,7 +1409,7 @@ msgstr ""
 "\n"
 "Bufor nie zosta� zapisany w %s: %s\n"
 
-#: src/nano.c:700
+#: src/nano.c:718
 #, c-format
 msgid ""
 "\n"
@@ -1322,262 +1418,268 @@ msgstr ""
 "\n"
 "Bufor nie zosta� zapisany w %s\n"
 
-#: src/nano.c:723
+#: src/nano.c:743
 msgid "Window size is too small for nano...\n"
 msgstr "Rozmiar okna za ma�y dla nano...\n"
 
-#: src/nano.c:816
+#: src/nano.c:836
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
 "\n"
 msgstr "Sk�adnia: nano [OPCJE] [[+LINIA,KOLUMNA] PLIK]...\n"
 
-#: src/nano.c:819
+#: src/nano.c:839
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Opcja\t\tD�uga opcja GNU\t\tZnaczenie\n"
 
-#: src/nano.c:821
+#: src/nano.c:841
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Opcja\t\tZnaczenie\n"
 
-#: src/nano.c:824
-msgid "Show this message"
-msgstr "Pokazanie tej informacji"
-
-#: src/nano.c:825
+#: src/nano.c:844
 msgid "+LINE,COLUMN"
 msgstr "+LINIA,KOLUMNA"
 
-#: src/nano.c:826
+#. TRANSLATORS: The next forty or so strings are option descriptions
+#. * for the --help output.  Try to keep them at most 40 characters.
+#: src/nano.c:847
 msgid "Start at line LINE, column COLUMN"
 msgstr "Rozpocz�cie w linii i kolumnie o podanych numerach"
 
-#: src/nano.c:828
+#: src/nano.c:849
 msgid "Enable smart home key"
 msgstr "W��cza rozumny przycisk \"w pocz�tek\""
 
-#: src/nano.c:829
+#: src/nano.c:850
 msgid "Save backups of existing files"
 msgstr "Tworzenie kopii zapasowych istniej�cych plik�w"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "-C <dir>"
 msgstr "-C <katalog>"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<katalog>"
 
-#: src/nano.c:831
+#: src/nano.c:852
 msgid "Directory for saving unique backup files"
 msgstr "Katalog przechowywania unikatowych kopii zapasowych"
 
-#: src/nano.c:834
+#: src/nano.c:855
 msgid "Use bold instead of reverse video text"
 msgstr "U�ywa tekstu pogrubionego zamiast negacji obrazu"
 
-#: src/nano.c:837
+#: src/nano.c:858
 msgid "Convert typed tabs to spaces"
 msgstr "Przetwarza tabulacje na spacje"
 
-#: src/nano.c:840
+#: src/nano.c:861
 msgid "Enable multiple file buffers"
 msgstr "W��czenie wielu bufor�w plikowych"
 
-#: src/nano.c:845
+#: src/nano.c:865
+msgid "Use (vim-style) lock files"
+msgstr "U�ywaj plik�w blokowania w stylu vim"
+
+#: src/nano.c:869
 msgid "Log & read search/replace string history"
 msgstr "Rejestrowanie i odczyt historii wyszukiwania/zamiany �a�cuch�w"
 
-#: src/nano.c:848
+#: src/nano.c:873
 msgid "Don't look at nanorc files"
 msgstr "Bez korzystania z plik�w nanorc"
 
-#: src/nano.c:851
+#: src/nano.c:876
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Naprawia problem pomylenia klawiszy klawiatury numerycznej"
 
-#: src/nano.c:853
+#: src/nano.c:878
 msgid "Don't add newlines to the ends of files"
 msgstr "Wy��cza dodanie znaku nowej linii na ko�cu pliku"
 
-#: src/nano.c:856
+#: src/nano.c:881
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Bez konwersji z formatu DOS/Mac"
 
-#: src/nano.c:858
+#: src/nano.c:883
 msgid "Use one more line for editing"
 msgstr "U�ycie dodatkowej linii do redagowania"
 
-#: src/nano.c:860
+#: src/nano.c:886
+msgid "Log & read location of cursor position"
+msgstr "Zapisz i odczytaj pozycj� kursora"
+
+#: src/nano.c:889
 msgid "-Q <str>"
 msgstr "-Q <�a�cuch>"
 
-#: src/nano.c:860
+#: src/nano.c:889
 msgid "--quotestr=<str>"
 msgstr "--quotestr=<�a�cuch>"
 
-#: src/nano.c:861
+#: src/nano.c:890
 msgid "Quoting string"
 msgstr "Znacznik cytowania"
 
-#: src/nano.c:863
+#: src/nano.c:892
 msgid "Restricted mode"
 msgstr "Tryb zastrze�ony"
 
-#: src/nano.c:866
+#: src/nano.c:895
 msgid "Scroll by line instead of half-screen"
 msgstr "Przewija po liniach zamiast po p�-ekranu"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "-T <#cols>"
 msgstr "-T <#kol>"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#kol>"
 
-#: src/nano.c:869
+#: src/nano.c:898
 msgid "Set width of a tab to #cols columns"
 msgstr "Ustawienie szeroko�ci tabulacji na podan� ilo�� kolumn"
 
-#: src/nano.c:871
+#: src/nano.c:900
 msgid "Do quick statusbar blanking"
 msgstr "Szybkie oczyszczenie linii stanu"
 
-#: src/nano.c:874
+#: src/nano.c:903
 msgid "Print version information and exit"
 msgstr "Wypisanie wersji i zako�czenie pracy"
 
-#: src/nano.c:877
+#: src/nano.c:906
 msgid "Detect word boundaries more accurately"
 msgstr "U�ci�la okre�lenie granic s��w"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "-Y <str>"
 msgstr "-Y <�a�c>"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "--syntax=<str>"
 msgstr "--syntax=<�a�c>"
 
-#: src/nano.c:881
+#: src/nano.c:910
 msgid "Syntax definition to use for coloring"
 msgstr "U�ycie zadanej definicji sk�adni do pod�wietlania"
 
-#: src/nano.c:883
+#: src/nano.c:912
 msgid "Constantly show cursor position"
 msgstr "Sta�e pokazywanie po�o�enia kursora"
 
-#: src/nano.c:885
+#: src/nano.c:914
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Naprawia problem pomylenia klawiszy Backspace/Delete"
 
-#: src/nano.c:888
+#: src/nano.c:915
+msgid "Show this help text"
+msgstr "Wy�wietla ten tekst pomocy"
+
+#: src/nano.c:918
 msgid "Automatically indent new lines"
 msgstr "Automatyczne wci�cia nowych linii"
 
-#: src/nano.c:889
+#: src/nano.c:919
 msgid "Cut from cursor to end of line"
 msgstr "Wycina od kursora do ko�ca linii"
 
-#: src/nano.c:892
+#: src/nano.c:922
 msgid "Don't follow symbolic links, overwrite"
 msgstr "Bez pod��ania za dowi�zaniami symbolicznymi, nadpisywanie"
 
-#: src/nano.c:894
+#: src/nano.c:924
 msgid "Enable the use of the mouse"
 msgstr "W��czenie myszy"
 
-#: src/nano.c:897
+#: src/nano.c:926
+msgid "Do not read the file (only write it)"
+msgstr "Bez odczytu pliku (tylko zapis)"
+
+#: src/nano.c:928
 msgid "-o <dir>"
 msgstr "-o <kat>"
 
-#: src/nano.c:897
+#: src/nano.c:928
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<kat>"
 
-#: src/nano.c:898
+#: src/nano.c:929
 msgid "Set operating directory"
 msgstr "Ustawienie katalogu pracy"
 
-#: src/nano.c:901
+#: src/nano.c:932
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Zachowanie dzia�ania klawiszy XON (^Q) i XOFF (^S)"
 
-#: src/nano.c:903
+#: src/nano.c:935
 msgid "Silently ignore startup issues like rc file errors"
 msgstr "Ignoruje b��dy podczas rozruchu, jak np. b��dy w pliku rc"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "-r <#cols>"
 msgstr "-r <#kol>"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "--fill=<#cols>"
 msgstr "--fill=<#kol>"
 
-#: src/nano.c:906
-msgid "Set wrapping point at column #cols"
+#: src/nano.c:939
+msgid "Set hard-wrapping point at column #cols"
 msgstr "Ustawia granice przewijania w podanej kolumnie"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "-s <prog>"
 msgstr "-s <prog>"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "--speller=<prog>"
 msgstr "--speller=<prog>"
 
-#: src/nano.c:910
+#: src/nano.c:943
 msgid "Enable alternate speller"
 msgstr "Alternatywny program sprawdzania pisowni"
 
-#: src/nano.c:913
+#: src/nano.c:946
 msgid "Auto save on exit, don't prompt"
 msgstr "Automatyczny zapis przy ko�czeniu pracy, bez pytania"
 
-#: src/nano.c:915
-msgid "Allow generic undo [EXPERIMENTAL]"
-msgstr "W��cza odwo�anie og�lne [EKSPERYMENTALNE]"
-
-#: src/nano.c:918
+#: src/nano.c:947
 msgid "View mode (read-only)"
 msgstr "Tryb przegl�dania (tylko odczyt)"
 
-#: src/nano.c:920
-msgid "Don't wrap long lines"
-msgstr "Bez �amania d�ugich linii"
+#: src/nano.c:949
+msgid "Don't hard-wrap long lines"
+msgstr "Bez przewijania d�ugich linii"
 
-#: src/nano.c:922
+#: src/nano.c:951
 msgid "Don't show the two help lines"
 msgstr "Bez pokazywania linii pomocy"
 
-#: src/nano.c:923
+#: src/nano.c:952
 msgid "Enable suspension"
 msgstr "W��czenie zawieszania"
 
-#: src/nano.c:924
+#: src/nano.c:954
 msgid "Enable soft line wrapping"
 msgstr "W��cza mi�kkie przewijanie linii"
 
-#: src/nano.c:928
-msgid "(ignored, for Pico compatibility)"
-msgstr "(ignorowane, dla zgodno�ci z Pico)"
-
-#: src/nano.c:938
-#, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
+#: src/nano.c:963
+#, fuzzy, c-format
+msgid " GNU nano, version %s\n"
 msgstr " GNU nano wersja %s (skompilowana %s, %s)\n"
 
-#: src/nano.c:943
+#: src/nano.c:966
 #, 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:944
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1586,155 +1688,179 @@ msgstr ""
 "\n"
 " Skompilowane opcje:"
 
-#: src/nano.c:1022
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr "Przepraszamy, obs�uga tej funkcji zosta�a wy��czona"
 
-#: src/nano.c:1044
+#: src/nano.c:1125
+msgid "No file name"
+msgstr "Brak nazwy pliku"
+
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "Zapisa� zmieniony bufor (ODPOWIED� \"Nie\" SPOWODUJE UTRAT� ZMIAN) ? "
 
-#: src/nano.c:1088
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr ""
 "Nie uda�o si� ponownie otworzy� wej�cie standardowe z klawiatury, "
 "przepraszamy\n"
 
-#: src/nano.c:1114
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "Odczyt z wej�cia standardowego. Aby przerwa�, naci�nij ^C\n"
 
-#: src/nano.c:1182
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Otrzymano SIGHUP lub SIGTERM\n"
 
-#: src/nano.c:1204
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Aby powr�ci� do nano, u�yj \"fg\".\n"
 
-#: src/nano.c:1386
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "w��czony(e)"
 
-#: src/nano.c:1387
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "wy��czony(e)"
 
-#: src/nano.c:1548 src/winio.c:1256
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr "Nieznane polecenie"
 
-#: src/nano.c:1674
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "Zignorowano XON, hmm, hmm."
 
-#: src/nano.c:1679
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "Zignorowano XOFF, hmm, hmm."
 
-#: src/nano.c:2209 src/rcfile.c:1100
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "��dana wielko�� tabulacji \"%s\" nie jest poprawna"
 
-#: src/nano.c:2268 src/rcfile.c:1025
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "��dana pozycja �amania linii \"%s\" nie jest poprawna"
 
+#: src/nano.c:2415
+#, c-format
+msgid "Type '%s -h' for a list of available options.\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:1259
+#: src/prompt.c:1055
 msgid "Yy"
 msgstr "Tt"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1056
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1057
 msgid "Aa"
 msgstr "Ww"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1071
 msgid "Yes"
 msgstr "Tak"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1076
 msgid "All"
 msgstr "Wszystko"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1081
 msgid "No"
 msgstr "Nie"
 
-#: src/rcfile.c:130
+#: src/rcfile.c:137
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "B��d w %s w linii %lu: "
 
-#: src/rcfile.c:185
+#: src/rcfile.c:196
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "Argument %s ma niedomkni�ty \""
 
-#: src/rcfile.c:212 src/rcfile.c:264 src/rcfile.c:711 src/rcfile.c:768
-#: src/rcfile.c:821
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Wyra�enia regularne musz� zaczyna� si� i ko�czy� znakiem \""
 
-#: src/rcfile.c:238 src/search.c:62
+#: src/rcfile.c:249 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "B��dne wyra�enie regularne \"%s\": %s"
 
-#: src/rcfile.c:258
+#: src/rcfile.c:269
 msgid "Missing syntax name"
 msgstr "Brak nazwy sk�adni"
 
-#: src/rcfile.c:316
+#: src/rcfile.c:340
 msgid "The \"none\" syntax is reserved"
 msgstr "Sk�adnia \"none\" jest zarezerwowana"
 
-#: src/rcfile.c:323
+#: src/rcfile.c:347
 msgid "The \"default\" syntax must take no extensions"
 msgstr "Sk�adnia \"default\" nie przyjmuje rozszerze�"
 
-#: src/rcfile.c:386 src/rcfile.c:483
+#: src/rcfile.c:433
 msgid "Missing key name"
 msgstr "Brak nazwy klawisza"
 
-#: src/rcfile.c:398 src/rcfile.c:499
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
-msgstr "przypisania klawiszy musz� zaczyna� si� z \"^\", \"M\", lub \"F\""
+#: src/rcfile.c:442 src/rcfile.c:453
+msgid "Key name is too short"
+msgstr "Za kr�tka nazwa klawisza"
 
-#: src/rcfile.c:407
-msgid "Must specify function to bind key to"
+#: src/rcfile.c:463
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
+msgstr "Nazwa klawisza musi zaczyna� si� z \"^\", \"M\", lub \"F\""
+
+#: src/rcfile.c:472
+msgid "Must specify a function to bind the key to"
 msgstr "Podaj funkcje do jakiej przypisuje si� klawisz"
 
-#: src/rcfile.c:418 src/rcfile.c:510
-msgid "Must specify menu to bind key to (or \"all\")"
-msgstr "Podaj menu do jakiego przypisuje si� klawisz (lub \"all\")"
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:482
+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"
+
+#: src/rcfile.c:489
+#, c-format
+msgid "Cannot map name \"%s\" to a function"
+msgstr "Nie mo�na odwzorowa� nazwy \"%s\" na funkcje"
+
+#: src/rcfile.c:496
+#, c-format
+msgid "Cannot map name \"%s\" to a menu"
+msgstr "Nie mo�na odwzorowa� nazwy \"%s\" na menu"
 
-#: src/rcfile.c:426
+#: src/rcfile.c:528
 #, c-format
-msgid "Could not map name \"%s\" to a function"
-msgstr "Nie mo�na odwzorowa� \"%s\" na funkcje"
+msgid "Function '%s' does not exist in menu '%s'"
+msgstr "Brak funkcji '%s' w menu '%s'"
 
-#: src/rcfile.c:432 src/rcfile.c:517
+#: src/rcfile.c:543
 #, c-format
-msgid "Could not map name \"%s\" to a menu"
-msgstr "Nie mo�na odwzorowa� \"%s\" na menu"
+msgid "Sorry, keystroke \"%s\" may not be rebound"
+msgstr "Przepraszam, przyci�ni�cie \"%s\" nie mo�e by� przypisane ponownie"
 
-#: src/rcfile.c:454
+#: src/rcfile.c:629
 #, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
-msgstr "Przepraszam, \"%s\" nie jest prawid�owym przypisaniem"
+msgid "Error expanding %s: %s"
+msgstr "B��d rozszerzenia %s: %s"
 
-#: src/rcfile.c:625
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1749,114 +1875,172 @@ msgstr ""
 "\"black\", z opcjonalnym przedrostkiem \"bright\"\n"
 "dla kolor�w pierwszoplanowych."
 
-#: src/rcfile.c:647
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
 msgstr "Nie mo�na doda� polecenia koloru bez polecenia sk�adni"
 
-#: src/rcfile.c:652
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "Brak nazwy koloru"
 
-#: src/rcfile.c:672
-#, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr "Kolor t�a \"%s\" nie mo�e by� jaskrawy"
-
-#: src/rcfile.c:690 src/rcfile.c:809
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr "Brak wyra�enia regularnego"
 
-#: src/rcfile.c:762
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\" wymaga odpowiadaj�cego mu \"end=\""
 
-#: src/rcfile.c:804
+#: src/rcfile.c:837
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr "Kolor t�a \"%s\" nie mo�e by� jaskrawy"
+
+#: src/rcfile.c:865
 msgid "Cannot add a header regex without a syntax command"
 msgstr "Nie mo�na doda� regularnego wyra�enia nag��wka bez polecenia sk�adni"
 
-#: src/rcfile.c:874
+#: src/rcfile.c:921
+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:926
+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:1010
+#, fuzzy
+msgid "Cannot add formatter without a syntax command"
+msgstr "Nie mo�na doda� analizatora sk�adni bez polecenia sk�adni"
+
+#: src/rcfile.c:1015
+#, fuzzy
+msgid "Missing formatter command"
+msgstr "Brak nazwy analizatora sk�adni"
+
+#: src/rcfile.c:1045
 #, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
-msgstr "B��d krytyczny: brak przypisanego klawisza dla funkcji \"%s\""
+msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
+msgstr ""
+"B��d krytyczny: brak przypisanego klawisza dla funkcji \"%s\".  "
+"Zako�czenie.\n"
 
-#: src/rcfile.c:876
+#: src/rcfile.c:1047
+#, c-format
 msgid ""
-"Exiting.  Please use nano with the -I option if needed to adjust your nanorc "
-"settings\n"
-msgstr "Zako�czenie. Uruchom nano z opcj� -I aby dopasowa� ustawienia\n"
+"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"
+
+#: src/rcfile.c:1108
+#, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "Nie znaleziono sk�adni \"%s\" do rozszerzenia"
 
-#: src/rcfile.c:926 src/rcfile.c:935 src/rcfile.c:945
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Poliecenie \"%s\" nie jest dozwolone w pliku do��czonym"
 
-#: src/rcfile.c:951 src/rcfile.c:1128
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Sk�adnia \"%s\" nie ma ustawie� kolor�w"
 
-#: src/rcfile.c:966
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Niezrozumia�e polecenie \"%s\""
 
-#: src/rcfile.c:972
-msgid "Missing flag"
-msgstr "Brak znacznika"
+#: src/rcfile.c:1186
+msgid "Missing option"
+msgstr "Brak opcji"
 
-#: src/rcfile.c:994
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Opcja \"%s\" wymaga argumentu"
 
-#: src/rcfile.c:1012
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr "Opcja nie jest poprawnym �a�cuchem wielobajtowym"
 
-#: src/rcfile.c:1038 src/rcfile.c:1066 src/rcfile.c:1075
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr "Wymagane s� nie-bia�e znaki"
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr "Wymagane s� dwa jednobajtowych znaki"
 
-#: src/rcfile.c:1114
+#: src/rcfile.c:1339
 #, c-format
-msgid "Cannot unset flag \"%s\""
-msgstr "Nie mo�na zerowa� znacznika \"%s\""
+msgid "Cannot unset option \"%s\""
+msgstr "Nie mo�na zresetowa� opcji \"%s\""
 
-#: src/rcfile.c:1123
+#: src/rcfile.c:1345
 #, c-format
-msgid "Unknown flag \"%s\""
-msgstr "Nieznany znacznik \"%s\""
+msgid "Unknown option \"%s\""
+msgstr "Nieznana opcja \"%s\""
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr "Nie mog� znale�� swojego katalogu domowego!  Aj!"
 
+#: src/rcfile.c:1442
+#, c-format
+msgid ""
+"\n"
+"Press Enter to continue starting nano.\n"
+msgstr ""
+"\n"
+"Naci�nij return aby kontynuowa� rozruch nano.\n"
+
 #: src/search.c:96
 #, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "Nie znaleziono \"%.*s%s\""
 
-#: src/search.c:205
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/search.c:184
+msgid " [Case Sensitive]"
+msgstr " [Uwzgl.wielk.liter]"
+
+#: src/search.c:188
+msgid " [Regexp]"
+msgstr " [Wyr.reg.]"
+
+#: src/search.c:192
+msgid " [Backwards]"
+msgstr " [Wstecz]"
+
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:197
 msgid " (to replace) in selection"
 msgstr " (i zast�p) w zaznaczeniu"
 
-#: src/search.c:207
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (i zast�p)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "Czy zast�pi� to wyst�pienie?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:945
 msgid "Replace with"
 msgstr "Zast�p przez"
 
-#: src/search.c:1004
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
@@ -1864,19 +2048,20 @@ msgstr[0] "Zast�piono %lu wyst�pienie"
 msgstr[1] "Zast�piono %lu wyst�pienia"
 msgstr[2] "Zast�piono %lu wyst�pie�"
 
-#: src/search.c:1034
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr "Wprowad� numer linii, numer kolumny"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
 msgstr "Niepoprawny numer linii lub kolumny"
 
-#: src/search.c:1214
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "To nie nawias"
 
-#: src/search.c:1281
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "Brak nawiasu do pary"
 
@@ -1888,221 +2073,284 @@ msgstr "Znacznik ustawiony"
 msgid "Mark Unset"
 msgstr "Znacznik skasowany"
 
-#: src/text.c:443
+#: src/text.c:439
 msgid "Nothing in undo buffer!"
 msgstr "Nie ma nic w buforze odwo�ania"
 
-#: src/text.c:455 src/text.c:593
+#: src/text.c:445 src/text.c:590
 #, c-format
-msgid "Internal error: can't match line %d.  Please save your work"
+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�"
+"B��d wewn�trzny: nie mo�na dopasowa� linii %d. Prosz� zapisa� swoj� prac�."
 
-#: src/text.c:466 src/text.c:603
+#: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
 msgstr "tekst dodany"
 
-#: src/text.c:475 src/text.c:613
+#: src/text.c:467 src/text.c:612
 msgid "text delete"
 msgstr "tekst usuni�ty"
 
-#: src/text.c:489 src/text.c:628
-msgid "line wrap"
-msgstr "przewijanie linii"
-
-#: src/text.c:503 src/text.c:636
+#: src/text.c:491 src/text.c:641
 msgid "line join"
 msgstr "po��czenie linii"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:505 src/text.c:657
 msgid "text cut"
 msgstr "wyci�cie tekstu"
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:510 src/text.c:661
 msgid "text uncut"
 msgstr "wklejanie tekstu"
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:515 src/text.c:623
 msgid "line break"
 msgstr "�amanie linii"
 
-#: src/text.c:532 src/text.c:665
+#: src/text.c:528 src/text.c:672
 msgid "text insert"
 msgstr "tekst wprowadzony"
 
-#: src/text.c:550 src/text.c:659
+#: src/text.c:549 src/text.c:665
 msgid "text replace"
 msgstr "tekst zamieniony"
 
-#: src/text.c:557 src/text.c:671
-msgid "Internal error: unknown type.  Please save your work"
-msgstr "B��d wewn�trzny: nieznany typ. Prosz� zapisa� swoj� prac�"
+#: src/text.c:556 src/text.c:679 src/text.c:983
+msgid "Internal error: unknown type.  Please save your work."
+msgstr "B��d wewn�trzny: nieznany typ. Prosz� zapisa� swoj� prac�."
 
-#: src/text.c:563
+#: src/text.c:561
 #, c-format
 msgid "Undid action (%s)"
 msgstr "Odwo�ano operacj� (%s)"
 
-#: src/text.c:578
+#: src/text.c:580
 msgid "Nothing to re-do!"
 msgstr "Nic do powt�rzenia!"
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
+#: src/text.c:584
+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:676
+#: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Powt�rzono operacj� (%s)"
 
-#: src/text.c:766
-msgid "Could not pipe"
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
+msgid "Could not create pipe"
 msgstr "Nie mo�na utworzy� potoku"
 
-#: src/text.c:793 src/text.c:2636 src/text.c:2788
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "Nie mo�na rozwidli� procesu"
 
-#: src/text.c:941
-msgid "Internal error: can't setup uncut.  Please save your work."
+#: src/text.c:969
+msgid "Internal error: cannot set up uncut.  Please save your work."
 msgstr ""
 "B��d wewn�trzny: ustawianie wklejania nie powiod�o si�. Prosz� zapisa� swoj� "
 "prac�."
 
-#: src/text.c:950
-msgid "Internal error: unknown type.  Please save your work."
-msgstr "B��d wewn�trzny: nieznany typ. Prosz� zapisa� swoj� prac�."
-
-#: src/text.c:1870
+#: src/text.c:1806
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Nieprawid�owy znacznik cytowania %s: %s"
 
-#: src/text.c:2267
+#: src/text.c:2207
 msgid "Can now UnJustify!"
 msgstr "Mo�na teraz cofn�� justowanie!"
 
-#: src/text.c:2462
+#: src/text.c:2404
 msgid "Edit a replacement"
 msgstr "Edytuj zast�pienie"
 
-#: src/text.c:2548
-msgid "Could not create pipe"
-msgstr "Nie mo�na utworzy� potoku"
-
-#: src/text.c:2550
+#: src/text.c:2492
 msgid "Creating misspelled word list, please wait..."
 msgstr "Tworzenie listy b��dnie napisanych s��w, prosz� czeka�..."
 
-#: src/text.c:2642
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
 msgstr "Nie mo�na uzyska� wielko�ci bufora potoku"
 
-#: src/text.c:2693
+#: src/text.c:2635
 msgid "Error invoking \"spell\""
 msgstr "B��d podczas wywo�ywania \"spell\""
 
-#: src/text.c:2696
+#: src/text.c:2638
 msgid "Error invoking \"sort -f\""
 msgstr "B��d podczas wywo�ywania \"sort -f\""
 
-#: src/text.c:2699
+#: src/text.c:2641
 msgid "Error invoking \"uniq\""
 msgstr "B��d podczas wywo�ywania \"uniq\""
 
-#: src/text.c:2756 src/text.c:2965
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "Zako�czono sprawdzanie pisowni"
 
-#: src/text.c:2815
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "B��d podczas wywo�ywania \"%s\""
 
-#: src/text.c:2960
+#: src/text.c:2885
+msgid "Invoking spell checker, please wait"
+msgstr "Wywo�anie sprawdzania pisowni, prosz� zaczeka�"
+
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Niepowodzenie sprawdzania pisowni: %s"
 
-#: src/text.c:2962
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Niepowodzenie sprawdzania pisowni: %s: %s"
 
-#: src/text.c:3030
+#: src/text.c:2937
+msgid "No linter defined for this type of file!"
+msgstr "Brak analizatora sk�adni dla tego typu pliku!"
+
+#: src/text.c:2947
+msgid "Save modified buffer before linting?"
+msgstr "Zapisa� bufor przed sprawdzaniem sk�adni?"
+
+#: src/text.c:2969
+msgid "Invoking linter, please wait"
+msgstr "Sprawdzanie sk�adni, prosz� zaczeka�"
+
+#: src/text.c:3125
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr "Otrzymano 0 poprawnych linii od polecenia: %s"
+
+#: src/text.c:3159
+#, 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?"
+
+#: src/text.c:3205
+msgid "At last message"
+msgstr "Ostatni komunikat"
+
+#: src/text.c:3210
+msgid "At first message"
+msgstr "Pierwszy komunikat"
+
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr ""
+
+#: src/text.c:3275
+msgid "Finished"
+msgstr ""
+
+#: src/text.c:3280
+#, fuzzy
+msgid "Invoking formatter, please wait"
+msgstr "Sprawdzanie sk�adni, prosz� zaczeka�"
+
+#: src/text.c:3360
+msgid "Finished formatting"
+msgstr ""
+
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sS�owa: %lu  Linii: %ld  Znaki: %lu"
 
-#: src/text.c:3031
+#: src/text.c:3439
 msgid "In Selection:  "
 msgstr "W zaznaczeniu:  "
 
-#: src/utils.c:405 src/utils.c:417
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3453
+msgid "Verbatim Input"
+msgstr "wprowadzanie dos�owne"
+
+#: src/utils.c:410 src/utils.c:422
 msgid "nano is out of memory!"
 msgstr "nano brak�o pami�ci!"
 
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
-#: src/winio.c:1557
+#: src/winio.c:1583
 msgid "Unicode Input"
 msgstr "Wej�cie Unicode"
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2142 src/winio.c:2146
 msgid "Modified"
 msgstr "Zmieniony "
 
-#: src/winio.c:2150
+#: src/winio.c:2143
 msgid "View"
 msgstr "Przegl."
 
-#: src/winio.c:2164
+#: src/winio.c:2157
 msgid "DIR:"
 msgstr "KAT:"
 
-#: src/winio.c:2171
+#: src/winio.c:2164
 msgid "File:"
 msgstr "Plik:"
 
-#: src/winio.c:3360
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2261
+msgid ""
+"Warning: Modifying a file which is not locked, check directory permission?"
+msgstr ""
+"Ostrze�enie: Plik nie zosta� zablokowany; sprawd� uprawnienia katalogu?"
+
+#: src/winio.c:3377
 #, 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:3492
+#: src/winio.c:3507
 msgid "The nano text editor"
 msgstr "Edytor tekstu nano"
 
-#: src/winio.c:3493
+#: src/winio.c:3508
 msgid "version"
 msgstr "wersja"
 
-#: src/winio.c:3494
+#: src/winio.c:3509
 msgid "Brought to you by:"
 msgstr "Stworzony przez:"
 
-#: src/winio.c:3495
+#: src/winio.c:3510
 msgid "Special thanks to:"
 msgstr "Specjalne podzi�kowania otrzymuj�:"
 
-#: src/winio.c:3496
+#: src/winio.c:3511
 msgid "The Free Software Foundation"
 msgstr "Free Software Foundation (Fundacja Wolnego Oprogramowania)"
 
-#: src/winio.c:3497
+#: src/winio.c:3512
+msgid "the many translators and the TP"
+msgstr ""
+
+#: src/winio.c:3513
 msgid "For ncurses:"
 msgstr "Za ncurses:"
 
-#: src/winio.c:3498
+#: src/winio.c:3514
 msgid "and anyone else we forgot..."
 msgstr "oraz wszyscy pozostali, o kt�rych zapomnieli�my..."
 
-#: src/winio.c:3499
+#: src/winio.c:3515
 msgid "Thank you for using nano!"
 msgstr "Dzi�kujemy za korzystanie z nano!"
 
-#~ msgid "Error writing backup file %s: File owner mismatch"
-#~ msgstr "B��d zapisu kopii zapasowej %s: niezgodno�� w�a�ciciela pliku"
+#~ msgid "Internal error: can't match line %ld.  Please save your work."
+#~ msgstr ""
+#~ "B��d wewn�trzny: nie mo�na dopasowa� linii %ld. Prosz� zapisa� swoj� "
+#~ "prac�."
+
+#~ msgid "line wrap"
+#~ msgstr "przewijanie linii"
diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo
index 6ea63c9..4ac1f06 100644
--- a/po/pt_BR.gmo
+++ b/po/pt_BR.gmo
diff --git a/po/pt_BR.po b/po/pt_BR.po
index b1ecc80..52ca8d5 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,121 +1,151 @@
-# Portugueses Translation for the nano textual domain
-# Copyright (C) 2009 Free Software Foundation, Inc.
+# Brazilian Portuguese translation for the nano
+# Copyright (C) 2015 Free Software Foundation, Inc.
 # This file is distributed under the same license as the nano package.
 # João Victor Duarte Martins <jvdm@sdf.lonestar.org>, 2010.
+# Rafael Ferreira <rafael.f.f1@gmail.com>, 2014, 2015.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 2.2.4pre2\n"
+"Project-Id-Version: nano 2.3.99pre3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-22 06:34-0500\n"
-"PO-Revision-Date: 2010-04-07 10:02-0300\n"
-"Last-Translator: João Victor Duarte Martins <jvdm@sdf.lonestar.org>\n"
-"Language-Team: Brazilian Portuguese <ldp-br@bazar.conectiva.com.br>\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
+"PO-Revision-Date: 2015-02-27 17:36-0300\n"
+"Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
+"Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge."
+"net>\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.7.4\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/browser.c:220
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:203
 msgid "Go To Directory"
-msgstr "Ir para o Diretório"
+msgstr "Ir para o diretório"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:860 src/files.c:2048
-#: src/nano.c:1060 src/search.c:220 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:246 src/browser.c:293
 #, c-format
 msgid "Can't go outside of %s in restricted mode"
-msgstr "Impossível mover-se fora de %s no modo restrito"
+msgstr "Não é possível mover-se para fora de %s no modo restrito"
 
-#: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:722
-#: src/files.c:731 src/files.c:1540 src/files.c:1659 src/files.c:1711
-#: src/files.c:1732 src/files.c:1855 src/files.c:2691 src/rcfile.c:568
-#: src/rcfile.c:1204
+#: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
+#: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
+#: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
-msgstr "Erro na leitura %s: %s"
+msgstr "Erro ao ler %s: %s"
 
-#: src/browser.c:303
+#: src/browser.c:283
 msgid "Can't move up a directory"
-msgstr "Impossível mover um diretório"
+msgstr "Não é possível mover um diretório"
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:665 src/browser.c:674
+#: src/browser.c:626 src/browser.c:635
 msgid "(dir)"
 msgstr "(dir)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:632
 msgid "(parent dir)"
 msgstr "(dir acima)"
 
-#: src/browser.c:801 src/search.c:185
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
-msgstr "Busca"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:805 src/search.c:189
-msgid " [Case Sensitive]"
-msgstr "[Sensibilidade de Caixa]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:811 src/search.c:195
-msgid " [Regexp]"
-msgstr "[Expressão Regular]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:817 src/search.c:201
-msgid " [Backwards]"
-msgstr "[Retroceder]"
+msgstr "Pesquisa"
 
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
-msgstr "Busca Ajustada"
+msgstr "Pesquisa ajustada"
 
-#: src/browser.c:1006 src/browser.c:1039 src/search.c:514 src/search.c:517
-#: src/search.c:574 src/search.c:577
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
-msgstr "Está é única ocorrência"
+msgstr "Esta é a única ocorrência"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
-msgstr "Nenhum padrão de busca atualmente"
+msgstr "Nenhum padrão de pesquisa atualmente"
+
+#: src/files.c:139
+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:145
+#, c-format
+msgid "Couldn't determine hostname for lock file: %s"
+msgstr "Não foi possível determinar o hostname para o arquivo de trava: %s"
+
+#: src/files.c:165 src/files.c:175 src/files.c:212 src/files.c:222
+#, c-format
+msgid "Error writing lock file %s: %s"
+msgstr "Erro ao escrever o arquivo de trava %s: %s"
+
+#: src/files.c:237
+#, c-format
+msgid "Error deleting lock file %s: %s"
+msgstr "Erro ao escrever o arquivo de trava %s: %s"
+
+#: src/files.c:272
+#, c-format
+msgid "Error opening lock file %s: %s"
+msgstr "Erro ao abrir o arquivo de trava %s: %s"
+
+#: src/files.c:282
+#, 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:297
+#, 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:125
+#: src/files.c:308
+#, c-format
+msgid "Error writing lock file: Directory '%s' doesn't exist"
+msgstr "Erro ao escrever o arquivo de trava: Diretório \"%s\" não existe"
+
+#: src/files.c:339
 #, c-format
 msgid "Can't insert file from outside of %s"
-msgstr "Impossível inserir a linha de fora do %s"
+msgstr "Não foi possível inserir a linha de fora de %s"
 
-#: src/files.c:234
+#: src/files.c:467
 msgid "No more open file buffers"
-msgstr "Não há mais nenhum buffer de arquivos aberto"
+msgstr "Não há mais nenhum buffer de arquivos abertos"
 
-#: src/files.c:250
+#: src/files.c:484
 #, c-format
 msgid "Switched to %s"
 msgstr "Alternado para %s"
 
-#: src/files.c:251 src/global.c:469 src/winio.c:2168
+#: src/files.c:485 src/global.c:953 src/winio.c:2161
 msgid "New Buffer"
-msgstr "Novo Buffer"
+msgstr "Novo buffer"
 
-#: src/files.c:633
+#: src/files.c:874
 #, 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:638
+#: src/files.c:879
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
@@ -130,14 +160,14 @@ msgstr[1] ""
 "%lu linhas lidas (Convertidas do formato DOS e Mac - Atenção: Sem permissão "
 "de escrita)"
 
-#: src/files.c:644
+#: src/files.c:885
 #, 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:648
+#: src/files.c:889
 #, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
@@ -150,14 +180,14 @@ msgstr[1] ""
 "%lu linhas lidas (Convertidas do formato Mac - Atenção: Sem permissão de "
 "escrita)"
 
-#: src/files.c:654
+#: src/files.c:895
 #, 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:658
+#: src/files.c:899
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
@@ -170,810 +200,879 @@ msgstr[1] ""
 "%lu linhas lidas (Convertidas do formato DOS - Atenção: Sem permissão de "
 "escrita)"
 
-#: src/files.c:664
+#: src/files.c:905
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "%lu linha lida"
 msgstr[1] "%lu linhas lidas"
 
-#: src/files.c:667
+#: src/files.c:908
 #, 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:700 src/files.c:736
+#: src/files.c:943 src/files.c:980
 msgid "Reading File"
 msgstr "Lendo o arquivo"
 
-#: src/files.c:706
+#: src/files.c:950
 msgid "New File"
-msgstr "Novo Arquivo"
+msgstr "Novo arquivo"
 
-#: src/files.c:709
+#: src/files.c:953
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" não encontrado"
 
-#: src/files.c:717 src/rcfile.c:559 src/rcfile.c:1154 src/rcfile.c:1195
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" é um diretório"
 
-#: src/files.c:718 src/rcfile.c:560 src/rcfile.c:1155 src/rcfile.c:1196
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" é um arquivo dispositivo"
 
-#: src/files.c:817
+#: src/files.c:1060
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Comando para execução no novo buffer [de %s] "
 
-#: src/files.c:819
+#: src/files.c:1062
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Comando para execução [de %s] "
 
-#: src/files.c:825
+#: src/files.c:1069
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Arquivo para inserção no novo buffer [de %s] "
 
-#: src/files.c:827
+#: src/files.c:1071
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Arquivo para inserção [de %s] "
 
-#: src/files.c:1077
+#: src/files.c:1320
 msgid "Key invalid in non-multibuffer mode"
-msgstr "Tecla ilegal em modo não-multibuffer"
+msgstr "Tecla inválida em modo não-multibuffer"
+
+#: src/files.c:1622
+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:1486
+#: src/files.c:1746
 #, c-format
 msgid "Can't write outside of %s"
-msgstr "Impossível escrever fora de %s"
+msgstr "Não foi possível escrever fora de %s"
 
-#: src/files.c:1501
+#: src/files.c:1761
 msgid "Cannot prepend or append to a symlink with --nofollow set"
-msgstr "Impossível acrecentar uma ligação simbólica com a opção --nofollow"
+msgstr ""
+"Não foi possível adicionar uma ligação simbólica com a opção --nofollow"
 
-#: src/files.c:1581 src/files.c:1603 src/files.c:1621 src/files.c:1632
-#: src/files.c:1640 src/files.c:1667
+#: src/files.c:1843 src/files.c:1868 src/files.c:1886 src/files.c:1899
+#: src/files.c:1910 src/files.c:1939
 #, c-format
 msgid "Error writing backup file %s: %s"
-msgstr "Erro ao escrever o arquivo reserva %s : %s"
+msgstr "Erro ao escrever o arquivo reserva %s: %s"
 
-#: src/files.c:1582 src/nano.c:701
+#: src/files.c:1844 src/nano.c:719
 msgid "Too many backup files?"
 msgstr "Muitos arquivos reserva?"
 
-#: src/files.c:1687 src/files.c:1744 src/files.c:1763 src/files.c:1775
-#: src/files.c:1799 src/files.c:1817 src/files.c:1827 src/files.c:1863
-#: src/files.c:1868 src/files.c:2764 src/files.c:2773
+#: src/files.c:1959 src/files.c:2016 src/files.c:2035 src/files.c:2047
+#: src/files.c:2071 src/files.c:2089 src/files.c:2099 src/files.c:2135
+#: src/files.c:2140 src/files.c:3101 src/files.c:3110 src/files.c:3133
+#: src/files.c:3145
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Erro ao escrever %s: %s"
 
-#: src/files.c:1721 src/text.c:2929 src/text.c:2941
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Erro ao escrever o arquivo temporário: %s"
 
-#: src/files.c:1900
+#: src/files.c:2173
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
-msgstr[0] "Escrito %lu linha"
-msgstr[1] "Escrito %lu linhas"
+msgstr[0] "Escrita %lu linha"
+msgstr[1] "Escritas %lu linhas"
 
-#: src/files.c:2004
+#: src/files.c:2278
 msgid " [DOS Format]"
 msgstr " [Formato DOS]"
 
-#: src/files.c:2005
+#: src/files.c:2279
 msgid " [Mac Format]"
 msgstr " [Formato Mac]"
 
-#: src/files.c:2007
+#: src/files.c:2281
 msgid " [Backup]"
 msgstr " [Arq Reserva]"
 
-#: src/files.c:2015
+#: src/files.c:2289
 msgid "Prepend Selection to File"
-msgstr "Pre-Adicionar seleção para o Arquivo"
+msgstr "Pré-adicionar seleção para o arquivo"
 
-#: src/files.c:2016
+#: src/files.c:2290
 msgid "Append Selection to File"
-msgstr "Adicionar seleção para o Arquivo"
+msgstr "Adicionar seleção para o arquivo"
 
-#: src/files.c:2017
+#: src/files.c:2291
 msgid "Write Selection to File"
-msgstr "Escrever a Seleção para o Arquivo"
+msgstr "Escrever a seleção para o arquivo"
 
-#: src/files.c:2020
+#: src/files.c:2294
 msgid "File Name to Prepend to"
-msgstr "Nome Arquivo para Pré-Adicionar"
+msgstr "Nome arquivo para pré-adicionar"
 
-#: src/files.c:2021
+#: src/files.c:2295
 msgid "File Name to Append to"
-msgstr "Arquivo para Adicionar ao"
+msgstr "Nome do arquivo para adicionar a"
 
-#: src/files.c:2022
+#: src/files.c:2296
 msgid "File Name to Write"
-msgstr "Nome do Arquivo para Gravar"
+msgstr "Nome do arquivo para gravar"
 
-#: src/files.c:2153
+#: src/files.c:2427
 msgid "File exists, OVERWRITE ? "
-msgstr "Arquivo já existe, SOBRESCREVER ?"
+msgstr "Arquivo já existe, SOBRESCREVER ? "
 
-#: src/files.c:2162
+#: src/files.c:2436
 msgid "Save file under DIFFERENT NAME ? "
-msgstr "Salvar o Arquivo com um NOME DIFERENTE ?"
+msgstr "Salvar o arquivo com um NOME DIFERENTE ? "
 
-#: src/files.c:2173
+#: src/files.c:2450
 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:2611
+#: src/files.c:2882
 msgid "(more)"
 msgstr "(mais)"
 
-#: src/files.c:2694 src/rcfile.c:1220
+#: src/files.c:2974
 #, c-format
 msgid ""
 "\n"
-"Press Enter to continue starting nano.\n"
+"Press Enter to continue\n"
 msgstr ""
 "\n"
-"Pressione Enter para continuar a inicialização do nano\n"
-
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:415 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Cancelar"
+"Pressione Enter para continuar\n"
 
-#: src/global.c:416
-msgid "Replace"
-msgstr "Substituir"
+#: src/files.c:2989
+#, c-format
+msgid ""
+"Unable to create directory %s: %s\n"
+"It is required for saving/loading search history or cursor positions.\n"
+msgstr ""
+"Não foi possível criar o diretório %s: %s\n"
+"É necessário para salvar/carregar posições do cursor ou histórico de "
+"pesquisa.\n"
 
-#: src/global.c:417
-msgid "No Replace"
-msgstr "Sem Substituição"
+#: src/files.c:2995
+#, 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 ""
+"Caminho %s não é um diretório e precisa ser.\n"
+"Nano não poderá carregar ou salvar posições do cursor ou histórico de "
+"pesquisa.\n"
 
-#: src/global.c:420
-msgid "Case Sens"
-msgstr "Sens de Caixa"
+#: src/files.c:3012
+#, 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 ""
+"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/global.c:421
-msgid "Backwards"
-msgstr "[Contrário]"
+#: src/files.c:3016
+#, 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 ""
+"Detectado um arquivo de histórico de nano legado (%s) que eu movi\n"
+"para a localização preferida (%s)\n"
+"(veja o FAQ do nano sobre essa alteração)"
 
-#: src/global.c:425
-msgid "Regexp"
-msgstr "Expressão Regular"
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
+#: src/global.c:477
+msgid "Exit"
+msgstr "Sair"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:451
-msgid "PrevHstory"
-msgstr "RegisAnt"
+#: src/global.c:478
+msgid "Close"
+msgstr "Fechar"
 
-#: src/global.c:452
-msgid "NextHstory"
-msgstr "PróxRegis"
+#: src/global.c:479
+msgid "Uncut Text"
+msgstr "Colar txt"
 
-#: src/global.c:453
-msgid "Go To Text"
-msgstr "Ir para o Próximo"
+#: src/global.c:481
+msgid "Unjustify"
+msgstr "Desjustifi"
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:455
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:485
 msgid "WhereIs Next"
-msgstr "OndeTá o Próx."
-
-#: src/global.c:457
-msgid "First File"
-msgstr "Primeira Linha"
-
-#: src/global.c:458
-msgid "Last File"
-msgstr "Última Linha"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:460
-msgid "To Files"
-msgstr "Para Arquivos"
-
-#: src/global.c:462
-msgid "DOS Format"
-msgstr "Formato DOS"
-
-#: src/global.c:463
-msgid "Mac Format"
-msgstr "Formato Mac"
-
-#: src/global.c:464
-msgid "Append"
-msgstr "Anexar"
+msgstr "OndeTá o próx."
 
-#: src/global.c:465
-msgid "Prepend"
-msgstr "Pre-anexar"
-
-#: src/global.c:466
-msgid "Backup File"
-msgstr "Arquivo Reserva"
-
-#: src/global.c:467
-msgid "Execute Command"
-msgstr "Executar Comando"
-
-#: src/global.c:471
-msgid "Go To Dir"
-msgstr "Ir P/ o Dir"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:480
-msgid "Get Help"
-msgstr "Ajuda"
-
-#: src/global.c:481
-msgid "Exit"
-msgstr "Sair"
-
-#: src/global.c:482
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:492
 msgid "Where Is"
 msgstr "Onde está?"
 
-#: src/global.c:483
-msgid "Prev Page"
-msgstr "Pág Anter"
-
-#: src/global.c:484
-msgid "Next Page"
-msgstr "Próx Pág"
-
-#: src/global.c:485
-msgid "First Line"
-msgstr "Prim Linha"
+#: src/global.c:493
+msgid "Replace"
+msgstr "Substituir"
 
-#: src/global.c:486
-msgid "Last Line"
-msgstr "Últ Linha"
+#: src/global.c:494
+msgid "Go To Line"
+msgstr "Ir p/ linha"
 
-#: src/global.c:487
-msgid "Suspend"
-msgstr "Suspender"
+#: src/global.c:495
+msgid "Prev Line"
+msgstr "Linha ant"
 
-#: src/global.c:489
-msgid "Beg of Par"
-msgstr "Ini de Par"
+#: src/global.c:496
+msgid "Next Line"
+msgstr "Prox linha"
 
-#: src/global.c:490
-msgid "End of Par"
-msgstr "Fim de Par"
+#: src/global.c:497
+msgid "Read File"
+msgstr "Ler o arq"
 
-#: src/global.c:491
+#: src/global.c:499
 msgid "FullJstify"
 msgstr "JstifiCmpl"
 
-#: src/global.c:493
+#: src/global.c:501
 msgid "Refresh"
 msgstr "Atualiz"
 
-#: src/global.c:495
-msgid "Insert File"
-msgstr "Inserir Arq"
-
-#: src/global.c:497
-msgid "Go To Line"
-msgstr "Ir P/ Linha"
-
-#: src/global.c:500
-msgid "Justify the current paragraph"
-msgstr "Justificar o parágrafo atual"
-
 #. 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:505
+#: src/global.c:507
+msgid "Justify the current paragraph"
+msgstr "Justifica o parágrafo atual"
+
+#: src/global.c:509
 msgid "Cancel the current function"
-msgstr "Cancelar a função atual"
+msgstr "Cancela a função atual"
 
-#: src/global.c:506
+#: src/global.c:510
 msgid "Display this help text"
-msgstr "Abrir texto de ajuda"
+msgstr "Abre este texto de ajuda"
 
-#: src/global.c:509
+#: src/global.c:513
 msgid "Close the current file buffer / Exit from nano"
-msgstr "Fechar o buffer do arquivo atual / Sair do nano"
+msgstr "Fecha o buffer do arquivo atual / Sai do nano"
 
-#: src/global.c:511
+#: src/global.c:515
 msgid "Exit from nano"
-msgstr "Sair do nano"
+msgstr "Sai do nano"
 
-#: src/global.c:515
+#: src/global.c:519
 msgid "Write the current file to disk"
-msgstr "Escrever o arquivo atual no disco"
+msgstr "Escreve o arquivo atual no disco"
 
-#: src/global.c:517
+#: src/global.c:521
 msgid "Insert another file into the current one"
-msgstr "Inserir outro arquivo no atual"
+msgstr "Insere outro arquivo no atual"
 
-# 'string' precisa de um referência direta no português
-#: src/global.c:519
+#: src/global.c:523
 msgid "Search for a string or a regular expression"
-msgstr "Procurar por uma string ou um expressão regular"
+msgstr "Procura por um texto ou uma expressão regular"
 
-#: src/global.c:520
-msgid "Go to previous screen"
-msgstr "Ir para a tela anterior"
+#: src/global.c:526
+msgid "Search for a string"
+msgstr "Pesquisa por um texto"
 
-#: src/global.c:521
-msgid "Go to next screen"
-msgstr "Ir para a próxima tela"
+#: src/global.c:528
+msgid "Go one screenful up"
+msgstr "Vai uma tela acima"
 
-#: src/global.c:523
+#: src/global.c:529
+msgid "Go one screenful down"
+msgstr "Vai uma tela abaixo"
+
+#: src/global.c:531
 msgid "Cut the current line and store it in the cutbuffer"
-msgstr "Recortar a linha atual e guardá-la no buffer-de-transferência"
+msgstr "Recorta a linha atual e guardá-la no buffer-de-transferência"
 
-#: src/global.c:525
+#: src/global.c:533
 msgid "Uncut from the cutbuffer into the current line"
-msgstr "Colar do buffer-de-transferência para a linha atual"
+msgstr "Cola do buffer-de-transferência para a linha atual"
 
-#: src/global.c:527
+#: src/global.c:534
 msgid "Display the position of the cursor"
-msgstr "Mostrar a posição do cursor"
+msgstr "Mostra a posição do cursor"
 
-#: src/global.c:529
+#: src/global.c:536
 msgid "Invoke the spell checker, if available"
-msgstr "Chamar pelo verificador ortográfico, se disponível"
+msgstr "Chama o verificador ortográfico, se disponível"
 
-# 'string' precisa de um referência direta no português
-#: src/global.c:531
+#: src/global.c:538
 msgid "Replace a string or a regular expression"
-msgstr "Substituir uma string ou expressão regular"
+msgstr "Substitui um texto ou expressão regular"
 
-#: src/global.c:532
+#: src/global.c:539
 msgid "Go to line and column number"
-msgstr "Ir para linha e coluna número"
+msgstr "Vai para linha e coluna número"
 
-#: src/global.c:534
-msgid "Mark text at the cursor position"
-msgstr "Marcar o texto na posicação do cursor"
+#: src/global.c:541
+msgid "Mark text starting from the cursor position"
+msgstr "Marca o texto iniciando na posição do cursor"
 
-#: src/global.c:535
-msgid "Repeat last search"
-msgstr "Repetir a última busca"
+#: src/global.c:542
+msgid "Repeat the last search"
+msgstr "Repete a última pesquisa"
 
-#: src/global.c:537
+#: src/global.c:544
 msgid "Copy the current line and store it in the cutbuffer"
-msgstr "Copiar a linha atual e guardá-la no buffer-de-transferência"
+msgstr "Copia a linha atual e guardá-la no buffer-de-transferência"
 
-#: src/global.c:538
+#: src/global.c:545
 msgid "Indent the current line"
-msgstr "Avançar o recuo da linha atual"
+msgstr "Avança o recuo da linha atual"
 
-#: src/global.c:539
+#: src/global.c:546
 msgid "Unindent the current line"
-msgstr "Recuar a linha atual"
+msgstr "Recua a linha atual"
 
-#: src/global.c:540
+#: src/global.c:547
 msgid "Undo the last operation"
-msgstr "Desfazer a última operação"
+msgstr "Desfaz a última operação"
 
-#: src/global.c:541
+#: src/global.c:548
 msgid "Redo the last undone operation"
-msgstr "Refazer a última operação desfeita"
+msgstr "Refaz a última operação desfeita"
 
-#: src/global.c:543
+#: src/global.c:550
 msgid "Go forward one character"
-msgstr "Avançar em um caractere"
+msgstr "Avança em um caractere"
 
-#: src/global.c:544
+#: src/global.c:551
 msgid "Go back one character"
-msgstr "Voltar em um caractere"
+msgstr "Volta em um caractere"
 
-#: src/global.c:546
+#: src/global.c:553
 msgid "Go forward one word"
-msgstr "Avançar em uma palavra"
+msgstr "Avança em uma palavra"
 
-#: src/global.c:547
+#: src/global.c:554
 msgid "Go back one word"
-msgstr "Retroceder em uma palavra"
+msgstr "Retrocede em uma palavra"
 
-#: src/global.c:549
+#: src/global.c:556
 msgid "Go to previous line"
-msgstr "Ir para a última linha"
+msgstr "Vai para a última linha"
 
-#: src/global.c:550
+#: src/global.c:557
 msgid "Go to next line"
-msgstr "Ir para a próxima linha"
+msgstr "Vai para a próxima linha"
 
-#: src/global.c:551
+#: src/global.c:558
 msgid "Go to beginning of current line"
-msgstr "Ir para o início da linha atual"
+msgstr "Vai para o início da linha atual"
 
-#: src/global.c:552
+#: src/global.c:559
 msgid "Go to end of current line"
-msgstr "Ir para o fim da linha atual"
+msgstr "Vai para o fim da linha atual"
 
-#: src/global.c:555
+#: src/global.c:562
 msgid "Go to beginning of paragraph; then of previous paragraph"
-msgstr "Ir para o início do parágrafo; depois para o parágrafo anterior"
+msgstr "Vai para o início do parágrafo; depois para o parágrafo anterior"
 
-#: src/global.c:557
+#: src/global.c:564
 msgid "Go just beyond end of paragraph; then of next paragraph"
-msgstr "Ir para o fim do parágrafo; depois para o próximo parágrafo"
+msgstr "Vai para o fim do parágrafo; depois para o próximo parágrafo"
 
-#: src/global.c:560
+#: src/global.c:566
 msgid "Go to the first line of the file"
-msgstr "Ir para a primeira linha do arquivo"
+msgstr "Vai para a primeira linha do arquivo"
 
-#: src/global.c:562
+#: src/global.c:567
 msgid "Go to the last line of the file"
-msgstr "Ir para a última linha do arquivo"
+msgstr "Vai para a última linha do arquivo"
 
-#: src/global.c:564
+#: src/global.c:569
 msgid "Go to the matching bracket"
-msgstr "Ir para o fechamento do parenteses/colchetes/chaves"
+msgstr "Vai para o fechamento do parênteses/colchetes/chaves"
 
-#: src/global.c:566
+#: src/global.c:571
 msgid "Scroll up one line without scrolling the cursor"
-msgstr "Rolar uma linha acima sem o cursor"
+msgstr "Rola uma linha acima sem o cursor"
 
-#: src/global.c:568
+#: src/global.c:573
 msgid "Scroll down one line without scrolling the cursor"
-msgstr "Rolar uma linha abaixo sem o cursor"
+msgstr "Rola uma linha abaixo sem o cursor"
 
-#: src/global.c:572
+#: src/global.c:576
 msgid "Switch to the previous file buffer"
-msgstr "Trocar para o buffer de arquivo anterior"
+msgstr "Troca para o buffer de arquivo anterior"
 
-#: src/global.c:574
+#: src/global.c:577
 msgid "Switch to the next file buffer"
-msgstr "Trocar para o próximo buffer de arquivo"
+msgstr "Troca para o próximo buffer de arquivo"
 
-#: src/global.c:577
+#: src/global.c:579
 msgid "Insert the next keystroke verbatim"
-msgstr "Inserir caractere(s) literalmente"
+msgstr "Insere caractere(s) literalmente"
 
-#: src/global.c:579
+#: src/global.c:580
 msgid "Insert a tab at the cursor position"
-msgstr "Inserir um caractere tabular na posição do cursor"
+msgstr "Insere um caractere tabular na posição do cursor"
 
 #: src/global.c:581
 msgid "Insert a newline at the cursor position"
-msgstr "Inserir quebra de linha na posição do cursor"
+msgstr "Insere quebra de linha na posição do cursor"
 
-#: src/global.c:583
+#: src/global.c:582
 msgid "Delete the character under the cursor"
-msgstr "Apagar o caractere sob o cursor"
+msgstr "Apaga o caractere sob o cursor"
 
-#: src/global.c:585
+#: src/global.c:584
 msgid "Delete the character to the left of the cursor"
-msgstr "Apagar o caractere a esquerda do cursor"
+msgstr "Apaga o caractere a esquerda do cursor"
 
-#: src/global.c:588
+#: src/global.c:587
 msgid "Cut from the cursor position to the end of the file"
-msgstr "Recortar do cursor até o fim da linha"
+msgstr "Recorta do cursor até o fim da linha"
 
-#: src/global.c:591
+#: src/global.c:590
 msgid "Justify the entire file"
-msgstr "Justificar o arquivo inteiro"
+msgstr "Justifica o arquivo inteiro"
 
-#: src/global.c:595
+#: src/global.c:594
 msgid "Count the number of words, lines, and characters"
-msgstr "Contar o número de palavras, linhas e caracteres"
+msgstr "Conta o número de palavras, linhas e caracteres"
 
-#: src/global.c:598
+#: src/global.c:597
 msgid "Refresh (redraw) the current screen"
-msgstr "Atualizar (re-desenhar) a tela atual"
+msgstr "Atualiza (re-desenha) a tela atual"
 
-#: src/global.c:600
+#: src/global.c:599
 msgid "Suspend the editor (if suspend is enabled)"
-msgstr "Suspender o editor (se a suspensão estiver habilitada)"
+msgstr "Suspende o editor (se a suspensão estiver habilitada)"
 
-#: src/global.c:603
+#: src/global.c:602
 msgid "Toggle the case sensitivity of the search"
-msgstr "Ativar sensibilidade de caixa na busca"
+msgstr "Ativa sensibilidade de caixa na pesquisa"
 
-#: src/global.c:605
+#: src/global.c:604
 msgid "Reverse the direction of the search"
-msgstr "Inverter a direção da busca"
+msgstr "Inverte a direção da pesquisa"
 
-#: src/global.c:609
+#: src/global.c:608
 msgid "Toggle the use of regular expressions"
-msgstr "Ativar o uso de expressões regulares"
+msgstr "Ativa o uso de expressões regulares"
 
-#: src/global.c:613
+#: src/global.c:612
 msgid "Recall the previous search/replace string"
-msgstr "Lembrar a última string de busca/substituição"
+msgstr "Lembra o último texto de pesquisa/substituição"
 
-#: src/global.c:615
+#: src/global.c:614
 msgid "Recall the next search/replace string"
-msgstr "Lembrar a ultima string de busca/substituição"
+msgstr "Lembra o ultimo texto de pesquisa/substituição"
 
-#: src/global.c:618
+#: src/global.c:617
 msgid "Go to file browser"
-msgstr "Ir para o navegador de arquivo"
+msgstr "Vai para o navegador de arquivo"
 
-#: src/global.c:621
+#: src/global.c:620
 msgid "Toggle the use of DOS format"
-msgstr "Ativar o uso do formato DOS"
+msgstr "Ativa o uso do formato DOS"
 
-#: src/global.c:622
+#: src/global.c:621
 msgid "Toggle the use of Mac format"
-msgstr "Ativar o uso do formato Mac"
+msgstr "Ativa o uso do formato Mac"
 
-#: src/global.c:624
+#: src/global.c:622
 msgid "Toggle appending"
-msgstr "Ativar ajutamento"
+msgstr "Ativa ajuntamento"
 
-#: src/global.c:625
+#: src/global.c:623
 msgid "Toggle prepending"
-msgstr "Ativar pré-ajuntamento"
+msgstr "Ativa pré-adicionamento"
 
-#: src/global.c:628
+#: src/global.c:624
 msgid "Toggle backing up of the original file"
-msgstr "Ativar cópia de segurança do arquivo original"
+msgstr "Ativa cópia de segurança do arquivo original"
 
-#: src/global.c:629
+#: src/global.c:625
 msgid "Execute external command"
-msgstr "Executar um comando externo"
+msgstr "Executa um comando externo"
 
-#: src/global.c:633
+#: src/global.c:628
 msgid "Toggle the use of a new buffer"
-msgstr "Ativar o uso de um novo buffer"
+msgstr "Ativa o uso de um novo buffer"
 
-#: src/global.c:636
+#: src/global.c:631
 msgid "Exit from the file browser"
-msgstr "Sair do navegador de arquivos"
+msgstr "Sai do navegador de arquivos"
 
-#: src/global.c:638
+#: src/global.c:632
 msgid "Go to the first file in the list"
-msgstr "Ir para o primeiro arquivo na lista"
+msgstr "Vai para o primeiro arquivo na lista"
 
-#: src/global.c:640
+#: src/global.c:633
 msgid "Go to the last file in the list"
-msgstr "Ir para o último arquivo na lista"
+msgstr "Vai para o último arquivo na lista"
 
-#: src/global.c:641
+#: src/global.c:634
+msgid "Go to the previous file in the list"
+msgstr "Vai para o prévio arquivo na lista"
+
+#: src/global.c:635
 msgid "Go to the next file in the list"
-msgstr "Ir para o próximo arquivo na lista"
+msgstr "Vai para o próximo arquivo na lista"
+
+#: src/global.c:636
+msgid "Go to directory"
+msgstr "Vai para o diretório"
+
+#: src/global.c:639
+msgid "Invoke the linter, if available"
+msgstr "Chama o lintador, se disponível"
+
+#: src/global.c:640
+msgid "Go to previous linter msg"
+msgstr "Vai para a mensagem anterior do lintador"
+
+#: src/global.c:641
+msgid "Go to next linter msg"
+msgstr "Vai para a próxima mensagem do lintador"
 
 #: src/global.c:642
-msgid "Go to the previous file in the list"
-msgstr "Ir para o prévio arquivo na lista"
+msgid "Invoke formatter, if available"
+msgstr "Chama o formatador, se disponível"
 
-#: src/global.c:643
-msgid "Go to directory"
-msgstr "Ir para o diretório"
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:662
+msgid "Get Help"
+msgstr "Ajuda"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:670
-msgid "Close"
-msgstr "Fechar"
+#: src/global.c:665 src/prompt.c:1084
+msgid "Cancel"
+msgstr "Cancelar"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:679
-msgid "WriteOut"
+#: src/global.c:678
+msgid "Write Out"
 msgstr "Gravar"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:704
+msgid "Go To Dir"
+msgstr "Ir p/ o dir"
+
+#: src/global.c:719
+msgid "Cut Text"
+msgstr "Recort txt"
+
+#: src/global.c:728
 msgid "Justify"
 msgstr "Justificar"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:696
-msgid "Read File"
-msgstr "Ler o Arq"
+#: src/global.c:733
+msgid "To Spell"
+msgstr "VerfOrtog"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:713
-msgid "Cut Text"
-msgstr "Recort Txt"
+#: src/global.c:738
+msgid "To Linter"
+msgstr "Lintar"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:718
-msgid "UnJustify"
-msgstr "DesJustifi"
+#: src/global.c:740
+msgid "Formatter"
+msgstr "Formatador"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:723
-msgid "UnCut Text"
-msgstr "Colar Txt"
+#: src/global.c:745
+msgid "Case Sens"
+msgstr "Sens de caixa"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:728 src/global.c:755
+#: src/global.c:750
+msgid "Regexp"
+msgstr "Expressão regular"
+
+#: src/global.c:755
+msgid "Backwards"
+msgstr "[Contrário]"
+
+#: src/global.c:762
+msgid "No Replace"
+msgstr "Sem substituição"
+
+#: src/global.c:770
 msgid "Cur Pos"
-msgstr "Pos Atual"
+msgstr "Pos atual"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:737
-msgid "To Spell"
-msgstr "Para Spell"
+#: src/global.c:780
+msgid "Prev Page"
+msgstr "Pág anter"
+
+#: src/global.c:782
+msgid "Next Page"
+msgstr "Próx pág"
+
+#: src/global.c:785
+msgid "First Line"
+msgstr "Prim linha"
+
+#: src/global.c:787
+msgid "Last Line"
+msgstr "Últ linha"
+
+# Aplica parênteses no texto
+#: src/global.c:794
+msgid "To Bracket"
+msgstr "Parênteses"
 
-#: src/global.c:771
+#: src/global.c:797
 msgid "Mark Text"
-msgstr "Marcar Txt"
+msgstr "Marcar txt"
 
-#: src/global.c:777
+#: src/global.c:800
 msgid "Copy Text"
-msgstr "Copiar Txt"
+msgstr "Copiar txt"
 
-#: src/global.c:780
+#: src/global.c:803
 msgid "Indent Text"
-msgstr "Alinhar Txt"
+msgstr "Alinhar txt"
 
-#: src/global.c:783
+#: src/global.c:805
 msgid "Unindent Text"
-msgstr "Desalinhar Txt"
+msgstr "Desalinhar txt"
 
-#: src/global.c:787
+#: src/global.c:808
 msgid "Undo"
 msgstr "Desfazer"
 
-#: src/global.c:790
+#: src/global.c:810
 msgid "Redo"
 msgstr "Refazer"
 
-#: src/global.c:796 src/global.c:800
-msgid "Forward"
-msgstr "Avançar"
-
-#: src/global.c:806 src/global.c:810
+#: src/global.c:814 src/global.c:820
 msgid "Back"
 msgstr "Voltar"
 
-#: src/global.c:817
-msgid "Next Word"
-msgstr "Prx Palvr"
+#: src/global.c:816 src/global.c:822
+msgid "Forward"
+msgstr "Avançar"
 
-#: src/global.c:820
+#: src/global.c:827
 msgid "Prev Word"
-msgstr "Palvr Ant"
+msgstr "Palvr ant"
 
-#: src/global.c:824
-msgid "Prev Line"
-msgstr "Linha Ant"
-
-#: src/global.c:827
-msgid "Next Line"
-msgstr "Prox Linha"
+#: src/global.c:829
+msgid "Next Word"
+msgstr "Prx palvr"
 
-#: src/global.c:830
+#: src/global.c:833
 msgid "Home"
 msgstr "Local"
 
-#: src/global.c:833
+#: src/global.c:835
 msgid "End"
 msgstr "Fim"
 
-#: src/global.c:845
-msgid "Find Other Bracket"
-msgstr "Encontrar Outro Parenteses"
+#: src/global.c:844
+msgid "Beg of Par"
+msgstr "Ini de par"
+
+#: src/global.c:846
+msgid "End of Par"
+msgstr "Fim de par"
 
-#: src/global.c:848
+#: src/global.c:851
 msgid "Scroll Up"
 msgstr "Rolar para cima"
 
-#: src/global.c:851
+#: src/global.c:853
 msgid "Scroll Down"
 msgstr "Rolar para baixo"
 
-#: src/global.c:856
-msgid "Previous File"
-msgstr "Próximo Arquivo"
-
 #: src/global.c:858
+msgid "Prev File"
+msgstr "Próximo arquivo"
+
+#: src/global.c:860
 msgid "Next File"
-msgstr "Arquivo Anterior"
+msgstr "Arquivo anterior"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:862 src/text.c:3045
-msgid "Verbatim Input"
-msgstr "Entrada Literal"
+#: src/global.c:869
+msgid "Verbatim"
+msgstr "Entrada literal"
 
-#: src/global.c:867
+#: src/global.c:872
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:870
+#: src/global.c:874
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:873
+#: src/global.c:876
 msgid "Delete"
 msgstr "Excluir"
 
-#: src/global.c:876
+#: src/global.c:878
 msgid "Backspace"
 msgstr "Tecla BACKSPACE"
 
-#: src/global.c:893
+#: src/global.c:888
 msgid "CutTillEnd"
 msgstr "RecortarAtéOFim"
 
-#: src/global.c:906
+#: src/global.c:898
 msgid "Word Count"
 msgstr "Contagem de palavras"
 
-#: src/global.c:1367
+#: src/global.c:905
+msgid "Suspend"
+msgstr "Suspender"
+
+#: src/global.c:910
+msgid "PrevHstory"
+msgstr "RegisAnt"
+
+#: src/global.c:913
+msgid "NextHstory"
+msgstr "PróxRegis"
+
+#: src/global.c:917
+msgid "Go To Text"
+msgstr "Ir para o próximo"
+
+#: src/global.c:928
+msgid "DOS Format"
+msgstr "Formato DOS"
+
+#: src/global.c:931
+msgid "Mac Format"
+msgstr "Formato Mac"
+
+#: src/global.c:934
+msgid "Append"
+msgstr "Anexar"
+
+#: src/global.c:936
+msgid "Prepend"
+msgstr "Pré-anexar"
+
+#: src/global.c:939
+msgid "Backup File"
+msgstr "Arquivo reserva"
+
+#: src/global.c:946
+msgid "Execute Command"
+msgstr "Executar comando"
+
+#: src/global.c:961
+msgid "To Files"
+msgstr "Para arquivos"
+
+#: src/global.c:964
+msgid "First File"
+msgstr "Primeira linha"
+
+#: src/global.c:966
+msgid "Last File"
+msgstr "Última linha"
+
+#: src/global.c:977
+msgid "Prev Lint Msg"
+msgstr "Msg Lint Ant"
+
+#: src/global.c:979
+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:1227
 msgid "Help mode"
-msgstr "Modo Ajuda"
+msgstr "Modo ajuda"
 
-#: src/global.c:1369
+#: src/global.c:1229
 msgid "Constant cursor position display"
 msgstr "Mostra da posição do cursor constante"
 
-#: src/global.c:1371
+#: src/global.c:1231
 msgid "Use of one more line for editing"
 msgstr "Uso de mais de uma linha para edição"
 
-#: src/global.c:1373
+#: src/global.c:1233
 msgid "Smooth scrolling"
-msgstr "Rolagem Macia"
+msgstr "Rolagem suave"
+
+#: src/global.c:1235
+msgid "Soft wrapping of overlong lines"
+msgstr "Ajuste suave de linhas compridas"
 
-#: src/global.c:1375
+#: src/global.c:1237
 msgid "Whitespace display"
-msgstr "Mostrar espaços-vazios"
+msgstr "Mostra espaços vazios"
 
-#: src/global.c:1377
+#: src/global.c:1239
 msgid "Color syntax highlighting"
-msgstr "Marcação Colorida de Sintaxe"
+msgstr "Marcação colorida de sintaxe"
 
-#: src/global.c:1379
+#: src/global.c:1241
 msgid "Smart home key"
 msgstr "Tecla HOME inteligente"
 
-#: src/global.c:1381
+#: src/global.c:1243
 msgid "Auto indent"
-msgstr "Indentação Automática"
+msgstr "Recuo automática"
 
-#: src/global.c:1383
+#: src/global.c:1245
 msgid "Cut to end"
-msgstr "Recortar até o fim"
+msgstr "Recorta até o fim"
 
-#: src/global.c:1385
-msgid "Long line wrapping"
-msgstr "Ajuste de linhas longas"
+#: src/global.c:1247
+msgid "Hard wrapping of overlong lines"
+msgstr "Ajuste rígido de linhas compridas"
 
-#: src/global.c:1387
+#: src/global.c:1249
 msgid "Conversion of typed tabs to spaces"
 msgstr "Conversão de tabulações para espaços"
 
-#: src/global.c:1389
+#: src/global.c:1251
 msgid "Backup files"
-msgstr "Reservar os Arquivos"
+msgstr "Reservar os arquivos"
 
-#: src/global.c:1391
+#: src/global.c:1253
 msgid "Multiple file buffers"
 msgstr "Múltiplos buffers de arquivos"
 
-#: src/global.c:1393
+#: src/global.c:1255
 msgid "Mouse support"
-msgstr "Suporte ao Rato"
+msgstr "Suporte ao mouse"
 
-#: src/global.c:1395
+#: src/global.c:1257
 msgid "No conversion from DOS/Mac format"
 msgstr "Sem conversões do formato DOS/Mac"
 
-#: src/global.c:1397
+#: src/global.c:1259
 msgid "Suspension"
-msgstr "Suspenção"
-
-# Soft line wrapping?
-#: src/global.c:1399
-msgid "Soft line wrapping"
-msgstr "Ajuste de linhas longas"
+msgstr "Suspensão"
 
-#: src/help.c:236
+#: src/help.c:205
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -985,18 +1084,17 @@ msgid ""
 "prompt.  Hitting Enter without entering any text will perform the previous "
 "search.  "
 msgstr ""
-"Texto de Ajuda do Comando de Busca\n"
+"Texto de Ajuda do Comando de Pesquisa\n"
 "\n"
-" Entre com as palavras ou caracteres que você gostaria de procurar, e\n"
-"então pressione <Enter>.  Se existir combinações para o texto que você\n"
-"inseriu a tela irá se atualizar para a localização da combinação mais\n"
-"próxima.\n"
+" Insira as palavras ou caracteres que você gostaria de pesquisar e, então, "
+"pressione Enter. Se existir ocorrências para o texto que você inseriu, a "
+"tela será atualizada para a localização da ocorrência mais próxima.\n"
 "\n"
-" A string de busca anterior irá aparecer em parenteses depois da entrada de "
-"busca. Pressionando Enter sem inserir nenhum texto irá fazer a busca "
-"anterior.   "
+" O texto da pesquisa anterior aparecerá em parênteses logo após a entrada de "
+"pesquisa. Pressionando Enter sem inserir nenhum texto executará a pesquisa "
+"anterior.  "
 
-#: src/help.c:245
+#: src/help.c:214
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1004,13 +1102,13 @@ msgid ""
 " The following function keys are available in Search mode:\n"
 "\n"
 msgstr ""
-"Se você selecionou texto com o marcador e então fez uma busca para "
-"substituição somente ocorrências do texto marcado serão substituídas.\n"
+"Se você selecionou um texto com o marcador e então fez uma pesquisa para "
+"substituição, apenas as ocorrências do texto marcado serão substituídas.\n"
 "\n"
-"As seguintes teclas de função vão estar disponíveis no modo de Busca:\n"
+" As seguintes teclas de função vão estar disponíveis no modo de pesquisa:\n"
 "\n"
 
-#: src/help.c:251
+#: src/help.c:220
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1023,14 +1121,14 @@ msgid ""
 msgstr ""
 "Texto de Ajuda do Ir Para Linha\n"
 "\n"
-" Entre com o número da linha que você quer ir e pressione <Enter>.  Se não\n"
-"existem linhas de texto para o número que você inseriu então você será\n"
-"enviado para a última linha do arquivo.\n"
+" Insira o número da linha para a qual você deseja ir e pressione Enter.  Se "
+"não existirem linhas de texto para o número que você inseriu, então você "
+"será enviado para a última linha do arquivo.\n"
 "\n"
 " As seguintes teclas de funções estão disponíveis no modo Ir Para Linha:\n"
 "\n"
 
-#: src/help.c:260
+#: src/help.c:229
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1053,7 +1151,7 @@ msgstr ""
 "irá ocorrer em um buffer separado (utilize Meta-< e > para alternar entre os "
 "bufferes de arquivo).  "
 
-#: src/help.c:269
+#: src/help.c:238
 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"
@@ -1061,16 +1159,14 @@ msgid ""
 " The following function keys are available in Insert File mode:\n"
 "\n"
 msgstr ""
-"Se você precisa de um outro buffer vazio basta não indicar nenhum arquivo ou "
-"indicar o nome de um arquivo que não existe e precione Enter.\n"
+"Se você precisar de um outro buffer vazio, basta não indicar nenhum arquivo "
+"ou indicar o nome de um arquivo que não existe e pressione Enter.\n"
 "\n"
 " As seguintes teclas de funções estão disponíveis no modo de Inserção de "
 "Arquivo:\n"
 "\n"
 
-# Talvez a tradução de 'prompted' não está correta.
-# Foi notificado na lista do ldp-br.
-#: src/help.c:275
+#: src/help.c:244
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1087,19 +1183,18 @@ msgid ""
 msgstr ""
 "Texto de Ajuda do Escrever Arquivo\n"
 "\n"
-" Digite o nome pelo qual você gostaria de salvar o arquivo atual e precione\n"
-"<Enter> para salvá-lo.\n"
+" Digite o nome com o qual você gostaria de salvar o arquivo atual e "
+"pressione Enter para salvá-lo.\n"
 "\n"
-" Se você selecionou texto com a marcação, você será questionado para salvar\n"
-"somente a porção selecionada para um arquivo separado.  Para reduzir as\n"
-"chances de sobrescrever o arquivo atual com a parte selecionada dele o nome\n"
+" Se você selecionou texto com a marcação, você será solicitado a salvar "
+"somente a porção selecionada para um arquivo separado.  Para reduzir as "
+"chances de sobrescrever o arquivo atual com a parte selecionada dele, o nome "
 "padrão não é o do arquivo atual nesse modo.\n"
 "\n"
-"  As seguintes teclas de funções estão disponíveis no modo Escrever "
-"Arquivo:\n"
+" As seguintes teclas de funções estão disponíveis no modo Escrever Arquivo:\n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:258
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1114,18 +1209,16 @@ msgid ""
 msgstr ""
 "Texto de Ajuda do Navegador de Arquivos\n"
 "\n"
-" O Navegador de arquvivos é utilizado para visualmente buscar a estrutura "
-"do\n"
-"diretório para selecionar um arquivo para leitura ou gravação.  Você pode\n"
-"utilizar as teclas de setas ou <Page Up/Down> para navegar através dos \n"
-"arquivos, e S ou <Enter> para escolher um arquivo,  ou entrar em um "
-"diretório,\n"
-"selecionado.  Para subir um nível,  selecione o diretório chamado \"..\" no\n"
+" O navegador de arquivos é utilizado para visualmente pesquisar a estrutura "
+"do diretório para selecionar um arquivo para leitura ou gravação.  Você pode "
+"utilizar as teclas de setas ou <Page Up/Down> para navegar através dos "
+"arquivos, e S ou Enter para escolher um arquivo,  ou entrar em um diretório, "
+"selecionado.  Para subir um nível,  selecione o diretório chamado \"..\" no "
 "topo da lista de arquivos.\n"
 "\n"
 " As seguintes teclas de funções estão disponíveis no Navegador de Arquivos:\n"
 
-#: src/help.c:302
+#: src/help.c:271
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1138,27 +1231,26 @@ msgid ""
 "search.\n"
 "\n"
 msgstr ""
-"Texto de Ajuda do Comando de Busca\n"
+"Texto de Ajuda do Comando de Pesquisa\n"
 "\n"
-" Insira as palavras ou caracteres que você gostaria de procurar e\n"
-"então pressione <Enter>.  Se existir combinações para o texto que você\n"
-"inseriu a tela irá se atualizar para a localização da combinação mais\n"
-"próxima.\n"
+" Insira as palavras ou caracteres que você gostaria de procurar e, então, "
+"pressione Enter.  Se existir combinações para o texto que você inseriu, a "
+"tela será atualizada para a localização da combinação mais próxima.\n"
 "\n"
-" A string da busca anterior irá aparecer em parenteses depois do prompt\n"
-"de busca.  Pressionar <Enter> sem inserir nenhum texto irá fazer uma busca\n"
-"com esta string anterior.\n"
+" O texto da pesquisa anterior aparecerá entre parênteses logo após o prompt "
+"de pesquisa.  Pressionar Enter sem inserir nenhum texto faz uma pesquisa com "
+"o texto da pesquisa anterior.\n"
 "\n"
 
-#: src/help.c:311
+#: src/help.c:280
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
 msgstr ""
 " As seguintes teclas de função estão disponíveis no modo de Navegação de "
-"Busca:\n"
+"Pesquisa:\n"
 
-#: src/help.c:315
+#: src/help.c:284
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1174,15 +1266,14 @@ msgstr ""
 "\n"
 " Insira o nome do diretório que você gostaria de navegar.\n"
 "\n"
-" Se a complentação <TAB> não foi desabilitada, você pode utilizar a\n"
-"a tecla <TAB> para (tentar) completar automaticamente o nome do\n"
-"diretório.\n"
+" Se a complentação <TAB> não foi desabilitada, você pode utilizar a tecla "
+"<TAB> para (tentar) completar automaticamente o nome do diretório.\n"
 "\n"
-" As seguinte teclas de funções estão disponíveis no modo\n"
-"Navegador de Ida à Diretórios:\n"
+" As seguinte teclas de funções estão disponíveis no modo Navegador de Ida à "
+"Diretórios:\n"
 "\n"
 
-#: src/help.c:328
+#: src/help.c:297
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1195,19 +1286,19 @@ msgid ""
 " The following function keys are available in Spell Check mode:\n"
 "\n"
 msgstr ""
-"Texto de Ajuda do Teste de Ortografia\n"
+"Texto de Ajuda da Verificação Ortográfica\n"
 "\n"
-" O verificador ortografico verifica todo o texto no arquivo\n"
-"atual.  Quando uma palavra desconhecida é encontrada ela é marcada e \n"
-"pode ser substituida por outra.  Então será feita a pergunta se a\n"
-"palavra deve ser substituída por todo o texto, ou, se você selecionou\n"
-"texto com a marcação, no texto marcado.\n"
+" O verificador ortográfico verifica todo o texto no arquivo atual.  Quando "
+"uma palavra desconhecida é encontrada, ela é destacada e pode ser "
+"substituída por outra.  Então, será feita a pergunta se a palavra deve ser "
+"substituída por todo o texto ou, se você selecionou texto com a marcação, no "
+"texto selecionado.\n"
 "\n"
-"As seguinte teclas de funções estão disponíveis no modo Teste de \n"
-"Ortografia:\n"
+"As seguinte teclas de funções estão disponíveis no modo Verificação "
+"Ortográfica:\n"
 "\n"
 
-#: src/help.c:343
+#: src/help.c:312
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1218,17 +1309,18 @@ msgid ""
 " The following function keys are available in Execute Command mode:\n"
 "\n"
 msgstr ""
-"Testo de ajuda da Execução de Comando\n"
+"Texto de Ajuda da Execução de Comando\n"
 "\n"
-" Este modo permite que você insira a saída de um comando executado pela "
-"cápsula (shell) dentro do buffer atual (ou em um novo buffer no modo de "
-"multiplos buffers).  Se você precisa de uma outra janela, embranco, insira "
+" Este modo permite que você insira a saída de um comando executado pelo "
+"shell dentro do buffer atual (ou em um novo buffer no modo de múltiplos "
+"buffers de arquivos).  Se você precisa de um outro buffer vazio, insira "
 "nenhum comando.\n"
 "\n"
-" As seguintes teclas de funções estão disponíveis neste modo:\n"
+" As seguintes teclas de funções estão disponíveis no modo Execução de "
+"Comando:\n"
 "\n"
 
-#: src/help.c:356
+#: src/help.c:325
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1239,16 +1331,17 @@ msgid ""
 "showing the file being edited.  The status line is the third line from the "
 "bottom and shows important messages.  "
 msgstr ""
-"Texto principal de ajuda do nano\n"
+"Texto Principal de Ajuda do Nano\n"
 "\n"
 " O editor nano foi projetado para simular as funcionalidades e a facilidade "
 "de uso do editor de texto UW Pico.  O editor possui quatro seções "
 "principais.  A linha superior mostra a versão do programa, o arquivo sendo "
-"editado no momento e se este foi modificado ou não.  Depois está a janela "
-"principal de edição exibindo o arquivo que está sendo editado.  A linha de "
-"estado é a terceira, mostrando mensagens importantes.  "
+"editado no momento e se este foi modificado ou não.  Em seguida está a "
+"janela principal de edição exibindo o arquivo que está sendo editado.  A "
+"linha de status é a terceira de baixo para cima, mostrando mensagens "
+"importantes.  "
 
-#: src/help.c:366
+#: src/help.c:335
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1262,12 +1355,12 @@ msgstr ""
 "\n"
 " A notação para os atalhos é a seguinte: Sequências com teclas Ctrl são "
 "apresentadas com um circunflexo (^) e podem ser executadas tanto com a tecla "
-"Controle (Ctrl) ou pressionando a tecla Escape (Esc) duas vezes.  Sequências "
+"Control (Ctrl) ou pressionando a tecla Escape (Esc) duas vezes.  Sequências "
 "com teclas de Escape são apresentadas com o símbolo Meta (M-) e podem ser "
 "executadas com as teclas Esc, Alt ou Meta, dependendo da sua configuração de "
 "teclado.   "
 
-#: src/help.c:375
+#: src/help.c:344
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1275,21 +1368,21 @@ msgid ""
 "keys are shown in parentheses:\n"
 "\n"
 msgstr ""
-"Pressionar Esc duas vezes e digitando um número com três digitos decimais de "
-"000 até 255 irá inserir o caractere com o valor conrespondente.  As "
-"seguintes sequências estão disponíveis na janela de edição principal.  "
-"Teclas alternativas são mostradas em parenteses:\n"
+"Pressionar Esc duas vezes e, então, digitar um número com três dígitos "
+"decimais de 000 até 255 fará inserir o caractere com o valor "
+"correspondente.  As seguintes sequências estão disponíveis na janela de "
+"edição principal.  Teclas alternativas são mostradas em parênteses:\n"
 "\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:376 src/help.c:448
 msgid "enable/disable"
 msgstr "habilitado/desabilitado"
 
-#: src/nano.c:587
+#: src/nano.c:601
 msgid "Key invalid in view mode"
-msgstr "Tecla ilegal no modo de visualização"
+msgstr "Tecla inválida no modo de visualização"
 
-#: src/nano.c:695
+#: src/nano.c:713
 #, c-format
 msgid ""
 "\n"
@@ -1298,7 +1391,7 @@ msgstr ""
 "\n"
 "Buffer escrito em %s\n"
 
-#: src/nano.c:697
+#: src/nano.c:715
 #, c-format
 msgid ""
 "\n"
@@ -1307,7 +1400,7 @@ msgstr ""
 "\n"
 "Buffer não foi escrito em %s: %s\n"
 
-#: src/nano.c:700
+#: src/nano.c:718
 #, c-format
 msgid ""
 "\n"
@@ -1316,426 +1409,454 @@ msgstr ""
 "\n"
 "Buffer não foi escrito: %s\n"
 
-#: src/nano.c:723
+#: src/nano.c:743
 msgid "Window size is too small for nano...\n"
 msgstr "Tamanho da tela muito pequeno para o nano...\n"
 
-#: src/nano.c:816
+#: src/nano.c:836
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
 "\n"
 msgstr ""
-"Uso: nano [OPÇÕES] [[+LINHA, COLUNA] ARQUIVO]...\n"
+"Uso: nano [OPÇÕES] [[+LINHA,COLUNA] ARQUIVO]...\n"
 "\n"
 
-#: src/nano.c:819
+#: src/nano.c:839
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
-msgstr "Opção\t\tOpção Longa GNU\t\tSignificado\n"
+msgstr "Opção\t\tOpção GNU longa\t\tSignificado\n"
 
-#: src/nano.c:821
+#: src/nano.c:841
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Opção\t\tSignificado\n"
 
-#: src/nano.c:824
-msgid "Show this message"
-msgstr "Mostrar essa mensagem"
-
-#: src/nano.c:825
+#: src/nano.c:844
 msgid "+LINE,COLUMN"
 msgstr "+LINHA,COLUNA"
 
-#: src/nano.c:826
+#. TRANSLATORS: The next forty or so strings are option descriptions
+#. * for the --help output.  Try to keep them at most 40 characters.
+#: src/nano.c:847
 msgid "Start at line LINE, column COLUMN"
-msgstr "Começar na linha numero LINHA, coluna COLUNA"
+msgstr "Começa na linha número LINHA, coluna COLUNA"
 
-#: src/nano.c:828
+#: src/nano.c:849
 msgid "Enable smart home key"
-msgstr "Habilitar tecla <HOME> inteligente"
+msgstr "Habilita tecla <HOME> inteligente"
 
-#: src/nano.c:829
+#: src/nano.c:850
 msgid "Save backups of existing files"
-msgstr "Salvar cópias reserva de arquivos que existem"
+msgstr "Salva cópias reserva de arquivos que existem"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "-C <dir>"
 msgstr "-E <dir>"
 
-# uma alternativa melhor para backup aqui?
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<dir>"
 
-#: src/nano.c:831
+#: src/nano.c:852
 msgid "Directory for saving unique backup files"
 msgstr "Diretório para salvar arquivos únicos de reserva"
 
 # É necessário melhorar aqui.
-#: src/nano.c:834
+#: src/nano.c:855
 msgid "Use bold instead of reverse video text"
 msgstr "Usa negrito ao invés de texto em video inverso"
 
-#: src/nano.c:837
+#: src/nano.c:858
 msgid "Convert typed tabs to spaces"
 msgstr "Converte tabulações digitadas em espaços"
 
-#: src/nano.c:840
+#: src/nano.c:861
 msgid "Enable multiple file buffers"
-msgstr "Permitir múltiplos buffers de arquivos"
+msgstr "Permite múltiplos buffers de arquivos"
+
+#: src/nano.c:865
+msgid "Use (vim-style) lock files"
+msgstr "Usa arquivos de travas (estilo vim)"
 
-#: src/nano.c:845
+#: src/nano.c:869
 msgid "Log & read search/replace string history"
-msgstr "Gravar e ler histórico das strings de busca/substituição"
+msgstr "Grava & lê histórico das strings de pesquisa/substituição"
 
-#: src/nano.c:848
+#: src/nano.c:873
 msgid "Don't look at nanorc files"
-msgstr "Não olhar o arquivo nanorc"
+msgstr "Não olha o arquivo nanorc"
 
-#: src/nano.c:851
+#: src/nano.c:876
 msgid "Fix numeric keypad key confusion problem"
-msgstr "Corrigir a confusão com o teclado numérico"
+msgstr "Corrige confusão com o teclado numérico"
 
-#: src/nano.c:853
+#: src/nano.c:878
 msgid "Don't add newlines to the ends of files"
-msgstr "Não adicionar retorno de carro nos finais das linhas"
+msgstr "Não adiciona nova-linha ao final das linhas dos arquivos"
 
-#: src/nano.c:856
+#: src/nano.c:881
 msgid "Don't convert files from DOS/Mac format"
-msgstr "Não converter arquivos do formato DOS/Mac"
+msgstr "Não converte arquivos do formato DOS/Mac"
 
-#: src/nano.c:858
+#: src/nano.c:883
 msgid "Use one more line for editing"
-msgstr "Utiliza um ou duas linhas para edição"
+msgstr "Utiliza um ou mais linhas para edição"
 
-#: src/nano.c:860
+#: src/nano.c:886
+msgid "Log & read location of cursor position"
+msgstr "Registra & lê a localização da posição do cursor"
+
+#: src/nano.c:889
 msgid "-Q <str>"
 msgstr "-Q <str>"
 
-#: src/nano.c:860
+#: src/nano.c:889
 msgid "--quotestr=<str>"
 msgstr "--quotestr=<str>"
 
-#: src/nano.c:861
+#: src/nano.c:890
 msgid "Quoting string"
-msgstr "Citando strings"
+msgstr "Texto de citação"
 
-#: src/nano.c:863
+#: src/nano.c:892
 msgid "Restricted mode"
 msgstr "Modo restrito"
 
 # revisar: meia tela
-#: src/nano.c:866
+#: src/nano.c:895
 msgid "Scroll by line instead of half-screen"
-msgstr "Rolar linhas ao invés de meia tela"
+msgstr "Rola linhas ao invés de meia tela"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "-T <#cols>"
 msgstr "-T <#cols>"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#cols>"
 
-#: src/nano.c:869
+#: src/nano.c:898
 msgid "Set width of a tab to #cols columns"
-msgstr "Modificar o tamanho da tabulação para #cols"
+msgstr "Modifica o tamanho da tabulação para #cols"
 
-#: src/nano.c:871
+#: src/nano.c:900
 msgid "Do quick statusbar blanking"
-msgstr "Remoção rápida da barra de estado"
+msgstr "Remoção rápida da barra de status"
 
-#: src/nano.c:874
+#: src/nano.c:903
 msgid "Print version information and exit"
 msgstr "Imprime informação de versão e fecha"
 
-#: src/nano.c:877
+#: src/nano.c:906
 msgid "Detect word boundaries more accurately"
 msgstr "Detecção mais precisa dos limites das palavras"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "-Y <str>"
 msgstr "-Y <str>"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "--syntax=<str>"
 msgstr "--syntax <str>"
 
-#: src/nano.c:881
+#: src/nano.c:910
 msgid "Syntax definition to use for coloring"
 msgstr "Definição de sintaxe para inserção de cores"
 
-#: src/nano.c:883
+#: src/nano.c:912
 msgid "Constantly show cursor position"
-msgstr "Mostrar a posição do cursos constantemente"
+msgstr "Mostra a posição do cursor constantemente"
 
-#: src/nano.c:885
+#: src/nano.c:914
 msgid "Fix Backspace/Delete confusion problem"
-msgstr "Corrige o problema de confusão entre a tecla Backspace/Delete"
+msgstr "Corrige confusão entre Backspace/Delete"
 
-#: src/nano.c:888
+#: src/nano.c:915
+msgid "Show this help text"
+msgstr "Mostra esse texto de ajuda"
+
+#: src/nano.c:918
 msgid "Automatically indent new lines"
-msgstr "Indentar automaticamente nova linhas"
+msgstr "Avança o recuo automaticamente em nova linhas"
 
-#: src/nano.c:889
+#: src/nano.c:919
 msgid "Cut from cursor to end of line"
-msgstr "Recortar do cursor até o fim da linha"
+msgstr "Recorta do cursor até o fim da linha"
 
-#: src/nano.c:892
+#: src/nano.c:922
 msgid "Don't follow symbolic links, overwrite"
-msgstr "Não seguir atalhos simbólicos, sobrescrever"
+msgstr "Não segue links simbólicos, e sim sobrescreve"
 
-#: src/nano.c:894
+#: src/nano.c:924
 msgid "Enable the use of the mouse"
-msgstr "Habilitar o uso do mouse"
+msgstr "Habilita o uso do mouse"
 
-#: src/nano.c:897
+#: src/nano.c:926
+msgid "Do not read the file (only write it)"
+msgstr "Não lê o arquivo (apenas o escreve)"
+
+#: src/nano.c:928
 msgid "-o <dir>"
 msgstr "-o <dir>"
 
-#: src/nano.c:897
+#: src/nano.c:928
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<dir>"
 
-#: src/nano.c:898
+#: src/nano.c:929
 msgid "Set operating directory"
-msgstr "Indicar o diretório de trabalho"
+msgstr "Define o diretório de trabalho"
 
-#: src/nano.c:901
+#: src/nano.c:932
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
-msgstr "Preservar as teclas XON (^Q) e XOFF (^S)"
+msgstr "Preserva as teclas XON (^Q) e XOFF (^S)"
 
-#: src/nano.c:903
+#: src/nano.c:935
 msgid "Silently ignore startup issues like rc file errors"
-msgstr ""
-"Ignorar silenciosamente problemas na inicialização como erros no arquivo rc"
+msgstr "Ignora silenciosamente problemas como erros no arquivo rc"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "-r <#cols>"
 msgstr "-r <#colun>"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "--fill=<#cols>"
 msgstr "--fill=<#colun>"
 
-#: src/nano.c:906
-msgid "Set wrapping point at column #cols"
-msgstr "Modificar o ponto de agrupamento na coluna #cols"
+#: src/nano.c:939
+msgid "Set hard-wrapping point at column #cols"
+msgstr "Define o ponto de ajuste rígido na coluna #cols"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "-s <prog>"
 msgstr "-s <prog>"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "--speller=<prog>"
 msgstr "--speller=<prog>"
 
-#: src/nano.c:910
+#: src/nano.c:943
 msgid "Enable alternate speller"
-msgstr "Habilitar um verificador ortográfico alternativo"
+msgstr "Habilita um verificador ortográfico alternativo"
 
-#: src/nano.c:913
+#: src/nano.c:946
 msgid "Auto save on exit, don't prompt"
-msgstr "Salvar automaticamente ao sair, não perguntar"
-
-#: src/nano.c:915
-msgid "Allow generic undo [EXPERIMENTAL]"
-msgstr "Permitir desfazer genérico [EXPERIMENTAL]"
+msgstr "Salva automaticamente ao sair, sem perguntar"
 
-#: src/nano.c:918
+#: src/nano.c:947
 msgid "View mode (read-only)"
-msgstr "Modo Visualização (somente leitura)"
+msgstr "Modo visualização (somente leitura)"
 
-#: src/nano.c:920
-msgid "Don't wrap long lines"
-msgstr "Não ajuste linhas compridas"
+#: src/nano.c:949
+msgid "Don't hard-wrap long lines"
+msgstr "Não faz ajuste rígido em linhas compridas"
 
-#: src/nano.c:922
+#: src/nano.c:951
 msgid "Don't show the two help lines"
-msgstr "Não as duas linhas de ajuda"
+msgstr "Não mostra as duas linhas de ajuda"
 
-#: src/nano.c:923
+#: src/nano.c:952
 msgid "Enable suspension"
-msgstr "Permitir suspenção"
+msgstr "Permite suspensão"
 
 # Soft line wrapping?
-#: src/nano.c:924
+#: src/nano.c:954
 msgid "Enable soft line wrapping"
-msgstr "Habilita ajuste de linhas longas"
+msgstr "Habilita ajuste suave de linhas compridas"
 
-#: src/nano.c:928
-msgid "(ignored, for Pico compatibility)"
-msgstr "(ignorado, para compatibilidade com o Pico)"
-
-#: src/nano.c:938
-#, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
+#: src/nano.c:963
+#, fuzzy, c-format
+msgid " GNU nano, version %s\n"
 msgstr "GNU nano versão %s (compilado %s, %s)\n"
 
-#: src/nano.c:943
+#: src/nano.c:966
 #, 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:944
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
 " Compiled options:"
 msgstr ""
 "\n"
-" Opções de compilação:"
+" Opções compiladas:"
 
-#: src/nano.c:1022
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
-msgstr "Desculpe, suporte para essa função foi desabilitado"
+msgstr "Desculpe, suporte para esta função foi desabilitado"
 
-#: src/nano.c:1044
+#: src/nano.c:1125
+msgid "No file name"
+msgstr "Nenhum nome de arquivo"
+
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr ""
 "Salvar o buffer modificado (RESPONDER \"Não\" IRÁ DESTRUIR MODIFICAÇÕES) ?"
 
-#: src/nano.c:1088
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
-msgstr "Não foi possível reabrir a stdin do teclado, desculpe\n"
+msgstr "Não foi possível reabrir a entrada padrão do teclado, desculpe\n"
 
-#: src/nano.c:1114
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "Lendo de stdin, ^C para abortar\n"
 
-#: src/nano.c:1182
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Recebi SIGHUP ou SIGTERM\n"
 
-#: src/nano.c:1204
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
-msgstr "Utilize \"fg\" para retornar ao nano\n"
+msgstr "Utilize \"fg\" para retornar ao nano.\n"
 
-#: src/nano.c:1386
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "habilitado"
 
-#: src/nano.c:1387
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "desabilitado"
 
-#: src/nano.c:1548 src/winio.c:1256
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr "Comando desconhecido"
 
-#: src/nano.c:1674
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "XON ignorado, mumble mumble."
 
-#: src/nano.c:1679
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF ignorado, mumble mumble"
 
-#: src/nano.c:2209 src/rcfile.c:1100
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Tamanho \"%s\" de tabulação é inválido"
 
-#: src/nano.c:2268 src/rcfile.c:1025
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Pedido de tamanho \"%s\" inválido"
 
+#: src/nano.c:2415
+#, 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"
+
 #. 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:1259
+#: src/prompt.c:1055
 msgid "Yy"
-msgstr "Ss"
+msgstr "SsYy"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1056
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1057
 msgid "Aa"
 msgstr "Tt"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1071
 msgid "Yes"
 msgstr "Sim"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1076
 msgid "All"
 msgstr "Todos"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1081
 msgid "No"
 msgstr "Não"
 
-#: src/rcfile.c:130
+#: src/rcfile.c:137
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Erro no %s na linha %lu: "
 
-#: src/rcfile.c:185
+#: src/rcfile.c:196
 #, c-format
 msgid "Argument '%s' has an unterminated \""
-msgstr "Argumento '%s' possui inderterminado \""
+msgstr "Argumento \"%s\" possui indeterminado \""
 
-#: src/rcfile.c:212 src/rcfile.c:264 src/rcfile.c:711 src/rcfile.c:768
-#: src/rcfile.c:821
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 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:238 src/search.c:62
+#: src/rcfile.c:249 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Expressão regular errônea \"%s\": %s"
 
-#: src/rcfile.c:258
+#: src/rcfile.c:269
 msgid "Missing syntax name"
 msgstr "Falta o nome da sintaxe"
 
-#: src/rcfile.c:316
+#: src/rcfile.c:340
 msgid "The \"none\" syntax is reserved"
 msgstr "A sintaxe \"none\" é reservada"
 
-#: src/rcfile.c:323
+#: src/rcfile.c:347
 msgid "The \"default\" syntax must take no extensions"
 msgstr "A sintaxe padrão não deve conter extensões"
 
-#: src/rcfile.c:386 src/rcfile.c:483
+#: src/rcfile.c:433
 msgid "Missing key name"
 msgstr "Falta o nome da chave"
 
-#: src/rcfile.c:398 src/rcfile.c:499
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
-msgstr "vínculos de teclas devem começar com \"^\", \"M\" ou \"F\""
+#: src/rcfile.c:442 src/rcfile.c:453
+msgid "Key name is too short"
+msgstr "Nome da tecla é muito curta"
+
+#: src/rcfile.c:463
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
+msgstr "Nome da tecla deve começar com \"^\", \"M\", or \"F\""
 
-#: src/rcfile.c:407
-msgid "Must specify function to bind key to"
+#: src/rcfile.c:472
+msgid "Must specify a function to bind the key to"
 msgstr "É preciso especificar uma função para o vínculo da tecla"
 
-#: src/rcfile.c:418 src/rcfile.c:510
-msgid "Must specify menu to bind key to (or \"all\")"
-msgstr "É preciso especificar um menu para o vínculo da tecla (ou \"all\")"
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:482
+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:426
+#: src/rcfile.c:489
 #, c-format
-msgid "Could not map name \"%s\" to a function"
-msgstr "Não foi possível mapear o nome \"%s\" com uma função"
+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:432 src/rcfile.c:517
+#: src/rcfile.c:496
 #, c-format
-msgid "Could not map name \"%s\" to a menu"
-msgstr "Não foi possível mapear o nome \"%s\" com um menu"
+msgid "Cannot map name \"%s\" to a menu"
+msgstr "Não foi possível mapear o nome \"%s\" a um menu"
 
-# TODO keystr pode ser traduzido?
-#: src/rcfile.c:454
+#: src/rcfile.c:528
 #, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
-msgstr "Desculpe, keystr \"%s\" é um vínculo ilegal"
+msgid "Function '%s' does not exist in menu '%s'"
+msgstr "Função \"%s\" não existe no menu \"%s\""
 
-#: src/rcfile.c:625
+#: src/rcfile.c:543
+#, c-format
+msgid "Sorry, keystroke \"%s\" may not be rebound"
+msgstr "Desculpe, a sequência \"%s\" ter seu vínculo redefinido"
+
+#: src/rcfile.c:629
+#, c-format
+msgid "Error expanding %s: %s"
+msgstr "Erro ao expandir %s: %s"
+
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1744,145 +1865,203 @@ msgid ""
 "\"black\", with the optional prefix \"bright\"\n"
 "for foreground colors."
 msgstr ""
-"Cor %s não foi entendida.\n"
+"Cor \"%s\" não foi entendida.\n"
 "Cores válidas são \"green\" (verde), \"red\" (vermelho), \n"
 "\"blue\" (azul), \"yellow\" (amarelo), \"cyan\" (ciano), \n"
-"\"magente\" (maguenta) e \"black\" (preto), com o prefixo \n"
-"opcional \"bright\" (claro) para cores de fundo."
+"\"magente\" (magenta) e \"black\" (preto), com o prefixo \n"
+"opcional \"bright\" (claro) para cores de primeiro plano."
 
-#: src/rcfile.c:647
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
-msgstr "Impossível adicionar um diretiva de cor sem um diretiva de sintaxe"
+msgstr "não é possível adicionar um comando de cor sem um comando de sintaxe"
 
-#: src/rcfile.c:652
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "Falta o nome da cor"
 
-#: src/rcfile.c:672
-#, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr "Cor do fundo \"%s\" não pode ser clara"
-
-#: src/rcfile.c:690 src/rcfile.c:809
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr "Falta a expressão regular"
 
-#: src/rcfile.c:762
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
-msgstr "\\\"start=\\\" precisa de um correspondende \\\"end=\\\""
+msgstr "\"start=\" precisa de um \"end=\" correspondente"
+
+#: src/rcfile.c:837
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr "Cor do fundo \"%s\" não pode ser clara"
 
-# TODO analisar no programa se isso faz sentido
-#: src/rcfile.c:804
+#: src/rcfile.c:865
 msgid "Cannot add a header regex without a syntax command"
-msgstr "Impossível adicionar um cabeçalho regex sem um comando de sintaxe"
+msgstr ""
+"Não é possível adicionar uma expressão regular de cabeçalho sem um comando "
+"de sintaxe"
+
+#: src/rcfile.c:921
+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:926
+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:990
+msgid "Missing linter command"
+msgstr "Falta o comando de lintador"
+
+#: src/rcfile.c:1010
+msgid "Cannot add formatter without a syntax command"
+msgstr "Não é possível adicionar formatador sem um comando de sintaxe"
 
-#: src/rcfile.c:874
+#: src/rcfile.c:1015
+msgid "Missing formatter command"
+msgstr "Falta o comando de formatador"
+
+#: src/rcfile.c:1045
 #, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
-msgstr "Erro fatal: nenhuma tecla mapeada para a função \"%s\""
+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:876
+#: src/rcfile.c:1047
+#, c-format
 msgid ""
-"Exiting.  Please use nano with the -I option if needed to adjust your nanorc "
-"settings\n"
+"If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
-"Saindo.  Por favor utilize o nano com a opção -I se for preciso para\n"
-"ajustar as configurações do seu nanorc\n"
+"Se necessário, use nano com a opção -I para ajustar suas configurações no "
+"nanorc.\n"
+
+#: src/rcfile.c:1108
+#, 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:926 src/rcfile.c:935 src/rcfile.c:945
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
-msgstr "Não é permitido o comando \"%s\" em arquivo incluido"
+msgstr "Comando \"%s\" não é permitido no arquivo incluído"
 
-#: src/rcfile.c:951 src/rcfile.c:1128
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Sintaxe \"%s\" não possui comandos de cor"
 
-#: src/rcfile.c:966
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
-msgstr "Comando \"%s\" desconhecido"
+msgstr "Comando \"%s\" não compreendido"
 
-#: src/rcfile.c:972
-msgid "Missing flag"
-msgstr "Falta sinalizador"
+#: src/rcfile.c:1186
+msgid "Missing option"
+msgstr "Falta opção"
 
-#: src/rcfile.c:994
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
-msgstr "Opção \"%s\" precisa de um argumento"
+msgstr "Opção \"%s\" requer um argumento"
 
-#: src/rcfile.c:1012
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr "Opção não é uma string multibyte válida"
 
-#: src/rcfile.c:1038 src/rcfile.c:1066 src/rcfile.c:1075
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr "Caracteres imprimíveis são necessário"
 
 # Tradução para single-column?
-#: src/rcfile.c:1048
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
-msgstr "É necessário dois caracteres single-column"
+msgstr "Dois caracteres de coluna única são necessários"
 
-#: src/rcfile.c:1114
+#: src/rcfile.c:1339
 #, c-format
-msgid "Cannot unset flag \"%s\""
-msgstr "Impossível desativar sinalizador \"%s\""
+msgid "Cannot unset option \"%s\""
+msgstr "Não é possível desativar a opção \"%s\""
 
-#: src/rcfile.c:1123
+#: src/rcfile.c:1345
 #, c-format
-msgid "Unknown flag \"%s\""
-msgstr "Sinalizador \"%s\" desconhecido"
+msgid "Unknown option \"%s\""
+msgstr "Opção \"%s\" desconhecida"
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
-msgstr "Impossível encontrar o meu diretório pessoal!  Putz!"
+msgstr "Não consigo localizar o meu diretório pessoal! Putz!"
+
+#: src/rcfile.c:1442
+#, c-format
+msgid ""
+"\n"
+"Press Enter to continue starting nano.\n"
+msgstr ""
+"\n"
+"Pressione Enter para continuar a inicialização do nano.\n"
 
 #: src/search.c:96
 #, c-format
 msgid "\"%.*s%s\" not found"
-msgstr "\\\"%.*s%s\\\" não foi encontrado"
+msgstr "\"%.*s%s\" não encontrado"
+
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/search.c:184
+msgid " [Case Sensitive]"
+msgstr " [Sensibilidade de caixa]"
 
-#: src/search.c:205
+#: src/search.c:188
+msgid " [Regexp]"
+msgstr " [Expressão regular]"
+
+#: src/search.c:192
+msgid " [Backwards]"
+msgstr " [Retroceder]"
+
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:197
 msgid " (to replace) in selection"
-msgstr " (para subtituir) na seleção"
+msgstr " (para substituir) na seleção"
 
-#: src/search.c:207
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (para substituir) na seleção"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "Substituir esse termo?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:945
 msgid "Replace with"
-msgstr "Subtituir por"
+msgstr "Substituir por"
 
-#: src/search.c:1004
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
 msgstr[0] "Substituiu-se %lu ocorrência"
 msgstr[1] "Substituiu-se %lu ocorrências"
 
-#: src/search.c:1034
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr "Insira o número da linha, número da coluna"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
 msgstr "Linha ou número de coluna inválido"
 
-#: src/search.c:1214
+#: src/search.c:1207
 msgid "Not a bracket"
-msgstr "Não é um parenteses"
+msgstr "Não é um parênteses"
 
-#: src/search.c:1281
+#: src/search.c:1274
 msgid "No matching bracket"
-msgstr "Nenhum parenteses encontrado"
+msgstr "Nenhum parênteses encontrado"
 
 #: src/text.c:54
 msgid "Mark Set"
@@ -1893,221 +2072,303 @@ msgid "Mark Unset"
 msgstr "Marcação desativada"
 
 # revisão: como traduzir undo buffer? 'desfazer' como um adjetivo?
-#: src/text.c:443
+#: src/text.c:439
 msgid "Nothing in undo buffer!"
 msgstr "Não há nada para desfazer!"
 
-#: src/text.c:455 src/text.c:593
+#: src/text.c:445 src/text.c:590
 #, c-format
-msgid "Internal error: can't match line %d.  Please save your work"
+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"
+"Erro interno: não consegui casar a linha %d.  Por favor salve o seu trabalho."
 
-#: src/text.c:466 src/text.c:603
+#: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
 msgstr "adic txt"
 
-#: src/text.c:475 src/text.c:613
+#: src/text.c:467 src/text.c:612
 msgid "text delete"
 msgstr "remover txt"
 
-#: src/text.c:489 src/text.c:628
-msgid "line wrap"
-msgstr "quebra de linha"
-
-#: src/text.c:503 src/text.c:636
+#: src/text.c:491 src/text.c:641
 msgid "line join"
 msgstr "juntar linha"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:505 src/text.c:657
 msgid "text cut"
 msgstr "recortar txt"
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:510 src/text.c:661
 msgid "text uncut"
 msgstr "colar txt"
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:515 src/text.c:623
 msgid "line break"
 msgstr "quebra de linha"
 
-#: src/text.c:532 src/text.c:665
+#: src/text.c:528 src/text.c:672
 msgid "text insert"
 msgstr "inserir txt"
 
-#: src/text.c:550 src/text.c:659
+#: src/text.c:549 src/text.c:665
 msgid "text replace"
 msgstr "substituir txt"
 
-#: src/text.c:557 src/text.c:671
-msgid "Internal error: unknown type.  Please save your work"
-msgstr "Erro interno: tipo desconhecido.  Por favor salve o seu trabalho"
+#: src/text.c:556 src/text.c:679 src/text.c:983
+msgid "Internal error: unknown type.  Please save your work."
+msgstr "Erro interno: tipo desconhecido.  Por favor salve o seu trabalho."
 
-#: src/text.c:563
+#: src/text.c:561
 #, c-format
 msgid "Undid action (%s)"
 msgstr "Ação desfeita (%s)"
 
-#: src/text.c:578
+#: src/text.c:580
 msgid "Nothing to re-do!"
 msgstr "Nada para refazer!"
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
+#: src/text.c:584
+msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
-"Erro interno: Falha na configuração de restauração.  Por favor salve o seu "
-"trabalho"
+"Erro interno: não consegui configurar refazimento.  Por favor salve o seu "
+"trabalho."
 
-#: src/text.c:676
+#: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Ação repetida (%s)"
 
-#: src/text.c:766
-msgid "Could not pipe"
-msgstr "Impossível fazer o duto"
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
+msgid "Could not create pipe"
+msgstr "Impossível criar o duto"
 
-#: src/text.c:793 src/text.c:2636 src/text.c:2788
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
-msgstr "Impossível bifurcar"
+msgstr "Não foi possível bifurcar"
 
-#: src/text.c:941
-msgid "Internal error: can't setup uncut.  Please save your work."
+#: src/text.c:969
+msgid "Internal error: cannot set up uncut.  Please save your work."
 msgstr ""
 "Erro interno: não consegui configurar colagem.  Por favor salve o seu "
-"trabalho"
+"trabalho."
 
-#: src/text.c:950
-msgid "Internal error: unknown type.  Please save your work."
-msgstr "Erro interno: tipo desconhecido.  Por favor salve o seu trabalho"
-
-#: src/text.c:1870
+#: src/text.c:1806
 #, c-format
 msgid "Bad quote string %s: %s"
-msgstr "String de citação ruim: %s: %s"
+msgstr "String de citação ruim %s: %s"
 
-#: src/text.c:2267
+#: src/text.c:2207
 msgid "Can now UnJustify!"
 msgstr "É possível DesJustificar!"
 
-#: src/text.c:2462
+#: src/text.c:2404
 msgid "Edit a replacement"
 msgstr "Editar uma substituição"
 
-#: src/text.c:2548
-msgid "Could not create pipe"
-msgstr "Impossível criar o duto"
-
-#: src/text.c:2550
+#: src/text.c:2492
 msgid "Creating misspelled word list, please wait..."
 msgstr "Criando a lista de palavra com erros ortográficos, por favor espere..."
 
-#: src/text.c:2642
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
-msgstr "Impossível descobrir o tamanho do buffer do duto"
+msgstr "Não foi possível descobrir o tamanho do buffer do duto"
 
-#: src/text.c:2693
+#: src/text.c:2635
 msgid "Error invoking \"spell\""
-msgstr "Erro ao clamar o \"spell\""
+msgstr "Erro ao chamar o \"spell\""
 
-#: src/text.c:2696
+#: src/text.c:2638
 msgid "Error invoking \"sort -f\""
-msgstr "Erro ao clamar o \"sort -f\""
+msgstr "Erro ao chamar o \"sort -f\""
 
-#: src/text.c:2699
+#: src/text.c:2641
 msgid "Error invoking \"uniq\""
-msgstr "Erro ao clamar o \"uniq\""
+msgstr "Erro ao chamar o \"uniq\""
 
-#: src/text.c:2756 src/text.c:2965
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
-msgstr "Checagem ortográfica finalizada"
+msgstr "Verificação ortográfica finalizada"
 
-#: src/text.c:2815
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
-msgstr "Erro ao clamar o \"%s\""
+msgstr "Erro ao chamar o \"%s\""
+
+#: src/text.c:2885
+msgid "Invoking spell checker, please wait"
+msgstr "Chamar pelo verificador ortográfico, se disponível"
 
-#: src/text.c:2960
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
-msgstr "Falha na checagem ortográfica: %s"
+msgstr "Verificação ortográfica falhou: %s"
 
-#: src/text.c:2962
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
-msgstr "Falha na checagem ortográfica: %s: %s"
+msgstr "Verificação ortográfica falhou: %s: %s"
+
+#: src/text.c:2937
+msgid "No linter defined for this type of file!"
+msgstr "Nenhum lintador definido para este tipo de arquivo!"
 
-#: src/text.c:3030
+#: src/text.c:2947
+msgid "Save modified buffer before linting?"
+msgstr "Salvar o buffer modificado antes de lintar?"
+
+#: src/text.c:2969
+msgid "Invoking linter, please wait"
+msgstr "Chamando lintador, por favor espere"
+
+#: src/text.c:3125
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr "Obteve 0 linhas analisáveis a partir do comando: %s"
+
+#: src/text.c:3159
+#, 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:3205
+msgid "At last message"
+msgstr "Na última mensagem"
+
+#: src/text.c:3210
+msgid "At first message"
+msgstr "Na primeira mensagem"
+
+#: src/text.c:3250
+#, fuzzy
+msgid "Error: no formatter defined"
+msgstr "Erro: nenhum lintador definido"
+
+#: src/text.c:3275
+msgid "Finished"
+msgstr "Finalizado"
+
+#: src/text.c:3280
+msgid "Invoking formatter, please wait"
+msgstr "Chamando formatador, por favor espere"
+
+#: src/text.c:3360
+msgid "Finished formatting"
+msgstr "Formatação finalizada"
+
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sPalav: %lu  Linhs: %ld  Carac: %lu"
 
-#: src/text.c:3031
+#: src/text.c:3439
 msgid "In Selection:  "
 msgstr "Na seleção:  "
 
-#: src/utils.c:405 src/utils.c:417
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3453
+msgid "Verbatim Input"
+msgstr "Entrada literal"
+
+#: src/utils.c:410 src/utils.c:422
 msgid "nano is out of memory!"
 msgstr "nano está sem memória!"
 
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
-#: src/winio.c:1557
+#: src/winio.c:1583
 msgid "Unicode Input"
 msgstr "Entrada Unicode"
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2142 src/winio.c:2146
 msgid "Modified"
 msgstr "Modificado"
 
-#: src/winio.c:2150
+#: src/winio.c:2143
 msgid "View"
 msgstr "Olhar"
 
-#: src/winio.c:2164
+#: src/winio.c:2157
 msgid "DIR:"
 msgstr "DIR:"
 
-#: src/winio.c:2171
+#: src/winio.c:2164
 msgid "File:"
 msgstr "Arquivo:"
 
-#: src/winio.c:3360
+# Mantive em 74 caracteres. -- Rafael
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2261
+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/winio.c:3377
 #, 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:3492
+#: src/winio.c:3507
 msgid "The nano text editor"
 msgstr "O editor de texto nano"
 
-#: src/winio.c:3493
+#: src/winio.c:3508
 msgid "version"
 msgstr "versão"
 
-#: src/winio.c:3494
+#: src/winio.c:3509
 msgid "Brought to you by:"
 msgstr "Trazido para você por:"
 
-#: src/winio.c:3495
+#: src/winio.c:3510
 msgid "Special thanks to:"
 msgstr "Agradecimentos especiais para:"
 
-#: src/winio.c:3496
+#: src/winio.c:3511
 msgid "The Free Software Foundation"
 msgstr "A Fundação Software Livre"
 
-#: src/winio.c:3497
+#: src/winio.c:3512
+msgid "the many translators and the TP"
+msgstr "os vários tradutores e o TP"
+
+#: src/winio.c:3513
 msgid "For ncurses:"
 msgstr "Para o ncurses:"
 
-#: src/winio.c:3498
+#: src/winio.c:3514
 msgid "and anyone else we forgot..."
 msgstr "e qualquer outro que nós esquecemos..."
 
-#: src/winio.c:3499
+#: src/winio.c:3515
 msgid "Thank you for using nano!"
 msgstr "Obrigado por usar o nano!"
 
+#~ msgid "Internal error: can't match line %ld.  Please save your work."
+#~ msgstr ""
+#~ "Erro interno: não consegui casar a linha %ld:  Por favor salve o seu "
+#~ "trabalho."
+
+#~ msgid "line wrap"
+#~ msgstr "quebra de linha"
+
+#~ msgid "Allow generic undo [EXPERIMENTAL]"
+#~ msgstr "Permitir desfazer genérico [EXPERIMENTAL]"
+
 #~ msgid "Error writing backup file %s: File owner mismatch"
 #~ msgstr "Erro ao escrever o arquivo reserva %s : Dono do arquivo não casou"
+
+#~ msgid "Insert File"
+#~ msgstr "Inserir Arq"
+
+#~ msgid "Go to previous screen"
+#~ msgstr "Ir para a tela anterior"
+
+#~ msgid "Find Other Bracket"
+#~ msgstr "Encontrar Outro parênteses"
+
+#~ msgid "Long line wrapping"
+#~ msgstr "Ajuste de linhas longas"
diff --git a/po/ro.gmo b/po/ro.gmo
index de04c8a..90bcf65 100644
--- a/po/ro.gmo
+++ b/po/ro.gmo
diff --git a/po/ro.po b/po/ro.po
index 8328c16..8a7acb4 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,1016 +1,1100 @@
-# Mesajele �n limba rom�n� pentru nano.
-# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
-# Acest fi�ier este distribuit sub aceea�i licen�� ca �i pachetul nano.
-# Laurentiu Buzdugan <lbuz@rolix.org>, 2003, 2004, 2005.
-#
+# Translation of the nano editor to Romanian.
+# Copyright (C) 2015 Free Software Foundation, Inc.
+# This file is distributed under the same license as the nano package.
+# Laurențiu Buzdugan <lbuz@rolix.org>, 2003-2005.
+# Mihai Cristescu <mihai.cristescu@archlinux.info>, 2015.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 1.3.7\n"
+"Project-Id-Version: nano 2.3.99pre4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-22 06:34-0500\n"
-"PO-Revision-Date: 2005-04-18 07:00-0500\n"
-"Last-Translator: Laurentiu Buzdugan <lbuz@rolix.org>\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
+"PO-Revision-Date: 2015-03-19 09:02+0200\n"
+"Last-Translator: Mihai Cristescu <mihai.cristescu@archlinux.info>\n"
 "Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
+"Language: ro\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=2; plural=(n != 1);\n"
-
-#: src/browser.c:220
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
+"2:1));\n"
+"X-Generator: Poedit 1.7.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+"X-Poedit-Basepath: .\n"
+"X-Poedit-SearchPath-0: src\n"
+
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:203
 msgid "Go To Directory"
-msgstr "Mergi la Director"
+msgstr "Mergi la director"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:860 src/files.c:2048
-#: src/nano.c:1060 src/search.c:220 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
-msgstr "Am renun�at"
+msgstr "S-a renunțat"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:246 src/browser.c:293
 #, c-format
 msgid "Can't go outside of %s in restricted mode"
-msgstr "Nu pot merge �n afara %s �n modul restric�ionat"
+msgstr "Nu pot merge în afara %s în modul restricționat"
 
-#: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:722
-#: src/files.c:731 src/files.c:1540 src/files.c:1659 src/files.c:1711
-#: src/files.c:1732 src/files.c:1855 src/files.c:2691 src/rcfile.c:568
-#: src/rcfile.c:1204
+#: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
+#: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
+#: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
-msgstr "Eroare citind %s: %s"
+msgstr "Eroare la citirea %s: %s"
 
-#: src/browser.c:303
+#: src/browser.c:283
 msgid "Can't move up a directory"
-msgstr "Nu pot schimba �n sus un director"
+msgstr "Nu se poate schimba mai sus directorul"
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:665 src/browser.c:674
+#: src/browser.c:626 src/browser.c:635
 msgid "(dir)"
 msgstr "(dir)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:632
 msgid "(parent dir)"
-msgstr ""
+msgstr "(dir sup.)"
 
-#: src/browser.c:801 src/search.c:185
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
-msgstr "Caut�"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:805 src/search.c:189
-msgid " [Case Sensitive]"
-msgstr " [Case Sensitive]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:811 src/search.c:195
-msgid " [Regexp]"
-msgstr " [Regexp]"
+msgstr "Caută"
 
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:817 src/search.c:201
-msgid " [Backwards]"
-msgstr " [�napoi]"
-
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
-msgstr "C�utare de la �nceput"
+msgstr "Caută de la început"
 
-#: src/browser.c:1006 src/browser.c:1039 src/search.c:514 src/search.c:517
-#: src/search.c:574 src/search.c:577
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
-msgstr "Aceasta este singura apari�ie"
+msgstr "Aceasta este singura apariție"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
-msgstr "Nici un pattern de c�utare curent"
+msgstr "Nici un termen de căutare definit"
+
+#: src/files.c:139
+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:145
+#, 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:165 src/files.c:175 src/files.c:212 src/files.c:222
+#, c-format
+msgid "Error writing lock file %s: %s"
+msgstr "Eroare la scrierea fișierului de blocare %s: %s"
 
-#: src/files.c:125
+#: src/files.c:237
+#, c-format
+msgid "Error deleting lock file %s: %s"
+msgstr "Eroare la ștergerea fișierului de blocare %s: %s"
+
+#: src/files.c:272
+#, c-format
+msgid "Error opening lock file %s: %s"
+msgstr "Eroare la deschiderea fișierului de blocare %s: %s"
+
+#: src/files.c:282
+#, 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:297
+#, 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:308
+#, c-format
+msgid "Error writing lock file: Directory '%s' doesn't exist"
+msgstr "Eroare la scrierea fișierului de blocare: Directorul „%s” nu există"
+
+#: src/files.c:339
 #, c-format
 msgid "Can't insert file from outside of %s"
-msgstr "Nu pot insera fi�ier din afara lui %s"
+msgstr "Nu se poate insera un fișier din afara %s"
 
-#: src/files.c:234
+#: src/files.c:467
 msgid "No more open file buffers"
-msgstr "Nici un alt bufere deschis"
+msgstr "Nu mai sunt fișiere deschise"
 
-#: src/files.c:250
+#: src/files.c:484
 #, c-format
 msgid "Switched to %s"
-msgstr "Am schimbat la %s"
+msgstr "S-a schimbat la %s"
 
-#: src/files.c:251 src/global.c:469 src/winio.c:2168
+#: src/files.c:485 src/global.c:953 src/winio.c:2161
 msgid "New Buffer"
-msgstr "Bufer nou"
+msgstr "Spațiu nou"
 
-#: src/files.c:633
+#: src/files.c:874
 #, 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] "Am citit %lu linie (convertit� din formatul DOS �i Mac)"
-msgstr[1] "Am citit %lu linii (convertite din formatul DOS �i Mac)"
+msgstr[0] "S-a citit %lu linie (Convertită din formatul DOS și Mac)"
+msgstr[1] "S-au citit %lu linii (Convertite din formatul DOS și Mac)"
+msgstr[2] "S-au citit %lu de linii (Convertite din formatul DOS și Mac)"
 
-#: src/files.c:638
-#, fuzzy, c-format
+#: src/files.c:879
+#, 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] "Am citit %lu linie (convertit� din formatul DOS �i Mac)"
-msgstr[1] "Am citit %lu linii (convertite din formatul DOS �i Mac)"
+msgstr[0] ""
+"S-a citit %lu linie (Convertită din formatul DOS și Mac - Avertizare: fără "
+"permisiune la scriere)"
+msgstr[1] ""
+"S-au citit %lu linii (Convertite din formatul DOS și Mac - Avertizare: fără "
+"permisiune la scriere)"
+msgstr[2] ""
+"S-au citit %lu de linii (Convertite din formatul DOS și Mac - Avertizare: "
+"fără permisiune la scriere)"
 
-#: src/files.c:644
+#: src/files.c:885
 #, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
-msgstr[0] "Am citit %lu linie (convertit� din formatul Mac)"
-msgstr[1] "Am citit %lu linii (convertite din formatul Mac)"
+msgstr[0] "S-a citit %lu linie (Convertită din formatul Mac)"
+msgstr[1] "S-au citit %lu linii (Convertite din formatul Mac)"
+msgstr[2] "S-au citit %lu de linii (Convertite din formatul Mac)"
 
-#: src/files.c:648
-#, fuzzy, c-format
+#: src/files.c:889
+#, 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] "Am citit %lu linie (convertit� din formatul Mac)"
-msgstr[1] "Am citit %lu linii (convertite din formatul Mac)"
+msgstr[0] ""
+"S-a citit %lu linie (Convertită din formatul Mac - Avertizare: fără "
+"permisiune la scriere)"
+msgstr[1] ""
+"S-au citit %lu linii (Convertite din formatul Mac - Avertizare: fără "
+"permisiune la scriere)"
+msgstr[2] ""
+"S-au citit %lu de linii (Convertite din formatul Mac - Avertizare: fără "
+"permisiune la scriere)"
 
-#: src/files.c:654
+#: src/files.c:895
 #, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
-msgstr[0] "Am citit %lu linie (convertit� din formatul DOS)"
-msgstr[1] "Am citit %lu linii (convertite din formatul DOS)"
+msgstr[0] "S-a citit %lu linie (convertită din formatul DOS)"
+msgstr[1] "S-au citit %lu linii (convertite din formatul DOS)"
+msgstr[2] "S-au citit %lu de linii (convertite din formatul DOS)"
 
-#: src/files.c:658
-#, fuzzy, c-format
+#: src/files.c:899
+#, 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] "Am citit %lu linie (convertit� din formatul DOS)"
-msgstr[1] "Am citit %lu linii (convertite din formatul DOS)"
+msgstr[0] ""
+"S-a citit %lu linie (Convertită din formatul DOS - Avertizare: fără "
+"permisiune la scriere)"
+msgstr[1] ""
+"S-au citit %lu linii (Convertite din formatul DOS - Avertizare: fără "
+"permisiune la scriere)"
+msgstr[2] ""
+"S-au citit %lu de linii (Convertite din formatul DOS - Avertizare: fără "
+"permisiune la scriere)"
 
-#: src/files.c:664
+#: src/files.c:905
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
-msgstr[0] "Am citit %lu linie"
-msgstr[1] "Am citit %lu linii"
+msgstr[0] "S-a citit %lu linie"
+msgstr[1] "S-au citit %lu linii"
+msgstr[2] "S-au citit %lu de linii"
 
-#: src/files.c:667
+#: src/files.c:908
 #, c-format
 msgid "Read %lu line ( Warning: No write permission)"
 msgid_plural "Read %lu lines (Warning: No write permission)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "S-a citit %lu linie (Avertizare: fără permisiune la scriere)"
+msgstr[1] "S-au citit %lu linii (Avertizare: fără permisiune la scriere)"
+msgstr[2] "S-au citit %lu de linii (Avertizare: fără permisiune la scriere)"
 
-#: src/files.c:700 src/files.c:736
+#: src/files.c:943 src/files.c:980
 msgid "Reading File"
-msgstr "Citesc Fi�ier"
+msgstr "Se citește fișierul"
 
-#: src/files.c:706
+#: src/files.c:950
 msgid "New File"
-msgstr "Fi�ier nou"
+msgstr "Fișier nou"
 
-#: src/files.c:709
+#: src/files.c:953
 #, c-format
 msgid "\"%s\" not found"
-msgstr "\"%s\" nu a fost g�sit"
+msgstr "„%s” nu a fost găsit"
 
-#: src/files.c:717 src/rcfile.c:559 src/rcfile.c:1154 src/rcfile.c:1195
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
-msgstr "\"%s\" este un director"
+msgstr "„%s” este un director"
 
-#: src/files.c:718 src/rcfile.c:560 src/rcfile.c:1155 src/rcfile.c:1196
-#, fuzzy, c-format
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
+#, c-format
 msgid "\"%s\" is a device file"
-msgstr "Fi�ierul \"%s\" este un fi�ier dispozitiv (device)"
+msgstr "„%s” este un fișier dispozitiv"
 
-#: src/files.c:817
+#: src/files.c:1060
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
-msgstr "Comand� de executat �n bufer nou [din %s] "
+msgstr "Comandă de executat într-un spațiu nou [din %s] "
 
-#: src/files.c:819
+#: src/files.c:1062
 #, c-format
 msgid "Command to execute [from %s] "
-msgstr "Comand� de executat [din %s] "
+msgstr "Comandă de executat [din %s] "
 
-#: src/files.c:825
+#: src/files.c:1069
 #, c-format
 msgid "File to insert into new buffer [from %s] "
-msgstr "Fi�ier de inserat �n bufer nou [din %s]"
+msgstr "Fișier de inserat într-un spațiu nou [din %s] "
 
-#: src/files.c:827
+#: src/files.c:1071
 #, c-format
 msgid "File to insert [from %s] "
-msgstr "Fi�ier de inserat [din %s]"
+msgstr "Fișier de inserat [din %s]"
 
-#: src/files.c:1077
-#, fuzzy
+#: src/files.c:1320
 msgid "Key invalid in non-multibuffer mode"
-msgstr "Tast� ilegal� �n modul non-multibufer"
+msgstr "Tastă ilegală în afara modului multi-spațiu"
+
+#: src/files.c:1622
+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:1486
+#: src/files.c:1746
 #, c-format
 msgid "Can't write outside of %s"
-msgstr "Nu pot scrie �n afar� de %s"
+msgstr "Nu se poate scrie în afara %s"
 
-#: src/files.c:1501
+#: src/files.c:1761
 msgid "Cannot prepend or append to a symlink with --nofollow set"
-msgstr "Nu pot pre-ad�ug� sau ad�uga la un symlink cu setarea --nofollow"
+msgstr "Imposibil de adăugat la o legătură simbolică cu setarea --nofollow"
 
-#: src/files.c:1581 src/files.c:1603 src/files.c:1621 src/files.c:1632
-#: src/files.c:1640 src/files.c:1667
-#, fuzzy, c-format
+#: src/files.c:1843 src/files.c:1868 src/files.c:1886 src/files.c:1899
+#: src/files.c:1910 src/files.c:1939
+#, c-format
 msgid "Error writing backup file %s: %s"
-msgstr "Eroare la scrierea fi�ierului temporar: %s"
+msgstr "Eroare la scrierea copiei de rezervă %s: %s"
 
-#: src/files.c:1582 src/nano.c:701
-#, fuzzy
+#: src/files.c:1844 src/nano.c:719
 msgid "Too many backup files?"
-msgstr "Fi�iere copie de siguran�� (backup)"
+msgstr "Prea multe copii de rezervă?"
 
-#: src/files.c:1687 src/files.c:1744 src/files.c:1763 src/files.c:1775
-#: src/files.c:1799 src/files.c:1817 src/files.c:1827 src/files.c:1863
-#: src/files.c:1868 src/files.c:2764 src/files.c:2773
+#: src/files.c:1959 src/files.c:2016 src/files.c:2035 src/files.c:2047
+#: src/files.c:2071 src/files.c:2089 src/files.c:2099 src/files.c:2135
+#: src/files.c:2140 src/files.c:3101 src/files.c:3110 src/files.c:3133
+#: src/files.c:3145
 #, c-format
 msgid "Error writing %s: %s"
-msgstr "Eroare scriind %s: %s"
+msgstr "Eroare la scrierea %s: %s"
 
-#: src/files.c:1721 src/text.c:2929 src/text.c:2941
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
-msgstr "Eroare la scrierea fi�ierului temporar: %s"
+msgstr "Eroare la scrierea fișierului temporar: %s"
 
-#: src/files.c:1900
-#, fuzzy, c-format
+#: src/files.c:2173
+#, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
-msgstr[0] "Am scris %u linie"
-msgstr[1] "Am scris %u linii"
+msgstr[0] "S-a scris %lu linie"
+msgstr[1] "S-au scris %lu linii"
+msgstr[2] "S-au scris %lu de linii"
 
-#: src/files.c:2004
+#: src/files.c:2278
 msgid " [DOS Format]"
 msgstr " [Format DOS]"
 
-#: src/files.c:2005
+#: src/files.c:2279
 msgid " [Mac Format]"
 msgstr " [Format Mac]"
 
-#: src/files.c:2007
+#: src/files.c:2281
 msgid " [Backup]"
-msgstr " [Copie de siguran�� (backup)]"
+msgstr " [Copie de rezervă]"
 
-#: src/files.c:2015
+#: src/files.c:2289
 msgid "Prepend Selection to File"
-msgstr "Pre-adaug� Selec�ie la fi�ier"
+msgstr "Adaugă selecție la începutul fișierului"
 
-#: src/files.c:2016
+#: src/files.c:2290
 msgid "Append Selection to File"
-msgstr "Adaug� Selec�ie la fi�ier"
+msgstr "Adaugă selecție la fișier"
 
-#: src/files.c:2017
+#: src/files.c:2291
 msgid "Write Selection to File"
-msgstr "Scrie Selec�ie �n fi�ier"
+msgstr "Scrie selecție în fișier"
 
-#: src/files.c:2020
+#: src/files.c:2294
 msgid "File Name to Prepend to"
-msgstr "Nume de pre-ad�ugat la"
+msgstr "Numele fișierului la începutul căruia se adaugă"
 
-#: src/files.c:2021
+#: src/files.c:2295
 msgid "File Name to Append to"
-msgstr "Nume de ad�ugat la"
+msgstr "Numele fișierului la sfârșitul căruia se adaugă"
 
-#: src/files.c:2022
+#: src/files.c:2296
 msgid "File Name to Write"
-msgstr "Nume de scris"
+msgstr "Numele fișierului pentru scriere"
 
-#: src/files.c:2153
+#: src/files.c:2427
 msgid "File exists, OVERWRITE ? "
-msgstr "Fi�ierul exist�, SUPRASCRIE ? "
+msgstr "Fișierul există, SE SUPRASCRIE ? "
 
-#: src/files.c:2162
+#: src/files.c:2436
 msgid "Save file under DIFFERENT NAME ? "
-msgstr "Salveaz� fi�ierul sun UN NUME DIFERIT ? "
+msgstr "Salvează fișierul cu un NUME DIFERIT? "
 
-#: src/files.c:2173
+#: src/files.c:2450
 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:2611
+#: src/files.c:2882
 msgid "(more)"
-msgstr "(suplimentar)"
+msgstr "(mai mult)"
 
-#: src/files.c:2694 src/rcfile.c:1220
-#, fuzzy, c-format
+#: src/files.c:2974
+#, c-format
 msgid ""
 "\n"
-"Press Enter to continue starting nano.\n"
+"Press Enter to continue\n"
 msgstr ""
 "\n"
-"Ap�sa�i Return/Enter pentru a continua lansarea nano\n"
-
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:415 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Renun��"
+"Apăsați Enter pentru a continua\n"
 
-#: src/global.c:416
-msgid "Replace"
-msgstr "�nlocuie�te"
+#: src/files.c:2989
+#, c-format
+msgid ""
+"Unable to create directory %s: %s\n"
+"It is required for saving/loading search history or cursor positions.\n"
+msgstr ""
+"Imposibil de creat directorul %s: %s\n"
+"Este necesar pentru salvarea/încărcarea istoricului de salvări sau pozițiile "
+"cursorului.\n"
 
-#: src/global.c:417
-msgid "No Replace"
-msgstr "Nici o �nlocuire"
+#: src/files.c:2995
+#, 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 ""
+"Calea %s nu este un director și trebuie să fie.\n"
+"Nano nu va putea să încarce sau să salveze istoricul sau pozițiile "
+"cursorului.\n"
 
-#: src/global.c:420
-msgid "Case Sens"
-msgstr "Cu majuscule semnificative"
+#: src/files.c:3012
+#, 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 ""
+"S-a detectat un fișier de istoric moștenit (%s) pe care am încercat să îl "
+"mut\n"
+" în locația preferată (%s) dar am întâmpinat o eroare: %s"
 
-#: src/global.c:421
-#, fuzzy
-msgid "Backwards"
-msgstr " [�napoi]"
+#: src/files.c:3016
+#, 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 ""
+"S-a detectat un fișier de istoric moștenit (%s) pe care am l-am mutat\n"
+" în locația preferată (%s)\n"
+"(vezi secțiunea FAQ nano despre această schimbare)"
 
-#: src/global.c:425
-msgid "Regexp"
-msgstr "Regexp"
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
+#: src/global.c:477
+msgid "Exit"
+msgstr "Ieșire"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:451
-#, fuzzy
-msgid "PrevHstory"
-msgstr "Istorie"
+#: src/global.c:478
+msgid "Close"
+msgstr "Închide"
 
-#: src/global.c:452
-#, fuzzy
-msgid "NextHstory"
-msgstr "Istorie"
+#: src/global.c:479
+msgid "Uncut Text"
+msgstr "Lipește"
 
-#: src/global.c:453
-msgid "Go To Text"
-msgstr "Du-te la text"
+#: src/global.c:481
+msgid "Unjustify"
+msgstr "Anul. alin."
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:455
-#, fuzzy
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:485
 msgid "WhereIs Next"
-msgstr "Unde este Urm�tor"
-
-#: src/global.c:457
-#, fuzzy
-msgid "First File"
-msgstr "Prima linie"
-
-#: src/global.c:458
-#, fuzzy
-msgid "Last File"
-msgstr "Ultima linie"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:460
-msgid "To Files"
-msgstr "�n fi�iere"
-
-#: src/global.c:462
-msgid "DOS Format"
-msgstr "Format DOS"
-
-#: src/global.c:463
-msgid "Mac Format"
-msgstr "Format Mac"
-
-#: src/global.c:464
-msgid "Append"
-msgstr "Adaug�"
-
-#: src/global.c:465
-msgid "Prepend"
-msgstr "Pre-adaug�"
-
-#: src/global.c:466
-msgid "Backup File"
-msgstr "Fi�ier copie de siguran�� (backup)"
-
-#: src/global.c:467
-msgid "Execute Command"
-msgstr "Execut� comand�"
-
-#: src/global.c:471
-msgid "Go To Dir"
-msgstr "Du-te la Director"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:480
-msgid "Get Help"
-msgstr "Cere ajutor"
+msgstr "Căutarea urm."
 
-#: src/global.c:481
-msgid "Exit"
-msgstr "Termin�"
-
-#: src/global.c:482
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:492
 msgid "Where Is"
-msgstr "Unde este"
+msgstr "Caută"
 
-#: src/global.c:483
-msgid "Prev Page"
-msgstr "Pagina precedent�"
-
-#: src/global.c:484
-msgid "Next Page"
-msgstr "Pagina urm�toare"
-
-#: src/global.c:485
-msgid "First Line"
-msgstr "Prima linie"
+#: src/global.c:493
+msgid "Replace"
+msgstr "Înlocuiește"
 
-#: src/global.c:486
-msgid "Last Line"
-msgstr "Ultima linie"
+#: src/global.c:494
+msgid "Go To Line"
+msgstr "Depl. linie"
 
-#: src/global.c:487
-msgid "Suspend"
-msgstr "Suspend�"
+#: src/global.c:495
+msgid "Prev Line"
+msgstr "Linia anterioară"
 
-#: src/global.c:489
-msgid "Beg of Par"
-msgstr "�nceput Par"
+#: src/global.c:496
+msgid "Next Line"
+msgstr "Linia următoare"
 
-#: src/global.c:490
-msgid "End of Par"
-msgstr "Sf�r�it Par"
+#: src/global.c:497
+msgid "Read File"
+msgstr "Citire fiș."
 
-#: src/global.c:491
+#: src/global.c:499
 msgid "FullJstify"
-msgstr "Aliniaz�Total"
+msgstr "Alin.compl"
 
-#: src/global.c:493
+#: src/global.c:501
 msgid "Refresh"
-msgstr "�mprosp�teaz�"
-
-#: src/global.c:495
-msgid "Insert File"
-msgstr "Insereaz� fi�ier"
-
-#: src/global.c:497
-msgid "Go To Line"
-msgstr "Du-te la linia"
-
-#: src/global.c:500
-msgid "Justify the current paragraph"
-msgstr "Aliniaz� paragraful curent"
+msgstr "Reîmprospătează"
 
 #. 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:505
+#: src/global.c:507
+msgid "Justify the current paragraph"
+msgstr "Aliniază paragraful curent"
+
+#: src/global.c:509
 msgid "Cancel the current function"
-msgstr "Anuleaz� func�ia curent�"
+msgstr "Anulează funcția curentă"
 
-#: src/global.c:506
+#: src/global.c:510
 msgid "Display this help text"
-msgstr ""
+msgstr "Afișează acest text de ajutor"
 
-#: src/global.c:509
-#, fuzzy
+#: src/global.c:513
 msgid "Close the current file buffer / Exit from nano"
-msgstr "�nchide fi�ierul �nc�rcat curent/Ie�i din nano"
+msgstr "Închide spațiul curent / Ieșire din nano"
 
-#: src/global.c:511
+#: src/global.c:515
 msgid "Exit from nano"
-msgstr "Ie�ire din nano"
+msgstr "Ieșire din nano"
 
-#: src/global.c:515
+#: src/global.c:519
 msgid "Write the current file to disk"
-msgstr "Scrie fi�ierul curent pe disc"
+msgstr "Scrie fișierul curent pe disc"
 
-#: src/global.c:517
+#: src/global.c:521
 msgid "Insert another file into the current one"
-msgstr "Insereaz� alt fi�ier �n fi�ierul curent"
+msgstr "Inserează alt fișier în fișierul curent"
 
-#: src/global.c:519
-#, fuzzy
+#: src/global.c:523
 msgid "Search for a string or a regular expression"
-msgstr "Folose�te expresii regulare (regular expressions)"
+msgstr "Caută un text sau o expresie regulată"
 
-#: src/global.c:520
-#, fuzzy
-msgid "Go to previous screen"
-msgstr "Du-te la ecranul precedent"
+#: src/global.c:526
+msgid "Search for a string"
+msgstr "Caută un text"
 
-#: src/global.c:521
-#, fuzzy
-msgid "Go to next screen"
-msgstr "Du-te la ecraul urm�tor"
+#: src/global.c:528
+msgid "Go one screenful up"
+msgstr "Deplasează cursorul în sus cu un ecran"
 
-#: src/global.c:523
+#: src/global.c:529
+msgid "Go one screenful down"
+msgstr "Deplasează cursorul în jos cu un ecran"
+
+#: src/global.c:531
 msgid "Cut the current line and store it in the cutbuffer"
-msgstr "Taie linia curent� �i p�streaz�-o �n cutbufer"
+msgstr "Decupează linia curentă și o păstrează în memoria temporară"
 
-#: src/global.c:525
+#: src/global.c:533
 msgid "Uncut from the cutbuffer into the current line"
-msgstr "Copiaz� din cutbufer �n linia curent�"
+msgstr "Lipește din memoria temporară în linia curentă"
 
-#: src/global.c:527
-#, fuzzy
+#: src/global.c:534
 msgid "Display the position of the cursor"
-msgstr "Arat� pozi�ia cursorului"
+msgstr "Afișează poziția cursorului"
 
-#: src/global.c:529
+#: src/global.c:536
 msgid "Invoke the spell checker, if available"
-msgstr "Invoc� corectorul ortografic, dac� e disponibil"
+msgstr "Invocă corectorul ortografic, dacă este disponibil"
 
-#: src/global.c:531
-#, fuzzy
+#: src/global.c:538
 msgid "Replace a string or a regular expression"
-msgstr "Folose�te expresii regulare (regular expressions)"
+msgstr "Înlocuiește un text sau o expresie regulată"
 
-#: src/global.c:532
-#, fuzzy
+#: src/global.c:539
 msgid "Go to line and column number"
-msgstr "Du-te la o anumit� linie"
+msgstr "Deplasează cursorul la linia și coloana numărul"
 
-#: src/global.c:534
-msgid "Mark text at the cursor position"
-msgstr "Marcheaz� textul la pozi�ia curent� a cursorului"
+#: src/global.c:541
+msgid "Mark text starting from the cursor position"
+msgstr "Marchează începutul textului de la poziția cursorului"
 
-#: src/global.c:535
-msgid "Repeat last search"
-msgstr "Repet� ultima c�utare"
+#: src/global.c:542
+msgid "Repeat the last search"
+msgstr "Repetă ultima căutare"
 
-#: src/global.c:537
-#, fuzzy
+#: src/global.c:544
 msgid "Copy the current line and store it in the cutbuffer"
-msgstr "Taie linia curent� �i p�streaz�-o �n cutbufer"
+msgstr "Copiază linia curentă și o păstrează în memoria temporară"
 
-#: src/global.c:538
-#, fuzzy
+#: src/global.c:545
 msgid "Indent the current line"
-msgstr "Adaug� la fi�ierul curent"
+msgstr "Mărește marginea liniei curente"
 
-#: src/global.c:539
-#, fuzzy
+#: src/global.c:546
 msgid "Unindent the current line"
-msgstr "Adaug� la fi�ierul curent"
+msgstr "Micșorează marginea liniei curente"
 
-#: src/global.c:540
+#: src/global.c:547
 msgid "Undo the last operation"
-msgstr ""
+msgstr "Anulează ultima operație"
 
-#: src/global.c:541
+#: src/global.c:548
 msgid "Redo the last undone operation"
-msgstr ""
+msgstr "Repetă ultima operație anulată"
 
-#: src/global.c:543
-#, fuzzy
+#: src/global.c:550
 msgid "Go forward one character"
-msgstr "Du-te �nainte un caracter"
+msgstr "Avansează cu un caracter"
 
-#: src/global.c:544
-#, fuzzy
+#: src/global.c:551
 msgid "Go back one character"
-msgstr "Du-te �napoi un caracter"
+msgstr "Înapoi cu un caracter"
 
-#: src/global.c:546
-#, fuzzy
+#: src/global.c:553
 msgid "Go forward one word"
-msgstr "Du-te �nainte un cuv�nt"
+msgstr "Avansează cu un cuvânt"
 
-#: src/global.c:547
-#, fuzzy
+#: src/global.c:554
 msgid "Go back one word"
-msgstr "Du-te �napoi un cuv�nt"
+msgstr "Înapoi cu un cuvânt"
 
-#: src/global.c:549
-#, fuzzy
+#: src/global.c:556
 msgid "Go to previous line"
-msgstr "Du-te la linia precedent�"
+msgstr "Deplasează cursorul la linia anterioară"
 
-#: src/global.c:550
-#, fuzzy
+#: src/global.c:557
 msgid "Go to next line"
-msgstr "Du-te la linia urm�toare"
+msgstr "Deplasează cursorul la linia următoare"
 
-#: src/global.c:551
-#, fuzzy
+#: src/global.c:558
 msgid "Go to beginning of current line"
-msgstr "Du-te la �nceputul liniei"
+msgstr "Deplasează cursorul la începutul liniei curente"
 
-#: src/global.c:552
-#, fuzzy
+#: src/global.c:559
 msgid "Go to end of current line"
-msgstr "Du-te la sf�r�itul liniei"
+msgstr "Deplasează cursorul la sfârșitul liniei curente"
 
-#: src/global.c:555
-#, fuzzy
+#: src/global.c:562
 msgid "Go to beginning of paragraph; then of previous paragraph"
-msgstr "Du-te la �nceputul paragrafului curent"
+msgstr ""
+"Deplasează cursorul la începutul paragrafului; apoi la începutul "
+"paragrafului anterior"
 
-#: src/global.c:557
-#, fuzzy
+#: src/global.c:564
 msgid "Go just beyond end of paragraph; then of next paragraph"
-msgstr "Du-te la sf�r�itul paragrafului curent"
+msgstr ""
+"Deplasează cursorul dincolo de sfârșitul paragrafului; apoi la sfârșitul "
+"paragrafului următor"
 
-#: src/global.c:560
+#: src/global.c:566
 msgid "Go to the first line of the file"
-msgstr "Du-te la prima linie din fi�ier"
+msgstr "Deplasează cursorul la prima linie din fișier"
 
-#: src/global.c:562
+#: src/global.c:567
 msgid "Go to the last line of the file"
-msgstr "Du-te la ultima linie din fi�ier"
+msgstr "Deplasează cursorul la ultima linie din fișier"
 
-#: src/global.c:564
-#, fuzzy
+#: src/global.c:569
 msgid "Go to the matching bracket"
-msgstr "Nici o parantez� pereche"
+msgstr "Deplasează cursorul la paranteza pereche"
 
-#: src/global.c:566
+#: src/global.c:571
 msgid "Scroll up one line without scrolling the cursor"
-msgstr ""
+msgstr "Derulează în sus o linie fără a deplasa cursorul"
 
-#: src/global.c:568
+#: src/global.c:573
 msgid "Scroll down one line without scrolling the cursor"
-msgstr ""
+msgstr "Derulează în jos o linie fără a deplasa cursorul"
 
-#: src/global.c:572
+#: src/global.c:576
 msgid "Switch to the previous file buffer"
-msgstr "Du-te la buferul de fi�ier precedent"
+msgstr "Comută la spațiul fișier anterior"
 
-#: src/global.c:574
+#: src/global.c:577
 msgid "Switch to the next file buffer"
-msgstr "Schimb� la urm�torul bufer de fi�ier"
+msgstr "Comută la următorul spațiu fișier"
 
-#: src/global.c:577
-#, fuzzy
+#: src/global.c:579
 msgid "Insert the next keystroke verbatim"
-msgstr "Insereaz� caracter(e) identic"
+msgstr "Inserează următoarea apăsare de tastă verbatim"
 
-#: src/global.c:579
-#, fuzzy
+#: src/global.c:580
 msgid "Insert a tab at the cursor position"
-msgstr "Insereaz� un caracter tab la pozi�ia curent� a cursorului"
+msgstr "Inserează un tab la poziția cursorului"
 
 #: src/global.c:581
-#, fuzzy
 msgid "Insert a newline at the cursor position"
-msgstr ""
-"Insereaz� un caracter \"carriage return\" la pozi�ia curent� a cursorului"
+msgstr "Inserează o linie nouă la poziția cursorului"
 
-#: src/global.c:583
+#: src/global.c:582
 msgid "Delete the character under the cursor"
-msgstr "�terge caracterul de sub cursor"
+msgstr "Șterge caracterul de sub cursor"
 
-#: src/global.c:585
+#: src/global.c:584
 msgid "Delete the character to the left of the cursor"
-msgstr "�terge caracterul de la st�nga cursorului"
+msgstr "Șterge caracterul de la stânga cursorului"
 
-#: src/global.c:588
+#: src/global.c:587
 msgid "Cut from the cursor position to the end of the file"
-msgstr "Taie de la cursor p�n� la sf�r�itul fi�ierului"
+msgstr "Decupează de la cursor până la sfârșitul fișierului"
 
-#: src/global.c:591
+#: src/global.c:590
 msgid "Justify the entire file"
-msgstr "Aliniaz� �ntregul fi�ier"
+msgstr "Aliniază întregul fișier"
 
-#: src/global.c:595
+#: src/global.c:594
 msgid "Count the number of words, lines, and characters"
-msgstr ""
+msgstr "Contorizează numărul cuvintelor, liniilor și caracterelor"
 
-#: src/global.c:598
+#: src/global.c:597
 msgid "Refresh (redraw) the current screen"
-msgstr "Re�mprosp�teaz� zona de ecran curent�"
+msgstr "Reîmprospătează zona de ecran curentă"
 
-#: src/global.c:600
+#: src/global.c:599
 msgid "Suspend the editor (if suspend is enabled)"
-msgstr ""
+msgstr "Suspendă editorul (dacă suspendarea este activată)"
 
-#: src/global.c:603
+#: src/global.c:602
 msgid "Toggle the case sensitivity of the search"
-msgstr ""
+msgstr "Comută sensibilitatea la majuscule a căutării"
 
-#: src/global.c:605
-#, fuzzy
+#: src/global.c:604
 msgid "Reverse the direction of the search"
-msgstr "Arat� pozi�ia cursorului"
+msgstr "Inversează direcția căutării"
 
-#: src/global.c:609
-#, fuzzy
+#: src/global.c:608
 msgid "Toggle the use of regular expressions"
-msgstr "Folose�te expresii regulare (regular expressions)"
+msgstr "Comută folosirea expresiilor regulate"
 
-#: src/global.c:613
-#, fuzzy
+#: src/global.c:612
 msgid "Recall the previous search/replace string"
-msgstr "Editeaz� �irurile precedente de c�utare/�nlocuire"
+msgstr "Reapelează șirul anterior caută/înlocuiește"
 
-#: src/global.c:615
-#, fuzzy
+#: src/global.c:614
 msgid "Recall the next search/replace string"
-msgstr "Editeaz� �irurile precedente de c�utare/�nlocuire"
+msgstr "Reapelează șirul următor caută/înlocuiește"
 
-#: src/global.c:618
+#: src/global.c:617
 msgid "Go to file browser"
-msgstr "Du-te la navigatorul de fi�iere"
+msgstr "Mergi la navigatorul de fișiere"
 
-#: src/global.c:621
-#, fuzzy
+#: src/global.c:620
 msgid "Toggle the use of DOS format"
-msgstr "Scrie fi�ierul ie�ire �n format DOS"
+msgstr "Comută folosirea formatului DOS"
 
-#: src/global.c:622
-#, fuzzy
+#: src/global.c:621
 msgid "Toggle the use of Mac format"
-msgstr "Scrie fi�ierul ie�ire �n format Mac"
+msgstr "Comuta folosirea formatului Mac"
 
-#: src/global.c:624
+#: src/global.c:622
 msgid "Toggle appending"
-msgstr ""
+msgstr "Comută adăugarea la sfârșit"
 
-#: src/global.c:625
+#: src/global.c:623
 msgid "Toggle prepending"
-msgstr ""
+msgstr "Comută adăugarea la început"
 
-#: src/global.c:628
+#: src/global.c:624
 msgid "Toggle backing up of the original file"
-msgstr ""
+msgstr "Comută realizarea copiei de siguranță a fișierului original"
 
-#: src/global.c:629
+#: src/global.c:625
 msgid "Execute external command"
-msgstr "Execut� comand� extern�"
+msgstr "Execută comandă externă"
 
-#: src/global.c:633
-#, fuzzy
+#: src/global.c:628
 msgid "Toggle the use of a new buffer"
-msgstr "Nu am putut ob�ine dimensiune bufer pentru pipe"
+msgstr "Comută folosirea unui spațiu nou"
 
-#: src/global.c:636
+#: src/global.c:631
 msgid "Exit from the file browser"
-msgstr "Ie�i din navigatorul de fi�iere"
+msgstr "Ieși din navigatorul de fișiere"
 
-#: src/global.c:638
-#, fuzzy
+#: src/global.c:632
 msgid "Go to the first file in the list"
-msgstr "Du-te la prima linie din fi�ier"
+msgstr "Deplasează cursorul la primul fișier din listă"
 
-#: src/global.c:640
-#, fuzzy
+#: src/global.c:633
 msgid "Go to the last file in the list"
-msgstr "Du-te la ultima linie din fi�ier"
+msgstr "Deplasează cursorul la ultimul fișier din listă"
 
-#: src/global.c:641
-#, fuzzy
+#: src/global.c:634
+msgid "Go to the previous file in the list"
+msgstr "Deplasează cursorul la fișierul anterior din listă"
+
+#: src/global.c:635
 msgid "Go to the next file in the list"
-msgstr "Du-te la linia urm�toare"
+msgstr "Deplasează cursorul la următorul fișier din listă"
+
+#: src/global.c:636
+msgid "Go to directory"
+msgstr "Mergi la director"
+
+#: src/global.c:639
+msgid "Invoke the linter, if available"
+msgstr "Apelează analiza statică, dacă este disponibilă"
+
+#: src/global.c:640
+msgid "Go to previous linter msg"
+msgstr "Mergi la mesajul anterior al analizei statice"
+
+#: src/global.c:641
+msgid "Go to next linter msg"
+msgstr "Mergi la mesajul următor al analizei statice"
 
 #: src/global.c:642
-#, fuzzy
-msgid "Go to the previous file in the list"
-msgstr "Du-te la linia precedent�"
+msgid "Invoke formatter, if available"
+msgstr "Apelează utilitarul de formatare, dacă este disponibil"
 
-#: src/global.c:643
-msgid "Go to directory"
-msgstr "Du-te la director"
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:662
+msgid "Get Help"
+msgstr "Ajutor"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:670
-msgid "Close"
-msgstr "�nchide"
+#: src/global.c:665 src/prompt.c:1084
+msgid "Cancel"
+msgstr "Renunță"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:679
-msgid "WriteOut"
-msgstr "Scrie ie�ire"
+#: src/global.c:678
+msgid "Write Out"
+msgstr "Salvează"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:704
+msgid "Go To Dir"
+msgstr "Mergi la Director"
+
+#: src/global.c:719
+msgid "Cut Text"
+msgstr "Decupează"
+
+#: src/global.c:728
 msgid "Justify"
-msgstr "Aliniaz�"
+msgstr "Aliniază"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:696
-msgid "Read File"
-msgstr "Cite�te fi�ier"
+#: src/global.c:733
+msgid "To Spell"
+msgstr "Ortograf."
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:713
-msgid "Cut Text"
-msgstr "Taie text"
+#: src/global.c:738
+msgid "To Linter"
+msgstr "Analiză statică"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:718
-msgid "UnJustify"
-msgstr "De-aliniaz�"
+#: src/global.c:740
+msgid "Formatter"
+msgstr "Formatare"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:723
-#, fuzzy
-msgid "UnCut Text"
-msgstr "Anuleaz� t�iere text"
+#: src/global.c:745
+msgid "Case Sens"
+msgstr "Sensibil Majusc."
+
+#: src/global.c:750
+msgid "Regexp"
+msgstr "Regexp"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:728 src/global.c:755
+#: src/global.c:755
+msgid "Backwards"
+msgstr "Înapoi"
+
+#: src/global.c:762
+msgid "No Replace"
+msgstr " Nicio înlocuire"
+
+#: src/global.c:770
 msgid "Cur Pos"
-msgstr "Poz. Crt."
+msgstr "Poz. curent."
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:737
-msgid "To Spell"
-msgstr "De ortografiat"
+#: src/global.c:780
+msgid "Prev Page"
+msgstr "Pagina anter."
+
+#: src/global.c:782
+msgid "Next Page"
+msgstr "Pagina urm."
+
+#: src/global.c:785
+msgid "First Line"
+msgstr "Prima linie"
+
+#: src/global.c:787
+msgid "Last Line"
+msgstr "Ultima linie"
+
+#: src/global.c:794
+msgid "To Bracket"
+msgstr "Paranteză"
 
-#: src/global.c:771
+#: src/global.c:797
 msgid "Mark Text"
-msgstr "Marcheaz� text"
+msgstr "Marchează text"
 
-#: src/global.c:777
-#, fuzzy
+#: src/global.c:800
 msgid "Copy Text"
-msgstr "Taie text"
+msgstr "Copiază text"
 
-#: src/global.c:780
-#, fuzzy
+#: src/global.c:803
 msgid "Indent Text"
-msgstr "Taie text"
+msgstr "Măreș. marg"
 
-#: src/global.c:783
-#, fuzzy
+#: src/global.c:805
 msgid "Unindent Text"
-msgstr "Anuleaz� t�iere text"
+msgstr "Micș. marg"
 
-#: src/global.c:787
+#: src/global.c:808
 msgid "Undo"
-msgstr ""
+msgstr "Anulează"
 
-#: src/global.c:790
+#: src/global.c:810
 msgid "Redo"
-msgstr ""
+msgstr "Repetă"
 
-#: src/global.c:796 src/global.c:800
-msgid "Forward"
-msgstr "�nainte"
-
-#: src/global.c:806 src/global.c:810
+#: src/global.c:814 src/global.c:820
 msgid "Back"
-msgstr "�napoi"
+msgstr "Înapoi"
 
-#: src/global.c:817
-msgid "Next Word"
-msgstr "Cuv�nt urm�tor"
+#: src/global.c:816 src/global.c:822
+msgid "Forward"
+msgstr "Înainte"
 
-#: src/global.c:820
+#: src/global.c:827
 msgid "Prev Word"
-msgstr "Cuv�nt precedent"
-
-#: src/global.c:824
-msgid "Prev Line"
-msgstr "Linia precedent�"
+msgstr "Cuvânt anterior"
 
-#: src/global.c:827
-msgid "Next Line"
-msgstr "Linia urm�toare"
+#: src/global.c:829
+msgid "Next Word"
+msgstr "Cuvântul următor"
 
-#: src/global.c:830
+#: src/global.c:833
 msgid "Home"
-msgstr "Acas�"
+msgstr "Acasă"
 
-#: src/global.c:833
+#: src/global.c:835
 msgid "End"
-msgstr "Sf�r�it"
+msgstr "Sfârșit"
 
-#: src/global.c:845
-msgid "Find Other Bracket"
-msgstr "G�se�te cealalt� parantez�"
+#: src/global.c:844
+msgid "Beg of Par"
+msgstr "Început Par"
 
-#: src/global.c:848
-msgid "Scroll Up"
-msgstr ""
+#: src/global.c:846
+msgid "End of Par"
+msgstr "Sfârșit Par"
 
 #: src/global.c:851
-msgid "Scroll Down"
-msgstr ""
+msgid "Scroll Up"
+msgstr "Derulează în sus"
 
-#: src/global.c:856
-msgid "Previous File"
-msgstr "Fi�ier precedent"
+#: src/global.c:853
+msgid "Scroll Down"
+msgstr "Derulează în jos"
 
 #: src/global.c:858
+msgid "Prev File"
+msgstr "Fișierul anterior"
+
+#: src/global.c:860
 msgid "Next File"
-msgstr "Fi�ier urm�tor"
+msgstr "Fiș urm"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:862 src/text.c:3045
-msgid "Verbatim Input"
-msgstr "Intrare identic�"
+#: src/global.c:869
+msgid "Verbatim"
+msgstr "Verbatim"
 
-#: src/global.c:867
+#: src/global.c:872
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:870
+#: src/global.c:874
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:873
+#: src/global.c:876
 msgid "Delete"
-msgstr "�terge"
+msgstr "Șterge"
 
-#: src/global.c:876
+#: src/global.c:878
 msgid "Backspace"
-msgstr "�terge �napoi (backspace)"
+msgstr "Șterge înapoi"
 
-#: src/global.c:893
+#: src/global.c:888
 msgid "CutTillEnd"
-msgstr "TaieP�n�LaSf�r�it"
+msgstr "Taie->Sfârșit"
 
-#: src/global.c:906
+#: src/global.c:898
 msgid "Word Count"
-msgstr ""
+msgstr "Contorizare cuvinte"
+
+#: src/global.c:905
+msgid "Suspend"
+msgstr "Suspendă"
+
+#: src/global.c:910
+msgid "PrevHstory"
+msgstr "Anterioara"
+
+#: src/global.c:913
+msgid "NextHstory"
+msgstr "Următoarea"
+
+#: src/global.c:917
+msgid "Go To Text"
+msgstr "Deplasează la text"
+
+#: src/global.c:928
+msgid "DOS Format"
+msgstr "Format DOS"
+
+#: src/global.c:931
+msgid "Mac Format"
+msgstr "Format Mac"
+
+#: src/global.c:934
+msgid "Append"
+msgstr "Adaugă la sfârșit"
+
+#: src/global.c:936
+msgid "Prepend"
+msgstr "Adaugă la început"
+
+#: src/global.c:939
+msgid "Backup File"
+msgstr "Fișier copie de rezervă"
+
+#: src/global.c:946
+msgid "Execute Command"
+msgstr "Execută comandă"
+
+#: src/global.c:961
+msgid "To Files"
+msgstr "La fișiere"
+
+#: src/global.c:964
+msgid "First File"
+msgstr "Primul fișier"
+
+#: src/global.c:966
+msgid "Last File"
+msgstr "Ultimul fișier"
 
-#: src/global.c:1367
+#: src/global.c:977
+msgid "Prev Lint Msg"
+msgstr "Analiză anter."
+
+#: src/global.c:979
+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:1227
 msgid "Help mode"
-msgstr "Mod Ajutor"
+msgstr "Bara de ajutor"
 
-#: src/global.c:1369
-#, fuzzy
+#: src/global.c:1229
 msgid "Constant cursor position display"
-msgstr "Pozi�ie cursor neschimbat�"
+msgstr "Afișare continuă poziție cursor"
 
-#: src/global.c:1371
-#, fuzzy
+#: src/global.c:1231
 msgid "Use of one more line for editing"
-msgstr "Folose�te mai mult spa�iu pentru editare"
+msgstr "Folosire a unei linii suplimentare pentru editare"
 
-#: src/global.c:1373
+#: src/global.c:1233
 msgid "Smooth scrolling"
-msgstr "Rulare (scrolling) fin�"
+msgstr "Derulare fină"
 
-#: src/global.c:1375
+#: src/global.c:1235
+msgid "Soft wrapping of overlong lines"
+msgstr "Rupere ușoară a liniilor lungi"
+
+#: src/global.c:1237
 msgid "Whitespace display"
-msgstr "Afi�eaz� spa�iu-alb"
+msgstr "Afișare spațiu-alb"
 
-#: src/global.c:1377
+#: src/global.c:1239
 msgid "Color syntax highlighting"
-msgstr "Eviden�iere sintax� color"
+msgstr "Evidențiere sintaxă color"
 
-#: src/global.c:1379
+#: src/global.c:1241
 msgid "Smart home key"
-msgstr "Tast� acas� inteligent�"
+msgstr "Tastă acasă inteligentă"
 
-#: src/global.c:1381
+#: src/global.c:1243
 msgid "Auto indent"
-msgstr "Auto paragraf"
+msgstr "Auto identare"
 
-#: src/global.c:1383
+#: src/global.c:1245
 msgid "Cut to end"
-msgstr "Taie p�n� la sf�r�it"
+msgstr "Decupare până la sfârșit"
 
-#: src/global.c:1385
-#, fuzzy
-msgid "Long line wrapping"
-msgstr "Trecere automat� (wrap) la linie nou�"
+#: src/global.c:1247
+msgid "Hard wrapping of overlong lines"
+msgstr "Rupere permanentă a liniilor lungi"
 
-#: src/global.c:1387
+#: src/global.c:1249
 msgid "Conversion of typed tabs to spaces"
-msgstr ""
+msgstr "Conversie a tab-urilor introduse în spații"
 
-#: src/global.c:1389
+#: src/global.c:1251
 msgid "Backup files"
-msgstr "Fi�iere copie de siguran�� (backup)"
+msgstr "Salvare fișiere copii de rezervă"
 
-#: src/global.c:1391
+#: src/global.c:1253
 msgid "Multiple file buffers"
-msgstr "Multiple bufere fi�iere"
+msgstr "Editare spații multiple de fișiere"
 
-#: src/global.c:1393
+#: src/global.c:1255
 msgid "Mouse support"
-msgstr "Suport maus"
+msgstr "Funcționalitate maus"
 
-#: src/global.c:1395
+#: src/global.c:1257
 msgid "No conversion from DOS/Mac format"
-msgstr "Nici o conversie de format DOS/Mac"
+msgstr "Conversie din formatul DOS/Mac"
 
-#: src/global.c:1397
-#, fuzzy
+#: src/global.c:1259
 msgid "Suspension"
-msgstr "Suspend�"
+msgstr "Suspendare"
 
-#: src/global.c:1399
-#, fuzzy
-msgid "Soft line wrapping"
-msgstr "Trecere automat� (wrap) la linie nou�"
-
-#: src/help.c:236
+#: src/help.c:205
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1022,17 +1106,18 @@ msgid ""
 "prompt.  Hitting Enter without entering any text will perform the previous "
 "search.  "
 msgstr ""
-"Text de ajutor pentru comanda \"Caut�\"\n"
+" Text de ajutor pentru comanda de căutare\n"
 "\n"
-" Introduce�i cuvintele sau caracterele pe care a�i dori s� le c�uta�i, apoi "
-"ap�sa�i Enter.  Dac� exist� vreo potrivire pentru textul c�utat, ecranul va "
-"fi actualizat la loca�ia cea mai apropiat� de locul unde aceast� potrivire a "
-"avut loc.\n"
+" Introduceți cuvintele sau caracterele pe care ați dori să le căutați, apoi "
+"apăsați Enter. Dacă există vreo potrivire pentru textul introdus, ecranul va "
+"fi actualizat la locația celei mai apropiate potriviri pentru textul "
+"căutat.\n"
 "\n"
-" �irul c�utat anterior va fi ar�tat �n paranteze dup� prompt-ul de c�utare. "
-"Ap�s�nd Enter f�r� a introduce vreun text va executa c�utarea anterioar�.  "
+" Textul căutat anterior va fi afișat între paranteze după prompt-ul de "
+"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:245
+#: src/help.c:214
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1040,12 +1125,13 @@ msgid ""
 " The following function keys are available in Search mode:\n"
 "\n"
 msgstr ""
-"Dac� a�i selectat text cu marcajul �i apoi c�uta�i pentru a �nlocui, numai "
-"potrivirile din textul selectat vor fi �nlocuite.\n"
+"Dacă ați selectat text cu marcajul și apoi folosiți funcția de căutare "
+"pentru a înlocui, numai potrivirile din textul selectat vor fi înlocuite.\n"
+"\n"
+" Următoarele taste de funcții sunt disponibile în modul de căutare:\n"
 "\n"
-"Urm�toarele taste de func�ii sunt disponibile �n modul \"Caut�\":\n"
 
-#: src/help.c:251
+#: src/help.c:220
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1056,15 +1142,17 @@ msgid ""
 " The following function keys are available in Go To Line mode:\n"
 "\n"
 msgstr ""
-"Textul de ajutor pentru comanda \"Du-te la linia\"\n"
+" Text de ajutor pentru comanda de deplasare la linia indicată\n"
 "\n"
-" Introduce�i num�rul liniei unde dori�i s� merge�i �i ap�sa�i Enter. Dac� "
-"exist� mai pu�ine linii de text dec�t num�rul introdus ve�i ajunge la ultima "
-"linie a fi�ierului.\n"
+" Introduceți numărul liniei unde doriți să ajungeți și apăsați Enter. Dacă "
+"există mai puține linii de text decât numărul introdus veți ajunge la ultima "
+"linie a fișierului.\n"
+"\n"
+" Următoarele taste de funcții sunt disponibile în modul de deplasare la "
+"linia:\n"
 "\n"
-" Urm�toarele taste de func�ii sunt disponibile �n modul \"Du-te la linia\":\n"
 
-#: src/help.c:260
+#: src/help.c:229
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1076,18 +1164,19 @@ 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 ""
-"Textul de ajutor pentru comanda \"Insereaz� fi�ier\"\n"
+" Text de ajutor pentru comanda de inserare fișier\n"
 "\n"
-" Tasta�i numele unui fi�ier de introdus �n buferul fi�ierului curent la "
-"pozi�ia curent� a cursorului.\n"
+" Tastați numele unui fișier de inserat în spațiul fișierului curent. Va fi "
+"inserat acolo unde se află poziția cursorului.\n"
 "\n"
-"  Dac� a�i compilat nano cu suport pentru multiple bufere �i a�i activat "
-"acest� op�iune cu indicatorii de linie de comand� -F sau --multibufer, "
-"comutatorul Meta-F, sau un fi�ier nanorc, inser�nd un fi�ier va face ca "
-"acesta s� fie �nc�rcat �ntr-un alt bufer (folosi�i Meta-< �i > pentru a "
-"comuta �ntre bufere). "
+" Dacă ați compilat nano cu capacitatea de a gestiona simultan mai multe "
+"spații de fișiere și ați activat această opțiune cu opțiunea din linie de "
+"comandă -F sau --multibufer, comutatorul Meta-F, sau prin fișierul nanorc, "
+"inserarea unui fișier va face ca acesta să fie încărcat într-un spațiu "
+"separat (folosiți Meta-< și Meta-> pentru a comuta între spațiile de "
+"fișiere). "
 
-#: src/help.c:269
+#: src/help.c:238
 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"
@@ -1095,13 +1184,14 @@ msgid ""
 " The following function keys are available in Insert File mode:\n"
 "\n"
 msgstr ""
-"Dac� ave�i nevoie de un alt bufer gol, nu introduce�i nici un nume sau "
-"introduce�i un nume de fi�ier ce nu exist� �i ap�sa�i Enter.\n"
+"Dacă aveți nevoie de un alt spațiu gol, nu introduceți nici un nume sau "
+"introduceți un nume de fișier ce nu există și apăsați Enter.\n"
+"\n"
+" Următoarele taste de funcții sunt disponibile în modul inserare de "
+"fișiere:\n"
 "\n"
-" Urm�toarele taste de func�ii sunt disponibile �n modul \"Insereaz� fi�ier"
-"\":\n"
 
-#: src/help.c:275
+#: src/help.c:244
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1116,20 +1206,20 @@ msgid ""
 " The following function keys are available in Write File mode:\n"
 "\n"
 msgstr ""
-"Textul de ajutor pentru comanda \"Scrie fi�ier\"\n"
+" Text de ajutor pentru comanda de salvare a fișierului\n"
 "\n"
-" Tasta�i numele sub care dori�i s� salva�i fi�ierul curent �i ap�sa�i Enter "
-"pentru a salva fi�ierul.\n"
+" Tastați numele sub care doriți să salvați fișierul curent și apăsați Enter "
+"pentru a salva fișierul.\n"
 "\n"
-" Dac� a�i selectat text cu marcajul, ve�i fi interpolat s� salva�i numai "
-"por�iunea selectat� �ntr-un fi�ier separat.  Pentru a reduce �ansa de a "
-"suprascrie fi�ierul curent cu doar o por�iune a sa, numele fi�ierului curent "
-"nu este implicit �n acest mod.\n"
+" Dacă ați selectat text cu marcajul, vi se va propune să salvați doar "
+"porțiunea selectată într-un fișier separat. Pentru a micșora riscul de a "
+"suprascrie fișierul curent cu doar o porțiune a sa,în acest mod numele "
+"fișierului curent nu este propus implicit.\n"
 "\n"
-" Urm�toarele taste de func�ii sunt disponibile �n modul \"Scrie fi�ier\"\n"
+" Următoarele taste de funcții sunt disponibile în modul salvare de fișier:\n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:258
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1142,20 +1232,20 @@ msgid ""
 " The following function keys are available in the file browser:\n"
 "\n"
 msgstr ""
-"Textul de ajutor pentru \"Navigator fi�iere\"\n"
+" Textul de ajutor pentru navigatorul de fișiere\n"
 "\n"
-" Navigatorul de fi�iere este folosit pentru a naviga vizual structura de "
-"directoare �i a selecta un fi�ier pentru citire sau scriere.  Pute�i folosi "
-"tastele cu s�ge�i sau Page Up/Down pentru a naviga prin fi�iere, �i S sau "
-"Enter pentru a alege fi�ierul selectat sau a intra �ntr-un director "
-"selectat. Pentru a v� muta �n sus un nivel, selecta�i directorul numit \".."
-"\" din cap�tul de sus a listei de fi�iere.\n"
+" Navigatorul de fișiere este folosit pentru a parcurge vizual structura de "
+"directoare cu scopul de a selecta un fișier pentru citire sau scriere. "
+"Puteți folosi tastele cu săgeți sau Page Up/Down pentru a parcurge "
+"fișierele, tastele S sau Enter pentru a alege fișierul selectat sau a intra "
+"în directorul selectat. Pentru a urca în ierarhia directoarelor, selectați "
+"directorul numit „..” din partea de sus a listei de fișiere.\n"
 "\n"
-" Urm�toarele taste de func�ii sunt disponibile �n \"Navigator fi�iere\":\n"
+" Următoarele taste de funcții sunt disponibile în modul navigator de "
+"fișiere:\n"
 "\n"
 
-#: src/help.c:302
-#, fuzzy
+#: src/help.c:271
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1168,23 +1258,28 @@ msgid ""
 "search.\n"
 "\n"
 msgstr ""
-"Text de ajutor pentru comanda \"Caut�\"\n"
+" Text de ajutor pentru comanda de căutare a navigatorului\n"
 "\n"
-" Introduce�i cuvintele sau caracterele pe care a�i dori s� le c�uta�i, apoi "
-"ap�sa�i Enter.  Dac� exist� vreo potrivire pentru textul c�utat, ecranul va "
-"fi actualizat la loca�ia cea mai apropiat� de locul unde aceast� potrivire a "
-"avut loc.\n"
+" Introduceți cuvintele sau caracterele pe care ați dori să le căutați, apoi "
+"apăsați Enter. Dacă există vreo potrivire pentru textul introdus, ecranul va "
+"fi actualizat la locația celei mai apropiate potriviri pentru textul "
+"căutat.\n"
+"\n"
+" Textul căutat anterior va fi afișat între paranteze după prompt-ul de "
+"căutare. Apăsând Enter fără a introduce vreun text va executa căutarea cu "
+"textul căutat anterior.\n"
 "\n"
-" �irul c�utat anterior va fi ar�tat �n paranteze dup� prompt-ul de c�utare. "
-"Ap�s�nd Enter f�r� a introduce vreun text va executa c�utarea anterioar�.  "
 
-#: src/help.c:311
+#: src/help.c:280
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
 msgstr ""
+" Următoarele taste de funcții sunt disponibile în modul de căutare "
+"navigator:\n"
+"\n"
 
-#: src/help.c:315
+#: src/help.c:284
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1196,19 +1291,18 @@ msgid ""
 " The following function keys are available in Browser Go To Directory mode:\n"
 "\n"
 msgstr ""
-"Text de ajutor pentru comanda \"Navigator Du-te la Directorul\"\n"
+" Text de ajutor pentru comanda de schimbare a directorului\n"
 "\n"
-" Introduce�i numele directorului pe care a�i dori s�-l naviga�i.\n"
+" Introduceți numele directorului pe care ați dori să-l parcurgeți.\n"
 "\n"
-" Dac� completarea cu tab nu a fost deactivat�, pute�i folosi tasta TAB "
-"pentru a �ncerca s� completa�i automat numele directorului.\n"
+" Dacă completarea cu tab nu a fost dezactivată, puteți folosi tasta Tab "
+"pentru a încerca completarea automată a numelui directorului.\n"
 "\n"
-" Urm�toarele taste de func�ii sunt disponibile �n modul \"Navigator Du-te la "
-"Directorul\":\n"
+" Următoarele taste de funcții sunt disponibile în modul de schimbare a "
+"directorului:\n"
 "\n"
 
-#: src/help.c:328
-#, fuzzy
+#: src/help.c:297
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1221,20 +1315,19 @@ msgid ""
 " The following function keys are available in Spell Check mode:\n"
 "\n"
 msgstr ""
-"Text de ajutor pentru \"Corector ortografic\"\n"
+" Text de ajutor pentru corectorul ortografic\n"
 "\n"
-" Corectorul ortografic verific� ortografierea �ntregului text din fi�ierul "
-"curent.  C�nd este �nt�lnit un cuv�nt necunoscut, acesta este eviden�iat �i "
-"poate fi introdus/editat un �nlocuitor.  Corectorul v� va �ntreba dac� "
-"dori�i s� �nlocui�i toate apari�iile cu aceea�i gre�eal� �n fi�ierul curent, "
-"sau, dac� a�i selectat text cu marcajul, �n textul selectat.\n"
+" Corectorul ortografic verifică toate textele fișierului curent. Când este "
+"întâlnit un cuvânt necunoscut, acesta va fi subliniat și va putea fi "
+"corectat. Apoi vi se va propune să înlocuiți fiecare apariție a acestui "
+"cuvânt greșit în fișierul curent, sau, dacă ați selectat text prin marcarea "
+"acestuia, în textul selectat.\n"
 "\n"
-" Urm�toarele alte func�ii sunt disponibile �n modul \"Corector ortografic"
-"\":\n"
+" Următoarele taste de funcții sunt disponibile în modul de corector "
+"ortografic:\n"
 "\n"
 
-#: src/help.c:343
-#, fuzzy
+#: src/help.c:312
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1245,17 +1338,17 @@ msgid ""
 " The following function keys are available in Execute Command mode:\n"
 "\n"
 msgstr ""
-"Text de ajutor \"Comand� extern�\"\n"
+" Text de ajutor pentru execuție comenzi externe\n"
 "\n"
-" Acest meniu v� permite s� insera�i ie�irea unei comenzi executate de shell "
-"�n buferul curent (sau �ntr-un nou bufer �n modul multibufer). Dac� dori�i "
-"un alt bufer gol, nu introduce�i nici o comand�.\n"
+" Acest meniu vă permite să inserați textul produs de execuția unei comenzi "
+"rulată de shell în spațiul curent (sau un spațiu nou în modul multi-spațiu). "
+"Dacă aveți nevoie de un spațiu gol, nu introduceți nici o comandă.\n"
 "\n"
-" Urm�toarele taste sunt disponibile �n acest mod:\n"
+" Următoarele taste de funcții sunt disponibile în modul de execuție comenzi "
+"externe:\n"
 "\n"
 
-#: src/help.c:356
-#, fuzzy
+#: src/help.c:325
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1266,21 +1359,17 @@ msgid ""
 "showing the file being edited.  The status line is the third line from the "
 "bottom and shows important messages.  "
 msgstr ""
-" text ajutor pentru nano\n"
-"\n"
-" Editotul nano este proiectat sa emuleze fun�ionalitatea �i u�urin�a de "
-"folosire a editorului de texte UW Pico.  Exist� patru sec�iuni principale "
-"ale editorului: Linia de sus arat� versiunea programului, numele fi�ierului "
-"curent ce este editat �i dac� fi�ierul a fost sau nu modificat.  Urm�toarea "
-"sec�iune principal� este fereastra de editare ce arat� fi�ierul ce este "
-"editat.  Linia de stare este a treia linie de jos �i arat� mesaje "
-"importante.  Ultimele dou� linii arat� cele mai frecvente scurt�turi "
-"folosite �n editor.\n"
+" Text principal de ajutor pentru nano\n"
 "\n"
-" "
+" Editorul nano este conceput sa reproducă funcționalitatea și ușurința de "
+"utilizare ale editorului Pico de la Universitatea Washington. Există patru "
+"secțiuni principale ale editorului. Linia de sus arată versiunea "
+"programului, numele fișierului în curs de editare și dacă fișierul a fost "
+"modificat sau nu. Mai jos urmează fereastra de editare principală care arată "
+"fișierul în curs de modificare. Linia de stare este a treia linie de jos, "
+"aceasta afișează mesajele importante. "
 
-#: src/help.c:366
-#, fuzzy
+#: src/help.c:335
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1290,13 +1379,16 @@ msgid ""
 "notated with the Meta (M-) symbol and can be entered using either the Esc, "
 "Alt, or Meta key depending on your keyboard setup.  "
 msgstr ""
-"Nota�ia pentru scurt�turi este dup� cum urmeaz�: secven�e Control-tast� sunt "
-"notate cu un simbol (^) �i sunt introduse cu tasta Control (Ctrl) sau "
-"ap�s�nd tasta Esc de dou� ori.  Secven�ele Escape-tast� sunt notate cu "
-"simbolul Meta (M) �i pot fi introduse folosind oricare din tastele Esc, Alt "
-"sau Meta, �n func�ie de setarea tastaturii d-voastr�.  "
+"Ultimele două linii arată cele mai frecvente scurtături folosite în "
+"editor. \n"
+"\n"
+" Notația pentru scurtături este după cum urmează: Secvențele control-tastă "
+"sunt notate cu un simbol caret (^) și pot fi introduse fie folosind tasta "
+"Control (Ctrl) sau apăsând tasta Escape (Esc) de două ori. Secvențele Escape-"
+"tastă sunt notate cu simbolul Meta (M) și pot fi introduse folosind oricare "
+"din tastele Esc, Alt sau Meta, în funcție de configurația tastaturii. "
 
-#: src/help.c:375
+#: src/help.c:344
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1304,493 +1396,494 @@ msgid ""
 "keys are shown in parentheses:\n"
 "\n"
 msgstr ""
-"De asemenea, ap�s�nd tasta Esc de dou� ori apoi tast�nd un num�r din trei "
-"cifre de la 000 la 255 va introduce caracterul cu codul ASCII "
-"corespunz�tor.  Urm�toarele combina�ii de taste sunt disponibile �n "
-"fereastra de editare principal�.  Tastele alternative sunt ar�tate �n "
-"paranteze:\n"
+"De asemenea, apăsând tasta Esc de două ori apoi tastând un număr din trei "
+"cifre de la 000 la 255 se va introduce caracterul cu codul ASCII "
+"corespunzător. Următoarele combinații de taste sunt disponibile în fereastra "
+"de editare principală. Tastele alternative sunt afișate între paranteze:\n"
 "\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:376 src/help.c:448
 msgid "enable/disable"
-msgstr "activeaz�/deactiveaz�"
+msgstr "[activare | dezactivare]"
 
-#: src/nano.c:587
-#, fuzzy
+#: src/nano.c:601
 msgid "Key invalid in view mode"
-msgstr "Tast� ilegal� �n modul VIZUALIZARE"
+msgstr "Tastă nevalidă în modul vizualizare"
 
-#: src/nano.c:695
+#: src/nano.c:713
 #, c-format
 msgid ""
 "\n"
 "Buffer written to %s\n"
 msgstr ""
 "\n"
-"Bufer scris �n %s\n"
+"Spațiu scris în %s\n"
 
-#: src/nano.c:697
-#, fuzzy, c-format
+#: src/nano.c:715
+#, c-format
 msgid ""
 "\n"
 "Buffer not written to %s: %s\n"
 msgstr ""
 "\n"
-"Bufer scris �n %s\n"
+"Spațiu nu s-a scris în %s: %s\n"
 
-#: src/nano.c:700
-#, fuzzy, c-format
+#: src/nano.c:718
+#, c-format
 msgid ""
 "\n"
 "Buffer not written: %s\n"
 msgstr ""
 "\n"
-"Bufer scris �n %s\n"
+"Spațiul nu s-a scris: %s\n"
 
-#: src/nano.c:723
+#: src/nano.c:743
 msgid "Window size is too small for nano...\n"
-msgstr "Dimensiunea ferestrei prea mic� pentru nano...\n"
+msgstr "Dimensiunea ferestrei este prea mică pentru nano...\n"
 
-#: src/nano.c:816
+#: src/nano.c:836
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
 "\n"
 msgstr ""
+"Folosire: nano [OPȚIUNI] [[+LINIE,COLOANĂ] FIȘIER]...\n"
+"\n"
 
-#: src/nano.c:819
-#, fuzzy, c-format
+#: src/nano.c:839
+#, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
-msgstr "Op�iune\t\tOp�iune lung�\t\t�n�eles\n"
+msgstr "Opțiune\t\tOpțiune lungă GNU\t\tSemnificație\n"
 
-#: src/nano.c:821
+#: src/nano.c:841
 #, c-format
 msgid "Option\t\tMeaning\n"
-msgstr "Op�iune\t\t�n�eles\n"
-
-#: src/nano.c:824
-msgid "Show this message"
-msgstr "Arat� acest mesaj"
+msgstr "Opțiune\t\tSemnificație\n"
 
-#: src/nano.c:825
+#: src/nano.c:844
 msgid "+LINE,COLUMN"
-msgstr ""
+msgstr "+LINIE,COLOANĂ"
 
-#: src/nano.c:826
-#, fuzzy
+#. TRANSLATORS: The next forty or so strings are option descriptions
+#. * for the --help output.  Try to keep them at most 40 characters.
+#: src/nano.c:847
 msgid "Start at line LINE, column COLUMN"
-msgstr "�ncepe la linia cu num�rul LINIE"
+msgstr "Începe la linia LINIE, coloana COLOANĂ"
 
-#: src/nano.c:828
+#: src/nano.c:849
 msgid "Enable smart home key"
-msgstr "Permite tasta acas� inteligent�"
+msgstr "Activează tasta acasă inteligentă"
 
-#: src/nano.c:829
-#, fuzzy
+#: src/nano.c:850
 msgid "Save backups of existing files"
-msgstr "Creaz� copii de siguran�� (backup) la salvare"
+msgstr "Salvează copii de rezervă ale fișierelor existente"
 
-#: src/nano.c:830
-#, fuzzy
+#: src/nano.c:851
 msgid "-C <dir>"
-msgstr "-E [dir]"
+msgstr "-C <dir>"
 
-#: src/nano.c:830
-#, fuzzy
+#: src/nano.c:851
 msgid "--backupdir=<dir>"
-msgstr "--backupdir=[dir]"
+msgstr "--backupdir=<dir>"
 
-#: src/nano.c:831
-#, fuzzy
+#: src/nano.c:852
 msgid "Directory for saving unique backup files"
-msgstr "Director pentru scrierea fi�ierelor copie-de-siguran�� (backup)"
+msgstr "Director pentru salvarea fișierelor unice copiid de rezervă"
 
-#: src/nano.c:834
+#: src/nano.c:855
 msgid "Use bold instead of reverse video text"
-msgstr ""
+msgstr "Folosește bold în loc de textul video inversat"
 
-#: src/nano.c:837
+#: src/nano.c:858
 msgid "Convert typed tabs to spaces"
-msgstr ""
+msgstr "Convertește tab-urile introduse în spații"
 
-#: src/nano.c:840
+#: src/nano.c:861
 msgid "Enable multiple file buffers"
-msgstr "Activeaz� bufere fi�ier multiple"
+msgstr "Activează spații fișier multiple"
+
+#: src/nano.c:865
+msgid "Use (vim-style) lock files"
+msgstr "Folosește fișiere de blocare în stilul vim"
 
-#: src/nano.c:845
+#: src/nano.c:869
 msgid "Log & read search/replace string history"
-msgstr "Scrie �n jurnal �i cite�te istoria �irurilor de c�utare/�nlocuire"
+msgstr "Scrie în jurnal și citește istoria șirurilor de căutare/înlocuire"
 
-#: src/nano.c:848
+#: src/nano.c:873
 msgid "Don't look at nanorc files"
-msgstr "Nu te uita la fi�ierele nanorc"
+msgstr "Nu te uita la fișierele nanorc"
 
-#: src/nano.c:851
-#, fuzzy
+#: src/nano.c:876
 msgid "Fix numeric keypad key confusion problem"
-msgstr "Repar� confuzia cu tastele Backspace/Delete"
+msgstr "Rezolvă problema de confuzie a tastelor numerice"
 
-#: src/nano.c:853
+#: src/nano.c:878
 msgid "Don't add newlines to the ends of files"
-msgstr ""
+msgstr "Nu se adaugă linii noi la sfârșitul fișierelor"
 
-#: src/nano.c:856
+#: src/nano.c:881
 msgid "Don't convert files from DOS/Mac format"
-msgstr "Nu converti fi�ierele din formatul DOS/Mac"
+msgstr "Nu converti fișierele din formatul DOS/Mac"
 
-#: src/nano.c:858
-#, fuzzy
+#: src/nano.c:883
 msgid "Use one more line for editing"
-msgstr "Folose�te mai mult spa�iu pentru editare"
+msgstr "Se folosește încă o linie pentru editare"
+
+#: src/nano.c:886
+msgid "Log & read location of cursor position"
+msgstr "Scrie în jurnal & citește locația poziției cursorului"
 
-#: src/nano.c:860
-#, fuzzy
+#: src/nano.c:889
 msgid "-Q <str>"
-msgstr "-Q [sir]"
+msgstr "-Q <str>"
 
-#: src/nano.c:860
-#, fuzzy
+#: src/nano.c:889
 msgid "--quotestr=<str>"
-msgstr "--quotestr=[�ir]"
+msgstr "--quotestr=<str>"
 
-#: src/nano.c:861
-#, fuzzy
+#: src/nano.c:890
 msgid "Quoting string"
-msgstr "�ir citate. implicit \"> \""
+msgstr "Text de citare"
 
-#: src/nano.c:863
+#: src/nano.c:892
 msgid "Restricted mode"
-msgstr "Mod restric�ionat"
+msgstr "Mod restricționat"
 
-#: src/nano.c:866
+#: src/nano.c:895
 msgid "Scroll by line instead of half-screen"
-msgstr ""
+msgstr "Derulare prin linie în locul jumătății de ecran"
 
-#: src/nano.c:868
-#, fuzzy
+#: src/nano.c:897
 msgid "-T <#cols>"
-msgstr "-T [#coloane]"
+msgstr "-T <#coloană>"
 
-#: src/nano.c:868
-#, fuzzy
+#: src/nano.c:897
 msgid "--tabsize=<#cols>"
-msgstr "--tabsize=[#coloane]"
+msgstr "--tabsize=<#număr>"
 
-#: src/nano.c:869
-#, fuzzy
+#: src/nano.c:898
 msgid "Set width of a tab to #cols columns"
-msgstr "Seteaz� l��imea unui tab �n coloane ca #coloane"
+msgstr "Setează lungimea unui tab la #număr coloane"
 
-#: src/nano.c:871
+#: src/nano.c:900
 msgid "Do quick statusbar blanking"
-msgstr ""
+msgstr "Realizează o clipire rapidă a barei de stare"
 
-#: src/nano.c:874
+#: src/nano.c:903
 msgid "Print version information and exit"
-msgstr "Afi�eaz� informa�ii despre versiune �i termin�"
+msgstr "Afișează informații despre versiune și termină"
 
-#: src/nano.c:877
+#: src/nano.c:906
 msgid "Detect word boundaries more accurately"
-msgstr ""
+msgstr "Detectează limitele cuvântului mai exact"
 
-#: src/nano.c:880
-#, fuzzy
+#: src/nano.c:909
 msgid "-Y <str>"
-msgstr "-Y [�ir]"
+msgstr "-Y <str>"
 
-#: src/nano.c:880
-#, fuzzy
+#: src/nano.c:909
 msgid "--syntax=<str>"
-msgstr "--syntax=[�ir]"
+msgstr "--syntax=<str>"
 
-#: src/nano.c:881
-#, fuzzy
+#: src/nano.c:910
 msgid "Syntax definition to use for coloring"
-msgstr "Defini�ie sintax� de folosit"
+msgstr "Definiția sintaxei de folosit pentru colorare"
 
-#: src/nano.c:883
+#: src/nano.c:912
 msgid "Constantly show cursor position"
-msgstr "Arat� continuu pozi�ia cursorului"
+msgstr "Arată continuu poziția cursorului"
 
-#: src/nano.c:885
+#: src/nano.c:914
 msgid "Fix Backspace/Delete confusion problem"
-msgstr "Repar� confuzia cu tastele Backspace/Delete"
+msgstr "Repară confuzia cu tastele Backspace/Delete"
 
-#: src/nano.c:888
+#: src/nano.c:915
+msgid "Show this help text"
+msgstr "Arată acest text de ajutor"
+
+#: src/nano.c:918
 msgid "Automatically indent new lines"
-msgstr "Indent-eaz� automatic liniile noi"
+msgstr "Indent-ează automatic liniile noi"
 
-#: src/nano.c:889
+#: src/nano.c:919
 msgid "Cut from cursor to end of line"
-msgstr "Taie de la cursor la sf�r�itul liniei"
+msgstr "Decupează de la cursor până la sfârșitul liniei"
 
-#: src/nano.c:892
+#: src/nano.c:922
 msgid "Don't follow symbolic links, overwrite"
 msgstr "Nu urma link-urile simbolice, scrie peste"
 
-#: src/nano.c:894
-#, fuzzy
+#: src/nano.c:924
 msgid "Enable the use of the mouse"
-msgstr "Permite maus"
+msgstr "Activează folosirea mouse-ului"
 
-#: src/nano.c:897
-#, fuzzy
+#: src/nano.c:926
+msgid "Do not read the file (only write it)"
+msgstr "Nu citi fișierul (doar scrie-l)"
+
+#: src/nano.c:928
 msgid "-o <dir>"
-msgstr "-o [dir]"
+msgstr "-o <dir>"
 
-#: src/nano.c:897
-#, fuzzy
+#: src/nano.c:928
 msgid "--operatingdir=<dir>"
-msgstr "--operatingdir=[dir]"
+msgstr "--operatingdir=<dir>"
 
-#: src/nano.c:898
+#: src/nano.c:929
 msgid "Set operating directory"
-msgstr "Seteaz� directorul de operare"
+msgstr "Setează directorul de operare"
 
-#: src/nano.c:901
+#: src/nano.c:932
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
-msgstr "Conserv� tastele XON (^Q) �i XOFF (^S)"
+msgstr "Conservă tastele XON (^Q) și XOFF (^S)"
 
-#: src/nano.c:903
+#: src/nano.c:935
 msgid "Silently ignore startup issues like rc file errors"
-msgstr ""
+msgstr "Ignoră silențios problemele la pornire cum ar fi fișierul rc"
 
-#: src/nano.c:905
-#, fuzzy
+#: src/nano.c:938
 msgid "-r <#cols>"
-msgstr "-r [#coloane]"
+msgstr "-r <#coloană>"
 
-#: src/nano.c:905
-#, fuzzy
+#: src/nano.c:938
 msgid "--fill=<#cols>"
-msgstr "--fill=[#coloane]"
+msgstr "--fill=<#număr>"
 
-#: src/nano.c:906
-#, fuzzy
-msgid "Set wrapping point at column #cols"
-msgstr "Seteaz� l��imea unui tab �n coloane ca #coloane"
+#: src/nano.c:939
+msgid "Set hard-wrapping point at column #cols"
+msgstr "Setează punctul de rupere permanentă la coloana #număr"
 
-#: src/nano.c:909
-#, fuzzy
+#: src/nano.c:942
 msgid "-s <prog>"
-msgstr "-s [prog]"
+msgstr "-s <prog>"
 
-#: src/nano.c:909
-#, fuzzy
+#: src/nano.c:942
 msgid "--speller=<prog>"
-msgstr "--speller=[prog]"
+msgstr "--speller=<prog>"
 
-#: src/nano.c:910
+#: src/nano.c:943
 msgid "Enable alternate speller"
-msgstr "Permite corector ortografic alternativ"
+msgstr "Activează corectorul ortografic alternativ"
 
-#: src/nano.c:913
+#: src/nano.c:946
 msgid "Auto save on exit, don't prompt"
-msgstr "Salveaz� automat la ie�ire, nu �ntreba"
+msgstr "Salvează automat la ieșire, nu întreba"
 
-#: src/nano.c:915
-msgid "Allow generic undo [EXPERIMENTAL]"
-msgstr ""
-
-#: src/nano.c:918
-#, fuzzy
+#: src/nano.c:947
 msgid "View mode (read-only)"
-msgstr "Mod vedere (numai citire)"
+msgstr "Mod vizualizare (doar citire)"
 
-#: src/nano.c:920
-msgid "Don't wrap long lines"
-msgstr "Nu sparge (wrap) liniile lungi"
+#: src/nano.c:949
+msgid "Don't hard-wrap long lines"
+msgstr "Nu strânge permanent liniile lungi"
 
-#: src/nano.c:922
-#, fuzzy
+#: src/nano.c:951
 msgid "Don't show the two help lines"
-msgstr "Nu ar�ta fereastra de ajutor"
+msgstr "Nu arăta cele două linii de ajutor"
 
-#: src/nano.c:923
-#, fuzzy
+#: src/nano.c:952
 msgid "Enable suspension"
-msgstr "Permite suspendarea"
+msgstr "Activează suspendarea"
 
-#: src/nano.c:924
+#: src/nano.c:954
 msgid "Enable soft line wrapping"
-msgstr ""
-
-#: src/nano.c:928
-msgid "(ignored, for Pico compatibility)"
-msgstr "(ignorat, pentru compatibilitate cu Pico)"
+msgstr "Activează ruperea ușoară a liniei"
 
-#: src/nano.c:938
+#: src/nano.c:963
 #, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
-msgstr " GNU nano versiunea %s (compilat %s, %s)\n"
+msgid " GNU nano, version %s\n"
+msgstr " GNU nano, versiunea %s\n"
 
-#: src/nano.c:943
+#: src/nano.c:966
 #, 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:944
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
 " Compiled options:"
 msgstr ""
 "\n"
-" Op�iuni compilare:"
+" Opțiuni compilate:"
 
-#: src/nano.c:1022
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
-msgstr "Ne pare r�u, suportul pentru aceast� func�ie a fost deactivat"
+msgstr "Ne pare rău, suportul pentru această funcție a fost dezactivat"
+
+#: src/nano.c:1125
+msgid "No file name"
+msgstr "Nici un nume de fișier"
 
-#: src/nano.c:1044
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
-msgstr "Salvez buferul modificat (R�SPUNSUL \"Nu\" VA DISTRUGE SCHIMB�RILE) ?"
+msgstr ""
+"Se salvează spațiul modificat? (prin răspunsul „Nu” se vor PIERDE "
+"modificările!) "
 
-#: src/nano.c:1088
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
-msgstr ""
+msgstr "Nu s-a putut redeschide stdin din tastatură, ne pare rău\n"
 
-#: src/nano.c:1114
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
-msgstr ""
+msgstr "Se citește din stdin, ^C pentru a abandona\n"
 
-#: src/nano.c:1182
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
-msgstr "Am recep�ionat SIGHUP sau SIGTERM\n"
+msgstr "Am recepționat SIGHUP sau SIGTERM\n"
 
-#: src/nano.c:1204
-#, fuzzy, c-format
+#: src/nano.c:1301
+#, c-format
 msgid "Use \"fg\" to return to nano.\n"
-msgstr "Folosi�i \"fg\" pentru a v� �ntoarce la nano"
+msgstr "Folosiți „fg” pentru a reveni la nano.\n"
 
-#: src/nano.c:1386
+#: src/nano.c:1481
 msgid "enabled"
-msgstr "activat"
+msgstr "activată"
 
-#: src/nano.c:1387
+#: src/nano.c:1481
 msgid "disabled"
-msgstr "deactivat"
+msgstr "dezactivată"
 
-#: src/nano.c:1548 src/winio.c:1256
-#, fuzzy
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
-msgstr "Indicator (flag) necunoscut %s"
+msgstr "Comandă necunoscută"
 
-#: src/nano.c:1674
-#, fuzzy
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
-msgstr "XON ignorat, murmur, murmur."
+msgstr "XON ignorat, mormăit mormăit"
 
-#: src/nano.c:1679
-#, fuzzy
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
-msgstr "XOFF ignorat, murmur, murmur."
+msgstr "XON ignorat, mormăit mormăit"
 
-#: src/nano.c:2209 src/rcfile.c:1100
-#, fuzzy, c-format
+#: src/nano.c:2310 src/rcfile.c:1325
+#, c-format
 msgid "Requested tab size \"%s\" is invalid"
-msgstr "Dimensiune tab cerut� %s invalid�"
+msgstr "Mărimea tab solicitată „%s” este nevalidă"
 
-#: src/nano.c:2268 src/rcfile.c:1025
-#, fuzzy, c-format
+#: src/nano.c:2374 src/rcfile.c:1250
+#, c-format
 msgid "Requested fill size \"%s\" is invalid"
-msgstr "Dimensiune umplere cerut� %s invalid�"
+msgstr "Mărimea de umplere solicitată „%s” este nevalidă"
+
+#: src/nano.c:2415
+#, 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"
 
 #. 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:1259
+#: src/prompt.c:1055
 msgid "Yy"
 msgstr "Yy"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1056
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1057
 msgid "Aa"
 msgstr "Aa"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1071
 msgid "Yes"
 msgstr "Da"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1076
 msgid "All"
-msgstr "Tot"
+msgstr "Toate"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1081
 msgid "No"
 msgstr "Nu"
 
-#: src/rcfile.c:130
-#, fuzzy, c-format
+#: src/rcfile.c:137
+#, c-format
 msgid "Error in %s on line %lu: "
-msgstr "Eroare �n %s pe linia %d: "
+msgstr "Eroare în %s la linia %lu: "
 
-#: src/rcfile.c:185
-#, fuzzy, c-format
+#: src/rcfile.c:196
+#, c-format
 msgid "Argument '%s' has an unterminated \""
-msgstr "Argumentul %s are \" neterminat"
+msgstr "Argumentul „%s” are un \" neterminat"
 
-#
-#: src/rcfile.c:212 src/rcfile.c:264 src/rcfile.c:711 src/rcfile.c:768
-#: src/rcfile.c:821
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
-msgstr "�irurile regex trebuie s� �nceap� �i sf�r�easc� cu un caracter \""
+msgstr "Șirurile regex trebuie să înceapă și să se termine cu caracterul \""
 
-#: src/rcfile.c:238 src/search.c:62
+#: src/rcfile.c:249 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
-msgstr "Regex incorect \"%s\": %s"
+msgstr "Regex incorect „%s”: %s"
 
-#: src/rcfile.c:258
+#: src/rcfile.c:269
 msgid "Missing syntax name"
-msgstr "Lipse�te nume sintax�"
+msgstr "Lipsește nume sintaxă"
 
-#: src/rcfile.c:316
+#: src/rcfile.c:340
 msgid "The \"none\" syntax is reserved"
-msgstr ""
+msgstr "Sintaxa „none” este rezervată"
 
-#: src/rcfile.c:323
+#: src/rcfile.c:347
 msgid "The \"default\" syntax must take no extensions"
-msgstr ""
+msgstr "Sintaxa „default” nu trebuie să aibă extensii"
 
-#: src/rcfile.c:386 src/rcfile.c:483
-#, fuzzy
+#: src/rcfile.c:433
 msgid "Missing key name"
-msgstr "Lipse�te nume sintax�"
+msgstr "Lipsește numele tastei"
 
-#: src/rcfile.c:398 src/rcfile.c:499
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
-msgstr ""
+#: src/rcfile.c:442 src/rcfile.c:453
+msgid "Key name is too short"
+msgstr "Numele tastei este prea scurt"
 
-#: src/rcfile.c:407
-msgid "Must specify function to bind key to"
-msgstr ""
+#: src/rcfile.c:463
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
+msgstr "Numele tastei trebuie să înceapă cu „^”, „M” sau „F”"
 
-#: src/rcfile.c:418 src/rcfile.c:510
-msgid "Must specify menu to bind key to (or \"all\")"
+#: src/rcfile.c:472
+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:482
+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:426
+#: src/rcfile.c:489
 #, c-format
-msgid "Could not map name \"%s\" to a function"
-msgstr ""
+msgid "Cannot map name \"%s\" to a function"
+msgstr "Imposibil de mapat numele „%s“ la o funcție"
 
-#: src/rcfile.c:432 src/rcfile.c:517
-#, fuzzy, c-format
-msgid "Could not map name \"%s\" to a menu"
-msgstr "Nu am putut invoca \"%s\""
+#: src/rcfile.c:496
+#, c-format
+msgid "Cannot map name \"%s\" to a menu"
+msgstr "Imposibil de mapat numele „%s“ la un meniu"
 
-#: src/rcfile.c:454
+#: src/rcfile.c:528
 #, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
-msgstr ""
+msgid "Function '%s' does not exist in menu '%s'"
+msgstr "Funcția „%s“ nu există în meniul „%s“"
+
+#: src/rcfile.c:543
+#, c-format
+msgid "Sorry, keystroke \"%s\" may not be rebound"
+msgstr "Ne pare rău, tasta „%s“ nu poate fi reasociată"
 
-#: src/rcfile.c:625
-#, fuzzy, c-format
+#: src/rcfile.c:629
+#, c-format
+msgid "Error expanding %s: %s"
+msgstr "Eroare la extinderea %s: %s"
+
+#: src/rcfile.c:672
+#, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
 "Valid colors are \"green\", \"red\", \"blue\",\n"
@@ -1798,459 +1891,487 @@ msgid ""
 "\"black\", with the optional prefix \"bright\"\n"
 "for foreground colors."
 msgstr ""
-"Culoare %s incorect�.\n"
-"Culori valide sunt \"green\"(verde), \"red\"(ro�u), \"blue\"(albastru), \n"
-"\"white\"(alb), \"yellow\"(galben), \"cyan\", \"magenta\"(purpuriu) �i \n"
-"\"black\"(negru), cu prefixul op�ional \"bright\"(str�lucitor) \n"
-"pentru culorile de scriere."
-
-#: src/rcfile.c:647
-#, fuzzy
+"Culoarea „%s“ nu a fost înțeleasă.\n"
+"Culorile valide sunt „verde“, „roșu“, „albastru“,\n"
+"„alb“, „galben“, „bleu“, „magenta“ și\n"
+"„negru“, cu prefixul opțional „bright“\n"
+"pentru culorile de fundal."
+
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
-msgstr "Nu pot ad�uga o directiv� de culoare f�r� o linie de sintax�"
+msgstr "Imposibil de adăugat o comandă de culoare fără o comandă de sintaxă"
 
-#: src/rcfile.c:652
+#: src/rcfile.c:699
 msgid "Missing color name"
-msgstr "Lipse�te nume culoare"
+msgstr "Lipsește numele culorii"
 
-#: src/rcfile.c:672
-#, fuzzy, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr "Culoarea de fundal %s nu poate fi str�lucitoare"
-
-#: src/rcfile.c:690 src/rcfile.c:809
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
-msgstr ""
+msgstr "Lipsește șirul regex"
 
-#: src/rcfile.c:762
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
-msgstr "\"start=\" necesit� un \"end=\" corespunz�tor"
+msgstr "\"start=\" necesită un \"end=\" corespunzător"
 
-#: src/rcfile.c:804
-#, fuzzy
+#: src/rcfile.c:837
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr "Culoarea de fundal „%s“ nu poate fi bright"
+
+#: src/rcfile.c:865
 msgid "Cannot add a header regex without a syntax command"
-msgstr "Nu pot ad�uga o directiv� de culoare f�r� o linie de sintax�"
+msgstr "Imposibil de adăugat un antet de regex fără o comandă de sintaxă"
+
+#: src/rcfile.c:921
+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:874
+#: src/rcfile.c:926
+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:990
+msgid "Missing linter command"
+msgstr "Comanda de analiză statică lipsește"
+
+#: src/rcfile.c:1010
+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:1015
+msgid "Missing formatter command"
+msgstr "Lipsește comanda utilitarului de formatare"
+
+#: src/rcfile.c:1045
 #, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
+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:876
+#: src/rcfile.c:1047
+#, c-format
 msgid ""
-"Exiting.  Please use nano with the -I option if needed to adjust your nanorc "
-"settings\n"
+"If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
+"Dacă este nevoie, folosiți nano cu opțiunea -I pentru a ajusta setările "
+"voastre nanorc.\n"
+
+#: src/rcfile.c:1108
+#, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "Nu s-a putut găsi sintaxa „%s” pentru extindere"
 
-#: src/rcfile.c:926 src/rcfile.c:935 src/rcfile.c:945
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
-msgstr ""
+msgstr "Comanda „%s” nu este permisă într-un fișier inclus"
 
-#: src/rcfile.c:951 src/rcfile.c:1128
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
-msgstr ""
+msgstr "Sintaxa „%s” nu are comenzi de colorare"
 
-#: src/rcfile.c:966
-#, fuzzy, c-format
+#: src/rcfile.c:1171
+#, c-format
 msgid "Command \"%s\" not understood"
-msgstr "Comanda %s nu a fost �n�eleas�"
+msgstr "Comanda „%s” nu a fost înțeleasă"
 
-#: src/rcfile.c:972
-msgid "Missing flag"
-msgstr "Lipse�te indicator (flag)"
+#: src/rcfile.c:1186
+msgid "Missing option"
+msgstr "Lipsește opțiunea"
 
-#: src/rcfile.c:994
-#, fuzzy, c-format
+#: src/rcfile.c:1208
+#, c-format
 msgid "Option \"%s\" requires an argument"
-msgstr "Op�iunea %s necesit� un argument"
+msgstr "Opțiunea „%s” necesită un argument"
 
-#: src/rcfile.c:1012
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
-msgstr ""
+msgstr "Opțiunea nu este un șir valid multioctet"
 
-#: src/rcfile.c:1038 src/rcfile.c:1066 src/rcfile.c:1075
-#, fuzzy
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
-msgstr "Sunt necesare dou� caractere non-tab �i non-spa�iu"
+msgstr "Sunt necesare caractere care nu sunt goale"
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
-msgstr "Sunt necesare dou� caractere de o singur� coloan�"
+msgstr "Sunt necesare două caractere (mono coloană)"
 
-#: src/rcfile.c:1114
-#, fuzzy, c-format
-msgid "Cannot unset flag \"%s\""
-msgstr "Nu pot de-seta indicatorul (flag) %s"
+#: src/rcfile.c:1339
+#, c-format
+msgid "Cannot unset option \"%s\""
+msgstr "Imposibil de dezactivat opțiunea „%s”"
 
-#: src/rcfile.c:1123
-#, fuzzy, c-format
-msgid "Unknown flag \"%s\""
-msgstr "Indicator (flag) necunoscut %s"
+#: src/rcfile.c:1345
+#, c-format
+msgid "Unknown option \"%s\""
+msgstr "Opțiune „%s” necunoscută"
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
-msgstr "Nu pot g�si directorul meu home!  U�u!"
+msgstr "Nu pot găsi directorul meu home!  Uau!"
+
+#: src/rcfile.c:1442
+#, c-format
+msgid ""
+"\n"
+"Press Enter to continue starting nano.\n"
+msgstr ""
+"\n"
+"Apăsați Enter pentru a continua pornirea nano.\n"
 
 #: src/search.c:96
 #, c-format
 msgid "\"%.*s%s\" not found"
-msgstr "\"%.*s%s\" nu a fost g�sit"
+msgstr "„%.*s%s” nu a fost găsit"
 
-#
-#: src/search.c:205
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/search.c:184
+msgid " [Case Sensitive]"
+msgstr " [Sensibil la majuscule]"
+
+#: src/search.c:188
+msgid " [Regexp]"
+msgstr " [Regexp]"
+
+#: src/search.c:192
+msgid " [Backwards]"
+msgstr " [Înapoi]"
+
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:197
 msgid " (to replace) in selection"
-msgstr " (de �nlocuit) �n selec�ie"
+msgstr " (de înlocuire) în selecție"
 
-#: src/search.c:207
+#: src/search.c:199
 msgid " (to replace)"
-msgstr " (de �nlocuit)"
+msgstr " (de înlocuire)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:769
 msgid "Replace this instance?"
-msgstr "�nlocuie�te �n acest caz?"
+msgstr "Se înlocuiește această apariție?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:945
 msgid "Replace with"
-msgstr "�nlocuie�te cu"
+msgstr "Se înlocuiește cu"
 
-#: src/search.c:1004
-#, fuzzy, c-format
+#: src/search.c:986
+#, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
-msgstr[0] "Am �nlocuit �n %ld loc"
-msgstr[1] "Am �nlocuit �n %ld locuri"
+msgstr[0] "S-a înlocuit %lu apariție"
+msgstr[1] "S-au înlocuit %lu apariții"
+msgstr[2] "S-au înlocuit %lu de apariții"
 
-#: src/search.c:1034
-#, fuzzy
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1027
 msgid "Enter line number, column number"
-msgstr "Introduce�i num�rul liniei"
+msgstr "Introduceți numărul liniei, numărul coloanei"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
-msgstr ""
+msgstr "Număr de linie sau coloană nevalid"
 
-#: src/search.c:1214
+#: src/search.c:1207
 msgid "Not a bracket"
-msgstr "Nu este o parantez�"
+msgstr "Nu este o paranteză"
 
-#: src/search.c:1281
+#: src/search.c:1274
 msgid "No matching bracket"
-msgstr "Nici o parantez� pereche"
+msgstr "Nu am găsit o paranteză pereche"
 
 #: src/text.c:54
 msgid "Mark Set"
-msgstr "Marcaj Setare"
+msgstr "Marcaj aplicat"
 
 #: src/text.c:58
-#, fuzzy
 msgid "Mark Unset"
-msgstr "Marcaj DEsetare"
+msgstr "Marcaj ridicat"
 
-#: src/text.c:443
+#: src/text.c:439
 msgid "Nothing in undo buffer!"
-msgstr ""
+msgstr "Nici o operație de anulat!"
 
-#: src/text.c:455 src/text.c:593
+#: src/text.c:445 src/text.c:590
 #, c-format
-msgid "Internal error: can't match line %d.  Please save your work"
+msgid "Internal error: can't match line %d.  Please save your work."
 msgstr ""
+"Eroare internă: nu se poate găsi o potrivire pentru linia %d. Vă rugăm să "
+"salvați fișierul."
 
-#: src/text.c:466 src/text.c:603
+#: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
-msgstr ""
+msgstr "adăugare de text"
 
-#: src/text.c:475 src/text.c:613
-#, fuzzy
+#: src/text.c:467 src/text.c:612
 msgid "text delete"
-msgstr "Fi�ier urm�tor"
+msgstr "ștergere de text"
 
-#: src/text.c:489 src/text.c:628
-#, fuzzy
-msgid "line wrap"
-msgstr "Trecere automat� (wrap) la linie nou�"
-
-#: src/text.c:503 src/text.c:636
+#: src/text.c:491 src/text.c:641
 msgid "line join"
-msgstr ""
+msgstr "fuziune de linii"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:505 src/text.c:657
 msgid "text cut"
-msgstr ""
+msgstr "decupare de text"
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:510 src/text.c:661
 msgid "text uncut"
-msgstr ""
+msgstr "lipire de text"
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:515 src/text.c:623
 msgid "line break"
-msgstr ""
+msgstr "linie nouă"
 
-#: src/text.c:532 src/text.c:665
-#, fuzzy
+#: src/text.c:528 src/text.c:672
 msgid "text insert"
-msgstr "Linia urm�toare"
+msgstr "inserare de text"
 
-#: src/text.c:550 src/text.c:659
-#, fuzzy
+#: src/text.c:549 src/text.c:665
 msgid "text replace"
-msgstr " (de �nlocuit)"
+msgstr "înlocuire de text"
 
-#: src/text.c:557 src/text.c:671
-msgid "Internal error: unknown type.  Please save your work"
-msgstr ""
+#: src/text.c:556 src/text.c:679 src/text.c:983
+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:563
+#: src/text.c:561
 #, c-format
 msgid "Undid action (%s)"
-msgstr ""
+msgstr "Acțiune anulată (%s)"
 
-#: src/text.c:578
+#: src/text.c:580
 msgid "Nothing to re-do!"
-msgstr ""
+msgstr "Nimic de refăcut!"
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
+#: src/text.c:584
+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:676
+#: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
-msgstr ""
+msgstr "Acțiune refăcută (%s)"
 
-#: src/text.c:766
-msgid "Could not pipe"
-msgstr "Nu am putut pipe"
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
+msgid "Could not create pipe"
+msgstr "Nu am putut crea o țeavă"
 
-#: src/text.c:793 src/text.c:2636 src/text.c:2788
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
-msgstr "Nu am putut fork"
+msgstr "Nu am putut crea un proces nou"
 
-#: src/text.c:941
-msgid "Internal error: can't setup uncut.  Please save your work."
+#: src/text.c:969
+msgid "Internal error: cannot set up uncut.  Please save your work."
 msgstr ""
+"Eroare internă: nu se poate pregăti acțiunea de lipire. Vă rugăm să salvați "
+"fișierul."
 
-#: src/text.c:950
-msgid "Internal error: unknown type.  Please save your work."
-msgstr ""
-
-#: src/text.c:1870
+#: src/text.c:1806
 #, c-format
 msgid "Bad quote string %s: %s"
-msgstr "�ir gre�it pentru ghilimele %s: %s"
+msgstr "Șir greșit de citare %s: %s"
 
-#: src/text.c:2267
+#: src/text.c:2207
 msgid "Can now UnJustify!"
-msgstr "Nu pot De-Alinia!"
+msgstr "Acum este posibilă de-alinierea!"
 
-#: src/text.c:2462
+#: src/text.c:2404
 msgid "Edit a replacement"
-msgstr "Editeaz� o �nlocuire"
-
-#: src/text.c:2548
-msgid "Could not create pipe"
-msgstr "Nu am putut crea pipe"
+msgstr "Editează o înlocuire"
 
-#: src/text.c:2550
+#: src/text.c:2492
 msgid "Creating misspelled word list, please wait..."
-msgstr "Creez list� cuvinte ortografiate gre�it, v� rog a�tepta�i..."
+msgstr "Se creează lista cuvintelor ortografiate greșit, vă rog așteptați..."
 
-#: src/text.c:2642
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
-msgstr "Nu am putut ob�ine dimensiune bufer pentru pipe"
+msgstr "Nu am putut obține dimensiunea spațiului țeavă"
 
-#: src/text.c:2693
+#: src/text.c:2635
 msgid "Error invoking \"spell\""
-msgstr "Eroare invocare \"spell\""
+msgstr "Eroare la apelarea „spell”"
 
-#: src/text.c:2696
+#: src/text.c:2638
 msgid "Error invoking \"sort -f\""
-msgstr "Eroare invocare \"sort -f\""
+msgstr "Eroare la apelarea „sort -f”"
 
-#: src/text.c:2699
+#: src/text.c:2641
 msgid "Error invoking \"uniq\""
-msgstr "Eroare invocare \"uniq\""
+msgstr "Eroare la apelarea „uniq”"
 
-#: src/text.c:2756 src/text.c:2965
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
-msgstr "Am terminat verificarea ortografiei"
+msgstr "Verificarea ortografică s-a terminat"
 
-#: src/text.c:2815
-#, fuzzy, c-format
+#: src/text.c:2759 src/text.c:3340
+#, c-format
 msgid "Error invoking \"%s\""
-msgstr "Eroare invocare \"spell\""
+msgstr "Eroare la apelarea „%s”"
 
-#: src/text.c:2960
-#, fuzzy, c-format
+#: src/text.c:2885
+msgid "Invoking spell checker, please wait"
+msgstr "Se apelează corectorul ortografic, vă rugăm așteptați"
+
+#: src/text.c:2902
+#, c-format
 msgid "Spell checking failed: %s"
-msgstr "Verificarea ortografiei a e�uat: %s: %s"
+msgstr "Corectarea ortografică a eșuat: %s"
 
-#: src/text.c:2962
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
-msgstr "Verificarea ortografiei a e�uat: %s: %s"
+msgstr "Verificarea ortografiei a eșuat: %s: %s"
+
+#: src/text.c:2937
+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:2947
+msgid "Save modified buffer before linting?"
+msgstr "Se salvează spațiul modificat înainte de analiza statică?"
 
-#: src/text.c:3030
+#: src/text.c:2969
+msgid "Invoking linter, please wait"
+msgstr "Se lansează analiza statică, vă rugăm așteptați"
+
+#: src/text.c:3125
 #, c-format
-msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
+msgid "Got 0 parsable lines from command: %s"
+msgstr "Comanda „%s” nu a produs nicio linie analizabilă"
+
+#: src/text.c:3159
+#, 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:3031
-#, fuzzy
+#: src/text.c:3205
+msgid "At last message"
+msgstr "Ultimul mesaj"
+
+#: src/text.c:3210
+msgid "At first message"
+msgstr "Primul mesaj"
+
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr "Eroare: nu este definit niciun utilitar de formatare"
+
+#: src/text.c:3275
+msgid "Finished"
+msgstr "Finalizat"
+
+#: src/text.c:3280
+msgid "Invoking formatter, please wait"
+msgstr "Se apelează utilitarul de formatare, vă rugăm așteptați"
+
+#: src/text.c:3360
+msgid "Finished formatting"
+msgstr "Formatarea s-a finalizat"
+
+#: src/text.c:3438
+#, c-format
+msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
+msgstr "%sCuvinte: %lu  Linii: %ld  Caractere: %lu"
+
+#: src/text.c:3439
 msgid "In Selection:  "
-msgstr "Adaug� Selec�ie la fi�ier"
+msgstr "În selecție:  "
 
-#: src/utils.c:405 src/utils.c:417
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3453
+msgid "Verbatim Input"
+msgstr "Intrare Verbatim"
+
+#: src/utils.c:410 src/utils.c:422
 msgid "nano is out of memory!"
-msgstr "nano a epuizat memoria!"
+msgstr "nano nu mai are memorie!"
 
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
-#: src/winio.c:1557
+#: src/winio.c:1583
 msgid "Unicode Input"
-msgstr ""
+msgstr "Intrare Unicode"
 
-#
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2142 src/winio.c:2146
 msgid "Modified"
 msgstr "Modificat"
 
-#
-#: src/winio.c:2150
+#: src/winio.c:2143
 msgid "View"
 msgstr "Vedere"
 
-#: src/winio.c:2164
+#: src/winio.c:2157
 msgid "DIR:"
 msgstr "DIR:"
 
-#: src/winio.c:2171
+#: src/winio.c:2164
 msgid "File:"
-msgstr "Fi�ier:"
+msgstr "Fișier:"
 
-#: src/winio.c:3360
-#, fuzzy, c-format
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2261
+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/winio.c:3377
+#, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr ""
-"linia %ld/%ld (%d%%), coloana %lu/%lu (%d%%), caracterul %lu/%ld (%d%%)"
+"linia %ld/%ld (%d%%), coloana %lu/%lu (%d%%), caracterul %lu/%lu (%d%%)"
 
-#: src/winio.c:3492
+#: src/winio.c:3507
 msgid "The nano text editor"
 msgstr "Editorul de texte nano"
 
-#: src/winio.c:3493
+#: src/winio.c:3508
 msgid "version"
 msgstr "versiune"
 
-#: src/winio.c:3494
+#: src/winio.c:3509
 msgid "Brought to you by:"
-msgstr "Adus pentru d-voastr� de:"
+msgstr "Prezentat de:"
 
-#: src/winio.c:3495
+#: src/winio.c:3510
 msgid "Special thanks to:"
-msgstr "Mul�umiri speciale lui:"
+msgstr "Mulțumiri speciale pentru:"
 
-#: src/winio.c:3496
+#: src/winio.c:3511
 msgid "The Free Software Foundation"
-msgstr "The Free Software Foundation"
+msgstr "Fundația Free Software"
 
-#: src/winio.c:3497
+#: src/winio.c:3512
+msgid "the many translators and the TP"
+msgstr "traducătorilor cei mulți și pentru TP"
+
+#: src/winio.c:3513
 msgid "For ncurses:"
 msgstr "Pentru ncurses:"
 
-#: src/winio.c:3498
+#: src/winio.c:3514
 msgid "and anyone else we forgot..."
-msgstr "�i oricine altcineva a fost uitat..."
+msgstr "și oricine altcineva a fost uitat..."
 
-#: src/winio.c:3499
+#: src/winio.c:3515
 msgid "Thank you for using nano!"
-msgstr "V� mul�umim c� folosi�i nano!"
-
-#~ msgid "Direction"
-#~ msgstr "Direc�ie"
-
-#~ msgid "Invoke the help menu"
-#~ msgstr "Invoc� meniul de ajutor"
-
-#~ msgid "Search for text within the editor"
-#~ msgstr "Caut� un anumit text �n editor"
+msgstr "Vă mulțumim că folosiți nano!"
 
-#~ msgid "Replace text within the editor"
-#~ msgstr "�nlocuie�te textul din editor"
-
-#~ msgid "Find other bracket"
-#~ msgstr "G�se�te cealalt� parantez�"
-
-#~ msgid "Make the current search/replace case (in)sensitive"
-#~ msgstr ""
-#~ "Execut� c�utarea/�nlocuirea curent� indiferent�/senzitiv� la m�rimea "
-#~ "literelor"
-
-#~ msgid "Make the current search/replace go backwards"
-#~ msgstr "Execut� c�utarea/�nlocuirea curent� spre �napoi"
-
-#~ msgid "Prepend to the current file"
-#~ msgstr "Pre-adaug� la fi�ierul curent"
-
-#~ msgid "Back up original file when saving"
+#~ msgid "Internal error: can't match line %ld.  Please save your work."
 #~ msgstr ""
-#~ "Creaz� copie de siguran�� (backup) pentru fi�ierul original la salvare"
-
-#~ msgid "Insert into new buffer"
-#~ msgstr "Insereaz� �n bufer nou"
-
-#~ msgid ""
-#~ "\n"
-#~ "Buffer not written to %s (too many backup files?)\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Buferul nu a fost scris �n %s (prea multe fi�iere copii de siguran�� "
-#~ "<backup>?)\n"
-
-#~ msgid "Up"
-#~ msgstr "Sus"
-
-#~ msgid "Space"
-#~ msgstr "Spa�iu"
-
-#~ msgid ""
-#~ "Usage: nano [+LINE] [GNU long option] [option] [file]\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Folosire: nano [+LINIE] [op�iune GNU lung�] [op�iune] [fi�ier]\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "Usage: nano [+LINE] [option] [file]\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Folosire: nano [+LINIE] [op�iune] [fi�ier]\n"
-#~ "\n"
-
-#~ msgid "+LINE"
-#~ msgstr "+LINIE"
-
-#~ msgid "Use more space for editing"
-#~ msgstr "Folose�te mai mult spa�iu pentru editare"
-
-#~ msgid "Do regular expression searches"
-#~ msgstr "Execut� c�ut�ri cu expresii regulare"
-
-#~ msgid "Set fill cols to (wrap lines at) #cols"
-#~ msgstr "Seteaz� coloane de umplere (sparge/wrap linii la) #coloane"
-
-#~ msgid "Verbatim input"
-#~ msgstr "Intrare identic�"
-
-#~ msgid "Could not create temp file: %s"
-#~ msgstr "Nu am putut crea fi�ier temporar: %s"
-
-#~ msgid "Come on, be reasonable"
-#~ msgstr "Haide�i, fi�i rezonabil"
-
-#~ msgid "Refusing zero-length regex match"
-#~ msgstr "Refuz potrivire regex de lungime 0"
-
-#~ msgid "Can't open \"%s\": %s"
-#~ msgstr "Nu pot deschide \"%s\": %s"
+#~ "Eroare internă: nu se poate găsi o potrivire pentru linia %ld. Vă rugăm "
+#~ "să salvați fișierul."
diff --git a/po/ru.gmo b/po/ru.gmo
index de92535..318855b 100644
--- a/po/ru.gmo
+++ b/po/ru.gmo
diff --git a/po/ru.po b/po/ru.po
index 9ff51f7..57cae74 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -3,116 +3,144 @@
 # This file is distributed under the same license as the nano package.
 #
 # Sergey A. Ribalchenko <fisher@obu.ck.ua>, 2001.
-# Dimitriy Ryazantcev <DJm00n@mail.ru>, 2006-2007, 2008.
+# Dimitriy Ryazantcev <DJm00n@mail.ru>, 2006-2007, 2008, 2014.
 # Serge A. Ribalchenko <serge.fisher@gmail.com>, 2007, 2008.
 # Pavel Maryanov <acid@jack.kiev.ua>, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 2.2.5\n"
+"Project-Id-Version: nano 2.3.3pre2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-22 06:34-0500\n"
-"PO-Revision-Date: 2010-11-08 13:17+0200\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\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"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "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"
+"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.6.5\n"
 
-#: src/browser.c:220
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:203
 msgid "Go To Directory"
 msgstr "К каталогу"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:860 src/files.c:2048
-#: src/nano.c:1060 src/search.c:220 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Отменено"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:246 src/browser.c:293
 #, c-format
 msgid "Can't go outside of %s in restricted mode"
 msgstr "Не удаётся выйти за границы %s в ограниченном режиме"
 
-#: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:722
-#: src/files.c:731 src/files.c:1540 src/files.c:1659 src/files.c:1711
-#: src/files.c:1732 src/files.c:1855 src/files.c:2691 src/rcfile.c:568
-#: src/rcfile.c:1204
+#: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
+#: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
+#: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Ошибка чтения %s: %s"
 
-#: src/browser.c:303
+#: src/browser.c:283
 msgid "Can't move up a directory"
 msgstr "Не удаётся переместить каталог"
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:665 src/browser.c:674
+#: src/browser.c:626 src/browser.c:635
 msgid "(dir)"
 msgstr "(каталог)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:632
 msgid "(parent dir)"
 msgstr "(вверх)"
 
-#: src/browser.c:801 src/search.c:185
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "Поиск"
 
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:805 src/search.c:189
-msgid " [Case Sensitive]"
-msgstr " [С учётом регистра]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:811 src/search.c:195
-msgid " [Regexp]"
-msgstr " [РегВыр]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:817 src/search.c:201
-msgid " [Backwards]"
-msgstr " [Назад]"
-
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "Поиск завёрнут"
 
-#: src/browser.c:1006 src/browser.c:1039 src/search.c:514 src/search.c:517
-#: src/search.c:574 src/search.c:577
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "Это единственное совпадение"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr "Нечего искать"
 
-#: src/files.c:125
+#: src/files.c:139
+msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
+msgstr ""
+"Не удалось получить мой идентификатор пользователя для файла блокировки "
+"(ошибка getpwuid())"
+
+#: src/files.c:145
+#, c-format
+msgid "Couldn't determine hostname for lock file: %s"
+msgstr "Не удалось определить имя компьютера для файла блокировки: %s"
+
+#: src/files.c:165 src/files.c:175 src/files.c:212 src/files.c:222
+#, c-format
+msgid "Error writing lock file %s: %s"
+msgstr "Ошибка записи файла блокировки %s: %s"
+
+#: src/files.c:237
+#, c-format
+msgid "Error deleting lock file %s: %s"
+msgstr "Ошибка удаления файла блокировки %s: %s"
+
+#: src/files.c:272
+#, c-format
+msgid "Error opening lock file %s: %s"
+msgstr "Ошибка открытия файла блокировки %s: %s"
+
+#: src/files.c:282
+#, 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:297
+#, c-format
+msgid "File %s is being edited (by %s with %s, PID %d); continue?"
+msgstr ""
+
+#: src/files.c:308
+#, fuzzy, c-format
+msgid "Error writing lock file: Directory '%s' doesn't exist"
+msgstr "Ошибка записи файла блокировки %s: %s"
+
+#: src/files.c:339
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Не удаётся вставить файл снаружи %s"
 
-#: src/files.c:234
+#: src/files.c:467
 msgid "No more open file buffers"
 msgstr "Нет больше открытых файловых буферов"
 
-#: src/files.c:250
+#: src/files.c:484
 #, c-format
 msgid "Switched to %s"
 msgstr "Переключено в %s"
 
-#: src/files.c:251 src/global.c:469 src/winio.c:2168
+#: src/files.c:485 src/global.c:953 src/winio.c:2161
 msgid "New Buffer"
 msgstr "Новый буфер"
 
-#: src/files.c:633
+#: src/files.c:874
 #, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
@@ -120,7 +148,7 @@ msgstr[0] "Прочитана %lu строка (преобразовано из
 msgstr[1] "Прочитано %lu строки (преобразовано из формата Mac и DOS)"
 msgstr[2] "Прочитано %lu строк (преобразовано из формата Mac и DOS)"
 
-#: src/files.c:638
+#: src/files.c:879
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
@@ -138,7 +166,7 @@ msgstr[2] ""
 "Прочитано %lu строк (преобразовано из формата Mac и DOS; предупреждение: нет "
 "доступа на запись)"
 
-#: src/files.c:644
+#: src/files.c:885
 #, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
@@ -146,7 +174,7 @@ msgstr[0] "Прочитана %lu строка (преобразовано из
 msgstr[1] "Прочитано %lu строки (преобразовано из формата Mac)"
 msgstr[2] "Прочитано %lu строк (преобразовано из формата Mac)"
 
-#: src/files.c:648
+#: src/files.c:889
 #, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
@@ -162,7 +190,7 @@ msgstr[2] ""
 "Прочитано %lu строк (преобразовано из формата Mac; предупреждение: нет "
 "доступа на запись)"
 
-#: src/files.c:654
+#: src/files.c:895
 #, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
@@ -170,7 +198,7 @@ msgstr[0] "Прочитана %lu строка (преобразовано из
 msgstr[1] "Прочитано %lu строки (преобразовано из формата DOS)"
 msgstr[2] "Прочитано %lu строк (преобразовано из формата DOS)"
 
-#: src/files.c:658
+#: src/files.c:899
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
@@ -186,7 +214,7 @@ msgstr[2] ""
 "Прочитано %lu строк (преобразовано из формата DOS; предупреждение: нет "
 "доступа на запись)"
 
-#: src/files.c:664
+#: src/files.c:905
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
@@ -194,7 +222,7 @@ msgstr[0] "Прочитана %lu строка"
 msgstr[1] "Прочитано %lu строки"
 msgstr[2] "Прочитано %lu строк"
 
-#: src/files.c:667
+#: src/files.c:908
 #, c-format
 msgid "Read %lu line ( Warning: No write permission)"
 msgid_plural "Read %lu lines (Warning: No write permission)"
@@ -202,85 +230,93 @@ msgstr[0] "Прочитана %lu строка (предупреждение: н
 msgstr[1] "Прочитаны %lu строки (предупреждение: нет доступа на запись)"
 msgstr[2] "Прочитано %lu строк (предупреждение: нет доступа на запись)"
 
-#: src/files.c:700 src/files.c:736
+#: src/files.c:943 src/files.c:980
 msgid "Reading File"
 msgstr "Чтение файла"
 
-#: src/files.c:706
+#: src/files.c:950
 msgid "New File"
 msgstr "Новый файл"
 
-#: src/files.c:709
+#: src/files.c:953
 #, c-format
 msgid "\"%s\" not found"
 msgstr "Файл «%s» не найден"
 
-#: src/files.c:717 src/rcfile.c:559 src/rcfile.c:1154 src/rcfile.c:1195
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "Файл «%s» является каталогом"
 
-#: src/files.c:718 src/rcfile.c:560 src/rcfile.c:1155 src/rcfile.c:1196
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "Файл «%s» является файлом устройства"
 
-#: src/files.c:817
+#: src/files.c:1060
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Команда для выполнения в новом буфере [от %s] "
 
-#: src/files.c:819
+#: src/files.c:1062
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Команда для выполнения [от %s] "
 
-#: src/files.c:825
+#: src/files.c:1069
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Файл для вставки в новый буфер [от %s] "
 
-#: src/files.c:827
+#: src/files.c:1071
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Файл для вставки [от %s] "
 
-#: src/files.c:1077
+#: src/files.c:1320
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Недопустимая клавиша в немногобуферном режиме"
 
-#: src/files.c:1486
+#: src/files.c:1622
+msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+msgstr ""
+"Не удалось записать файл резервной копии, продолжить сохранение? (Ответьте Н "
+"- если не уверены)"
+
+#: src/files.c:1746
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Не удаётся записать за пределами %s"
 
-#: src/files.c:1501
+#: src/files.c:1761
 msgid "Cannot prepend or append to a symlink with --nofollow set"
 msgstr "Не удаётся дописать в начале или в конце с параметром --nofollow"
 
-#: src/files.c:1581 src/files.c:1603 src/files.c:1621 src/files.c:1632
-#: src/files.c:1640 src/files.c:1667
+#: src/files.c:1843 src/files.c:1868 src/files.c:1886 src/files.c:1899
+#: src/files.c:1910 src/files.c:1939
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Ошибка записи файла резервной копии %s: %s"
 
-#: src/files.c:1582 src/nano.c:701
+#: src/files.c:1844 src/nano.c:719
 msgid "Too many backup files?"
 msgstr "Слишком много резервных файлов?"
 
-#: src/files.c:1687 src/files.c:1744 src/files.c:1763 src/files.c:1775
-#: src/files.c:1799 src/files.c:1817 src/files.c:1827 src/files.c:1863
-#: src/files.c:1868 src/files.c:2764 src/files.c:2773
+#: src/files.c:1959 src/files.c:2016 src/files.c:2035 src/files.c:2047
+#: src/files.c:2071 src/files.c:2089 src/files.c:2099 src/files.c:2135
+#: src/files.c:2140 src/files.c:3101 src/files.c:3110 src/files.c:3133
+#: src/files.c:3145
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Ошибка записи %s: %s"
 
-#: src/files.c:1721 src/text.c:2929 src/text.c:2941
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Ошибка записи временного файла: %s"
 
-#: src/files.c:1900
+#: src/files.c:2173
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
@@ -288,375 +324,331 @@ msgstr[0] "Записана %lu строка"
 msgstr[1] "Записано %lu строки"
 msgstr[2] "Записано %lu строк"
 
-#: src/files.c:2004
+#: src/files.c:2278
 msgid " [DOS Format]"
 msgstr " [формат DOS]"
 
-#: src/files.c:2005
+#: src/files.c:2279
 msgid " [Mac Format]"
 msgstr " [формат Mac]"
 
-#: src/files.c:2007
+#: src/files.c:2281
 msgid " [Backup]"
 msgstr " [Копия]"
 
-#: src/files.c:2015
+#: src/files.c:2289
 msgid "Prepend Selection to File"
 msgstr "Добавить выделенное в начало файла"
 
-#: src/files.c:2016
+#: src/files.c:2290
 msgid "Append Selection to File"
 msgstr "Добавить выделенное в конец файла"
 
-#: src/files.c:2017
+#: src/files.c:2291
 msgid "Write Selection to File"
 msgstr "Записать выделенное в файл"
 
-#: src/files.c:2020
+#: src/files.c:2294
 msgid "File Name to Prepend to"
 msgstr "Имя файла для добавления (в конец)"
 
-#: src/files.c:2021
+#: src/files.c:2295
 msgid "File Name to Append to"
 msgstr "Имя файла для добавления (в начало)"
 
-#: src/files.c:2022
+#: src/files.c:2296
 msgid "File Name to Write"
 msgstr "Имя файла для записи"
 
-#: src/files.c:2153
+#: src/files.c:2427
 msgid "File exists, OVERWRITE ? "
 msgstr "Файл существует. ПЕРЕЗАПИСАТЬ? "
 
-#: src/files.c:2162
+#: src/files.c:2436
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "Записать файл под ДРУГИМ ИМЕНЕМ?"
 
-#: src/files.c:2173
+#: src/files.c:2450
 msgid "File was modified since you opened it, continue saving ? "
 msgstr "Файл был изменён после открытия. Продолжить сохранение?"
 
-#: src/files.c:2611
+#: src/files.c:2882
 msgid "(more)"
 msgstr "(ещё)"
 
-#: src/files.c:2694 src/rcfile.c:1220
+#: src/files.c:2974
 #, c-format
 msgid ""
 "\n"
-"Press Enter to continue starting nano.\n"
+"Press Enter to continue\n"
 msgstr ""
 "\n"
-"Нажмите ВВОД для продолжения запуска nano.\n"
+"Нажмите ВВОД для продолжения.\n"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:415 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Отмена"
-
-#: src/global.c:416
-msgid "Replace"
-msgstr "Замена"
+#: src/files.c:2989
+#, fuzzy, c-format
+msgid ""
+"Unable to create directory %s: %s\n"
+"It is required for saving/loading search history or cursor positions.\n"
+msgstr ""
+"Не удалось создать каталог %s: %s\n"
+"Он требуется для сохранения/загрузки истории поиска или позиции курсора\n"
 
-#: src/global.c:417
-msgid "No Replace"
-msgstr "Не заменять"
+#: src/files.c:2995
+#, fuzzy, 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 ""
+"Путь %s - не является каталогом, но должен им быть.\n"
+"Nano не сможет загрузить или сохранить историю поиска или позицию курсора\n"
 
-#: src/global.c:420
-msgid "Case Sens"
-msgstr "Уч.регистр"
+#: src/files.c:3012
+#, 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 ""
+"Обнаружен старый файл истории nano (%s), который я попытался переместить\n"
+"на новое место (%s), но произошла ошибка: %s"
 
-#: src/global.c:421
-msgid "Backwards"
-msgstr "Назад"
+#: src/files.c:3016
+#, 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 ""
+"Обнаружен старый файл истории nano (%s), который я переместил\n"
+"на новое место (%s)\n"
+"(смотрите в nano FAQ об этом изменении)"
 
-#: src/global.c:425
-msgid "Regexp"
-msgstr "Рег.выраж."
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
+#: src/global.c:477
+msgid "Exit"
+msgstr "Выход"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:451
-msgid "PrevHstory"
-msgstr "ПредИстор"
+#: src/global.c:478
+msgid "Close"
+msgstr "Закрыть"
 
-#: src/global.c:452
-msgid "NextHstory"
-msgstr "СледИстор"
+#: src/global.c:479
+msgid "Uncut Text"
+msgstr "Отмен. вырезку"
 
-#: src/global.c:453
-msgid "Go To Text"
-msgstr "К строке"
+#: src/global.c:481
+msgid "Unjustify"
+msgstr "Отмен. растяж."
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:455
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:485
 msgid "WhereIs Next"
 msgstr "Найти далее"
 
-#: src/global.c:457
-msgid "First File"
-msgstr "ПервыйФайл"
-
-#: src/global.c:458
-msgid "Last File"
-msgstr "ПоследнФайл"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:460
-msgid "To Files"
-msgstr "К файлам"
-
-#: src/global.c:462
-msgid "DOS Format"
-msgstr "Формат DOS"
-
-#: src/global.c:463
-msgid "Mac Format"
-msgstr "Формат Mac"
-
-#: src/global.c:464
-msgid "Append"
-msgstr "Доп. в начало"
-
-#: src/global.c:465
-msgid "Prepend"
-msgstr "Доп. в конец"
-
-#: src/global.c:466
-msgid "Backup File"
-msgstr "Резерв. копия"
-
-#: src/global.c:467
-msgid "Execute Command"
-msgstr "Выполнить команду"
-
-#: src/global.c:471
-msgid "Go To Dir"
-msgstr "Перейти к"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:480
-msgid "Get Help"
-msgstr "Помощь"
-
-#: src/global.c:481
-msgid "Exit"
-msgstr "Выход"
-
-#: src/global.c:482
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:492
 msgid "Where Is"
 msgstr "Поиск"
 
-#: src/global.c:483
-msgid "Prev Page"
-msgstr "ПредCтр"
-
-#: src/global.c:484
-msgid "Next Page"
-msgstr "СледCтр"
-
-#: src/global.c:485
-msgid "First Line"
-msgstr "ПервСтрока"
+#: src/global.c:493
+msgid "Replace"
+msgstr "Замена"
 
-#: src/global.c:486
-msgid "Last Line"
-msgstr "ПослСтрока"
+#: src/global.c:494
+msgid "Go To Line"
+msgstr "К строке"
 
-#: src/global.c:487
-msgid "Suspend"
-msgstr "Приостановка"
+#: src/global.c:495
+msgid "Prev Line"
+msgstr "Пред. строка"
 
-#: src/global.c:489
-msgid "Beg of Par"
-msgstr "НачПар"
+#: src/global.c:496
+msgid "Next Line"
+msgstr "След. строка"
 
-#: src/global.c:490
-msgid "End of Par"
-msgstr "КонПар"
+#: src/global.c:497
+msgid "Read File"
+msgstr "ЧитФайл"
 
-#: src/global.c:491
+#: src/global.c:499
 msgid "FullJstify"
 msgstr "Выровнять"
 
-#: src/global.c:493
+#: src/global.c:501
 msgid "Refresh"
 msgstr "Обновить"
 
-#: src/global.c:495
-msgid "Insert File"
-msgstr "Вставить файл"
-
-#: src/global.c:497
-msgid "Go To Line"
-msgstr "К строке"
-
-#: src/global.c:500
+#. 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:507
 msgid "Justify the current paragraph"
 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:505
+#: src/global.c:509
 msgid "Cancel the current function"
 msgstr "Отменить текущую функцию"
 
-#: src/global.c:506
+#: src/global.c:510
 msgid "Display this help text"
 msgstr "Показать эту справку"
 
-#: src/global.c:509
+#: src/global.c:513
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Закрыть текущий буфер / Выйти из nano"
 
-#: src/global.c:511
+#: src/global.c:515
 msgid "Exit from nano"
 msgstr "Выход из nano"
 
-#: src/global.c:515
+#: src/global.c:519
 msgid "Write the current file to disk"
 msgstr "Записать текущий файл на диск"
 
-#: src/global.c:517
+#: src/global.c:521
 msgid "Insert another file into the current one"
 msgstr "Вставить другой файл в текущий"
 
-#: src/global.c:519
+#: src/global.c:523
 msgid "Search for a string or a regular expression"
 msgstr "Искать текст или регулярное выражение"
 
-#: src/global.c:520
-msgid "Go to previous screen"
-msgstr "Перейти на предыдущий экран"
+#: src/global.c:526
+msgid "Search for a string"
+msgstr "Искать текст"
 
-#: src/global.c:521
-msgid "Go to next screen"
-msgstr "Перейти на следующий экран"
+#: src/global.c:528
+msgid "Go one screenful up"
+msgstr "Перейти на экран вверх"
 
-#: src/global.c:523
+#: src/global.c:529
+msgid "Go one screenful down"
+msgstr "Перейти на экран вниз"
+
+#: src/global.c:531
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Вырезать текущую строку и сохранить её в буфере обмена"
 
-#: src/global.c:525
+#: src/global.c:533
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Вставить содержимое буфера обмена в текущую строку"
 
-#: src/global.c:527
+#: src/global.c:534
 msgid "Display the position of the cursor"
 msgstr "Показать положение курсора"
 
-#: src/global.c:529
+#: src/global.c:536
 msgid "Invoke the spell checker, if available"
 msgstr "Проверить орфографию, если доступно"
 
-#: src/global.c:531
+#: src/global.c:538
 msgid "Replace a string or a regular expression"
 msgstr "Заменить текст или регулярное выражение"
 
-#: src/global.c:532
+#: src/global.c:539
 msgid "Go to line and column number"
 msgstr "Перейти на указанный номер строки и столбца"
 
-#: src/global.c:534
-msgid "Mark text at the cursor position"
-msgstr "Отметить текст в текущей позиции курсора"
+#: src/global.c:541
+msgid "Mark text starting from the cursor position"
+msgstr "Отметить текст от текущей позиции курсора"
 
-#: src/global.c:535
-msgid "Repeat last search"
+#: src/global.c:542
+msgid "Repeat the last search"
 msgstr "Повторить последний поиск"
 
-#: src/global.c:537
+#: src/global.c:544
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "Копировать текущую строку и сохранить ее в буфере обмена"
 
-#: src/global.c:538
+#: src/global.c:545
 msgid "Indent the current line"
 msgstr "Увеличить отступ строки"
 
-#: src/global.c:539
+#: src/global.c:546
 msgid "Unindent the current line"
 msgstr "Уменьшить отступ строки"
 
-#: src/global.c:540
+#: src/global.c:547
 msgid "Undo the last operation"
 msgstr "Отменить последнее действие"
 
-#: src/global.c:541
+#: src/global.c:548
 msgid "Redo the last undone operation"
 msgstr "Повторить последнее отменённое действие"
 
-#: src/global.c:543
+#: src/global.c:550
 msgid "Go forward one character"
 msgstr "Вперёд на один символ"
 
-#: src/global.c:544
+#: src/global.c:551
 msgid "Go back one character"
 msgstr "Назад на один символ"
 
-#: src/global.c:546
+#: src/global.c:553
 msgid "Go forward one word"
 msgstr "Вперёд на одно слово"
 
-#: src/global.c:547
+#: src/global.c:554
 msgid "Go back one word"
 msgstr "Назад на одно слово"
 
-#: src/global.c:549
+#: src/global.c:556
 msgid "Go to previous line"
 msgstr "На предыдущую строку"
 
-#: src/global.c:550
+#: src/global.c:557
 msgid "Go to next line"
 msgstr "На следующую строку"
 
-#: src/global.c:551
+#: src/global.c:558
 msgid "Go to beginning of current line"
 msgstr "На начало текущей строки"
 
-#: src/global.c:552
+#: src/global.c:559
 msgid "Go to end of current line"
 msgstr "В конец текущей строки"
 
-#: src/global.c:555
+#: src/global.c:562
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "На начало текущего абзаца; потом следующего абзаца"
 
-#: src/global.c:557
+#: src/global.c:564
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr "В конец текущего абзаца; потом следующего абзаца"
 
-#: src/global.c:560
+#: src/global.c:566
 msgid "Go to the first line of the file"
 msgstr "На первую строку файла"
 
-#: src/global.c:562
+#: src/global.c:567
 msgid "Go to the last line of the file"
 msgstr "На последнюю строку файла"
 
-#: src/global.c:564
+#: src/global.c:569
 msgid "Go to the matching bracket"
 msgstr "На соответствующую скобку"
 
-#: src/global.c:566
+#: src/global.c:571
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "Прокрутить одну строку вверх, не перемещая курсор"
 
-#: src/global.c:568
+#: src/global.c:573
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "Прокрутить одну строку вниз, не перемещая курсор"
 
-#: src/global.c:572
+#: src/global.c:576
 msgid "Switch to the previous file buffer"
 msgstr "Перейти в предыдущий буфер"
 
-#: src/global.c:574
+#: src/global.c:577
 msgid "Switch to the next file buffer"
 msgstr "Перейти в следующий буфер"
 
-#: src/global.c:577
+#: src/global.c:579
 msgid "Insert the next keystroke verbatim"
 msgstr "Вставить следующую комбинацию клавиш как есть"
 
-#: src/global.c:579
+#: src/global.c:580
 msgid "Insert a tab at the cursor position"
 msgstr "Вставить табуляцию в позиции курсора"
 
@@ -664,330 +656,436 @@ msgstr "Вставить табуляцию в позиции курсора"
 msgid "Insert a newline at the cursor position"
 msgstr "Вставить строку в позиции курсора"
 
-#: src/global.c:583
+#: src/global.c:582
 msgid "Delete the character under the cursor"
 msgstr "Удалить символ под курсором"
 
-#: src/global.c:585
+#: src/global.c:584
 msgid "Delete the character to the left of the cursor"
 msgstr "Удалить символ слева от курсора"
 
-#: src/global.c:588
+#: src/global.c:587
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Вырезать от позиции курсора до конца файла"
 
-#: src/global.c:591
+#: src/global.c:590
 msgid "Justify the entire file"
 msgstr "Выровнять по ширине текущий абзац"
 
-#: src/global.c:595
+#: src/global.c:594
 msgid "Count the number of words, lines, and characters"
 msgstr "Подсчитать количество слов, строк и символов"
 
-#: src/global.c:598
+#: src/global.c:597
 msgid "Refresh (redraw) the current screen"
 msgstr "Обновить текущий экран"
 
-#: src/global.c:600
+#: src/global.c:599
 msgid "Suspend the editor (if suspend is enabled)"
 msgstr "Приостановить редактор (если включено)"
 
-#: src/global.c:603
+#: src/global.c:602
 msgid "Toggle the case sensitivity of the search"
 msgstr "Искать с учётом регистра"
 
-#: src/global.c:605
+#: src/global.c:604
 msgid "Reverse the direction of the search"
 msgstr "Изменить направление поиска"
 
-#: src/global.c:609
+#: src/global.c:608
 msgid "Toggle the use of regular expressions"
 msgstr "Использовать регулярные выражения"
 
-#: src/global.c:613
+#: src/global.c:612
 msgid "Recall the previous search/replace string"
 msgstr "Сбросить предыдущую строку поиска/замены"
 
-#: src/global.c:615
+#: src/global.c:614
 msgid "Recall the next search/replace string"
 msgstr "Сбросить следующую строку поиска/замены"
 
-#: src/global.c:618
+#: src/global.c:617
 msgid "Go to file browser"
 msgstr "Перейти в файловый браузер"
 
-#: src/global.c:621
+#: src/global.c:620
 msgid "Toggle the use of DOS format"
 msgstr "Использовать формат DOS"
 
-#: src/global.c:622
+#: src/global.c:621
 msgid "Toggle the use of Mac format"
 msgstr "Использовать формат Mac"
 
-#: src/global.c:624
+#: src/global.c:622
 msgid "Toggle appending"
 msgstr "Добавлять в конец"
 
-#: src/global.c:625
+#: src/global.c:623
 msgid "Toggle prepending"
 msgstr "Добавлять в начало"
 
-#: src/global.c:628
+#: src/global.c:624
 msgid "Toggle backing up of the original file"
 msgstr "Делать резервные копии оригинала"
 
-#: src/global.c:629
+#: src/global.c:625
 msgid "Execute external command"
 msgstr "Выполнить внешнюю команду"
 
-#: src/global.c:633
+#: src/global.c:628
 msgid "Toggle the use of a new buffer"
 msgstr "Использовать новый буфер"
 
-#: src/global.c:636
+#: src/global.c:631
 msgid "Exit from the file browser"
 msgstr "Выйти из файлового браузера"
 
-#: src/global.c:638
+#: src/global.c:632
 msgid "Go to the first file in the list"
 msgstr "Перейти к первому файлу в списке"
 
-#: src/global.c:640
+#: src/global.c:633
 msgid "Go to the last file in the list"
 msgstr "Перейти к последнему файлу в списке"
 
-#: src/global.c:641
-msgid "Go to the next file in the list"
-msgstr "Перейти к следующему файлу в списке"
-
-#: src/global.c:642
+#: src/global.c:634
 msgid "Go to the previous file in the list"
 msgstr "Перейти к предыдущему файлу в списке"
 
-#: src/global.c:643
+#: src/global.c:635
+msgid "Go to the next file in the list"
+msgstr "Перейти к следующему файлу в списке"
+
+#: src/global.c:636
 msgid "Go to directory"
 msgstr "Перейти к каталогу"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:670
-msgid "Close"
-msgstr "Закрыть"
+#: src/global.c:639
+msgid "Invoke the linter, if available"
+msgstr "Проверить синтаксис кода, если доступно"
+
+#: src/global.c:640
+msgid "Go to previous linter msg"
+msgstr "На предыдущее сообщение"
+
+#: src/global.c:641
+msgid "Go to next linter msg"
+msgstr "На следующее сообщение"
+
+#: src/global.c:642
+#, fuzzy
+msgid "Invoke formatter, if available"
+msgstr "Проверить синтаксис кода, если доступно"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:679
-msgid "WriteOut"
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:662
+msgid "Get Help"
+msgstr "Помощь"
+
+#: src/global.c:665 src/prompt.c:1084
+msgid "Cancel"
+msgstr "Отмена"
+
+#: src/global.c:678
+msgid "Write Out"
 msgstr "Записать"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:704
+msgid "Go To Dir"
+msgstr "Перейти к"
+
+#: src/global.c:719
+msgid "Cut Text"
+msgstr "Вырезать"
+
+#: src/global.c:728
 msgid "Justify"
 msgstr "Выровнять"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:696
-msgid "Read File"
-msgstr "ЧитФайл"
+#: src/global.c:733
+msgid "To Spell"
+msgstr "Словарь"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:713
-msgid "Cut Text"
-msgstr "Вырезать"
+#: src/global.c:738
+msgid "To Linter"
+msgstr "Пров. синтак."
+
+#: src/global.c:740
+#, fuzzy
+msgid "Formatter"
+msgstr "Формат DOS"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:718
-msgid "UnJustify"
-msgstr "ОтмВыравн"
+#: src/global.c:745
+msgid "Case Sens"
+msgstr "Уч.регистр"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:723
-msgid "UnCut Text"
-msgstr "ОтмВырезк"
+#: src/global.c:750
+msgid "Regexp"
+msgstr "Рег.выраж."
+
+#: src/global.c:755
+msgid "Backwards"
+msgstr "Назад"
+
+#: src/global.c:762
+msgid "No Replace"
+msgstr "Не заменять"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:728 src/global.c:755
+#: src/global.c:770
 msgid "Cur Pos"
 msgstr "ТекПозиц"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:737
-msgid "To Spell"
-msgstr "Словарь"
+#: src/global.c:780
+msgid "Prev Page"
+msgstr "ПредCтр"
+
+#: src/global.c:782
+msgid "Next Page"
+msgstr "СледCтр"
+
+#: src/global.c:785
+msgid "First Line"
+msgstr "ПервСтрока"
+
+#: src/global.c:787
+msgid "Last Line"
+msgstr "ПослСтрока"
+
+#: src/global.c:794
+msgid "To Bracket"
+msgstr "На скобку"
 
-#: src/global.c:771
+#: src/global.c:797
 msgid "Mark Text"
 msgstr "Отметить"
 
-#: src/global.c:777
+#: src/global.c:800
 msgid "Copy Text"
 msgstr "Копировать"
 
-#: src/global.c:780
+#: src/global.c:803
 msgid "Indent Text"
 msgstr "Отступ"
 
-#: src/global.c:783
+#: src/global.c:805
 msgid "Unindent Text"
 msgstr "ОтмОтступа"
 
-#: src/global.c:787
+#: src/global.c:808
 msgid "Undo"
 msgstr "Отмена"
 
-#: src/global.c:790
+#: src/global.c:810
 msgid "Redo"
 msgstr "Повтор"
 
-#: src/global.c:796 src/global.c:800
-msgid "Forward"
-msgstr "Вперёд"
-
-#: src/global.c:806 src/global.c:810
+#: src/global.c:814 src/global.c:820
 msgid "Back"
 msgstr "Назад"
 
-#: src/global.c:817
-msgid "Next Word"
-msgstr "След. слово"
+#: src/global.c:816 src/global.c:822
+msgid "Forward"
+msgstr "Вперёд"
 
-#: src/global.c:820
+#: src/global.c:827
 msgid "Prev Word"
 msgstr "Пред. слово"
 
-#: src/global.c:824
-msgid "Prev Line"
-msgstr "Пред. строка"
-
-#: src/global.c:827
-msgid "Next Line"
-msgstr "След. строка"
+#: src/global.c:829
+msgid "Next Word"
+msgstr "След. слово"
 
-#: src/global.c:830
+#: src/global.c:833
 msgid "Home"
 msgstr "Начало"
 
-#: src/global.c:833
+#: src/global.c:835
 msgid "End"
 msgstr "Конец"
 
-#: src/global.c:845
-msgid "Find Other Bracket"
-msgstr "Найти другую скобку"
+#: src/global.c:844
+msgid "Beg of Par"
+msgstr "НачПар"
+
+#: src/global.c:846
+msgid "End of Par"
+msgstr "КонПар"
 
-#: src/global.c:848
+#: src/global.c:851
 msgid "Scroll Up"
 msgstr "Прокрутить вверх"
 
-#: src/global.c:851
+#: src/global.c:853
 msgid "Scroll Down"
 msgstr "Прокрутить вниз"
 
-#: src/global.c:856
-msgid "Previous File"
+#: src/global.c:858
+msgid "Prev File"
 msgstr "Предыдущий файл"
 
-#: src/global.c:858
+#: src/global.c:860
 msgid "Next File"
 msgstr "Следующий файл"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:862 src/text.c:3045
-msgid "Verbatim Input"
-msgstr "Ввод «как есть»"
+#: src/global.c:869
+msgid "Verbatim"
+msgstr "Подробный"
 
-#: src/global.c:867
+#: src/global.c:872
 msgid "Tab"
 msgstr "Табуляция"
 
-#: src/global.c:870
+#: src/global.c:874
 msgid "Enter"
 msgstr "Ввод"
 
-#: src/global.c:873
+#: src/global.c:876
 msgid "Delete"
 msgstr "Удалить"
 
-#: src/global.c:876
+#: src/global.c:878
 msgid "Backspace"
 msgstr "Возврат каретки"
 
-#: src/global.c:893
+#: src/global.c:888
 msgid "CutTillEnd"
 msgstr "Обрез. до конца"
 
-#: src/global.c:906
+#: src/global.c:898
 msgid "Word Count"
 msgstr "Счётчик слов"
 
-#: src/global.c:1367
+#: src/global.c:905
+msgid "Suspend"
+msgstr "Приостановка"
+
+#: src/global.c:910
+msgid "PrevHstory"
+msgstr "ПредИстор"
+
+#: src/global.c:913
+msgid "NextHstory"
+msgstr "СледИстор"
+
+#: src/global.c:917
+msgid "Go To Text"
+msgstr "К строке"
+
+#: src/global.c:928
+msgid "DOS Format"
+msgstr "Формат DOS"
+
+#: src/global.c:931
+msgid "Mac Format"
+msgstr "Формат Mac"
+
+#: src/global.c:934
+msgid "Append"
+msgstr "Доп. в начало"
+
+#: src/global.c:936
+msgid "Prepend"
+msgstr "Доп. в конец"
+
+#: src/global.c:939
+msgid "Backup File"
+msgstr "Резерв. копия"
+
+#: src/global.c:946
+msgid "Execute Command"
+msgstr "Выполнить команду"
+
+#: src/global.c:961
+msgid "To Files"
+msgstr "К файлам"
+
+#: src/global.c:964
+msgid "First File"
+msgstr "ПервыйФайл"
+
+#: src/global.c:966
+msgid "Last File"
+msgstr "ПоследнФайл"
+
+#: src/global.c:977
+msgid "Prev Lint Msg"
+msgstr "Пред. сообщ. пров."
+
+#: src/global.c:979
+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:1227
 msgid "Help mode"
 msgstr "Режим справки"
 
-#: src/global.c:1369
+#: src/global.c:1229
 msgid "Constant cursor position display"
 msgstr "Отображение постоянного положения курсора"
 
-#: src/global.c:1371
+#: src/global.c:1231
 msgid "Use of one more line for editing"
 msgstr "Использование дополнительной строки для редактирования"
 
-#: src/global.c:1373
+#: src/global.c:1233
 msgid "Smooth scrolling"
 msgstr "Плавная прокрутка"
 
-#: src/global.c:1375
+#: src/global.c:1235
+msgid "Soft wrapping of overlong lines"
+msgstr "Мягкий перенос длинных строк"
+
+#: src/global.c:1237
 msgid "Whitespace display"
 msgstr "Отображение пробелов"
 
-#: src/global.c:1377
+#: src/global.c:1239
 msgid "Color syntax highlighting"
 msgstr "Подсветка синтаксиса"
 
-#: src/global.c:1379
+#: src/global.c:1241
 msgid "Smart home key"
 msgstr "Умная клавиша HOME"
 
-#: src/global.c:1381
+#: src/global.c:1243
 msgid "Auto indent"
 msgstr "Автоотступы"
 
-#: src/global.c:1383
+#: src/global.c:1245
 msgid "Cut to end"
 msgstr "Вырезать до конца"
 
-#: src/global.c:1385
-msgid "Long line wrapping"
-msgstr "Перенос длинных строк"
+#: src/global.c:1247
+msgid "Hard wrapping of overlong lines"
+msgstr "Жесткий перенос длинных строк"
 
-#: src/global.c:1387
+#: src/global.c:1249
 msgid "Conversion of typed tabs to spaces"
 msgstr "Конвертация табуляций в пробелы"
 
-#: src/global.c:1389
+#: src/global.c:1251
 msgid "Backup files"
 msgstr "Резервные файлы"
 
-#: src/global.c:1391
+#: src/global.c:1253
 msgid "Multiple file buffers"
 msgstr "Несколько файловых буферов"
 
-#: src/global.c:1393
+#: src/global.c:1255
 msgid "Mouse support"
 msgstr "Поддержка мыши"
 
-#: src/global.c:1395
+#: src/global.c:1257
 msgid "No conversion from DOS/Mac format"
 msgstr "Без преобразования из формата DOS/Mac"
 
-#: src/global.c:1397
+#: src/global.c:1259
 msgid "Suspension"
 msgstr "Приостановка"
 
-#: src/global.c:1399
-msgid "Soft line wrapping"
-msgstr "Мягкий перенос строк"
-
-#: src/help.c:236
+#: src/help.c:205
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1009,7 +1107,7 @@ msgstr ""
 "поиска. Если нажать клаишу ВВОД без редактирования текста, будет продолжен "
 "предыдущий поиск.  "
 
-#: src/help.c:245
+#: src/help.c:214
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1023,7 +1121,7 @@ msgstr ""
 " Следующие функциональные клавиши доступны в режиме поиска:\n"
 "\n"
 
-#: src/help.c:251
+#: src/help.c:220
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1043,7 +1141,7 @@ msgstr ""
 " Следующие функциональные клавиши доступны в режиме Перейти к строке:\n"
 "\n"
 
-#: src/help.c:260
+#: src/help.c:229
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1066,7 +1164,7 @@ msgstr ""
 "файла в отдельный буфер (используйте Meta-< and > для переключения между "
 "файловыми буферами).  "
 
-#: src/help.c:269
+#: src/help.c:238
 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"
@@ -1080,7 +1178,7 @@ msgstr ""
 " Следующие функциональные клавиши доступны в режиме Вставка файла:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:244
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1107,7 +1205,7 @@ msgstr ""
 " Следующие клавиши доступны в режиме записи файла:\n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:258
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1127,12 +1225,12 @@ msgstr ""
 "Пользуйтесь клавишами со стрелками или PageUp/PageDown для перехода по "
 "содержимому каталога, и клавишами S или ВВОД для выбора нужного файла или "
 "входа в выбранный каталог. Для перемещения вверх на одну директорию, "
-"выберите директорию, названную \"..\" в самом верху списка файлов.\n"
+"выберите директорию, названную «..» в самом верху списка файлов.\n"
 "\n"
 " Следующие функциональные клавиши доступны в просмотрщике файлов:\n"
 "\n"
 
-#: src/help.c:302
+#: src/help.c:271
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1158,16 +1256,15 @@ msgstr ""
 " Следующие функциональные клавиши доступны в режиме поиска:\n"
 "\n"
 
-#: src/help.c:311
+#: src/help.c:280
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
 msgstr ""
-"  Следующие функциональные клавиши доступны в режиме Поиск просмотрщика :\n"
-":\n"
+" Следующие функциональные клавиши доступны в режиме Поиск просмотрщика:\n"
 "\n"
 
-#: src/help.c:315
+#: src/help.c:284
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1190,7 +1287,7 @@ msgstr ""
 "Просмотрщика:\n"
 "\n"
 
-#: src/help.c:328
+#: src/help.c:297
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1214,7 +1311,7 @@ msgstr ""
 " Следующие функциональные клавиши доступны в режиме проверки правописания:\n"
 "\n"
 
-#: src/help.c:343
+#: src/help.c:312
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1235,7 +1332,7 @@ msgstr ""
 " Следующие функциональные клавиши доступны в режиме Внешняя Команда:\n"
 "\n"
 
-#: src/help.c:356
+#: src/help.c:325
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1246,7 +1343,7 @@ msgid ""
 "showing the file being edited.  The status line is the third line from the "
 "bottom and shows important messages.  "
 msgstr ""
-" Текст помощи nano\n"
+"Текст помощи nano\n"
 "\n"
 " Редактор nano разработан для эмуляции функциональности и простоты "
 "использования оригинального редактора UW Pico. Редактор разбит на 4 основные "
@@ -1255,7 +1352,7 @@ msgstr ""
 "это главное окно редактирования, в котором отображен редактируемый файл. "
 "Строка состояния - 3 строка снизу - показывает разные важные сообщения.  "
 
-#: src/help.c:366
+#: src/help.c:335
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1273,7 +1370,7 @@ msgstr ""
 "и могут быть введены при помощи кнопок Esc, Alt или Meta, в зависимости от "
 "используемой клавиатуры.  "
 
-#: src/help.c:375
+#: src/help.c:344
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1287,15 +1384,15 @@ msgstr ""
 "возрастанию:\n"
 "\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:376 src/help.c:448
 msgid "enable/disable"
 msgstr "разрешить/запретить"
 
-#: src/nano.c:587
+#: src/nano.c:601
 msgid "Key invalid in view mode"
 msgstr "Неверная клавиша в режиме просмотра"
 
-#: src/nano.c:695
+#: src/nano.c:713
 #, c-format
 msgid ""
 "\n"
@@ -1304,7 +1401,7 @@ msgstr ""
 "\n"
 "Буфер записан в %s\n"
 
-#: src/nano.c:697
+#: src/nano.c:715
 #, c-format
 msgid ""
 "\n"
@@ -1313,7 +1410,7 @@ msgstr ""
 "\n"
 "Буфер не записан в %s: %s\n"
 
-#: src/nano.c:700
+#: src/nano.c:718
 #, c-format
 msgid ""
 "\n"
@@ -1322,11 +1419,11 @@ msgstr ""
 "\n"
 "Буфер не записан в %s\n"
 
-#: src/nano.c:723
+#: src/nano.c:743
 msgid "Window size is too small for nano...\n"
 msgstr "Размер окна слишком мал для Nano...\n"
 
-#: src/nano.c:816
+#: src/nano.c:836
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
@@ -1335,251 +1432,257 @@ msgstr ""
 "Использование: nano [ОПЦИИ] [[+СТРОКА,СТОЛБЕЦ] ФАЙЛ]...\n"
 "\n"
 
-#: src/nano.c:819
+#: src/nano.c:839
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Опция\t\tДлинная форма\t\tЗначение\n"
 
-#: src/nano.c:821
+#: src/nano.c:841
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Опция\t\tЗначение\n"
 
-#: src/nano.c:824
-msgid "Show this message"
-msgstr "Показывать это сообщение"
-
-#: src/nano.c:825
+#: src/nano.c:844
 msgid "+LINE,COLUMN"
 msgstr "+СТРОКА,СТОЛБЕЦ"
 
-#: src/nano.c:826
+#. TRANSLATORS: The next forty or so strings are option descriptions
+#. * for the --help output.  Try to keep them at most 40 characters.
+#: src/nano.c:847
 msgid "Start at line LINE, column COLUMN"
 msgstr "Начать со строки СТРОКА, столбца СТОЛБЕЦ"
 
-#: src/nano.c:828
+#: src/nano.c:849
 msgid "Enable smart home key"
 msgstr "Включить умную клавишу home"
 
-#: src/nano.c:829
+#: src/nano.c:850
 msgid "Save backups of existing files"
 msgstr "Делать резервные копии существующих файлов при сохранении"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "-C <dir>"
 msgstr "-C <дир>"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<дир>"
 
-#: src/nano.c:831
+#: src/nano.c:852
 msgid "Directory for saving unique backup files"
 msgstr "Каталог для сохранения уникальных резервных файлов"
 
-#: src/nano.c:834
+#: src/nano.c:855
 msgid "Use bold instead of reverse video text"
 msgstr "Использовать жирный шрифт вместо обычного"
 
-#: src/nano.c:837
+#: src/nano.c:858
 msgid "Convert typed tabs to spaces"
 msgstr "Конвертировать табуляции в пробелы"
 
-#: src/nano.c:840
+#: src/nano.c:861
 msgid "Enable multiple file buffers"
 msgstr "Разрешить несколько файловых буферов"
 
-#: src/nano.c:845
+#: src/nano.c:865
+msgid "Use (vim-style) lock files"
+msgstr "Использовать файлы блокировки (vim-стиль)"
+
+#: src/nano.c:869
 msgid "Log & read search/replace string history"
 msgstr "Сохранять и читать историю поиска/замены строк"
 
-#: src/nano.c:848
+#: src/nano.c:873
 msgid "Don't look at nanorc files"
 msgstr "Не использовать на файлы nanorc"
 
-#: src/nano.c:851
+#: src/nano.c:876
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Решить проблему зависания цифровой клавиатуры"
 
-#: src/nano.c:853
+#: src/nano.c:878
 msgid "Don't add newlines to the ends of files"
 msgstr "Не добавлять пустые строки в конце файла"
 
-#: src/nano.c:856
+#: src/nano.c:881
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Не преобразовывать из DOS/Mac формата"
 
-#: src/nano.c:858
+#: src/nano.c:883
 msgid "Use one more line for editing"
 msgstr "Использование дополнительной строки для редактирования"
 
-#: src/nano.c:860
+#: src/nano.c:886
+msgid "Log & read location of cursor position"
+msgstr "Сохранять и загружать позицию курсора"
+
+#: src/nano.c:889
 msgid "-Q <str>"
 msgstr "-Q <стр>"
 
-#: src/nano.c:860
+#: src/nano.c:889
 msgid "--quotestr=<str>"
 msgstr "--quotestr=<стр>"
 
-#: src/nano.c:861
+#: src/nano.c:890
 msgid "Quoting string"
 msgstr "Строка цитирования"
 
-#: src/nano.c:863
+#: src/nano.c:892
 msgid "Restricted mode"
 msgstr "Запрещенный режим"
 
-#: src/nano.c:866
+#: src/nano.c:895
 msgid "Scroll by line instead of half-screen"
 msgstr "Построчная прокрутка вместо полу-экранной"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "-T <#cols>"
 msgstr "-T <#чис>"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#чис>"
 
-#: src/nano.c:869
+#: src/nano.c:898
 msgid "Set width of a tab to #cols columns"
 msgstr "Установить ширину табуляции в #чис столбцов"
 
-#: src/nano.c:871
+#: src/nano.c:900
 msgid "Do quick statusbar blanking"
 msgstr "Делать быструю очистку строки состояния"
 
-#: src/nano.c:874
+#: src/nano.c:903
 msgid "Print version information and exit"
 msgstr "Показать версию и выйти"
 
-#: src/nano.c:877
+#: src/nano.c:906
 msgid "Detect word boundaries more accurately"
 msgstr "Определять границы слов более точно"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "-Y <str>"
 msgstr "-Y <стр>"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "--syntax=<str>"
 msgstr "--syntax=<стр>"
 
-#: src/nano.c:881
+#: src/nano.c:910
 msgid "Syntax definition to use for coloring"
 msgstr "Использовать описание синтаксиса для подсветки"
 
-#: src/nano.c:883
+#: src/nano.c:912
 msgid "Constantly show cursor position"
 msgstr "Постоянно показывать позицию курсора"
 
-#: src/nano.c:885
+#: src/nano.c:914
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Решить проблему Backspace/Delete"
 
-#: src/nano.c:888
+#: src/nano.c:915
+msgid "Show this help text"
+msgstr "Показать эту справку"
+
+#: src/nano.c:918
 msgid "Automatically indent new lines"
 msgstr "Автоматический отступ на новых строках"
 
-#: src/nano.c:889
+#: src/nano.c:919
 msgid "Cut from cursor to end of line"
 msgstr "Вырезать от курсора до конца строки"
 
-#: src/nano.c:892
+#: src/nano.c:922
 msgid "Don't follow symbolic links, overwrite"
 msgstr "Не следовать по символьным ссылкам, переписывать"
 
-#: src/nano.c:894
+#: src/nano.c:924
 msgid "Enable the use of the mouse"
 msgstr "Разрешить использование мыши"
 
-#: src/nano.c:897
+#: src/nano.c:926
+msgid "Do not read the file (only write it)"
+msgstr "Не читать файл (только писать его)"
+
+#: src/nano.c:928
 msgid "-o <dir>"
 msgstr "-o <дир>"
 
-#: src/nano.c:897
+#: src/nano.c:928
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<дир>"
 
-#: src/nano.c:898
+#: src/nano.c:929
 msgid "Set operating directory"
 msgstr "Установить рабочий каталог"
 
-#: src/nano.c:901
+#: src/nano.c:932
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Зарезервировать кнопки XON (^Q) и XOFF (^S)"
 
-#: src/nano.c:903
+#: src/nano.c:935
 msgid "Silently ignore startup issues like rc file errors"
 msgstr "Молча игнорировать ошибки запуска, например rc-файла"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "-r <#cols>"
 msgstr "-r <#столбцы>"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "--fill=<#cols>"
 msgstr "--fill=<#столбцы>"
 
-#: src/nano.c:906
-msgid "Set wrapping point at column #cols"
-msgstr "Установить точку переноса строки на #столбцы"
+#: src/nano.c:939
+msgid "Set hard-wrapping point at column #cols"
+msgstr "Установить точку жесткого переноса строки на #столбцы"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "-s <prog>"
 msgstr "-s <программа>"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "--speller=<prog>"
 msgstr "--speller=<программа>"
 
-#: src/nano.c:910
+#: src/nano.c:943
 msgid "Enable alternate speller"
 msgstr "Использовать альтернативную программу проверки орфографии"
 
-#: src/nano.c:913
+#: src/nano.c:946
 msgid "Auto save on exit, don't prompt"
 msgstr "Автозапись при выходе, без лишних вопросов"
 
-#: src/nano.c:915
-msgid "Allow generic undo [EXPERIMENTAL]"
-msgstr "Разрешить функцию отмены действий [ЭКСПЕРИМЕНТАЛЬНАЯ]"
-
-#: src/nano.c:918
+#: src/nano.c:947
 msgid "View mode (read-only)"
 msgstr "Режим просмотра (только чтение)"
 
-#: src/nano.c:920
-msgid "Don't wrap long lines"
-msgstr "Не переносить длинные строки"
+#: src/nano.c:949
+msgid "Don't hard-wrap long lines"
+msgstr "Не делать жесткий перенос длинных строк"
 
-#: src/nano.c:922
+#: src/nano.c:951
 msgid "Don't show the two help lines"
 msgstr "Не показывать две строки помощи внизу"
 
-#: src/nano.c:923
+#: src/nano.c:952
 msgid "Enable suspension"
 msgstr "Разрешить приостановку"
 
-#: src/nano.c:924
+#: src/nano.c:954
 msgid "Enable soft line wrapping"
 msgstr "Включить мягкий перенос строк"
 
-#: src/nano.c:928
-msgid "(ignored, for Pico compatibility)"
-msgstr "(игнорируется, для совместимости с Pico)"
-
-#: src/nano.c:938
-#, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
+#: src/nano.c:963
+#, fuzzy, c-format
+msgid " GNU nano, version %s\n"
 msgstr " GNU nano версия %s (собрано %s, %s)\n"
 
-#: src/nano.c:943
+#: src/nano.c:966
 #, 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:944
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1588,154 +1691,180 @@ msgstr ""
 "\n"
 " Параметры сборки:"
 
-#: src/nano.c:1022
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr "Поддержка этой функции была отключена"
 
-#: src/nano.c:1044
+#: src/nano.c:1125
+msgid "No file name"
+msgstr ""
+
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "Сохранить изменённый буфер? (ИНАЧЕ ВСЕ ИЗМЕНЕНИЯ БУДУТ ПОТЕРЯНЫ)"
 
-#: src/nano.c:1088
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "Не удалось повторно открыть стандартный ввод с клавиатуры\n"
 
-#: src/nano.c:1114
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "Чтение из стандартного ввода. ^C для прерывания\n"
 
-#: src/nano.c:1182
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Получен SIGHUP или SIGTERM\n"
 
-#: src/nano.c:1204
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Используйте «fg» для возврата в nano\n"
 
-#: src/nano.c:1386
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "включено"
 
-#: src/nano.c:1387
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "отключено"
 
-#: src/nano.c:1548 src/winio.c:1256
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr "Неизвестная команда"
 
-#: src/nano.c:1674
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "XON проигнорирован, мр-бр-бр"
 
-#: src/nano.c:1679
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF проигнорирован, мр-бр-бр"
 
-#: src/nano.c:2209 src/rcfile.c:1100
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Запрошенный размер табуляции «%s» не подходит"
 
-#: src/nano.c:2268 src/rcfile.c:1025
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Запрошенный размер заполнения «%s» не подходит"
 
+#: src/nano.c:2415
+#, c-format
+msgid "Type '%s -h' for a list of available options.\n"
+msgstr "Введите «%s -h» для получения списка доступных опций.\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:1259
+#: src/prompt.c:1055
 msgid "Yy"
 msgstr "YyДд"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1056
 msgid "Nn"
 msgstr "NnНн"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1057
 msgid "Aa"
 msgstr "AaВв"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1071
 msgid "Yes"
 msgstr "Да"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1076
 msgid "All"
 msgstr "Все"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1081
 msgid "No"
 msgstr "Нет"
 
-#: src/rcfile.c:130
+#: src/rcfile.c:137
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Ошибка в позиции %s строки %lu: "
 
-#: src/rcfile.c:185
+#: src/rcfile.c:196
 #, c-format
 msgid "Argument '%s' has an unterminated \""
-msgstr "Аргумент %s имеет незакрытую \""
+msgstr "Аргумент «%s» имеет незакрытую \""
 
-#: src/rcfile.c:212 src/rcfile.c:264 src/rcfile.c:711 src/rcfile.c:768
-#: src/rcfile.c:821
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
 msgstr ""
 "Строки регулярных выражений должны начинаться и заканчиваться символом \""
 
-#: src/rcfile.c:238 src/search.c:62
+#: src/rcfile.c:249 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Плохое регулярное выражение «%s»: %s"
 
-#: src/rcfile.c:258
+#: src/rcfile.c:269
 msgid "Missing syntax name"
 msgstr "Отсутствует название синтаксиса"
 
-#: src/rcfile.c:316
+#: src/rcfile.c:340
 msgid "The \"none\" syntax is reserved"
 msgstr "Синтаксис «none» зарезервирован"
 
-#: src/rcfile.c:323
+#: src/rcfile.c:347
 msgid "The \"default\" syntax must take no extensions"
 msgstr "Синтаксис «default» не должен иметь расширений"
 
-#: src/rcfile.c:386 src/rcfile.c:483
+#: src/rcfile.c:433
 msgid "Missing key name"
 msgstr "Отсутствует название клавиши"
 
-#: src/rcfile.c:398 src/rcfile.c:499
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
-msgstr "привязки клавиш должны начинаться с «^», «M» или «F»"
+#: src/rcfile.c:442 src/rcfile.c:453
+msgid "Key name is too short"
+msgstr "Название ключа слишком короткое"
+
+#: src/rcfile.c:463
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
+msgstr "Привязки клавиш должны начинаться с «^», «M» или «F»"
 
-#: src/rcfile.c:407
-msgid "Must specify function to bind key to"
+#: src/rcfile.c:472
+msgid "Must specify a function to bind the key to"
 msgstr "Укажите функцию, которой назначается клавиша"
 
-#: src/rcfile.c:418 src/rcfile.c:510
-msgid "Must specify menu to bind key to (or \"all\")"
-msgstr "Укажите меню, которому назначается клавиша (или «all»)"
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:482
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
+msgstr ""
+"Вы должны указать имя меню (или «все») на которое нужно назначить/убрать "
+"назначение клавиши"
+
+#: src/rcfile.c:489
+#, c-format
+msgid "Cannot map name \"%s\" to a function"
+msgstr "Не удалось сопоставить имя «%s» к функции"
+
+#: src/rcfile.c:496
+#, c-format
+msgid "Cannot map name \"%s\" to a menu"
+msgstr "Не удалось сопоставить имя «%s» к меню"
 
-#: src/rcfile.c:426
+#: src/rcfile.c:528
 #, c-format
-msgid "Could not map name \"%s\" to a function"
-msgstr "Не удалось сопоставить имя «%s» функции"
+msgid "Function '%s' does not exist in menu '%s'"
+msgstr ""
 
-#: src/rcfile.c:432 src/rcfile.c:517
+#: src/rcfile.c:543
 #, c-format
-msgid "Could not map name \"%s\" to a menu"
-msgstr "Не удалось сопоставить имя «%s» меню"
+msgid "Sorry, keystroke \"%s\" may not be rebound"
+msgstr "Привязка «%s» не может быть переназначена"
 
-#: src/rcfile.c:454
+#: src/rcfile.c:629
 #, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
-msgstr "Привязка «%s» не является допустимой"
+msgid "Error expanding %s: %s"
+msgstr "Ошибка расширения %s: %s"
 
-#: src/rcfile.c:625
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1750,116 +1879,172 @@ msgstr ""
 "«black», с необязательным префиксом «bright»\n"
 "для цвета фона."
 
-#: src/rcfile.c:647
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
 msgstr "Не удаётся добавить команду цвета без команды синтаксиса"
 
-#: src/rcfile.c:652
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "Отсутствует название цвета"
 
-#: src/rcfile.c:672
-#, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr "Цвет фона \"%s\" не может быть светлым"
-
-#: src/rcfile.c:690 src/rcfile.c:809
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr "Отсутствует регулярное выражение"
 
-#: src/rcfile.c:762
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
-msgstr "\"start=\" требует соответствующего \"end=\""
+msgstr "«start=» требует соответствующего «end=»"
+
+#: src/rcfile.c:837
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr "Цвет фона «%s» не может быть светлым"
 
-#: src/rcfile.c:804
+#: src/rcfile.c:865
 msgid "Cannot add a header regex without a syntax command"
 msgstr "Не удаётся добавить рег. выражение заголовка без команды синтаксиса"
 
-#: src/rcfile.c:874
+#: src/rcfile.c:921
+msgid "Cannot add a magic string regex without a syntax command"
+msgstr "Не удаётся добавить магическое рег. выражение без команды синтаксиса"
+
+#: src/rcfile.c:926
+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"
+msgstr "Отсутствует команда анализатора синтаксиса"
+
+#: src/rcfile.c:1010
+#, fuzzy
+msgid "Cannot add formatter without a syntax command"
+msgstr "Не удаётся добавить анализатор синтаксиса без команды синтаксиса"
+
+#: src/rcfile.c:1015
+#, fuzzy
+msgid "Missing formatter command"
+msgstr "Отсутствует команда анализатора синтаксиса"
+
+#: src/rcfile.c:1045
 #, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
-msgstr "Критическая ошибка: для действия \"%s\" не назначены клавиши"
+msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
+msgstr "Критическая ошибка: для функции «%s» не назначены клавиши.  Выхожу.\n"
 
-#: src/rcfile.c:876
+#: src/rcfile.c:1047
+#, c-format
 msgid ""
-"Exiting.  Please use nano with the -I option if needed to adjust your nanorc "
-"settings\n"
+"If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
-"Выхожу.  Используйте nano с опцией -I если требуется подстроить параметры "
-"вашего nanorc\n"
+"Используйте nano с опцией -I, если требуется подстроить параметры вашего "
+"nanorc.\n"
+
+#: src/rcfile.c:1108
+#, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "Не удалось сопоставить имя «%s» к расширению"
 
-#: src/rcfile.c:926 src/rcfile.c:935 src/rcfile.c:945
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
-msgstr "Команда \"%s\" не разрешена во включенном файле"
+msgstr "Команда «%s» не разрешена во включенном файле"
 
-#: src/rcfile.c:951 src/rcfile.c:1128
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
-msgstr "Синтаксис \"%s\" не имеет цветовых команд"
+msgstr "Синтаксис «%s» не имеет цветовых команд"
 
-#: src/rcfile.c:966
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
-msgstr "Не понятная команда \"%s\""
+msgstr "Непонятная команда «%s»"
 
-#: src/rcfile.c:972
-msgid "Missing flag"
-msgstr "Отсутствует опция"
+#: src/rcfile.c:1186
+msgid "Missing option"
+msgstr "Параметр отсутствует "
 
-#: src/rcfile.c:994
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
-msgstr "Опция \"%s\" требует аргумент"
+msgstr "Опция «%s» требует аргумент"
 
-#: src/rcfile.c:1012
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr "Опция не правильная многобайтовая строка"
 
-#: src/rcfile.c:1038 src/rcfile.c:1066 src/rcfile.c:1075
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr "Требуется не пустой символ"
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr "Требуется два однострочных символа"
 
-#: src/rcfile.c:1114
+#: src/rcfile.c:1339
 #, c-format
-msgid "Cannot unset flag \"%s\""
-msgstr "Не удаётся снять флаг  \"%s\""
+msgid "Cannot unset option \"%s\""
+msgstr "Не удалось снять опцию «%s»"
 
-#: src/rcfile.c:1123
+#: src/rcfile.c:1345
 #, c-format
-msgid "Unknown flag \"%s\""
-msgstr "Неизвестный флаг \"%s\""
+msgid "Unknown option \"%s\""
+msgstr "Неизвестная опция «%s»"
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr "Не могу найти собственную домашнюю директорию! Йой!"
 
+#: src/rcfile.c:1442
+#, c-format
+msgid ""
+"\n"
+"Press Enter to continue starting nano.\n"
+msgstr ""
+"\n"
+"Нажмите ВВОД для продолжения запуска nano.\n"
+
 #: src/search.c:96
 #, c-format
 msgid "\"%.*s%s\" not found"
-msgstr "\"%.*s%s\" не найден"
+msgstr "«%.*s%s» не найден"
 
-#: src/search.c:205
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/search.c:184
+msgid " [Case Sensitive]"
+msgstr " [С учётом регистра]"
+
+#: src/search.c:188
+msgid " [Regexp]"
+msgstr " [РегВыр]"
+
+#: src/search.c:192
+msgid " [Backwards]"
+msgstr " [Назад]"
+
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:197
 msgid " (to replace) in selection"
 msgstr " (что менять) в выделении"
 
-#: src/search.c:207
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (что менять)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "Заменить это вхождение?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:945
 msgid "Replace with"
 msgstr "Заменить на"
 
-#: src/search.c:1004
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
@@ -1867,19 +2052,20 @@ msgstr[0] "Замененное %lu вхождение"
 msgstr[1] "Замененные %lu вхождения"
 msgstr[2] "Заменено %lu вхождений"
 
-#: src/search.c:1034
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr "Введите номер строки и столбца"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
 msgstr "Неправильный номер строки или столбца"
 
-#: src/search.c:1214
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "Не скобка"
 
-#: src/search.c:1281
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "Нет соответствующей скобки"
 
@@ -1891,218 +2077,316 @@ msgstr "Метка установлена"
 msgid "Mark Unset"
 msgstr "Метка снята"
 
-#: src/text.c:443
+#: src/text.c:439
 msgid "Nothing in undo buffer!"
 msgstr "Буфер отмены действий пуст!"
 
-#: src/text.c:455 src/text.c:593
+#: src/text.c:445 src/text.c:590
 #, c-format
-msgid "Internal error: can't match line %d.  Please save your work"
+msgid "Internal error: can't match line %d.  Please save your work."
 msgstr ""
-"Внутренняя ошибка: не удаётся сопоставить строку %d. Сохраните свою работу"
+"Внутренняя ошибка: не удаётся сопоставить строку %d. Сохраните свою работу."
 
-#: src/text.c:466 src/text.c:603
+#: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
 msgstr "добавление текста"
 
-#: src/text.c:475 src/text.c:613
+#: src/text.c:467 src/text.c:612
 msgid "text delete"
 msgstr "удаление текста"
 
-#: src/text.c:489 src/text.c:628
-msgid "line wrap"
-msgstr "перенос строки"
-
-#: src/text.c:503 src/text.c:636
+#: src/text.c:491 src/text.c:641
 msgid "line join"
 msgstr "объединение строк"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:505 src/text.c:657
 msgid "text cut"
 msgstr "обрезка текста"
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:510 src/text.c:661
 msgid "text uncut"
 msgstr "отмена обрезки текста"
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:515 src/text.c:623
 msgid "line break"
 msgstr "новая строка"
 
-#: src/text.c:532 src/text.c:665
+#: src/text.c:528 src/text.c:672
 msgid "text insert"
 msgstr "вставка текста"
 
-#: src/text.c:550 src/text.c:659
+#: src/text.c:549 src/text.c:665
 msgid "text replace"
 msgstr "замена текста"
 
-#: src/text.c:557 src/text.c:671
-msgid "Internal error: unknown type.  Please save your work"
+#: src/text.c:556 src/text.c:679 src/text.c:983
+msgid "Internal error: unknown type.  Please save your work."
 msgstr "Внутренняя ошибка: неизвестный тип. Сохраните свою работу"
 
-#: src/text.c:563
+#: src/text.c:561
 #, c-format
 msgid "Undid action (%s)"
 msgstr "Отменённое действие (%s)"
 
-#: src/text.c:578
+#: src/text.c:580
 msgid "Nothing to re-do!"
 msgstr "Нечего повторять!"
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
-msgstr "Внутренняя ошибка: ошибка настройки повтора. Сохраните свою работу"
+#: src/text.c:584
+msgid "Internal error: cannot set up redo.  Please save your work."
+msgstr ""
+"Внутренняя ошибка: ошибка настройки повторения изменения. Сохраните свою "
+"работу."
 
-#: src/text.c:676
+#: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Повторённое действие (%s)"
 
-#: src/text.c:766
-msgid "Could not pipe"
-msgstr "Не удалось перенаправить в конвейер"
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
+msgid "Could not create pipe"
+msgstr "Не удалось создать конвейер"
 
-#: src/text.c:793 src/text.c:2636 src/text.c:2788
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "Не удалось создать дочерний процесс"
 
-#: src/text.c:941
-msgid "Internal error: can't setup uncut.  Please save your work."
+#: src/text.c:969
+msgid "Internal error: cannot set up uncut.  Please save your work."
 msgstr ""
-"Внутренняя ошибка: ошибка настройки отмены образки. Сохраните свою работу"
+"Внутренняя ошибка: ошибка настройки отмены обрезки. Сохраните свою работу."
 
-#: src/text.c:950
-msgid "Internal error: unknown type.  Please save your work."
-msgstr "Внутренняя ошибка: неизвестный тип. Сохраните свою работу"
-
-#: src/text.c:1870
+#: src/text.c:1806
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Недопустимая строка цитирования %s: %s"
 
-#: src/text.c:2267
+#: src/text.c:2207
 msgid "Can now UnJustify!"
 msgstr "Сейчас можно отменить выравнивание!"
 
-#: src/text.c:2462
+#: src/text.c:2404
 msgid "Edit a replacement"
 msgstr "Редактировать замену"
 
-#: src/text.c:2548
-msgid "Could not create pipe"
-msgstr "Не удалось создать конвейер"
-
-#: src/text.c:2550
+#: src/text.c:2492
 msgid "Creating misspelled word list, please wait..."
 msgstr "Идёт создание списка ошибочных слов. Подождите..."
 
-#: src/text.c:2642
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
 msgstr "Не удалось получить размер буфера конвейера"
 
-#: src/text.c:2693
+#: src/text.c:2635
 msgid "Error invoking \"spell\""
-msgstr "Ошибка выполнения \"spell\""
+msgstr "Ошибка выполнения «spell»"
 
-#: src/text.c:2696
+#: src/text.c:2638
 msgid "Error invoking \"sort -f\""
-msgstr "Ошибка выполнения \"sort -f\""
+msgstr "Ошибка выполнения «sort -f»"
 
-#: src/text.c:2699
+#: src/text.c:2641
 msgid "Error invoking \"uniq\""
-msgstr "Ошибка выполнения \"uniq\""
+msgstr "Ошибка выполнения «uniq»"
 
-#: src/text.c:2756 src/text.c:2965
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "Проверка правописания завершена"
 
-#: src/text.c:2815
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
-msgstr "Ошибка выполнения \"%s\""
+msgstr "Ошибка выполнения «%s»"
 
-#: src/text.c:2960
+#: src/text.c:2885
+msgid "Invoking spell checker, please wait"
+msgstr "Запуск проверки орфографии, подождите"
+
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Проверка правописания не удалась: %s"
 
-#: src/text.c:2962
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Проверка правописания не удалась: %s: %s"
 
-#: src/text.c:3030
+#: src/text.c:2937
+msgid "No linter defined for this type of file!"
+msgstr "Для данного типа файла не настроена программа проверки синтаксиса!"
+
+#: src/text.c:2947
+msgid "Save modified buffer before linting?"
+msgstr "Сохранить измененный буфер перед проверкой?"
+
+#: src/text.c:2969
+msgid "Invoking linter, please wait"
+msgstr "Запуск проверки, подождите"
+
+#: src/text.c:3125
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr "Получено 0 распознанных строк от комманды: %s"
+
+#: src/text.c:3159
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr "Это сообщение о не открытом файле %s, открыть его в новом буфере?"
+
+#: src/text.c:3205
+msgid "At last message"
+msgstr "Последнее сообщение"
+
+#: src/text.c:3210
+msgid "At first message"
+msgstr "Первое сообщение"
+
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr ""
+
+#: src/text.c:3275
+msgid "Finished"
+msgstr ""
+
+#: src/text.c:3280
+#, fuzzy
+msgid "Invoking formatter, please wait"
+msgstr "Запуск проверки, подождите"
+
+#: src/text.c:3360
+msgid "Finished formatting"
+msgstr ""
+
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sСлов: %lu  Строк: %ld  Символов: %lu"
 
-#: src/text.c:3031
+#: src/text.c:3439
 msgid "In Selection:  "
 msgstr "В выделении:  "
 
-#: src/utils.c:405 src/utils.c:417
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3453
+msgid "Verbatim Input"
+msgstr "Ввод «как есть»"
+
+#: src/utils.c:410 src/utils.c:422
 msgid "nano is out of memory!"
 msgstr "Недостаточно памяти для nano!"
 
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
-#: src/winio.c:1557
+#: src/winio.c:1583
 msgid "Unicode Input"
 msgstr "Юникод код"
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2142 src/winio.c:2146
 msgid "Modified"
 msgstr "Изменён"
 
-#: src/winio.c:2150
+#: src/winio.c:2143
 msgid "View"
 msgstr "Смотр"
 
-#: src/winio.c:2164
+#: src/winio.c:2157
 msgid "DIR:"
 msgstr "Дир:"
 
-#: src/winio.c:2171
+#: src/winio.c:2164
 msgid "File:"
 msgstr "Файл:"
 
-#: src/winio.c:3360
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2261
+msgid ""
+"Warning: Modifying a file which is not locked, check directory permission?"
+msgstr ""
+"Предупреждение: Изменяя не заблокированный файл, проверять доступ к каталогу?"
+
+#: src/winio.c:3377
 #, 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:3492
+#: src/winio.c:3507
 msgid "The nano text editor"
 msgstr "Текстовый редактор nano"
 
-#: src/winio.c:3493
+#: src/winio.c:3508
 msgid "version"
 msgstr "версия"
 
-#: src/winio.c:3494
+#: src/winio.c:3509
 msgid "Brought to you by:"
 msgstr "Предоставлен вам:"
 
-#: src/winio.c:3495
+#: src/winio.c:3510
 msgid "Special thanks to:"
 msgstr "Особая благодарность:"
 
-#: src/winio.c:3496
+#: src/winio.c:3511
 msgid "The Free Software Foundation"
 msgstr ""
 "The Free Software Foundation (фонд свободного программного обеспечения)"
 
-#: src/winio.c:3497
+#: src/winio.c:3512
+msgid "the many translators and the TP"
+msgstr ""
+
+#: src/winio.c:3513
 msgid "For ncurses:"
 msgstr "Для ncurses:"
 
-#: src/winio.c:3498
+#: src/winio.c:3514
 msgid "and anyone else we forgot..."
 msgstr ""
 "Дмитрию Рязанцеву за помощь в переводе и всем остальным, кого мы забыли "
 "упомянуть..."
 
-#: src/winio.c:3499
+#: src/winio.c:3515
 msgid "Thank you for using nano!"
 msgstr "Спасибо за то, что выбрали nano!"
+
+#~ msgid "Allow generic undo [EXPERIMENTAL]"
+#~ msgstr "Разрешить функцию отмены действий [ЭКСПЕРИМЕНТАЛЬНАЯ]"
+
+#~ msgid "line wrap"
+#~ msgstr "перенос строки"
+
+#~ msgid "Insert File"
+#~ msgstr "Вставить файл"
+
+#~ msgid "Go to previous screen"
+#~ msgstr "Перейти на предыдущий экран"
+
+#~ msgid "Find Other Bracket"
+#~ msgstr "Найти другую скобку"
+
+#~ msgid "Long line wrapping"
+#~ msgstr "Перенос длинных строк"
+
+#~ msgid "Soft line wrapping"
+#~ msgstr "Мягкий перенос строк"
+
+#~ msgid "(ignored, for Pico compatibility)"
+#~ msgstr "(игнорируется, для совместимости с Pico)"
+
+#~ msgid "Must specify menu to bind key to (or \"all\")"
+#~ msgstr "Укажите меню, которому назначается клавиша (или «all»)"
+
+#~ msgid "Missing flag"
+#~ msgstr "Отсутствует опция"
+
+#~ msgid "Internal error: unknown type.  Please save your work"
+#~ msgstr "Внутренняя ошибка: неизвестный тип. Сохраните свою работу"
+
+#~ msgid "Internal error: Redo setup failed.  Please save your work"
+#~ msgstr "Внутренняя ошибка: ошибка настройки повтора. Сохраните свою работу"
+
+#~ msgid "Could not pipe"
+#~ msgstr "Не удалось перенаправить в конвейер"
diff --git a/po/rw.gmo b/po/rw.gmo
deleted file mode 100644
index 9ca4657..0000000
--- a/po/rw.gmo
+++ /dev/null
diff --git a/po/rw.po b/po/rw.po
deleted file mode 100644
index 0e7bfc2..0000000
--- a/po/rw.po
+++ /dev/null
@@ -1,2454 +0,0 @@
-# translation of nano to Kinyarwanda.
-# Copyright (C) 2005 Free Software Foundation, Inc.
-# This file is distributed under the same license as the nano package.
-# Steve Murphy <murf@e-tools.com>, 2005
-# Steve performed initial rough translation from compendium built from translations provided by the following translators:
-# Philibert Ndandali  <ndandali@yahoo.fr>, 2005.
-# Viateur MUGENZI <muvia1@yahoo.fr>, 2005.
-# Noëlla Mupole <s24211045@tuks.co.za>, 2005.
-# Carole Karema <karemacarole@hotmail.com>, 2005.
-# JEAN BAPTISTE NGENDAHAYO <ngenda_denis@yahoo.co.uk>, 2005.
-# Augustin KIBERWA  <akiberwa@yahoo.co.uk>, 2005.
-# Donatien NSENGIYUMVA <ndonatienuk@yahoo.co.uk>, 2005.
-# Antoine Bigirimana <antoine@e-tools.com>, 2005.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: nano 1.3.6\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-22 06:34-0500\n"
-"PO-Revision-Date: 2005-04-03 10:55-0700\n"
-"Last-Translator: Steven Michael Murphy <murf@e-tools.com>\n"
-"Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\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"
-
-#: src/browser.c:220
-msgid "Go To Directory"
-msgstr ""
-
-#: src/browser.c:233 src/browser.c:830 src/files.c:860 src/files.c:2048
-#: src/nano.c:1060 src/search.c:220 src/search.c:314 src/search.c:975
-#: src/search.c:1040
-msgid "Cancelled"
-msgstr "Kureka"
-
-#: src/browser.c:266 src/browser.c:314
-#, fuzzy, c-format
-msgid "Can't go outside of %s in restricted mode"
-msgstr "Gyayo Hanze Bya in Nta gukoresha bisesuye Ubwoko"
-
-#: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:722
-#: src/files.c:731 src/files.c:1540 src/files.c:1659 src/files.c:1711
-#: src/files.c:1732 src/files.c:1855 src/files.c:2691 src/rcfile.c:568
-#: src/rcfile.c:1204
-#, c-format
-msgid "Error reading %s: %s"
-msgstr ""
-
-#: src/browser.c:303
-#, fuzzy
-msgid "Can't move up a directory"
-msgstr "Kwimura Hejuru a bushyinguro"
-
-#. TRANSLATORS: Try to keep this at most 7
-#. * characters.
-#: src/browser.c:665 src/browser.c:674
-msgid "(dir)"
-msgstr ""
-
-#. TRANSLATORS: Try to keep this at most 12
-#. * characters.
-#: src/browser.c:671
-msgid "(parent dir)"
-msgstr ""
-
-# #-#-#-#-#  offmgr.pot (PACKAGE VERSION)  #-#-#-#-#
-# offmgr/source\offapp\dialog\inetdlg.src:RID_OFADLG_INTERNET.1.RID_SVXPAGE_INET_SEARCH.text
-# #-#-#-#-#  offmgr.pot (PACKAGE VERSION)  #-#-#-#-#
-# offmgr/source\offapp\dialog\treeopt.src:RID_OFADLG_OPTIONS_TREE_PAGES.SID_INET_DLG.3.text
-#: src/browser.c:801 src/search.c:185
-msgid "Search"
-msgstr "Gushaka"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:805 src/search.c:189
-msgid " [Case Sensitive]"
-msgstr ""
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:811 src/search.c:195
-msgid " [Regexp]"
-msgstr ""
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:817 src/search.c:201
-msgid " [Backwards]"
-msgstr ""
-
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
-msgid "Search Wrapped"
-msgstr ""
-
-#: src/browser.c:1006 src/browser.c:1039 src/search.c:514 src/search.c:517
-#: src/search.c:574 src/search.c:577
-#, fuzzy
-msgid "This is the only occurrence"
-msgstr "ni i ukugaragara"
-
-#: src/browser.c:1042 src/search.c:583
-#, fuzzy
-msgid "No current search pattern"
-msgstr "KIGEZWEHO Gushaka Ishusho"
-
-#: src/files.c:125
-#, fuzzy, c-format
-msgid "Can't insert file from outside of %s"
-msgstr "Kongeramo IDOSIYE Bivuye Hanze Bya"
-
-#: src/files.c:234
-#, fuzzy
-msgid "No more open file buffers"
-msgstr "Birenzeho Gufungura IDOSIYE"
-
-#: src/files.c:250
-#, fuzzy, c-format
-msgid "Switched to %s"
-msgstr "Kuri"
-
-#: src/files.c:251 src/global.c:469 src/winio.c:2168
-msgid "New Buffer"
-msgstr ""
-
-#: src/files.c:633
-#, 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] "Umurongo Bivuye Na Imiterere"
-
-#: src/files.c:638
-#, 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] "Umurongo Bivuye Na Imiterere"
-
-#: src/files.c:644
-#, fuzzy, c-format
-msgid "Read %lu line (Converted from Mac format)"
-msgid_plural "Read %lu lines (Converted from Mac format)"
-msgstr[0] "Umurongo Bivuye Imiterere"
-
-#: src/files.c:648
-#, 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] "Umurongo Bivuye Imiterere"
-
-#: src/files.c:654
-#, fuzzy, c-format
-msgid "Read %lu line (Converted from DOS format)"
-msgid_plural "Read %lu lines (Converted from DOS format)"
-msgstr[0] "Umurongo Bivuye Imiterere"
-
-#: src/files.c:658
-#, 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] "Umurongo Bivuye Imiterere"
-
-#: src/files.c:664
-#, fuzzy, c-format
-msgid "Read %lu line"
-msgid_plural "Read %lu lines"
-msgstr[0] "Umurongo"
-
-#: src/files.c:667
-#, 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:700 src/files.c:736
-#, fuzzy
-msgid "Reading File"
-msgstr "Idosiye"
-
-#: src/files.c:706
-#, fuzzy
-msgid "New File"
-msgstr "Idosiye"
-
-# #-#-#-#-#  sw.pot (PACKAGE VERSION)  #-#-#-#-#
-# sw/source\ui\dochdl\dochdl.src:STR_NOGLOS2.text
-# #-#-#-#-#  sw.pot (PACKAGE VERSION)  #-#-#-#-#
-# sw/source\ui\uiview\view.src:STR_NOGLOS2.text
-#: src/files.c:709
-#, fuzzy, c-format
-msgid "\"%s\" not found"
-msgstr "\"%s\"ntibyabonetse"
-
-#: src/files.c:717 src/rcfile.c:559 src/rcfile.c:1154 src/rcfile.c:1195
-#, fuzzy, c-format
-msgid "\"%s\" is a directory"
-msgstr "\"%s\"ni a bushyinguro"
-
-#: src/files.c:718 src/rcfile.c:560 src/rcfile.c:1155 src/rcfile.c:1196
-#, fuzzy, c-format
-msgid "\"%s\" is a device file"
-msgstr "Idosiye ni a APAREYE IDOSIYE"
-
-#: src/files.c:817
-#, fuzzy, c-format
-msgid "Command to execute in new buffer [from %s] "
-msgstr "Kuri Gukora in Gishya Bivuye"
-
-#: src/files.c:819
-#, fuzzy, c-format
-msgid "Command to execute [from %s] "
-msgstr "Kuri Gukora Bivuye"
-
-#: src/files.c:825
-#, fuzzy, c-format
-msgid "File to insert into new buffer [from %s] "
-msgstr "Idosiye Kuri Kongeramo Gishya Bivuye"
-
-#: src/files.c:827
-#, fuzzy, c-format
-msgid "File to insert [from %s] "
-msgstr "Idosiye Kuri Kongeramo Bivuye"
-
-#: src/files.c:1077
-#, fuzzy
-msgid "Key invalid in non-multibuffer mode"
-msgstr "in Ubwoko"
-
-#: src/files.c:1486
-#, fuzzy, c-format
-msgid "Can't write outside of %s"
-msgstr "Kwandika Hanze Bya"
-
-#: src/files.c:1501
-#, fuzzy
-msgid "Cannot prepend or append to a symlink with --nofollow set"
-msgstr "Cyangwa Kongeraho... Kuri a Na: Gushyiraho"
-
-#: src/files.c:1581 src/files.c:1603 src/files.c:1621 src/files.c:1632
-#: src/files.c:1640 src/files.c:1667
-#, fuzzy, c-format
-msgid "Error writing backup file %s: %s"
-msgstr "IDOSIYE"
-
-#: src/files.c:1582 src/nano.c:701
-#, fuzzy
-msgid "Too many backup files?"
-msgstr "Idosiye"
-
-#: src/files.c:1687 src/files.c:1744 src/files.c:1763 src/files.c:1775
-#: src/files.c:1799 src/files.c:1817 src/files.c:1827 src/files.c:1863
-#: src/files.c:1868 src/files.c:2764 src/files.c:2773
-#, c-format
-msgid "Error writing %s: %s"
-msgstr ""
-
-#: src/files.c:1721 src/text.c:2929 src/text.c:2941
-#, fuzzy, c-format
-msgid "Error writing temp file: %s"
-msgstr "IDOSIYE"
-
-#: src/files.c:1900
-#, fuzzy, c-format
-msgid "Wrote %lu line"
-msgid_plural "Wrote %lu lines"
-msgstr[0] "Umurongo"
-
-#: src/files.c:2004
-msgid " [DOS Format]"
-msgstr ""
-
-#: src/files.c:2005
-msgid " [Mac Format]"
-msgstr ""
-
-#: src/files.c:2007
-msgid " [Backup]"
-msgstr ""
-
-#: src/files.c:2015
-#, fuzzy
-msgid "Prepend Selection to File"
-msgstr "Kuri Idosiye"
-
-#: src/files.c:2016
-#, fuzzy
-msgid "Append Selection to File"
-msgstr "Kuri Idosiye"
-
-#: src/files.c:2017
-#, fuzzy
-msgid "Write Selection to File"
-msgstr "Kuri Idosiye"
-
-#: src/files.c:2020
-#, fuzzy
-msgid "File Name to Prepend to"
-msgstr "Idosiye Kuri Kuri"
-
-#: src/files.c:2021
-#, fuzzy
-msgid "File Name to Append to"
-msgstr "Idosiye Kuri Kuri"
-
-#: src/files.c:2022
-#, fuzzy
-msgid "File Name to Write"
-msgstr "Idosiye Kuri"
-
-#: src/files.c:2153
-#, fuzzy
-msgid "File exists, OVERWRITE ? "
-msgstr "Idosiye"
-
-#: src/files.c:2162
-#, fuzzy
-msgid "Save file under DIFFERENT NAME ? "
-msgstr "Kubika IDOSIYE"
-
-#: src/files.c:2173
-msgid "File was modified since you opened it, continue saving ? "
-msgstr ""
-
-#: src/files.c:2611
-#, fuzzy
-msgid "(more)"
-msgstr "(Birenzeho"
-
-#: src/files.c:2694 src/rcfile.c:1220
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Press Enter to continue starting nano.\n"
-msgstr "Kuri urifuzagukomeza"
-
-# crashrep/source\all\crashrep.lng:%CANCEL_BUTTON%.text
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:415 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Kureka"
-
-# offmgr/source\offapp\dialog\autocdlg.src:RID_OFA_AUTOCORR_DLG.1.RID_OFAPAGE_AUTOCORR_REPLACE.text
-#: src/global.c:416
-msgid "Replace"
-msgstr "Gusimbura"
-
-#: src/global.c:417
-msgid "No Replace"
-msgstr ""
-
-#: src/global.c:420
-msgid "Case Sens"
-msgstr ""
-
-# #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
-# sch/source\ui\dlg\attrib2.src:TAB_AXIS.1.text
-# #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
-# sch/source\ui\dlg\attrib2.src:TAB_X_AXIS.1.text
-# #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
-# sch/source\ui\dlg\attrib2.src:TAB_Y_AXIS.1.text
-# #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
-# sch/source\ui\dlg\attrib2.src:TAB_Z_AXIS.1.text
-# #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
-# sch/source\ui\dlg\attrib2.src:TAB_GRID.1.text
-# #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
-# sch/source\ui\dlg\attrib2.src:TAB_LINE.1.text
-# #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
-# sch/source\ui\dlg\attrib.src:TAB_TITLE.1.text
-# #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
-# sch/source\ui\dlg\attrib.src:TAB_LEGEND.1.text
-# #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
-# sch/source\ui\dlg\attrib.src:TAB_DATA_LINE.1.text
-# #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
-# sch/source\ui\dlg\attrib.src:TAB_DATA_POINT.1.text
-# #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
-# sch/source\ui\dlg\attrib3.src:TAB_DIAGRAM_FLOOR.1.text
-# #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
-# sch/source\ui\dlg\attrib3.src:TAB_DIAGRAM_AREA.1.text
-# #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
-# sch/source\ui\dlg\attrib4.src:TAB_DIAGRAM_STOCK_LOSS.1.text
-# #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
-# sch/source\ui\dlg\attrib4.src:TAB_DIAGRAM_STOCK_PLUS.1.text
-#: src/global.c:421
-#, fuzzy
-msgid "Backwards"
-msgstr "Inyuma"
-
-#: src/global.c:425
-msgid "Regexp"
-msgstr ""
-
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:451
-#, fuzzy
-msgid "PrevHstory"
-msgstr "Urutonde"
-
-#: src/global.c:452
-#, fuzzy
-msgid "NextHstory"
-msgstr "Urutonde"
-
-#: src/global.c:453
-msgid "Go To Text"
-msgstr ""
-
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:455
-msgid "WhereIs Next"
-msgstr ""
-
-# svx/source\dialog\paragrph.src:RID_SVXPAGE_STD_PARAGRAPH.FT_FLINEINDENT.text
-#: src/global.c:457
-#, fuzzy
-msgid "First File"
-msgstr "Umurongo ubanza"
-
-# svx/source\dialog\paragrph.src:RID_SVXPAGE_ALIGN_PARAGRAPH.FT_LASTLINE.text
-#: src/global.c:458
-#, fuzzy
-msgid "Last File"
-msgstr "Umurongo wa nyuma"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:460
-msgid "To Files"
-msgstr ""
-
-#: src/global.c:462
-msgid "DOS Format"
-msgstr ""
-
-#: src/global.c:463
-msgid "Mac Format"
-msgstr ""
-
-# 214
-#: src/global.c:464
-msgid "Append"
-msgstr "kugereka"
-
-#: src/global.c:465
-msgid "Prepend"
-msgstr ""
-
-# 503
-#: src/global.c:466
-#, fuzzy
-msgid "Backup File"
-msgstr "inyibutsabubiko"
-
-#: src/global.c:467
-msgid "Execute Command"
-msgstr ""
-
-#: src/global.c:471
-msgid "Go To Dir"
-msgstr ""
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:480
-msgid "Get Help"
-msgstr ""
-
-# #-#-#-#-#  setup2.pot (PACKAGE VERSION)  #-#-#-#-#
-# setup2/source\ui\app.src:STR_RESTART_BTN_NO.text
-# #-#-#-#-#  setup2.pot (PACKAGE VERSION)  #-#-#-#-#
-# setup2/source\ui\pages\phavefun.src:RESID_PAGE_PAGEHAVEFUN.STR_LOGOUT_BTN_NO.text
-#: src/global.c:481
-msgid "Exit"
-msgstr "Gusohoka"
-
-#: src/global.c:482
-msgid "Where Is"
-msgstr ""
-
-#: src/global.c:483
-msgid "Prev Page"
-msgstr ""
-
-# sc/sdi\scslots.src:SID_PREVIEW_NEXT.text
-#: src/global.c:484
-msgid "Next Page"
-msgstr "Ipaji ikurikira"
-
-# svx/source\dialog\paragrph.src:RID_SVXPAGE_STD_PARAGRAPH.FT_FLINEINDENT.text
-#: src/global.c:485
-#, fuzzy
-msgid "First Line"
-msgstr "Umurongo ubanza"
-
-# svx/source\dialog\paragrph.src:RID_SVXPAGE_ALIGN_PARAGRAPH.FT_LASTLINE.text
-#: src/global.c:486
-#, fuzzy
-msgid "Last Line"
-msgstr "Umurongo wa nyuma"
-
-#: src/global.c:487
-msgid "Suspend"
-msgstr ""
-
-#: src/global.c:489
-#, fuzzy
-msgid "Beg of Par"
-msgstr "Bya"
-
-#: src/global.c:490
-#, fuzzy
-msgid "End of Par"
-msgstr "Impera Bya"
-
-#: src/global.c:491
-msgid "FullJstify"
-msgstr ""
-
-# dbaccess/source/ui/inc/toolbox.hrc:MID_SBA_QRY_REFRESH.text
-#: src/global.c:493
-msgid "Refresh"
-msgstr "Kugira gishya"
-
-#: src/global.c:495
-msgid "Insert File"
-msgstr "Kongeramo Idosiye"
-
-#: src/global.c:497
-#, fuzzy
-msgid "Go To Line"
-msgstr "Gya kumurongo"
-
-#: src/global.c:500
-#, fuzzy
-msgid "Justify the current paragraph"
-msgstr "i KIGEZWEHO Igika"
-
-#. 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:505
-#, fuzzy
-msgid "Cancel the current function"
-msgstr "i KIGEZWEHO Umumaro"
-
-#: src/global.c:506
-msgid "Display this help text"
-msgstr ""
-
-#: src/global.c:509
-#, fuzzy
-msgid "Close the current file buffer / Exit from nano"
-msgstr "Funga IDOSIYE Bivuye"
-
-#: src/global.c:511
-#, fuzzy
-msgid "Exit from nano"
-msgstr "Bivuye"
-
-#: src/global.c:515
-#, fuzzy
-msgid "Write the current file to disk"
-msgstr "i KIGEZWEHO IDOSIYE Kuri"
-
-#: src/global.c:517
-#, fuzzy
-msgid "Insert another file into the current one"
-msgstr "IDOSIYE i KIGEZWEHO"
-
-#: src/global.c:519
-#, fuzzy
-msgid "Search for a string or a regular expression"
-msgstr "Ibisanzwe"
-
-#: src/global.c:520
-#, fuzzy
-msgid "Go to previous screen"
-msgstr "Kuri i Ibanjirije Mugaragaza"
-
-#: src/global.c:521
-#, fuzzy
-msgid "Go to next screen"
-msgstr "Kuri i Komeza>> Mugaragaza"
-
-#: src/global.c:523
-#, fuzzy
-msgid "Cut the current line and store it in the cutbuffer"
-msgstr "i KIGEZWEHO Umurongo Na in i"
-
-#: src/global.c:525
-#, fuzzy
-msgid "Uncut from the cutbuffer into the current line"
-msgstr "Bivuye i i KIGEZWEHO Umurongo"
-
-#: src/global.c:527
-#, fuzzy
-msgid "Display the position of the cursor"
-msgstr "i Ibirindiro Bya i indanga"
-
-#: src/global.c:529
-#, fuzzy
-msgid "Invoke the spell checker, if available"
-msgstr "i Genzuranyuguti NIBA Bihari"
-
-#: src/global.c:531
-#, fuzzy
-msgid "Replace a string or a regular expression"
-msgstr "Ibisanzwe"
-
-#: src/global.c:532
-#, fuzzy
-msgid "Go to line and column number"
-msgstr "Kuri a Umurongo Umubare"
-
-#: src/global.c:534
-#, fuzzy
-msgid "Mark text at the cursor position"
-msgstr "Umwandiko ku i indanga Ibirindiro"
-
-#: src/global.c:535
-#, fuzzy
-msgid "Repeat last search"
-msgstr "Iheruka Gushaka"
-
-#: src/global.c:537
-#, fuzzy
-msgid "Copy the current line and store it in the cutbuffer"
-msgstr "i KIGEZWEHO Umurongo Na in i"
-
-#: src/global.c:538
-#, fuzzy
-msgid "Indent the current line"
-msgstr "Kuri i KIGEZWEHO IDOSIYE"
-
-#: src/global.c:539
-#, fuzzy
-msgid "Unindent the current line"
-msgstr "Kuri i KIGEZWEHO IDOSIYE"
-
-#: src/global.c:540
-msgid "Undo the last operation"
-msgstr ""
-
-#: src/global.c:541
-msgid "Redo the last undone operation"
-msgstr ""
-
-#: src/global.c:543
-#, fuzzy
-msgid "Go forward one character"
-msgstr "Imbere Inyuguti"
-
-#: src/global.c:544
-#, fuzzy
-msgid "Go back one character"
-msgstr "Inyuma Inyuguti"
-
-#: src/global.c:546
-#, fuzzy
-msgid "Go forward one word"
-msgstr "Imbere ijambo"
-
-#: src/global.c:547
-#, fuzzy
-msgid "Go back one word"
-msgstr "subira inyuma ijambo"
-
-#: src/global.c:549
-#, fuzzy
-msgid "Go to previous line"
-msgstr "Kuri i Ibanjirije Umurongo"
-
-#: src/global.c:550
-#, fuzzy
-msgid "Go to next line"
-msgstr "Kuri i Komeza>> Umurongo"
-
-#: src/global.c:551
-#, fuzzy
-msgid "Go to beginning of current line"
-msgstr "Kuri i Itangiriro Bya i KIGEZWEHO Umurongo"
-
-#: src/global.c:552
-#, fuzzy
-msgid "Go to end of current line"
-msgstr "Kuri i Impera Bya i KIGEZWEHO Umurongo"
-
-#: src/global.c:555
-#, fuzzy
-msgid "Go to beginning of paragraph; then of previous paragraph"
-msgstr "Kuri i Itangiriro Bya i KIGEZWEHO Igika"
-
-#: src/global.c:557
-#, fuzzy
-msgid "Go just beyond end of paragraph; then of next paragraph"
-msgstr "Kuri i Impera Bya i KIGEZWEHO Igika"
-
-#: src/global.c:560
-#, fuzzy
-msgid "Go to the first line of the file"
-msgstr "Kuri i Itangira Umurongo Bya i IDOSIYE"
-
-#: src/global.c:562
-#, fuzzy
-msgid "Go to the last line of the file"
-msgstr "Kuri i Iheruka Umurongo Bya i IDOSIYE"
-
-#: src/global.c:564
-#, fuzzy
-msgid "Go to the matching bracket"
-msgstr "a"
-
-#: src/global.c:566
-msgid "Scroll up one line without scrolling the cursor"
-msgstr ""
-
-#: src/global.c:568
-msgid "Scroll down one line without scrolling the cursor"
-msgstr ""
-
-#: src/global.c:572
-#, fuzzy
-msgid "Switch to the previous file buffer"
-msgstr "Kuri i Ibanjirije IDOSIYE"
-
-#: src/global.c:574
-#, fuzzy
-msgid "Switch to the next file buffer"
-msgstr "Kuri i Komeza>> IDOSIYE"
-
-#: src/global.c:577
-#, fuzzy
-msgid "Insert the next keystroke verbatim"
-msgstr "Inyuguti S"
-
-#: src/global.c:579
-#, fuzzy
-msgid "Insert a tab at the cursor position"
-msgstr "a Isunika Inyuguti ku i indanga Ibirindiro"
-
-#: src/global.c:581
-#, fuzzy
-msgid "Insert a newline at the cursor position"
-msgstr "a Garuka ku i indanga Ibirindiro"
-
-#: src/global.c:583
-#, fuzzy
-msgid "Delete the character under the cursor"
-msgstr "i Inyuguti i indanga"
-
-#: src/global.c:585
-#, fuzzy
-msgid "Delete the character to the left of the cursor"
-msgstr "i Inyuguti Kuri i Ibumoso: Bya i indanga"
-
-#: src/global.c:588
-#, fuzzy
-msgid "Cut from the cursor position to the end of the file"
-msgstr "Bivuye i indanga Ibirindiro Kuri i Impera Bya i IDOSIYE"
-
-#: src/global.c:591
-#, fuzzy
-msgid "Justify the entire file"
-msgstr "i IDOSIYE"
-
-#: src/global.c:595
-msgid "Count the number of words, lines, and characters"
-msgstr ""
-
-#: src/global.c:598
-#, fuzzy
-msgid "Refresh (redraw) the current screen"
-msgstr "Kongera Gushushanya i KIGEZWEHO Mugaragaza"
-
-#: src/global.c:600
-msgid "Suspend the editor (if suspend is enabled)"
-msgstr ""
-
-#: src/global.c:603
-msgid "Toggle the case sensitivity of the search"
-msgstr ""
-
-#: src/global.c:605
-#, fuzzy
-msgid "Reverse the direction of the search"
-msgstr "i Ibirindiro Bya i indanga"
-
-#: src/global.c:609
-#, fuzzy
-msgid "Toggle the use of regular expressions"
-msgstr "Ibisanzwe"
-
-#: src/global.c:613
-#, fuzzy
-msgid "Recall the previous search/replace string"
-msgstr "i Ibanjirije Gushaka Gusimbura Ikurikiranyanyuguti"
-
-#: src/global.c:615
-#, fuzzy
-msgid "Recall the next search/replace string"
-msgstr "i Ibanjirije Gushaka Gusimbura Ikurikiranyanyuguti"
-
-#: src/global.c:618
-#, fuzzy
-msgid "Go to file browser"
-msgstr "Kuri IDOSIYE Mucukumbuzi"
-
-#: src/global.c:621
-#, fuzzy
-msgid "Toggle the use of DOS format"
-msgstr "IDOSIYE Inyuma in Imiterere"
-
-#: src/global.c:622
-#, fuzzy
-msgid "Toggle the use of Mac format"
-msgstr "IDOSIYE Inyuma in Imiterere"
-
-#: src/global.c:624
-msgid "Toggle appending"
-msgstr ""
-
-#: src/global.c:625
-msgid "Toggle prepending"
-msgstr ""
-
-#: src/global.c:628
-msgid "Toggle backing up of the original file"
-msgstr ""
-
-#: src/global.c:629
-#, fuzzy
-msgid "Execute external command"
-msgstr "external Komandi:"
-
-#: src/global.c:633
-#, fuzzy
-msgid "Toggle the use of a new buffer"
-msgstr "OYA Kubona Ingano Bya"
-
-#: src/global.c:636
-#, fuzzy
-msgid "Exit from the file browser"
-msgstr "Bivuye i IDOSIYE Mucukumbuzi"
-
-#: src/global.c:638
-#, fuzzy
-msgid "Go to the first file in the list"
-msgstr "Kuri i Itangira Umurongo Bya i IDOSIYE"
-
-#: src/global.c:640
-#, fuzzy
-msgid "Go to the last file in the list"
-msgstr "Kuri i Iheruka Umurongo Bya i IDOSIYE"
-
-#: src/global.c:641
-#, fuzzy
-msgid "Go to the next file in the list"
-msgstr "Kuri i Komeza>> Umurongo"
-
-#: src/global.c:642
-#, fuzzy
-msgid "Go to the previous file in the list"
-msgstr "Kuri i Ibanjirije Umurongo"
-
-#: src/global.c:643
-#, fuzzy
-msgid "Go to directory"
-msgstr "Kuri bushyinguro"
-
-# #-#-#-#-#  basctl.pot (PACKAGE VERSION)  #-#-#-#-#
-# basctl/source\basicide\macrodlg.src:RID_MACROCHOOSER.RID_PB_CLOSE.text
-# #-#-#-#-#  basctl.pot (PACKAGE VERSION)  #-#-#-#-#
-# basctl/source\basicide\macrodlg.src:RID_STR_CLOSE.text
-# #-#-#-#-#  basctl.pot (PACKAGE VERSION)  #-#-#-#-#
-# basctl/source\basicide\moduldlg.src:RID_TP_MODULS.RID_PB_CLOSE.text
-# #-#-#-#-#  basctl.pot (PACKAGE VERSION)  #-#-#-#-#
-# basctl/source\basicide\moduldlg.src:RID_TP_LIBS.RID_PB_CLOSE.text
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:670
-msgid "Close"
-msgstr "Gufunga"
-
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:679
-msgid "WriteOut"
-msgstr ""
-
-# sc/source\ui\src\scstring.src:SCSTR_HOR_JUSTIFY_BLOCK.text
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
-msgid "Justify"
-msgstr "Gukwiza umurongo wose"
-
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:696
-#, fuzzy
-msgid "Read File"
-msgstr "Idosiye"
-
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:713
-msgid "Cut Text"
-msgstr ""
-
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:718
-msgid "UnJustify"
-msgstr ""
-
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:723
-msgid "UnCut Text"
-msgstr ""
-
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:728 src/global.c:755
-msgid "Cur Pos"
-msgstr ""
-
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:737
-msgid "To Spell"
-msgstr ""
-
-#: src/global.c:771
-msgid "Mark Text"
-msgstr ""
-
-#: src/global.c:777
-msgid "Copy Text"
-msgstr ""
-
-#: src/global.c:780
-msgid "Indent Text"
-msgstr ""
-
-#: src/global.c:783
-msgid "Unindent Text"
-msgstr ""
-
-#: src/global.c:787
-msgid "Undo"
-msgstr ""
-
-#: src/global.c:790
-msgid "Redo"
-msgstr ""
-
-# sch/sdi\schslots.src:SID_ROW_MOREFRONT.text
-#: src/global.c:796 src/global.c:800
-msgid "Forward"
-msgstr "Imbere"
-
-# #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
-# sch/source\ui\dlg\attrib2.src:TAB_AXIS.1.text
-# #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
-# sch/source\ui\dlg\attrib2.src:TAB_X_AXIS.1.text
-# #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
-# sch/source\ui\dlg\attrib2.src:TAB_Y_AXIS.1.text
-# #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
-# sch/source\ui\dlg\attrib2.src:TAB_Z_AXIS.1.text
-# #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
-# sch/source\ui\dlg\attrib2.src:TAB_GRID.1.text
-# #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
-# sch/source\ui\dlg\attrib2.src:TAB_LINE.1.text
-# #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
-# sch/source\ui\dlg\attrib.src:TAB_TITLE.1.text
-# #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
-# sch/source\ui\dlg\attrib.src:TAB_LEGEND.1.text
-# #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
-# sch/source\ui\dlg\attrib.src:TAB_DATA_LINE.1.text
-# #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
-# sch/source\ui\dlg\attrib.src:TAB_DATA_POINT.1.text
-# #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
-# sch/source\ui\dlg\attrib3.src:TAB_DIAGRAM_FLOOR.1.text
-# #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
-# sch/source\ui\dlg\attrib3.src:TAB_DIAGRAM_AREA.1.text
-# #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
-# sch/source\ui\dlg\attrib4.src:TAB_DIAGRAM_STOCK_LOSS.1.text
-# #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
-# sch/source\ui\dlg\attrib4.src:TAB_DIAGRAM_STOCK_PLUS.1.text
-#: src/global.c:806 src/global.c:810
-msgid "Back"
-msgstr "Inyuma"
-
-#: src/global.c:817
-msgid "Next Word"
-msgstr ""
-
-#: src/global.c:820
-msgid "Prev Word"
-msgstr ""
-
-#: src/global.c:824
-msgid "Prev Line"
-msgstr ""
-
-#: src/global.c:827
-msgid "Next Line"
-msgstr ""
-
-#: src/global.c:830
-msgid "Home"
-msgstr "Home"
-
-# officecfg/registry\schema\org\openoffice\Office\DataAccess.xcs:....FormSearchOptions.SearchPosition..end-of-field.text
-#: src/global.c:833
-msgid "End"
-msgstr "Impera"
-
-#: src/global.c:845
-msgid "Find Other Bracket"
-msgstr ""
-
-#: src/global.c:848
-msgid "Scroll Up"
-msgstr ""
-
-#: src/global.c:851
-msgid "Scroll Down"
-msgstr ""
-
-#: src/global.c:856
-#, fuzzy
-msgid "Previous File"
-msgstr "Idosiye"
-
-#: src/global.c:858
-#, fuzzy
-msgid "Next File"
-msgstr "Idosiye"
-
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:862 src/text.c:3045
-msgid "Verbatim Input"
-msgstr ""
-
-# sc/source\ui\src\textdlgs.src:RID_SCDLG_PARAGRAPH.1.RID_SVXPAGE_TABULATOR.text
-#: src/global.c:867
-msgid "Tab"
-msgstr "Isimbuka"
-
-# LOCALIZATION NOTE : BLOCK end GLYPHS
-# Enter, backspace, and Tab might have both glyphs and text
-# if the keyboards usually have a glyph,
-# if there is a meaningful translation,
-# or if keyboards are localized
-# then translate them or insert the appropriate glyph
-# otherwise you should probably just translate the glyph regions
-# LOCALIZATION NOTE : BLOCK maybe GLYPHS
-#: src/global.c:870
-msgid "Enter"
-msgstr "Injiza"
-
-# #-#-#-#-#  basctl.pot (PACKAGE VERSION)  #-#-#-#-#
-# basctl/source\basicide\basidesh.src:RID_POPUP_TABBAR.SID_BASICIDE_DELETECURRENT.text
-# #-#-#-#-#  basctl.pot (PACKAGE VERSION)  #-#-#-#-#
-# basctl/source\basicide\brkdlg.src:RID_BASICIDE_BREAKPOINTDLG.RID_PB_DEL.text
-#: src/global.c:873
-msgid "Delete"
-msgstr "Gusiba"
-
-# #-#-#-#-#  sw.pot (PACKAGE VERSION)  #-#-#-#-#
-# sw/sdi\swslots.src:FN_BACKSPACE.text
-# #-#-#-#-#  sw.pot (PACKAGE VERSION)  #-#-#-#-#
-# sw/sdi\swslots.src:FN_SHIFT_BACKSPACE.text
-#: src/global.c:876
-msgid "Backspace"
-msgstr "Gusiba usubira inyuma"
-
-#: src/global.c:893
-msgid "CutTillEnd"
-msgstr ""
-
-#: src/global.c:906
-msgid "Word Count"
-msgstr ""
-
-#: src/global.c:1367
-#, fuzzy
-msgid "Help mode"
-msgstr "Ubwoko"
-
-#: src/global.c:1369
-#, fuzzy
-msgid "Constant cursor position display"
-msgstr "indanga Ibirindiro"
-
-#: src/global.c:1371
-#, fuzzy
-msgid "Use of one more line for editing"
-msgstr "Bya Birenzeho Umwanya kugirango"
-
-#: src/global.c:1373
-msgid "Smooth scrolling"
-msgstr ""
-
-#: src/global.c:1375
-#, fuzzy
-msgid "Whitespace display"
-msgstr "Kugaragaza"
-
-#: src/global.c:1377
-#, fuzzy
-msgid "Color syntax highlighting"
-msgstr "Igaragaza cyane"
-
-#: src/global.c:1379
-#, fuzzy
-msgid "Smart home key"
-msgstr "Ku Ntangiriro Urufunguzo"
-
-#: src/global.c:1381
-#, fuzzy
-msgid "Auto indent"
-msgstr "Ikurura"
-
-#: src/global.c:1383
-#, fuzzy
-msgid "Cut to end"
-msgstr "Kuri Impera"
-
-#: src/global.c:1385
-#, fuzzy
-msgid "Long line wrapping"
-msgstr "Umurongo Gufunika"
-
-#: src/global.c:1387
-msgid "Conversion of typed tabs to spaces"
-msgstr ""
-
-#: src/global.c:1389
-#, fuzzy
-msgid "Backup files"
-msgstr "Idosiye"
-
-#: src/global.c:1391
-#, fuzzy
-msgid "Multiple file buffers"
-msgstr "IDOSIYE"
-
-#: src/global.c:1393
-#, fuzzy
-msgid "Mouse support"
-msgstr "Gushigikira"
-
-#: src/global.c:1395
-#, fuzzy
-msgid "No conversion from DOS/Mac format"
-msgstr "Ihindurangero Bivuye Imiterere"
-
-#: src/global.c:1397
-msgid "Suspension"
-msgstr ""
-
-#: src/global.c:1399
-#, fuzzy
-msgid "Soft line wrapping"
-msgstr "Umurongo Gufunika"
-
-#: src/help.c:236
-#, fuzzy
-msgid ""
-"Search Command Help Text\n"
-"\n"
-" Enter the words or characters you would like to search for, and then press "
-"Enter.  If there is a match for the text you entered, the screen will be "
-"updated to the location of the nearest match for the search string.\n"
-"\n"
-" The previous search string will be shown in brackets after the search "
-"prompt.  Hitting Enter without entering any text will perform the previous "
-"search.  "
-msgstr ""
-"i Amagambo Cyangwa Inyuguti nka Kuri Gushaka kugirango Hanyuma kanda ni a "
-"BIHUYE kugirango i Umwandiko i Mugaragaza Kuri i Ahantu Bya i BIHUYE "
-"kugirango i Gushaka Ikurikiranyanyuguti Ibanjirije Gushaka "
-"Ikurikiranyanyuguti in Udusodeko Nyuma i Gushaka Urwinjiriro Umwandiko i "
-"Ibanjirije Gushaka Byahiswemo Umwandiko Na: i Ikimenyetso Na Hanyuma Gushaka "
-"Kuri Gusimbura in i Byahiswemo Umwandiko Umumaro Utubuto Bihari in Ubwoko"
-
-#: src/help.c:245
-msgid ""
-"If you have selected text with the mark and then search to replace, only "
-"matches in the selected text will be replaced.\n"
-"\n"
-" The following function keys are available in Search mode:\n"
-"\n"
-msgstr ""
-
-#: src/help.c:251
-#, fuzzy
-msgid ""
-"Go To Line Help Text\n"
-"\n"
-" Enter the line number that you wish to go to and hit Enter.  If there are "
-"fewer lines of text than the number you entered, you will be brought to the "
-"last line of the file.\n"
-"\n"
-" The following function keys are available in Go To Line mode:\n"
-"\n"
-msgstr ""
-"i Umurongo Umubare Kuri Gyayo Kuri Na kanda Bike Imirongo Bya Umwandiko i "
-"Umubare Kuri i Iheruka Umurongo Bya i IDOSIYE Umumaro Utubuto Bihari in "
-"Ubwoko"
-
-#: src/help.c:260
-#, fuzzy
-msgid ""
-"Insert File Help Text\n"
-"\n"
-" Type in the name of a file to be inserted into the current file buffer at "
-"the current cursor location.\n"
-"\n"
-" If you have compiled nano with multiple file buffer support, and enable "
-"multiple file buffers with the -F or --multibuffer command line flags, the "
-"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 ""
-"Idosiye in i Izina: Bya a IDOSIYE Kuri Byinjijwemo i KIGEZWEHO IDOSIYE ku i "
-"KIGEZWEHO indanga Ahantu Na: Igikubo IDOSIYE Gushigikira Na Gushoboza "
-"Igikubo Na: i Cyangwa Komandi: Umurongo Amabendera i Mukomatanya Cyangwa a "
-"IDOSIYE a IDOSIYE Kuri a Gukoresha Na Kuri Hindura hagati IDOSIYE "
-"Ahatanditseho OYA Injiza Izina ry'idosiye: Cyangwa Ubwoko in a Izina "
-"ry'idosiye: ku i Urwinjiriro Na Kanda Umumaro Utubuto Bihari in Idosiye "
-"Ubwoko"
-
-#: src/help.c:269
-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"
-"\n"
-" The following function keys are available in Insert File mode:\n"
-"\n"
-msgstr ""
-
-#: src/help.c:275
-#, fuzzy
-msgid ""
-"Write File Help Text\n"
-"\n"
-" Type the name that you wish to save the current file as and press Enter to "
-"save the file.\n"
-"\n"
-" If you have selected text with the mark, you will be prompted to save only "
-"the selected portion to a separate file.  To reduce the chance of "
-"overwriting the current file with just a portion of it, the current filename "
-"is not the default in this mode.\n"
-"\n"
-" The following function keys are available in Write File mode:\n"
-"\n"
-msgstr ""
-"Idosiye i Izina: Kuri Kubika i KIGEZWEHO IDOSIYE Nka Na kanda Kuri Kubika i "
-"IDOSIYE Byahiswemo Umwandiko Na: i Ikimenyetso Kuri Kubika i Byahiswemo Kuri "
-"a IDOSIYE i Bya i KIGEZWEHO IDOSIYE Na: a Bya i KIGEZWEHO Izina ry'idosiye: "
-"ni OYA i Mburabuzi in iyi Ubwoko Umumaro Utubuto Bihari in Idosiye Ubwoko"
-
-#: src/help.c:289
-#, fuzzy
-msgid ""
-"File Browser Help Text\n"
-"\n"
-" The file browser is used to visually browse the directory structure to "
-"select a file for reading or writing.  You may use the arrow keys or Page Up/"
-"Down to browse through the files, and S or Enter to choose the selected file "
-"or enter the selected directory.  To move up one level, select the directory "
-"called \"..\" at the top of the file list.\n"
-"\n"
-" The following function keys are available in the file browser:\n"
-"\n"
-msgstr ""
-"Project- Id- Version: basctl\n"
-"POT- Creation- Date: 2003- 12- 07 17: 13+ 02\n"
-"PO- Revision- Date: 2004- 11- 04 10: 13- 0700\n"
-"Last- Translator: Language- Team:< en@ li. org> MIME- Version: 1. 0\n"
-"Content- Type: text/ plain; charset= UTF- 8\n"
-"Content- Transfer- Encoding: 8bit\n"
-"X- Generator: KBabel 1. 0\n"
-"."
-
-#: src/help.c:302
-#, fuzzy
-msgid ""
-"Browser Search Command Help Text\n"
-"\n"
-" Enter the words or characters you would like to search for, and then press "
-"Enter.  If there is a match for the text you entered, the screen will be "
-"updated to the location of the nearest match for the search string.\n"
-"\n"
-" The previous search string will be shown in brackets after the search "
-"prompt.  Hitting Enter without entering any text will perform the previous "
-"search.\n"
-"\n"
-msgstr ""
-"i Amagambo Cyangwa Inyuguti nka Kuri Gushaka kugirango Hanyuma kanda ni a "
-"BIHUYE kugirango i Umwandiko i Mugaragaza Kuri i Ahantu Bya i BIHUYE "
-"kugirango i Gushaka Ikurikiranyanyuguti Ibanjirije Gushaka "
-"Ikurikiranyanyuguti in Udusodeko Nyuma i Gushaka Urwinjiriro Umwandiko i "
-"Ibanjirije Gushaka Byahiswemo Umwandiko Na: i Ikimenyetso Na Hanyuma Gushaka "
-"Kuri Gusimbura in i Byahiswemo Umwandiko Umumaro Utubuto Bihari in Ubwoko"
-
-#: src/help.c:311
-msgid ""
-" The following function keys are available in Browser Search mode:\n"
-"\n"
-msgstr ""
-
-#: src/help.c:315
-#, fuzzy
-msgid ""
-"Browser Go To Directory Help Text\n"
-"\n"
-" Enter the name of the directory you would like to browse to.\n"
-"\n"
-" If tab completion has not been disabled, you can use the Tab key to "
-"(attempt to) automatically complete the directory name.\n"
-"\n"
-" The following function keys are available in Browser Go To Directory mode:\n"
-"\n"
-msgstr ""
-"i Izina: Bya i bushyinguro nka Kuri Gushakisha... Kuri Isunika OYA "
-"Yahagaritswe Gukoresha i Urufunguzo Kuri Kuri ku buryo bwikora Byuzuye i "
-"bushyinguro Izina: Umumaro Utubuto Bihari in Ubwoko"
-
-#: src/help.c:328
-#, fuzzy
-msgid ""
-"Spell Check Help Text\n"
-"\n"
-" The spell checker checks the spelling of all text in the current file.  "
-"When an unknown word is encountered, it is highlighted and a replacement can "
-"be edited.  It will then prompt to replace every instance of the given "
-"misspelled word in the current file, or, if you have selected text with the "
-"mark, in the selected text.\n"
-"\n"
-" The following function keys are available in Spell Check mode:\n"
-"\n"
-msgstr ""
-"Genzuranyuguti i Ivuganyuguti Bya Byose Umwandiko in i KIGEZWEHO IDOSIYE "
-"Kitazwi ijambo ni ni Na a Hanyuma Urwinjiriro Kuri Gusimbura buri Urugero "
-"Bya i ijambo in i KIGEZWEHO IDOSIYE Cyangwa NIBA Byahiswemo Umwandiko Na: i "
-"Ikimenyetso in i Byahiswemo Umwandiko Ikindi Imimaro Bihari in Ubwoko"
-
-#: src/help.c:343
-#, fuzzy
-msgid ""
-"Execute Command Help Text\n"
-"\n"
-" This mode allows you to insert the output of a command run by the shell "
-"into the current buffer (or a new buffer in multiple file buffer mode).  If "
-"you need another blank buffer, do not enter any command.\n"
-"\n"
-" The following function keys are available in Execute Command mode:\n"
-"\n"
-msgstr ""
-"Ibikubiyemo Kuri Kongeramo i Ibisohoka Bya a Komandi: Gukoresha ku i "
-"Igikonoshwa i KIGEZWEHO Cyangwa a Gishya in Ubwoko Ahatanditseho OYA Injiza "
-"Komandi: Utubuto Bihari in iyi Ubwoko"
-
-#: src/help.c:356
-msgid ""
-"Main nano help text\n"
-"\n"
-" The nano editor is designed to emulate the functionality and ease-of-use of "
-"the UW Pico text editor.  There are four main sections of the editor.  The "
-"top line shows the program version, the current filename being edited, and "
-"whether or not the file has been modified.  Next is the main editor window "
-"showing the file being edited.  The status line is the third line from the "
-"bottom and shows important messages.  "
-msgstr ""
-
-#: src/help.c:366
-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.  "
-msgstr ""
-
-#: src/help.c:375
-msgid ""
-"Also, pressing Esc twice and then typing a three-digit decimal number from "
-"000 to 255 will enter the character with the corresponding value.  The "
-"following keystrokes are available in the main editor window.  Alternative "
-"keys are shown in parentheses:\n"
-"\n"
-msgstr ""
-
-#: src/help.c:407 src/help.c:483
-#, fuzzy
-msgid "enable/disable"
-msgstr "Gushoboza"
-
-#: src/nano.c:587
-#, fuzzy
-msgid "Key invalid in view mode"
-msgstr "in Ubwoko"
-
-#: src/nano.c:695
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Buffer written to %s\n"
-msgstr "Kuri"
-
-#: src/nano.c:697
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Buffer not written to %s: %s\n"
-msgstr "Kuri"
-
-#: src/nano.c:700
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Buffer not written: %s\n"
-msgstr "Kuri"
-
-#: src/nano.c:723
-#, fuzzy
-msgid "Window size is too small for nano...\n"
-msgstr "Ingano ni Gitoya kugirango"
-
-#: src/nano.c:816
-#, c-format
-msgid ""
-"Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
-"\n"
-msgstr ""
-
-#: src/nano.c:819
-#, c-format
-msgid "Option\t\tGNU long option\t\tMeaning\n"
-msgstr ""
-
-#: src/nano.c:821
-#, c-format
-msgid "Option\t\tMeaning\n"
-msgstr ""
-
-#: src/nano.c:824
-#, fuzzy
-msgid "Show this message"
-msgstr "iyi Ubutumwa"
-
-#: src/nano.c:825
-msgid "+LINE,COLUMN"
-msgstr ""
-
-#: src/nano.c:826
-#, fuzzy
-msgid "Start at line LINE, column COLUMN"
-msgstr "Gutangira ku Umurongo Umubare"
-
-#: src/nano.c:828
-#, fuzzy
-msgid "Enable smart home key"
-msgstr "Cyiza Ku Ntangiriro Urufunguzo"
-
-#: src/nano.c:829
-#, fuzzy
-msgid "Save backups of existing files"
-msgstr "Idosiye ku Kubika"
-
-#: src/nano.c:830
-#, fuzzy
-msgid "-C <dir>"
-msgstr "-E"
-
-#: src/nano.c:830
-msgid "--backupdir=<dir>"
-msgstr ""
-
-#: src/nano.c:831
-#, fuzzy
-msgid "Directory for saving unique backup files"
-msgstr "kugirango Inyibutsa Idosiye"
-
-#: src/nano.c:834
-msgid "Use bold instead of reverse video text"
-msgstr ""
-
-#: src/nano.c:837
-msgid "Convert typed tabs to spaces"
-msgstr ""
-
-#: src/nano.c:840
-#, fuzzy
-msgid "Enable multiple file buffers"
-msgstr "Igikubo IDOSIYE"
-
-#: src/nano.c:845
-#, fuzzy
-msgid "Log & read search/replace string history"
-msgstr "Gusoma Gushaka Gusimbura Ikurikiranyanyuguti Urutonde"
-
-#: src/nano.c:848
-#, fuzzy
-msgid "Don't look at nanorc files"
-msgstr "ku Idosiye"
-
-#: src/nano.c:851
-msgid "Fix numeric keypad key confusion problem"
-msgstr ""
-
-#: src/nano.c:853
-msgid "Don't add newlines to the ends of files"
-msgstr ""
-
-#: src/nano.c:856
-#, fuzzy
-msgid "Don't convert files from DOS/Mac format"
-msgstr "GUHINDURA Idosiye Bivuye Imiterere"
-
-#: src/nano.c:858
-#, fuzzy
-msgid "Use one more line for editing"
-msgstr "Bya Birenzeho Umwanya kugirango"
-
-#: src/nano.c:860
-msgid "-Q <str>"
-msgstr ""
-
-#: src/nano.c:860
-msgid "--quotestr=<str>"
-msgstr ""
-
-#: src/nano.c:861
-#, fuzzy
-msgid "Quoting string"
-msgstr "Ikurikiranyanyuguti Mburabuzi"
-
-#: src/nano.c:863
-#, fuzzy
-msgid "Restricted mode"
-msgstr "Ubwoko"
-
-#: src/nano.c:866
-msgid "Scroll by line instead of half-screen"
-msgstr ""
-
-#: src/nano.c:868
-#, fuzzy
-msgid "-T <#cols>"
-msgstr "-R"
-
-#: src/nano.c:868
-msgid "--tabsize=<#cols>"
-msgstr ""
-
-#: src/nano.c:869
-#, fuzzy
-msgid "Set width of a tab to #cols columns"
-msgstr "Ubugari Bya a Isunika in Kuri"
-
-#: src/nano.c:871
-msgid "Do quick statusbar blanking"
-msgstr ""
-
-#: src/nano.c:874
-#, fuzzy
-msgid "Print version information and exit"
-msgstr "Verisiyo Ibisobanuro Na Gusohoka"
-
-#: src/nano.c:877
-msgid "Detect word boundaries more accurately"
-msgstr ""
-
-#: src/nano.c:880
-msgid "-Y <str>"
-msgstr ""
-
-#: src/nano.c:880
-msgid "--syntax=<str>"
-msgstr ""
-
-#: src/nano.c:881
-#, fuzzy
-msgid "Syntax definition to use for coloring"
-msgstr "Insobanuro Kuri Gukoresha"
-
-#: src/nano.c:883
-#, fuzzy
-msgid "Constantly show cursor position"
-msgstr "Garagaza indanga Ibirindiro"
-
-#: src/nano.c:885
-msgid "Fix Backspace/Delete confusion problem"
-msgstr ""
-
-#: src/nano.c:888
-#, fuzzy
-msgid "Automatically indent new lines"
-msgstr "Ikurura Gishya Imirongo"
-
-#: src/nano.c:889
-#, fuzzy
-msgid "Cut from cursor to end of line"
-msgstr "Bivuye indanga Kuri Impera Bya Umurongo"
-
-#: src/nano.c:892
-#, fuzzy
-msgid "Don't follow symbolic links, overwrite"
-msgstr "amahuza Guhindura"
-
-#: src/nano.c:894
-#, fuzzy
-msgid "Enable the use of the mouse"
-msgstr "Imbeba"
-
-#: src/nano.c:897
-#, fuzzy
-msgid "-o <dir>"
-msgstr "-o"
-
-#: src/nano.c:897
-#, fuzzy
-msgid "--operatingdir=<dir>"
-msgstr "bushyinguro"
-
-#: src/nano.c:898
-#, fuzzy
-msgid "Set operating directory"
-msgstr "bushyinguro"
-
-#: src/nano.c:901
-#, fuzzy
-msgid "Preserve XON (^Q) and XOFF (^S) keys"
-msgstr "Na Utubuto"
-
-#: src/nano.c:903
-msgid "Silently ignore startup issues like rc file errors"
-msgstr ""
-
-#: src/nano.c:905
-#, fuzzy
-msgid "-r <#cols>"
-msgstr "-R"
-
-#: src/nano.c:905
-#, fuzzy
-msgid "--fill=<#cols>"
-msgstr "--Kuzuza"
-
-#: src/nano.c:906
-#, fuzzy
-msgid "Set wrapping point at column #cols"
-msgstr "Ubugari Bya a Isunika in Kuri"
-
-#: src/nano.c:909
-#, fuzzy
-msgid "-s <prog>"
-msgstr "-S"
-
-#: src/nano.c:909
-msgid "--speller=<prog>"
-msgstr ""
-
-#: src/nano.c:910
-msgid "Enable alternate speller"
-msgstr ""
-
-#: src/nano.c:913
-#, fuzzy
-msgid "Auto save on exit, don't prompt"
-msgstr "Kubika ku Gusohoka Urwinjiriro"
-
-#: src/nano.c:915
-msgid "Allow generic undo [EXPERIMENTAL]"
-msgstr ""
-
-#: src/nano.c:918
-#, fuzzy
-msgid "View mode (read-only)"
-msgstr "Gusoma Ubwoko"
-
-#: src/nano.c:920
-#, fuzzy
-msgid "Don't wrap long lines"
-msgstr "Gufunika Imirongo"
-
-#: src/nano.c:922
-#, fuzzy
-msgid "Don't show the two help lines"
-msgstr "Garagaza Ifashayobora Idirishya"
-
-#: src/nano.c:923
-#, fuzzy
-msgid "Enable suspension"
-msgstr "Imbeba"
-
-#: src/nano.c:924
-msgid "Enable soft line wrapping"
-msgstr ""
-
-#: src/nano.c:928
-#, fuzzy
-msgid "(ignored, for Pico compatibility)"
-msgstr "(kugirango Bihuye neza"
-
-#: src/nano.c:938
-#, fuzzy, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
-msgstr "Verisiyo"
-
-#: src/nano.c:943
-#, fuzzy, c-format
-msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
-msgstr "Muhinduzi HTTP www Muhinduzi org"
-
-#: src/nano.c:944
-#, fuzzy, c-format
-msgid ""
-"\n"
-" Compiled options:"
-msgstr "Amahitamo"
-
-#: src/nano.c:1022
-#, fuzzy
-msgid "Sorry, support for this function has been disabled"
-msgstr "Gushigikira kugirango iyi Umumaro Yahagaritswe"
-
-#: src/nano.c:1044
-#, fuzzy
-msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
-msgstr "Kubika Byahinduwe"
-
-#: src/nano.c:1088
-msgid "Couldn't reopen stdin from keyboard, sorry\n"
-msgstr ""
-
-#: src/nano.c:1114
-#, c-format
-msgid "Reading from stdin, ^C to abort\n"
-msgstr ""
-
-#: src/nano.c:1182
-#, fuzzy
-msgid "Received SIGHUP or SIGTERM\n"
-msgstr "Cyangwa"
-
-#: src/nano.c:1204
-#, fuzzy, c-format
-msgid "Use \"fg\" to return to nano.\n"
-msgstr "Kuri Garuka Kuri"
-
-#: src/nano.c:1386
-#, fuzzy
-msgid "enabled"
-msgstr "Bikora"
-
-#: src/nano.c:1387
-#, fuzzy
-msgid "disabled"
-msgstr "Yahagaritswe"
-
-#: src/nano.c:1548 src/winio.c:1256
-#, fuzzy
-msgid "Unknown Command"
-msgstr "Ibendera"
-
-#: src/nano.c:1674
-msgid "XON ignored, mumble mumble"
-msgstr ""
-
-#: src/nano.c:1679
-msgid "XOFF ignored, mumble mumble"
-msgstr ""
-
-#: src/nano.c:2209 src/rcfile.c:1100
-#, fuzzy, c-format
-msgid "Requested tab size \"%s\" is invalid"
-msgstr "Isunika Ingano Sibyo"
-
-#: src/nano.c:2268 src/rcfile.c:1025
-#, fuzzy, c-format
-msgid "Requested fill size \"%s\" is invalid"
-msgstr "Kuzuza Ingano Sibyo"
-
-#. 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:1259
-msgid "Yy"
-msgstr ""
-
-#: src/prompt.c:1260
-msgid "Nn"
-msgstr ""
-
-# #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
-# officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Insert.Caption.WriterObject.Table.Settings.Numbering..10.text
-# #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
-# officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Insert.Caption.WriterObject.Frame.Settings.Numbering..10.text
-# #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
-# officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Insert.Caption.WriterObject.Graphic.Settings.Numbering..10.text
-# #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
-# officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Insert.Caption.OfficeObject.Calc.Settings.Numbering..10.text
-# #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
-# officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Insert.Caption.OfficeObject.Draw.Settings.Numbering..10.text
-# #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
-# officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Insert.Caption.OfficeObject.Chart.Settings.Numbering..10.text
-# #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
-# officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Insert.Caption.OfficeObject.Image.Settings.Numbering..10.text
-# #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
-# officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Insert.Caption.OfficeObject.Formula.Settings.Numbering..10.text
-# #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
-# officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Insert.Caption.OfficeObject.Impress.Settings.Numbering..10.text
-# #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
-# officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Insert.Caption.OfficeObject.OLEMisc.Settings.Numbering..10.text
-#: src/prompt.c:1261
-#, fuzzy
-msgid "Aa"
-msgstr "aa"
-
-#: src/prompt.c:1275
-msgid "Yes"
-msgstr "Yego"
-
-# basctl/source\basicide\basidesh.src:RID_STR_ALL.text
-#: src/prompt.c:1280
-msgid "All"
-msgstr "Byose"
-
-#: src/prompt.c:1285
-msgid "No"
-msgstr "Oya"
-
-#: src/rcfile.c:130
-#, fuzzy, c-format
-msgid "Error in %s on line %lu: "
-msgstr "in ku Umurongo"
-
-#: src/rcfile.c:185
-#, c-format
-msgid "Argument '%s' has an unterminated \""
-msgstr ""
-
-#: src/rcfile.c:212 src/rcfile.c:264 src/rcfile.c:711 src/rcfile.c:768
-#: src/rcfile.c:821
-#, fuzzy
-msgid "Regex strings must begin and end with a \" character"
-msgstr "Ikurikiranyanyuguti Na Impera Na: a Inyuguti"
-
-#: src/rcfile.c:238 src/search.c:62
-#, c-format
-msgid "Bad regex \"%s\": %s"
-msgstr ""
-
-#: src/rcfile.c:258
-#, fuzzy
-msgid "Missing syntax name"
-msgstr "Izina:"
-
-#: src/rcfile.c:316
-msgid "The \"none\" syntax is reserved"
-msgstr ""
-
-#: src/rcfile.c:323
-msgid "The \"default\" syntax must take no extensions"
-msgstr ""
-
-#: src/rcfile.c:386 src/rcfile.c:483
-#, fuzzy
-msgid "Missing key name"
-msgstr "Izina:"
-
-#: src/rcfile.c:398 src/rcfile.c:499
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
-msgstr ""
-
-#: src/rcfile.c:407
-msgid "Must specify function to bind key to"
-msgstr ""
-
-#: src/rcfile.c:418 src/rcfile.c:510
-msgid "Must specify menu to bind key to (or \"all\")"
-msgstr ""
-
-#: src/rcfile.c:426
-#, c-format
-msgid "Could not map name \"%s\" to a function"
-msgstr ""
-
-#: src/rcfile.c:432 src/rcfile.c:517
-#, fuzzy, c-format
-msgid "Could not map name \"%s\" to a menu"
-msgstr "OYA"
-
-#: src/rcfile.c:454
-#, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
-msgstr ""
-
-#: src/rcfile.c:625
-#, fuzzy, c-format
-msgid ""
-"Color \"%s\" not understood.\n"
-"Valid colors are \"green\", \"red\", \"blue\",\n"
-"\"white\", \"yellow\", \"cyan\", \"magenta\" and\n"
-"\"black\", with the optional prefix \"bright\"\n"
-"for foreground colors."
-msgstr ""
-"OYA Amabara Icyatsi Umutuku Ubururu Umweru Umuhondo Ubururu bukeye Umutuku "
-"werurutse umukara Na: i Bitari ngombwa Imbanziriza Bibonerana kugirango "
-"Amabara"
-
-#: src/rcfile.c:647
-#, fuzzy
-msgid "Cannot add a color command without a syntax command"
-msgstr "Kongeramo a Ibara a Umurongo"
-
-#: src/rcfile.c:652
-#, fuzzy
-msgid "Missing color name"
-msgstr "Ibara Izina:"
-
-#: src/rcfile.c:672
-#, fuzzy, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr "Ibara Bibonerana"
-
-#: src/rcfile.c:690 src/rcfile.c:809
-msgid "Missing regex string"
-msgstr ""
-
-#: src/rcfile.c:762
-#, fuzzy
-msgid "\"start=\" requires a corresponding \"end=\""
-msgstr "\"Gutangira a Impera"
-
-#: src/rcfile.c:804
-#, fuzzy
-msgid "Cannot add a header regex without a syntax command"
-msgstr "Kongeramo a Ibara a Umurongo"
-
-#: src/rcfile.c:874
-#, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
-msgstr ""
-
-#: src/rcfile.c:876
-msgid ""
-"Exiting.  Please use nano with the -I option if needed to adjust your nanorc "
-"settings\n"
-msgstr ""
-
-#: src/rcfile.c:926 src/rcfile.c:935 src/rcfile.c:945
-#, c-format
-msgid "Command \"%s\" not allowed in included file"
-msgstr ""
-
-#: src/rcfile.c:951 src/rcfile.c:1128
-#, c-format
-msgid "Syntax \"%s\" has no color commands"
-msgstr ""
-
-#: src/rcfile.c:966
-#, fuzzy, c-format
-msgid "Command \"%s\" not understood"
-msgstr "OYA"
-
-#: src/rcfile.c:972
-#, fuzzy
-msgid "Missing flag"
-msgstr "Ibendera"
-
-#: src/rcfile.c:994
-#, c-format
-msgid "Option \"%s\" requires an argument"
-msgstr ""
-
-#: src/rcfile.c:1012
-msgid "Option is not a valid multibyte string"
-msgstr ""
-
-#: src/rcfile.c:1038 src/rcfile.c:1066 src/rcfile.c:1075
-#, fuzzy
-msgid "Non-blank characters required"
-msgstr "Isunika Na Umwanya Inyuguti Bya ngombwa"
-
-#: src/rcfile.c:1048
-#, fuzzy
-msgid "Two single-column characters required"
-msgstr "UMWE Inkingi Inyuguti Bya ngombwa"
-
-#: src/rcfile.c:1114
-#, fuzzy, c-format
-msgid "Cannot unset flag \"%s\""
-msgstr "Ibendera"
-
-#: src/rcfile.c:1123
-#, fuzzy, c-format
-msgid "Unknown flag \"%s\""
-msgstr "Ibendera"
-
-#: src/rcfile.c:1182
-#, fuzzy
-msgid "I can't find my home directory!  Wah!"
-msgstr "Gushaka Ku Ntangiriro bushyinguro"
-
-#: src/search.c:96
-#, fuzzy, c-format
-msgid "\"%.*s%s\" not found"
-msgstr ""
-"\"%.*Project- Id- Version: basctl\n"
-"POT- Creation- Date: 2003- 12- 07 17: 13+ 02\n"
-"PO- Revision- Date: 2004- 11- 04 10: 13- 0700\n"
-"Last- Translator: Language- Team:< en@ li. org> MIME- Version: 1. 0\n"
-"Content- Type: text/ plain; charset= UTF- 8\n"
-"Content- Transfer- Encoding: 8bit\n"
-"X- Generator: KBabel 1. 0\n"
-"."
-
-#: src/search.c:205
-#, fuzzy
-msgid " (to replace) in selection"
-msgstr "(Kuri Gusimbura in Ihitamo"
-
-#: src/search.c:207
-#, fuzzy
-msgid " (to replace)"
-msgstr "(Kuri Gusimbura"
-
-#: src/search.c:784
-#, fuzzy
-msgid "Replace this instance?"
-msgstr "iyi Urugero"
-
-# offmgr/source\offapp\dialog\fontsubs.src:RID_SVX_FONT_SUBSTITUTION.STR_HEADER4.text
-#: src/search.c:962
-msgid "Replace with"
-msgstr "Gusimbuza na"
-
-#: src/search.c:1004
-#, fuzzy, c-format
-msgid "Replaced %lu occurrence"
-msgid_plural "Replaced %lu occurrences"
-msgstr[0] "ukugaragara"
-
-#: src/search.c:1034
-#, fuzzy
-msgid "Enter line number, column number"
-msgstr "Injiza inomero y'umurongo"
-
-#: src/search.c:1061
-msgid "Invalid line or column number"
-msgstr ""
-
-#: src/search.c:1214
-#, fuzzy
-msgid "Not a bracket"
-msgstr "a"
-
-#: src/search.c:1281
-msgid "No matching bracket"
-msgstr ""
-
-#: src/text.c:54
-msgid "Mark Set"
-msgstr ""
-
-#: src/text.c:58
-msgid "Mark Unset"
-msgstr ""
-
-#: src/text.c:443
-msgid "Nothing in undo buffer!"
-msgstr ""
-
-#: src/text.c:455 src/text.c:593
-#, c-format
-msgid "Internal error: can't match line %d.  Please save your work"
-msgstr ""
-
-#: src/text.c:466 src/text.c:603
-msgid "text add"
-msgstr ""
-
-#: src/text.c:475 src/text.c:613
-#, fuzzy
-msgid "text delete"
-msgstr "Idosiye"
-
-#: src/text.c:489 src/text.c:628
-#, fuzzy
-msgid "line wrap"
-msgstr "Umurongo Gufunika"
-
-#: src/text.c:503 src/text.c:636
-msgid "line join"
-msgstr ""
-
-#: src/text.c:514 src/text.c:651
-msgid "text cut"
-msgstr ""
-
-#: src/text.c:518 src/text.c:655
-msgid "text uncut"
-msgstr ""
-
-#: src/text.c:522 src/text.c:622
-msgid "line break"
-msgstr ""
-
-#: src/text.c:532 src/text.c:665
-#, fuzzy
-msgid "text insert"
-msgstr "Idosiye"
-
-#: src/text.c:550 src/text.c:659
-#, fuzzy
-msgid "text replace"
-msgstr "(Kuri Gusimbura"
-
-#: src/text.c:557 src/text.c:671
-msgid "Internal error: unknown type.  Please save your work"
-msgstr ""
-
-#: src/text.c:563
-#, c-format
-msgid "Undid action (%s)"
-msgstr ""
-
-#: src/text.c:578
-msgid "Nothing to re-do!"
-msgstr ""
-
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
-msgstr ""
-
-#: src/text.c:676
-#, c-format
-msgid "Redid action (%s)"
-msgstr ""
-
-#: src/text.c:766
-#, fuzzy
-msgid "Could not pipe"
-msgstr "OYA"
-
-#: src/text.c:793 src/text.c:2636 src/text.c:2788
-#, fuzzy
-msgid "Could not fork"
-msgstr "OYA"
-
-#: src/text.c:941
-msgid "Internal error: can't setup uncut.  Please save your work."
-msgstr ""
-
-#: src/text.c:950
-msgid "Internal error: unknown type.  Please save your work."
-msgstr ""
-
-#: src/text.c:1870
-#, fuzzy, c-format
-msgid "Bad quote string %s: %s"
-msgstr "Gushyiraho akugarizo Ikurikiranyanyuguti"
-
-#: src/text.c:2267
-#, fuzzy
-msgid "Can now UnJustify!"
-msgstr "NONEAHA"
-
-#: src/text.c:2462
-#, fuzzy
-msgid "Edit a replacement"
-msgstr "a"
-
-#: src/text.c:2548
-#, fuzzy
-msgid "Could not create pipe"
-msgstr "OYA Kurema"
-
-#: src/text.c:2550
-#, fuzzy
-msgid "Creating misspelled word list, please wait..."
-msgstr "ijambo Urutonde Tegereza"
-
-#: src/text.c:2642
-#, fuzzy
-msgid "Could not get size of pipe buffer"
-msgstr "OYA Kubona Ingano Bya"
-
-#: src/text.c:2693
-#, fuzzy
-msgid "Error invoking \"spell\""
-msgstr "Genzuranyuguti"
-
-#: src/text.c:2696
-#, fuzzy
-msgid "Error invoking \"sort -f\""
-msgstr "Ishungura F"
-
-#: src/text.c:2699
-msgid "Error invoking \"uniq\""
-msgstr ""
-
-#: src/text.c:2756 src/text.c:2965
-#, fuzzy
-msgid "Finished checking spelling"
-msgstr "Ivuganyuguti"
-
-#: src/text.c:2815
-#, fuzzy, c-format
-msgid "Error invoking \"%s\""
-msgstr "Genzuranyuguti"
-
-#: src/text.c:2960
-#, fuzzy, c-format
-msgid "Spell checking failed: %s"
-msgstr "Byanze"
-
-#: src/text.c:2962
-#, fuzzy, c-format
-msgid "Spell checking failed: %s: %s"
-msgstr "Byanze"
-
-#: src/text.c:3030
-#, c-format
-msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
-msgstr ""
-
-#: src/text.c:3031
-#, fuzzy
-msgid "In Selection:  "
-msgstr "Kuri Idosiye"
-
-#: src/utils.c:405 src/utils.c:417
-#, fuzzy
-msgid "nano is out of memory!"
-msgstr "ni Inyuma Bya Ububiko"
-
-#. TRANSLATORS: This is displayed during the input of a
-#. * six-digit hexadecimal Unicode character code.
-#: src/winio.c:1557
-msgid "Unicode Input"
-msgstr ""
-
-# sc/source\ui\src\globstr.src:RID_GLOBSTR.STR_DOC_MODIFIED.text
-#: src/winio.c:2149 src/winio.c:2153
-msgid "Modified"
-msgstr "Byahinduwe"
-
-# #-#-#-#-#  offmgr.pot (PACKAGE VERSION)  #-#-#-#-#
-# offmgr/source\offapp\dialog\treeopt.src:RID_OFADLG_OPTIONS_TREE_PAGES.SID_GENERAL_OPTIONS.5.text
-# #-#-#-#-#  offmgr.pot (PACKAGE VERSION)  #-#-#-#-#
-# offmgr/source\offapp\dialog\treeopt.src:RID_OFADLG_OPTIONS_TREE_PAGES.SID_SW_EDITOPTIONS.3.text
-# #-#-#-#-#  offmgr.pot (PACKAGE VERSION)  #-#-#-#-#
-# offmgr/source\offapp\dialog\treeopt.src:RID_OFADLG_OPTIONS_TREE_PAGES.SID_SW_ONLINEOPTIONS.2.text
-# #-#-#-#-#  offmgr.pot (PACKAGE VERSION)  #-#-#-#-#
-# offmgr/source\offapp\dialog\treeopt.src:RID_OFADLG_OPTIONS_TREE_PAGES.SID_SC_EDITOPTIONS.3.text
-# #-#-#-#-#  offmgr.pot (PACKAGE VERSION)  #-#-#-#-#
-# offmgr/source\offapp\dialog\treeopt.src:RID_OFADLG_OPTIONS_TREE_PAGES.SID_SD_EDITOPTIONS.3.text
-# #-#-#-#-#  offmgr.pot (PACKAGE VERSION)  #-#-#-#-#
-# offmgr/source\offapp\dialog\treeopt.src:RID_OFADLG_OPTIONS_TREE_PAGES.SID_SD_GRAPHIC_OPTIONS.3.text
-#: src/winio.c:2150
-msgid "View"
-msgstr "Igaragaza"
-
-#: src/winio.c:2164
-msgid "DIR:"
-msgstr ""
-
-# sc/source\ui\src\globstr.src:RID_GLOBSTR.STR_LINKERRORFILE.text
-#: src/winio.c:2171
-msgid "File:"
-msgstr "Idosiye:"
-
-#: src/winio.c:3360
-#, fuzzy, c-format
-msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
-msgstr "Umurongo Col INYUGUTI"
-
-#: src/winio.c:3492
-#, fuzzy
-msgid "The nano text editor"
-msgstr "Umwandiko Muhinduzi"
-
-# goodies/source\filter.vcl\eps\dlgeps.src:DLG_EXPORT_EPS.GRP_VERSION.text
-#: src/winio.c:3493
-#, fuzzy
-msgid "version"
-msgstr "Verisiyo"
-
-#: src/winio.c:3494
-#, fuzzy
-msgid "Brought to you by:"
-msgstr "Kuri ku"
-
-#: src/winio.c:3495
-#, fuzzy
-msgid "Special thanks to:"
-msgstr "Kuri"
-
-#: src/winio.c:3496
-msgid "The Free Software Foundation"
-msgstr ""
-
-#: src/winio.c:3497
-msgid "For ncurses:"
-msgstr ""
-
-#: src/winio.c:3498
-#, fuzzy
-msgid "and anyone else we forgot..."
-msgstr "Na Ikindi Twebwe"
-
-#: src/winio.c:3499
-#, fuzzy
-msgid "Thank you for using nano!"
-msgstr "kugirango ikoresha"
-
-# #-#-#-#-#  sc.pot (PACKAGE VERSION)  #-#-#-#-#
-# sc/source\ui\src\miscdlgs.src:RID_SCDLG_FILLSERIES.FL_DIRECTION.text
-# #-#-#-#-#  sc.pot (PACKAGE VERSION)  #-#-#-#-#
-# sc/source\ui\src\sortdlg.src:RID_SCPAGE_SORT_OPTIONS.FL_DIRECTION.text
-#~ msgid "Direction"
-#~ msgstr "Icyerekezo"
-
-#, fuzzy
-#~ msgid "Invoke the help menu"
-#~ msgstr "i Ifashayobora Ibikubiyemo"
-
-#, fuzzy
-#~ msgid "Search for text within the editor"
-#~ msgstr "kugirango Umwandiko muri i Muhinduzi"
-
-#, fuzzy
-#~ msgid "Replace text within the editor"
-#~ msgstr "Umwandiko muri i Muhinduzi"
-
-#, fuzzy
-#~ msgid "Find other bracket"
-#~ msgstr "Ikindi"
-
-#, fuzzy
-#~ msgid "Make the current search/replace case (in)sensitive"
-#~ msgstr "i KIGEZWEHO Gushaka Gusimbura in"
-
-#, fuzzy
-#~ msgid "Make the current search/replace go backwards"
-#~ msgstr "i KIGEZWEHO Gushaka Gusimbura Gyayo Inyuma"
-
-#, fuzzy
-#~ msgid "Prepend to the current file"
-#~ msgstr "Kuri i KIGEZWEHO IDOSIYE"
-
-#, fuzzy
-#~ msgid "Back up original file when saving"
-#~ msgstr "Hejuru Umwimerere IDOSIYE Ryari: Mu kubika"
-
-#, fuzzy
-#~ msgid "Insert into new buffer"
-#~ msgstr "Gishya"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "Buffer not written to %s (too many backup files?)\n"
-#~ msgstr "OYA Kuri Inyibutsa Idosiye"
-
-#, fuzzy
-#~ msgid ""
-#~ " nano help text\n"
-#~ "\n"
-#~ " The nano editor is designed to emulate the functionality and ease-of-use "
-#~ "of the UW Pico text editor.  There are four main sections of the editor.  "
-#~ "The top line shows the program version, the current filename being "
-#~ "edited, and whether or not the file has been modified.  Next is the main "
-#~ "editor window showing the file being edited.  The status line is the "
-#~ "third line from the bottom and shows important messages. 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 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.  Also, pressing "
-#~ "Esc twice and then typing a three-digit decimal number from 000 to 255 "
-#~ "will enter the character with the corresponding value.  The following "
-#~ "keystrokes are available in the main editor window.  Alternative keys are "
-#~ "shown in parentheses:\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Ifashayobora Muhinduzi ni Kuri i Na Bya Gukoresha Bya i Umwandiko "
-#~ "Muhinduzi Ibyatoranyijwe Bya i Muhinduzi Hejuru: Umurongo i Porogaramu "
-#~ "Verisiyo i KIGEZWEHO Izina ry'idosiye: Na Cyangwa OYA i IDOSIYE "
-#~ "Byahinduwe ni i Muhinduzi Idirishya i IDOSIYE Imimerere Umurongo ni i "
-#~ "Umurongo Bivuye i Hasi: Na By'ingirakamaro Ubutumwa Hasi: Imirongo "
-#~ "Garagaza i in i Muhinduzi kugirango ni Nka Urufunguzo Na: a IKIMENYETSO "
-#~ "Na ku ikoresha i Urufunguzo Cyangwa i Urufunguzo Urufunguzo Na: i "
-#~ "IKIMENYETSO Na ikoresha i Cyangwa Urufunguzo ku Mwandikisho Imikorere Na "
-#~ "Hanyuma Kwandika: a NYACUMI Umubare Bivuye 000 Kuri Injiza i Inyuguti Na: "
-#~ "i Agaciro Bihari in i Muhinduzi Idirishya Utubuto in"
-
-# sc/source\ui\src\optdlg.src:RID_SCPAGE_LAYOUT.LB_ALIGN.3.text
-#~ msgid "Up"
-#~ msgstr "Hejuru"
-
-# svx/source\dialog\sdstring.src:RID_SVXSTR_BMP5.text
-#~ msgid "Space"
-#~ msgstr "Umwanya"
-
-#, fuzzy
-#~ msgid ""
-#~ "Usage: nano [+LINE] [GNU long option] [option] [file]\n"
-#~ "\n"
-#~ msgstr "Ihitamo Ihitamo IDOSIYE"
-
-#, fuzzy
-#~ msgid ""
-#~ "Usage: nano [+LINE] [option] [file]\n"
-#~ "\n"
-#~ msgstr "Ihitamo IDOSIYE"
-
-#, fuzzy
-#~ msgid "Use more space for editing"
-#~ msgstr "Birenzeho Umwanya kugirango"
-
-#, fuzzy
-#~ msgid "Do regular expression searches"
-#~ msgstr "Ibisanzwe imvugo"
-
-#, fuzzy
-#~ msgid "Set fill cols to (wrap lines at) #cols"
-#~ msgstr "Kuzuza Kuri Gufunika Imirongo ku"
-
-#, fuzzy
-#~ msgid "Verbatim input"
-#~ msgstr "Iyinjiza"
-
-#, fuzzy
-#~ msgid "Could not create temp file: %s"
-#~ msgstr "OYA Kurema IDOSIYE"
-
-#, fuzzy
-#~ msgid "Come on, be reasonable"
-#~ msgstr "ku"
-
-#, fuzzy
-#~ msgid "Refusing zero-length regex match"
-#~ msgstr "Zeru Uburebure BIHUYE"
diff --git a/po/sl.gmo b/po/sl.gmo
new file mode 100644
index 0000000..1173b6d
--- /dev/null
+++ b/po/sl.gmo
diff --git a/po/sl.po b/po/sl.po
new file mode 100644
index 0000000..7c16537
--- /dev/null
+++ b/po/sl.po
@@ -0,0 +1,2434 @@
+# Slovenian translation of nano.
+# Copyright (C) 2009 - 2013 Free Software Foundation, Inc.
+# This file is distributed under the same license as the nano package.
+#
+# Damir Jerovšek <damir.jerovsek@gmail.com>, 2012.
+# Matej Urbančič <matej.urban@gmail.com>, 2012.
+# Klemen Košir <klemen913@gmail.com>, 2009, 2012, 2013.
+msgid ""
+msgstr ""
+"Project-Id-Version: nano 2.3.2pre4\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\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"
+"Language: sl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
+"%100==4 ? 3 : 0);\n"
+"X-Generator: Poedit 1.5.5\n"
+
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:203
+msgid "Go To Directory"
+msgstr "Pojdi v mapo"
+
+#: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
+msgid "Cancelled"
+msgstr "Preklicano"
+
+#: src/browser.c:246 src/browser.c:293
+#, c-format
+msgid "Can't go outside of %s in restricted mode"
+msgstr "V omejenem načinu ni mogoče zapustiti %s"
+
+#: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
+#: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
+#: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
+#: src/rcfile.c:590 src/rcfile.c:1426
+#, c-format
+msgid "Error reading %s: %s"
+msgstr "Napaka med branjem %s: %s"
+
+#: src/browser.c:283
+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:626 src/browser.c:635
+msgid "(dir)"
+msgstr "(mapa)"
+
+#. TRANSLATORS: Try to keep this at most 12
+#. * characters.
+#: src/browser.c:632
+msgid "(parent dir)"
+msgstr "(nad. mapa)"
+
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:759 src/search.c:181
+msgid "Search"
+msgstr "Iskanje"
+
+#: src/browser.c:812 src/search.c:382
+msgid "Search Wrapped"
+msgstr "Iskanje je ovito"
+
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
+msgid "This is the only occurrence"
+msgstr "To je edina pojavitev niza"
+
+#: src/browser.c:915 src/search.c:569
+msgid "No current search pattern"
+msgstr "Ni trenutnega vzorca iskanja"
+
+#: src/files.c:139
+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:145
+#, 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:165 src/files.c:175 src/files.c:212 src/files.c:222
+#, c-format
+msgid "Error writing lock file %s: %s"
+msgstr "Med zapisovanjem zaklepne datoteke %s je prišlo do napake: %s"
+
+#: src/files.c:237
+#, c-format
+msgid "Error deleting lock file %s: %s"
+msgstr "Med brisanjem zaklepne datoteke %s je prišlo do napake: %s"
+
+#: src/files.c:272
+#, 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:282
+#, fuzzy, c-format
+msgid "Error reading lock file %s: Not enough data read"
+msgstr ""
+"Med branjem zaklepne datoteke %s je prišlo do napake. Prebranih je bilo "
+"premalo podatkov."
+
+#. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
+#: src/files.c:297
+#, c-format
+msgid "File %s is being edited (by %s with %s, PID %d); continue?"
+msgstr ""
+
+#: src/files.c:308
+#, fuzzy, c-format
+msgid "Error writing lock file: Directory '%s' doesn't exist"
+msgstr "Med zapisovanjem zaklepne datoteke %s je prišlo do napake: %s"
+
+#: src/files.c:339
+#, c-format
+msgid "Can't insert file from outside of %s"
+msgstr "Ni mogoče vstaviti datoteke izven %s"
+
+#: src/files.c:467
+msgid "No more open file buffers"
+msgstr "Ni več medpomnilnikov odprtih datotek"
+
+#: src/files.c:484
+#, c-format
+msgid "Switched to %s"
+msgstr "Preklopljeno na %s"
+
+#: src/files.c:485 src/global.c:953 src/winio.c:2161
+msgid "New Buffer"
+msgstr "Nov medpomnilnik"
+
+#: src/files.c:874
+#, 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] "Prebranih je %lu vrstic (pretvorjeno iz oblike DOS in Mac)"
+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:879
+#, 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:885
+#, c-format
+msgid "Read %lu line (Converted from Mac format)"
+msgid_plural "Read %lu lines (Converted from Mac format)"
+msgstr[0] "Prebranih je %lu vrstic (pretvorjeno iz oblike Mac)"
+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:889
+#, 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:895
+#, c-format
+msgid "Read %lu line (Converted from DOS format)"
+msgid_plural "Read %lu lines (Converted from DOS format)"
+msgstr[0] "Prebranih je %lu vrstic (Pretvorjeno iz oblike DOS)"
+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:899
+#, 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:905
+#, c-format
+msgid "Read %lu line"
+msgid_plural "Read %lu lines"
+msgstr[0] "Prebranih je %lu vrstic"
+msgstr[1] "Prebrana je %lu vrstica"
+msgstr[2] "Prebrani sta %lu vrstici"
+msgstr[3] "Prebrane so %lu vrstice"
+
+#: src/files.c:908
+#, 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:943 src/files.c:980
+msgid "Reading File"
+msgstr "Branje datoteke"
+
+#: src/files.c:950
+msgid "New File"
+msgstr "Nova datoteka"
+
+#: src/files.c:953
+#, c-format
+msgid "\"%s\" not found"
+msgstr "\"%s\" ni mogoče najti"
+
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
+#, c-format
+msgid "\"%s\" is a directory"
+msgstr "\"%s\" je mapa"
+
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
+#, c-format
+msgid "\"%s\" is a device file"
+msgstr "\"%s\" je datoteka naprave"
+
+#: src/files.c:1060
+#, c-format
+msgid "Command to execute in new buffer [from %s] "
+msgstr "Ukaz za izvedbo v novem medpomnilniku [iz %s] "
+
+#: src/files.c:1062
+#, c-format
+msgid "Command to execute [from %s] "
+msgstr "Ukaz za izvedbo [iz %s] "
+
+#: src/files.c:1069
+#, c-format
+msgid "File to insert into new buffer [from %s] "
+msgstr "Datoteka za vstavitev v nov medpomnilnik [iz %s] "
+
+#: src/files.c:1071
+#, c-format
+msgid "File to insert [from %s] "
+msgstr "Datoteka za vstavitev [iz %s] "
+
+#: src/files.c:1320
+msgid "Key invalid in non-multibuffer mode"
+msgstr "Neveljavna tipka v ne-več-medpomnilniškem načinu"
+
+#: src/files.c:1622
+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:1746
+#, c-format
+msgid "Can't write outside of %s"
+msgstr "Ni mogoče pisati zunaj %s"
+
+#: src/files.c:1761
+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"
+
+#: src/files.c:1843 src/files.c:1868 src/files.c:1886 src/files.c:1899
+#: src/files.c:1910 src/files.c:1939
+#, c-format
+msgid "Error writing backup file %s: %s"
+msgstr "Napaka med pisanjem datoteke varnostne kopije %s: %s"
+
+#: src/files.c:1844 src/nano.c:719
+msgid "Too many backup files?"
+msgstr "Ali je preveč varnostnih kopij datotek?"
+
+#: src/files.c:1959 src/files.c:2016 src/files.c:2035 src/files.c:2047
+#: src/files.c:2071 src/files.c:2089 src/files.c:2099 src/files.c:2135
+#: src/files.c:2140 src/files.c:3101 src/files.c:3110 src/files.c:3133
+#: src/files.c:3145
+#, c-format
+msgid "Error writing %s: %s"
+msgstr "Napaka med pisanjem %s:%s"
+
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
+#, c-format
+msgid "Error writing temp file: %s"
+msgstr "Napaka med pisanjem v začasno datoteko: %s"
+
+#: src/files.c:2173
+#, c-format
+msgid "Wrote %lu line"
+msgid_plural "Wrote %lu lines"
+msgstr[0] "Zapisanih je %lu vrstic"
+msgstr[1] "Zapisana je %lu vrstica"
+msgstr[2] "Zapisani sta %lu vrstici"
+msgstr[3] "Zapisane so %lu vrstice"
+
+#: src/files.c:2278
+msgid " [DOS Format]"
+msgstr " [Oblika DOS]"
+
+#: src/files.c:2279
+msgid " [Mac Format]"
+msgstr " [Oblika Mac]"
+
+#: src/files.c:2281
+msgid " [Backup]"
+msgstr " [Varnostna kopija]"
+
+#: src/files.c:2289
+msgid "Prepend Selection to File"
+msgstr "Pripni izbiro pred datoteko"
+
+#: src/files.c:2290
+msgid "Append Selection to File"
+msgstr "Pripni izbiro datoteki"
+
+#: src/files.c:2291
+msgid "Write Selection to File"
+msgstr "Zapiši izbiro v datoteko"
+
+#: src/files.c:2294
+msgid "File Name to Prepend to"
+msgstr "Ime datoteke, ki naj bo pripeta na začetek"
+
+#: src/files.c:2295
+msgid "File Name to Append to"
+msgstr "Ime datoteke, ki naj bo pripeta"
+
+#: src/files.c:2296
+msgid "File Name to Write"
+msgstr "Ime datoteke za zapis"
+
+#: src/files.c:2427
+msgid "File exists, OVERWRITE ? "
+msgstr "Datoteka že obstraja. Ali naj bo prepisana? "
+
+#: src/files.c:2436
+msgid "Save file under DIFFERENT NAME ? "
+msgstr "Ali želite datoteko shraniti z DRUGIM imenom? "
+
+#: src/files.c:2450
+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:2882
+msgid "(more)"
+msgstr "(več)"
+
+#: src/files.c:2974
+#, c-format
+msgid ""
+"\n"
+"Press Enter to continue\n"
+msgstr ""
+"\n"
+"Za nadaljevanje pritisnite Enter\n"
+
+#: src/files.c:2989
+#, fuzzy, c-format
+msgid ""
+"Unable to create directory %s: %s\n"
+"It is required for saving/loading search history or cursor positions.\n"
+msgstr ""
+"Mape %s ni mogoče ustvariti: %s\n"
+"Mapa je namenjena shranjevanju in nalaganju zgodovine iskanja in položaja "
+"kazalke\n"
+
+#: src/files.c:2995
+#, fuzzy, 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 ""
+"Pot %s ni mapa.\n"
+"S programom Nano ne bo mogoče shranjevati in nalagati zgodovine iskanja in "
+"položaja kazalke\n"
+
+#: src/files.c:3012
+#, 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 ""
+"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:3016
+#, 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 ""
+"Zaznana je bila opuščena datoteka zgodovine (%s).\n"
+"Premaknjena je na prednostno mesto (%s)\n"
+"Za več podrobnosti si poglejte pogosto zastavljena vprašanja."
+
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
+#: src/global.c:477
+msgid "Exit"
+msgstr "Končaj"
+
+#: src/global.c:478
+msgid "Close"
+msgstr "Zapri"
+
+#: src/global.c:479
+#, fuzzy
+msgid "Uncut Text"
+msgstr "Odizr. be."
+
+#: src/global.c:481
+#, fuzzy
+msgid "Unjustify"
+msgstr "Odporavnaj"
+
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:485
+msgid "WhereIs Next"
+msgstr "Išči nas."
+
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:492
+msgid "Where Is"
+msgstr "Poišči"
+
+#: src/global.c:493
+msgid "Replace"
+msgstr "Zamenjaj"
+
+#: src/global.c:494
+msgid "Go To Line"
+msgstr "V vrstico"
+
+#: src/global.c:495
+msgid "Prev Line"
+msgstr "Pred. vrs."
+
+#: src/global.c:496
+msgid "Next Line"
+msgstr "Nasl. vrs."
+
+#: src/global.c:497
+msgid "Read File"
+msgstr "Odpri dat."
+
+#: src/global.c:499
+msgid "FullJstify"
+msgstr "Pop. por."
+
+#: src/global.c:501
+msgid "Refresh"
+msgstr "Osveži"
+
+#. 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:507
+msgid "Justify the current paragraph"
+msgstr "Poravnaj trenutni odstavek"
+
+#: src/global.c:509
+msgid "Cancel the current function"
+msgstr "Prekliči trenutno funkcijo"
+
+#: src/global.c:510
+msgid "Display this help text"
+msgstr "Pokaži to besedilo pomoči"
+
+#: src/global.c:513
+msgid "Close the current file buffer / Exit from nano"
+msgstr "Zapri trenutni medpomnilnik datoteke / Končaj nano"
+
+#: src/global.c:515
+msgid "Exit from nano"
+msgstr "Končaj nano"
+
+#: src/global.c:519
+msgid "Write the current file to disk"
+msgstr "Zapiši trenutno datoteko na disk"
+
+#: src/global.c:521
+msgid "Insert another file into the current one"
+msgstr "Vstavi drugo datoteko v trenutno"
+
+#: src/global.c:523
+msgid "Search for a string or a regular expression"
+msgstr "Poišči niz znakov ali logični izraz"
+
+#: src/global.c:526
+#, fuzzy
+msgid "Search for a string"
+msgstr "Poišči niz znakov ali logični izraz"
+
+#: src/global.c:528
+#, fuzzy
+msgid "Go one screenful up"
+msgstr "Pojdi na naslednji zaslon"
+
+#: src/global.c:529
+#, fuzzy
+msgid "Go one screenful down"
+msgstr "Pojdi na naslednji zaslon"
+
+#: src/global.c:531
+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:533
+msgid "Uncut from the cutbuffer into the current line"
+msgstr "Prilepi iz medpomnilnika izreza v trenutno vrstico"
+
+#: src/global.c:534
+msgid "Display the position of the cursor"
+msgstr "Prikaži položaj kazalke"
+
+#: src/global.c:536
+msgid "Invoke the spell checker, if available"
+msgstr "Vključi črkovalnik, če je na voljo"
+
+#: src/global.c:538
+msgid "Replace a string or a regular expression"
+msgstr "Zamenjaj niz ali logični izraz"
+
+#: src/global.c:539
+msgid "Go to line and column number"
+msgstr "Pojdi v številko vrstice in stolpca"
+
+#: src/global.c:541
+#, fuzzy
+msgid "Mark text starting from the cursor position"
+msgstr "Označi besedilo na mestu kazalke"
+
+#: src/global.c:542
+#, fuzzy
+msgid "Repeat the last search"
+msgstr "Ponovi zadnje iskanje"
+
+#: src/global.c:544
+msgid "Copy the current line and store it in the cutbuffer"
+msgstr "Kopiraj trenutno vrstico in jo shrani v medpomni. izreza"
+
+#: src/global.c:545
+msgid "Indent the current line"
+msgstr "Zamakni trenutno vrstico"
+
+#: src/global.c:546
+msgid "Unindent the current line"
+msgstr "Odstrani zamik trenutne vrstice"
+
+#: src/global.c:547
+msgid "Undo the last operation"
+msgstr "Razveljavi zadnje dejanje"
+
+#: src/global.c:548
+msgid "Redo the last undone operation"
+msgstr "Uveljavi zadnje razveljavljeno dejanje"
+
+#: src/global.c:550
+msgid "Go forward one character"
+msgstr "Pojdi naprej za en znak"
+
+#: src/global.c:551
+msgid "Go back one character"
+msgstr "Pojdi nazaj za en znak"
+
+#: src/global.c:553
+msgid "Go forward one word"
+msgstr "Pojdi naprej za eno besedo"
+
+#: src/global.c:554
+msgid "Go back one word"
+msgstr "Pojdi nazaj za eno besedo"
+
+#: src/global.c:556
+msgid "Go to previous line"
+msgstr "Pojdi v predhodno vrstico"
+
+#: src/global.c:557
+msgid "Go to next line"
+msgstr "Pojdi v naslednjo vrstico"
+
+#: src/global.c:558
+msgid "Go to beginning of current line"
+msgstr "Pojdi na začetek trenutne vrstice"
+
+#: src/global.c:559
+msgid "Go to end of current line"
+msgstr "Pojdi na konec trenutne vrstice"
+
+#: src/global.c:562
+msgid "Go to beginning of paragraph; then of previous paragraph"
+msgstr "Pojdi na začetek odstavka; nato prejšnjega odstavka"
+
+#: src/global.c:564
+msgid "Go just beyond end of paragraph; then of next paragraph"
+msgstr "Pojdi preko konca odstavka; nato naslednjega odstavka"
+
+#: src/global.c:566
+msgid "Go to the first line of the file"
+msgstr "Pojdi v prvo vrstico datoteke"
+
+#: src/global.c:567
+msgid "Go to the last line of the file"
+msgstr "Pojdi v zadnjo vrstico datoteke"
+
+#: src/global.c:569
+msgid "Go to the matching bracket"
+msgstr "Pojdi do ujemajočega oklepaja"
+
+#: src/global.c:571
+msgid "Scroll up one line without scrolling the cursor"
+msgstr "Pomakni se navzgor za eno vrstico brez drsenja kazalke"
+
+#: src/global.c:573
+msgid "Scroll down one line without scrolling the cursor"
+msgstr "Pomakni se navzdol za eno vrstico brez drsenja kazalke"
+
+#: src/global.c:576
+msgid "Switch to the previous file buffer"
+msgstr "Preklopi na prejšnji medpomnilnik datoteke"
+
+#: src/global.c:577
+msgid "Switch to the next file buffer"
+msgstr "Preklopi na naslednji medpomnilnik datoteke"
+
+#: src/global.c:579
+msgid "Insert the next keystroke verbatim"
+msgstr "Vstavi naslednji natančni pritisk tipk"
+
+#: src/global.c:580
+msgid "Insert a tab at the cursor position"
+msgstr "Vstavi tabulator na položaju kazalke"
+
+#: src/global.c:581
+msgid "Insert a newline at the cursor position"
+msgstr "Vstavi novo vrstico na položaju kazalke"
+
+#: src/global.c:582
+msgid "Delete the character under the cursor"
+msgstr "Izbriši znak pod kazalko"
+
+#: src/global.c:584
+msgid "Delete the character to the left of the cursor"
+msgstr "Izbriši znak levo od kazalke"
+
+#: src/global.c:587
+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:590
+msgid "Justify the entire file"
+msgstr "Poravnaj celotno datoteko"
+
+#: src/global.c:594
+msgid "Count the number of words, lines, and characters"
+msgstr "Preštej število besed, vrstic in znakov"
+
+#: src/global.c:597
+msgid "Refresh (redraw) the current screen"
+msgstr "Osveži (ponovno nariši) trenutni zaslon"
+
+#: src/global.c:599
+msgid "Suspend the editor (if suspend is enabled)"
+msgstr "Daj urejevalnik v pripravljenost (če je omogočeno)"
+
+#: src/global.c:602
+msgid "Toggle the case sensitivity of the search"
+msgstr "Preklopi ločevanje velikosti črk iskanja"
+
+#: src/global.c:604
+msgid "Reverse the direction of the search"
+msgstr "Obrni smer iskanja"
+
+#: src/global.c:608
+msgid "Toggle the use of regular expressions"
+msgstr "Preklopi uporabo logičnih izrazov"
+
+#: src/global.c:612
+msgid "Recall the previous search/replace string"
+msgstr "Prikliči predhodni niz iskanja/zamenjave"
+
+#: src/global.c:614
+msgid "Recall the next search/replace string"
+msgstr "Prikliči naslednji niz iskanja/zamenjave"
+
+#: src/global.c:617
+msgid "Go to file browser"
+msgstr "Pojdi v brskalnik datotek"
+
+#: src/global.c:620
+msgid "Toggle the use of DOS format"
+msgstr "Preklopi uporabo oblike DOS"
+
+#: src/global.c:621
+msgid "Toggle the use of Mac format"
+msgstr "Preklopi uporabo oblike Mac"
+
+#: src/global.c:622
+msgid "Toggle appending"
+msgstr "Preklopi pripenjanje"
+
+#: src/global.c:623
+msgid "Toggle prepending"
+msgstr "Preklopi pripenjanje na začetek"
+
+#: src/global.c:624
+msgid "Toggle backing up of the original file"
+msgstr "Preklopi ustvarjanje varnostne kopije izvirne datoteke"
+
+#: src/global.c:625
+msgid "Execute external command"
+msgstr "Izvedi zunanji ukaz"
+
+#: src/global.c:628
+msgid "Toggle the use of a new buffer"
+msgstr "Preklopi uporabo novega medpomnilnika"
+
+#: src/global.c:631
+msgid "Exit from the file browser"
+msgstr "Končaj brskalnik datotek"
+
+#: src/global.c:632
+msgid "Go to the first file in the list"
+msgstr "Pojdi k prvi datoteki na seznamu"
+
+#: src/global.c:633
+msgid "Go to the last file in the list"
+msgstr "Pojdi k zadnji datoteki na seznamu"
+
+#: src/global.c:634
+msgid "Go to the previous file in the list"
+msgstr "Pojdi k predhodni datoteki na seznamu"
+
+#: src/global.c:635
+msgid "Go to the next file in the list"
+msgstr "Pojdi k naslednji datoteki na seznamu"
+
+#: src/global.c:636
+msgid "Go to directory"
+msgstr "Pojdi v mapo"
+
+#: src/global.c:639
+#, fuzzy
+msgid "Invoke the linter, if available"
+msgstr "Vključi črkovalnik, če je na voljo"
+
+#: src/global.c:640
+#, fuzzy
+msgid "Go to previous linter msg"
+msgstr "Pojdi v predhodno vrstico"
+
+#: src/global.c:641
+#, fuzzy
+msgid "Go to next linter msg"
+msgstr "Pojdi v naslednjo vrstico"
+
+#: src/global.c:642
+#, 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:662
+msgid "Get Help"
+msgstr "Pomoč"
+
+#: src/global.c:665 src/prompt.c:1084
+msgid "Cancel"
+msgstr "Prekliči"
+
+#: src/global.c:678
+#, fuzzy
+msgid "Write Out"
+msgstr "Zapiši"
+
+#: src/global.c:704
+msgid "Go To Dir"
+msgstr "Pojdi v mapo"
+
+#: src/global.c:719
+msgid "Cut Text"
+msgstr "Izre. bes."
+
+#: src/global.c:728
+msgid "Justify"
+msgstr "Poravnaj"
+
+#: src/global.c:733
+msgid "To Spell"
+msgstr "Črkuj"
+
+#: src/global.c:738
+#, fuzzy
+msgid "To Linter"
+msgstr "V vrstico"
+
+#: src/global.c:740
+#, fuzzy
+msgid "Formatter"
+msgstr "oblika DOS"
+
+#: src/global.c:745
+msgid "Case Sens"
+msgstr "Loč. črk"
+
+#: src/global.c:750
+msgid "Regexp"
+msgstr "Log. izraz"
+
+#: src/global.c:755
+msgid "Backwards"
+msgstr "Nazaj"
+
+#: src/global.c:762
+msgid "No Replace"
+msgstr "Brez. zam."
+
+#: src/global.c:770
+msgid "Cur Pos"
+msgstr "Položaj kaz."
+
+#: src/global.c:780
+msgid "Prev Page"
+msgstr "Pred. str."
+
+#: src/global.c:782
+msgid "Next Page"
+msgstr "Nasl. str."
+
+#: src/global.c:785
+msgid "First Line"
+msgstr "Prva vrst."
+
+#: src/global.c:787
+msgid "Last Line"
+msgstr "Zad. vrst."
+
+#: src/global.c:794
+#, fuzzy
+msgid "To Bracket"
+msgstr "Ni oklepaj"
+
+#: src/global.c:797
+msgid "Mark Text"
+msgstr "Ozna. bes."
+
+#: src/global.c:800
+msgid "Copy Text"
+msgstr "Kopi. bes."
+
+#: src/global.c:803
+msgid "Indent Text"
+msgstr "Zama. bes."
+
+#: src/global.c:805
+msgid "Unindent Text"
+msgstr "Odzam. be."
+
+#: src/global.c:808
+msgid "Undo"
+msgstr "Razveljavi"
+
+#: src/global.c:810
+msgid "Redo"
+msgstr "Uveljavi"
+
+#: src/global.c:814 src/global.c:820
+msgid "Back"
+msgstr "Nazaj"
+
+#: src/global.c:816 src/global.c:822
+msgid "Forward"
+msgstr "Naprej"
+
+#: src/global.c:827
+msgid "Prev Word"
+msgstr "Pred. bes."
+
+#: src/global.c:829
+msgid "Next Word"
+msgstr "Nasl. bes."
+
+#: src/global.c:833
+msgid "Home"
+msgstr "Domov"
+
+#: src/global.c:835
+msgid "End"
+msgstr "Konec"
+
+#: src/global.c:844
+msgid "Beg of Par"
+msgstr "Zač. odst."
+
+#: src/global.c:846
+msgid "End of Par"
+msgstr "Kon. odst."
+
+#: src/global.c:851
+msgid "Scroll Up"
+msgstr "Pomik gor"
+
+#: src/global.c:853
+msgid "Scroll Down"
+msgstr "Pomik dol"
+
+#: src/global.c:858
+#, fuzzy
+msgid "Prev File"
+msgstr "Predhodna datoteka"
+
+#: src/global.c:860
+msgid "Next File"
+msgstr "Naslednja datoteka"
+
+#: src/global.c:869
+#, fuzzy
+msgid "Verbatim"
+msgstr "Natančni vnos"
+
+#: src/global.c:872
+msgid "Tab"
+msgstr "Tabulator"
+
+#: src/global.c:874
+msgid "Enter"
+msgstr "Enter"
+
+#: src/global.c:876
+msgid "Delete"
+msgstr "Delete"
+
+#: src/global.c:878
+msgid "Backspace"
+msgstr "Vračalka"
+
+#: src/global.c:888
+msgid "CutTillEnd"
+msgstr "IzrezDoKonca"
+
+#: src/global.c:898
+msgid "Word Count"
+msgstr "Štetje besed"
+
+#: src/global.c:905
+msgid "Suspend"
+msgstr "V priprav."
+
+#: src/global.c:910
+msgid "PrevHstory"
+msgstr "Prej. Zgo."
+
+#: src/global.c:913
+msgid "NextHstory"
+msgstr "Nasl. Zgo."
+
+#: src/global.c:917
+msgid "Go To Text"
+msgstr "Nasl. bes."
+
+#: src/global.c:928
+msgid "DOS Format"
+msgstr "oblika DOS"
+
+#: src/global.c:931
+msgid "Mac Format"
+msgstr "oblika Mac"
+
+#: src/global.c:934
+msgid "Append"
+msgstr "Pripni"
+
+#: src/global.c:936
+msgid "Prepend"
+msgstr "Pripni na začet."
+
+#: src/global.c:939
+msgid "Backup File"
+msgstr "Varnostna kopija"
+
+#: src/global.c:946
+msgid "Execute Command"
+msgstr "Izvedi ukaz"
+
+#: src/global.c:961
+msgid "To Files"
+msgstr "Do datotek"
+
+#: src/global.c:964
+msgid "First File"
+msgstr "Prva dat."
+
+#: src/global.c:966
+msgid "Last File"
+msgstr "Zadnja dat."
+
+#: src/global.c:977
+#, fuzzy
+msgid "Prev Lint Msg"
+msgstr "Pred. vrs."
+
+#: src/global.c:979
+#, 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:1227
+msgid "Help mode"
+msgstr "Način pomoči"
+
+#: src/global.c:1229
+msgid "Constant cursor position display"
+msgstr "Stalni prikaz položaja kazalke"
+
+#: src/global.c:1231
+msgid "Use of one more line for editing"
+msgstr "Uporaba ene vrstice več za urejanje"
+
+#: src/global.c:1233
+msgid "Smooth scrolling"
+msgstr "Gladko drsenje"
+
+#: src/global.c:1235
+#, fuzzy
+msgid "Soft wrapping of overlong lines"
+msgstr "Ne lomi dolgih vrstic"
+
+#: src/global.c:1237
+msgid "Whitespace display"
+msgstr "Prikaz presledkov"
+
+#: src/global.c:1239
+msgid "Color syntax highlighting"
+msgstr "Barvno poudarjanje skladnje"
+
+#: src/global.c:1241
+msgid "Smart home key"
+msgstr "Pametna tipka za Domov"
+
+#: src/global.c:1243
+msgid "Auto indent"
+msgstr "Samodejno zamikanje"
+
+#: src/global.c:1245
+msgid "Cut to end"
+msgstr "Izreži do konca"
+
+#: src/global.c:1247
+#, fuzzy
+msgid "Hard wrapping of overlong lines"
+msgstr "Ne lomi dolgih vrstic"
+
+#: src/global.c:1249
+msgid "Conversion of typed tabs to spaces"
+msgstr "Pretvarjanje tabulatorjev v presledne znake"
+
+#: src/global.c:1251
+msgid "Backup files"
+msgstr "Datoteke varnostnih kopij"
+
+#: src/global.c:1253
+msgid "Multiple file buffers"
+msgstr "Več medpomnilnikov datotek"
+
+#: src/global.c:1255
+msgid "Mouse support"
+msgstr "Podpora za miško"
+
+#: src/global.c:1257
+msgid "No conversion from DOS/Mac format"
+msgstr "Ni pretvorbe iz oblike DOS/Mac"
+
+#: src/global.c:1259
+msgid "Suspension"
+msgstr "Stanje pripravljenosti"
+
+#: src/help.c:205
+msgid ""
+"Search Command Help Text\n"
+"\n"
+" Enter the words or characters you would like to search for, and then press "
+"Enter.  If there is a match for the text you entered, the screen will be "
+"updated to the location of the nearest match for the search string.\n"
+"\n"
+" The previous search string will be shown in brackets after the search "
+"prompt.  Hitting Enter without entering any text will perform the previous "
+"search.  "
+msgstr ""
+"Pomoč za ukaz iskanja\n"
+"\n"
+" Vnesite besede ali znake, ki jih želite poiskati, in vnos potrdite. Ko je "
+"niz najden, se na zaslonu pokaže mesto prvega zadetka.\n"
+"\n"
+" Predhodni iskalni niz bo prikazan v oklepajih. Pritisk vnosne tipke brez "
+"predhodnega vnosa besedila, izvede predhodno iskanje.  "
+
+#: src/help.c:214
+msgid ""
+"If you have selected text with the mark and then search to replace, only "
+"matches in the selected text will be replaced.\n"
+"\n"
+" The following function keys are available in Search mode:\n"
+"\n"
+msgstr ""
+"Kadar je izbrano besedilo z oznako in je uporabljena možnost iskanja in "
+"zamenjave, bodo zamenjani le nizi v izbranem besedilu.\n"
+"\n"
+" V načinu Iskanja so na voljo naslednje funkcijske tipke:\n"
+"\n"
+
+#: src/help.c:220
+msgid ""
+"Go To Line Help Text\n"
+"\n"
+" Enter the line number that you wish to go to and hit Enter.  If there are "
+"fewer lines of text than the number you entered, you will be brought to the "
+"last line of the file.\n"
+"\n"
+" The following function keys are available in Go To Line mode:\n"
+"\n"
+msgstr ""
+"Pomoč za skok v vrstico\n"
+"\n"
+" Vnesite številko vrstice, v katero želite skočiti, in pritisnite vnosno "
+"tipko. Kadar je število vrstic besedila manjše do vpisanega števila, bo "
+"kazalka premaknjena v zadnjo vrstico.\n"
+"\n"
+"V načinu V vrstico so na voljo naslednje funkcijske tipke:\n"
+"\n"
+
+#: src/help.c:229
+msgid ""
+"Insert File Help Text\n"
+"\n"
+" Type in the name of a file to be inserted into the current file buffer at "
+"the current cursor location.\n"
+"\n"
+" If you have compiled nano with multiple file buffer support, and enable "
+"multiple file buffers with the -F or --multibuffer command line flags, the "
+"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 vstavljanje datoteke\n"
+"\n"
+" Vnesite ime datoteke, ki jo želite vstaviti v medpomnilnik trenutne "
+"datoteke na trenutnem položaju kazalke.\n"
+"\n"
+" V primeru, da je program nano kodno preveden s podporo več medpomnilnikom "
+"in so medpomnilniki več datotek omogočeni z zastavicami ukazne vrstice -F "
+"ali --multibuffer ali datoteko nanorc, bo datoteka naložena v ločen "
+"medpomnilnik (za preklop med medpomnilniki datotek je na voljo bližnjica "
+"Meta-< in >).  "
+
+#: src/help.c:238
+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"
+"\n"
+" The following function keys are available in Insert File mode:\n"
+"\n"
+msgstr ""
+"Kadar potrebujete dodaten prazen medpomnilnik, ob pozivu ne vnašajte imen "
+"datotek ali pa vnesite neobstoječe ime datoteke, nato pritisnite vnosno "
+"tipko.\n"
+"\n"
+" V načinu vstavljanja datoteke so na voljo naslednje funkcijske tipke:\n"
+"\n"
+
+#: src/help.c:244
+msgid ""
+"Write File Help Text\n"
+"\n"
+" Type the name that you wish to save the current file as and press Enter to "
+"save the file.\n"
+"\n"
+" If you have selected text with the mark, you will be prompted to save only "
+"the selected portion to a separate file.  To reduce the chance of "
+"overwriting the current file with just a portion of it, the current filename "
+"is not the default in this mode.\n"
+"\n"
+" The following function keys are available in Write File mode:\n"
+"\n"
+msgstr ""
+"Pomoč za zapisovanje datotek\n"
+"\n"
+" Vnesite ime, s katerim želite shraniti trenutno datoteko, in pritisnite "
+"vnosno tipko za potrditev. \n"
+"\n"
+" Če ste izbrali besedilo z oznako, bo prikazana možnost za shranjevanje le "
+"izbranega dela besedila v ločeno datoteko. Za zmanjšanje možnosti prepisa "
+"trenutne datoteke, v tem načinu trenutno ime ni določeno privzeto.\n"
+"\n"
+" V načinu zapisovanja so na voljo naslednje funkcijske tipke:\n"
+"\n"
+
+#: src/help.c:258
+msgid ""
+"File Browser Help Text\n"
+"\n"
+" The file browser is used to visually browse the directory structure to "
+"select a file for reading or writing.  You may use the arrow keys or Page Up/"
+"Down to browse through the files, and S or Enter to choose the selected file "
+"or enter the selected directory.  To move up one level, select the directory "
+"called \"..\" at the top of the file list.\n"
+"\n"
+" The following function keys are available in the file browser:\n"
+"\n"
+msgstr ""
+"Pomoč za brskalnik datotek\n"
+"\n"
+" Brskalnik je uporaben pri iskanju datotek po drevesu map. Uporabiti je "
+"mogoče smerne tipke in tipki stran gor in dol ter S ali vnosno tipko za "
+"izbor datoteke oziroma vstop v izbrano mapo. Za premik na višjo raven map, "
+"izberite mapo z oznako \"..\" na vrhu seznama datotek.\n"
+"\n"
+"  V načinu brskanja so na voljo naslednje funkcijske tipke:\n"
+"\n"
+
+#: src/help.c:271
+msgid ""
+"Browser Search Command Help Text\n"
+"\n"
+" Enter the words or characters you would like to search for, and then press "
+"Enter.  If there is a match for the text you entered, the screen will be "
+"updated to the location of the nearest match for the search string.\n"
+"\n"
+" The previous search string will be shown in brackets after the search "
+"prompt.  Hitting Enter without entering any text will perform the previous "
+"search.\n"
+"\n"
+msgstr ""
+"Pomoč za brskanje med ukazi\n"
+"\n"
+" Vnesite besede in znake, ki jih želite poiskati, in pritisnite vnosno "
+"tipko.  Če je niz najden, se na zaslonu pokaže mesto prvega zadetka.\n"
+"\n"
+" Predhodni iskalni niz bo prikazan v oklepajih. Pritisk vnosne tipke, brez "
+"predhodnega vnosa besedila, izvede predhodno iskanje.\n"
+"\n"
+
+#: src/help.c:280
+msgid ""
+" The following function keys are available in Browser Search mode:\n"
+"\n"
+msgstr ""
+" V načinu iskanja v brskalniku so na voljo naslednje funkcijske tipke:\n"
+"\n"
+
+#: src/help.c:284
+msgid ""
+"Browser Go To Directory Help Text\n"
+"\n"
+" Enter the name of the directory you would like to browse to.\n"
+"\n"
+" If tab completion has not been disabled, you can use the Tab key to "
+"(attempt to) automatically complete the directory name.\n"
+"\n"
+" The following function keys are available in Browser Go To Directory mode:\n"
+"\n"
+msgstr ""
+"Pomoč za premikanje med mapami\n"
+"\n"
+" Vnesite ime mape, po kateri želite brskati.\n"
+"\n"
+" Kadar je omogočena možnost dopolnjevanja niza, se s tipko Tab ime mape "
+"samodejno dopolni.\n"
+"\n"
+" V načinu premikanja med mapami v brskalniku so na voljo naslednje "
+"funkcijske tipke:\n"
+"\n"
+
+#: src/help.c:297
+msgid ""
+"Spell Check Help Text\n"
+"\n"
+" The spell checker checks the spelling of all text in the current file.  "
+"When an unknown word is encountered, it is highlighted and a replacement can "
+"be edited.  It will then prompt to replace every instance of the given "
+"misspelled word in the current file, or, if you have selected text with the "
+"mark, in the selected text.\n"
+"\n"
+" The following function keys are available in Spell Check mode:\n"
+"\n"
+msgstr ""
+"Pomoč za črkovanje\n"
+"\n"
+" S črkovalnikom lahko preverimo pravilnost zapisa celotnega besedila v "
+"trenutni datoteki. Kadar črkovalnik naleti na neznano besedo, jo poudari in "
+"omogoči urejanje. Po urejanju se pojavi možnost za zamenjavo vsakega "
+"primerka dane napačno črkovane besede v trenutni datoteki ali, če je "
+"besedilo izbrano, v izboru besedila.\n"
+"\n"
+" V načinu črkovanja so na voljo naslednje funkcijske tipke:\n"
+"\n"
+
+#: src/help.c:312
+msgid ""
+"Execute Command Help Text\n"
+"\n"
+" This mode allows you to insert the output of a command run by the shell "
+"into the current buffer (or a new buffer in multiple file buffer mode).  If "
+"you need another blank buffer, do not enter any command.\n"
+"\n"
+" The following function keys are available in Execute Command mode:\n"
+"\n"
+msgstr ""
+"Pomoč za izvajanje ukazov\n"
+"\n"
+" Možnost omogoča vnos izpisa ukaza iz lupine v trenutni medpomnilnik (ali "
+"nov medpomnilnik v načinu medpomnilnika več datotek). Pri uporabi praznega "
+"medpomnilnika, ni treba vnesti ukazov.\n"
+"\n"
+" V načinu izvajanja ukazov so na voljo naslednje funkcijske tipke:\n"
+"\n"
+
+#: src/help.c:325
+msgid ""
+"Main nano help text\n"
+"\n"
+" The nano editor is designed to emulate the functionality and ease-of-use of "
+"the UW Pico text editor.  There are four main sections of the editor.  The "
+"top line shows the program version, the current filename being edited, and "
+"whether or not the file has been modified.  Next is the main editor window "
+"showing the file being edited.  The status line is the third line from the "
+"bottom and shows important messages.  "
+msgstr ""
+"Splošna pomoč programa nano\n"
+"\n"
+" Urejevalnik nano posnema delovanje in preprostost uporabe urejevalnika "
+"besedil UW Pico. Urejevalnik ima štiri osrednje dele, na katere je treba "
+"biti pozoren. Zgornja vrstica prikazuje različico programa, trenutno ime "
+"odprte datoteke in, ali je bila datoteka spremenjena ali ne. Naslednji del "
+"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:335
+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.  "
+msgstr ""
+"Spodnji dve vrstici prikazujeta najpogosteje uporabljene bližnjice.\n"
+"\n"
+" Zapis za bližnjice je poenoten. Bližnice CTRL-tipka so zapisana s "
+"korektorskim znakom (^) in se jih lahko vnese bodisi z uporabo tipke Control "
+"(Ctrl) bodisi z dvojnim pritiskom ubežne tipke (Esc). Zaporedja Esc-tipka so "
+"zabeležena s simbolom Meta (M-) in se jih lahko vnese s tipkami Esc, Alt ali "
+"Meta, odvisno od nastavitve tipkovnice."
+
+#: src/help.c:344
+msgid ""
+"Also, pressing Esc twice and then typing a three-digit decimal number from "
+"000 to 255 will enter the character with the corresponding value.  The "
+"following keystrokes are available in the main editor window.  Alternative "
+"keys are shown in parentheses:\n"
+"\n"
+msgstr ""
+"Prav tako lahko z dvojnim pritiskom ubežne tipke (Esc), in nato z vnosom "
+"trimestnega decimalnega števila od 000 do 255, vnesete znak z ustrezno "
+"vrednostjo. Naslednje poteze tipk so na voljo v osrednjem oknu urejevalnika. "
+"Nadomestne tipke so prikazane v oklepajih:\n"
+"\n"
+
+#: src/help.c:376 src/help.c:448
+msgid "enable/disable"
+msgstr "omogoči/onemogoči"
+
+#: src/nano.c:601
+msgid "Key invalid in view mode"
+msgstr "Ključ je neveljaven v načinu pogleda"
+
+#: src/nano.c:713
+#, c-format
+msgid ""
+"\n"
+"Buffer written to %s\n"
+msgstr ""
+"\n"
+"Medpomnilnik je zapisan v %s\n"
+
+#: src/nano.c:715
+#, c-format
+msgid ""
+"\n"
+"Buffer not written to %s: %s\n"
+msgstr ""
+"\n"
+"Medpomnilnik ni zapisan v %s: %s\n"
+
+#: src/nano.c:718
+#, c-format
+msgid ""
+"\n"
+"Buffer not written: %s\n"
+msgstr ""
+"\n"
+"Medpomnilnik ni zapisan: %s\n"
+
+#: src/nano.c:743
+msgid "Window size is too small for nano...\n"
+msgstr "Velikost okna je premajhna za nano ...\n"
+
+#: src/nano.c:836
+#, c-format
+msgid ""
+"Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
+"\n"
+msgstr ""
+"Uporaba: nano [MOŽNOSTI] [[+VRSTICA,STOLPEC] DATOTEKA] ...\n"
+"\n"
+
+#: src/nano.c:839
+#, c-format
+msgid "Option\t\tGNU long option\t\tMeaning\n"
+msgstr "Možnost\t\tdolga možnost GNU\t\tPomen\n"
+
+#: src/nano.c:841
+#, c-format
+msgid "Option\t\tMeaning\n"
+msgstr "Možnost\t\tPomen\n"
+
+#: src/nano.c:844
+msgid "+LINE,COLUMN"
+msgstr "+VRSTICA,STOLPEC"
+
+#. TRANSLATORS: The next forty or so strings are option descriptions
+#. * for the --help output.  Try to keep them at most 40 characters.
+#: src/nano.c:847
+msgid "Start at line LINE, column COLUMN"
+msgstr "Začetek v vrstici VRSTICA, stolpcu STOLPEC"
+
+#: src/nano.c:849
+msgid "Enable smart home key"
+msgstr "Omogoči pametno tipko za Domov"
+
+#: src/nano.c:850
+msgid "Save backups of existing files"
+msgstr "Shrani varnostne kopije obstoječih datotek"
+
+#: src/nano.c:851
+msgid "-C <dir>"
+msgstr "-C <mapa>"
+
+#: src/nano.c:851
+msgid "--backupdir=<dir>"
+msgstr "--backupdir=<mapa>"
+
+#: src/nano.c:852
+msgid "Directory for saving unique backup files"
+msgstr "Mapa za shranjevanje edinstvenih varnostnih kopij"
+
+#: src/nano.c:855
+msgid "Use bold instead of reverse video text"
+msgstr "Uporabi krepko namesto obratnega besedila videa"
+
+#: src/nano.c:858
+msgid "Convert typed tabs to spaces"
+msgstr "Pretvori vpisane tabulatorske znake v presledke"
+
+#: src/nano.c:861
+msgid "Enable multiple file buffers"
+msgstr "Omogoči več medpomnilnikov datotek"
+
+#: src/nano.c:865
+msgid "Use (vim-style) lock files"
+msgstr "Uporabi zaklepne datoteke"
+
+#: src/nano.c:869
+msgid "Log & read search/replace string history"
+msgstr "Beleži in beri zgodovino niza iskanja in zamenjave"
+
+#: src/nano.c:873
+msgid "Don't look at nanorc files"
+msgstr "Ne glej datotek nanorc"
+
+#: src/nano.c:876
+msgid "Fix numeric keypad key confusion problem"
+msgstr "Popravi težavo z zmedo s tipkami številčnice"
+
+#: src/nano.c:878
+msgid "Don't add newlines to the ends of files"
+msgstr "Ne dodajaj novih vrstic na konec datotek"
+
+#: src/nano.c:881
+msgid "Don't convert files from DOS/Mac format"
+msgstr "Ne pretvarjaj datotek iz oblike DOS/Mac"
+
+#: src/nano.c:883
+msgid "Use one more line for editing"
+msgstr "Uporabi eno ali več vrstic za urejanje"
+
+#: src/nano.c:886
+msgid "Log & read location of cursor position"
+msgstr "Shrani in preberi mesto kazalke"
+
+#: src/nano.c:889
+msgid "-Q <str>"
+msgstr "-Q <niz>"
+
+#: src/nano.c:889
+msgid "--quotestr=<str>"
+msgstr "--quotestr=<niz>"
+
+#: src/nano.c:890
+msgid "Quoting string"
+msgstr "Niz za navajanje"
+
+#: src/nano.c:892
+msgid "Restricted mode"
+msgstr "Omejen način"
+
+#: src/nano.c:895
+msgid "Scroll by line instead of half-screen"
+msgstr "Pomikaj se vrstično namesto pol-zaslonsko"
+
+#: src/nano.c:897
+msgid "-T <#cols>"
+msgstr "-T <št. stolpcev>"
+
+#: src/nano.c:897
+msgid "--tabsize=<#cols>"
+msgstr "--tabsize=<št. stolpcev>"
+
+#: src/nano.c:898
+msgid "Set width of a tab to #cols columns"
+msgstr "Nastavi širino tabulatorja na št. stolpcev stolpcev"
+
+#: src/nano.c:900
+msgid "Do quick statusbar blanking"
+msgstr "Hitro prazni vrstico stanja"
+
+#: src/nano.c:903
+msgid "Print version information and exit"
+msgstr "Prikaži podrobnosti različice in končaj"
+
+#: src/nano.c:906
+msgid "Detect word boundaries more accurately"
+msgstr "Zaznaj meje besed natančneje"
+
+#: src/nano.c:909
+msgid "-Y <str>"
+msgstr "-Y <niz>"
+
+#: src/nano.c:909
+msgid "--syntax=<str>"
+msgstr "--syntax=<niz>"
+
+#: src/nano.c:910
+msgid "Syntax definition to use for coloring"
+msgstr "Uporaba določila skladnje za barvanje"
+
+#: src/nano.c:912
+msgid "Constantly show cursor position"
+msgstr "Nenehno kaži položaj kazalke"
+
+#: src/nano.c:914
+msgid "Fix Backspace/Delete confusion problem"
+msgstr "Popravi težavo zmede tipk vračalke/izbriši"
+
+#: src/nano.c:915
+#, fuzzy
+msgid "Show this help text"
+msgstr "Pokaži to besedilo pomoči"
+
+#: src/nano.c:918
+msgid "Automatically indent new lines"
+msgstr "Samodejno zamakni nove vrstice"
+
+#: src/nano.c:919
+msgid "Cut from cursor to end of line"
+msgstr "Izreži od kazalke do konca vrstice"
+
+#: src/nano.c:922
+msgid "Don't follow symbolic links, overwrite"
+msgstr "Ne dovoli simbolnih povezav, ampak prepiši"
+
+#: src/nano.c:924
+msgid "Enable the use of the mouse"
+msgstr "Omogoči uporabo miške"
+
+#: src/nano.c:926
+msgid "Do not read the file (only write it)"
+msgstr ""
+
+#: src/nano.c:928
+msgid "-o <dir>"
+msgstr "-o <mapa>"
+
+#: src/nano.c:928
+msgid "--operatingdir=<dir>"
+msgstr "--operatingdir=<mapa>"
+
+#: src/nano.c:929
+msgid "Set operating directory"
+msgstr "Nastavi mapo delovanja"
+
+#: src/nano.c:932
+msgid "Preserve XON (^Q) and XOFF (^S) keys"
+msgstr "Ohrani tipke XON (^Q) in XOFF (^S)"
+
+#: src/nano.c:935
+msgid "Silently ignore startup issues like rc file errors"
+msgstr "Tiho prezri težave začenjanja kot napake datoteke rc"
+
+#: src/nano.c:938
+msgid "-r <#cols>"
+msgstr "-r <št. stolpcev>"
+
+#: src/nano.c:938
+msgid "--fill=<#cols>"
+msgstr "--fill=<št. stolpcev>"
+
+#: src/nano.c:939
+#, fuzzy
+msgid "Set hard-wrapping point at column #cols"
+msgstr "Nastavi točko preloma na stolpcu št. stoplca"
+
+#: src/nano.c:942
+msgid "-s <prog>"
+msgstr "-s <prog>"
+
+#: src/nano.c:942
+msgid "--speller=<prog>"
+msgstr "--speller=<prog>"
+
+#: src/nano.c:943
+msgid "Enable alternate speller"
+msgstr "Omogoči nadomestni črkovalnik"
+
+#: src/nano.c:946
+msgid "Auto save on exit, don't prompt"
+msgstr "Samodejno shrani ob izhodu in ne pokaži poziva"
+
+#: src/nano.c:947
+msgid "View mode (read-only)"
+msgstr "Način pogleda (samo za branje)"
+
+#: src/nano.c:949
+#, fuzzy
+msgid "Don't hard-wrap long lines"
+msgstr "Ne lomi dolgih vrstic"
+
+#: src/nano.c:951
+msgid "Don't show the two help lines"
+msgstr "Ne pokaži dveh vrstic pomoči"
+
+#: src/nano.c:952
+msgid "Enable suspension"
+msgstr "Omogoči stanje pripravljenosti"
+
+#: src/nano.c:954
+msgid "Enable soft line wrapping"
+msgstr "Omogoči blage prelome vrstic"
+
+#: src/nano.c:963
+#, fuzzy, c-format
+msgid " GNU nano, version %s\n"
+msgstr " GNU nano različica %s (kodno prevedena %s, %s)\n"
+
+#: src/nano.c:966
+#, 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:967
+#, c-format
+msgid ""
+"\n"
+" Compiled options:"
+msgstr ""
+"\n"
+" Kodno prevedene možnosti:"
+
+#: src/nano.c:1096
+msgid "Sorry, support for this function has been disabled"
+msgstr "Žal je podpora za to funkcijo onemogočena"
+
+#: src/nano.c:1125
+msgid "No file name"
+msgstr ""
+
+#: src/nano.c:1136
+msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
+msgstr ""
+"Ali naj se spremembe datoteke shranijo (z odgovorom \"Ne\" bodo SPREMEMBE "
+"IZGUBLJENE)? "
+
+#: src/nano.c:1189
+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:1213
+#, c-format
+msgid "Reading from stdin, ^C to abort\n"
+msgstr "Branje iz stdin, ^C za prekinitev\n"
+
+#: src/nano.c:1279
+msgid "Received SIGHUP or SIGTERM\n"
+msgstr "Prejet je bil SIGHUP ali SIGTERM\n"
+
+#: src/nano.c:1301
+#, c-format
+msgid "Use \"fg\" to return to nano.\n"
+msgstr "Za vrnitev v nano uporabite \"fg\".\n"
+
+#: src/nano.c:1481
+msgid "enabled"
+msgstr "omogočeno"
+
+#: src/nano.c:1481
+msgid "disabled"
+msgstr "onemogočeno"
+
+#: src/nano.c:1635 src/winio.c:1283
+msgid "Unknown Command"
+msgstr "Neznan ukaz"
+
+#: src/nano.c:1747
+msgid "XON ignored, mumble mumble"
+msgstr "XON je prezrt, mumble mumble"
+
+#: src/nano.c:1752
+msgid "XOFF ignored, mumble mumble"
+msgstr "XOFF je prezrt, mumble mumble"
+
+#: src/nano.c:2310 src/rcfile.c:1325
+#, c-format
+msgid "Requested tab size \"%s\" is invalid"
+msgstr "Zahtevana velikost tabulatorja \"%s\" je neveljavna"
+
+#: src/nano.c:2374 src/rcfile.c:1250
+#, c-format
+msgid "Requested fill size \"%s\" is invalid"
+msgstr "Zahtevana velikost zapolnitve \"%s\" je neveljavna"
+
+#: src/nano.c:2415
+#, c-format
+msgid "Type '%s -h' for a list of available options.\n"
+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:1055
+msgid "Yy"
+msgstr "DdYy"
+
+#: src/prompt.c:1056
+msgid "Nn"
+msgstr "NnNn"
+
+#: src/prompt.c:1057
+msgid "Aa"
+msgstr "VvAa"
+
+#: src/prompt.c:1071
+msgid "Yes"
+msgstr "Da"
+
+#: src/prompt.c:1076
+msgid "All"
+msgstr "Vse"
+
+#: src/prompt.c:1081
+msgid "No"
+msgstr "Ne"
+
+#: src/rcfile.c:137
+#, c-format
+msgid "Error in %s on line %lu: "
+msgstr "Napaka v %s v vrstici %lu: "
+
+#: src/rcfile.c:196
+#, c-format
+msgid "Argument '%s' has an unterminated \""
+msgstr "Argument '%s' ima neuničen \""
+
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
+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:249 src/search.c:62
+#, c-format
+msgid "Bad regex \"%s\": %s"
+msgstr "Slab logični izraz \"%s\": %s"
+
+#: src/rcfile.c:269
+msgid "Missing syntax name"
+msgstr "Manjka ime skladnje"
+
+#: src/rcfile.c:340
+msgid "The \"none\" syntax is reserved"
+msgstr "Skladnja \"none\" je pridržana"
+
+#: src/rcfile.c:347
+msgid "The \"default\" syntax must take no extensions"
+msgstr "Skladnja \"default\" ne sme prejeti nobene pripone"
+
+#: src/rcfile.c:433
+msgid "Missing key name"
+msgstr "Manjka ime tipke"
+
+#: src/rcfile.c:442 src/rcfile.c:453
+msgid "Key name is too short"
+msgstr ""
+
+#: src/rcfile.c:463
+#, 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:472
+#, 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:482
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
+msgstr ""
+
+#: src/rcfile.c:489
+#, fuzzy, c-format
+msgid "Cannot map name \"%s\" to a function"
+msgstr "Ni mogoče preslikati imena \"%s\" k funkciji"
+
+#: src/rcfile.c:496
+#, fuzzy, c-format
+msgid "Cannot map name \"%s\" to a menu"
+msgstr "Ni mogoče preslikati imena \"%s\" k meniju"
+
+#: src/rcfile.c:528
+#, c-format
+msgid "Function '%s' does not exist in menu '%s'"
+msgstr ""
+
+#: src/rcfile.c:543
+#, fuzzy, c-format
+msgid "Sorry, keystroke \"%s\" may not be rebound"
+msgstr "Na žalost je pritisk tipk \"%s\" neveljavna vezava"
+
+#: src/rcfile.c:629
+#, fuzzy, c-format
+msgid "Error expanding %s: %s"
+msgstr "Napaka med branjem %s: %s"
+
+#: src/rcfile.c:672
+#, c-format
+msgid ""
+"Color \"%s\" not understood.\n"
+"Valid colors are \"green\", \"red\", \"blue\",\n"
+"\"white\", \"yellow\", \"cyan\", \"magenta\" and\n"
+"\"black\", with the optional prefix \"bright\"\n"
+"for foreground colors."
+msgstr ""
+"Barva \"%s\" ni razumljiva.\n"
+"Veljavne barve so \"green\", \"red\", \"blue\",\n"
+"\"white\", \"yellow\", \"cyan\", \"magenta\" in\n"
+"\"black\", z neobvezno predpono \"bright\"\n"
+"za osprednje barve."
+
+#: src/rcfile.c:694
+msgid "Cannot add a color command without a syntax command"
+msgstr "Ni mogoče dodati ukaza barve brez ukaza skladnje"
+
+#: src/rcfile.c:699
+msgid "Missing color name"
+msgstr "Manjka ime barve"
+
+#: src/rcfile.c:709 src/rcfile.c:870
+msgid "Missing regex string"
+msgstr "Manjka niz logičnega izraza"
+
+#: src/rcfile.c:785
+msgid "\"start=\" requires a corresponding \"end=\""
+msgstr "\"start=\" potrebuje ustrezen \"end=\""
+
+#: src/rcfile.c:837
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr "Barva ozadja \"%s\" ne more biti svetla"
+
+#: src/rcfile.c:865
+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:921
+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:926
+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:1010
+#, fuzzy
+msgid "Cannot add formatter without a syntax command"
+msgstr "Ni mogoče dodati ukaza barve brez ukaza skladnje"
+
+#: src/rcfile.c:1015
+msgid "Missing formatter command"
+msgstr ""
+
+#: src/rcfile.c:1045
+#, 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:1047
+#, fuzzy, c-format
+msgid ""
+"If needed, use nano with the -I option to adjust your nanorc settings.\n"
+msgstr ""
+"Poteka končanje programa. Za prilagajanje nastavitev nanorc, uporabite ukaz "
+"nano z možnostjo -I.\n"
+
+#: src/rcfile.c:1108
+#, fuzzy, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "Ni mogoče preslikati imena \"%s\" k meniju"
+
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
+#, c-format
+msgid "Command \"%s\" not allowed in included file"
+msgstr "Ukaz \"%s\" ni dovoljen v vključeni datoteki"
+
+#: src/rcfile.c:1149 src/rcfile.c:1350
+#, c-format
+msgid "Syntax \"%s\" has no color commands"
+msgstr "Skladnja \"%s\" nima ukazov barv"
+
+#: src/rcfile.c:1171
+#, c-format
+msgid "Command \"%s\" not understood"
+msgstr "Ukaz \"%s\" ni razumljiv"
+
+#: src/rcfile.c:1186
+#, fuzzy
+msgid "Missing option"
+msgstr "Manjka ime barve"
+
+#: src/rcfile.c:1208
+#, c-format
+msgid "Option \"%s\" requires an argument"
+msgstr "Možnost \"%s\" zahteva argument"
+
+#: src/rcfile.c:1226
+msgid "Option is not a valid multibyte string"
+msgstr "Možnost ni veljaven večbajtni niz"
+
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
+msgid "Non-blank characters required"
+msgstr "Zahtevani so ne-prazni znaki"
+
+#: src/rcfile.c:1273
+msgid "Two single-column characters required"
+msgstr "Potrebna sta dva enostolpčna znaka"
+
+#: src/rcfile.c:1339
+#, fuzzy, c-format
+msgid "Cannot unset option \"%s\""
+msgstr "Ni mogoče ponastaviti zastavice \"%s\""
+
+#: src/rcfile.c:1345
+#, fuzzy, c-format
+msgid "Unknown option \"%s\""
+msgstr "Neznana zastavica \"%s\""
+
+#: src/rcfile.c:1404
+msgid "I can't find my home directory!  Wah!"
+msgstr "Ni mogoče najti domače mape!"
+
+#: src/rcfile.c:1442
+#, c-format
+msgid ""
+"\n"
+"Press Enter to continue starting nano.\n"
+msgstr ""
+"\n"
+"Za nadaljevanje uporabe programa nano pritisnite vnosno tipko.\n"
+
+#: src/search.c:96
+#, 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:184
+msgid " [Case Sensitive]"
+msgstr " [Case Sensitive]"
+
+#: src/search.c:188
+msgid " [Regexp]"
+msgstr " [Regexp]"
+
+#: src/search.c:192
+msgid " [Backwards]"
+msgstr " [Backwards]"
+
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:197
+msgid " (to replace) in selection"
+msgstr " (za zamenjavo) v izbor"
+
+#: src/search.c:199
+msgid " (to replace)"
+msgstr " (za zamenjavo)"
+
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:769
+msgid "Replace this instance?"
+msgstr "Ali naj se primerek zamenja?"
+
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:945
+msgid "Replace with"
+msgstr "Zamenjaj z"
+
+#: src/search.c:986
+#, c-format
+msgid "Replaced %lu occurrence"
+msgid_plural "Replaced %lu occurrences"
+msgstr[0] "Zamenjanih je %lu pojavitev"
+msgstr[1] "Zamenjana je %lu pojavitev"
+msgstr[2] "Zamenjani sta %lu pojavitvi"
+msgstr[3] "Zamenjane so %lu pojavitve"
+
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1027
+msgid "Enter line number, column number"
+msgstr "Vnesite številko vrstice, številko stolpca"
+
+#: src/search.c:1054
+msgid "Invalid line or column number"
+msgstr "Neveljavna številka vrstice ali stolpca"
+
+#: src/search.c:1207
+msgid "Not a bracket"
+msgstr "Ni oklepaj"
+
+#: src/search.c:1274
+msgid "No matching bracket"
+msgstr "Ni ujemajočega oklepaja"
+
+#: src/text.c:54
+msgid "Mark Set"
+msgstr "Označba je nastavljena"
+
+#: src/text.c:58
+msgid "Mark Unset"
+msgstr "Označba je ponastavljena"
+
+#: src/text.c:439
+msgid "Nothing in undo buffer!"
+msgstr "Ničesar ni v medpomnilniku razveljavitve!"
+
+#: src/text.c:445 src/text.c:590
+#, 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."
+
+#: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
+msgid "text add"
+msgstr "dodaj besedilo"
+
+#: src/text.c:467 src/text.c:612
+msgid "text delete"
+msgstr "izbriši besedilo"
+
+#: src/text.c:491 src/text.c:641
+msgid "line join"
+msgstr "združi vrstici"
+
+#: src/text.c:505 src/text.c:657
+msgid "text cut"
+msgstr "izreži besedilo"
+
+#: src/text.c:510 src/text.c:661
+msgid "text uncut"
+msgstr "odizreži besedilo"
+
+#: src/text.c:515 src/text.c:623
+msgid "line break"
+msgstr "prekini vrstico"
+
+#: src/text.c:528 src/text.c:672
+msgid "text insert"
+msgstr "vnesi besedilo"
+
+#: src/text.c:549 src/text.c:665
+msgid "text replace"
+msgstr "zamenjaj besedilo"
+
+#: src/text.c:556 src/text.c:679 src/text.c:983
+msgid "Internal error: unknown type.  Please save your work."
+msgstr "Notranja napaka: neznana vrsta. Shranite svoje delo."
+
+#: src/text.c:561
+#, c-format
+msgid "Undid action (%s)"
+msgstr "Ponastavljeno dejanje (%s)"
+
+#: src/text.c:580
+msgid "Nothing to re-do!"
+msgstr "Ničesar ni mogoče uveljaviti!"
+
+#: src/text.c:584
+#, 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:684
+#, c-format
+msgid "Redid action (%s)"
+msgstr "Uveljavljeno dejanje (%s)"
+
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
+msgid "Could not create pipe"
+msgstr "Ni mogoče ustvariti cevi"
+
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
+msgid "Could not fork"
+msgstr "Ni mogoče razvejiti"
+
+#: src/text.c:969
+#, fuzzy
+msgid "Internal error: cannot set up uncut.  Please save your work."
+msgstr ""
+"Notranja napaka: ni mogoče nastaviti preklica izreza. Shranite svoje delo."
+
+#: src/text.c:1806
+#, c-format
+msgid "Bad quote string %s: %s"
+msgstr "Slab niz navedka %s: %s"
+
+#: src/text.c:2207
+msgid "Can now UnJustify!"
+msgstr "Zdaj je mogoče preklicati poravnavo!"
+
+#: src/text.c:2404
+msgid "Edit a replacement"
+msgstr "Uredi zamenjavo"
+
+#: src/text.c:2492
+msgid "Creating misspelled word list, please wait..."
+msgstr "Ustvarjanje napačno črkovanega seznama besed, počakajte ..."
+
+#: src/text.c:2584 src/text.c:3022
+msgid "Could not get size of pipe buffer"
+msgstr "Ni mogoče pridobiti velikosti medpomnilnika cevi"
+
+#: src/text.c:2635
+msgid "Error invoking \"spell\""
+msgstr "Napaka pri priklicu \"spell\""
+
+#: src/text.c:2638
+msgid "Error invoking \"sort -f\""
+msgstr "Napaka pri priklicu \"sort -f\""
+
+#: src/text.c:2641
+msgid "Error invoking \"uniq\""
+msgstr "Napaka pri priklicu \"uniq\""
+
+#: src/text.c:2696 src/text.c:2907
+msgid "Finished checking spelling"
+msgstr "Končano preverjanje črkovanja"
+
+#: src/text.c:2759 src/text.c:3340
+#, c-format
+msgid "Error invoking \"%s\""
+msgstr "Napaka pri priklicu \"%s\""
+
+#: src/text.c:2885
+#, fuzzy
+msgid "Invoking spell checker, please wait"
+msgstr "Vključi črkovalnik, če je na voljo"
+
+#: src/text.c:2902
+#, c-format
+msgid "Spell checking failed: %s"
+msgstr "Preverjanje črkovanja je spodletelo: %s"
+
+#: src/text.c:2904
+#, c-format
+msgid "Spell checking failed: %s: %s"
+msgstr "Preverjanje črkovanja je spodletelo: %s: %s"
+
+#: src/text.c:2937
+#, fuzzy
+msgid "No linter defined for this type of file!"
+msgstr "Ne dodajaj novih vrstic na konec datotek"
+
+#: src/text.c:2947
+msgid "Save modified buffer before linting?"
+msgstr ""
+
+#: src/text.c:2969
+msgid "Invoking linter, please wait"
+msgstr ""
+
+#: src/text.c:3125
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr ""
+
+#: src/text.c:3159
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr ""
+
+#: src/text.c:3205
+#, fuzzy
+msgid "At last message"
+msgstr "Pokaži to sporočilo"
+
+#: src/text.c:3210
+#, fuzzy
+msgid "At first message"
+msgstr "Pokaži to sporočilo"
+
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr ""
+
+#: src/text.c:3275
+msgid "Finished"
+msgstr ""
+
+#: src/text.c:3280
+msgid "Invoking formatter, please wait"
+msgstr ""
+
+#: src/text.c:3360
+msgid "Finished formatting"
+msgstr ""
+
+#: src/text.c:3438
+#, c-format
+msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
+msgstr "%sBesede: %lu  Vrstice: %ld  Znaki: %lu"
+
+#: src/text.c:3439
+msgid "In Selection:  "
+msgstr "V izboru:  "
+
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3453
+msgid "Verbatim Input"
+msgstr "Natančni vnos"
+
+#: src/utils.c:410 src/utils.c:422
+msgid "nano is out of memory!"
+msgstr "Programu nano je zmanjkalo pomnilnika!"
+
+#. TRANSLATORS: This is displayed during the input of a
+#. * six-digit hexadecimal Unicode character code.
+#: src/winio.c:1583
+msgid "Unicode Input"
+msgstr "Vnos Unikod"
+
+#: src/winio.c:2142 src/winio.c:2146
+msgid "Modified"
+msgstr "Spremenjeno"
+
+#: src/winio.c:2143
+msgid "View"
+msgstr "Pogled"
+
+#: src/winio.c:2157
+msgid "DIR:"
+msgstr "MAPA:"
+
+#: src/winio.c:2164
+msgid "File:"
+msgstr "Datoteka:"
+
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2261
+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/winio.c:3377
+#, 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:3507
+msgid "The nano text editor"
+msgstr "Urejevalnik besedil nano"
+
+#: src/winio.c:3508
+msgid "version"
+msgstr "različica"
+
+#: src/winio.c:3509
+msgid "Brought to you by:"
+msgstr "Zaslužni za izid programa:"
+
+#: src/winio.c:3510
+msgid "Special thanks to:"
+msgstr "Posebna zahvala:"
+
+#: src/winio.c:3511
+msgid "The Free Software Foundation"
+msgstr "The Free Software Foundation"
+
+#: src/winio.c:3512
+msgid "the many translators and the TP"
+msgstr ""
+
+#: src/winio.c:3513
+msgid "For ncurses:"
+msgstr "Za ncurses:"
+
+#: src/winio.c:3514
+msgid "and anyone else we forgot..."
+msgstr "in vse, ki smo jih pozabili navesti ..."
+
+#: src/winio.c:3515
+msgid "Thank you for using nano!"
+msgstr "Hvala, ker uporabljate nano!"
+
+#~ msgid "Insert File"
+#~ msgstr "Vstavi dat."
+
+#~ msgid "Go to previous screen"
+#~ msgstr "Pojdi na predhodni zaslon"
+
+#~ msgid "Find Other Bracket"
+#~ msgstr "Najdi drug oklepaj"
+
+#~ msgid "Long line wrapping"
+#~ msgstr "Prelomi dolgih vrstic"
+
+#~ msgid "Soft line wrapping"
+#~ msgstr "Blagi prelomi vrstic"
+
+#~ msgid "Allow generic undo [EXPERIMENTAL]"
+#~ msgstr "Dovoli splošno razveljavitev [POSKUSNO]"
+
+#~ msgid "(ignored, for Pico compatibility)"
+#~ msgstr "(prezrto, za združljivost s programom Pico)"
+
+#~ msgid "Must specify menu to bind key to (or \"all\")"
+#~ msgstr "Treba je navesti meni, ki se veže na tipko (ali \"all\")"
+
+#~ msgid "Missing flag"
+#~ msgstr "Manjka zastavica"
+
+#~ msgid "line wrap"
+#~ msgstr "prelomi vrstico"
+
+#~ msgid "Internal error: unknown type.  Please save your work"
+#~ msgstr "Notranja napaka: neznana vrsta. Shranite svoje delo"
+
+#~ msgid "Internal error: Redo setup failed.  Please save your work"
+#~ msgstr ""
+#~ "Notranja napaka: nastavitev uveljavitve je spodletela. Shranite svoje "
+#~ "delo."
+
+#~ msgid "Could not pipe"
+#~ msgstr "Ni mogoče povezati"
diff --git a/po/sr.gmo b/po/sr.gmo
index c9fd43b..7ebadf5 100644
--- a/po/sr.gmo
+++ b/po/sr.gmo
diff --git a/po/sr.po b/po/sr.po
index 0943f9b..1faa4ca 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,1035 +1,1089 @@
-# Serbian translation of nano
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Serbian translation of nano.
+# Copyright (C) 2014 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—2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 1.2.2\n"
+"Project-Id-Version: nano-2.3.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-22 06:34-0500\n"
-"PO-Revision-Date: 2003-11-05 22:27+0100\n"
-"Last-Translator: Danilo Segan <dsegan@gmx.net>\n"
-"Language-Team: Serbian <sr@li.org>\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
+"PO-Revision-Date: 2014-09-13 12:15+0200\n"
+"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
+"Language-Team: Serbian <(nothing)>\n"
+"Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3;    plural=n%10==1 && n%100!=11 ? 0 :  (n%10>=2 && 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"
 
-#: src/browser.c:220
-#, fuzzy
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:203
 msgid "Go To Directory"
 msgstr "Иди у директоријум"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:860 src/files.c:2048
-#: src/nano.c:1060 src/search.c:220 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Отказано"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:246 src/browser.c:293
 #, c-format
 msgid "Can't go outside of %s in restricted mode"
-msgstr "Не могох да одем ван %s у ограниченом режиму"
+msgstr "Не могу да идем ван „%s“ у ограниченом режиму"
 
-#: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:722
-#: src/files.c:731 src/files.c:1540 src/files.c:1659 src/files.c:1711
-#: src/files.c:1732 src/files.c:1855 src/files.c:2691 src/rcfile.c:568
-#: src/rcfile.c:1204
-#, fuzzy, c-format
+#: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
+#: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
+#: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
+#: src/rcfile.c:590 src/rcfile.c:1426
+#, c-format
 msgid "Error reading %s: %s"
-msgstr "Лоша ниска за цитирање %s: %s"
+msgstr "Грешка при читању „%s“: %s"
 
-#: src/browser.c:303
+#: src/browser.c:283
 msgid "Can't move up a directory"
-msgstr "Не могох да уђем у наддиректоријум"
+msgstr "Не могу да идем директоријум изнад"
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:665 src/browser.c:674
+#: src/browser.c:626 src/browser.c:635
 msgid "(dir)"
-msgstr ""
+msgstr "(дир)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:632
 msgid "(parent dir)"
-msgstr ""
+msgstr "(главни дир)"
 
-#: src/browser.c:801 src/search.c:185
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "Тражи"
 
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:805 src/search.c:189
-msgid " [Case Sensitive]"
-msgstr "[разл. слова по величини]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:811 src/search.c:195
-msgid " [Regexp]"
-msgstr "[рег. израз]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:817 src/search.c:201
-msgid " [Backwards]"
-msgstr "[уназад]"
-
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
-msgstr "Претрага у круг"
+msgstr "Тражи у круг"
 
-#: src/browser.c:1006 src/browser.c:1039 src/search.c:514 src/search.c:517
-#: src/search.c:574 src/search.c:577
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "Ово је једина појава"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
+msgstr "Нема шаблона текуће претраге"
+
+#: src/files.c:139
+msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
+msgstr ""
+"Не могу да одредим мој идентет за датотеку закључавања (није успело "
+"„getpwuid()“)"
+
+#: src/files.c:145
+#, c-format
+msgid "Couldn't determine hostname for lock file: %s"
+msgstr "Не могу да одредим назив домаћина за датотеку закључавања: %s"
+
+#: src/files.c:165 src/files.c:175 src/files.c:212 src/files.c:222
+#, c-format
+msgid "Error writing lock file %s: %s"
+msgstr "Грешка записивања датотеке закључавања „%s“: %s"
+
+#: src/files.c:237
+#, c-format
+msgid "Error deleting lock file %s: %s"
+msgstr "Грешка брисања датотеке закључавања „%s“: %s"
+
+#: src/files.c:272
+#, c-format
+msgid "Error opening lock file %s: %s"
+msgstr "Грешка отварања датотеке закључавања „%s“: %s"
+
+#: src/files.c:282
+#, 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:297
+#, c-format
+msgid "File %s is being edited (by %s with %s, PID %d); continue?"
 msgstr ""
 
-#: src/files.c:125
+#: src/files.c:308
+#, c-format
+msgid "Error writing lock file: Directory '%s' doesn't exist"
+msgstr "Грешка писања датотеке закључавања: Директоријум „%s“ не постоји"
+
+#: src/files.c:339
 #, c-format
 msgid "Can't insert file from outside of %s"
-msgstr "Не могох да уметнем датотеку изван %s"
+msgstr "Не могу да уметнем датотеку изван %s"
 
-#: src/files.c:234
-#, fuzzy
+#: src/files.c:467
 msgid "No more open file buffers"
-msgstr "Нема више отворених датотека"
+msgstr "Нема више међумеморије отворених датотека"
 
-#: src/files.c:250
+#: src/files.c:484
 #, c-format
 msgid "Switched to %s"
-msgstr "Пребацих се на %s"
+msgstr "Прешао сам на %s"
 
-#: src/files.c:251 src/global.c:469 src/winio.c:2168
+#: src/files.c:485 src/global.c:953 src/winio.c:2161
 msgid "New Buffer"
-msgstr "Нови бафер"
+msgstr "Нова међумеморија"
 
-#: src/files.c:633
-#, fuzzy, c-format
+#: src/files.c:874
+#, 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 ред (претворен из Мекинтош записа)"
-msgstr[1] "Учитах %d реда (претворених из Мекинтош записа)"
-msgstr[2] "Учитах %d редова (претворених из Мекинтош записа)"
+msgstr[0] "Учитах %lu ред (претворен из ДОС и Мекинтош записа)"
+msgstr[1] "Учитах %lu реда (претворених из ДОС и Мекинтош записа)"
+msgstr[2] "Учитах %lu редова (претворених из ДОС и Мекинтош записа)"
 
-#: src/files.c:638
-#, fuzzy, c-format
+#: src/files.c:879
+#, 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 ред (претворен из Мекинтош записа)"
-msgstr[1] "Учитах %d реда (претворених из Мекинтош записа)"
-msgstr[2] "Учитах %d редова (претворених из Мекинтош записа)"
+msgstr[0] ""
+"Учитах %lu ред (претворен из ДОС и Мекинтош записа — упозорење: нема дозволе "
+"за писање)"
+msgstr[1] ""
+"Учитах %lu реда (претворених из ДОС и Мекинтош записа — упозорење: нема "
+"дозволе за писање)"
+msgstr[2] ""
+"Учитах %lu редова (претворених из ДОС и Мекинтош записа — упозорење: нема "
+"дозволе за писање)"
 
-#: src/files.c:644
-#, fuzzy, c-format
+#: src/files.c:885
+#, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
-msgstr[0] "Учитах %d ред (претворен из Мекинтош записа)"
-msgstr[1] "Учитах %d реда (претворених из Мекинтош записа)"
-msgstr[2] "Учитах %d редова (претворених из Мекинтош записа)"
+msgstr[0] "Учитах %lu ред (претворен из Мекинтош записа)"
+msgstr[1] "Учитах %lu реда (претворених из Мекинтош записа)"
+msgstr[2] "Учитах %lu редова (претворених из Мекинтош записа)"
 
-#: src/files.c:648
-#, fuzzy, c-format
+#: src/files.c:889
+#, 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 ред (претворен из Мекинтош записа)"
-msgstr[1] "Учитах %d реда (претворених из Мекинтош записа)"
-msgstr[2] "Учитах %d редова (претворених из Мекинтош записа)"
+msgstr[0] ""
+"Учитах %lu ред (претворен из Мекинтош записа — упозорење: нема дозвола за "
+"писање)"
+msgstr[1] ""
+"Учитах %lu реда (претворених из Мекинтош записа — упозорење: нема дозвола за "
+"писање)"
+msgstr[2] ""
+"Учитах %lu редова (претворених из Мекинтош записа — упозорење: нема дозвола "
+"за писање)"
 
-#: src/files.c:654
-#, fuzzy, c-format
+#: src/files.c:895
+#, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
-msgstr[0] "Учитах %d ред (претворен из ДОС записа)"
-msgstr[1] "Учитах %d реда (претворених из ДОС записа)"
-msgstr[2] "Учитах %d редова (претворених из ДОС записа)"
+msgstr[0] "Учитах %lu ред (претворен из ДОС записа)"
+msgstr[1] "Учитах %lu реда (претворених из ДОС записа)"
+msgstr[2] "Учитах %lu редова (претворених из ДОС записа)"
 
-#: src/files.c:658
-#, fuzzy, c-format
+#: src/files.c:899
+#, 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 ред (претворен из ДОС записа)"
-msgstr[1] "Учитах %d реда (претворених из ДОС записа)"
-msgstr[2] "Учитах %d редова (претворених из ДОС записа)"
+msgstr[0] ""
+"Учитах %lu ред (претворен из ДОС записа — упозорење: нема дозвола за писање)"
+msgstr[1] ""
+"Учитах %lu реда (претворених из ДОС записа — упозорење: нема дозвола за "
+"писање)"
+msgstr[2] ""
+"Учитах %lu редова (претворених из ДОС записа — упозорење: нема дозвола за "
+"писање)"
 
-#: src/files.c:664
-#, fuzzy, c-format
+#: src/files.c:905
+#, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
-msgstr[0] "Учитах %d ред"
-msgstr[1] "Учитах %d реда"
-msgstr[2] "Учитах %d редова"
+msgstr[0] "Учитах %lu ред"
+msgstr[1] "Учитах %lu реда"
+msgstr[2] "Учитах %lu редова"
 
-#: src/files.c:667
+#: src/files.c:908
 #, 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[0] "Учитах %lu редова (упозорење: нема дозвола за писање)"
+msgstr[1] "Учитах %lu редова (упозорење: нема дозвола за писање)"
+msgstr[2] "Учитах %lu редова (упозорење: нема дозвола за писање)"
 
-#: src/files.c:700 src/files.c:736
+#: src/files.c:943 src/files.c:980
 msgid "Reading File"
 msgstr "Учитавам датотеку"
 
-#: src/files.c:706
+#: src/files.c:950
 msgid "New File"
 msgstr "Нова датотека"
 
-#: src/files.c:709
+#: src/files.c:953
 #, c-format
 msgid "\"%s\" not found"
-msgstr "Не нађох „%s“"
+msgstr "Нисам нашао „%s“"
 
-#: src/files.c:717 src/rcfile.c:559 src/rcfile.c:1154 src/rcfile.c:1195
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "„%s“ је директоријум"
 
-#: src/files.c:718 src/rcfile.c:560 src/rcfile.c:1155 src/rcfile.c:1196
-#, fuzzy, c-format
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
+#, c-format
 msgid "\"%s\" is a device file"
-msgstr "Датотека „%s“ чини датотеку уређаја"
+msgstr "„%s“ је датотека уређаја"
 
-#: src/files.c:817
-#, fuzzy, c-format
+#: src/files.c:1060
+#, c-format
 msgid "Command to execute in new buffer [from %s] "
-msgstr "Датотека коју уметнути у нови бафер [из %s] "
+msgstr "Наредба за извршавање у новој међумеморији [из „%s“] "
 
-#: src/files.c:819
-#, fuzzy, c-format
+#: src/files.c:1062
+#, c-format
 msgid "Command to execute [from %s] "
-msgstr "Наредба за извршавање"
+msgstr "Наредба за извршавање [из „%s“] "
 
-#: src/files.c:825
+#: src/files.c:1069
 #, c-format
 msgid "File to insert into new buffer [from %s] "
-msgstr "Датотека коју уметнути у нови бафер [из %s] "
+msgstr "Датотека за унос у нову међумеморију [из „%s“] "
 
-#: src/files.c:827
+#: src/files.c:1071
 #, c-format
 msgid "File to insert [from %s] "
-msgstr "Датотека коју уметнути [из %s] "
+msgstr "Датотека за унос [из „%s“] "
 
-#: src/files.c:1077
-#, fuzzy
+#: src/files.c:1320
 msgid "Key invalid in non-multibuffer mode"
-msgstr "Недозвољен тастер у не-вишебаферском режиму"
+msgstr "Недозвољен тастер у не-вишемеђумеморијском режиму"
+
+#: src/files.c:1622
+msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+msgstr ""
+"Нисам успео да запишем датотеку резерве, да наставим са чувањем? (Одговорите "
+"са N ако нисте сигурни)"
 
-#: src/files.c:1486
+#: src/files.c:1746
 #, c-format
 msgid "Can't write outside of %s"
-msgstr "Не могох да упишем изван %s"
+msgstr "Не могу да пишем ван %s"
 
-#: src/files.c:1501
+#: src/files.c:1761
 msgid "Cannot prepend or append to a symlink with --nofollow set"
 msgstr ""
+"Не могу да додам подешавање „--nofollow“ испред или иза симболичке везе"
 
-#: src/files.c:1581 src/files.c:1603 src/files.c:1621 src/files.c:1632
-#: src/files.c:1640 src/files.c:1667
+#: src/files.c:1843 src/files.c:1868 src/files.c:1886 src/files.c:1899
+#: src/files.c:1910 src/files.c:1939
 #, c-format
 msgid "Error writing backup file %s: %s"
-msgstr ""
+msgstr "Грешка записивања датотеке резерве „%s“: %s"
 
-#: src/files.c:1582 src/nano.c:701
-#, fuzzy
+#: src/files.c:1844 src/nano.c:719
 msgid "Too many backup files?"
-msgstr ""
-"\n"
-"Не уписах %s (превише резервних датотека?)\n"
+msgstr "Превише резервних датотека?"
 
-#: src/files.c:1687 src/files.c:1744 src/files.c:1763 src/files.c:1775
-#: src/files.c:1799 src/files.c:1817 src/files.c:1827 src/files.c:1863
-#: src/files.c:1868 src/files.c:2764 src/files.c:2773
-#, fuzzy, c-format
+#: src/files.c:1959 src/files.c:2016 src/files.c:2035 src/files.c:2047
+#: src/files.c:2071 src/files.c:2089 src/files.c:2099 src/files.c:2135
+#: src/files.c:2140 src/files.c:3101 src/files.c:3110 src/files.c:3133
+#: src/files.c:3145
+#, c-format
 msgid "Error writing %s: %s"
-msgstr "Лоша ниска за цитирање %s: %s"
+msgstr "Грешка приликом писања „%s“: %s"
 
-#: src/files.c:1721 src/text.c:2929 src/text.c:2941
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
-msgstr ""
+msgstr "Грешка писања привремене датотеке: %s"
 
-#: src/files.c:1900
-#, fuzzy, c-format
+#: src/files.c:2173
+#, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
-msgstr[0] "Уписах %d ред"
-msgstr[1] "Уписах %d реда"
-msgstr[2] "Уписах %d редова"
+msgstr[0] "Уписах %lu ред"
+msgstr[1] "Уписах %lu реда"
+msgstr[2] "Уписах %lu редова"
 
-#: src/files.c:2004
+#: src/files.c:2278
 msgid " [DOS Format]"
-msgstr "[ДОС запис]"
+msgstr " [ДОС запис]"
 
-#: src/files.c:2005
+#: src/files.c:2279
 msgid " [Mac Format]"
-msgstr "[Мек запис]"
+msgstr " [Мек запис]"
 
-#: src/files.c:2007
+#: src/files.c:2281
 msgid " [Backup]"
-msgstr "[Резерва]"
+msgstr " [Резерва]"
 
-#: src/files.c:2015
+#: src/files.c:2289
 msgid "Prepend Selection to File"
-msgstr "Додај избор на почетак датотеке"
+msgstr "Додаје избор на почетак датотеке"
 
-#: src/files.c:2016
+#: src/files.c:2290
 msgid "Append Selection to File"
-msgstr "Додај избор на крај датотеке"
+msgstr "Додаје избор на крај датотеке"
 
-#: src/files.c:2017
+#: src/files.c:2291
 msgid "Write Selection to File"
-msgstr "Упиши избор у датотеку"
+msgstr "Уписује избор у датотеку"
 
-#: src/files.c:2020
+#: src/files.c:2294
 msgid "File Name to Prepend to"
-msgstr "У коју датотеку додати"
+msgstr "Назив датотеке којој ће претходити"
 
-#: src/files.c:2021
+#: src/files.c:2295
 msgid "File Name to Append to"
-msgstr "У коју датотеку додати"
+msgstr "Назив датотеке за којом ће следити"
 
-#: src/files.c:2022
+#: src/files.c:2296
 msgid "File Name to Write"
-msgstr "У коју датотеку уписати"
+msgstr "Назив датотеке у којој ће уписати"
 
-#: src/files.c:2153
-#, fuzzy
+#: src/files.c:2427
 msgid "File exists, OVERWRITE ? "
 msgstr "Датотека постоји, да ПРЕСНИМИМ?"
 
-#: src/files.c:2162
+#: src/files.c:2436
 msgid "Save file under DIFFERENT NAME ? "
-msgstr ""
+msgstr "Да сачувам датотеку под ДРУГАЧИЈИМ НАЗИВОМ ?"
 
-#: src/files.c:2173
+#: src/files.c:2450
 msgid "File was modified since you opened it, continue saving ? "
-msgstr ""
+msgstr "Датотека је измењена од када сте је отворили, да наставим са чувањем ?"
 
-#: src/files.c:2611
+#: src/files.c:2882
 msgid "(more)"
-msgstr "(више)"
+msgstr "(још)"
 
-#: src/files.c:2694 src/rcfile.c:1220
-#, fuzzy, c-format
+#: src/files.c:2974
+#, c-format
 msgid ""
 "\n"
-"Press Enter to continue starting nano.\n"
+"Press Enter to continue\n"
 msgstr ""
 "\n"
-"Притисните ентер за наставак покретања нана\n"
+"Притисните Унеси да наставите\n"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:415 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Откажи"
-
-#: src/global.c:416
-msgid "Replace"
-msgstr "Замени"
+#: src/files.c:2989
+#, c-format
+msgid ""
+"Unable to create directory %s: %s\n"
+"It is required for saving/loading search history or cursor positions.\n"
+msgstr ""
+"Не могу да направим директоријум „%s“: %s\n"
+"Потребан је за чување/учитавање историјата претраге или положаја курсора.\n"
 
-#: src/global.c:417
-msgid "No Replace"
-msgstr "Без замене"
+#: src/files.c:2995
+#, 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 ""
+"Путања „%s“ није директоријум а мора бити.\n"
+"Нано неће бити у могућности да учита или да сачува историјат претраге или "
+"положаје курсора.\n"
 
-#: src/global.c:420
-msgid "Case Sens"
-msgstr "Вел. слова"
+#: src/files.c:3012
+#, 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 ""
+"Открио сам стару датотеку историјата наноа (%s) коју сам покушао да\n"
+"преместим на жељено место (%s) али сам наишао на грешку: %s"
 
-#: src/global.c:421
-#, fuzzy
-msgid "Backwards"
-msgstr "[уназад]"
+#: src/files.c:3016
+#, 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 ""
+"Открио сам стару датотеку историјата наноа (%s) коју сам\n"
+"преместио на жељено место (%s)\n"
+"(погледајте нанова ЧПП о овој измени)"
 
-#: src/global.c:425
-msgid "Regexp"
-msgstr "Рег. израз"
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
+#: src/global.c:477
+msgid "Exit"
+msgstr "Изађи"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:451
-#, fuzzy
-msgid "PrevHstory"
-msgstr "Историјат"
+#: src/global.c:478
+msgid "Close"
+msgstr "Затвори"
 
-#: src/global.c:452
-#, fuzzy
-msgid "NextHstory"
-msgstr "Историјат"
+#: src/global.c:479
+msgid "Uncut Text"
+msgstr "Не сеци текст"
 
-#: src/global.c:453
-#, fuzzy
-msgid "Go To Text"
-msgstr "Иди у ред"
+#: src/global.c:481
+msgid "Unjustify"
+msgstr "Одравнај"
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:455
-#, fuzzy
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:485
 msgid "WhereIs Next"
-msgstr "Где је"
-
-#: src/global.c:457
-#, fuzzy
-msgid "First File"
-msgstr "Први ред"
-
-#: src/global.c:458
-#, fuzzy
-msgid "Last File"
-msgstr "Последњи ред"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:460
-msgid "To Files"
-msgstr "У датотеке"
-
-#: src/global.c:462
-msgid "DOS Format"
-msgstr "ДОС запис"
-
-#: src/global.c:463
-msgid "Mac Format"
-msgstr "Мекинтош запис"
-
-#: src/global.c:464
-msgid "Append"
-msgstr "Надодај"
-
-#: src/global.c:465
-msgid "Prepend"
-msgstr "Додај на почетак"
-
-#: src/global.c:466
-msgid "Backup File"
-msgstr "Сачини резерву датотеке"
-
-#: src/global.c:467
-msgid "Execute Command"
-msgstr "Изврши наредбу"
-
-#: src/global.c:471
-msgid "Go To Dir"
-msgstr "Иди у директоријум"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:480
-msgid "Get Help"
-msgstr "Добијте помоћ"
+msgstr "Где је слдћи"
 
-#: src/global.c:481
-msgid "Exit"
-msgstr "Изађи"
-
-#: src/global.c:482
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:492
 msgid "Where Is"
 msgstr "Где је"
 
-#: src/global.c:483
-msgid "Prev Page"
-msgstr "Претходна страна"
-
-#: src/global.c:484
-msgid "Next Page"
-msgstr "Следећа страна"
-
-#: src/global.c:485
-msgid "First Line"
-msgstr "Први ред"
+#: src/global.c:493
+msgid "Replace"
+msgstr "Замени"
 
-#: src/global.c:486
-msgid "Last Line"
-msgstr "Последњи ред"
+#: src/global.c:494
+msgid "Go To Line"
+msgstr "На ред"
 
-#: src/global.c:487
-msgid "Suspend"
-msgstr "Суспендуј"
+#: src/global.c:495
+msgid "Prev Line"
+msgstr "Претходни ред"
 
-#: src/global.c:489
-msgid "Beg of Par"
-msgstr ""
+#: src/global.c:496
+msgid "Next Line"
+msgstr "Следећи ред"
 
-#: src/global.c:490
-msgid "End of Par"
-msgstr ""
+#: src/global.c:497
+msgid "Read File"
+msgstr "Читај датотеку"
 
-#: src/global.c:491
-#, fuzzy
+#: src/global.c:499
 msgid "FullJstify"
-msgstr "Пораванај"
+msgstr "Пуно поравнање"
 
-#: src/global.c:493
+#: src/global.c:501
 msgid "Refresh"
 msgstr "Освежи"
 
-#: src/global.c:495
-#, fuzzy
-msgid "Insert File"
-msgstr "Следећа датотека"
-
-#: src/global.c:497
-msgid "Go To Line"
-msgstr "Иди у ред"
-
-#: src/global.c:500
-msgid "Justify the current paragraph"
-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:505
+#: src/global.c:507
+msgid "Justify the current paragraph"
+msgstr "Поравнава текући пасус"
+
+#: src/global.c:509
 msgid "Cancel the current function"
-msgstr "Откажи текућу операцију"
+msgstr "Отказује текућу операцију"
 
-#: src/global.c:506
+#: src/global.c:510
 msgid "Display this help text"
-msgstr ""
+msgstr "Приказује текст ове помоћи"
 
-#: src/global.c:509
-#, fuzzy
+#: src/global.c:513
 msgid "Close the current file buffer / Exit from nano"
-msgstr "Затвори тренутно учитану датотеку/изађи из нана"
+msgstr "Затвара међумеморију тренутне датотеке / излази из нана"
 
-#: src/global.c:511
+#: src/global.c:515
 msgid "Exit from nano"
-msgstr "Изађи из нана"
+msgstr "Излази из нана"
 
-#: src/global.c:515
+#: src/global.c:519
 msgid "Write the current file to disk"
-msgstr "Упиши текућу датотеку на диск"
+msgstr "Уписује текућу датотеку на диск"
 
-#: src/global.c:517
+#: src/global.c:521
 msgid "Insert another file into the current one"
-msgstr "Уметни другу датотеку у текућу"
+msgstr "Умеће другу датотеку у текућу"
 
-#: src/global.c:519
-#, fuzzy
+#: src/global.c:523
 msgid "Search for a string or a regular expression"
-msgstr "Користи регуларне изразе"
+msgstr "Тражи ниску или регуларни израз"
 
-#: src/global.c:520
-#, fuzzy
-msgid "Go to previous screen"
-msgstr "Пребаци се на претходни екран"
+#: src/global.c:526
+msgid "Search for a string"
+msgstr "Тражи ниску"
 
-#: src/global.c:521
-#, fuzzy
-msgid "Go to next screen"
-msgstr "Пребаци се на следећи екран"
+#: src/global.c:528
+msgid "Go one screenful up"
+msgstr "На следећи екран"
 
-#: src/global.c:523
+#: src/global.c:529
+msgid "Go one screenful down"
+msgstr "На претходни екран"
+
+#: src/global.c:531
 msgid "Cut the current line and store it in the cutbuffer"
-msgstr "Исеци текући ред и смести га у исечке"
+msgstr "Исеца текући ред и смешта га у исечке"
 
-#: src/global.c:525
+#: src/global.c:533
 msgid "Uncut from the cutbuffer into the current line"
-msgstr "Убаци исечак у текући ред"
+msgstr "Убацује исечак у текући ред"
 
-#: src/global.c:527
-#, fuzzy
+#: src/global.c:534
 msgid "Display the position of the cursor"
-msgstr "Прикажи положај курзора"
+msgstr "Приказује положај курзора"
 
-#: src/global.c:529
+#: src/global.c:536
 msgid "Invoke the spell checker, if available"
-msgstr "Покрени правописну проверу, ако је доступна"
+msgstr "Покреће проверу правописа, ако је доступна"
 
-#: src/global.c:531
-#, fuzzy
+#: src/global.c:538
 msgid "Replace a string or a regular expression"
-msgstr "Користи регуларне изразе"
+msgstr "Замењује ниску или регуларни израз"
 
-#: src/global.c:532
-#, fuzzy
+#: src/global.c:539
 msgid "Go to line and column number"
-msgstr "Иди на одређени ред"
+msgstr "На ред и број ступца"
 
-#: src/global.c:534
-#, fuzzy
-msgid "Mark text at the cursor position"
-msgstr "Означи текст на текућем положају курзора"
+#: src/global.c:541
+msgid "Mark text starting from the cursor position"
+msgstr "Означава текст почевши од положаја курзора"
 
-#: src/global.c:535
-msgid "Repeat last search"
-msgstr ""
+#: src/global.c:542
+msgid "Repeat the last search"
+msgstr "Понавља последњу претрагу"
 
-#: src/global.c:537
-#, fuzzy
+#: src/global.c:544
 msgid "Copy the current line and store it in the cutbuffer"
-msgstr "Исеци текући ред и смести га у исечке"
+msgstr "Исеца текући ред и смешта га у исечке"
 
-#: src/global.c:538
-#, fuzzy
+#: src/global.c:545
 msgid "Indent the current line"
-msgstr "Додај на текућу датотеку"
+msgstr "Увлачи текући ред"
 
-#: src/global.c:539
-#, fuzzy
+#: src/global.c:546
 msgid "Unindent the current line"
-msgstr "Додај на текућу датотеку"
+msgstr "Поништава увлачење текућег реда"
 
-#: src/global.c:540
+#: src/global.c:547
 msgid "Undo the last operation"
-msgstr ""
+msgstr "Поништава последњу радњу"
 
-#: src/global.c:541
+#: src/global.c:548
 msgid "Redo the last undone operation"
-msgstr ""
+msgstr "Враћа последњу поништену радњу"
 
-#: src/global.c:543
-#, fuzzy
+#: src/global.c:550
 msgid "Go forward one character"
-msgstr "Иди један знак напред"
+msgstr "Иде један знак унапред"
 
-#: src/global.c:544
-#, fuzzy
+#: src/global.c:551
 msgid "Go back one character"
-msgstr "Иди један знак назад"
+msgstr "Иде један знак уназад"
 
-#: src/global.c:546
-#, fuzzy
+#: src/global.c:553
 msgid "Go forward one word"
-msgstr "Иди једну реч унапред"
+msgstr "Иде једну реч унапред"
 
-#: src/global.c:547
-#, fuzzy
+#: src/global.c:554
 msgid "Go back one word"
-msgstr "Иди једну реч уназад"
+msgstr "Иде једну реч уназад"
 
-#: src/global.c:549
-#, fuzzy
+#: src/global.c:556
 msgid "Go to previous line"
-msgstr "Пребаци се на претходни екран"
+msgstr "На претходни ред"
 
-#: src/global.c:550
-#, fuzzy
+#: src/global.c:557
 msgid "Go to next line"
-msgstr "Иди један ред испод"
+msgstr "На следећи ред"
 
-#: src/global.c:551
-#, fuzzy
+#: src/global.c:558
 msgid "Go to beginning of current line"
-msgstr "Иди на почетак текућег реда"
+msgstr "На почетак текућег реда"
 
-#: src/global.c:552
-#, fuzzy
+#: src/global.c:559
 msgid "Go to end of current line"
-msgstr "Иди на крај текућег реда"
+msgstr "На крај текућег реда"
 
-#: src/global.c:555
+#: src/global.c:562
 msgid "Go to beginning of paragraph; then of previous paragraph"
-msgstr ""
+msgstr "На почетак пасуса; затим претходног пасуса"
 
-#: src/global.c:557
+#: src/global.c:564
 msgid "Go just beyond end of paragraph; then of next paragraph"
-msgstr ""
+msgstr "Иде одмах после краја пасуса; затим следећег пасуса"
 
-#: src/global.c:560
+#: src/global.c:566
 msgid "Go to the first line of the file"
-msgstr "Иди у први ред датотеке"
+msgstr "Иде у први ред датотеке"
 
-#: src/global.c:562
+#: src/global.c:567
 msgid "Go to the last line of the file"
-msgstr "Иди у последњи ред датотеке"
+msgstr "Иде у последњи ред датотеке"
 
-#: src/global.c:564
-#, fuzzy
+#: src/global.c:569
 msgid "Go to the matching bracket"
-msgstr "Нема одговарајуће заграде"
+msgstr "На одговарајућу заграду"
 
-#: src/global.c:566
+#: src/global.c:571
 msgid "Scroll up one line without scrolling the cursor"
-msgstr ""
+msgstr "Помера се један ред горе без померања курсора"
 
-#: src/global.c:568
+#: src/global.c:573
 msgid "Scroll down one line without scrolling the cursor"
-msgstr ""
+msgstr "Помера се један ред доле без померања курсора"
 
-#: src/global.c:572
-#, fuzzy
+#: src/global.c:576
 msgid "Switch to the previous file buffer"
-msgstr "Пребаци се на претходни екран"
+msgstr "Пребацује се на међумеморију претходне датотеке"
 
-#: src/global.c:574
+#: src/global.c:577
 msgid "Switch to the next file buffer"
-msgstr ""
+msgstr "Пребацује се на међумеморију следеће датотеке"
 
-#: src/global.c:577
+#: src/global.c:579
 msgid "Insert the next keystroke verbatim"
-msgstr ""
+msgstr "Умеће следећу дословност притиска тастера"
 
-#: src/global.c:579
-#, fuzzy
+#: src/global.c:580
 msgid "Insert a tab at the cursor position"
-msgstr "Уметни прелом реда на текућем положају"
+msgstr "Умеће табулатор на положај курсора"
 
 #: src/global.c:581
-#, fuzzy
 msgid "Insert a newline at the cursor position"
-msgstr "Уметни прелом реда на текућем положају"
+msgstr "Умеће нови ред на положај курсора"
 
-#: src/global.c:583
+#: src/global.c:582
 msgid "Delete the character under the cursor"
-msgstr "Обриши знак под курзором"
+msgstr "Брише знак под курзором"
 
-#: src/global.c:585
+#: src/global.c:584
 msgid "Delete the character to the left of the cursor"
-msgstr "Обриши знак лево од курзора"
+msgstr "Брише знак лево од курзора"
 
-#: src/global.c:588
-#, fuzzy
+#: src/global.c:587
 msgid "Cut from the cursor position to the end of the file"
-msgstr "Убаци исечак у текући ред"
+msgstr "Одсеца од положаја курзора до краја датотеке"
 
-#: src/global.c:591
-#, fuzzy
+#: src/global.c:590
 msgid "Justify the entire file"
-msgstr "Поравнај текући пасус"
+msgstr "Поравнава читаву датотеку"
 
-#: src/global.c:595
+#: src/global.c:594
 msgid "Count the number of words, lines, and characters"
-msgstr ""
+msgstr "Броји речи, редова, и знакова"
 
-#: src/global.c:598
+#: src/global.c:597
 msgid "Refresh (redraw) the current screen"
-msgstr "Освежи (понов исцртај) текући екран"
+msgstr "Освежава (поново исцртава) текући екран"
 
-#: src/global.c:600
+#: src/global.c:599
 msgid "Suspend the editor (if suspend is enabled)"
-msgstr ""
+msgstr "Обуставља уређивача (ако је обустављање укључено)"
 
-#: src/global.c:603
+#: src/global.c:602
 msgid "Toggle the case sensitivity of the search"
-msgstr ""
+msgstr "Пребацује осетљивост величине слова у претрази"
 
-#: src/global.c:605
-#, fuzzy
+#: src/global.c:604
 msgid "Reverse the direction of the search"
-msgstr "Прикажи положај курзора"
+msgstr "Заокреће правац претраге"
 
-#: src/global.c:609
-#, fuzzy
+#: src/global.c:608
 msgid "Toggle the use of regular expressions"
-msgstr "Користи регуларне изразе"
+msgstr "Пребацује коришћење регуларних израза"
 
-#: src/global.c:613
-#, fuzzy
+#: src/global.c:612
 msgid "Recall the previous search/replace string"
-msgstr "Уреди ниске претходних претрага и замена"
+msgstr "Опозива ниску претходне претраге и замене"
 
-#: src/global.c:615
-#, fuzzy
+#: src/global.c:614
 msgid "Recall the next search/replace string"
-msgstr "Уреди ниске претходних претрага и замена"
+msgstr "Опозива ниску следеће претраге и замене"
 
-#: src/global.c:618
+#: src/global.c:617
 msgid "Go to file browser"
-msgstr "Иди у прегледач датотека"
+msgstr "Иде у прегледач датотека"
 
-#: src/global.c:621
-#, fuzzy
+#: src/global.c:620
 msgid "Toggle the use of DOS format"
-msgstr "Упишите датотеку у ДОС облику"
+msgstr "Пребацује коришћење ДОС записа"
 
-#: src/global.c:622
-#, fuzzy
+#: src/global.c:621
 msgid "Toggle the use of Mac format"
-msgstr "Упишите датотеку у Мек облику"
+msgstr "Пребацује коришћење Мекинтош записа"
 
-#: src/global.c:624
+#: src/global.c:622
 msgid "Toggle appending"
-msgstr ""
+msgstr "Пребацује додавање након"
 
-#: src/global.c:625
+#: src/global.c:623
 msgid "Toggle prepending"
-msgstr ""
+msgstr "Пребацује додавање пре"
 
-#: src/global.c:628
+#: src/global.c:624
 msgid "Toggle backing up of the original file"
-msgstr ""
+msgstr "Пребацује стварање резерве изворне датотеке"
 
-#: src/global.c:629
+#: src/global.c:625
 msgid "Execute external command"
-msgstr "Изврши спољну наредбу"
+msgstr "Извршава спољну наредбу"
 
-#: src/global.c:633
-#, fuzzy
+#: src/global.c:628
 msgid "Toggle the use of a new buffer"
-msgstr "Измена убацивања у нови бафер"
+msgstr "Пребацује коришћење нове међумеморије"
 
-#: src/global.c:636
-#, fuzzy
+#: src/global.c:631
 msgid "Exit from the file browser"
-msgstr "Иди у прегледач датотека"
+msgstr "Излази из прегледача датотека"
 
-#: src/global.c:638
-#, fuzzy
+#: src/global.c:632
 msgid "Go to the first file in the list"
-msgstr "Иди у први ред датотеке"
+msgstr "Иде у прву датотеку на списку"
 
-#: src/global.c:640
-#, fuzzy
+#: src/global.c:633
 msgid "Go to the last file in the list"
-msgstr "Иди у последњи ред датотеке"
+msgstr "Иде у последњу датотеку на списку"
 
-#: src/global.c:641
-#, fuzzy
+#: src/global.c:634
+msgid "Go to the previous file in the list"
+msgstr "На претходну датотеку на списку"
+
+#: src/global.c:635
 msgid "Go to the next file in the list"
-msgstr "Иди у последњи ред датотеке"
+msgstr "Иде у следећу датотеку на списку"
+
+#: src/global.c:636
+msgid "Go to directory"
+msgstr "Иде у директоријум"
+
+#: src/global.c:639
+msgid "Invoke the linter, if available"
+msgstr "Покреће чистача, ако је доступан"
+
+#: src/global.c:640
+msgid "Go to previous linter msg"
+msgstr "Иде на претходну поруку чистача"
+
+#: src/global.c:641
+msgid "Go to next linter msg"
+msgstr "Иде на следећу поруку чистача"
 
 #: src/global.c:642
 #, fuzzy
-msgid "Go to the previous file in the list"
-msgstr "Иди у први ред датотеке"
+msgid "Invoke formatter, if available"
+msgstr "Покреће чистача, ако је доступан"
 
-#: src/global.c:643
-msgid "Go to directory"
-msgstr "Иди у директоријум"
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:662
+msgid "Get Help"
+msgstr "Добави помоћ"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:670
-msgid "Close"
-msgstr "Затвори"
+#: src/global.c:665 src/prompt.c:1084
+msgid "Cancel"
+msgstr "Откажи"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:679
-msgid "WriteOut"
+#: src/global.c:678
+msgid "Write Out"
 msgstr "Испиши"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
-msgid "Justify"
-msgstr "Пораванај"
-
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:696
-msgid "Read File"
-msgstr "Прочитај датотеку"
+#: src/global.c:704
+msgid "Go To Dir"
+msgstr "У директорјум"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:713
+#: src/global.c:719
 msgid "Cut Text"
 msgstr "Исеци текст"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:718
-msgid "UnJustify"
-msgstr "Одравнај"
+#: src/global.c:728
+msgid "Justify"
+msgstr "Пораванај"
+
+#: src/global.c:733
+msgid "To Spell"
+msgstr "На проверу писања"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:723
+#: src/global.c:738
+msgid "To Linter"
+msgstr "На чишћење"
+
+#: src/global.c:740
 #, fuzzy
-msgid "UnCut Text"
-msgstr "Убаци текст"
+msgid "Formatter"
+msgstr "ДОС запис"
+
+#: src/global.c:745
+msgid "Case Sens"
+msgstr "Вел. слова"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:728 src/global.c:755
+#: src/global.c:750
+msgid "Regexp"
+msgstr "Рег. израз"
+
+#: src/global.c:755
+msgid "Backwards"
+msgstr "Уназад"
+
+#: src/global.c:762
+msgid "No Replace"
+msgstr "Не мењај"
+
+#: src/global.c:770
 msgid "Cur Pos"
-msgstr "Пол. курз."
+msgstr "Положај курзора"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:737
-msgid "To Spell"
-msgstr "У проверу правописа"
+#: src/global.c:780
+msgid "Prev Page"
+msgstr "Претходна страна"
 
-#: src/global.c:771
+#: src/global.c:782
+msgid "Next Page"
+msgstr "Следећа страна"
+
+#: src/global.c:785
+msgid "First Line"
+msgstr "Први ред"
+
+#: src/global.c:787
+msgid "Last Line"
+msgstr "Последњи ред"
+
+#: src/global.c:794
+msgid "To Bracket"
+msgstr "До заграде"
+
+#: src/global.c:797
 msgid "Mark Text"
 msgstr "Означи текст"
 
-#: src/global.c:777
-#, fuzzy
+#: src/global.c:800
 msgid "Copy Text"
-msgstr "Исеци текст"
+msgstr "Умножи текст"
 
-#: src/global.c:780
-#, fuzzy
+#: src/global.c:803
 msgid "Indent Text"
-msgstr "Исеци текст"
+msgstr "Увуци текст"
 
-#: src/global.c:783
-#, fuzzy
+#: src/global.c:805
 msgid "Unindent Text"
-msgstr "Убаци текст"
+msgstr "Поништи увлачење"
 
-#: src/global.c:787
+#: src/global.c:808
 msgid "Undo"
-msgstr ""
+msgstr "Опозови"
 
-#: src/global.c:790
+#: src/global.c:810
 msgid "Redo"
-msgstr ""
-
-#: src/global.c:796 src/global.c:800
-msgid "Forward"
-msgstr "Напред"
+msgstr "Поврати"
 
-#: src/global.c:806 src/global.c:810
+#: src/global.c:814 src/global.c:820
 msgid "Back"
 msgstr "Назад"
 
-#: src/global.c:817
-msgid "Next Word"
-msgstr "Следећа реч"
+#: src/global.c:816 src/global.c:822
+msgid "Forward"
+msgstr "Напред"
 
-#: src/global.c:820
+#: src/global.c:827
 msgid "Prev Word"
 msgstr "Претходна реч"
 
-#: src/global.c:824
-#, fuzzy
-msgid "Prev Line"
-msgstr "Претходна страна"
-
-#: src/global.c:827
-#, fuzzy
-msgid "Next Line"
-msgstr "Следећа датотека"
+#: src/global.c:829
+msgid "Next Word"
+msgstr "Следећа реч"
 
-#: src/global.c:830
+#: src/global.c:833
 msgid "Home"
 msgstr "Почетак"
 
-#: src/global.c:833
+#: src/global.c:835
 msgid "End"
 msgstr "Крај"
 
-#: src/global.c:845
-msgid "Find Other Bracket"
-msgstr "Нађи другу заграду"
+#: src/global.c:844
+msgid "Beg of Par"
+msgstr "Почeтaк пасуса"
 
-#: src/global.c:848
-msgid "Scroll Up"
-msgstr ""
+#: src/global.c:846
+msgid "End of Par"
+msgstr "Крај пасуса"
 
 #: src/global.c:851
+msgid "Scroll Up"
+msgstr "Помакни горе"
+
+#: src/global.c:853
 msgid "Scroll Down"
-msgstr ""
+msgstr "Помакни доле"
 
-#: src/global.c:856
-msgid "Previous File"
+#: src/global.c:858
+msgid "Prev File"
 msgstr "Претходна датотека"
 
-#: src/global.c:858
+#: src/global.c:860
 msgid "Next File"
 msgstr "Следећа датотека"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:862 src/text.c:3045
-msgid "Verbatim Input"
-msgstr ""
+#: src/global.c:869
+msgid "Verbatim"
+msgstr "Вербатим"
 
-#: src/global.c:867
+#: src/global.c:872
 msgid "Tab"
 msgstr "Табулатор"
 
-#: src/global.c:870
+#: src/global.c:874
 msgid "Enter"
-msgstr "Унос"
+msgstr "Унеси"
 
-#: src/global.c:873
+#: src/global.c:876
 msgid "Delete"
 msgstr "Обриши"
 
-#: src/global.c:876
+#: src/global.c:878
 msgid "Backspace"
-msgstr "Брисање"
+msgstr "Врати простор"
 
-#: src/global.c:893
+#: src/global.c:888
 msgid "CutTillEnd"
-msgstr ""
+msgstr "Исеци до краја"
 
-#: src/global.c:906
+#: src/global.c:898
 msgid "Word Count"
-msgstr ""
+msgstr "Изброј речи"
+
+#: src/global.c:905
+msgid "Suspend"
+msgstr "Обустави"
+
+#: src/global.c:910
+msgid "PrevHstory"
+msgstr "Прет. историјат"
+
+#: src/global.c:913
+msgid "NextHstory"
+msgstr "След. историјат"
+
+#: src/global.c:917
+msgid "Go To Text"
+msgstr "На текст"
+
+#: src/global.c:928
+msgid "DOS Format"
+msgstr "ДОС запис"
+
+#: src/global.c:931
+msgid "Mac Format"
+msgstr "Мекинтош запис"
+
+#: src/global.c:934
+msgid "Append"
+msgstr "Додај позади"
+
+#: src/global.c:936
+msgid "Prepend"
+msgstr "Додај напред"
+
+#: src/global.c:939
+msgid "Backup File"
+msgstr "Направи резерву"
 
-#: src/global.c:1367
+#: src/global.c:946
+msgid "Execute Command"
+msgstr "Изврши наредбу"
+
+#: src/global.c:961
+msgid "To Files"
+msgstr "У датотеке"
+
+#: src/global.c:964
+msgid "First File"
+msgstr "Прва датотека"
+
+#: src/global.c:966
+msgid "Last File"
+msgstr "Пследња датотека"
+
+#: src/global.c:977
+msgid "Prev Lint Msg"
+msgstr "Пртх пор чистч"
+
+#: src/global.c:979
+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:1227
 msgid "Help mode"
 msgstr "Режим помоћи"
 
-#: src/global.c:1369
-#, fuzzy
+#: src/global.c:1229
 msgid "Constant cursor position display"
-msgstr "Константан положај курзора"
+msgstr "Сталан приказ положаја курзора"
 
-#: src/global.c:1371
+#: src/global.c:1231
 msgid "Use of one more line for editing"
-msgstr ""
+msgstr "Користи још један ред за уређивање"
 
-#: src/global.c:1373
+#: src/global.c:1233
 msgid "Smooth scrolling"
 msgstr "Глатко клизање"
 
-#: src/global.c:1375
+#: src/global.c:1235
+msgid "Soft wrapping of overlong lines"
+msgstr "Слабо преламање превише дугих редова"
+
+#: src/global.c:1237
 msgid "Whitespace display"
-msgstr ""
+msgstr "Приказ празнина"
 
-#: src/global.c:1377
+#: src/global.c:1239
 msgid "Color syntax highlighting"
 msgstr "Истицање синтаксе у боји"
 
-#: src/global.c:1379
+#: src/global.c:1241
 msgid "Smart home key"
-msgstr ""
+msgstr "Паметни тастер „Почетак“"
 
-#: src/global.c:1381
+#: src/global.c:1243
 msgid "Auto indent"
 msgstr "Самоувлачење"
 
-#: src/global.c:1383
+#: src/global.c:1245
 msgid "Cut to end"
-msgstr "Исеци до краја"
+msgstr "Исецање до краја"
 
-#: src/global.c:1385
-msgid "Long line wrapping"
-msgstr ""
+#: src/global.c:1247
+msgid "Hard wrapping of overlong lines"
+msgstr "Јако преламање превише дугих редова"
 
-#: src/global.c:1387
+#: src/global.c:1249
 msgid "Conversion of typed tabs to spaces"
-msgstr ""
+msgstr "Претварање укуцаних табулатора у размаке"
 
-#: src/global.c:1389
-#, fuzzy
+#: src/global.c:1251
 msgid "Backup files"
-msgstr "Сачини резерву датотеке"
+msgstr "Резервне датотеке"
 
-#: src/global.c:1391
+#: src/global.c:1253
 msgid "Multiple file buffers"
-msgstr "Бафери више датотека"
+msgstr "Међумеморије више датотека"
 
-#: src/global.c:1393
+#: src/global.c:1255
 msgid "Mouse support"
 msgstr "Подршка за миша"
 
-#: src/global.c:1395
+#: src/global.c:1257
 msgid "No conversion from DOS/Mac format"
 msgstr "Без претварања из Мекинтош/ДОС записа"
 
-#: src/global.c:1397
-#, fuzzy
+#: src/global.c:1259
 msgid "Suspension"
-msgstr "Суспендуј"
-
-#: src/global.c:1399
-msgid "Soft line wrapping"
-msgstr ""
+msgstr "Обустави"
 
 # bug: there's "enter" and "Enter"
-#: src/help.c:236
-#, fuzzy
+#: src/help.c:205
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1043,18 +1097,15 @@ msgid ""
 msgstr ""
 "Помоћ за наредбу претраге\n"
 "\n"
-" Унесите речи или знаке које желите да нађете, и притисните Ентер. Уколико "
-"се тражени текст пронађе, на екрану ће се приказати положај најближег "
-"резултата претраге.\n"
+" Унесите речи или знаке које желите да нађете, и притисните Унеси. Уколико "
+"постоји тражени текст, на екрану ће се приказати положај најближег резултата "
+"претраге.\n"
 "\n"
 " Претходна ниска претраге ће се приказати у угластим заградама након "
-"„Тражи:“. Притиском на Ентер уместо уноса новог текста ће извести претходну "
-"претрагу.\n"
-"\n"
-" Наредни тастери обављају неки посао у режиму претраге:\n"
-"\n"
+"„Тражи:“. Притиском на Унеси без уноса неког текста ће обавити претходну "
+"претрагу."
 
-#: src/help.c:245
+#: src/help.c:214
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1062,8 +1113,13 @@ msgid ""
 " The following function keys are available in Search mode:\n"
 "\n"
 msgstr ""
+"Ако сте изабрали текст са означавачем а затим претрагу да замените, само "
+"поклапања у изабраном тексту ће бити замењена.\n"
+"\n"
+" Следећи тастери су доступни у режиму претраге:\n"
+"\n"
 
-#: src/help.c:251
+#: src/help.c:220
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1076,15 +1132,14 @@ msgid ""
 msgstr ""
 "Помоћ за одлазак у ред\n"
 "\n"
-" Унесите број реда у који желите да одете и притисните Ентер. Уколико има "
+" Унесите број реда у који желите да идете и притисните Унеси. Уколико има "
 "мање редова текста од броја који сте унели, поставићу вас на последњи ред "
 "датотеке.\n"
 "\n"
-" Наредни тастери обављају неки посао у режиму одласка у ред:\n"
+" Следећи тастери су доступни у режиму одласка у ред:\n"
 "\n"
 
-#: src/help.c:260
-#, fuzzy
+#: src/help.c:229
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1098,21 +1153,16 @@ msgid ""
 msgstr ""
 "Помоћ за уметање датотеке\n"
 "\n"
-" Унесите име датотеке коју желите да уметнете у текући бафер на текућем "
-"положају курзора.\n"
-"\n"
-" Уколико сте изградили нана са подршком за вишедатотечне бафере, и укључили "
-"више бафера са опцијама „-F“ или „--multibuffer“, Мета-F изменом, или nanorc "
-"датотеком, уметање датотеке ће је учитати у одвојеном баферу (користите Мета-"
-"< и > за пребацивање између бафера).\n"
-"\n"
-" Уколико вам треба још један празан бафер, не уносите име датотеке, или "
-"укуцајте име непостојеће датотеке и притисните Ентер.\n"
-"\n"
-" Наредни тастери обављају неки посао у режиму уметања датотеке:\n"
+" Унесите назив датотеке коју желите да уметнете у текућу међумеморију на "
+"текућем положају курзора.\n"
 "\n"
+" Уколико сте наноа изградили са подршком међумеморије за више датотека, и "
+"укључили међумеморије више датотека са опцијама „-F“ или „--multibuffer“, "
+"Мета-F изменом, или нанорц датотеком, уметање датотеке ће је учитати у "
+"одвојеној међумеморији (користите Мета-< и > за пребацивање између "
+"међумеморија)."
 
-#: src/help.c:269
+#: src/help.c:238
 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"
@@ -1120,9 +1170,13 @@ msgid ""
 " The following function keys are available in Insert File mode:\n"
 "\n"
 msgstr ""
+"Уколико вам треба још једна празна међумеморија, немојте унети назив "
+"датотеке, или укуцајте назив непостојеће датотеке и притисните Унеси.\n"
+"\n"
+" Следећи тастери су доступни у режиму уметања датотеке:\n"
+"\n"
 
-#: src/help.c:275
-#, fuzzy
+#: src/help.c:244
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1139,18 +1193,18 @@ msgid ""
 msgstr ""
 "Помоћ за упис датотеке\n"
 "\n"
-" Унесите име датотеке у коју желите да упишете текући бафер и притисните "
-"Ентер да снимите.\n"
+" Унесите назив датотеке у којој желите да сачувате текућу датотеку и "
+"притисните Унеси да сачувате датотеку.\n"
 "\n"
-" Уколико сте изабрали текст помоћу Ctrl-^, бићете упитани да ли желите да "
-"сачувате изабрани део у одвојену датотеку. Да умањите шансе преснимавања "
-"постојеће датотеке једним њеним делом, име текуће датотеке се не подразумева "
-"у овом режиму.\n"
+" Уколико сте изабрали текст помоћу означавача, бићете упитани да ли желите "
+"да сачувате само изабрани део у засебну датотеку. Да умањите шансе "
+"преснимавања постојеће датотеке само једним њеним делом, назив текуће "
+"датотеке се не подразумева у овом режиму.\n"
 "\n"
-" Наредни тастери обављају неки посао у режиму уписа датотеке:\n"
+" Следећи тастери су доступни у режиму уписа датотеке:\n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:258
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1166,17 +1220,16 @@ msgstr ""
 "Помоћ за прегледач датотека\n"
 "\n"
 " Прегледач датотека се користи за визуелно разгледање директоријума за избор "
-"датотеке ради читања или уписа. Можете користити стрелице или PageUp/Down "
-"тастере за разгледање датотека, а S или Ентер да изаберете означену датотеку "
-"или да уђете у означени директоријум. Да одете један ниво изнад, изаберите "
-"директоријум са називом „..“ у врху списка датотека.\n"
+"датотеке ради читања или уписа. Можете користити стрелице или тастере "
+"„Страница горе/доле“ за разгледање датотека, а S или Унеси да изаберете "
+"означену датотеку или да уђете у означени директоријум. Да одете један ниво "
+"изнад, изаберите директоријум са називом „..“ на врху списка датотека.\n"
 "\n"
-" Наредни тастери обављају неки посао у режиму прегледача датотека:\n"
+" Следећи тастери су доступни у режиму прегледача датотека:\n"
 "\n"
 
 # bug: there's "enter" and "Enter"
-#: src/help.c:302
-#, fuzzy
+#: src/help.c:271
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1189,27 +1242,26 @@ msgid ""
 "search.\n"
 "\n"
 msgstr ""
-"Помоћ за наредбу претраге\n"
+"Помоћ за наредбу претраге прегледача\n"
 "\n"
-" Унесите речи или знаке које желите да нађете, и притисните Ентер. Уколико "
-"се тражени текст пронађе, на екрану ће се приказати положај најближег "
-"резултата претраге.\n"
+" Унесите речи или знаке које желите да нађете, и притисните Унеси. Уколико "
+"постоји тражени текст, на екрану ће се приказати положај најближег резултата "
+"претраге.\n"
 "\n"
 " Претходна ниска претраге ће се приказати у угластим заградама након "
-"„Тражи:“. Притиском на Ентер уместо уноса новог текста ће извести претходну "
+"„Тражи:“. Притиском на Унеси без уноса неког текста ће обавити претходну "
 "претрагу.\n"
 "\n"
-" Наредни тастери обављају неки посао у режиму претраге:\n"
-"\n"
 
-#: src/help.c:311
+#: src/help.c:280
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
 msgstr ""
+" Следећи тастери су доступни у режиму претраге прегледача:\n"
+"\n"
 
-#: src/help.c:315
-#, fuzzy
+#: src/help.c:284
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1223,16 +1275,15 @@ msgid ""
 msgstr ""
 "Помоћ за одлазак у директоријум\n"
 "\n"
-" Унесите име директоријума у који желите да одете.\n"
+" Унесите назив директоријума у који желите да одете.\n"
 "\n"
 " Уколико није искључено допуњавање табулатором, можете користити TAB тастер "
-"да (покушате да) самодопуните име директоријума.\n"
+"да (покушате да) самодопуните назив директоријума.\n"
 "\n"
-" Наредни тастери обављају неки посао у режиму одласка у директоријум:\n"
+" Следећи тастери су доступни у режиму одласка у директоријум:\n"
 "\n"
 
-#: src/help.c:328
-#, fuzzy
+#: src/help.c:297
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1252,11 +1303,10 @@ msgstr ""
 "упитани да замените сваку појаву дате погрешно унете речи у текућој "
 "датотеци.\n"
 "\n"
-" Наредни тастери обављају неки посао у режиму провере правописа:\n"
+" Следећи тастери су доступни у режиму провере правописа:\n"
 "\n"
 
-#: src/help.c:343
-#, fuzzy
+#: src/help.c:312
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1267,16 +1317,17 @@ msgid ""
 " The following function keys are available in Execute Command mode:\n"
 "\n"
 msgstr ""
-"Помоћ за спољну наредбу\n"
+"Помоћ за извршавање наредбе\n"
 "\n"
-" Овај мени вам омогућава да уметнете излаз наредбе коју покреће љуска у "
-"текући бафер (или у нови бафер у вишебаферском режиму).\n"
+" Овај режим вам омогућава да уметнете излаз наредбе коју покреће љуска у "
+"текућу међумеморију (или у нову међумеморију у режиму међумеморије више "
+"датотека). Ако вам је потребна још једна празна међумеморија, немојте "
+"уносити никакву наредбу.\n"
 "\n"
-" Наредни тастери обављају неки посао у овом режиму:\n"
+" Следећи тастери су доступни у овом режиму:\n"
 "\n"
 
-#: src/help.c:356
-#, fuzzy
+#: src/help.c:325
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1287,25 +1338,16 @@ msgid ""
 "showing the file being edited.  The status line is the third line from the "
 "bottom and shows important messages.  "
 msgstr ""
-" Помоћ за нана\n"
+" Главна нанова помоћ\n"
 "\n"
 " Уређивач нано је израђен да опонаша могућности и лакоћу употребе уређивача "
-"Пико са Универзитета у Вашингтону. Постоји четири главна одељка уређивача: "
-"горњи ред приказује издање програма, име датотеке која се управо уређује, и "
-"да ли је датотека измењена или не. Следећи део је главни уређивач који "
-"приказује датотеку која се уређује. Ред са стањем је трећи ред одоздо и "
-"приказује важне поруке. Два доња реда приказују најчешће коришћене пречице у "
-"уређивачу.\n"
-"\n"
-" Запис пречица је овакав: Пречице уз Control тастер су означени помоћу "
-"симбола капице (^) и уносе се уз тастер Control (Ctrl).  Пречице уз Escape "
-"тастер су означене помоћу Мета (М) симбола и уносе се помоћу неког од Esc, "
-"Alt или Meta тастера у зависности од подешавања ваше тастатуре. Наредни "
-"тастери обављају неки посао у прозору главног уређивача. Допунски тастери су "
-"приказани у заградама:\n"
-"\n"
-
-#: src/help.c:366
+"Пико са Универзитета у Вашингтону. Постоје четири главна одељка уређивача: "
+"горњи ред приказује издање програма, назив датотеке која се управо уређује, "
+"и да ли је датотека измењена или не. Следећи део је главни прозор уређивача "
+"који приказује датотеку која се уређује. Ред са стањем је трећи ред одоздо и "
+"приказује важне поруке."
+
+#: src/help.c:335
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1315,8 +1357,15 @@ msgid ""
 "notated with the Meta (M-) symbol and can be entered using either the Esc, "
 "Alt, or Meta key depending on your keyboard setup.  "
 msgstr ""
+" Два доња реда приказују најчешће коришћене пречице у уређивачу.\n"
+"\n"
+" Запис пречица је овакав: Пречице тастера Контрол су означене помоћу симбола "
+"капице (^) и уносе се уз тастер Контрол (Ctrl) или двоструким притиском на "
+"тастер Ескејп (Esc).  Пречице тастера Ескејп су означене Мета (М) симболом и "
+"уносе се помоћу тастера „Esc“, „Alt“ или „Meta“ у зависности од подешавања "
+"ваше тастатуре."
 
-#: src/help.c:375
+#: src/help.c:344
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1324,323 +1373,311 @@ msgid ""
 "keys are shown in parentheses:\n"
 "\n"
 msgstr ""
+"Такође, двоструким притиском на тастер Ескејп и укуцавањем троцифреног "
+"децималног броја од 000 до 255 унећете знак са одговарајућом вредношћу. "
+"Следећи притисци тастера су доступни у главном прозору уређивача. Заменски "
+"тастери су приказани у загради:\n"
+"\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:376 src/help.c:448
 msgid "enable/disable"
-msgstr "укључи/искључи"
+msgstr "— укључује/искључује"
 
-#: src/nano.c:587
-#, fuzzy
+#: src/nano.c:601
 msgid "Key invalid in view mode"
-msgstr "Тастер недозвољен у прегледачком режиму"
+msgstr "Неисправан тастер у режиму прегледа"
 
-#: src/nano.c:695
+#: src/nano.c:713
 #, c-format
 msgid ""
 "\n"
 "Buffer written to %s\n"
 msgstr ""
 "\n"
-"Бафер уписан у %s\n"
+"Међумеморија је уписана у %s\n"
 
-#: src/nano.c:697
-#, fuzzy, c-format
+#: src/nano.c:715
+#, c-format
 msgid ""
 "\n"
 "Buffer not written to %s: %s\n"
 msgstr ""
 "\n"
-"Бафер уписан у %s\n"
+"Међумеморија није уписана у %s:%s\n"
 
-#: src/nano.c:700
-#, fuzzy, c-format
+#: src/nano.c:718
+#, c-format
 msgid ""
 "\n"
 "Buffer not written: %s\n"
 msgstr ""
 "\n"
-"Бафер уписан у %s\n"
+"Међумеморија није уписана: %s\n"
 
-#: src/nano.c:723
+#: src/nano.c:743
 msgid "Window size is too small for nano...\n"
 msgstr "Величина прозора је премала за нана...\n"
 
-#: src/nano.c:816
+#: src/nano.c:836
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
 "\n"
 msgstr ""
+"Употреба: nano [МОГУЋНОСТИ] [[+РЕД,СТУБАЦ] ДАТОТЕКА]...\n"
+"\n"
 
-#: src/nano.c:819
-#, fuzzy, c-format
+#: src/nano.c:839
+#, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
-msgstr "Опција\t\tДуга опција\t\tЗначење\n"
+msgstr "Опција\t\tГнуова дуга опција\tЗначење\n"
 
-#: src/nano.c:821
+#: src/nano.c:841
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Опција\t\tЗначење\n"
 
-#: src/nano.c:824
-msgid "Show this message"
-msgstr "Прикажи ову поруку"
-
-#: src/nano.c:825
+#: src/nano.c:844
 msgid "+LINE,COLUMN"
-msgstr ""
+msgstr "+РЕД,СТУБАЦ"
 
-#: src/nano.c:826
-#, fuzzy
+#. TRANSLATORS: The next forty or so strings are option descriptions
+#. * for the --help output.  Try to keep them at most 40 characters.
+#: src/nano.c:847
 msgid "Start at line LINE, column COLUMN"
-msgstr "Почни у реду број РЕД"
+msgstr "Почиње у реду РЕД, ступцу СТУБАЦ"
 
-#: src/nano.c:828
-#, fuzzy
+#: src/nano.c:849
 msgid "Enable smart home key"
-msgstr "Укључи миша"
+msgstr "Укључује паметни тастер „Почетак“"
 
-#: src/nano.c:829
-#, fuzzy
+#: src/nano.c:850
 msgid "Save backups of existing files"
-msgstr "Направи резерву постојећих датотека при снимању"
+msgstr "Чува резерве постојећих датотека"
 
-#: src/nano.c:830
-#, fuzzy
+#: src/nano.c:851
 msgid "-C <dir>"
-msgstr "-o [дир]"
+msgstr "-C [дир]"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "--backupdir=<dir>"
-msgstr ""
+msgstr "--backupdir=[дир]"
 
-#: src/nano.c:831
+#: src/nano.c:852
 msgid "Directory for saving unique backup files"
-msgstr ""
+msgstr "Директоријум за чување јединствених датотека резерве"
 
-#: src/nano.c:834
+#: src/nano.c:855
 msgid "Use bold instead of reverse video text"
-msgstr ""
+msgstr "Користи подебљање уместо обрнутог видео текста"
 
-#: src/nano.c:837
+#: src/nano.c:858
 msgid "Convert typed tabs to spaces"
-msgstr ""
+msgstr "Претвара укуцане табулаторе у размаке"
 
-#: src/nano.c:840
+#: src/nano.c:861
 msgid "Enable multiple file buffers"
-msgstr "Омогући бафере са више датотека"
+msgstr "Укључује међумеморије више датотека"
+
+#: src/nano.c:865
+msgid "Use (vim-style) lock files"
+msgstr "Користи (вим-стила) датотеке закључавања"
 
-#: src/nano.c:845
+#: src/nano.c:869
 msgid "Log & read search/replace string history"
-msgstr "Дневник и читање претходних претрага/замена"
+msgstr "Бележи и чита историјат претраге/замене ниске"
 
-#: src/nano.c:848
+#: src/nano.c:873
 msgid "Don't look at nanorc files"
-msgstr "Не гледај у датотеке nanorc"
+msgstr "Не тражи у нанорц датотекама"
 
-#: src/nano.c:851
+#: src/nano.c:876
 msgid "Fix numeric keypad key confusion problem"
-msgstr ""
+msgstr "Поправља проблеме тастера нумеричке тастатуре"
 
-#: src/nano.c:853
+#: src/nano.c:878
 msgid "Don't add newlines to the ends of files"
-msgstr ""
+msgstr "Не додаје нове редове на крајеве датотека"
 
-#: src/nano.c:856
+#: src/nano.c:881
 msgid "Don't convert files from DOS/Mac format"
-msgstr "Не претварај датотеке из ДОС/Мекинтош облика"
+msgstr "Не претвара датотеке из ДОС/Мекинтош записа"
 
-#: src/nano.c:858
+#: src/nano.c:883
 msgid "Use one more line for editing"
-msgstr ""
+msgstr "Користи још један ред за уређивање"
 
-#: src/nano.c:860
-#, fuzzy
+#: src/nano.c:886
+msgid "Log & read location of cursor position"
+msgstr "Бележи и чита место положаја курзора"
+
+#: src/nano.c:889
 msgid "-Q <str>"
 msgstr "-Q [ниска]"
 
-#: src/nano.c:860
-#, fuzzy
+#: src/nano.c:889
 msgid "--quotestr=<str>"
 msgstr "--quotestr=[ниска]"
 
-#: src/nano.c:861
-#, fuzzy
+#: src/nano.c:890
 msgid "Quoting string"
-msgstr "Ниска за цитирање, подразумевано „> “"
+msgstr "Ниска за цитирање"
 
-#: src/nano.c:863
+#: src/nano.c:892
 msgid "Restricted mode"
-msgstr ""
+msgstr "Ограничени режим"
 
-#: src/nano.c:866
+#: src/nano.c:895
 msgid "Scroll by line instead of half-screen"
-msgstr ""
+msgstr "Премиче по ред уместо пола екрана"
 
-#: src/nano.c:868
-#, fuzzy
+#: src/nano.c:897
 msgid "-T <#cols>"
-msgstr "-r [#колона]"
+msgstr "-T [#ступци]"
 
-#: src/nano.c:868
-#, fuzzy
+#: src/nano.c:897
 msgid "--tabsize=<#cols>"
-msgstr "--tabsize=[број]"
+msgstr "--tabsize=[#ступци]"
 
-#: src/nano.c:869
-#, fuzzy
+#: src/nano.c:898
 msgid "Set width of a tab to #cols columns"
-msgstr "Поставља ширину табулатора на број"
+msgstr "Поставља ширину табулатора на „#ступци“ стубаца"
 
-#: src/nano.c:871
+#: src/nano.c:900
 msgid "Do quick statusbar blanking"
-msgstr ""
+msgstr "Обавља брзо чишћење траке стања"
 
-#: src/nano.c:874
+#: src/nano.c:903
 msgid "Print version information and exit"
-msgstr "Испиши податке о издању и изађи"
+msgstr "Исписује податке о издању и излази"
 
-#: src/nano.c:877
+#: src/nano.c:906
 msgid "Detect word boundaries more accurately"
-msgstr ""
+msgstr "Тачније открива границе речи"
 
-#: src/nano.c:880
-#, fuzzy
+#: src/nano.c:909
 msgid "-Y <str>"
 msgstr "-Y [ниска]"
 
-#: src/nano.c:880
-#, fuzzy
+#: src/nano.c:909
 msgid "--syntax=<str>"
-msgstr "--syntax [ниска]"
+msgstr "--syntax=[ниска]"
 
-#: src/nano.c:881
-#, fuzzy
+#: src/nano.c:910
 msgid "Syntax definition to use for coloring"
-msgstr "Која дефиниција синтаксе се користи"
+msgstr "Одредница синтаксе за обојавање"
 
-#: src/nano.c:883
+#: src/nano.c:912
 msgid "Constantly show cursor position"
-msgstr "Стално приказуј положај курзора"
+msgstr "Непрекидно приказује положај курзора"
 
-#: src/nano.c:885
+#: src/nano.c:914
 msgid "Fix Backspace/Delete confusion problem"
-msgstr ""
+msgstr "Поправља проблеме тастера Поврати простор/Обриши"
+
+#: src/nano.c:915
+msgid "Show this help text"
+msgstr "Приказује овај текст помоћи"
 
-#: src/nano.c:888
+#: src/nano.c:918
 msgid "Automatically indent new lines"
-msgstr "Само увуци нове редове"
+msgstr "Самостално увлачи нове редове"
 
-#: src/nano.c:889
-#, fuzzy
+#: src/nano.c:919
 msgid "Cut from cursor to end of line"
-msgstr "Нека ^K исеца од курзора до краја реда"
+msgstr "Исеца од курзора до краја реда"
 
-#: src/nano.c:892
+#: src/nano.c:922
 msgid "Don't follow symbolic links, overwrite"
-msgstr "Не прати симболичке везе, пресними их"
+msgstr "Не прати симболичке везе, преснимава их"
 
-#: src/nano.c:894
-#, fuzzy
+#: src/nano.c:924
 msgid "Enable the use of the mouse"
-msgstr "Укључи миша"
+msgstr "Укључује коришћење миша"
 
-#: src/nano.c:897
-#, fuzzy
+#: src/nano.c:926
+msgid "Do not read the file (only write it)"
+msgstr "Не чита датотеку (само је пише)"
+
+#: src/nano.c:928
 msgid "-o <dir>"
 msgstr "-o [дир]"
 
-#: src/nano.c:897
-#, fuzzy
+#: src/nano.c:928
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=[дир]"
 
-#: src/nano.c:898
+#: src/nano.c:929
 msgid "Set operating directory"
 msgstr "Поставља радни директоријум"
 
-#: src/nano.c:901
+#: src/nano.c:932
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
-msgstr "Тастери за очување XON-а (^Q) и XOFF-а (^S)"
+msgstr "Очувава тастере XON (^Q) и XOFF (^S)"
 
-#: src/nano.c:903
+#: src/nano.c:935
 msgid "Silently ignore startup issues like rc file errors"
-msgstr ""
+msgstr "Нечујно занемарује проблеме покретања као што су грешке рц датотеке"
 
-#: src/nano.c:905
-#, fuzzy
+#: src/nano.c:938
 msgid "-r <#cols>"
-msgstr "-r [#колона]"
+msgstr "-r [#стубац]"
 
-#: src/nano.c:905
-#, fuzzy
+#: src/nano.c:938
 msgid "--fill=<#cols>"
-msgstr "--fill=[#колона]"
+msgstr "--fill=[#стубац]"
 
-#: src/nano.c:906
-msgid "Set wrapping point at column #cols"
-msgstr ""
+#: src/nano.c:939
+msgid "Set hard-wrapping point at column #cols"
+msgstr "Поставља тачку јаког прелома на ступцу бр. стубац"
 
-#: src/nano.c:909
-#, fuzzy
+#: src/nano.c:942
 msgid "-s <prog>"
 msgstr "-s [програм]"
 
-#: src/nano.c:909
-#, fuzzy
+#: src/nano.c:942
 msgid "--speller=<prog>"
 msgstr "--speller=[програм]"
 
-#: src/nano.c:910
+#: src/nano.c:943
 msgid "Enable alternate speller"
-msgstr "Омогући неку другу проверу правописа"
+msgstr "Укључује заменску проверу правописа"
 
-#: src/nano.c:913
+#: src/nano.c:946
 msgid "Auto save on exit, don't prompt"
-msgstr "Сам упиши при излазу, не питај"
-
-#: src/nano.c:915
-msgid "Allow generic undo [EXPERIMENTAL]"
-msgstr ""
+msgstr "Сам чува при излазу, не пита"
 
-#: src/nano.c:918
-#, fuzzy
+#: src/nano.c:947
 msgid "View mode (read-only)"
 msgstr "Режим прегледа (само за читање)"
 
-#: src/nano.c:920
-msgid "Don't wrap long lines"
-msgstr "Не преламај дуге редове"
+#: src/nano.c:949
+msgid "Don't hard-wrap long lines"
+msgstr "Не прелама јако дуге редове"
 
-#: src/nano.c:922
-#, fuzzy
+#: src/nano.c:951
 msgid "Don't show the two help lines"
-msgstr "Не приказуј прозор за помоћ"
+msgstr "Не приказује два реда помоћи"
 
-#: src/nano.c:923
-#, fuzzy
+#: src/nano.c:952
 msgid "Enable suspension"
-msgstr "Укључи суспензију"
+msgstr "Укључује обуставу"
 
-#: src/nano.c:924
+#: src/nano.c:954
 msgid "Enable soft line wrapping"
-msgstr ""
-
-#: src/nano.c:928
-msgid "(ignored, for Pico compatibility)"
-msgstr "(занемарен, ради сагласности са Пиком)"
+msgstr "Укључује меко преламање редова"
 
-#: src/nano.c:938
-#, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
-msgstr "ГНУ нано издање %s (изграђено %s, %s)\n"
+#: src/nano.c:963
+#, fuzzy, c-format
+msgid " GNU nano, version %s\n"
+msgstr " Гнуов нано издање %s (изграђено %s, %s)\n"
 
-#: src/nano.c:943
+#: src/nano.c:966
 #, 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/"
+msgstr " Ел. пошта: nano@nano-editor.org\tВеб: http://www.nano-editor.org/"
 
-#: src/nano.c:944
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1649,159 +1686,178 @@ msgstr ""
 "\n"
 " Уграђене опције:"
 
-#: src/nano.c:1022
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr "Нажалост, подршка за ову функцију је искључена"
 
-#: src/nano.c:1044
+#: src/nano.c:1125
+msgid "No file name"
+msgstr "Нема назива датотеке"
+
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
-msgstr ""
-"Сачувати измењени бафер (ОДГОВАРАЊЕМ СА „Не“ ЋЕТЕ БАЦИТИ СВЕ ИЗМЕНЕ) ? "
+msgstr "Да сачувам измењену међумеморију (ОДГОВОР „Не“ ЋЕ ОДБАЦИТИ ИЗМЕНЕ) ? "
 
-#: src/nano.c:1088
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
-msgstr ""
+msgstr "Не могу поново да отворим стандардни улаз са тастатуре, извините\n"
 
-#: src/nano.c:1114
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
-msgstr ""
+msgstr "Читам са стандардног улаза, ^C да прекинете\n"
 
-#: src/nano.c:1182
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Примих SIGHUP или SIGTERM\n"
 
-#: src/nano.c:1204
-#, fuzzy, c-format
+#: src/nano.c:1301
+#, c-format
 msgid "Use \"fg\" to return to nano.\n"
-msgstr "Користите „fg“ да се вратите у нана"
+msgstr "Користите „fg“ да се вратите у нано.\n"
 
-#: src/nano.c:1386
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "укључено"
 
-#: src/nano.c:1387
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "искључено"
 
-#: src/nano.c:1548 src/winio.c:1256
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
-msgstr ""
+msgstr "Непозната наредба"
 
-#: src/nano.c:1674
-#, fuzzy
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
-msgstr "XON занемарен, трт-мрт."
+msgstr "XON је занемарен, јао мени"
 
-#: src/nano.c:1679
-#, fuzzy
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
-msgstr "XOFF занемарен, трт-мрт."
+msgstr "XOFF је занемарен, јао мени"
 
-#: src/nano.c:2209 src/rcfile.c:1100
-#, fuzzy, c-format
+#: src/nano.c:2310 src/rcfile.c:1325
+#, c-format
 msgid "Requested tab size \"%s\" is invalid"
-msgstr "тражена величина табулатора %d је неисправна"
+msgstr "Тражена величина табулатора %s је неисправна"
 
-#: src/nano.c:2268 src/rcfile.c:1025
-#, fuzzy, c-format
+#: src/nano.c:2374 src/rcfile.c:1250
+#, c-format
 msgid "Requested fill size \"%s\" is invalid"
-msgstr "тражена величина попуне %d је неисправна"
+msgstr "Тражена величина попуне %s је неисправна"
+
+#: src/nano.c:2415
+#, c-format
+msgid "Type '%s -h' for a list of available options.\n"
+msgstr "Укуцајте „%s -h“ за списак доступних опција.\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:1259
+#: src/prompt.c:1055
 msgid "Yy"
-msgstr "YyДдDd"
+msgstr "ДдDdYy"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1056
 msgid "Nn"
 msgstr "НнNn"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1057
 msgid "Aa"
-msgstr "AaАа"
+msgstr "АаАа"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1071
 msgid "Yes"
 msgstr "Да"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1076
 msgid "All"
 msgstr "Све"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1081
 msgid "No"
 msgstr "Не"
 
-#: src/rcfile.c:130
-#, fuzzy, c-format
+#: src/rcfile.c:137
+#, c-format
 msgid "Error in %s on line %lu: "
-msgstr "Грешка у %s у %d. реду: "
+msgstr "Грешка у %s у %lu. реду: "
 
-#: src/rcfile.c:185
-#, fuzzy, c-format
+#: src/rcfile.c:196
+#, c-format
 msgid "Argument '%s' has an unterminated \""
-msgstr "аргумент %s садржи недовршен \""
+msgstr "Аргумент „%s“ садржи недовршени знак \""
 
-#: src/rcfile.c:212 src/rcfile.c:264 src/rcfile.c:711 src/rcfile.c:768
-#: src/rcfile.c:821
-#, fuzzy
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
-msgstr "ниске регуларних израза морају почети и завршити се знаком \"\n"
+msgstr "Ниске регуларних израза морају почети и завршити се знаком \""
 
-#: src/rcfile.c:238 src/search.c:62
+#: src/rcfile.c:249 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Лош регуларни израз „%s“: %s"
 
-#: src/rcfile.c:258
+#: src/rcfile.c:269
 msgid "Missing syntax name"
-msgstr "Недостаје име синтаксе"
+msgstr "Недостаје назив синтаксе"
 
-#: src/rcfile.c:316
+#: src/rcfile.c:340
 msgid "The \"none\" syntax is reserved"
-msgstr ""
+msgstr "Синтакса „none“ је резервисана"
 
-#: src/rcfile.c:323
+#: src/rcfile.c:347
 msgid "The \"default\" syntax must take no extensions"
-msgstr ""
+msgstr "Синтакса „default“ не сме да садржи проширења"
 
-#: src/rcfile.c:386 src/rcfile.c:483
-#, fuzzy
+#: src/rcfile.c:433
 msgid "Missing key name"
-msgstr "Недостаје име синтаксе"
+msgstr "Недостаје назив тастера"
 
-#: src/rcfile.c:398 src/rcfile.c:499
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
-msgstr ""
+#: src/rcfile.c:442 src/rcfile.c:453
+msgid "Key name is too short"
+msgstr "Назив тастера је прекратак"
 
-#: src/rcfile.c:407
-msgid "Must specify function to bind key to"
-msgstr ""
+#: src/rcfile.c:463
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
+msgstr "Назив тастера мора почети са ^, M, или F"
 
-#: src/rcfile.c:418 src/rcfile.c:510
-msgid "Must specify menu to bind key to (or \"all\")"
-msgstr ""
+#: src/rcfile.c:472
+msgid "Must specify a function to bind the key to"
+msgstr "Морате навести функцију за коју свезати тастер"
 
-#: src/rcfile.c:426
-#, fuzzy, c-format
-msgid "Could not map name \"%s\" to a function"
-msgstr "Не могох да отворим %s ради уписа: %s"
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:482
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
+msgstr "Морате навести изборник (или „all“) у коме свезати/развезати тастер"
 
-#: src/rcfile.c:432 src/rcfile.c:517
-#, fuzzy, c-format
-msgid "Could not map name \"%s\" to a menu"
-msgstr "Не могох да покренем „%s“"
+#: src/rcfile.c:489
+#, c-format
+msgid "Cannot map name \"%s\" to a function"
+msgstr "Не могу да мапирам назив „%s“ ка функцији"
 
-#: src/rcfile.c:454
+#: src/rcfile.c:496
 #, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
-msgstr ""
+msgid "Cannot map name \"%s\" to a menu"
+msgstr "Не могу да мапирам назив „%s“ ка изборнику"
 
-#: src/rcfile.c:625
-#, fuzzy, c-format
+#: src/rcfile.c:528
+#, c-format
+msgid "Function '%s' does not exist in menu '%s'"
+msgstr "Функција „%s“ не постоји у изборнику „%s“"
+
+#: src/rcfile.c:543
+#, c-format
+msgid "Sorry, keystroke \"%s\" may not be rebound"
+msgstr "Извините, ниска тастера „%s“ не може бити поново свезана"
+
+#: src/rcfile.c:629
+#, c-format
+msgid "Error expanding %s: %s"
+msgstr "Грешка ширења „%s“: %s"
+
+#: src/rcfile.c:672
+#, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
 "Valid colors are \"green\", \"red\", \"blue\",\n"
@@ -1809,589 +1865,528 @@ msgid ""
 "\"black\", with the optional prefix \"bright\"\n"
 "for foreground colors."
 msgstr ""
-"Не разумех боју %s.\n"
+"Нисам разумео боју „%s“.\n"
 "Дозвољене боје су „green“ (зелена), „red“ (црвена), „blue“ (плава), \n"
-"„white“ (бела), „yellow“ (жута), „cyan“ (цијан), „magenta“ (магента) и\n"
-"„black“ (црна), са необавезним предметком „bright“ (светло).\n"
+"„white“ (бела), „yellow“ (жута), „cyan“ (плавичаста), „magenta“ (љубичаста) "
+"и\n"
+"„black“ (црна), са необавезним предметком „bright“ (светло)\n"
+"за боје позадине."
 
-#: src/rcfile.c:647
-#, fuzzy
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
-msgstr "Не могох да додам упуте за боју без синтаксног реда"
+msgstr "Не могу да додам наредбу боје без наредбе синтаксе"
 
-#: src/rcfile.c:652
+#: src/rcfile.c:699
 msgid "Missing color name"
-msgstr "Недостаје име боје"
+msgstr "Недостаје назив боје"
 
-#: src/rcfile.c:672
-#, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr ""
-
-#: src/rcfile.c:690 src/rcfile.c:809
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
-msgstr ""
+msgstr "Недостаје ниска регуларног израза"
 
-#: src/rcfile.c:762
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "„start=“ захтева и одговарајући „end=“"
 
-#: src/rcfile.c:804
-#, fuzzy
+#: src/rcfile.c:837
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr "Боја позадине „%s“ не може бити светла"
+
+#: src/rcfile.c:865
 msgid "Cannot add a header regex without a syntax command"
-msgstr "Не могох да додам упуте за боју без синтаксног реда"
+msgstr "Не могу да додам регуларни израз заглавља без наредбе синтаксе"
+
+#: src/rcfile.c:921
+msgid "Cannot add a magic string regex without a syntax command"
+msgstr "Не могу да додам регуларни израз чаробне ниске без наредбе синтаксе"
+
+#: src/rcfile.c:926
+msgid "Missing magic string name"
+msgstr "Недостаје назив чаробне ниске"
+
+#: src/rcfile.c:985
+msgid "Cannot add a linter without a syntax command"
+msgstr "Не могу да додам чистача без наредбе синтаксе"
 
-#: src/rcfile.c:874
+#: src/rcfile.c:990
+msgid "Missing linter command"
+msgstr "Недостаје наредба чистача"
+
+#: src/rcfile.c:1010
+#, fuzzy
+msgid "Cannot add formatter without a syntax command"
+msgstr "Не могу да додам чистача без наредбе синтаксе"
+
+#: src/rcfile.c:1015
+#, fuzzy
+msgid "Missing formatter command"
+msgstr "Недостаје наредба чистача"
+
+#: src/rcfile.c:1045
 #, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
-msgstr ""
+msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
+msgstr "Кобна грешка: нема мапираних тастера за функцију „%s“.  Излазим.\n"
 
-#: src/rcfile.c:876
+#: src/rcfile.c:1047
+#, c-format
 msgid ""
-"Exiting.  Please use nano with the -I option if needed to adjust your nanorc "
-"settings\n"
+"If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
+"Ако је потребно, користите нано са опцијом „-I“ да дотерате ваша подешавања "
+"нанорц-а\n"
+
+#: src/rcfile.c:1108
+#, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "Не могу да нађем синтаксу „%s“ за ширење"
 
-#: src/rcfile.c:926 src/rcfile.c:935 src/rcfile.c:945
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
-msgstr ""
+msgstr "Наредба „%s“ није дозвољена у укљученој датотеци"
 
-#: src/rcfile.c:951 src/rcfile.c:1128
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
-msgstr ""
+msgstr "Синтакса „%s“ нема наредбе боје"
 
-#: src/rcfile.c:966
-#, fuzzy, c-format
+#: src/rcfile.c:1171
+#, c-format
 msgid "Command \"%s\" not understood"
-msgstr "не разумех наредбу %s"
+msgstr "Нисам разумео наредбу „%s“"
 
-#: src/rcfile.c:972
-#, fuzzy
-msgid "Missing flag"
-msgstr "Недостаје име боје"
+#: src/rcfile.c:1186
+msgid "Missing option"
+msgstr "Недостаје опција"
 
-#: src/rcfile.c:994
-#, fuzzy, c-format
+#: src/rcfile.c:1208
+#, c-format
 msgid "Option \"%s\" requires an argument"
-msgstr "опција „%s“ захтева аргумент"
+msgstr "Опција „%s“ захтева аргумент"
 
-#: src/rcfile.c:1012
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
-msgstr ""
+msgstr "Опција није исправна вишебитна ниска"
 
-#: src/rcfile.c:1038 src/rcfile.c:1066 src/rcfile.c:1075
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
-msgstr ""
+msgstr "Потребни су не-празни знаци"
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
-msgstr ""
+msgstr "Потребна су два знака једног-ступца"
 
-#: src/rcfile.c:1114
+#: src/rcfile.c:1339
 #, c-format
-msgid "Cannot unset flag \"%s\""
-msgstr ""
+msgid "Cannot unset option \"%s\""
+msgstr "Не могу да расподесим опцију „%s“"
 
-#: src/rcfile.c:1123
+#: src/rcfile.c:1345
 #, c-format
-msgid "Unknown flag \"%s\""
-msgstr ""
+msgid "Unknown option \"%s\""
+msgstr "Непозната опција „%s“"
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
-msgstr "Не могох да нађем мој лични директоријум! Бре!"
+msgstr "Ја не могу да нађем мој лични директоријум! Бре, брате!"
+
+#: src/rcfile.c:1442
+#, c-format
+msgid ""
+"\n"
+"Press Enter to continue starting nano.\n"
+msgstr ""
+"\n"
+"Притисните Унеси да наставите покретање наноа\n"
 
 #: src/search.c:96
-#, fuzzy, c-format
+#, c-format
 msgid "\"%.*s%s\" not found"
-msgstr "Не нађох „%s“"
+msgstr "Нисам нашао „%.*s%s“"
 
-#: src/search.c:205
-#, fuzzy
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/search.c:184
+msgid " [Case Sensitive]"
+msgstr " [разл. величину слова]"
+
+#: src/search.c:188
+msgid " [Regexp]"
+msgstr " [рег. израз]"
+
+#: src/search.c:192
+msgid " [Backwards]"
+msgstr " [уназад]"
+
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:197
 msgid " (to replace) in selection"
-msgstr " (за замену)"
+msgstr " (за замену) у избору"
 
-#: src/search.c:207
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (за замену)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "Да заменим ову појаву?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:945
 msgid "Replace with"
 msgstr "Замени са"
 
-#: src/search.c:1004
-#, fuzzy, c-format
+#: src/search.c:986
+#, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
-msgstr[0] "Замених %d појаву"
-msgstr[1] "Замених %d појаве"
-msgstr[2] "Замених %d појава"
+msgstr[0] "Замених %lu појаву"
+msgstr[1] "Замених %lu појаве"
+msgstr[2] "Замених %lu појава"
 
-#: src/search.c:1034
-#, fuzzy
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1027
 msgid "Enter line number, column number"
-msgstr "Унесите број реда"
+msgstr "Унесите број реда, број ступца"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
-msgstr ""
+msgstr "Неисправан број реда или ступца"
 
-#: src/search.c:1214
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "Није заграда"
 
-#: src/search.c:1281
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "Нема одговарајуће заграде"
 
 # 48x48/emblems/emblem-marketing.icon.in.h:1
 #: src/text.c:54
 msgid "Mark Set"
-msgstr "Ознака постављена"
+msgstr "Постављена ознака"
 
 #: src/text.c:58
-#, fuzzy
 msgid "Mark Unset"
-msgstr "Ознака ОДпостављена"
+msgstr "Поништена ознака"
 
-#: src/text.c:443
+#: src/text.c:439
 msgid "Nothing in undo buffer!"
-msgstr ""
+msgstr "Нема ничега у међумеморији поништавања!"
 
-#: src/text.c:455 src/text.c:593
+#: src/text.c:445 src/text.c:590
 #, c-format
-msgid "Internal error: can't match line %d.  Please save your work"
+msgid "Internal error: can't match line %d.  Please save your work."
 msgstr ""
+"Унутрашња грешка: не могу да поклопим %d. ред.  Молим сачувајте ваш рад."
 
-#: src/text.c:466 src/text.c:603
+#: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
-msgstr ""
+msgstr "додавање текста"
 
-#: src/text.c:475 src/text.c:613
-#, fuzzy
+#: src/text.c:467 src/text.c:612
 msgid "text delete"
-msgstr "Следећа датотека"
+msgstr "брисање текста"
 
-#: src/text.c:489 src/text.c:628
-msgid "line wrap"
-msgstr ""
-
-#: src/text.c:503 src/text.c:636
+#: src/text.c:491 src/text.c:641
 msgid "line join"
-msgstr ""
+msgstr "спој реда"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:505 src/text.c:657
 msgid "text cut"
-msgstr ""
+msgstr "исецање текста"
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:510 src/text.c:661
 msgid "text uncut"
-msgstr ""
+msgstr "поништавање исецања текста"
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:515 src/text.c:623
 msgid "line break"
-msgstr ""
+msgstr "крај реда"
 
-#: src/text.c:532 src/text.c:665
-#, fuzzy
+#: src/text.c:528 src/text.c:672
 msgid "text insert"
-msgstr "Следећа датотека"
+msgstr "уметање текста"
 
-#: src/text.c:550 src/text.c:659
-#, fuzzy
+#: src/text.c:549 src/text.c:665
 msgid "text replace"
-msgstr " (за замену)"
+msgstr "замена текста"
 
-#: src/text.c:557 src/text.c:671
-msgid "Internal error: unknown type.  Please save your work"
-msgstr ""
+#: src/text.c:556 src/text.c:679 src/text.c:983
+msgid "Internal error: unknown type.  Please save your work."
+msgstr "Унутрашња грешка: непозната врста.  Молим сачувајте ваш рад."
 
-#: src/text.c:563
+#: src/text.c:561
 #, c-format
 msgid "Undid action (%s)"
-msgstr ""
+msgstr "Радња поништавања обављеног (%s)"
 
-#: src/text.c:578
+#: src/text.c:580
 msgid "Nothing to re-do!"
-msgstr ""
+msgstr "Ничега за поновно обављање!"
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
+#: src/text.c:584
+msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
+"Унутрашња грешка: не могу да поставим повраћај.  Молим сачувајте ваш рад."
 
-#: src/text.c:676
+#: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
-msgstr ""
+msgstr "Радња поновног обављања (%s)"
 
-#: src/text.c:766
-msgid "Could not pipe"
-msgstr "Не могу да направим цев"
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
+msgid "Could not create pipe"
+msgstr "Не могу да направим спојку"
 
-#: src/text.c:793 src/text.c:2636 src/text.c:2788
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
-msgstr "Не могу да покренем"
+msgstr "Не могу да расцепим"
 
-#: src/text.c:941
-msgid "Internal error: can't setup uncut.  Please save your work."
+#: src/text.c:969
+msgid "Internal error: cannot set up uncut.  Please save your work."
 msgstr ""
+"Унутрашња грешка: не могу да поставим поништавање одсецања.  Молим сачувајте "
+"ваш рад."
 
-#: src/text.c:950
-msgid "Internal error: unknown type.  Please save your work."
-msgstr ""
-
-#: src/text.c:1870
+#: src/text.c:1806
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Лоша ниска за цитирање %s: %s"
 
-#: src/text.c:2267
+#: src/text.c:2207
 msgid "Can now UnJustify!"
 msgstr "Сада могу да „одравнам“!"
 
-#: src/text.c:2462
+#: src/text.c:2404
 msgid "Edit a replacement"
 msgstr "Измените замену"
 
-#: src/text.c:2548
-msgid "Could not create pipe"
-msgstr "Не могох да направим цевку"
-
-#: src/text.c:2550
+#: src/text.c:2492
 msgid "Creating misspelled word list, please wait..."
-msgstr "Образујем списак погрешно унетих речи, сачекајте..."
+msgstr "Правим списак погрешно унетих речи, сачекајте..."
 
-#: src/text.c:2642
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
-msgstr "Не могох да сазнам величину бафера за цевку"
+msgstr "Не могу да добавим величину међумеморије спојке"
 
-#: src/text.c:2693
+#: src/text.c:2635
 msgid "Error invoking \"spell\""
 msgstr "Грешка при покретању „spell“-а"
 
-#: src/text.c:2696
+#: src/text.c:2638
 msgid "Error invoking \"sort -f\""
 msgstr "Грешка при покретању „sort -f“-а"
 
-#: src/text.c:2699
+#: src/text.c:2641
 msgid "Error invoking \"uniq\""
 msgstr "Грешка при покретању „uniq“-а"
 
-#: src/text.c:2756 src/text.c:2965
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
-msgstr "Завршена провера правописа"
+msgstr "Завршио сам проверу правописа"
 
-#: src/text.c:2815
-#, fuzzy, c-format
+#: src/text.c:2759 src/text.c:3340
+#, c-format
 msgid "Error invoking \"%s\""
-msgstr "Грешка при покретању „spell“-а"
+msgstr "Грешка при покретању „%s“-а"
 
-#: src/text.c:2960
+#: src/text.c:2885
+msgid "Invoking spell checker, please wait"
+msgstr "Призивам проверу правописа, сачекајте мало"
+
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
-msgstr "Неуспешна провера правописа: %s"
+msgstr "Провера правописа није успела: %s"
 
-#: src/text.c:2962
-#, fuzzy, c-format
+#: src/text.c:2904
+#, c-format
 msgid "Spell checking failed: %s: %s"
-msgstr "Неуспешна провера правописа: %s"
+msgstr "Провера правописа није успела: %s: %s"
+
+#: src/text.c:2937
+msgid "No linter defined for this type of file!"
+msgstr "Чистач није одређен за ову врсту датотеке!"
+
+#: src/text.c:2947
+msgid "Save modified buffer before linting?"
+msgstr "Да сачувам измењену међумеморију пре чишћења?"
 
-#: src/text.c:3030
+#: src/text.c:2969
+msgid "Invoking linter, please wait"
+msgstr "Призивам чистача, сачекајте мало"
+
+#: src/text.c:3125
 #, c-format
-msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
+msgid "Got 0 parsable lines from command: %s"
+msgstr "Добих 0 обрадивих редова од наредбе: %s"
+
+#: src/text.c:3159
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr ""
+"Ова порука је за неотворену датотеку „%s“, да је отворим у новој "
+"међумеморији?"
+
+#: src/text.c:3205
+msgid "At last message"
+msgstr "На последњу поруку"
+
+#: src/text.c:3210
+msgid "At first message"
+msgstr "На прву поруку"
+
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr ""
+
+#: src/text.c:3275
+msgid "Finished"
 msgstr ""
 
-#: src/text.c:3031
+#: src/text.c:3280
 #, fuzzy
+msgid "Invoking formatter, please wait"
+msgstr "Призивам чистача, сачекајте мало"
+
+#: src/text.c:3360
+msgid "Finished formatting"
+msgstr ""
+
+#: src/text.c:3438
+#, c-format
+msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
+msgstr "%sРечи: %lu  Редова: %ld  Знакова: %lu"
+
+#: src/text.c:3439
 msgid "In Selection:  "
-msgstr "Додај избор на крај датотеке"
+msgstr "У избору:"
 
-#: src/utils.c:405 src/utils.c:417
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3453
+msgid "Verbatim Input"
+msgstr "Улаз дословности"
+
+#: src/utils.c:410 src/utils.c:422
 msgid "nano is out of memory!"
-msgstr "нану је понестало меморије!"
+msgstr "наноу је понестало меморије!"
 
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
-#: src/winio.c:1557
+#: src/winio.c:1583
 msgid "Unicode Input"
-msgstr ""
+msgstr "Улаз Уникода"
 
-#: src/winio.c:2149 src/winio.c:2153
-#, fuzzy
+#: src/winio.c:2142 src/winio.c:2146
 msgid "Modified"
-msgstr " Измењено "
+msgstr "Измењено "
 
-#: src/winio.c:2150
-#, fuzzy
+#: src/winio.c:2143
 msgid "View"
-msgstr " Преглед "
+msgstr "Преглед "
 
-#: src/winio.c:2164
-#, fuzzy
+#: src/winio.c:2157
 msgid "DIR:"
 msgstr "ДИР: "
 
-#: src/winio.c:2171
-#, fuzzy
+#: src/winio.c:2164
 msgid "File:"
 msgstr "Датотека:"
 
-#: src/winio.c:3360
-#, fuzzy, c-format
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2261
+msgid ""
+"Warning: Modifying a file which is not locked, check directory permission?"
+msgstr ""
+"Упозорење: Мењам датотеку која није закључана, да проверим дозволе "
+"директоријума?"
+
+#: src/winio.c:3377
+#, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
-msgstr "ред %ld/%ld (%d%%), стубац %lu/%lu (%d%%), знак %lu/%ld (%d%%)"
+msgstr "ред %ld/%ld (%d%%), стубац %lu/%lu (%d%%), знак %lu/%lu (%d%%)"
 
-#: src/winio.c:3492
+#: src/winio.c:3507
 msgid "The nano text editor"
 msgstr "Уређивач текста нано"
 
-#: src/winio.c:3493
-#, fuzzy
+#: src/winio.c:3508
 msgid "version"
 msgstr "издање "
 
-#: src/winio.c:3494
+#: src/winio.c:3509
 msgid "Brought to you by:"
-msgstr "Омогућили су вам:"
+msgstr "Припремили:"
 
-#: src/winio.c:3495
+#: src/winio.c:3510
 msgid "Special thanks to:"
-msgstr "Посебну захвалност дугујемо:"
+msgstr "Посебно се захваљујемо:"
 
-#: src/winio.c:3496
+#: src/winio.c:3511
 msgid "The Free Software Foundation"
-msgstr "Задужбина за Слободни Софтвер"
+msgstr "Задужбини слободног софтвера"
+
+#: src/winio.c:3512
+msgid "the many translators and the TP"
+msgstr ""
 
-#: src/winio.c:3497
+#: src/winio.c:3513
 msgid "For ncurses:"
 msgstr "За ен-курсис:"
 
-#: src/winio.c:3498
+#: src/winio.c:3514
 msgid "and anyone else we forgot..."
-msgstr "и сви остали које смо пропустили..."
+msgstr "и свима осталима које смо пропустили..."
 
-#: src/winio.c:3499
-#, fuzzy
+#: src/winio.c:3515
 msgid "Thank you for using nano!"
-msgstr "Хвала што користите нана!\n"
-
-#~ msgid "File to insert into new buffer [from ./] "
-#~ msgstr "Датотека коју уметнути у нови бафер [из ./]"
-
-#~ msgid "File to insert [from ./] "
-#~ msgstr "Датотека коју уметнути [из ./]"
-
-#~ msgid "Could not read %s for backup: %s"
-#~ msgstr "Не могох да прочитам %s ради прављења резерве: %s"
-
-#~ msgid "Couldn't write backup: %s"
-#~ msgstr "Не могох да упишем резерву: %s"
-
-#~ msgid "Could not set permissions %o on backup %s: %s"
-#~ msgstr "Не могох да поставим овлашћења %o за резерву %s: %s"
-
-#~ msgid "Could not set owner %d/group %d on backup %s: %s"
-#~ msgstr "Не могох да поставим власника %d и групу %d за резерву %s: %s"
-
-#~ msgid "Could not set access/modification time on backup %s: %s"
-#~ msgstr "Не могох да поставим време приступа и измене за резерву %s: %s"
-
-#~ msgid "Could not open file for writing: %s"
-#~ msgstr "Не могох да отворим датотеку ради уписа: %s"
+msgstr "Хвала вам што користите нано!"
 
-#~ msgid "Could not close %s: %s"
-#~ msgstr "Не могох да затворим %s: %s"
-
-#~ msgid "Could not reopen %s: %s"
-#~ msgstr "Не могох да поново отворим %s: %s"
-
-#~ msgid "Could not open %s for prepend: %s"
-#~ msgstr "Не могох да отворим %s ради додавања на почетак: %s"
-
-#~ msgid "Could not set permissions %o on %s: %s"
-#~ msgstr "Не могох да поставим овлашћења %o за %s: %s"
-
-#~ msgid "Can't open \"%s\": %s"
-#~ msgstr "Не могох да отворим „%s“ : %s"
-
-#~ msgid "Goto Cancelled"
-#~ msgstr "Улазак отказан"
-
-#~ msgid "Unable to open ~/.nano_history file, %s"
-#~ msgstr "Не могох да отворим датотеку ~/.nano_history, %s"
-
-#~ msgid "Unable to write ~/.nano_history file, %s"
-#~ msgstr "Не могох да упишем датотеку ~/.nano_history, %s"
-
-#~ msgid "Writing file in DOS format"
-#~ msgstr "Уписујем датотеку у ДОС запису"
-
-#~ msgid "Writing file in Mac format"
-#~ msgstr "Уписујем датотеку у Мекинтош запису"
-
-#~ msgid "Backing up file"
-#~ msgstr "Правим резервни примерак"
-
-#~ msgid "Auto wrap"
-#~ msgstr "Самопрелом"
-
-#~ msgid "Invoke the help menu"
-#~ msgstr "Покрени мени за помоћ"
-
-#~ msgid "Unjustify after a justify"
-#~ msgstr "Одравнај после поравнавања"
-
-#~ msgid "Replace text within the editor"
-#~ msgstr "Замени текст из уређивача"
-
-#~ msgid "Search for text within the editor"
-#~ msgstr "Тражи текст у уређивачу"
-
-#~ msgid "Move up one line"
-#~ msgstr "Иди један ред изнад"
-
-#~ msgid "Insert a tab character"
-#~ msgstr "Уметни табулатор"
-
-#~ msgid "Make the current search or replace case (in)sensitive"
-#~ msgstr "Нека текућа претрага или замена не разликује велика и мала слова."
-
-#~ msgid "Prepend to the current file"
-#~ msgstr "Додај на почетак текуће датотеке"
-
-#~ msgid "Search backwards"
-#~ msgstr "Тражи уназад"
-
-#~ msgid "Write file out in DOS format"
-#~ msgstr "Испиши датотеку у ДОС запису"
-
-#~ msgid "Write file out in Mac format"
-#~ msgstr "Испиши датотеку у Мекинтош запису"
-
-#~ msgid "Back up original file when saving"
-#~ msgstr "Направи резервни примерак изворне датотеке при снимању"
-
-#~ msgid "Find other bracket"
-#~ msgstr "Нађи другу заграду"
-
-#~ msgid "Open previously loaded file"
-#~ msgstr "Отвори претходно коришћену датотеку"
-
-#~ msgid "Open next loaded file"
-#~ msgstr "Отвори следеће учитану датотеку"
-
-#~ msgid "Up"
-#~ msgstr "Горе"
-
-#~ msgid "Down"
-#~ msgstr "Доле"
-
-#~ msgid "Direction"
-#~ msgstr "Смер"
-
-#~ msgid "Space"
-#~ msgstr "Простор"
-
-#~ msgid ""
-#~ "Usage: nano [+LINE] [GNU long option] [option] [file]\n"
-#~ "\n"
+#~ msgid "Internal error: can't match line %ld.  Please save your work."
 #~ msgstr ""
-#~ "Употреба: nano [+РЕД] [Дуге Гнуове опције] [опција] [датотека]\n"
-#~ "\n"
+#~ "Унутрашња грешка: не могу да поклопим %ld. ред.  Молим сачувајте ваш рад."
 
-#~ msgid ""
-#~ "Usage: nano [+LINE] [option] [file]\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Употреба: nano [+РЕД] [опција] [датотека]\n"
-#~ "\n"
-
-#~ msgid "+LINE"
-#~ msgstr "+РЕД"
-
-#~ msgid "Use alternate keypad routines"
-#~ msgstr "Користи неке друге функције за нумеричку тастатуру"
+#~ msgid "line wrap"
+#~ msgstr "прелом реда"
 
-#~ msgid "Do regular expression searches"
-#~ msgstr "Изводи претраге по регуларним изразима"
+#~ msgid "Allow generic undo [EXPERIMENTAL]"
+#~ msgstr "Дозвољава уопштено поништавање [ПРОБНО]"
 
-#~ msgid "-T [num]"
-#~ msgstr "-T [број]"
+#~ msgid "Insert File"
+#~ msgstr "Умеће датотеку"
 
-#~ msgid "Set fill cols to (wrap lines at) #cols"
-#~ msgstr "Постави испуњавање колона (прелом реда) на #колона"
+#~ msgid "Go to previous screen"
+#~ msgstr "Иде на претходни екран"
 
-#~ msgid "Could not create a temporary filename: %s"
-#~ msgstr "Не могох да направим привремену датотеку: %s"
-
-#~ msgid "Spell checking failed: unable to write temp file!"
-#~ msgstr ""
-#~ "Неуспешна провера правописа: не могох да пишем у привремену датотеку!"
+#~ msgid "Find Other Bracket"
+#~ msgstr "Нађи другу заграду"
 
-#~ msgid "Cannot resize top win"
-#~ msgstr "Не могох да изменим величину горњег прозора"
+#~ msgid "Long line wrapping"
+#~ msgstr "Преламање дугог реда"
 
-#~ msgid "Cannot move top win"
-#~ msgstr "Не могох да преместим горњи прозор"
+#~ msgid "Soft line wrapping"
+#~ msgstr "Меко преламање реда"
 
-#~ msgid "Cannot resize edit win"
-#~ msgstr "Не могох да изменим величину прозора за унос"
+#~ msgid "(ignored, for Pico compatibility)"
+#~ msgstr "(занемарен, ради сагласности са Пиком)"
 
-#~ msgid "Cannot move edit win"
-#~ msgstr "Не могох да преместим прозор за унос"
+#~ msgid "Must specify menu to bind key to (or \"all\")"
+#~ msgstr "Морате навести изборник за који свезати тастер (или „all“)"
 
-#~ msgid "Cannot resize bottom win"
-#~ msgstr "Не могох да изменим величину доњег прозора"
+#~ msgid "Missing flag"
+#~ msgstr "Недостаје обележје"
 
-#~ msgid "Cannot move bottom win"
-#~ msgstr "Не могох да преместим доњи прозор"
+#~ msgid "Internal error: unknown type.  Please save your work"
+#~ msgstr "Унутрашња грешка: непозната врста.  Молим сачувајте ваш рад!!!"
 
-#~ msgid "NumLock glitch detected.  Keypad will malfunction with NumLock off"
+#~ msgid "Internal error: Redo setup failed.  Please save your work"
 #~ msgstr ""
-#~ "Примећена грешка са NumLock-ом. Нумеричка тастатура неће радити када је "
-#~ "он искључен"
-
-#~ msgid "Tab size is too small for nano...\n"
-#~ msgstr "Величина табулатора премала за нана...\n"
-
-#~ msgid "Errors found in .nanorc file"
-#~ msgstr "Нађох грешке у датотеци .nanorc"
-
-#~ msgid "Unable to open ~/.nanorc file, %s"
-#~ msgstr "Не могох да отворим датотеку ~/.nanorc, %s"
-
-#~ msgid "\"%s...\" not found"
-#~ msgstr "Не нађох „%s...“"
-
-#~ msgid "Invalid regex \"%s\""
-#~ msgstr "Неисправан регуларни израз „%s“"
-
-#~ msgid "Search Cancelled"
-#~ msgstr "Претрага отказана"
-
-#~ msgid "Replace Cancelled"
-#~ msgstr "Замена отказана"
-
-#~ msgid "Replace failed: unknown subexpression!"
-#~ msgstr "Не успех да заменим: непознат подизраз!"
-
-#~ msgid "Aborted"
-#~ msgstr "Обустављен"
-
-#~ msgid "Come on, be reasonable"
-#~ msgstr "'ајде, буди разуман"
-
-#~ msgid "  File: ..."
-#~ msgstr "  Датотека: ..."
-
-#~ msgid "   DIR: ..."
-#~ msgstr "   ДИР: ..."
+#~ "Унутрашња грешка: Није успело постављање понављања.  Молим сачувајте ваш "
+#~ "рад!!!"
 
-#~ msgid "Refusing 0 length regex match"
-#~ msgstr "Одбијам поклапање са регуларним изразом дужине 0"
+#~ msgid "Could not pipe"
+#~ msgstr "Не могу да направим спојку"
diff --git a/po/sv.gmo b/po/sv.gmo
index ee0057b..24260bd 100644
--- a/po/sv.gmo
+++ b/po/sv.gmo
diff --git a/po/sv.po b/po/sv.po
index ffe6db7..f0e133d 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,985 +1,1076 @@
 # Swedish messages for nano.
-# Copyright (C) 2001, 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
-# Daniel Nylander <po@danielnylander.se>, 2006.
+# Copyright © 2014 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.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 1.9.99pre0\n"
+"Project-Id-Version: nano 2.3.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-22 06:34-0500\n"
-"PO-Revision-Date: 2006-08-24 20:53+0100\n"
-"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
+"PO-Revision-Date: 2014-12-25 00:11+0100\n"
+"Last-Translator: Josef Andersson <josef.andersson@fripost.org>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
+"Language: sv\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\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.5.4\n"
 
-#: src/browser.c:220
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:203
 msgid "Go To Directory"
-msgstr "G� till katalog"
+msgstr "Gå till katalog"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:860 src/files.c:2048
-#: src/nano.c:1060 src/search.c:220 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Avbruten"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:246 src/browser.c:293
 #, c-format
 msgid "Can't go outside of %s in restricted mode"
-msgstr "Kan inte g� utanf�r %s i begr�nsat l�ge"
+msgstr "Kan inte gå utanför %s i begränsat läge"
 
-#: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:722
-#: src/files.c:731 src/files.c:1540 src/files.c:1659 src/files.c:1711
-#: src/files.c:1732 src/files.c:1855 src/files.c:2691 src/rcfile.c:568
-#: src/rcfile.c:1204
+#: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
+#: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
+#: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
-msgstr "Fel vid inl�sning av %s: %s"
+msgstr "Fel vid inläsning av %s: %s"
 
-#: src/browser.c:303
+#: src/browser.c:283
 msgid "Can't move up a directory"
-msgstr "Kan inte g� upp en katalog"
+msgstr "Kan inte gå upp en katalog"
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:665 src/browser.c:674
+#: src/browser.c:626 src/browser.c:635
 msgid "(dir)"
 msgstr "(kat)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:632
 msgid "(parent dir)"
-msgstr "(f�r�ldkat)"
+msgstr "(föräldkat)"
 
-#: src/browser.c:801 src/search.c:185
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
-msgstr "S�k"
+msgstr "Sök"
 
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:805 src/search.c:189
-msgid " [Case Sensitive]"
-msgstr " [Skiftl�gesk�nslig]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:811 src/search.c:195
-msgid " [Regexp]"
-msgstr " [Regulj�rt uttryck]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:817 src/search.c:201
-msgid " [Backwards]"
-msgstr " [Bakl�nges]"
-
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
-msgstr "S�kningen b�rjade om fr�n b�rjan"
+msgstr "Sökningen började om från början"
 
-#: src/browser.c:1006 src/browser.c:1039 src/search.c:514 src/search.c:517
-#: src/search.c:574 src/search.c:577
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
-msgstr "Detta �r enda f�rekomsten"
+msgstr "Detta är enda förekomsten"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
-msgstr "Inget aktuellt s�km�nster"
+msgstr "Inget aktuellt sökmönster"
 
-#: src/files.c:125
+#: src/files.c:139
+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:145
+#, 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:165 src/files.c:175 src/files.c:212 src/files.c:222
+#, c-format
+msgid "Error writing lock file %s: %s"
+msgstr "Fel vid skrivning av låsfilen %s: %s"
+
+#: src/files.c:237
+#, c-format
+msgid "Error deleting lock file %s: %s"
+msgstr "Fel vid borttagning av låsfilen %s: %s"
+
+#: src/files.c:272
+#, c-format
+msgid "Error opening lock file %s: %s"
+msgstr "Fel vid inläsning av låsfilen %s: %s"
+
+#: src/files.c:282
+#, 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:297
+#, c-format
+msgid "File %s is being edited (by %s with %s, PID %d); continue?"
+msgstr ""
+
+#: src/files.c:308
+#, c-format
+msgid "Error writing lock file: Directory '%s' doesn't exist"
+msgstr "Fel vid skrivning av låsfil: Katalogen ”%s” finns inte"
+
+#: src/files.c:339
 #, c-format
 msgid "Can't insert file from outside of %s"
-msgstr "Kan inte infoga fil fr�n utanf�r %s"
+msgstr "Kan inte infoga fil från utanför %s"
 
-#: src/files.c:234
+#: src/files.c:467
 msgid "No more open file buffers"
-msgstr "Inga fler �ppna filbuffertar"
+msgstr "Inga fler öppna filbuffertar"
 
-#: src/files.c:250
+#: src/files.c:484
 #, c-format
 msgid "Switched to %s"
-msgstr "V�xlade till %s"
+msgstr "Växlade till %s"
 
-#: src/files.c:251 src/global.c:469 src/winio.c:2168
+#: src/files.c:485 src/global.c:953 src/winio.c:2161
 msgid "New Buffer"
 msgstr "Ny buffert"
 
-#: src/files.c:633
+#: src/files.c:874
 #, 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)"
+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:638
-#, fuzzy, c-format
+#: src/files.c:879
+#, 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)"
-msgstr[1] "L�ste %lu rader (konverterade fr�n DOS- och Mac-format)"
+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:644
+#: src/files.c:885
 #, 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)"
+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:648
-#, fuzzy, c-format
+#: src/files.c:889
+#, 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)"
-msgstr[1] "L�ste %lu rader (konverterade fr�n Mac-format)"
+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:654
+#: src/files.c:895
 #, 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)"
+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:658
-#, fuzzy, c-format
+#: src/files.c:899
+#, 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)"
-msgstr[1] "L�ste %lu rader (konverterade fr�n DOS-format)"
+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:664
+#: src/files.c:905
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
-msgstr[0] "L�ste %lu rad"
-msgstr[1] "L�ste %lu rader"
+msgstr[0] "Läste %lu rad"
+msgstr[1] "Läste %lu rader"
 
-#: src/files.c:667
+#: src/files.c:908
 #, c-format
 msgid "Read %lu line ( Warning: No write permission)"
 msgid_plural "Read %lu lines (Warning: No write permission)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Läste %lu rad (Varning: Inga skrivrättigheter)"
+msgstr[1] "Läste %lu rader (Varning: Inga skrivrättigheter)"
 
-#: src/files.c:700 src/files.c:736
+#: src/files.c:943 src/files.c:980
 msgid "Reading File"
-msgstr "L�ser filen"
+msgstr "Läser filen"
 
-#: src/files.c:706
+#: src/files.c:950
 msgid "New File"
 msgstr "Ny fil"
 
-#: src/files.c:709
+#: src/files.c:953
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" kunde inte hittas"
 
-#: src/files.c:717 src/rcfile.c:559 src/rcfile.c:1154 src/rcfile.c:1195
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
-msgstr "\"%s\" �r en katalog"
+msgstr "\"%s\" är en katalog"
 
-#: src/files.c:718 src/rcfile.c:560 src/rcfile.c:1155 src/rcfile.c:1196
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
-msgstr "\"%s\" �r en enhetsfil"
+msgstr "\"%s\" är en enhetsfil"
 
-#: src/files.c:817
+#: src/files.c:1060
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
-msgstr "Kommando att k�ra i ny buffert [fr�n %s] "
+msgstr "Kommando att köra i ny buffert [från %s] "
 
-#: src/files.c:819
+#: src/files.c:1062
 #, c-format
 msgid "Command to execute [from %s] "
-msgstr "Kommando att k�ra [fr�n %s] "
+msgstr "Kommando att köra [från %s] "
 
-#: src/files.c:825
+#: src/files.c:1069
 #, c-format
 msgid "File to insert into new buffer [from %s] "
-msgstr "Fil att infoga i ny buffert [fr�n %s] "
+msgstr "Fil att infoga i ny buffert [från %s] "
 
-#: src/files.c:827
+#: src/files.c:1071
 #, c-format
 msgid "File to insert [from %s] "
-msgstr "Fil att infoga [fr�n %s] "
+msgstr "Fil att infoga [från %s] "
 
-#: src/files.c:1077
+#: src/files.c:1320
 msgid "Key invalid in non-multibuffer mode"
-msgstr "Tangenten ogiltig i icke-flerbuffertl�get"
+msgstr "Tangenten ogiltig i icke-flerbuffertläget"
+
+#: src/files.c:1622
+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:1486
+#: src/files.c:1746
 #, c-format
 msgid "Can't write outside of %s"
-msgstr "Kan inte skriva utanf�r %s"
+msgstr "Kan inte skriva utanför %s"
 
-#: src/files.c:1501
+#: src/files.c:1761
 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� --"
-"nofollow �r angivet"
+"Kan inte infoga före eller lägga till efter i en symbolisk länk då --"
+"nofollow är angivet"
 
-#: src/files.c:1581 src/files.c:1603 src/files.c:1621 src/files.c:1632
-#: src/files.c:1640 src/files.c:1667
-#, fuzzy, c-format
+#: src/files.c:1843 src/files.c:1868 src/files.c:1886 src/files.c:1899
+#: src/files.c:1910 src/files.c:1939
+#, c-format
 msgid "Error writing backup file %s: %s"
-msgstr "Fel vid skrivning av tempor�r fil: %s"
+msgstr "Fel vid skrivning av säkerhetskopian %s: %s"
 
-#: src/files.c:1582 src/nano.c:701
+#: src/files.c:1844 src/nano.c:719
 msgid "Too many backup files?"
-msgstr "F�r m�nga s�kerhetskopierade filer?"
+msgstr "För många säkerhetskopierade filer?"
 
-#: src/files.c:1687 src/files.c:1744 src/files.c:1763 src/files.c:1775
-#: src/files.c:1799 src/files.c:1817 src/files.c:1827 src/files.c:1863
-#: src/files.c:1868 src/files.c:2764 src/files.c:2773
+#: src/files.c:1959 src/files.c:2016 src/files.c:2035 src/files.c:2047
+#: src/files.c:2071 src/files.c:2089 src/files.c:2099 src/files.c:2135
+#: src/files.c:2140 src/files.c:3101 src/files.c:3110 src/files.c:3133
+#: src/files.c:3145
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Fel vid skrivning av %s: %s"
 
-#: src/files.c:1721 src/text.c:2929 src/text.c:2941
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
-msgstr "Fel vid skrivning av tempor�r fil: %s"
+msgstr "Fel vid skrivning av temporär fil: %s"
 
-#: src/files.c:1900
+#: src/files.c:2173
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "Skrev %lu rad"
 msgstr[1] "Skrev %lu rader"
 
-#: src/files.c:2004
+#: src/files.c:2278
 msgid " [DOS Format]"
 msgstr " [DOS-format]"
 
-#: src/files.c:2005
+#: src/files.c:2279
 msgid " [Mac Format]"
 msgstr " [Mac-format]"
 
-#: src/files.c:2007
+#: src/files.c:2281
 msgid " [Backup]"
-msgstr " [S�kerhetskopia]"
+msgstr " [Säkerhetskopia]"
 
-#: src/files.c:2015
+#: src/files.c:2289
 msgid "Prepend Selection to File"
 msgstr "Infoga markering till fil"
 
-#: src/files.c:2016
+#: src/files.c:2290
 msgid "Append Selection to File"
-msgstr "L�gg till markering till fil"
+msgstr "Lägg till markering till fil"
 
-#: src/files.c:2017
+#: src/files.c:2291
 msgid "Write Selection to File"
 msgstr "Skriv markering till fil"
 
-#: src/files.c:2020
+#: src/files.c:2294
 msgid "File Name to Prepend to"
 msgstr "Filnamn att infoga i"
 
-#: src/files.c:2021
+#: src/files.c:2295
 msgid "File Name to Append to"
-msgstr "Filnamn att l�gga till i"
+msgstr "Filnamn att lägga till i"
 
-#: src/files.c:2022
+#: src/files.c:2296
 msgid "File Name to Write"
 msgstr "Filnamn att skriva"
 
-#: src/files.c:2153
+#: src/files.c:2427
 msgid "File exists, OVERWRITE ? "
-msgstr "Filen existerar, SKRIVA �VER? "
+msgstr "Filen existerar, SKRIVA ÖVER? "
 
-#: src/files.c:2162
+#: src/files.c:2436
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "Spara filen med ANNAT NAMN? "
 
-#: src/files.c:2173
+#: src/files.c:2450
 msgid "File was modified since you opened it, continue saving ? "
-msgstr ""
+msgstr "Filen har ändrats sedan du öppnade den, fortsätt spara? "
 
-#: src/files.c:2611
+#: src/files.c:2882
 msgid "(more)"
 msgstr "(mer)"
 
-#: src/files.c:2694 src/rcfile.c:1220
+#: src/files.c:2974
 #, c-format
 msgid ""
 "\n"
-"Press Enter to continue starting nano.\n"
+"Press Enter to continue\n"
 msgstr ""
 "\n"
-"Tryck Enter f�r att forts�tta starta nano.\n"
-
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:415 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Avbryt"
+"Tryck Retur för att fortsätta\n"
 
-#: src/global.c:416
-msgid "Replace"
-msgstr "Ers�tt"
+#: src/files.c:2989
+#, c-format
+msgid ""
+"Unable to create directory %s: %s\n"
+"It is required for saving/loading search history or cursor positions.\n"
+msgstr ""
+"Kunde inte skapa katalogen %s: %s\n"
+"Den krävs för skrivning/inläsning av sökhistorik eller markörpos.\n"
 
-#: src/global.c:417
-msgid "No Replace"
-msgstr "Ingen ers�ttning"
+#: src/files.c:2995
+#, 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 ""
+"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/global.c:420
-msgid "Case Sens"
-msgstr "Skiftk�nsl"
+#: src/files.c:3012
+#, 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 ""
+"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/global.c:421
-msgid "Backwards"
-msgstr "Bak�t"
+#: src/files.c:3016
+#, 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 ""
+"Upptäckte en gammal historikfil för nano (%s) som jag flyttade\n"
+"till (%s)\n"
+"(se nanos FAQ för mer om denna ändring)"
 
-#: src/global.c:425
-msgid "Regexp"
-msgstr "Regulj�rt uttr"
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
+#: src/global.c:477
+msgid "Exit"
+msgstr "Avsluta"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:451
-msgid "PrevHstory"
-msgstr "F�regHisto"
+#: src/global.c:478
+msgid "Close"
+msgstr "Stäng"
 
-#: src/global.c:452
-msgid "NextHstory"
-msgstr "N�staHisto"
+#: src/global.c:479
+msgid "Uncut Text"
+msgstr "Ångra klipp ut text"
 
-#: src/global.c:453
-msgid "Go To Text"
-msgstr "G� till text"
+#: src/global.c:481
+msgid "Unjustify"
+msgstr "Ojustera"
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:455
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:485
 msgid "WhereIs Next"
-msgstr "VarFinnsN�st"
-
-#: src/global.c:457
-msgid "First File"
-msgstr "F�rsta filen"
+msgstr "VarFinnsNäst"
 
-#: src/global.c:458
-msgid "Last File"
-msgstr "Sista filen"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:460
-msgid "To Files"
-msgstr "Till filer"
-
-#: src/global.c:462
-msgid "DOS Format"
-msgstr "DOS-format"
-
-#: src/global.c:463
-msgid "Mac Format"
-msgstr "Mac-format"
-
-#: src/global.c:464
-msgid "Append"
-msgstr "L�gg till"
-
-#: src/global.c:465
-msgid "Prepend"
-msgstr "Infoga"
-
-#: src/global.c:466
-msgid "Backup File"
-msgstr "S�kerhetskopiera fil"
-
-#: src/global.c:467
-msgid "Execute Command"
-msgstr "K�r kommando"
-
-#: src/global.c:471
-msgid "Go To Dir"
-msgstr "G� till katalog"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:480
-msgid "Get Help"
-msgstr "F� hj�lp"
-
-#: src/global.c:481
-msgid "Exit"
-msgstr "Avsluta"
-
-#: src/global.c:482
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:492
 msgid "Where Is"
 msgstr "Var finns"
 
-#: src/global.c:483
-msgid "Prev Page"
-msgstr "F�reg sid"
-
-#: src/global.c:484
-msgid "Next Page"
-msgstr "N�sta sid"
-
-#: src/global.c:485
-msgid "First Line"
-msgstr "F�rsta raden"
+#: src/global.c:493
+msgid "Replace"
+msgstr "Ersätt"
 
-#: src/global.c:486
-msgid "Last Line"
-msgstr "Sista raden"
+#: src/global.c:494
+msgid "Go To Line"
+msgstr "Gå till rad"
 
-#: src/global.c:487
-#, fuzzy
-msgid "Suspend"
-msgstr "Suspendering"
+#: src/global.c:495
+msgid "Prev Line"
+msgstr "Föreg rad"
 
-#: src/global.c:489
-msgid "Beg of Par"
-msgstr "B�rj p� par"
+#: src/global.c:496
+msgid "Next Line"
+msgstr "Nästa rad"
 
-#: src/global.c:490
-msgid "End of Par"
-msgstr "Slut p� par"
+#: src/global.c:497
+msgid "Read File"
+msgstr "Läs fil"
 
-# Os�ker
-#: src/global.c:491
+# Osäker
+#: src/global.c:499
 msgid "FullJstify"
 msgstr "Fulljstera"
 
-#: src/global.c:493
+#: src/global.c:501
 msgid "Refresh"
 msgstr "Uppdatera"
 
-#: src/global.c:495
-msgid "Insert File"
-msgstr "Infoga fil"
-
-#: src/global.c:497
-msgid "Go To Line"
-msgstr "G� till rad"
-
-#: src/global.c:500
+#. 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:507
 msgid "Justify the current paragraph"
 msgstr "Justera det aktuella stycket"
 
-#. 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:505
+#: src/global.c:509
 msgid "Cancel the current function"
 msgstr "Avbryt den aktuella funktionen"
 
-#: src/global.c:506
+#: src/global.c:510
 msgid "Display this help text"
-msgstr "Visa denna hj�lptext"
+msgstr "Visa denna hjälptext"
 
-#: src/global.c:509
+#: src/global.c:513
 msgid "Close the current file buffer / Exit from nano"
-msgstr "St�ng aktuell filbuffert / Avsluta nano"
+msgstr "Stäng aktuell filbuffert / Avsluta nano"
 
-#: src/global.c:511
+#: src/global.c:515
 msgid "Exit from nano"
 msgstr "Avsluta nano"
 
-#: src/global.c:515
+#: src/global.c:519
 msgid "Write the current file to disk"
 msgstr "Skriv den aktuella filen till disk"
 
-#: src/global.c:517
+#: src/global.c:521
 msgid "Insert another file into the current one"
 msgstr "Infoga ytterligare en fil i den nuvarande"
 
-#: src/global.c:519
+#: src/global.c:523
 msgid "Search for a string or a regular expression"
-msgstr "S�k efter en str�ng eller ett regulj�rt uttryck"
+msgstr "Sök efter en sträng eller ett reguljärt uttryck"
 
-#: src/global.c:520
-#, fuzzy
-msgid "Go to previous screen"
-msgstr "Flytta till f�reg�ende sk�rm"
+#: src/global.c:526
+msgid "Search for a string"
+msgstr "Sök efter en sträng"
 
-#: src/global.c:521
-#, fuzzy
-msgid "Go to next screen"
-msgstr "Flytta till n�sta sk�rm"
+#: src/global.c:528
+msgid "Go one screenful up"
+msgstr "Gå en hel skärm upp"
 
-#: src/global.c:523
+#: src/global.c:529
+msgid "Go one screenful down"
+msgstr "Gå en hel skärm ned"
+
+#: src/global.c:531
 msgid "Cut the current line and store it in the cutbuffer"
-msgstr "Klipper ut den aktuella raden och lagrar den i urklippsbufferten"
+msgstr "Klipp ut den aktuella raden och lagra den i urklippsbufferten"
 
-#: src/global.c:525
+#: src/global.c:533
 msgid "Uncut from the cutbuffer into the current line"
-msgstr "Klistra in fr�n urklippsbufferten i aktuell rad"
+msgstr "Klistra in från urklippsbufferten i aktuell rad"
 
-#: src/global.c:527
+#: src/global.c:534
 msgid "Display the position of the cursor"
-msgstr "Visa mark�rens position"
+msgstr "Visa markörens position"
 
-#: src/global.c:529
+#: src/global.c:536
 msgid "Invoke the spell checker, if available"
-msgstr "Starta stavningskontrollen, om tillg�nglig"
+msgstr "Starta stavningskontrollen, om tillgänglig"
 
-#: src/global.c:531
+#: src/global.c:538
 msgid "Replace a string or a regular expression"
-msgstr "Ers�tt en str�ng eller ett regulj�rt uttryck"
+msgstr "Ersätt en sträng eller ett reguljärt uttryck"
 
-#: src/global.c:532
+#: src/global.c:539
 msgid "Go to line and column number"
-msgstr "G� till rad- och kolumnnummer"
+msgstr "Gå till rad- och kolumnnummer"
 
-#: src/global.c:534
-msgid "Mark text at the cursor position"
-msgstr "Markera text vid mark�rpositionen"
+#: src/global.c:541
+msgid "Mark text starting from the cursor position"
+msgstr "Markera text med början vid markörpositionen"
 
-#: src/global.c:535
-msgid "Repeat last search"
-msgstr "Upprepa senaste s�kning"
+#: src/global.c:542
+msgid "Repeat the last search"
+msgstr "Upprepa senaste sökning"
 
-#: src/global.c:537
+#: src/global.c:544
 msgid "Copy the current line and store it in the cutbuffer"
-msgstr "Kopiera den aktuella raden och lagrar den i urklippsbufferten"
+msgstr "Kopiera den aktuella raden och lagra den i urklippsbufferten"
 
-#: src/global.c:538
+#: src/global.c:545
 msgid "Indent the current line"
 msgstr "Dra in aktuell rad"
 
-#: src/global.c:539
+#: src/global.c:546
 msgid "Unindent the current line"
-msgstr "�ngra indragning av aktuell rad"
+msgstr "Ångra indragning av aktuell rad"
 
-#: src/global.c:540
+#: src/global.c:547
 msgid "Undo the last operation"
-msgstr ""
+msgstr "Ångra senaste åtgärden"
 
-#: src/global.c:541
+#: src/global.c:548
 msgid "Redo the last undone operation"
-msgstr ""
+msgstr "Gör om den senaste ångraåtgärden"
 
-#: src/global.c:543
-#, fuzzy
+#: src/global.c:550
 msgid "Go forward one character"
-msgstr "Flytta fram�t ett tecken"
+msgstr "Gå framåt ett tecken"
 
-#: src/global.c:544
-#, fuzzy
+#: src/global.c:551
 msgid "Go back one character"
-msgstr "Flytta bak�t ett tecken"
+msgstr "Gå bakåt ett tecken"
 
-#: src/global.c:546
-#, fuzzy
+#: src/global.c:553
 msgid "Go forward one word"
-msgstr "G� fram�t ett ord"
+msgstr "Gå framåt ett ord"
 
-#: src/global.c:547
-#, fuzzy
+#: src/global.c:554
 msgid "Go back one word"
-msgstr "Flytta ett ord bak�t"
+msgstr "Gå bakåt ett ord"
 
-#: src/global.c:549
-#, fuzzy
+#: src/global.c:556
 msgid "Go to previous line"
-msgstr "Flytta till f�reg�ende rad"
+msgstr "Gå till föregående rad"
 
-#: src/global.c:550
-#, fuzzy
+#: src/global.c:557
 msgid "Go to next line"
-msgstr "Flytta till n�sta rad"
+msgstr "Gå till nästa rad"
 
-#: src/global.c:551
-#, fuzzy
+#: src/global.c:558
 msgid "Go to beginning of current line"
-msgstr "Flytta till b�rjan p� aktuell rad"
+msgstr "Gå till början på aktuell rad"
 
-#: src/global.c:552
-#, fuzzy
+#: src/global.c:559
 msgid "Go to end of current line"
-msgstr "Flytta till slutet p� aktuell rad"
+msgstr "Gå till slutet på aktuell rad"
 
-#: src/global.c:555
-#, fuzzy
+# Biten efter ; är konstig
+#: src/global.c:562
 msgid "Go to beginning of paragraph; then of previous paragraph"
-msgstr "G� till b�rjan p� det aktuella stycket"
+msgstr "Gå till början på det aktuella stycket; sedan för föregående stycke"
 
-#: src/global.c:557
-#, fuzzy
+# Biten efter ; är konstig
+#: src/global.c:564
 msgid "Go just beyond end of paragraph; then of next paragraph"
-msgstr "G� till slutet p� det aktuella stycket"
+msgstr "Gå till slutet på det aktuella stycket; sedan för nästa stycke"
 
-#: src/global.c:560
-#, fuzzy
+#: src/global.c:566
 msgid "Go to the first line of the file"
-msgstr "G� till filens f�rsta rad"
+msgstr "Gå till filens första rad"
 
-#: src/global.c:562
-#, fuzzy
+#: src/global.c:567
 msgid "Go to the last line of the file"
-msgstr "G� till filens sista rad"
+msgstr "Gå till filens sista rad"
 
-#: src/global.c:564
-#, fuzzy
+#: src/global.c:569
 msgid "Go to the matching bracket"
-msgstr "G� till matchande klammer"
+msgstr "Gå till den matchande klammern"
 
-#: src/global.c:566
+#: src/global.c:571
 msgid "Scroll up one line without scrolling the cursor"
-msgstr "Rulla upp en rad utan att rulla mark�ren"
+msgstr "Rulla upp en rad utan att rulla markören"
 
-#: src/global.c:568
+#: src/global.c:573
 msgid "Scroll down one line without scrolling the cursor"
-msgstr "Rulla ned en rad utan att rulla mark�ren"
+msgstr "Rulla ned en rad utan att rulla markören"
 
-#: src/global.c:572
+#: src/global.c:576
 msgid "Switch to the previous file buffer"
-msgstr "V�xla till f�reg�ende filbuffert"
+msgstr "Växla till föregående filbuffert"
 
-#: src/global.c:574
+#: src/global.c:577
 msgid "Switch to the next file buffer"
-msgstr "V�xla till n�sta filbuffert"
+msgstr "Växla till nästa filbuffert"
 
-# Os�ker
-#: src/global.c:577
+# Osäker
+#: src/global.c:579
 msgid "Insert the next keystroke verbatim"
-msgstr "Infoga n�sta tecken ordagrant"
+msgstr "Infoga nästa tecken ordagrant"
 
-#: src/global.c:579
+#: src/global.c:580
 msgid "Insert a tab at the cursor position"
-msgstr "Infoga ett tabulatortecken vid mark�rpositionen"
+msgstr "Infoga ett tabulatortecken vid markörpositionen"
 
 #: src/global.c:581
 msgid "Insert a newline at the cursor position"
-msgstr "Infoga en vagnretur vid mark�rpositionen"
+msgstr "Infoga ny rad-tecken vid markörpositionen"
 
-#: src/global.c:583
+#: src/global.c:582
 msgid "Delete the character under the cursor"
-msgstr "Ta bort tecknet under mark�ren"
+msgstr "Ta bort tecknet under markören"
 
-#: src/global.c:585
+#: src/global.c:584
 msgid "Delete the character to the left of the cursor"
-msgstr "Ta bort tecknet till v�nster om mark�ren"
+msgstr "Ta bort tecknet till vänster om markören"
 
-#: src/global.c:588
+#: src/global.c:587
 msgid "Cut from the cursor position to the end of the file"
-msgstr "Klipp ut fr�n mark�rens position till slutet av filen"
+msgstr "Klipp ut från markörens position till slutet av filen"
 
-#: src/global.c:591
+#: src/global.c:590
 msgid "Justify the entire file"
 msgstr "Justera hela filen"
 
-#: src/global.c:595
+#: src/global.c:594
 msgid "Count the number of words, lines, and characters"
-msgstr "R�kna antalet ord, rader och tecken"
+msgstr "Räkna antalet ord, rader och tecken"
 
-#: src/global.c:598
+#: src/global.c:597
 msgid "Refresh (redraw) the current screen"
-msgstr "Uppdatera (rita om) den aktuella sk�rmen"
+msgstr "Uppdatera (rita om) den aktuella skärmen"
 
-#: src/global.c:600
+#: src/global.c:599
 msgid "Suspend the editor (if suspend is enabled)"
-msgstr ""
+msgstr "Försätt redigeraren i vänteläge (om vänteläge är aktiverat)"
 
-#: src/global.c:603
+#: src/global.c:602
 msgid "Toggle the case sensitivity of the search"
-msgstr "V�xla skiftl�gesk�nslig s�kning"
+msgstr "Växla skiftlägeskänslig sökning"
 
-#: src/global.c:605
+#: src/global.c:604
 msgid "Reverse the direction of the search"
-msgstr "V�nd riktning f�r s�kningen"
+msgstr "Vänd riktning för sökningen"
 
-#: src/global.c:609
+#: src/global.c:608
 msgid "Toggle the use of regular expressions"
-msgstr "V�xla anv�ndning av regulj�ra uttryck"
+msgstr "Växla användningen av reguljära uttryck"
 
-#: src/global.c:613
+#: src/global.c:612
 msgid "Recall the previous search/replace string"
-msgstr "�terkalla den f�reg�ende s�k/ers�tt-str�ngen"
+msgstr "Återkalla den föregående sök/ersätt-strängen"
 
-#: src/global.c:615
+#: src/global.c:614
 msgid "Recall the next search/replace string"
-msgstr "�terkalla n�sta s�k/ers�tt-str�ng"
+msgstr "Återkalla nästa sök/ersätt-sträng"
 
-#: src/global.c:618
+#: src/global.c:617
 msgid "Go to file browser"
-msgstr "G� till filbl�ddrare"
+msgstr "Gå till filbläddrare"
 
-#: src/global.c:621
+#: src/global.c:620
 msgid "Toggle the use of DOS format"
-msgstr "V�xla anv�ndning av DOS-format"
+msgstr "Växla användning av DOS-format"
 
-#: src/global.c:622
+#: src/global.c:621
 msgid "Toggle the use of Mac format"
-msgstr "V�xla anv�ndning av Mac-format"
+msgstr "Växla användning av Mac-format"
 
-#: src/global.c:624
+#: src/global.c:622
 msgid "Toggle appending"
-msgstr "V�xla inmatning efter"
+msgstr "Växla inmatning efter"
 
-#: src/global.c:625
+#: src/global.c:623
 msgid "Toggle prepending"
-msgstr "V�xla inmatning f�re"
+msgstr "Växla inmatning före"
 
-#: src/global.c:628
+#: src/global.c:624
 msgid "Toggle backing up of the original file"
-msgstr "V�xla s�kerhetskopiering av originalfilen"
+msgstr "Växla säkerhetskopiering av originalfilen"
 
-#: src/global.c:629
+#: src/global.c:625
 msgid "Execute external command"
-msgstr "K�r externt kommando"
+msgstr "Kör externt kommando"
 
-#: src/global.c:633
+#: src/global.c:628
 msgid "Toggle the use of a new buffer"
-msgstr "V�xla anv�ndning av en ny buffert"
+msgstr "Växla användning av en ny buffert"
 
-#: src/global.c:636
+#: src/global.c:631
 msgid "Exit from the file browser"
-msgstr "Avsluta fr�n filbl�ddraren"
+msgstr "Avsluta från filbläddraren"
 
-#: src/global.c:638
+#: src/global.c:632
 msgid "Go to the first file in the list"
-msgstr "G� till f�rsta filen i listan"
+msgstr "Gå till första filen i listan"
 
-#: src/global.c:640
+#: src/global.c:633
 msgid "Go to the last file in the list"
-msgstr "G� till sista filen i listan"
+msgstr "Gå till sista filen i listan"
 
-#: src/global.c:641
-#, fuzzy
+#: src/global.c:634
+msgid "Go to the previous file in the list"
+msgstr "Gå till föregående fil i listan"
+
+#: src/global.c:635
 msgid "Go to the next file in the list"
-msgstr "G� till sista filen i listan"
+msgstr "Gå till nästa fil i listan"
+
+#: src/global.c:636
+msgid "Go to directory"
+msgstr "Gå till katalog"
+
+#: src/global.c:639
+msgid "Invoke the linter, if available"
+msgstr "Starta felkontrollen, om tillgänglig"
+
+#: src/global.c:640
+msgid "Go to previous linter msg"
+msgstr "Gå till föregående felkontrmedd"
+
+#: src/global.c:641
+msgid "Go to next linter msg"
+msgstr "Gå till nästa felkontrmedd"
 
 #: src/global.c:642
 #, fuzzy
-msgid "Go to the previous file in the list"
-msgstr "G� till f�rsta filen i listan"
+msgid "Invoke formatter, if available"
+msgstr "Starta felkontrollen, om tillgänglig"
 
-#: src/global.c:643
-msgid "Go to directory"
-msgstr "G� till katalog"
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:662
+msgid "Get Help"
+msgstr "Få hjälp"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:670
-msgid "Close"
-msgstr "St�ng"
+#: src/global.c:665 src/prompt.c:1084
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: src/global.c:678
+msgid "Write Out"
+msgstr "Skriv ut"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:679
-msgid "WriteOut"
-msgstr "Spara"
+#: src/global.c:704
+msgid "Go To Dir"
+msgstr "Gå till katalog"
+
+#: src/global.c:719
+msgid "Cut Text"
+msgstr "Klipp ut"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:728
 msgid "Justify"
 msgstr "Justera"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:696
-msgid "Read File"
-msgstr "L�s fil"
+#: src/global.c:733
+msgid "To Spell"
+msgstr "Stavkontr."
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:713
-msgid "Cut Text"
-msgstr "Klipp ut"
+#: src/global.c:738
+msgid "To Linter"
+msgstr "Till felkontrollsverktyg"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:718
-msgid "UnJustify"
-msgstr "Ojustera"
+#: src/global.c:740
+#, fuzzy
+msgid "Formatter"
+msgstr "DOS-format"
+
+#: src/global.c:745
+msgid "Case Sens"
+msgstr "Skiftkänsl"
+
+#: src/global.c:750
+msgid "Regexp"
+msgstr "Reguljärt uttr"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:723
-msgid "UnCut Text"
-msgstr "�ngra kopi"
+#: src/global.c:755
+msgid "Backwards"
+msgstr "Bakåt"
+
+#: src/global.c:762
+msgid "No Replace"
+msgstr "Ingen ersättning"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:728 src/global.c:755
+#: src/global.c:770
 msgid "Cur Pos"
 msgstr "Akt. pos"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:737
-msgid "To Spell"
-msgstr "Stavkontr."
+#: src/global.c:780
+msgid "Prev Page"
+msgstr "Föreg sid"
 
-#: src/global.c:771
+#: src/global.c:782
+msgid "Next Page"
+msgstr "Nästa sid"
+
+#: src/global.c:785
+msgid "First Line"
+msgstr "Första raden"
+
+#: src/global.c:787
+msgid "Last Line"
+msgstr "Sista raden"
+
+#: src/global.c:794
+msgid "To Bracket"
+msgstr "Till klammer"
+
+#: src/global.c:797
 msgid "Mark Text"
 msgstr "Markera text"
 
-#: src/global.c:777
+#: src/global.c:800
 msgid "Copy Text"
 msgstr "Kopiera text"
 
-#: src/global.c:780
+#: src/global.c:803
 msgid "Indent Text"
 msgstr "Dra in text"
 
-#: src/global.c:783
+#: src/global.c:805
 msgid "Unindent Text"
-msgstr "�ngra indragning av text"
+msgstr "Ångra indragning av text"
 
-#: src/global.c:787
+#: src/global.c:808
 msgid "Undo"
-msgstr ""
+msgstr "Ångra"
 
-#: src/global.c:790
+#: src/global.c:810
 msgid "Redo"
-msgstr ""
-
-#: src/global.c:796 src/global.c:800
-msgid "Forward"
-msgstr "Fram�t"
+msgstr "Gör om"
 
-#: src/global.c:806 src/global.c:810
+#: src/global.c:814 src/global.c:820
 msgid "Back"
-msgstr "Bak�t"
+msgstr "Bakåt"
 
-#: src/global.c:817
-msgid "Next Word"
-msgstr "N�sta ord"
+#: src/global.c:816 src/global.c:822
+msgid "Forward"
+msgstr "Framåt"
 
-#: src/global.c:820
+#: src/global.c:827
 msgid "Prev Word"
-msgstr "F�reg ord"
+msgstr "Föreg ord"
 
-#: src/global.c:824
-msgid "Prev Line"
-msgstr "F�reg rad"
-
-#: src/global.c:827
-msgid "Next Line"
-msgstr "N�sta rad"
+#: src/global.c:829
+msgid "Next Word"
+msgstr "Nästa ord"
 
-#: src/global.c:830
+#: src/global.c:833
 msgid "Home"
 msgstr "Hem"
 
-#: src/global.c:833
+#: src/global.c:835
 msgid "End"
 msgstr "Slut"
 
-#: src/global.c:845
-msgid "Find Other Bracket"
-msgstr "Hitta andra klammern"
+#: src/global.c:844
+msgid "Beg of Par"
+msgstr "Börj på sty"
+
+#: src/global.c:846
+msgid "End of Par"
+msgstr "Slut på sty"
 
-#: src/global.c:848
+#: src/global.c:851
 msgid "Scroll Up"
 msgstr "Rulla upp"
 
-#: src/global.c:851
+#: src/global.c:853
 msgid "Scroll Down"
 msgstr "Rulla ned"
 
-#: src/global.c:856
-msgid "Previous File"
-msgstr "F�reg�ende fil"
-
 #: src/global.c:858
+msgid "Prev File"
+msgstr "Föregående fil"
+
+#: src/global.c:860
 msgid "Next File"
-msgstr "N�sta fil"
+msgstr "Nästa fil"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:862 src/text.c:3045
-msgid "Verbatim Input"
-msgstr "Ordagrann inmatning"
+#: src/global.c:869
+msgid "Verbatim"
+msgstr "Ordagrann"
 
-#: src/global.c:867
+#: src/global.c:872
 msgid "Tab"
 msgstr "Tabb"
 
-#: src/global.c:870
+#: src/global.c:874
 msgid "Enter"
 msgstr "Retur"
 
-#: src/global.c:873
+#: src/global.c:876
 msgid "Delete"
 msgstr "Ta bort"
 
-#: src/global.c:876
+#: src/global.c:878
 msgid "Backspace"
 msgstr "Backsteg"
 
-#: src/global.c:893
+#: src/global.c:888
 msgid "CutTillEnd"
 msgstr "KlippTillSlut"
 
-#: src/global.c:906
+#: src/global.c:898
 msgid "Word Count"
 msgstr "Antal ord"
 
-#: src/global.c:1367
+#: src/global.c:905
+msgid "Suspend"
+msgstr "Vänteläge"
+
+#: src/global.c:910
+msgid "PrevHstory"
+msgstr "FöregHisto"
+
+#: src/global.c:913
+msgid "NextHstory"
+msgstr "NästaHisto"
+
+#: src/global.c:917
+msgid "Go To Text"
+msgstr "Gå till text"
+
+#: src/global.c:928
+msgid "DOS Format"
+msgstr "DOS-format"
+
+#: src/global.c:931
+msgid "Mac Format"
+msgstr "Mac-format"
+
+#: src/global.c:934
+msgid "Append"
+msgstr "Lägg till"
+
+#: src/global.c:936
+msgid "Prepend"
+msgstr "Infoga"
+
+#: src/global.c:939
+msgid "Backup File"
+msgstr "Säkerhetskopiera fil"
+
+#: src/global.c:946
+msgid "Execute Command"
+msgstr "Kör kommando"
+
+#: src/global.c:961
+msgid "To Files"
+msgstr "Till filer"
+
+#: src/global.c:964
+msgid "First File"
+msgstr "Första filen"
+
+#: src/global.c:966
+msgid "Last File"
+msgstr "Sista filen"
+
+#: src/global.c:977
+msgid "Prev Lint Msg"
+msgstr "Föreg felkontrolsmed"
+
+#: src/global.c:979
+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:1227
 msgid "Help mode"
-msgstr "Hj�lpl�ge"
+msgstr "Hjälpläge"
 
-#: src/global.c:1369
+#: src/global.c:1229
 msgid "Constant cursor position display"
-msgstr "Konstant visning av mark�rposition"
+msgstr "Konstant visning av markörposition"
 
-#: src/global.c:1371
+#: src/global.c:1231
 msgid "Use of one more line for editing"
-msgstr "Anv�ndning av ytterligare en rad f�r redigering"
+msgstr "Användning av ytterligare en rad för redigering"
 
-#: src/global.c:1373
+#: src/global.c:1233
 msgid "Smooth scrolling"
 msgstr "Mjuk rullning"
 
-#: src/global.c:1375
+#: src/global.c:1235
+msgid "Soft wrapping of overlong lines"
+msgstr "Mjuk radbrytning av långa rader"
+
+#: src/global.c:1237
 msgid "Whitespace display"
-msgstr "Visning av mellanrum"
+msgstr "Visning av blanktecken"
 
-#: src/global.c:1377
+#: src/global.c:1239
 msgid "Color syntax highlighting"
-msgstr "F�rgmarkering av syntax"
+msgstr "Färgmarkering av syntax"
 
-#: src/global.c:1379
+#: src/global.c:1241
 msgid "Smart home key"
 msgstr "Smart hemtangent"
 
-#: src/global.c:1381
+#: src/global.c:1243
 msgid "Auto indent"
 msgstr "Automatisk indragning"
 
-#: src/global.c:1383
+#: src/global.c:1245
 msgid "Cut to end"
 msgstr "Klipp ut till slutet"
 
-#: src/global.c:1385
-msgid "Long line wrapping"
-msgstr "Radbryt l�nga rader"
+#: src/global.c:1247
+msgid "Hard wrapping of overlong lines"
+msgstr "Fast radbrytning av långa rader"
 
-#: src/global.c:1387
+#: src/global.c:1249
 msgid "Conversion of typed tabs to spaces"
 msgstr "Konvertering av inmatade tabulatorer till blanksteg"
 
-#: src/global.c:1389
+#: src/global.c:1251
 msgid "Backup files"
-msgstr "S�kerhetskopiera filer"
+msgstr "Säkerhetskopiera filer"
 
-#: src/global.c:1391
+#: src/global.c:1253
 msgid "Multiple file buffers"
 msgstr "Flera filbuffertar"
 
-#: src/global.c:1393
+#: src/global.c:1255
 msgid "Mouse support"
-msgstr "Musst�d"
+msgstr "Musstöd"
 
-#: src/global.c:1395
+#: src/global.c:1257
 msgid "No conversion from DOS/Mac format"
-msgstr "Ingen konvertering fr�n DOS/Mac-format"
+msgstr "Ingen konvertering från DOS/Mac-format"
 
-#: src/global.c:1397
+#: src/global.c:1259
 msgid "Suspension"
-msgstr "Suspendering"
-
-#: src/global.c:1399
-#, fuzzy
-msgid "Soft line wrapping"
-msgstr "Radbryt l�nga rader"
+msgstr "Vänteläge"
 
-#: src/help.c:236
+#: src/help.c:205
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -991,17 +1082,17 @@ msgid ""
 "prompt.  Hitting Enter without entering any text will perform the previous "
 "search.  "
 msgstr ""
-"Hj�lptext f�r s�kkommando\n"
+"Hjälptext för sökkommando\n"
 "\n"
-" Ange de ord eller tecken som du vill s�ka efter och tryck sedan Retur. Om "
-"det finns en tr�ff f�r det du angav kommer sk�rmen att uppdateras till att "
-"visa den n�rmaste tr�ffen f�r s�kstr�ngen.\n"
+" Ange de ord eller tecken som du vill söka efter och tryck sedan Retur. Om "
+"det finns en träff för det du angav kommer skärmen att uppdateras till att "
+"visa den närmaste träffen för söksträngen.\n"
 "\n"
-" Den f�reg�ende s�kstr�ngen kommer att visas inom klamrar efter s�kprompten. "
-"Att trycka Retur utan att ange n�gon text kommer att genomf�ra den tidigare "
-"s�kningen.  "
+" Den föregående söksträngen kommer att visas inom klamrar efter sökprompten. "
+"Att trycka Retur utan att ange någon text kommer att utföra den tidigare "
+"sökningen.  "
 
-#: src/help.c:245
+#: src/help.c:214
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1009,13 +1100,13 @@ msgid ""
 " The following function keys are available in Search mode:\n"
 "\n"
 msgstr ""
-"Om du har markerat text med mark�ren och sedan s�kt och ersatt, kommer "
-"endast tr�ffar i den markerade texten att ers�ttas.\n"
+"Om du har markerat text med markören och sedan sökt och ersatt, kommer "
+"endast träffar i den markerade texten att ersättas.\n"
 "\n"
-" F�ljande funktionstangenter finns tillg�ngliga i s�kl�get:\n"
+" Följande funktionstangenter finns tillgängliga i sökläget:\n"
 "\n"
 
-#: src/help.c:251
+#: src/help.c:220
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1026,16 +1117,16 @@ msgid ""
 " The following function keys are available in Go To Line mode:\n"
 "\n"
 msgstr ""
-"Hj�lptext f�r G� till rad\n"
+"Hjälptext för gå till rad\n"
 "\n"
-" Ange det radnummer du vill g� till och tryck Retur. Om det finns f�rre "
-"textrader �n det tal du angav kommer du att tas till den sista raden i "
+" Ange det radnummer du vill gå till och tryck Retur. Om det finns färre "
+"textrader än det tal du angav kommer du att tas till den sista raden i "
 "filen.\n"
 "\n"
-" F�ljande funktionstangenter �r tillg�ngliga i G� till rad-l�ge:\n"
+" Följande funktionstangenter är tillgängliga i gå till rad-läge:\n"
 "\n"
 
-#: src/help.c:260
+#: src/help.c:229
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1047,18 +1138,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 ""
-"Hj�lptext f�r infoga fil\n"
+"Hjälptext för infoga fil\n"
 "\n"
-" Ange namnet p� den fil som ska s�ttas in i den aktuella filbufferten p� den "
-"aktuella platsen f�r mark�ren.\n"
+" Ange namnet på den fil som ska sättas in i den aktuella filbufferten på den "
+"aktuella platsen för markören.\n"
 "\n"
-" Om du har kompilerat nano med st�d f�r flera samtidiga filbuffertar och "
+" Om du har kompilerat nano med stöd för flera samtidiga filbuffertar och "
 "aktiverar flera buffertar med kommandoradsflaggorna -F eller --multibuffer, "
-"kombinationen Meta-F eller en nanorc-fil, kommer att infoga en fil g�ra s� "
-"att den l�ses in i en separat buffert (anv�nd Meta-< och > f�r att v�xla "
+"kombinationen Meta-F eller en nanorc-fil, kommer att infoga en fil göra så "
+"att den läses in i en separat buffert (använd Meta-< och > för att växla "
 "mellan filbuffertar). "
 
-#: src/help.c:269
+#: src/help.c:238
 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"
@@ -1066,13 +1157,13 @@ msgid ""
 " The following function keys are available in Insert File mode:\n"
 "\n"
 msgstr ""
-"Om du beh�ver ytterligare en tom buffert, ange inget filnamn, eller ange ett "
+"Om du behöver ytterligare en tom buffert, ange inget filnamn, eller ange ett "
 "ickeexisterande filnamn vid prompten och tryck Retur.\n"
 "\n"
-" F�ljande funktionstangenter �r tillg�ngliga i infoga fil-l�ge:\n"
+" Följande funktionstangenter är tillgängliga i infoga fil-läge:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:244
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1087,20 +1178,20 @@ msgid ""
 " The following function keys are available in Write File mode:\n"
 "\n"
 msgstr ""
-"Hj�lptext f�r skriv fil\n"
+"Hjälptext för skriv fil\n"
 "\n"
-" Ange det namn som du vill spara aktuell fil som och tryck Retur f�r att "
+" Ange det namn som du vill spara aktuell fil som och tryck Retur för att "
 "spara filen.\n"
 "\n"
-" Om du har markerat text med mark�ren kommer du f� fr�gan om att endast "
-"spara markeringen till en separat fil. F�r att minska risken att den "
-"aktuella filen skrivs �ver med endast en del av den �r inte det aktuella "
-"filnamnet standardalternativet i detta l�ge.\n"
+" Om du har markerat text med markören kommer du få frågan om att endast "
+"spara markeringen till en separat fil. För att minska risken att den "
+"aktuella filen skrivs över med endast en del av den är inte det aktuella "
+"filnamnet standardalternativet i detta läge.\n"
 "\n"
-" F�ljande funktionstangenter �r tillg�ngliga i filskrivningsl�ge:\n"
+" Följande funktionstangenter är tillgängliga i skriv fil-läge:\n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:258
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1113,18 +1204,18 @@ msgid ""
 " The following function keys are available in the file browser:\n"
 "\n"
 msgstr ""
-"Hj�lptext f�r filbl�ddrare\n"
+"Hjälptext för filbläddrare\n"
 "\n"
-" Filbl�ddraren anv�nds f�r att visuellt bl�ddra i katalogstrukturen f�r att "
-"v�lja en fil f�r l�sning eller skrivning. Du kan anv�nda piltangenterna "
-"eller PageUp/PageDown f�r att bl�ddra bland filerna, och S eller Retur f�r "
-"att v�lja den markerade filen eller g� in i den markerade katalogen. F�r att "
-"g� upp en niv� v�ljer du katalogen kallad \"..\" �verst i fillistan.\n"
+" Filbläddraren används för att visuellt bläddra i katalogstrukturen för att "
+"välja en fil för läsning eller skrivning. Du kan använda piltangenterna "
+"eller PageUp/PageDown för att bläddra bland filerna, och S eller Retur för "
+"att välja den markerade filen eller gå in i den markerade katalogen. För att "
+"gå upp en nivå väljer du katalogen kallad \"..\" överst i fillistan.\n"
 "\n"
-" F�ljande funktionstangenter �r tillg�ngliga i filbl�ddraren:\n"
+" Följande funktionstangenter är tillgängliga i filbläddraren:\n"
 "\n"
 
-#: src/help.c:302
+#: src/help.c:271
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1137,26 +1228,26 @@ msgid ""
 "search.\n"
 "\n"
 msgstr ""
-"Hj�lptext f�r s�kkommando\n"
+"Hjälptext för sökkommando\n"
 "\n"
-" Ange de ord eller tecken som du vill s�ka efter och tryck sedan Retur. Om "
-"det finns en tr�ff f�r det du angav kommer sk�rmen att uppdateras till att "
-"visa den n�rmaste tr�ffen f�r s�kstr�ngen.\n"
+" Ange de ord eller tecken som du vill söka efter och tryck sedan Retur. Om "
+"det finns en träff för det du angav kommer skärmen att uppdateras till att "
+"visa den närmaste träffen för söksträngen.\n"
 "\n"
-" Den f�reg�ende s�kstr�ngen kommer att visas inom klamrar efter s�kprompten. "
-"Att trycka Retur utan att ange n�gon text kommer att genomf�ra den tidigare "
-"s�kningen.\n"
+" Den föregående söksträngen kommer att visas inom klamrar efter sökprompten. "
+"Att trycka Retur utan att ange någon text kommer att genomföra den tidigare "
+"sökningen.\n"
 "\n"
 
-#: src/help.c:311
+#: src/help.c:280
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
 msgstr ""
-" F�ljande funktionstangenter �r tillg�ngliga i s�kl�get:\n"
+" Följande funktionstangenter är tillgängliga i sökläget:\n"
 "\n"
 
-#: src/help.c:315
+#: src/help.c:284
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1168,19 +1259,19 @@ msgid ""
 " The following function keys are available in Browser Go To Directory mode:\n"
 "\n"
 msgstr ""
-"Hj�lptext f�r g� till katalog i bl�ddraren\n"
+"Hjälptext för gå till katalog i bläddraren\n"
 "\n"
-" Ange namnet p� den katalog som du vill g� till.\n"
+" Ange namnet på den katalog som du vill gå till.\n"
 "\n"
-" Om tabulatorkomplettering inte har inaktiverats kan du anv�nda "
-"tabulatortangenten f�r att (f�rs�ka att) automatiskt komplettera "
+" Om tabulatorkomplettering inte har inaktiverats kan du använda "
+"tabulatortangenten för att (försöka att) automatiskt komplettera "
 "katalognamnet.\n"
 "\n"
-" F�ljande funktionstangenter �r tillg�ngliga i bl�ddrarens g� till katalog-"
-"l�ge:\n"
+" Följande funktionstangenter är tillgängliga i bläddrarens gå till katalog-"
+"läge:\n"
 "\n"
 
-#: src/help.c:328
+#: src/help.c:297
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1193,19 +1284,18 @@ msgid ""
 " The following function keys are available in Spell Check mode:\n"
 "\n"
 msgstr ""
-"Hj�lptext f�r stavningskontrollen\n"
+"Hjälptext för stavningskontrollen\n"
 "\n"
 " Stavningskontrollen kontrollerar stavningen av all text i den aktuella "
-"filen. N�r ett ok�nt ord hittas, markeras det och en ers�ttning kan "
-"redigeras. Den kommer sedan att f�r varenda f�rekomst av det angivna "
-"felstavade ordet i den aktuella filen, fr�ga om det ska ers�ttas, eller, om "
-"du har markerat text med mark�ren, i den markerade texten.\n"
+"filen. När ett okänt ord hittas, markeras det och en ersättning kan "
+"redigeras. Den kommer sedan att för varenda förekomst av det angivna "
+"felstavade ordet i den aktuella filen fråga om det ska ersättas eller, om du "
+"har markerat text med markören, i den markerade texten.\n"
 "\n"
-" F�ljande funktionstangenter �r tillg�ngliga i stavningskontroll�get:\n"
+" Följande funktionstangenter är tillgängliga i stavningskontrolläget:\n"
 "\n"
 
-#: src/help.c:343
-#, fuzzy
+#: src/help.c:312
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1216,16 +1306,16 @@ msgid ""
 " The following function keys are available in Execute Command mode:\n"
 "\n"
 msgstr ""
-"Hj�lptext f�r externt kommando\n"
+"Hjälptext för att kör kommando\n"
 "\n"
-" Detta l�ge l�ter dig infoga utdata fr�n ett kommando som k�rs av ett skal i "
-"den aktuella bufferten (eller en ny buffert i flerbuffertl�ge). Om du "
-"beh�ver ytterligare en tom buffert beh�ver du inte ange n�got kommando.\n"
+" Detta läge låter dig infoga utdata från ett kommando som körs av ett skal i "
+"den aktuella bufferten (eller en ny buffert i flerbuffertläge). Om du "
+"behöver ytterligare en tom buffert behöver du inte ange något kommando.\n"
 "\n"
-" F�ljande tangenter �r tillg�ngliga i det externa kommandol�get:\n"
+" Följande funktionstangenter är tillgängliga i läget kör kommando:\n"
 "\n"
 
-#: src/help.c:356
+#: src/help.c:325
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1236,16 +1326,16 @@ msgid ""
 "showing the file being edited.  The status line is the third line from the "
 "bottom and shows important messages.  "
 msgstr ""
-"Hj�lptext f�r nano\n"
+"Hjälptext för nano\n"
 "\n"
-" Textredigeraren nano �r skapad f�r att emulera funktionaliteten och "
-"l�ttanv�ndheten hos textredigeraren UW Pico. Det finns fyra huvuddelar i "
-"redigeraren: �versta raden visar programmets versionsnummer, namnet p� filen "
-"som redigeras och om filen har �ndrats. Efter detta finns huvudf�nstret som "
-"visar filen som redigeras. Statusraden �r tredje raden fr�n nederkanten och "
+" Textredigeraren nano är skapad för att emulera funktionaliteten och "
+"lättanvändheten hos textredigeraren UW Pico. Det finns fyra huvuddelar i "
+"redigeraren: Översta raden visar programmets versionsnummer, namnet på filen "
+"som redigeras och om filen har ändrats. Efter detta finns huvudfönstret som "
+"visar filen som redigeras. Statusraden är tredje raden från nederkanten och "
 "visar viktiga meddelanden.  "
 
-#: src/help.c:366
+#: src/help.c:335
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1255,16 +1345,16 @@ msgid ""
 "notated with the Meta (M-) symbol and can be entered using either the Esc, "
 "Alt, or Meta key depending on your keyboard setup.  "
 msgstr ""
-"De nedersta tv� raderna visar de vanligaste kortkommandona som anv�nds i "
+"De nedersta två raderna visar de vanligaste kortkommandona som används i "
 "textredigeraren.\n"
 "\n"
-" Notationen f�r kortkommandon �r som f�ljer: Sekvenser med Control-tangent "
+" Notationen för kortkommandon är som följer: Sekvenser med Control-tangent "
 "skrivs med ett taktecken (^) och trycks tillsammans med antingen Control-"
-"tangenten (Ctrl) eller genom att trycka Escape-tangenten tv� g�nger. Escape-"
-"sekvenser skrivs med metatecknet (M) och och anges antingen med Esc-, Alt- "
-"eller Meta-tangenten beroende p� dina tangentbordsinst�llningar.  "
+"tangenten (Ctrl) eller genom att trycka Escape-tangenten två gånger. Escape-"
+"sekvenser skrivs med metatecknet (M) och anges antingen med Esc-, Alt- eller "
+"Meta-tangenten beroende på dina tangentbordsinställningar.  "
 
-#: src/help.c:375
+#: src/help.c:344
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1272,21 +1362,21 @@ msgid ""
 "keys are shown in parentheses:\n"
 "\n"
 msgstr ""
-"Dessutom kan du genom att trycka p� Escape tv� g�nger och sedan ange ett "
-"tresiffrigt tal fr�n 000 till 255 ange det tecken som har motsvarande ASCII-"
-"kod. F�ljande tangentkombinationer �r tillg�ngliga i redigerarens "
-"huvudf�nster. Alternativa tangenter visas inom parentes:\n"
+"Dessutom kan du genom att trycka på Escape två gånger och sedan ange ett "
+"tresiffrigt tal från 000 till 255 ange det tecken som har motsvarande ASCII-"
+"kod. Följande tangentkombinationer är tillgängliga i redigerarens "
+"huvudfönster. Alternativa tangenter visas inom parentes:\n"
 "\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:376 src/help.c:448
 msgid "enable/disable"
 msgstr "aktivera/inaktivera"
 
-#: src/nano.c:587
+#: src/nano.c:601
 msgid "Key invalid in view mode"
-msgstr "Tangenten ogiltig i visningsl�get"
+msgstr "Tangenten ogiltig i visningsläget"
 
-#: src/nano.c:695
+#: src/nano.c:713
 #, c-format
 msgid ""
 "\n"
@@ -1295,7 +1385,7 @@ msgstr ""
 "\n"
 "Bufferten skrevs till %s\n"
 
-#: src/nano.c:697
+#: src/nano.c:715
 #, c-format
 msgid ""
 "\n"
@@ -1304,7 +1394,7 @@ msgstr ""
 "\n"
 "Bufferten skrevs inte till %s: %s\n"
 
-#: src/nano.c:700
+#: src/nano.c:718
 #, c-format
 msgid ""
 "\n"
@@ -1313,265 +1403,270 @@ msgstr ""
 "\n"
 "Bufferten skrevs inte: %s\n"
 
-#: src/nano.c:723
+#: src/nano.c:743
 msgid "Window size is too small for nano...\n"
-msgstr "F�nsterstorleken �r f�r liten f�r Nano...\n"
+msgstr "Fönsterstorleken är för liten för Nano…\n"
 
-#: src/nano.c:816
+#: src/nano.c:836
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
 "\n"
 msgstr ""
-"Anv�ndning: nano [FLAGGOR] [[+RAD,KOLUMN] FIL]...\n"
+"Användning: nano [FLAGGOR] [[+RAD,KOLUMN] FIL]…\n"
 "\n"
 
-#: src/nano.c:819
+#: src/nano.c:839
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
-msgstr "Flagga\t\tL�ng GNU flagga\t\tBetydelse\n"
+msgstr "Flagga\t\tLång GNU-flagga\t\tBetydelse\n"
 
-#: src/nano.c:821
+#: src/nano.c:841
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Flagga\t\tBetydelse\n"
 
-#: src/nano.c:824
-msgid "Show this message"
-msgstr "Visa detta meddelande"
-
-#: src/nano.c:825
+#: src/nano.c:844
 msgid "+LINE,COLUMN"
 msgstr "+RAD,KOLUMN"
 
-#: src/nano.c:826
+#. TRANSLATORS: The next forty or so strings are option descriptions
+#. * for the --help output.  Try to keep them at most 40 characters.
+#: src/nano.c:847
 msgid "Start at line LINE, column COLUMN"
 msgstr "Starta vid radnummer RAD, kolumn KOLUMN"
 
-#: src/nano.c:828
+#: src/nano.c:849
 msgid "Enable smart home key"
 msgstr "Aktivera smart hemtangent"
 
-#: src/nano.c:829
+#: src/nano.c:850
 msgid "Save backups of existing files"
-msgstr "Spara s�kerhetskopior av befintliga filer"
+msgstr "Spara säkerhetskopior av befintliga filer"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "-C <dir>"
 msgstr "-C <kat>"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<kat>"
 
-#: src/nano.c:831
+#: src/nano.c:852
 msgid "Directory for saving unique backup files"
-msgstr "Katalog f�r att spara unika s�kerhetskopior"
+msgstr "Katalog för att spara unika säkerhetskopior"
 
-#: src/nano.c:834
+#: src/nano.c:855
 msgid "Use bold instead of reverse video text"
-msgstr "Anv�nd fet stil ist�llet f�r omv�nd videotext"
+msgstr "Använd fet stil istället för omvänd videotext"
 
-#: src/nano.c:837
+#: src/nano.c:858
 msgid "Convert typed tabs to spaces"
-msgstr "Convertera angivna tabulatorer till blanksteg"
+msgstr "Konvertera angivna tabulatorer till blanksteg"
 
-#: src/nano.c:840
+#: src/nano.c:861
 msgid "Enable multiple file buffers"
-msgstr "Anv�nd flera filbuffertar"
+msgstr "Använd flera filbuffertar"
 
-#: src/nano.c:845
+#: src/nano.c:865
+msgid "Use (vim-style) lock files"
+msgstr "Använd låsfiler (i vim-stil)"
+
+#: src/nano.c:869
 msgid "Log & read search/replace string history"
-msgstr "Logga och l�s str�nghistorik f�r s�k/ers�tt"
+msgstr "Logga och läs stränghistorik för sök/ersätt"
 
-#: src/nano.c:848
+#: src/nano.c:873
 msgid "Don't look at nanorc files"
 msgstr "Titta inte i nanorc-filer"
 
-#: src/nano.c:851
+#: src/nano.c:876
 msgid "Fix numeric keypad key confusion problem"
-msgstr "Ta hand om f�rvirringsproblemet med numeriska tangentbordet"
+msgstr "Ta hand om förvirringsproblemet med numeriska tangentbordet"
 
-#: src/nano.c:853
+#: src/nano.c:878
 msgid "Don't add newlines to the ends of files"
-msgstr "L�gg inte till nya rader p� slutet av filer"
+msgstr "Lägg inte till nya rader på slutet av filer"
 
-#: src/nano.c:856
+#: src/nano.c:881
 msgid "Don't convert files from DOS/Mac format"
-msgstr "Konvertera inte filer fr�n DOS/Mac-format"
+msgstr "Konvertera inte filer från DOS/Mac-format"
 
-#: src/nano.c:858
+#: src/nano.c:883
 msgid "Use one more line for editing"
-msgstr "Anv�nd en rad till f�r redigering"
+msgstr "Använd en rad till för redigering"
 
-#: src/nano.c:860
+#: src/nano.c:886
+msgid "Log & read location of cursor position"
+msgstr "Logga & läs plats för markörposition"
+
+#: src/nano.c:889
 msgid "-Q <str>"
 msgstr "-Q <str>"
 
-#: src/nano.c:860
+#: src/nano.c:889
 msgid "--quotestr=<str>"
 msgstr "--quotestr=<str>"
 
-#: src/nano.c:861
+#: src/nano.c:890
 msgid "Quoting string"
-msgstr "Citatstr�ng"
+msgstr "Citatsträng"
 
-#: src/nano.c:863
+#: src/nano.c:892
 msgid "Restricted mode"
-msgstr "Begr�nsat l�ge"
+msgstr "Begränsat läge"
 
-#: src/nano.c:866
+#: src/nano.c:895
 msgid "Scroll by line instead of half-screen"
-msgstr ""
+msgstr "Rulla efter rad istället för halvskärm"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "-T <#cols>"
 msgstr "-T <kolumner>"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<kolumner>"
 
-#: src/nano.c:869
+#: src/nano.c:898
 msgid "Set width of a tab to #cols columns"
-msgstr "St�ll in bredden p� ett tabbsteg till antal kolumner"
+msgstr "Ställ in bredden på ett tabbsteg till antal kolumner"
 
-#: src/nano.c:871
+#: src/nano.c:900
 msgid "Do quick statusbar blanking"
-msgstr "G�r en snabb rensning av statusraden"
+msgstr "Gör en snabb rensning av statusraden"
 
-#: src/nano.c:874
+#: src/nano.c:903
 msgid "Print version information and exit"
 msgstr "Skriv ut versionsinformation och avsluta"
 
-#: src/nano.c:877
+#: src/nano.c:906
 msgid "Detect word boundaries more accurately"
-msgstr "Identifiera ordgr�nsen mer noggrant"
+msgstr "Identifiera ordgränsen mer noggrant"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "-Y <str>"
 msgstr "-Y <str>"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "--syntax=<str>"
 msgstr "--syntax=<str>"
 
-#: src/nano.c:881
+#: src/nano.c:910
 msgid "Syntax definition to use for coloring"
-msgstr "Syntaxdefinition att anv�nda f�r f�rger"
+msgstr "Syntaxdefinition att använda för färger"
 
-#: src/nano.c:883
+#: src/nano.c:912
 msgid "Constantly show cursor position"
-msgstr "Visa mark�rposition hela tiden"
+msgstr "Visa markörposition hela tiden"
 
-#: src/nano.c:885
+#: src/nano.c:914
 msgid "Fix Backspace/Delete confusion problem"
-msgstr "Fixa f�rvirringsproblemet med Backspace/Delete"
+msgstr "Fixa förvirringsproblemet med Backsteg/Delete"
+
+#: src/nano.c:915
+msgid "Show this help text"
+msgstr "Visa denna hjälptext"
 
-#: src/nano.c:888
+#: src/nano.c:918
 msgid "Automatically indent new lines"
 msgstr "Dra automatiskt in nya rader"
 
-#: src/nano.c:889
+#: src/nano.c:919
 msgid "Cut from cursor to end of line"
-msgstr "Klipp ut fr�n mark�ren till slutet p� raden"
+msgstr "Klipp ut från markören till slutet på raden"
 
-#: src/nano.c:892
+#: src/nano.c:922
 msgid "Don't follow symbolic links, overwrite"
-msgstr "F�lj inte symboliska l�nkar, skriv �ver"
+msgstr "Följ inte symboliska länkar, skriv över"
 
-#: src/nano.c:894
+#: src/nano.c:924
 msgid "Enable the use of the mouse"
-msgstr "Aktivera anv�ndning av musen"
+msgstr "Aktivera användning av musen"
 
-#: src/nano.c:897
+#: src/nano.c:926
+msgid "Do not read the file (only write it)"
+msgstr "Läs inte filen (skriv den bara)"
+
+#: src/nano.c:928
 msgid "-o <dir>"
 msgstr "-o <kat>"
 
-#: src/nano.c:897
+#: src/nano.c:928
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<kat>"
 
-#: src/nano.c:898
+#: src/nano.c:929
 msgid "Set operating directory"
-msgstr "St�ll in arbetskatalog"
+msgstr "Ställ in arbetskatalog"
 
-#: src/nano.c:901
+#: src/nano.c:932
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Bevara XON (^Q)- och XOFF (^S)-tangenter"
 
-#: src/nano.c:903
+#: src/nano.c:935
 msgid "Silently ignore startup issues like rc file errors"
-msgstr ""
+msgstr "Ignorera tyst startproblem som rc-filfel"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "-r <#cols>"
 msgstr "-r <kolumner>"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "--fill=<#cols>"
 msgstr "--fill=<kolumner>"
 
-#: src/nano.c:906
-msgid "Set wrapping point at column #cols"
-msgstr "St�ll in brytpunkt vid kolumnen \"kolumner\""
+#: src/nano.c:939
+msgid "Set hard-wrapping point at column #cols"
+msgstr "Ställ in fast radbryt-punkt vid kolumnen #cols"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "-s <prog>"
 msgstr "-s <prog>"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "--speller=<prog>"
 msgstr "--speller=<prog>"
 
-#: src/nano.c:910
+#: src/nano.c:943
 msgid "Enable alternate speller"
-msgstr "Anv�nd alternativ stavningskontroll"
+msgstr "Använd alternativ stavningskontroll"
 
-#: src/nano.c:913
+#: src/nano.c:946
 msgid "Auto save on exit, don't prompt"
-msgstr "Spara automatiskt vid avslut, fr�ga inte"
-
-#: src/nano.c:915
-msgid "Allow generic undo [EXPERIMENTAL]"
-msgstr ""
+msgstr "Spara automatiskt vid avslut, fråga inte"
 
-#: src/nano.c:918
+#: src/nano.c:947
 msgid "View mode (read-only)"
-msgstr "Visningsl�ge (skrivskyddat)"
+msgstr "Visningsläge (skrivskyddat)"
 
-#: src/nano.c:920
-msgid "Don't wrap long lines"
-msgstr "Radbryt inte l�nga rader"
+#: src/nano.c:949
+msgid "Don't hard-wrap long lines"
+msgstr "Använd inte fast radbryt för långa rader"
 
-#: src/nano.c:922
+#: src/nano.c:951
 msgid "Don't show the two help lines"
-msgstr "Visa inte de tv� hj�lpraderna"
+msgstr "Visa inte de två hjälpraderna"
 
-#: src/nano.c:923
+#: src/nano.c:952
 msgid "Enable suspension"
-msgstr "Anv�nd suspendering"
+msgstr "Använd vänteläge"
 
-#: src/nano.c:924
-#, fuzzy
+#: src/nano.c:954
 msgid "Enable soft line wrapping"
-msgstr "Radbryt l�nga rader"
+msgstr "Aktivera mjuk radbrytning"
 
-#: src/nano.c:928
-msgid "(ignored, for Pico compatibility)"
-msgstr "(ignorerad f�r kompatibilitet med Pico)"
-
-#: src/nano.c:938
-#, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
+#: src/nano.c:963
+#, fuzzy, c-format
+msgid " GNU nano, version %s\n"
 msgstr " GNU nano version %s (kompilerad %s, %s)\n"
 
-#: src/nano.c:943
+#: src/nano.c:966
 #, 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:944
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1580,155 +1675,178 @@ msgstr ""
 "\n"
 " Kompileringsflaggor:"
 
-#: src/nano.c:1022
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
-msgstr "Tyv�rr, st�d f�r denna funktion har inaktiverats"
+msgstr "Tyvärr, stöd för denna funktion har inaktiverats"
+
+#: src/nano.c:1125
+msgid "No file name"
+msgstr "Inget filnamn"
 
-#: src/nano.c:1044
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr ""
-"Spara �ndrad buffert (ATT SVARA \"Nej\" KOMMER ATT F�RST�RA �NDRINGAR)? "
+"Spara ändrad buffert (ATT SVARA \"Nej\" KOMMER ATT FÖRSTÖRA ÄNDRINGAR)? "
 
-#: src/nano.c:1088
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
-msgstr ""
+msgstr "Kunde inte återöppna stdin från tangentbordet\n"
 
-#: src/nano.c:1114
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
-msgstr ""
+msgstr "Läser från stdin, ^C för att avbryta\n"
 
-#: src/nano.c:1182
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Mottog SIGHUP eller SIGTERM\n"
 
-#: src/nano.c:1204
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
-msgstr "Anv�nd \"fg\" f�r att �terv�nda till nano.\n"
+msgstr "Använd \"fg\" för att återvända till nano.\n"
 
-#: src/nano.c:1386
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "aktiverad"
 
-#: src/nano.c:1387
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "inaktiverad"
 
-#: src/nano.c:1548 src/winio.c:1256
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
-msgstr "Ok�nt kommando"
+msgstr "Okänt kommando"
 
-#: src/nano.c:1674
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "XON ignorerades, mummel mummel"
 
-#: src/nano.c:1679
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF ignorerades, mummel mummel"
 
-#: src/nano.c:2209 src/rcfile.c:1100
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
-msgstr "Beg�rd tabulatorstorlek \"%s\" �r ogiltig"
+msgstr "Begärd tabulatorstorlek \"%s\" är ogiltig"
 
-#: src/nano.c:2268 src/rcfile.c:1025
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
-msgstr "Beg�rd fyllningsstorlek \"%s\" �r ogiltig"
+msgstr "Begärd fyllningsstorlek \"%s\" är ogiltig"
+
+#: src/nano.c:2415
+#, 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"
 
 #. 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:1259
+#: src/prompt.c:1055
 msgid "Yy"
 msgstr "JjYy"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1056
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1057
 msgid "Aa"
 msgstr "Aa"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1071
 msgid "Yes"
 msgstr "Ja"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1076
 msgid "All"
 msgstr "Alla"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1081
 msgid "No"
 msgstr "Nej"
 
-#: src/rcfile.c:130
+#: src/rcfile.c:137
 #, c-format
 msgid "Error in %s on line %lu: "
-msgstr "Fel i %s p� rad %lu: "
+msgstr "Fel i %s på rad %lu: "
 
-#: src/rcfile.c:185
+#: src/rcfile.c:196
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "Argumentet \"%s\" har ett oavslutat \""
 
-#: src/rcfile.c:212 src/rcfile.c:264 src/rcfile.c:711 src/rcfile.c:768
-#: src/rcfile.c:821
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 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"
+msgstr "Strängar med reguljära uttryck måste börja och sluta med ett \"-tecken"
 
-#: src/rcfile.c:238 src/search.c:62
+#: src/rcfile.c:249 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
-msgstr "Felaktigt regulj�rt uttryck \"%s\": %s"
+msgstr "Felaktigt reguljärt uttryck \"%s\": %s"
 
-#: src/rcfile.c:258
+#: src/rcfile.c:269
 msgid "Missing syntax name"
 msgstr "Syntaxnamn saknas"
 
-#: src/rcfile.c:316
+#: src/rcfile.c:340
 msgid "The \"none\" syntax is reserved"
-msgstr "Syntaxen \"none\" �r reserverad"
+msgstr "Syntaxen \"none\" är reserverad"
 
-#: src/rcfile.c:323
+#: src/rcfile.c:347
 msgid "The \"default\" syntax must take no extensions"
-msgstr "Syntaxen \"default\" f�r inte ta ut�kningar"
+msgstr "Syntaxen \"default\" får inte ta utökningar"
 
-#: src/rcfile.c:386 src/rcfile.c:483
-#, fuzzy
+#: src/rcfile.c:433
 msgid "Missing key name"
-msgstr "Syntaxnamn saknas"
+msgstr "Saknar tangentnamn"
 
-#: src/rcfile.c:398 src/rcfile.c:499
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
-msgstr ""
+#: src/rcfile.c:442 src/rcfile.c:453
+msgid "Key name is too short"
+msgstr "Tangentnamnet är för kort"
 
-#: src/rcfile.c:407
-msgid "Must specify function to bind key to"
-msgstr ""
+#: src/rcfile.c:463
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
+msgstr "Tangentnamnet måste börja med ”^”, ”M” eller ”F”"
 
-#: src/rcfile.c:418 src/rcfile.c:510
-msgid "Must specify menu to bind key to (or \"all\")"
-msgstr ""
+#: src/rcfile.c:472
+msgid "Must specify a function to bind the key to"
+msgstr "Måste ange en funktion att binda tangenten till"
 
-#: src/rcfile.c:426
-#, fuzzy, c-format
-msgid "Could not map name \"%s\" to a function"
-msgstr "Kunde inte �ppna %s f�r skrivning: %s"
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:482
+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:432 src/rcfile.c:517
-#, fuzzy, c-format
-msgid "Could not map name \"%s\" to a menu"
-msgstr "Kunde inte starta \"%s\""
+#: src/rcfile.c:489
+#, c-format
+msgid "Cannot map name \"%s\" to a function"
+msgstr "Kan inte mappa namnet ”%s” till en funktion"
 
-#: src/rcfile.c:454
+#: src/rcfile.c:496
 #, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
-msgstr ""
+msgid "Cannot map name \"%s\" to a menu"
+msgstr "Kan inte mappa namnet ”%s” till en meny"
+
+#: src/rcfile.c:528
+#, c-format
+msgid "Function '%s' does not exist in menu '%s'"
+msgstr "Funktionen ”%s”  existerar inte i meny ”%s”"
+
+#: src/rcfile.c:543
+#, c-format
+msgid "Sorry, keystroke \"%s\" may not be rebound"
+msgstr "Tangentnedtryckningen ”%s” kan inte bindas om"
+
+#: src/rcfile.c:629
+#, c-format
+msgid "Error expanding %s: %s"
+msgstr "Fel vid utökning av %s: %s"
 
-#: src/rcfile.c:625
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1737,141 +1855,202 @@ msgid ""
 "\"black\", with the optional prefix \"bright\"\n"
 "for foreground colors."
 msgstr ""
-"F�rst�r inte f�rgen \"%s\".\n"
-"Giltiga f�rger �r \"green\" (gr�nt), \"red\" (r�tt),\n"
-"\"blue\" (bl�tt), \"white\" (vitt), \"yellow\" (gult),\n"
+"Förstår inte färgen \"%s\".\n"
+"Giltiga färger är \"green\" (grönt), \"red\" (rött),\n"
+"\"blue\" (blått), \"white\" (vitt), \"yellow\" (gult),\n"
 "\"cyan\", \"magenta\" och \"black\" (svart), med\n"
-"valfria prefixet \"bright\" (ljus) f�r f�rgrundsf�rger."
+"valfria prefixet \"bright\" (ljus) för förgrundsfärger."
 
-#: src/rcfile.c:647
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
-msgstr "Kan inte l�gga till ett f�rgkommando utan ett syntaxkommando"
+msgstr "Kan inte lägga till ett färgkommando utan ett syntaxkommando"
 
-#: src/rcfile.c:652
+#: src/rcfile.c:699
 msgid "Missing color name"
-msgstr "F�rgnamn saknas"
+msgstr "Färgnamn saknas"
 
-#: src/rcfile.c:672
+#: src/rcfile.c:709 src/rcfile.c:870
+msgid "Missing regex string"
+msgstr "Saknar sträng för reguljärt uttryck"
+
+#: src/rcfile.c:785
+msgid "\"start=\" requires a corresponding \"end=\""
+msgstr "\"start=\" kräver ett motsvarande \"end=\""
+
+#: src/rcfile.c:837
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
-msgstr "Bakgrundsf�rgen \"%s\" kan inte vara ljus"
+msgstr "Bakgrundsfärgen \"%s\" kan inte vara ljus"
 
-#: src/rcfile.c:690 src/rcfile.c:809
-msgid "Missing regex string"
-msgstr "Saknar regulj�r uttrycksstr�ng"
+#: src/rcfile.c:865
+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:762
-msgid "\"start=\" requires a corresponding \"end=\""
-msgstr "\"start=\" kr�ver ett motsvarande \"end=\""
+#: src/rcfile.c:921
+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:926
+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:804
+#: src/rcfile.c:990
+msgid "Missing linter command"
+msgstr "Saknar kommando för felkontroll"
+
+#: src/rcfile.c:1010
 #, fuzzy
-msgid "Cannot add a header regex without a syntax command"
-msgstr "Kan inte l�gga till ett f�rgkommando utan ett syntaxkommando"
+msgid "Cannot add formatter without a syntax command"
+msgstr "Kan inte lägga till en felkontroll utan ett syntaxkommando"
+
+#: src/rcfile.c:1015
+#, fuzzy
+msgid "Missing formatter command"
+msgstr "Saknar kommando för felkontroll"
 
-#: src/rcfile.c:874
+#: src/rcfile.c:1045
 #, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
+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:876
+#: src/rcfile.c:1047
+#, c-format
 msgid ""
-"Exiting.  Please use nano with the -I option if needed to adjust your nanorc "
-"settings\n"
+"If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
+"Om det behövs, använd nano med flaggan -I för att justera dina nanorc-"
+"inställningar.\n"
+
+#: src/rcfile.c:1108
+#, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "Kunde inte hitta syntax %s att utöka"
 
-#: src/rcfile.c:926 src/rcfile.c:935 src/rcfile.c:945
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
-msgstr "Kommandot \"%s\" till�ts inte i inkluderad fil"
+msgstr "Kommandot \"%s\" tillåts inte i inkluderad fil"
 
-#: src/rcfile.c:951 src/rcfile.c:1128
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
-msgstr "Syntax \"%s\" har inga f�rgkommandon"
+msgstr "Syntax \"%s\" har inga färgkommandon"
 
-#: src/rcfile.c:966
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
-msgstr "F�rst�r inte kommandot \"%s\""
+msgstr "Förstår inte kommandot \"%s\""
 
-#: src/rcfile.c:972
-msgid "Missing flag"
-msgstr "Flagga saknas"
+#: src/rcfile.c:1186
+msgid "Missing option"
+msgstr "Saknad flagga"
 
-#: src/rcfile.c:994
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
-msgstr "Flaggan \"%s\" kr�ver ett argument"
+msgstr "Flaggan \"%s\" kräver ett argument"
 
-#: src/rcfile.c:1012
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
-msgstr "Flagga �r inte en giltig flerbytestr�ng"
+msgstr "Flagga är inte en giltig flerbytesträng"
 
-#: src/rcfile.c:1038 src/rcfile.c:1066 src/rcfile.c:1075
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
-msgstr "Icke-blanktecken kr�vs"
+msgstr "Icke-blanktecken krävs"
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
-msgstr "Tv� enkel-kolumntecken kr�vs"
+msgstr "Två enkel-kolumntecken krävs"
 
-#: src/rcfile.c:1114
+#: src/rcfile.c:1339
 #, c-format
-msgid "Cannot unset flag \"%s\""
+msgid "Cannot unset option \"%s\""
 msgstr "Kan inte bort flaggan \"%s\""
 
-#: src/rcfile.c:1123
+#: src/rcfile.c:1345
 #, c-format
-msgid "Unknown flag \"%s\""
-msgstr "Ok�nd flagga \"%s\""
+msgid "Unknown option \"%s\""
+msgstr "Okänd flagga \"%s\""
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr "Jag kan inte hitta min hemkatalog! Buhu!"
 
+#: src/rcfile.c:1442
+#, c-format
+msgid ""
+"\n"
+"Press Enter to continue starting nano.\n"
+msgstr ""
+"\n"
+"Tryck Retur för att fortsätta starta nano.\n"
+
 #: src/search.c:96
 #, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "\"%.*s%s\" kunde inte hittas"
 
-#: src/search.c:205
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/search.c:184
+msgid " [Case Sensitive]"
+msgstr " [Skiftlägeskänslig]"
+
+#: src/search.c:188
+msgid " [Regexp]"
+msgstr " [Reguljärt uttryck]"
+
+#: src/search.c:192
+msgid " [Backwards]"
+msgstr " [Baklänges]"
+
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:197
 msgid " (to replace) in selection"
-msgstr " (att ers�tta) i markering"
+msgstr " (att ersätta) i markering"
 
-#: src/search.c:207
+#: src/search.c:199
 msgid " (to replace)"
-msgstr " (att ers�tta)"
+msgstr " (att ersätta)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:769
 msgid "Replace this instance?"
-msgstr "Ers�tta denna f�rekomst?"
+msgstr "Ersätta denna förekomst?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:945
 msgid "Replace with"
-msgstr "Ers�tt med"
+msgstr "Ersätt med"
 
-#: src/search.c:1004
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
-msgstr[0] "Ersatte %lu f�rekomst"
-msgstr[1] "Ersatte %lu f�rekomster"
+msgstr[0] "Ersatte %lu förekomst"
+msgstr[1] "Ersatte %lu förekomster"
 
-#: src/search.c:1034
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr "Ange radnummer, kolumnnummer"
 
-#: src/search.c:1061
-#, fuzzy
+#: src/search.c:1054
 msgid "Invalid line or column number"
-msgstr "Ange radnummer, kolumnnummer"
+msgstr "Ogiltigt rad- eller kolumnnummer"
 
-#: src/search.c:1214
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "Inte en klammer"
 
-#: src/search.c:1281
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "Ingen matchande klammer"
 
@@ -1883,247 +2062,326 @@ msgstr "Markering satt"
 msgid "Mark Unset"
 msgstr "Markera borttagen"
 
-#: src/text.c:443
+#: src/text.c:439
 msgid "Nothing in undo buffer!"
-msgstr ""
+msgstr "Inget i ångra-bufferten!"
 
-#: src/text.c:455 src/text.c:593
+#: src/text.c:445 src/text.c:590
 #, c-format
-msgid "Internal error: can't match line %d.  Please save your work"
-msgstr ""
+msgid "Internal error: can't match line %d.  Please save your work."
+msgstr "Internt fel: Kan inte matcha raden %d. Spara ditt arbete."
 
-#: src/text.c:466 src/text.c:603
+#: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
-msgstr ""
+msgstr "lägg till text"
 
-#: src/text.c:475 src/text.c:613
-#, fuzzy
+#: src/text.c:467 src/text.c:612
 msgid "text delete"
-msgstr "N�sta fil"
-
-#: src/text.c:489 src/text.c:628
-#, fuzzy
-msgid "line wrap"
-msgstr "Radbryt l�nga rader"
+msgstr "textborttagning"
 
-#: src/text.c:503 src/text.c:636
+#: src/text.c:491 src/text.c:641
 msgid "line join"
-msgstr ""
+msgstr "lägg ihop rad"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:505 src/text.c:657
 msgid "text cut"
-msgstr ""
+msgstr "klipp ut text"
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:510 src/text.c:661
 msgid "text uncut"
-msgstr ""
+msgstr "ångra klipp ut text"
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:515 src/text.c:623
 msgid "line break"
-msgstr ""
+msgstr "radbryt"
 
-#: src/text.c:532 src/text.c:665
-#, fuzzy
+#: src/text.c:528 src/text.c:672
 msgid "text insert"
-msgstr "N�sta rad"
+msgstr "textinmatning"
 
-#: src/text.c:550 src/text.c:659
-#, fuzzy
+#: src/text.c:549 src/text.c:665
 msgid "text replace"
-msgstr " (att ers�tta)"
+msgstr "textersättning"
 
-#: src/text.c:557 src/text.c:671
-msgid "Internal error: unknown type.  Please save your work"
-msgstr ""
+#: src/text.c:556 src/text.c:679 src/text.c:983
+msgid "Internal error: unknown type.  Please save your work."
+msgstr "Internt fel: Okänd typ. Spara ditt arbete."
 
-#: src/text.c:563
+#: src/text.c:561
 #, c-format
 msgid "Undid action (%s)"
-msgstr ""
+msgstr "Ångrade åtgärd (%s)"
 
-#: src/text.c:578
+#: src/text.c:580
 msgid "Nothing to re-do!"
-msgstr ""
+msgstr "Inget att göra om!"
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
-msgstr ""
+#: src/text.c:584
+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:676
+#: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
-msgstr ""
+msgstr "Gjorde om åtgärd (%s)"
 
-#: src/text.c:766
-msgid "Could not pipe"
-msgstr "Kunde inte anv�nda r�r"
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
+msgid "Could not create pipe"
+msgstr "Kunde inte skapa rör"
 
-#: src/text.c:793 src/text.c:2636 src/text.c:2788
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "Kunde inte grena"
 
-#: src/text.c:941
-msgid "Internal error: can't setup uncut.  Please save your work."
-msgstr ""
-
-#: src/text.c:950
-msgid "Internal error: unknown type.  Please save your work."
-msgstr ""
+#: src/text.c:969
+msgid "Internal error: cannot set up uncut.  Please save your work."
+msgstr "Internt fel: Kan ångra klipp ut. Spara ditt arbete."
 
-#: src/text.c:1870
+#: src/text.c:1806
 #, c-format
 msgid "Bad quote string %s: %s"
-msgstr "Felaktig citeringsstr�ng %s: %s"
+msgstr "Felaktig citeringssträng %s: %s"
 
-#: src/text.c:2267
+#: src/text.c:2207
 msgid "Can now UnJustify!"
 msgstr "Kan ojustera nu!"
 
-#: src/text.c:2462
+#: src/text.c:2404
 msgid "Edit a replacement"
-msgstr "Redigera en ers�ttning"
-
-#: src/text.c:2548
-msgid "Could not create pipe"
-msgstr "Kunde inte skapa r�r"
+msgstr "Redigera en ersättning"
 
-#: src/text.c:2550
+#: src/text.c:2492
 msgid "Creating misspelled word list, please wait..."
-msgstr "Skapar lista �ver felstavade ord, var v�nlig v�nta..."
+msgstr "Skapar lista över felstavade ord, var vänlig vänta…"
 
-#: src/text.c:2642
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
-msgstr "Kunde inte f� tag i r�rbuffertens storlek"
+msgstr "Kunde inte få tag i rörbuffertens storlek"
 
-#: src/text.c:2693
+#: src/text.c:2635
 msgid "Error invoking \"spell\""
 msgstr "Fel vid start av \"spell\""
 
-#: src/text.c:2696
+#: src/text.c:2638
 msgid "Error invoking \"sort -f\""
 msgstr "Fel vid start av \"sort -f\""
 
-#: src/text.c:2699
+#: src/text.c:2641
 msgid "Error invoking \"uniq\""
 msgstr "Fel vid start av \"uniq\""
 
-#: src/text.c:2756 src/text.c:2965
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
-msgstr "Stavningskontrollen slutf�rdes"
+msgstr "Stavningskontrollen slutfördes"
 
-#: src/text.c:2815
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Fel vid start av \"%s\""
 
-#: src/text.c:2960
+#: src/text.c:2885
+msgid "Invoking spell checker, please wait"
+msgstr "Starta stavningskontrollen"
+
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Stavningskontrollen misslyckades: %s"
 
-#: src/text.c:2962
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Stavningskontrollen misslyckades: %s: %s"
 
-#: src/text.c:3030
+#: src/text.c:2937
+msgid "No linter defined for this type of file!"
+msgstr "Ingen felkontroll definierad för denna typ av fil!"
+
+#: src/text.c:2947
+msgid "Save modified buffer before linting?"
+msgstr "Spara ändrad buffert före felkontroll?"
+
+#: src/text.c:2969
+msgid "Invoking linter, please wait"
+msgstr "Startar felkontroll, vänta."
+
+#: src/text.c:3125
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr "Fick 0 tolkningsbara rader från kommando: %s"
+
+#: src/text.c:3159
+#, 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:3205
+msgid "At last message"
+msgstr "Vid sista meddelandet"
+
+#: src/text.c:3210
+msgid "At first message"
+msgstr "Vid första meddelandet"
+
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr ""
+
+#: src/text.c:3275
+msgid "Finished"
+msgstr ""
+
+#: src/text.c:3280
+#, fuzzy
+msgid "Invoking formatter, please wait"
+msgstr "Startar felkontroll, vänta."
+
+#: src/text.c:3360
+msgid "Finished formatting"
+msgstr ""
+
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sOrd: %lu  Rader: %ld  Tecken: %lu"
 
-#: src/text.c:3031
+#: src/text.c:3439
 msgid "In Selection:  "
 msgstr "I markering:  "
 
-#: src/utils.c:405 src/utils.c:417
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3453
+msgid "Verbatim Input"
+msgstr "Ordagrann inmatning"
+
+#: src/utils.c:410 src/utils.c:422
 msgid "nano is out of memory!"
-msgstr "nano har slut p� minne!"
+msgstr "nano har slut på minne!"
 
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
-#: src/winio.c:1557
+#: src/winio.c:1583
 msgid "Unicode Input"
 msgstr "Unicode-inmatning"
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2142 src/winio.c:2146
 msgid "Modified"
-msgstr "�ndrad"
+msgstr "Ändrad"
 
-#: src/winio.c:2150
+#: src/winio.c:2143
 msgid "View"
 msgstr "Visa"
 
-#: src/winio.c:2164
+#: src/winio.c:2157
 msgid "DIR:"
 msgstr "KAT:"
 
-#: src/winio.c:2171
+#: src/winio.c:2164
 msgid "File:"
 msgstr "Fil:"
 
-#: src/winio.c:3360
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2261
+msgid ""
+"Warning: Modifying a file which is not locked, check directory permission?"
+msgstr "Varning: Ändring av olåst fil, kontrollera katalogrättigheter?"
+
+#: src/winio.c:3377
 #, 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:3492
+#: src/winio.c:3507
 msgid "The nano text editor"
 msgstr "Textredigeraren nano"
 
-#: src/winio.c:3493
+#: src/winio.c:3508
 msgid "version"
 msgstr "version"
 
-#: src/winio.c:3494
+#: src/winio.c:3509
 msgid "Brought to you by:"
 msgstr "Presenteras av:"
 
-#: src/winio.c:3495
+#: src/winio.c:3510
 msgid "Special thanks to:"
 msgstr "Ytterligare tack till:"
 
-#: src/winio.c:3496
+#: src/winio.c:3511
 msgid "The Free Software Foundation"
 msgstr "Free Software Foundation"
 
-#: src/winio.c:3497
+#: src/winio.c:3512
+msgid "the many translators and the TP"
+msgstr ""
+
+#: src/winio.c:3513
 msgid "For ncurses:"
-msgstr "F�r ncurses:"
+msgstr "För ncurses:"
 
-#: src/winio.c:3498
+#: src/winio.c:3514
 msgid "and anyone else we forgot..."
-msgstr "och alla andra som vi har gl�mt..."
+msgstr "och alla andra som vi har glömt…"
 
-#: src/winio.c:3499
+#: src/winio.c:3515
 msgid "Thank you for using nano!"
-msgstr "Tack f�r att du anv�nder nano!"
+msgstr "Tack för att du använder nano!"
+
+#~ msgid "Internal error: can't match line %ld.  Please save your work."
+#~ msgstr "Internt fel: Kan inte matcha rad %ld. Spara ditt arbete."
+
+#~ msgid "line wrap"
+#~ msgstr "radbryt"
+
+#~ msgid "Move to the previous screen"
+#~ msgstr "Flytta till föregående skärm"
+
+#~ msgid "Move to the next screen"
+#~ msgstr "Flytta till nästa skärm"
+
+#~ msgid "Find Other Bracket"
+#~ msgstr "Hitta andra klammern"
+
+#~ msgid "Insert File"
+#~ msgstr "Infoga fil"
 
 #~ msgid "Space"
 #~ msgstr "Blanksteg"
 
+#~ msgid "(ignored, for Pico compatibility)"
+#~ msgstr "(ignorerad för kompatibilitet med Pico)"
+
+#~ msgid "Missing flag"
+#~ msgstr "Flagga saknas"
+
 #~ msgid "Come on, be reasonable"
-#~ msgstr "Kom igen, var nu f�rst�ndig"
+#~ msgstr "Kom igen, var nu förståndig"
+
+#~ msgid "Could not pipe"
+#~ msgstr "Kunde inte använda rör"
 
 #~ msgid "Prepending to %s failed: %s"
 #~ msgstr "Infogning till %s misslyckades: %s"
 
 #~ msgid "Invoke the help menu"
-#~ msgstr "Starta hj�lpmenyn"
+#~ msgstr "Starta hjälpmenyn"
 
 #~ msgid "Search for text within the editor"
-#~ msgstr "S�k efter text inuti textredigeraren"
+#~ msgstr "Sök efter text inuti textredigeraren"
 
 #~ msgid "Replace text within the editor"
-#~ msgstr "Ers�tt text inuti textredigeraren"
+#~ msgstr "Ersätt text inuti textredigeraren"
 
 #~ msgid "Find matching bracket"
 #~ msgstr "Hitta matchande klammer"
 
 #~ msgid "Make the current search/replace case (in)sensitive"
-#~ msgstr "G�r den aktuella s�kningen/ers�ttningen skiftl�ges(o)k�nslig"
+#~ msgstr "Gör den aktuella sökningen/ersättningen skiftläges(o)känslig"
 
 #~ msgid "Make the current search/replace go backwards"
-#~ msgstr "G�r s� att den aktuella s�kningen/ers�ttningen g�r bakl�nges"
+#~ msgstr "Gör så att den aktuella sökningen/ersättningen går baklänges"
 
 #~ msgid "Write file out in DOS format"
 #~ msgstr "Skriv fil i DOS-format"
@@ -2135,7 +2393,7 @@ msgstr "Tack f�r att du anv�nder nano!"
 #~ msgstr "Infoga i den aktuella filen"
 
 #~ msgid "Back up original file when saving"
-#~ msgstr "S�kerhetskopiera ursprunglig fil vid sparande"
+#~ msgstr "Säkerhetskopiera ursprunglig fil vid sparande"
 
 #~ msgid "Insert into new buffer"
 #~ msgstr "Infoga i ny buffert"
@@ -2144,11 +2402,11 @@ msgstr "Tack f�r att du anv�nder nano!"
 #~ "Usage: nano [+LINE,COLUMN] [GNU long option] [option] [file]\n"
 #~ "\n"
 #~ msgstr ""
-#~ "Anv�ndning: nano [+RAD,KOLUMN]] [l�ng GNU-flagga] [flagga] [fil]\n"
+#~ "Användning: nano [+RAD,KOLUMN]] [lång GNU-flagga] [flagga] [fil]\n"
 #~ "\n"
 
 #~ msgid "Use more space for editing"
-#~ msgstr "Anv�nd mer utrymme f�r redigering"
+#~ msgstr "Använd mer utrymme för redigering"
 
 #~ msgid "Set fill cols to (wrap lines at) #cols"
 #~ msgstr "Bryt rader efter antal tecken"
@@ -2156,11 +2414,8 @@ msgstr "Tack f�r att du anv�nder nano!"
 #~ msgid "Duplicate syntax name %s"
 #~ msgstr "Kopia av syntaxnamn %s"
 
-#~ msgid "Could not create temp file: %s"
-#~ msgstr "Kunde inte skapa tempor�r fil: %s"
-
 #~ msgid "Refusing zero-length regex match"
-#~ msgstr "V�grar matchning av regulj�rt uttryck med noll-l�ngd"
+#~ msgstr "Vägrar matchning av reguljärt uttryck med noll-längd"
 
 #~ msgid "Wrote %u line"
 #~ msgid_plural "Wrote %u lines"
@@ -2168,14 +2423,14 @@ msgstr "Tack f�r att du anv�nder nano!"
 #~ msgstr[1] "Skrev %u rader"
 
 #~ msgid "Can't open \"%s\": %s"
-#~ msgstr "Kan inte �ppna \"%s\": %s"
+#~ msgstr "Kan inte öppna \"%s\": %s"
 
 #~ msgid ""
 #~ "\n"
 #~ "Press Return to continue starting nano\n"
 #~ msgstr ""
 #~ "\n"
-#~ "Tryck Retur f�r att forts�tta starta nano\n"
+#~ "Tryck Retur för att fortsätta starta nano\n"
 
 #~ msgid "Direction"
 #~ msgstr "Riktning"
@@ -2188,7 +2443,7 @@ msgstr "Tack f�r att du anv�nder nano!"
 #~ "Buffer not written to %s (too many backup files?)\n"
 #~ msgstr ""
 #~ "\n"
-#~ "Bufferten skrevs inte till %s (f�r m�nga s�kerhetskopior?)\n"
+#~ "Bufferten skrevs inte till %s (för många säkerhetskopior?)\n"
 
 #~ msgid "Up"
 #~ msgstr "Upp"
@@ -2197,22 +2452,25 @@ msgstr "Tack f�r att du anv�nder nano!"
 #~ msgstr "+RAD"
 
 #~ msgid "Do regular expression searches"
-#~ msgstr "S�k med regulj�rt uttryck"
+#~ msgstr "Sök med reguljärt uttryck"
 
 #~ msgid "Verbatim input"
 #~ msgstr "Ordagrann inmatning"
 
+#~ msgid "Could not invoke \"%s\""
+#~ msgstr "Kunde inte starta \"%s\""
+
 #~ msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%ld (%d%%)"
 #~ msgstr "rad %ld/%ld (%d%%), kolumn %lu/%lu (%d%%), tecken %lu/%ld (%d%%)"
 
 #~ msgid "File exists, OVERWRITE ?"
-#~ msgstr "Filen existerar, SKRIVA �VER?"
+#~ msgstr "Filen existerar, SKRIVA ÖVER?"
 
 #~ msgid "File exists, OVERWRITE?"
-#~ msgstr "Filen existerar, SKRIVA �VER?"
+#~ msgstr "Filen existerar, SKRIVA ÖVER?"
 
 #~ msgid "File exists, OVERWRITE? "
-#~ msgstr "Filen existerar, SKRIVA �VER? "
+#~ msgstr "Filen existerar, SKRIVA ÖVER? "
 
 #~ msgid "Save file under DIFFERENT NAME? "
 #~ msgstr "Spara filen med ANNAT NAMN? "
@@ -2224,7 +2482,7 @@ msgstr "Tack f�r att du anv�nder nano!"
 #~ msgstr "Justera"
 
 #~ msgid "Backup file"
-#~ msgstr "S�kerhetskopiera fil"
+#~ msgstr "Säkerhetskopiera fil"
 
 #~ msgid "%s not found"
 #~ msgstr "%s kunde inte hittas"
@@ -2233,16 +2491,16 @@ msgstr "Tack f�r att du anv�nder nano!"
 #~ msgstr "add_to_cutbuffer() anropades med inptr->data = %s\n"
 
 #~ msgid "Blew away cutbuffer =)\n"
-#~ msgstr "Spr�ngde urklippsbufferten =)\n"
+#~ msgstr "Sprängde urklippsbufferten =)\n"
 
 #~ msgid "File to insert into new buffer [from ./] "
-#~ msgstr "Fil att infoga i ny buffert [fr�n ./] "
+#~ msgstr "Fil att infoga i ny buffert [från ./] "
 
 #~ msgid "File to insert [from ./] "
-#~ msgstr "Fil att infoga [fr�n ./] "
+#~ msgstr "Fil att infoga [från ./] "
 
 #~ msgid "filename is %s\n"
-#~ msgstr "filnamnet �r %s\n"
+#~ msgstr "filnamnet är %s\n"
 
 #~ msgid "%s: free'd a node, YAY!\n"
 #~ msgstr "%s: frigjorde en nod, JIPPI!\n"
@@ -2251,46 +2509,46 @@ msgstr "Tack f�r att du anv�nder nano!"
 #~ msgstr "%s: frigjorde sista noden.\n"
 
 #~ msgid "Could not read %s for backup: %s"
-#~ msgstr "Kunde inte �ppna %s f�r s�kerhetskopiering: %s"
+#~ msgstr "Kunde inte öppna %s för säkerhetskopiering: %s"
 
 #~ msgid "Couldn't write backup: %s"
-#~ msgstr "Kunde inte skriva s�kerhetskopia: %s"
+#~ msgstr "Kunde inte skriva säkerhetskopia: %s"
 
 #~ msgid "Backing up %s to %s\n"
-#~ msgstr "S�kerhetskopierar %s till %s\n"
+#~ msgstr "Säkerhetskopierar %s till %s\n"
 
 #~ msgid "Could not set permissions %o on backup %s: %s"
-#~ msgstr "Kunde inte s�tta r�ttigheterna %o p� s�kerhetskopian %s: %s"
+#~ msgstr "Kunde inte sätta rättigheterna %o på säkerhetskopian %s: %s"
 
 #~ msgid "Could not set owner %d/group %d on backup %s: %s"
-#~ msgstr "Kunde inte s�tta �gare %d/grupp %d p� s�kerhetskopian %s: %s"
+#~ msgstr "Kunde inte sätta ägare %d/grupp %d på säkerhetskopian %s: %s"
 
 #~ msgid "Could not set access/modification time on backup %s: %s"
-#~ msgstr "Kunde inte s�tta �tkomst-/modifieringstid p� s�kerhetskopian %s: %s"
+#~ msgstr "Kunde inte sätta åtkomst-/modifieringstid på säkerhetskopian %s: %s"
 
 #~ msgid "Could not open file for writing: %s"
-#~ msgstr "Kunde inte �ppna filen f�r skrivning: %s"
+#~ msgstr "Kunde inte öppna filen för skrivning: %s"
 
 #~ msgid "Wrote >%s\n"
 #~ msgstr "Skrev >%s\n"
 
 #~ msgid "Could not close %s: %s"
-#~ msgstr "Kunde inte st�nga %s: %s"
+#~ msgstr "Kunde inte stänga %s: %s"
 
 #~ msgid "Could not reopen %s: %s"
-#~ msgstr "Kunde inte �ter�ppna %s: %s"
+#~ msgstr "Kunde inte återöppna %s: %s"
 
-#~ msgid "Could not open %s for prepend: %s"
-#~ msgstr "Kunde inte �ppna %s f�r infogande: %s"
+#~ msgid "Could not open %s for writing: %s"
+#~ msgstr "Kunde inte öppna %s för skrivning: %s"
 
 #~ msgid "Could not set permissions %o on %s: %s"
-#~ msgstr "Kunde inte s�tta r�ttigheterna %o p� %s: %s"
+#~ msgstr "Kunde inte sätta rättigheterna %o på %s: %s"
 
 #~ msgid "Goto Cancelled"
-#~ msgstr "G� till avbrutet"
+#~ msgstr "Gå till avbrutet"
 
 #~ msgid "Unable to open ~/.nano_history file, %s"
-#~ msgstr "Kan inte �ppna filen ~/.nano_history, %s"
+#~ msgstr "Kan inte öppna filen ~/.nano_history, %s"
 
 #~ msgid "Unable to write ~/.nano_history file, %s"
 #~ msgstr "Kan inte skriva filen ~/.nano_history, %s"
@@ -2302,31 +2560,31 @@ msgstr "Tack f�r att du anv�nder nano!"
 #~ msgstr "Skriver fil i Mac-format"
 
 #~ msgid "Backing up file"
-#~ msgstr "S�kerhetskopierar fil"
+#~ msgstr "Säkerhetskopierar fil"
 
 #~ msgid "Unjustify after a justify"
-#~ msgstr "�terst�ll en justering"
+#~ msgstr "Återställ en justering"
 
 #~ msgid "Move up one line"
-#~ msgstr "G� upp en rad"
+#~ msgstr "Gå upp en rad"
 
 #~ msgid "Move down one line"
-#~ msgstr "G� ner en rad"
+#~ msgstr "Gå ner en rad"
 
 #~ msgid "Search backwards"
-#~ msgstr "S�k bakl�nges"
+#~ msgstr "Sök baklänges"
 
 #~ msgid "Open previously loaded file"
-#~ msgstr "�ppna f�reg�ende inl�sta fil"
+#~ msgstr "Öppna föregående inlästa fil"
 
 #~ msgid "Open next loaded file"
-#~ msgstr "�ppna n�sta inl�sta fil"
+#~ msgstr "Öppna nästa inlästa fil"
 
 #~ msgid "Down"
 #~ msgstr "Ner"
 
 #~ msgid "Use alternate keypad routines"
-#~ msgstr "Anv�nd alternativa tangentbordsrutiner"
+#~ msgstr "Använd alternativa tangentbordsrutiner"
 
 #~ msgid "-T [num]"
 #~ msgstr "-T [antal]"
@@ -2338,42 +2596,42 @@ msgstr "Tack f�r att du anv�nder nano!"
 #~ msgstr "Efter, data = \"%s\"\n"
 
 #~ msgid "Spell checking failed: unable to write temp file!"
-#~ msgstr "Stavningskontroll misslyckades: kan inte skriva till tempor�rfil!"
+#~ msgstr "Stavningskontroll misslyckades: kan inte skriva till temporärfil!"
 
 #~ msgid "Cannot resize top win"
-#~ msgstr "Kan inte �ndra storlek p� �vre f�nstret"
+#~ msgstr "Kan inte ändra storlek på övre fönstret"
 
 #~ msgid "Cannot move top win"
-#~ msgstr "Kan inte flytta �vre f�nstret"
+#~ msgstr "Kan inte flytta övre fönstret"
 
 #~ msgid "Cannot resize edit win"
-#~ msgstr "Kan inte �ndra storlek p� redigeringsf�nstret"
+#~ msgstr "Kan inte ändra storlek på redigeringsfönstret"
 
 #~ msgid "Cannot move edit win"
-#~ msgstr "Kan inte flytta redigeringsf�nstret"
+#~ msgstr "Kan inte flytta redigeringsfönstret"
 
 #~ msgid "Cannot resize bottom win"
-#~ msgstr "Kan inte �ndra storlek p� nedre f�nstret"
+#~ msgstr "Kan inte ändra storlek på nedre fönstret"
 
 #~ msgid "Cannot move bottom win"
-#~ msgstr "Kan inte flytta nedre f�nstret"
+#~ msgstr "Kan inte flytta nedre fönstret"
 
 #~ msgid "NumLock glitch detected.  Keypad will malfunction with NumLock off"
 #~ msgstr ""
-#~ "NumLock-problem uppt�cktes. Tangenterna kommer inte att fungera utan "
+#~ "NumLock-problem upptäcktes. Tangenterna kommer inte att fungera utan "
 #~ "NumLock"
 
 #~ msgid "Tab size is too small for nano...\n"
-#~ msgstr "Tabulatorstorleken �r f�r liten f�r nano...\n"
+#~ msgstr "Tabulatorstorleken är för liten för nano...\n"
 
 #~ msgid "Main: set up windows\n"
-#~ msgstr "Main: konfigurera f�nster\n"
+#~ msgstr "Main: konfigurera fönster\n"
 
 #~ msgid "Main: bottom win\n"
-#~ msgstr "Main: nedre f�nstret\n"
+#~ msgstr "Main: nedre fönstret\n"
 
 #~ msgid "Main: open file\n"
-#~ msgstr "Main: �ppna fil\n"
+#~ msgstr "Main: öppna fil\n"
 
 #~ msgid "AHA!  %c (%d)\n"
 #~ msgstr "AHA! %c (%d)\n"
@@ -2397,7 +2655,7 @@ msgstr "Tack f�r att du anv�nder nano!"
 #~ msgstr "Jag mottog %c (%d)!\n"
 
 #~ msgid "Adding new syntax after 1st\n"
-#~ msgstr "L�gger till ny syntax efter f�rsta\n"
+#~ msgstr "Lägger till ny syntax efter första\n"
 
 #~ msgid "Starting a new syntax type\n"
 #~ msgstr "Startar ny syntaxtyp\n"
diff --git a/po/tr.gmo b/po/tr.gmo
index 7bf49e5..2dc8b86 100644
--- a/po/tr.gmo
+++ b/po/tr.gmo
diff --git a/po/tr.po b/po/tr.po
index 24ff5db..236650e 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,123 +1,148 @@
-# translation of nano-1.2.1.tr.po to Turkish
+# translation of nano to Turkish.
 # Copyright (C) 2003 Free Software Foundation, Inc.
 # This file is distributed under the same license as the nano package.
-# A. Murat EREN <meren@comu.edu.tr>, 2003
 #
+# A. Murat EREN <meren@comu.edu.tr>, 2003
 msgid ""
 msgstr ""
 "Project-Id-Version: nano 1.2.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-22 06:34-0500\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\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"
+"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: KBabel 1.0\n"
 
-#: src/browser.c:220
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:203
 #, fuzzy
 msgid "Go To Directory"
 msgstr "Dizine Git"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:860 src/files.c:2048
-#: src/nano.c:1060 src/search.c:220 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "İptal edildi"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:246 src/browser.c:293
 #, 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:277 src/browser.c:324 src/browser.c:347 src/files.c:722
-#: src/files.c:731 src/files.c:1540 src/files.c:1659 src/files.c:1711
-#: src/files.c:1732 src/files.c:1855 src/files.c:2691 src/rcfile.c:568
-#: src/rcfile.c:1204
+#: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
+#: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
+#: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, fuzzy, c-format
 msgid "Error reading %s: %s"
 msgstr "Hatalı alıntı dizgesi %s: %s"
 
-#: src/browser.c:303
+#: src/browser.c:283
 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:665 src/browser.c:674
+#: src/browser.c:626 src/browser.c:635
 msgid "(dir)"
 msgstr ""
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:632
 msgid "(parent dir)"
 msgstr ""
 
-#: src/browser.c:801 src/search.c:185
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "Ara"
 
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:805 src/search.c:189
-msgid " [Case Sensitive]"
-msgstr " [Büyük / Küçük Harfe Duyarlı]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:811 src/search.c:195
-msgid " [Regexp]"
-msgstr " [Düzenli İfade]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:817 src/search.c:201
-msgid " [Backwards]"
-msgstr " [Geriye Doğru]"
-
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "Arama Döngülendi"
 
-#: src/browser.c:1006 src/browser.c:1039 src/search.c:514 src/search.c:517
-#: src/search.c:574 src/search.c:577
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "Bu tek bulgu"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr ""
 
-#: src/files.c:125
+#: src/files.c:139
+msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
+msgstr ""
+
+#: src/files.c:145
+#, fuzzy, c-format
+msgid "Couldn't determine hostname for lock file: %s"
+msgstr "%o izinleri %s dosyasına uygulanamadı: %s"
+
+#: src/files.c:165 src/files.c:175 src/files.c:212 src/files.c:222
+#, fuzzy, c-format
+msgid "Error writing lock file %s: %s"
+msgstr "%s'nin %d. satırında hata: "
+
+#: src/files.c:237
+#, fuzzy, c-format
+msgid "Error deleting lock file %s: %s"
+msgstr "%s'nin %d. satırında hata: "
+
+#: src/files.c:272
+#, fuzzy, c-format
+msgid "Error opening lock file %s: %s"
+msgstr "%s'nin %d. satırında hata: "
+
+#: src/files.c:282
+#, 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:297
+#, c-format
+msgid "File %s is being edited (by %s with %s, PID %d); continue?"
+msgstr ""
+
+#: src/files.c:308
+#, c-format
+msgid "Error writing lock file: Directory '%s' doesn't exist"
+msgstr ""
+
+#: src/files.c:339
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Dosya %s dışından eklenemiyor"
 
-#: src/files.c:234
+#: src/files.c:467
 #, fuzzy
 msgid "No more open file buffers"
 msgstr "Başka açık dosya yok"
 
-#: src/files.c:250
+#: src/files.c:484
 #, c-format
 msgid "Switched to %s"
 msgstr "%s 'e geçildi"
 
-#: src/files.c:251 src/global.c:469 src/winio.c:2168
+#: src/files.c:485 src/global.c:953 src/winio.c:2161
 msgid "New Buffer"
 msgstr "Yeni Arabellek"
 
-#: src/files.c:633
+#: src/files.c:874
 #, 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:638
+#: src/files.c:879
 #, fuzzy, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
@@ -127,13 +152,13 @@ msgid_plural ""
 "permission)"
 msgstr[0] "%d satır okundu (Mac biçiminden dönüştürüldü)"
 
-#: src/files.c:644
+#: src/files.c:885
 #, 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:648
+#: src/files.c:889
 #, fuzzy, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
@@ -141,13 +166,13 @@ 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:654
+#: src/files.c:895
 #, 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:658
+#: src/files.c:899
 #, fuzzy, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
@@ -155,506 +180,454 @@ 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:664
+#: src/files.c:905
 #, fuzzy, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "%d satır okundu"
 
-#: src/files.c:667
+#: src/files.c:908
 #, c-format
 msgid "Read %lu line ( Warning: No write permission)"
 msgid_plural "Read %lu lines (Warning: No write permission)"
 msgstr[0] ""
 
-#: src/files.c:700 src/files.c:736
+#: src/files.c:943 src/files.c:980
 msgid "Reading File"
 msgstr "Dosya Okunuyor"
 
-#: src/files.c:706
+#: src/files.c:950
 msgid "New File"
 msgstr "Yeni Dosya"
 
-#: src/files.c:709
+#: src/files.c:953
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" bulunamadı"
 
-#: src/files.c:717 src/rcfile.c:559 src/rcfile.c:1154 src/rcfile.c:1195
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" bir dizin"
 
-#: src/files.c:718 src/rcfile.c:560 src/rcfile.c:1155 src/rcfile.c:1196
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, fuzzy, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" bir aygıt dosyası"
 
-#: src/files.c:817
+#: src/files.c:1060
 #, fuzzy, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Yeni arabelleğe eklenecek dosya [%s 'den]"
 
-#: src/files.c:819
+#: src/files.c:1062
 #, fuzzy, c-format
 msgid "Command to execute [from %s] "
 msgstr "Çalıştırılacak komut"
 
-#: src/files.c:825
+#: src/files.c:1069
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Yeni arabelleğe eklenecek dosya [%s 'den]"
 
-#: src/files.c:827
+#: src/files.c:1071
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Eklenecek dosya [%s tarafından] "
 
-#: src/files.c:1077
+#: src/files.c:1320
 #, fuzzy
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Anahtar çoklu olmayan arabellek kipinde geçersiz"
 
-#: src/files.c:1486
+#: src/files.c:1622
+msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+msgstr ""
+
+#: src/files.c:1746
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "%s dışına yazılamıyor"
 
-#: src/files.c:1501
+#: src/files.c:1761
 msgid "Cannot prepend or append to a symlink with --nofollow set"
 msgstr ""
 
-#: src/files.c:1581 src/files.c:1603 src/files.c:1621 src/files.c:1632
-#: src/files.c:1640 src/files.c:1667
+#: src/files.c:1843 src/files.c:1868 src/files.c:1886 src/files.c:1899
+#: src/files.c:1910 src/files.c:1939
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr ""
 
-#: src/files.c:1582 src/nano.c:701
+#: src/files.c:1844 src/nano.c:719
 #, fuzzy
 msgid "Too many backup files?"
 msgstr ""
 "\n"
 "%s yazılmamış (çok fazla yedek dosyası?)\n"
 
-#: src/files.c:1687 src/files.c:1744 src/files.c:1763 src/files.c:1775
-#: src/files.c:1799 src/files.c:1817 src/files.c:1827 src/files.c:1863
-#: src/files.c:1868 src/files.c:2764 src/files.c:2773
+#: src/files.c:1959 src/files.c:2016 src/files.c:2035 src/files.c:2047
+#: src/files.c:2071 src/files.c:2089 src/files.c:2099 src/files.c:2135
+#: src/files.c:2140 src/files.c:3101 src/files.c:3110 src/files.c:3133
+#: src/files.c:3145
 #, fuzzy, c-format
 msgid "Error writing %s: %s"
 msgstr "Hatalı alıntı dizgesi %s: %s"
 
-#: src/files.c:1721 src/text.c:2929 src/text.c:2941
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr ""
 
-#: src/files.c:1900
+#: src/files.c:2173
 #, fuzzy, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "%d satır yazıldı"
 
-#: src/files.c:2004
+#: src/files.c:2278
 msgid " [DOS Format]"
 msgstr " [DOS Biçimi]"
 
-#: src/files.c:2005
+#: src/files.c:2279
 msgid " [Mac Format]"
 msgstr " [Mac Biçimi]"
 
-#: src/files.c:2007
+#: src/files.c:2281
 msgid " [Backup]"
 msgstr " [Yedek]"
 
-#: src/files.c:2015
+#: src/files.c:2289
 msgid "Prepend Selection to File"
 msgstr "Seçimi Dosyanın Başına Ekle"
 
-#: src/files.c:2016
+#: src/files.c:2290
 msgid "Append Selection to File"
 msgstr "Seçimi Dosyanın Sonuna Ekle"
 
-#: src/files.c:2017
+#: src/files.c:2291
 msgid "Write Selection to File"
 msgstr "Seçimi Dosyaya Yaz"
 
-#: src/files.c:2020
+#: src/files.c:2294
 msgid "File Name to Prepend to"
 msgstr "Başına Eklenecek Dosya Adı"
 
-#: src/files.c:2021
+#: src/files.c:2295
 msgid "File Name to Append to"
 msgstr "Sonuna Eklenecek Dosya Adı"
 
-#: src/files.c:2022
+#: src/files.c:2296
 msgid "File Name to Write"
 msgstr "Yazılacak Dosya Adı"
 
-#: src/files.c:2153
+#: src/files.c:2427
 #, fuzzy
 msgid "File exists, OVERWRITE ? "
 msgstr "Dosya var, ÜSTÜNE YAZILSIN MI?"
 
-#: src/files.c:2162
+#: src/files.c:2436
 msgid "Save file under DIFFERENT NAME ? "
 msgstr ""
 
-#: src/files.c:2173
+#: src/files.c:2450
 msgid "File was modified since you opened it, continue saving ? "
 msgstr ""
 
-#: src/files.c:2611
+#: src/files.c:2882
 msgid "(more)"
 msgstr "(daha)"
 
-#: src/files.c:2694 src/rcfile.c:1220
+#: src/files.c:2974
 #, fuzzy, c-format
 msgid ""
 "\n"
-"Press Enter to continue starting nano.\n"
+"Press Enter to continue\n"
 msgstr ""
 "\n"
 "nano'yu başlatmaya devam etmek için Gir tuşuna basınız\n"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:415 src/prompt.c:1288
-msgid "Cancel"
-msgstr "İptal"
-
-#: src/global.c:416
-msgid "Replace"
-msgstr "Değiştir"
+#: src/files.c:2989
+#, c-format
+msgid ""
+"Unable to create directory %s: %s\n"
+"It is required for saving/loading search history or cursor positions.\n"
+msgstr ""
 
-#: src/global.c:417
-msgid "No Replace"
-msgstr "Değiştirme Yok"
+#: src/files.c:2995
+#, 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/global.c:420
-msgid "Case Sens"
-msgstr "Harf Duyarlı"
+#: src/files.c:3012
+#, 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/global.c:421
-#, fuzzy
-msgid "Backwards"
-msgstr " [Geriye Doğru]"
+#: src/files.c:3016
+#, 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 ""
 
-#: src/global.c:425
-msgid "Regexp"
-msgstr "Düzenli İfade"
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
+#: src/global.c:477
+msgid "Exit"
+msgstr "Çık"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:451
-#, fuzzy
-msgid "PrevHstory"
-msgstr "Geçmiş"
+#: src/global.c:478
+msgid "Close"
+msgstr "Kapat"
 
-#: src/global.c:452
+#: src/global.c:479
 #, fuzzy
-msgid "NextHstory"
-msgstr "Geçmiş"
+msgid "Uncut Text"
+msgstr "Kesmeyi Geri Al"
 
-#: src/global.c:453
+#: src/global.c:481
 #, fuzzy
-msgid "Go To Text"
-msgstr "Satıra Git"
+msgid "Unjustify"
+msgstr "Yaslamayı Geri Al"
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:455
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:485
 #, fuzzy
 msgid "WhereIs Next"
 msgstr "Ara"
 
-#: src/global.c:457
-#, fuzzy
-msgid "First File"
-msgstr "İlk Satır"
-
-#: src/global.c:458
-#, fuzzy
-msgid "Last File"
-msgstr "Son Satır"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:460
-msgid "To Files"
-msgstr "Dosyalara"
-
-#: src/global.c:462
-msgid "DOS Format"
-msgstr "DOS Biçimi"
-
-#: src/global.c:463
-msgid "Mac Format"
-msgstr "Mac Biçimi"
-
-#: src/global.c:464
-msgid "Append"
-msgstr "Sonuna Ekle"
-
-#: src/global.c:465
-msgid "Prepend"
-msgstr "Başına Ekle"
-
-#: src/global.c:466
-msgid "Backup File"
-msgstr "Yedek Dosyası"
-
-#: src/global.c:467
-msgid "Execute Command"
-msgstr "Komut Çalıştır"
-
-#: src/global.c:471
-msgid "Go To Dir"
-msgstr "Dizine Git"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:480
-msgid "Get Help"
-msgstr "Yardım Al"
-
-#: src/global.c:481
-msgid "Exit"
-msgstr "Çık"
-
-#: src/global.c:482
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:492
 msgid "Where Is"
 msgstr "Ara"
 
-#: src/global.c:483
-msgid "Prev Page"
-msgstr "Önceki Sayfa"
-
-#: src/global.c:484
-msgid "Next Page"
-msgstr "Sonraki Sayfa"
-
-#: src/global.c:485
-msgid "First Line"
-msgstr "İlk Satır"
+#: src/global.c:493
+msgid "Replace"
+msgstr "Değiştir"
 
-#: src/global.c:486
-msgid "Last Line"
-msgstr "Son Satır"
+#: src/global.c:494
+msgid "Go To Line"
+msgstr "Satıra Git"
 
-#: src/global.c:487
-msgid "Suspend"
-msgstr "Askıya Al"
+#: src/global.c:495
+#, fuzzy
+msgid "Prev Line"
+msgstr "Önceki Sayfa"
 
-#: src/global.c:489
-msgid "Beg of Par"
-msgstr ""
+#: src/global.c:496
+#, fuzzy
+msgid "Next Line"
+msgstr "Sonraki Dosya"
 
-#: src/global.c:490
-msgid "End of Par"
-msgstr ""
+#: src/global.c:497
+msgid "Read File"
+msgstr "Dosya Oku"
 
-#: src/global.c:491
+#: src/global.c:499
 #, fuzzy
 msgid "FullJstify"
 msgstr "Yasla"
 
-#: src/global.c:493
+#: src/global.c:501
 msgid "Refresh"
 msgstr "Tazele"
 
-#: src/global.c:495
-#, fuzzy
-msgid "Insert File"
-msgstr "Sonraki Dosya"
-
-#: src/global.c:497
-msgid "Go To Line"
-msgstr "Satıra Git"
-
-#: src/global.c:500
+#. 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:507
 msgid "Justify the current paragraph"
 msgstr "Şu anki paragrafı yasla"
 
-#. 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:505
+#: src/global.c:509
 msgid "Cancel the current function"
 msgstr "Yürürlükteki fonksiyonu iptal et"
 
-#: src/global.c:506
+#: src/global.c:510
 msgid "Display this help text"
 msgstr ""
 
-#: src/global.c:509
+#: src/global.c:513
 #, fuzzy
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Yüklenmiş olan dosyayı kapat/nano'dan çık"
 
-#: src/global.c:511
+#: src/global.c:515
 msgid "Exit from nano"
 msgstr "nano'dan çık"
 
-#: src/global.c:515
+#: src/global.c:519
 msgid "Write the current file to disk"
 msgstr "Yürütülmekte olan dosyayı diske yaz"
 
-#: src/global.c:517
+#: src/global.c:521
 msgid "Insert another file into the current one"
 msgstr "Şu anki dosyaya başka bir dosya ekle"
 
-#: src/global.c:519
+#: src/global.c:523
 #, fuzzy
 msgid "Search for a string or a regular expression"
 msgstr "Düzenli ifade kullan"
 
-#: src/global.c:520
-#, fuzzy
-msgid "Go to previous screen"
-msgstr "Önceki ekrana git"
+#: src/global.c:526
+msgid "Search for a string"
+msgstr ""
 
-#: src/global.c:521
-#, fuzzy
-msgid "Go to next screen"
-msgstr "Sonraki ekrana git"
+#: src/global.c:528
+msgid "Go one screenful up"
+msgstr ""
 
-#: src/global.c:523
+#: src/global.c:529
+msgid "Go one screenful down"
+msgstr ""
+
+#: src/global.c:531
 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:525
+#: src/global.c:533
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Şu anki satıra kesim arabelleğini yapıştır"
 
-#: src/global.c:527
+#: src/global.c:534
 #, fuzzy
 msgid "Display the position of the cursor"
 msgstr "İmlecin pozisyonunu göster"
 
-#: src/global.c:529
+#: src/global.c:536
 msgid "Invoke the spell checker, if available"
 msgstr "Yazım denetleyicisini çağır (eğer mümkün ise)"
 
-#: src/global.c:531
+#: src/global.c:538
 #, fuzzy
 msgid "Replace a string or a regular expression"
 msgstr "Düzenli ifade kullan"
 
-#: src/global.c:532
+#: src/global.c:539
 #, fuzzy
 msgid "Go to line and column number"
 msgstr "Satır numarasına git"
 
-#: src/global.c:534
+#: src/global.c:541
 #, fuzzy
-msgid "Mark text at the cursor position"
+msgid "Mark text starting from the cursor position"
 msgstr "İmleç hizasındaki metni işaretle"
 
-#: src/global.c:535
-msgid "Repeat last search"
+#: src/global.c:542
+msgid "Repeat the last search"
 msgstr ""
 
-#: src/global.c:537
+#: src/global.c:544
 #, 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:538
+#: src/global.c:545
 #, fuzzy
 msgid "Indent the current line"
 msgstr "Yürürlükteki dosyanın sonuna ekle"
 
-#: src/global.c:539
+#: src/global.c:546
 #, fuzzy
 msgid "Unindent the current line"
 msgstr "Yürürlükteki dosyanın sonuna ekle"
 
-#: src/global.c:540
+#: src/global.c:547
 msgid "Undo the last operation"
 msgstr ""
 
-#: src/global.c:541
+#: src/global.c:548
 msgid "Redo the last undone operation"
 msgstr ""
 
-#: src/global.c:543
+#: src/global.c:550
 #, fuzzy
 msgid "Go forward one character"
 msgstr "Bir karakter ileri git"
 
-#: src/global.c:544
+#: src/global.c:551
 #, fuzzy
 msgid "Go back one character"
 msgstr "Bir karakter geri gel"
 
-#: src/global.c:546
+#: src/global.c:553
 #, fuzzy
 msgid "Go forward one word"
 msgstr "Bir kelime ileri git"
 
-#: src/global.c:547
+#: src/global.c:554
 #, fuzzy
 msgid "Go back one word"
 msgstr "Bir kelime geriye git"
 
-#: src/global.c:549
+#: src/global.c:556
 #, fuzzy
 msgid "Go to previous line"
 msgstr "Önceki ekrana git"
 
-#: src/global.c:550
+#: src/global.c:557
 #, fuzzy
 msgid "Go to next line"
 msgstr "Bir satır aşağı in"
 
-#: src/global.c:551
+#: src/global.c:558
 #, fuzzy
 msgid "Go to beginning of current line"
 msgstr "Şu anki satırın başına git"
 
-#: src/global.c:552
+#: src/global.c:559
 #, fuzzy
 msgid "Go to end of current line"
 msgstr "Şu anki satırın sonuna git"
 
-#: src/global.c:555
+#: src/global.c:562
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr ""
 
-#: src/global.c:557
+#: src/global.c:564
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr ""
 
-#: src/global.c:560
+#: src/global.c:566
 msgid "Go to the first line of the file"
 msgstr "Dosyanın ilk satırına git"
 
-#: src/global.c:562
+#: src/global.c:567
 msgid "Go to the last line of the file"
 msgstr "Dosyanın son satırına git"
 
-#: src/global.c:564
+#: src/global.c:569
 #, fuzzy
 msgid "Go to the matching bracket"
 msgstr "Eşleşen ayraç yok"
 
-#: src/global.c:566
+#: src/global.c:571
 msgid "Scroll up one line without scrolling the cursor"
 msgstr ""
 
-#: src/global.c:568
+#: src/global.c:573
 msgid "Scroll down one line without scrolling the cursor"
 msgstr ""
 
-#: src/global.c:572
+#: src/global.c:576
 #, fuzzy
 msgid "Switch to the previous file buffer"
 msgstr "Önceki ekrana git"
 
-#: src/global.c:574
+#: src/global.c:577
 msgid "Switch to the next file buffer"
 msgstr ""
 
-#: src/global.c:577
+#: src/global.c:579
 msgid "Insert the next keystroke verbatim"
 msgstr ""
 
-#: src/global.c:579
+#: src/global.c:580
 #, fuzzy
 msgid "Insert a tab at the cursor position"
 msgstr "İmlecin olduğu yerden satır başı yap"
@@ -664,353 +637,469 @@ msgstr "İmlecin olduğu yerden satır başı yap"
 msgid "Insert a newline at the cursor position"
 msgstr "İmlecin olduğu yerden satır başı yap"
 
-#: src/global.c:583
+#: src/global.c:582
 msgid "Delete the character under the cursor"
 msgstr "İmlecin altındaki karakteri sil"
 
-#: src/global.c:585
+#: src/global.c:584
 msgid "Delete the character to the left of the cursor"
 msgstr "İmlecin solundaki karakteri sil"
 
-#: src/global.c:588
+#: src/global.c:587
 #, 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:591
+#: src/global.c:590
 #, fuzzy
 msgid "Justify the entire file"
 msgstr "Şu anki paragrafı yasla"
 
-#: src/global.c:595
+#: src/global.c:594
 msgid "Count the number of words, lines, and characters"
 msgstr ""
 
-#: src/global.c:598
+#: src/global.c:597
 msgid "Refresh (redraw) the current screen"
 msgstr "Şu anki ekranı tazele (yeniden çiz)"
 
-#: src/global.c:600
+#: src/global.c:599
 msgid "Suspend the editor (if suspend is enabled)"
 msgstr ""
 
-#: src/global.c:603
+#: src/global.c:602
 msgid "Toggle the case sensitivity of the search"
 msgstr ""
 
-#: src/global.c:605
+#: src/global.c:604
 #, fuzzy
 msgid "Reverse the direction of the search"
 msgstr "İmlecin pozisyonunu göster"
 
-#: src/global.c:609
+#: src/global.c:608
 #, fuzzy
 msgid "Toggle the use of regular expressions"
 msgstr "Düzenli ifade kullan"
 
-#: src/global.c:613
+#: src/global.c:612
 #, fuzzy
 msgid "Recall the previous search/replace string"
 msgstr "Önceki arama/değiştirme dizgisini düzenle"
 
-#: src/global.c:615
+#: src/global.c:614
 #, fuzzy
 msgid "Recall the next search/replace string"
 msgstr "Önceki arama/değiştirme dizgisini düzenle"
 
-#: src/global.c:618
+#: src/global.c:617
 msgid "Go to file browser"
 msgstr "Dosya tarayıcısına git"
 
-#: src/global.c:621
+#: src/global.c:620
 #, fuzzy
 msgid "Toggle the use of DOS format"
 msgstr "Dosyayı DOS biçiminde yaz"
 
-#: src/global.c:622
+#: src/global.c:621
 #, fuzzy
 msgid "Toggle the use of Mac format"
 msgstr "Dosyayı Mac biçiminde yaz"
 
-#: src/global.c:624
+#: src/global.c:622
 msgid "Toggle appending"
 msgstr ""
 
-#: src/global.c:625
+#: src/global.c:623
 msgid "Toggle prepending"
 msgstr ""
 
-#: src/global.c:628
+#: src/global.c:624
 msgid "Toggle backing up of the original file"
 msgstr ""
 
-#: src/global.c:629
+#: src/global.c:625
 msgid "Execute external command"
 msgstr "Harici komut çalıştır"
 
-#: src/global.c:633
+#: src/global.c:628
 #, fuzzy
 msgid "Toggle the use of a new buffer"
 msgstr "Yeni arabelleğe girişi aç/kapa"
 
-#: src/global.c:636
+#: src/global.c:631
 #, fuzzy
 msgid "Exit from the file browser"
 msgstr "Dosya tarayıcısına git"
 
-#: src/global.c:638
+#: src/global.c:632
 #, fuzzy
 msgid "Go to the first file in the list"
 msgstr "Dosyanın ilk satırına git"
 
-#: src/global.c:640
+#: src/global.c:633
 #, fuzzy
 msgid "Go to the last file in the list"
 msgstr "Dosyanın son satırına git"
 
-#: src/global.c:641
+#: src/global.c:634
+#, fuzzy
+msgid "Go to the previous file in the list"
+msgstr "Dosyanın ilk satırına git"
+
+#: src/global.c:635
 #, fuzzy
 msgid "Go to the next file in the list"
 msgstr "Dosyanın son satırına git"
 
+#: src/global.c:636
+msgid "Go to directory"
+msgstr "Dizine git"
+
+#: src/global.c:639
+#, fuzzy
+msgid "Invoke the linter, if available"
+msgstr "Yazım denetleyicisini çağır (eğer mümkün ise)"
+
+#: src/global.c:640
+#, fuzzy
+msgid "Go to previous linter msg"
+msgstr "Satır numarasına git"
+
+#: src/global.c:641
+msgid "Go to next linter msg"
+msgstr ""
+
 #: src/global.c:642
 #, fuzzy
-msgid "Go to the previous file in the list"
-msgstr "Dosyanın ilk satırına git"
+msgid "Invoke formatter, if available"
+msgstr "Yazım denetleyicisini çağır (eğer mümkün ise)"
 
-#: src/global.c:643
-msgid "Go to directory"
-msgstr "Dizine git"
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:662
+msgid "Get Help"
+msgstr "Yardım Al"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:670
-msgid "Close"
-msgstr "Kapat"
+#: src/global.c:665 src/prompt.c:1084
+msgid "Cancel"
+msgstr "İptal"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:679
-msgid "WriteOut"
+#: src/global.c:678
+#, fuzzy
+msgid "Write Out"
 msgstr "Yaz"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:704
+msgid "Go To Dir"
+msgstr "Dizine Git"
+
+#: src/global.c:719
+msgid "Cut Text"
+msgstr "Metni Kes"
+
+#: src/global.c:728
 msgid "Justify"
 msgstr "Yasla"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:696
-msgid "Read File"
-msgstr "Dosya Oku"
+#: src/global.c:733
+msgid "To Spell"
+msgstr "Denetime"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:713
-msgid "Cut Text"
-msgstr "Metni Kes"
+#: src/global.c:738
+#, fuzzy
+msgid "To Linter"
+msgstr "Satıra Git"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:718
-msgid "UnJustify"
-msgstr "Yaslamayı Geri Al"
+#: src/global.c:740
+#, fuzzy
+msgid "Formatter"
+msgstr "DOS Biçimi"
+
+#: src/global.c:745
+msgid "Case Sens"
+msgstr "Harf Duyarlı"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:723
+#: src/global.c:750
+msgid "Regexp"
+msgstr "Düzenli İfade"
+
+#: src/global.c:755
 #, fuzzy
-msgid "UnCut Text"
-msgstr "Kesmeyi Geri Al"
+msgid "Backwards"
+msgstr " [Geriye Doğru]"
+
+#: src/global.c:762
+msgid "No Replace"
+msgstr "Değiştirme Yok"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:728 src/global.c:755
+#: src/global.c:770
 msgid "Cur Pos"
 msgstr "İmleç Pozisyonu"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:737
-msgid "To Spell"
-msgstr "Denetime"
+#: src/global.c:780
+msgid "Prev Page"
+msgstr "Önceki Sayfa"
 
-#: src/global.c:771
+#: src/global.c:782
+msgid "Next Page"
+msgstr "Sonraki Sayfa"
+
+#: src/global.c:785
+msgid "First Line"
+msgstr "İlk Satır"
+
+#: src/global.c:787
+msgid "Last Line"
+msgstr "Son Satır"
+
+#: src/global.c:794
+#, fuzzy
+msgid "To Bracket"
+msgstr "Ayraç değil"
+
+#: src/global.c:797
 msgid "Mark Text"
 msgstr "Metni İşaretle"
 
-#: src/global.c:777
+#: src/global.c:800
 #, fuzzy
 msgid "Copy Text"
 msgstr "Metni Kes"
 
-#: src/global.c:780
+#: src/global.c:803
 #, fuzzy
 msgid "Indent Text"
 msgstr "Metni Kes"
 
-#: src/global.c:783
-#, fuzzy
+#: src/global.c:805
 msgid "Unindent Text"
-msgstr "Kesmeyi Geri Al"
+msgstr ""
 
-#: src/global.c:787
+#: src/global.c:808
 msgid "Undo"
 msgstr ""
 
-#: src/global.c:790
+#: src/global.c:810
 msgid "Redo"
 msgstr ""
 
-#: src/global.c:796 src/global.c:800
-msgid "Forward"
-msgstr "İleri"
-
-#: src/global.c:806 src/global.c:810
+#: src/global.c:814 src/global.c:820
 msgid "Back"
 msgstr "Geri"
 
-#: src/global.c:817
-msgid "Next Word"
-msgstr "Sonraki Kelime"
+#: src/global.c:816 src/global.c:822
+msgid "Forward"
+msgstr "İleri"
 
-#: src/global.c:820
+#: src/global.c:827
 msgid "Prev Word"
 msgstr "Önceki Kelime"
 
-#: src/global.c:824
-#, fuzzy
-msgid "Prev Line"
-msgstr "Önceki Sayfa"
-
-#: src/global.c:827
-#, fuzzy
-msgid "Next Line"
-msgstr "Sonraki Dosya"
+#: src/global.c:829
+msgid "Next Word"
+msgstr "Sonraki Kelime"
 
-#: src/global.c:830
+#: src/global.c:833
 msgid "Home"
 msgstr "Ev"
 
-#: src/global.c:833
+#: src/global.c:835
 msgid "End"
 msgstr "Son"
 
-#: src/global.c:845
-msgid "Find Other Bracket"
-msgstr "Diğer Köşeli Ayracı Bul"
+#: src/global.c:844
+msgid "Beg of Par"
+msgstr ""
 
-#: src/global.c:848
-msgid "Scroll Up"
+#: src/global.c:846
+msgid "End of Par"
 msgstr ""
 
 #: src/global.c:851
+msgid "Scroll Up"
+msgstr ""
+
+#: src/global.c:853
 msgid "Scroll Down"
 msgstr ""
 
-#: src/global.c:856
-msgid "Previous File"
+#: src/global.c:858
+#, fuzzy
+msgid "Prev File"
 msgstr "Önceki Dosya"
 
-#: src/global.c:858
+#: src/global.c:860
 msgid "Next File"
 msgstr "Sonraki Dosya"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:862 src/text.c:3045
-msgid "Verbatim Input"
+#: src/global.c:869
+msgid "Verbatim"
 msgstr ""
 
-#: src/global.c:867
+#: src/global.c:872
 msgid "Tab"
 msgstr "Sekme (TAB)"
 
-#: src/global.c:870
+#: src/global.c:874
 msgid "Enter"
 msgstr "Gir Tuşu (Enter)"
 
-#: src/global.c:873
+#: src/global.c:876
 msgid "Delete"
 msgstr "Sil"
 
-#: src/global.c:876
+#: src/global.c:878
 msgid "Backspace"
 msgstr "Geri tuşu"
 
-#: src/global.c:893
+#: src/global.c:888
 msgid "CutTillEnd"
 msgstr ""
 
-#: src/global.c:906
+#: src/global.c:898
 msgid "Word Count"
 msgstr ""
 
-#: src/global.c:1367
+#: src/global.c:905
+msgid "Suspend"
+msgstr "Askıya Al"
+
+#: src/global.c:910
+#, fuzzy
+msgid "PrevHstory"
+msgstr "Geçmiş"
+
+#: src/global.c:913
+#, fuzzy
+msgid "NextHstory"
+msgstr "Geçmiş"
+
+#: src/global.c:917
+#, fuzzy
+msgid "Go To Text"
+msgstr "Satıra Git"
+
+#: src/global.c:928
+msgid "DOS Format"
+msgstr "DOS Biçimi"
+
+#: src/global.c:931
+msgid "Mac Format"
+msgstr "Mac Biçimi"
+
+#: src/global.c:934
+msgid "Append"
+msgstr "Sonuna Ekle"
+
+#: src/global.c:936
+msgid "Prepend"
+msgstr "Başına Ekle"
+
+#: src/global.c:939
+msgid "Backup File"
+msgstr "Yedek Dosyası"
+
+#: src/global.c:946
+msgid "Execute Command"
+msgstr "Komut Çalıştır"
+
+#: src/global.c:961
+msgid "To Files"
+msgstr "Dosyalara"
+
+#: src/global.c:964
+#, fuzzy
+msgid "First File"
+msgstr "İlk Satır"
+
+#: src/global.c:966
+#, fuzzy
+msgid "Last File"
+msgstr "Son Satır"
+
+#: src/global.c:977
+msgid "Prev Lint Msg"
+msgstr ""
+
+#: src/global.c:979
+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:1227
 msgid "Help mode"
 msgstr "Yardım Kipi"
 
-#: src/global.c:1369
+#: src/global.c:1229
 #, fuzzy
 msgid "Constant cursor position display"
 msgstr "Sabit imleç pozisyonu"
 
-#: src/global.c:1371
+#: src/global.c:1231
 msgid "Use of one more line for editing"
 msgstr ""
 
-#: src/global.c:1373
+#: src/global.c:1233
 msgid "Smooth scrolling"
 msgstr "Yumuşak kaydırma"
 
-#: src/global.c:1375
+#: src/global.c:1235
+#, fuzzy
+msgid "Soft wrapping of overlong lines"
+msgstr "Uzun satırları kaydırma"
+
+#: src/global.c:1237
 msgid "Whitespace display"
 msgstr ""
 
-#: src/global.c:1377
+#: src/global.c:1239
 msgid "Color syntax highlighting"
 msgstr "Renkli sözdizimi vurgusu"
 
-#: src/global.c:1379
+#: src/global.c:1241
 msgid "Smart home key"
 msgstr ""
 
-#: src/global.c:1381
+#: src/global.c:1243
 msgid "Auto indent"
 msgstr "Otomatik hizala"
 
-#: src/global.c:1383
+#: src/global.c:1245
 msgid "Cut to end"
 msgstr "Sonuna kes"
 
-#: src/global.c:1385
-msgid "Long line wrapping"
-msgstr ""
+#: src/global.c:1247
+#, fuzzy
+msgid "Hard wrapping of overlong lines"
+msgstr "Uzun satırları kaydırma"
 
-#: src/global.c:1387
+#: src/global.c:1249
 msgid "Conversion of typed tabs to spaces"
 msgstr ""
 
-#: src/global.c:1389
+#: src/global.c:1251
 #, fuzzy
 msgid "Backup files"
 msgstr "Yedek Dosyası"
 
-#: src/global.c:1391
+#: src/global.c:1253
 msgid "Multiple file buffers"
 msgstr "Dosya arabelleklerini çokla"
 
-#: src/global.c:1393
+#: src/global.c:1255
 msgid "Mouse support"
 msgstr "Fare Desteği"
 
-#: src/global.c:1395
+#: src/global.c:1257
 msgid "No conversion from DOS/Mac format"
 msgstr "DOS/Mac biçimi ile ilgili bir şey yok"
 
-#: src/global.c:1397
+#: src/global.c:1259
 #, fuzzy
 msgid "Suspension"
 msgstr "Askıya Al"
 
-#: src/global.c:1399
-msgid "Soft line wrapping"
-msgstr ""
-
-#: src/help.c:236
+#: src/help.c:205
 #, fuzzy
 msgid ""
 "Search Command Help Text\n"
@@ -1037,7 +1126,7 @@ msgstr ""
 " Arama kipinde aşağıdaki anahtarlardan yararlanabilirsiniz:\n"
 "\n"
 
-#: src/help.c:245
+#: src/help.c:214
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1046,7 +1135,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:251
+#: src/help.c:220
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1066,7 +1155,7 @@ msgstr ""
 " Satıra Git kipinde aşağıdaki anahtarlardan yararlanabilirsiniz:\n"
 "\n"
 
-#: src/help.c:260
+#: src/help.c:229
 #, fuzzy
 msgid ""
 "Insert File Help Text\n"
@@ -1097,7 +1186,7 @@ msgstr ""
 " Dosya Ekle kipinde aşağıdaki anahtarlardan yararlanabilirsiniz:\n"
 "\n"
 
-#: src/help.c:269
+#: src/help.c:238
 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"
@@ -1106,7 +1195,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:275
+#: src/help.c:244
 #, fuzzy
 msgid ""
 "Write File Help Text\n"
@@ -1136,7 +1225,7 @@ msgstr ""
 " Dosyayı Yaz kipinde aşağıdaki anahtarlardan yararlanabilirsiniz:\n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:258
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1161,7 +1250,7 @@ msgstr ""
 " Dosya Tarayıcısı kipinde aşağıdaki anahtarlardan yararlanabilirsiniz:\n"
 "\n"
 
-#: src/help.c:302
+#: src/help.c:271
 #, fuzzy
 msgid ""
 "Browser Search Command Help Text\n"
@@ -1189,13 +1278,13 @@ msgstr ""
 " Arama kipinde aşağıdaki anahtarlardan yararlanabilirsiniz:\n"
 "\n"
 
-#: src/help.c:311
+#: src/help.c:280
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
 msgstr ""
 
-#: src/help.c:315
+#: src/help.c:284
 #, fuzzy
 msgid ""
 "Browser Go To Directory Help Text\n"
@@ -1218,7 +1307,7 @@ msgstr ""
 " Tarayıcı Dizine Git kipinde aşağıdaki anahtarlardan yararlanabilirsiniz:\n"
 "\n"
 
-#: src/help.c:328
+#: src/help.c:297
 #, fuzzy
 msgid ""
 "Spell Check Help Text\n"
@@ -1242,7 +1331,7 @@ msgstr ""
 " Yazım Denetimi kipinde aşağıdaki anahtarlardan yararlanabilirsiniz:\n"
 "\n"
 
-#: src/help.c:343
+#: src/help.c:312
 #, fuzzy
 msgid ""
 "Execute Command Help Text\n"
@@ -1263,7 +1352,7 @@ msgstr ""
 " Harici Komut kipinde aşağıdaki anahtarlardan yararlanabilirsiniz:\n"
 "\n"
 
-#: src/help.c:356
+#: src/help.c:325
 #, fuzzy
 msgid ""
 "Main nano help text\n"
@@ -1294,7 +1383,7 @@ msgstr ""
 "kullanılabilir.  Alternatif tuşlar parantez içinde gösterilmişlerdir:\n"
 "\n"
 
-#: src/help.c:366
+#: src/help.c:335
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1305,7 +1394,7 @@ msgid ""
 "Alt, or Meta key depending on your keyboard setup.  "
 msgstr ""
 
-#: src/help.c:375
+#: src/help.c:344
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1314,16 +1403,16 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:376 src/help.c:448
 msgid "enable/disable"
 msgstr "etkin/etkisiz"
 
-#: src/nano.c:587
+#: src/nano.c:601
 #, fuzzy
 msgid "Key invalid in view mode"
 msgstr "GÖSTER kipi için geçersiz anahtar"
 
-#: src/nano.c:695
+#: src/nano.c:713
 #, c-format
 msgid ""
 "\n"
@@ -1332,7 +1421,7 @@ msgstr ""
 "\n"
 "Arabellek %s olarak yazıldı\n"
 
-#: src/nano.c:697
+#: src/nano.c:715
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -1341,7 +1430,7 @@ msgstr ""
 "\n"
 "Arabellek %s olarak yazıldı\n"
 
-#: src/nano.c:700
+#: src/nano.c:718
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -1350,287 +1439,292 @@ msgstr ""
 "\n"
 "Arabellek %s olarak yazıldı\n"
 
-#: src/nano.c:723
+#: src/nano.c:743
 msgid "Window size is too small for nano...\n"
 msgstr "Pencere boyutu nano için çok küçük...\n"
 
-#: src/nano.c:816
+#: src/nano.c:836
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
 "\n"
 msgstr ""
 
-#: src/nano.c:819
+#: src/nano.c:839
 #, fuzzy, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Seçenek\t\tUzun Seçenek\t\tAnlamı\n"
 
-#: src/nano.c:821
+#: src/nano.c:841
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Seçenek\t\tAnlamı\n"
 
-#: src/nano.c:824
-msgid "Show this message"
-msgstr "Bu mesajı gösterir"
-
-#: src/nano.c:825
+#: src/nano.c:844
 msgid "+LINE,COLUMN"
 msgstr ""
 
-#: src/nano.c:826
+#. TRANSLATORS: The next forty or so strings are option descriptions
+#. * for the --help output.  Try to keep them at most 40 characters.
+#: src/nano.c:847
 #, fuzzy
 msgid "Start at line LINE, column COLUMN"
 msgstr "LINE satır numarasından başla"
 
-#: src/nano.c:828
+#: src/nano.c:849
 #, fuzzy
 msgid "Enable smart home key"
 msgstr "Fare etkin"
 
-#: src/nano.c:829
+#: src/nano.c:850
 #, fuzzy
 msgid "Save backups of existing files"
 msgstr "Kaydetme anında varolan dosyaların yedeğini al"
 
-#: src/nano.c:830
-#, fuzzy
+#: src/nano.c:851
 msgid "-C <dir>"
-msgstr "-o [dizin]"
+msgstr ""
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "--backupdir=<dir>"
 msgstr ""
 
-#: src/nano.c:831
+#: src/nano.c:852
 msgid "Directory for saving unique backup files"
 msgstr ""
 
-#: src/nano.c:834
+#: src/nano.c:855
 msgid "Use bold instead of reverse video text"
 msgstr ""
 
-#: src/nano.c:837
+#: src/nano.c:858
 msgid "Convert typed tabs to spaces"
 msgstr ""
 
-#: src/nano.c:840
+#: src/nano.c:861
 msgid "Enable multiple file buffers"
 msgstr "Çoklu dosya arabelleği aktif"
 
-#: src/nano.c:845
+#: src/nano.c:865
+msgid "Use (vim-style) lock files"
+msgstr ""
+
+#: src/nano.c:869
 msgid "Log & read search/replace string history"
 msgstr "Metin arama/değiştirme geçmişini oku ve günlükle."
 
-#: src/nano.c:848
+#: src/nano.c:873
 msgid "Don't look at nanorc files"
 msgstr "nanorc dosyalarına bakma"
 
-#: src/nano.c:851
+#: src/nano.c:876
 msgid "Fix numeric keypad key confusion problem"
 msgstr ""
 
-#: src/nano.c:853
+#: src/nano.c:878
 msgid "Don't add newlines to the ends of files"
 msgstr ""
 
-#: src/nano.c:856
+#: src/nano.c:881
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Dosyalaro DOS/Mac biçiminden dönüştürme"
 
-#: src/nano.c:858
+#: src/nano.c:883
 msgid "Use one more line for editing"
 msgstr ""
 
-#: src/nano.c:860
+#: src/nano.c:886
 #, fuzzy
+msgid "Log & read location of cursor position"
+msgstr "Sabit imleç pozisyonu"
+
+#: src/nano.c:889
 msgid "-Q <str>"
-msgstr "-Q [metin]"
+msgstr ""
 
-#: src/nano.c:860
+#: src/nano.c:889
 #, fuzzy
 msgid "--quotestr=<str>"
 msgstr "--quotestr=[metin]"
 
-#: src/nano.c:861
+#: src/nano.c:890
 #, fuzzy
 msgid "Quoting string"
 msgstr "Alıntı dizgesi, öntanımlı \"> \""
 
-#: src/nano.c:863
+#: src/nano.c:892
 msgid "Restricted mode"
 msgstr ""
 
-#: src/nano.c:866
+#: src/nano.c:895
 msgid "Scroll by line instead of half-screen"
 msgstr ""
 
-#: src/nano.c:868
+#: src/nano.c:897
 #, fuzzy
 msgid "-T <#cols>"
 msgstr "-r [#cols]"
 
-#: src/nano.c:868
+#: src/nano.c:897
 #, fuzzy
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=[sayı]"
 
-#: src/nano.c:869
+#: src/nano.c:898
 #, fuzzy
 msgid "Set width of a tab to #cols columns"
 msgstr "Sekmenin genişliğini numaraya ayarla"
 
-#: src/nano.c:871
+#: src/nano.c:900
 msgid "Do quick statusbar blanking"
 msgstr ""
 
-#: src/nano.c:874
+#: src/nano.c:903
 msgid "Print version information and exit"
 msgstr "Sürüm bilgisini yaz ve çık"
 
-#: src/nano.c:877
+#: src/nano.c:906
 msgid "Detect word boundaries more accurately"
 msgstr ""
 
-#: src/nano.c:880
-#, fuzzy
+#: src/nano.c:909
 msgid "-Y <str>"
-msgstr "-Y [metin]"
+msgstr ""
 
-#: src/nano.c:880
+#: src/nano.c:909
 #, fuzzy
 msgid "--syntax=<str>"
 msgstr "--syntax [metin]"
 
-#: src/nano.c:881
+#: src/nano.c:910
 #, fuzzy
 msgid "Syntax definition to use for coloring"
 msgstr "Kullanılacak sözdizim tanımlaması"
 
-#: src/nano.c:883
+#: src/nano.c:912
 msgid "Constantly show cursor position"
 msgstr "İmleç pozisyonunu daimi göster"
 
-#: src/nano.c:885
+#: src/nano.c:914
 msgid "Fix Backspace/Delete confusion problem"
 msgstr ""
 
-#: src/nano.c:888
+#: src/nano.c:915
+#, fuzzy
+msgid "Show this help text"
+msgstr "Bu mesajı gösterir"
+
+#: src/nano.c:918
 msgid "Automatically indent new lines"
 msgstr "Yeni satırlarda otomatik paragraf başı yap"
 
-#: src/nano.c:889
+#: src/nano.c:919
 #, fuzzy
 msgid "Cut from cursor to end of line"
 msgstr ""
 "^K komutunun, imleç pozisyonundan satırın sonuna dek kesmesine izin ver"
 
-#: src/nano.c:892
+#: src/nano.c:922
 msgid "Don't follow symbolic links, overwrite"
 msgstr "Simgesel bağları takip etme, üzerine yaz"
 
-#: src/nano.c:894
+#: src/nano.c:924
 #, fuzzy
 msgid "Enable the use of the mouse"
 msgstr "Fare etkin"
 
-#: src/nano.c:897
-#, fuzzy
+#: src/nano.c:926
+msgid "Do not read the file (only write it)"
+msgstr ""
+
+#: src/nano.c:928
 msgid "-o <dir>"
-msgstr "-o [dizin]"
+msgstr ""
 
-#: src/nano.c:897
+#: src/nano.c:928
 #, fuzzy
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=[dizin]"
 
-#: src/nano.c:898
+#: src/nano.c:929
 msgid "Set operating directory"
 msgstr "Çalışma dizinini belirle"
 
-#: src/nano.c:901
+#: src/nano.c:932
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "XON (^Q) ve XOFF (^S) tuşlarını sakla"
 
-#: src/nano.c:903
+#: src/nano.c:935
 msgid "Silently ignore startup issues like rc file errors"
 msgstr ""
 
-#: src/nano.c:905
+#: src/nano.c:938
 #, fuzzy
 msgid "-r <#cols>"
 msgstr "-r [#cols]"
 
-#: src/nano.c:905
+#: src/nano.c:938
 #, fuzzy
 msgid "--fill=<#cols>"
 msgstr "--fill=[#cols]"
 
-#: src/nano.c:906
-msgid "Set wrapping point at column #cols"
+#: src/nano.c:939
+msgid "Set hard-wrapping point at column #cols"
 msgstr ""
 
-#: src/nano.c:909
+#: src/nano.c:942
 #, fuzzy
 msgid "-s <prog>"
 msgstr "-s [prog]"
 
-#: src/nano.c:909
+#: src/nano.c:942
 #, fuzzy
 msgid "--speller=<prog>"
 msgstr "--speller=[prog]"
 
-#: src/nano.c:910
+#: src/nano.c:943
 msgid "Enable alternate speller"
 msgstr "Alternatif yazım kontrolcüsü etkin"
 
-#: src/nano.c:913
+#: src/nano.c:946
 msgid "Auto save on exit, don't prompt"
 msgstr "Çıkışta sormaksızın otomatik kaydet"
 
-#: src/nano.c:915
-msgid "Allow generic undo [EXPERIMENTAL]"
-msgstr ""
-
-#: src/nano.c:918
+#: src/nano.c:947
 #, fuzzy
 msgid "View mode (read-only)"
 msgstr "Göster (sadece okunur) kipi"
 
-#: src/nano.c:920
-msgid "Don't wrap long lines"
+#: src/nano.c:949
+#, fuzzy
+msgid "Don't hard-wrap long lines"
 msgstr "Uzun satırları kaydırma"
 
-#: src/nano.c:922
+#: src/nano.c:951
 #, fuzzy
 msgid "Don't show the two help lines"
 msgstr "Yardım penceresini gösterme"
 
-#: src/nano.c:923
+#: src/nano.c:952
 #, fuzzy
 msgid "Enable suspension"
 msgstr "Askıya almayı etkinleştir"
 
-#: src/nano.c:924
+#: src/nano.c:954
 msgid "Enable soft line wrapping"
 msgstr ""
 
-#: src/nano.c:928
-msgid "(ignored, for Pico compatibility)"
-msgstr "(Pico uyumluluğu için yoksayıldı)"
-
-#: src/nano.c:938
-#, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
+#: src/nano.c:963
+#, fuzzy, c-format
+msgid " GNU nano, version %s\n"
 msgstr " GNU nano sürüm numarası: %s (%s, %s tarihinde derlendi)\n"
 
-#: src/nano.c:943
+#: src/nano.c:966
 #, 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:944
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1639,159 +1733,183 @@ msgstr ""
 "\n"
 " Derleme seçenekleri:"
 
-#: src/nano.c:1022
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr "Özür dileriz, bu işlev için destek etkisiz kılınmış"
 
-#: src/nano.c:1044
+#: src/nano.c:1125
+msgid "No file name"
+msgstr ""
+
+#: src/nano.c:1136
 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) ? "
 
-#: src/nano.c:1088
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr ""
 
-#: src/nano.c:1114
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr ""
 
-#: src/nano.c:1182
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "SIGHUP ya da SIGTERM sinyali alındı\n"
 
-#: src/nano.c:1204
+#: src/nano.c:1301
 #, 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:1386
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "etkin"
 
-#: src/nano.c:1387
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "etkisiz"
 
-#: src/nano.c:1548 src/winio.c:1256
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr ""
 
-#: src/nano.c:1674
+#: src/nano.c:1747
 #, fuzzy
 msgid "XON ignored, mumble mumble"
 msgstr "XON yoksayıldı."
 
-#: src/nano.c:1679
+#: src/nano.c:1752
 #, fuzzy
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF yoksayıldı."
 
-#: src/nano.c:2209 src/rcfile.c:1100
+#: src/nano.c:2310 src/rcfile.c:1325
 #, fuzzy, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "istenen Tab değeri %d geçerli değil"
 
-#: src/nano.c:2268 src/rcfile.c:1025
+#: src/nano.c:2374 src/rcfile.c:1250
 #, fuzzy, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "istenen doldurma değeri %d geçerli değil"
 
+#: src/nano.c:2415
+#, c-format
+msgid "Type '%s -h' for a list of available options.\n"
+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:1259
+#: src/prompt.c:1055
 msgid "Yy"
 msgstr "Ee"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1056
 msgid "Nn"
 msgstr "Hh"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1057
 msgid "Aa"
 msgstr "Tt"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1071
 msgid "Yes"
 msgstr "Evet"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1076
 msgid "All"
 msgstr "Tümü"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1081
 msgid "No"
 msgstr "Hayır"
 
-#: src/rcfile.c:130
+#: src/rcfile.c:137
 #, fuzzy, c-format
 msgid "Error in %s on line %lu: "
 msgstr "%s'nin %d. satırında hata: "
 
-#: src/rcfile.c:185
+#: src/rcfile.c:196
 #, fuzzy, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "%s argümanında sonlanmamış \" var"
 
-#: src/rcfile.c:212 src/rcfile.c:264 src/rcfile.c:711 src/rcfile.c:768
-#: src/rcfile.c:821
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 #, 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:238 src/search.c:62
+#: src/rcfile.c:249 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "\"%s\" yanlış bir düzenli ifade: %s"
 
-#: src/rcfile.c:258
+#: src/rcfile.c:269
 msgid "Missing syntax name"
 msgstr "Sözdizim ismi eksik"
 
-#: src/rcfile.c:316
+#: src/rcfile.c:340
 msgid "The \"none\" syntax is reserved"
 msgstr ""
 
-#: src/rcfile.c:323
+#: src/rcfile.c:347
 msgid "The \"default\" syntax must take no extensions"
 msgstr ""
 
-#: src/rcfile.c:386 src/rcfile.c:483
+#: src/rcfile.c:433
 #, fuzzy
 msgid "Missing key name"
 msgstr "Sözdizim ismi eksik"
 
-#: src/rcfile.c:398 src/rcfile.c:499
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
+#: src/rcfile.c:442 src/rcfile.c:453
+msgid "Key name is too short"
 msgstr ""
 
-#: src/rcfile.c:407
-msgid "Must specify function to bind key to"
+#: src/rcfile.c:463
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr ""
 
-#: src/rcfile.c:418 src/rcfile.c:510
-msgid "Must specify menu to bind key to (or \"all\")"
+#: src/rcfile.c:472
+msgid "Must specify a function to bind the key to"
 msgstr ""
 
-#: src/rcfile.c:426
-#, fuzzy, c-format
-msgid "Could not map name \"%s\" to a function"
-msgstr "%s yazmak için açılamadı: %s"
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:482
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
+msgstr ""
 
-#: src/rcfile.c:432 src/rcfile.c:517
-#, fuzzy, c-format
-msgid "Could not map name \"%s\" to a menu"
-msgstr "\"%s\" çağırılamadı"
+#: src/rcfile.c:489
+#, c-format
+msgid "Cannot map name \"%s\" to a function"
+msgstr ""
+
+#: src/rcfile.c:496
+#, c-format
+msgid "Cannot map name \"%s\" to a menu"
+msgstr ""
+
+#: src/rcfile.c:528
+#, c-format
+msgid "Function '%s' does not exist in menu '%s'"
+msgstr ""
 
-#: src/rcfile.c:454
+#: src/rcfile.c:543
 #, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
+msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr ""
 
-#: src/rcfile.c:625
+#: src/rcfile.c:629
+#, c-format
+msgid "Error expanding %s: %s"
+msgstr ""
+
+#: src/rcfile.c:672
 #, fuzzy, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1805,137 +1923,197 @@ msgstr ""
 "\"white\", \"yellow\", \"cyan\", \"magenta\" ve \n"
 "\"black\", seçimli \"bright\" ön eki ile.\n"
 
-#: src/rcfile.c:647
+#: src/rcfile.c:694
 #, 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:652
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "Renk ismi eksik"
 
-#: src/rcfile.c:672
-#, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr ""
-
-#: src/rcfile.c:690 src/rcfile.c:809
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr ""
 
-#: src/rcfile.c:762
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\", \"end=\"e ihtiyaç duyar."
 
-#: src/rcfile.c:804
+#: src/rcfile.c:837
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr ""
+
+#: src/rcfile.c:865
 #, 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:874
+#: src/rcfile.c:921
+#, 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:926
+#, 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:1010
+#, fuzzy
+msgid "Cannot add formatter without a syntax command"
+msgstr "Sözdizimi satırı olmaksızın renk direktifi eklenemez"
+
+#: src/rcfile.c:1015
+msgid "Missing formatter command"
+msgstr ""
+
+#: src/rcfile.c:1045
 #, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
+msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr ""
 
-#: src/rcfile.c:876
+#: src/rcfile.c:1047
+#, c-format
 msgid ""
-"Exiting.  Please use nano with the -I option if needed to adjust your nanorc "
-"settings\n"
+"If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
 
-#: src/rcfile.c:926 src/rcfile.c:935 src/rcfile.c:945
+#: src/rcfile.c:1108
+#, 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:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr ""
 
-#: src/rcfile.c:951 src/rcfile.c:1128
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr ""
 
-#: src/rcfile.c:966
+#: src/rcfile.c:1171
 #, fuzzy, c-format
 msgid "Command \"%s\" not understood"
 msgstr "%s komutu anlaşılamadı"
 
-#: src/rcfile.c:972
+#: src/rcfile.c:1186
 #, fuzzy
-msgid "Missing flag"
+msgid "Missing option"
 msgstr "Renk ismi eksik"
 
-#: src/rcfile.c:994
+#: src/rcfile.c:1208
 #, 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:1012
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr ""
 
-#: src/rcfile.c:1038 src/rcfile.c:1066 src/rcfile.c:1075
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr ""
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr ""
 
-#: src/rcfile.c:1114
+#: src/rcfile.c:1339
 #, fuzzy, c-format
-msgid "Cannot unset flag \"%s\""
-msgstr "%d bayrağı boşaltıldı!\n"
+msgid "Cannot unset option \"%s\""
+msgstr "Üst pencere yeniden boyutlandırılamaz"
 
-#: src/rcfile.c:1123
+#: src/rcfile.c:1345
 #, c-format
-msgid "Unknown flag \"%s\""
+msgid "Unknown option \"%s\""
 msgstr ""
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr "Ev dizinimi bulamıyorum!"
 
+#: src/rcfile.c:1442
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Press Enter to continue starting nano.\n"
+msgstr ""
+"\n"
+"nano'yu başlatmaya devam etmek için Gir tuşuna basınız\n"
+
 #: src/search.c:96
 #, fuzzy, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "\"%s\" bulunamadı"
 
-#: src/search.c:205
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/search.c:184
+msgid " [Case Sensitive]"
+msgstr " [Büyük / Küçük Harfe Duyarlı]"
+
+#: src/search.c:188
+msgid " [Regexp]"
+msgstr " [Düzenli İfade]"
+
+#: src/search.c:192
+msgid " [Backwards]"
+msgstr " [Geriye Doğru]"
+
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:197
 #, fuzzy
 msgid " (to replace) in selection"
 msgstr " (değiştirmek için)"
 
-#: src/search.c:207
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (değiştirmek için)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "Bu bulgu değiştirilsin mi?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:945
 msgid "Replace with"
 msgstr "İle değiştir"
 
-#: src/search.c:1004
+#: src/search.c:986
 #, fuzzy, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
 msgstr[0] "%d değiştirme yapıldı"
 
-#: src/search.c:1034
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1027
 #, fuzzy
 msgid "Enter line number, column number"
 msgstr "Satır numarasını girin"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
 msgstr ""
 
-#: src/search.c:1214
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "Ayraç değil"
 
-#: src/search.c:1281
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "Eşleşen ayraç yok"
 
@@ -1948,223 +2126,281 @@ msgstr "İşaretle"
 msgid "Mark Unset"
 msgstr "İşareti Kaldır"
 
-#: src/text.c:443
+#: src/text.c:439
 msgid "Nothing in undo buffer!"
 msgstr ""
 
-#: src/text.c:455 src/text.c:593
+#: src/text.c:445 src/text.c:590
 #, c-format
-msgid "Internal error: can't match line %d.  Please save your work"
+msgid "Internal error: can't match line %d.  Please save your work."
 msgstr ""
 
-#: src/text.c:466 src/text.c:603
+#: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
 msgstr ""
 
-#: src/text.c:475 src/text.c:613
+#: src/text.c:467 src/text.c:612
 #, fuzzy
 msgid "text delete"
 msgstr "Sonraki Dosya"
 
-#: src/text.c:489 src/text.c:628
-msgid "line wrap"
-msgstr ""
-
-#: src/text.c:503 src/text.c:636
+#: src/text.c:491 src/text.c:641
 msgid "line join"
 msgstr ""
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:505 src/text.c:657
 msgid "text cut"
 msgstr ""
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:510 src/text.c:661
 msgid "text uncut"
 msgstr ""
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:515 src/text.c:623
 msgid "line break"
 msgstr ""
 
-#: src/text.c:532 src/text.c:665
+#: src/text.c:528 src/text.c:672
 #, fuzzy
 msgid "text insert"
 msgstr "Sonraki Dosya"
 
-#: src/text.c:550 src/text.c:659
+#: src/text.c:549 src/text.c:665
 #, fuzzy
 msgid "text replace"
 msgstr " (değiştirmek için)"
 
-#: src/text.c:557 src/text.c:671
-msgid "Internal error: unknown type.  Please save your work"
+#: src/text.c:556 src/text.c:679 src/text.c:983
+msgid "Internal error: unknown type.  Please save your work."
 msgstr ""
 
-#: src/text.c:563
+#: src/text.c:561
 #, c-format
 msgid "Undid action (%s)"
 msgstr ""
 
-#: src/text.c:578
+#: src/text.c:580
 msgid "Nothing to re-do!"
 msgstr ""
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
+#: src/text.c:584
+msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
 
-#: src/text.c:676
+#: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr ""
 
-#: src/text.c:766
-msgid "Could not pipe"
-msgstr "Boru işlemi gerçekleştirilemedi"
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
+msgid "Could not create pipe"
+msgstr "Boru yaratılamadı"
 
-#: src/text.c:793 src/text.c:2636 src/text.c:2788
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "Fork işlemi gerçekleştirilemedi"
 
-#: src/text.c:941
-msgid "Internal error: can't setup uncut.  Please save your work."
-msgstr ""
-
-#: src/text.c:950
-msgid "Internal error: unknown type.  Please save your work."
+#: src/text.c:969
+msgid "Internal error: cannot set up uncut.  Please save your work."
 msgstr ""
 
-#: src/text.c:1870
+#: src/text.c:1806
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Hatalı alıntı dizgesi %s: %s"
 
-#: src/text.c:2267
+#: src/text.c:2207
 msgid "Can now UnJustify!"
 msgstr "Şmdi yaslamayı geri alabilirsiniz!"
 
-#: src/text.c:2462
+#: src/text.c:2404
 msgid "Edit a replacement"
 msgstr "Bir yerdeğiştirmeyi düzenle"
 
-#: src/text.c:2548
-msgid "Could not create pipe"
-msgstr "Boru yaratılamadı"
-
-#: src/text.c:2550
+#: src/text.c:2492
 msgid "Creating misspelled word list, please wait..."
 msgstr "Yazım hatası içeren kelimeler listeleniyor, lütfen bekleyiniz"
 
-#: src/text.c:2642
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
 msgstr "Boru arabelleğinin boyutu alınamıyor"
 
-#: src/text.c:2693
+#: src/text.c:2635
 msgid "Error invoking \"spell\""
 msgstr "\"spell\" çağırılırken hata"
 
-#: src/text.c:2696
+#: src/text.c:2638
 msgid "Error invoking \"sort -f\""
 msgstr "\"sort -f\" çağırılırken hata"
 
-#: src/text.c:2699
+#: src/text.c:2641
 msgid "Error invoking \"uniq\""
 msgstr "\"uniq\" çağırılırken hata"
 
-#: src/text.c:2756 src/text.c:2965
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "Yazım kontrolü bitti"
 
-#: src/text.c:2815
+#: src/text.c:2759 src/text.c:3340
 #, fuzzy, c-format
 msgid "Error invoking \"%s\""
 msgstr "\"spell\" çağırılırken hata"
 
-#: src/text.c:2960
+#: src/text.c:2885
+#, fuzzy
+msgid "Invoking spell checker, please wait"
+msgstr "Yazım denetleyicisini çağır (eğer mümkün ise)"
+
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Yazım kontrolü başarısız oldu: %s"
 
-#: src/text.c:2962
+#: src/text.c:2904
 #, fuzzy, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Yazım kontrolü başarısız oldu: %s"
 
-#: src/text.c:3030
+#: src/text.c:2937
+msgid "No linter defined for this type of file!"
+msgstr ""
+
+#: src/text.c:2947
+msgid "Save modified buffer before linting?"
+msgstr ""
+
+#: src/text.c:2969
+msgid "Invoking linter, please wait"
+msgstr ""
+
+#: src/text.c:3125
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr ""
+
+#: src/text.c:3159
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr ""
+
+#: src/text.c:3205
+#, fuzzy
+msgid "At last message"
+msgstr "Bu mesajı gösterir"
+
+#: src/text.c:3210
+#, fuzzy
+msgid "At first message"
+msgstr "Bu mesajı gösterir"
+
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr ""
+
+#: src/text.c:3275
+msgid "Finished"
+msgstr ""
+
+#: src/text.c:3280
+msgid "Invoking formatter, please wait"
+msgstr ""
+
+#: src/text.c:3360
+msgid "Finished formatting"
+msgstr ""
+
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr ""
 
-#: src/text.c:3031
+#: src/text.c:3439
 #, fuzzy
 msgid "In Selection:  "
 msgstr "Seçimi Dosyanın Sonuna Ekle"
 
-#: src/utils.c:405 src/utils.c:417
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3453
+msgid "Verbatim Input"
+msgstr ""
+
+#: src/utils.c:410 src/utils.c:422
 msgid "nano is out of memory!"
 msgstr "nano bellek dışı!"
 
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
-#: src/winio.c:1557
+#: src/winio.c:1583
 msgid "Unicode Input"
 msgstr ""
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2142 src/winio.c:2146
 #, fuzzy
 msgid "Modified"
 msgstr " Değiştirildi "
 
-#: src/winio.c:2150
+#: src/winio.c:2143
 #, fuzzy
 msgid "View"
 msgstr " Göster "
 
-#: src/winio.c:2164
+#: src/winio.c:2157
 #, fuzzy
 msgid "DIR:"
 msgstr " DİZİN: "
 
-#: src/winio.c:2171
+#: src/winio.c:2164
 #, fuzzy
 msgid "File:"
 msgstr "Dosya: "
 
-#: src/winio.c:3360
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2261
+msgid ""
+"Warning: Modifying a file which is not locked, check directory permission?"
+msgstr ""
+
+#: src/winio.c:3377
 #, 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:3492
+#: src/winio.c:3507
 msgid "The nano text editor"
 msgstr "nano metin editörü"
 
-#: src/winio.c:3493
+#: src/winio.c:3508
 #, fuzzy
 msgid "version"
 msgstr "sürüm "
 
-#: src/winio.c:3494
+#: src/winio.c:3509
 msgid "Brought to you by:"
 msgstr "Size sağlayan: "
 
-#: src/winio.c:3495
+#: src/winio.c:3510
 msgid "Special thanks to:"
 msgstr "Özel teşekkürler:"
 
-#: src/winio.c:3496
+#: src/winio.c:3511
 msgid "The Free Software Foundation"
 msgstr "The Free Software Foundation"
 
-#: src/winio.c:3497
+#: src/winio.c:3512
+msgid "the many translators and the TP"
+msgstr ""
+
+#: src/winio.c:3513
 msgid "For ncurses:"
 msgstr "ncurses için:"
 
-#: src/winio.c:3498
+#: src/winio.c:3514
 msgid "and anyone else we forgot..."
 msgstr "ve unuttuğumuz kişilere..."
 
-#: src/winio.c:3499
+#: src/winio.c:3515
 #, fuzzy
 msgid "Thank you for using nano!"
 msgstr "nano kullandığınız için teşekkürler!\n"
@@ -2221,11 +2457,8 @@ msgstr "nano kullandığınız için teşekkürler!\n"
 #~ msgid "Could not reopen %s: %s"
 #~ msgstr "%s tekrar açılamadı: %s"
 
-#~ msgid "Could not open %s for prepend: %s"
-#~ msgstr "%s başına ekleme için açılamıyor: %s"
-
-#~ msgid "Could not set permissions %o on %s: %s"
-#~ msgstr "%o izinleri %s dosyasına uygulanamadı: %s"
+#~ msgid "Could not open %s for writing: %s"
+#~ msgstr "%s yazmak için açılamadı: %s"
 
 #~ msgid "Can't open \"%s\": %s"
 #~ msgstr "\"%s\" açılamıyor: %s"
@@ -2263,6 +2496,9 @@ msgstr "nano kullandığınız için teşekkürler!\n"
 #~ msgid "Search for text within the editor"
 #~ msgstr "Editör içinde metin ara"
 
+#~ msgid "Move to the next screen"
+#~ msgstr "Sonraki ekrana git"
+
 #~ msgid "Move up one line"
 #~ msgstr "Bir satır yukarı çık"
 
@@ -2304,6 +2540,9 @@ msgstr "nano kullandığınız için teşekkürler!\n"
 #~ msgid "Down"
 #~ msgstr "Aşağı"
 
+#~ msgid "Find Other Bracket"
+#~ msgstr "Diğer Köşeli Ayracı Bul"
+
 #~ msgid "Direction"
 #~ msgstr "Yön"
 
@@ -2330,30 +2569,45 @@ msgstr "nano kullandığınız için teşekkürler!\n"
 #~ msgid "Use alternate keypad routines"
 #~ msgstr "Alternatif tuştakımı yordamlarını kullan"
 
+#~ msgid "-Q [str]"
+#~ msgstr "-Q [metin]"
+
 #~ msgid "Do regular expression searches"
 #~ msgstr "Düzenli ifade aramaları gerçekleştir"
 
 #~ msgid "-T [num]"
 #~ msgstr "-T [sayı]"
 
+#~ msgid "-Y [str]"
+#~ msgstr "-Y [metin]"
+
+#~ msgid "-o [dir]"
+#~ msgstr "-o [dizin]"
+
 #~ msgid "Set fill cols to (wrap lines at) #cols"
 #~ msgstr "Satırları #cols hizasından kaydır"
 
+#~ msgid "(ignored, for Pico compatibility)"
+#~ msgstr "(Pico uyumluluğu için yoksayıldı)"
+
+#~ msgid "Could not pipe"
+#~ msgstr "Boru işlemi gerçekleştirilemedi"
+
 #~ msgid "current->data now = \"%s\"\n"
 #~ msgstr "current->data now = \"%s\"\n"
 
 #~ msgid "After, data = \"%s\"\n"
 #~ msgstr "Sonra, veri = \"%s\"\n"
 
+#~ msgid "Could not invoke \"%s\""
+#~ msgstr "\"%s\" çağırılamadı"
+
 #~ msgid "Could not create a temporary filename: %s"
 #~ msgstr "Geçici bir dosya adı yaratılamadı: %s"
 
 #~ 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 "Cannot resize top win"
-#~ msgstr "Üst pencere yeniden boyutlandırılamaz"
-
 #~ msgid "Cannot move top win"
 #~ msgstr "Üst pencere hareket ettirilemez"
 
@@ -2431,6 +2685,9 @@ msgstr "nano kullandığınız için teşekkürler!\n"
 #~ msgid "set flag %d!\n"
 #~ msgstr "%d bayrağı atandı!\n"
 
+#~ msgid "unset flag %d!\n"
+#~ msgstr "%d bayrağı boşaltıldı!\n"
+
 #~ msgid "Errors found in .nanorc file"
 #~ msgstr ".nanorc dosyası içerisinde hatalar bulundu"
 
diff --git a/po/uk.gmo b/po/uk.gmo
index 3f6b730..3febc1d 100644
--- a/po/uk.gmo
+++ b/po/uk.gmo
diff --git a/po/uk.po b/po/uk.po
index 8527b04..2818f7c 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -1,1036 +1,1097 @@
-# l10n file 4 nano, ukrainian language
+# Ukrainian translation for nano.
 # Copyright (C) 2001 Free Software Foundation, Inc.
-# Sergey A. Ribalchenko <fisher@obu.ck.ua>, 2001.
+# This file is distributed under the same license as the nano package.
 #
+# Sergey A. Ribalchenko <fisher@obu.ck.ua>, 2001.
+# Yuri Chornoivan <yurchor@ukr.net>, 2014, 2015.
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 1.1.99pre3\n"
+"Project-Id-Version: nano 2.3.99pre4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-22 06:34-0500\n"
-"PO-Revision-Date: 2003-02-17 10:51+0300\n"
-"Last-Translator: Sergey A. Ribalchenko <fisher@obu.ck.ua>\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
+"PO-Revision-Date: 2015-03-19 12:19+0200\n"
+"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
+"Language: uk\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=koi8-u\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "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"
+"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: Lokalize 1.5\n"
 
-#: src/browser.c:220
-#, fuzzy
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:203
 msgid "Go To Directory"
-msgstr "�� �������Ҧ�"
+msgstr "Перейти до каталогу"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:860 src/files.c:2048
-#: src/nano.c:1060 src/search.c:220 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
-msgstr "���������"
+msgstr "Скасовано"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:246 src/browser.c:293
 #, c-format
 msgid "Can't go outside of %s in restricted mode"
-msgstr "�� ���� Ц�� ���� %s � ���������� ����ͦ"
+msgstr "Не можу піти поза %s в обмеженому режимі"
 
-#: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:722
-#: src/files.c:731 src/files.c:1540 src/files.c:1659 src/files.c:1711
-#: src/files.c:1732 src/files.c:1855 src/files.c:2691 src/rcfile.c:568
-#: src/rcfile.c:1204
-#, fuzzy, c-format
+#: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
+#: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
+#: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
+#: src/rcfile.c:590 src/rcfile.c:1426
+#, c-format
 msgid "Error reading %s: %s"
-msgstr "������� ����� ��������� %s: %s"
+msgstr "Помилка під час спроби читання %s: %s"
 
-#: src/browser.c:303
+#: src/browser.c:283
 msgid "Can't move up a directory"
-msgstr "�� ���� ����ͦ����� �������Ҧ�"
+msgstr "Не можу перейти на каталог вище"
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:665 src/browser.c:674
+#: src/browser.c:626 src/browser.c:635
 msgid "(dir)"
-msgstr ""
+msgstr "(кат)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:632
 msgid "(parent dir)"
-msgstr ""
+msgstr "(батьк. кат.)"
 
-#: src/browser.c:801 src/search.c:185
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
-msgstr "�����"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:805 src/search.c:189
-msgid " [Case Sensitive]"
-msgstr " [��������]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:811 src/search.c:195
-msgid " [Regexp]"
-msgstr " [�������]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:817 src/search.c:201
-msgid " [Backwards]"
-msgstr " [�����]"
+msgstr "Пошук"
 
 # message
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
-msgstr "�������� ˦��� �����, ������ ��������"
+msgstr "Дісталися кінця файла, почали спочатку"
 
-#: src/browser.c:1006 src/browser.c:1039 src/search.c:514 src/search.c:517
-#: src/search.c:574 src/search.c:577
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
-msgstr "�� ����� �Ц���Ħ���"
+msgstr "Це єдиний збіг"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
+msgstr "Немає поточного зразка для пошуку"
+
+#: src/files.c:139
+msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
+msgstr "Не вдалося визначити профіль для файла блокування (помилка getpwuid())"
+
+#: src/files.c:145
+#, c-format
+msgid "Couldn't determine hostname for lock file: %s"
+msgstr "Не вдалося визначити назву вузла для файла блокування: %s"
+
+#: src/files.c:165 src/files.c:175 src/files.c:212 src/files.c:222
+#, c-format
+msgid "Error writing lock file %s: %s"
+msgstr "Помилка під час спроби записати файл блокування %s: %s"
+
+#: src/files.c:237
+#, c-format
+msgid "Error deleting lock file %s: %s"
+msgstr "Помилка під час спроби вилучити файл блокування %s: %s"
+
+#: src/files.c:272
+#, c-format
+msgid "Error opening lock file %s: %s"
+msgstr "Помилка під час спроби відкрити файл блокування %s: %s"
+
+#: src/files.c:282
+#, c-format
+msgid "Error reading lock file %s: Not enough data read"
 msgstr ""
+"Помилка під час спроби прочитати дані з файла блокування %s: прочитано "
+"недостатньо даних"
 
-#: src/files.c:125
+#. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
+#: src/files.c:297
+#, c-format
+msgid "File %s is being edited (by %s with %s, PID %d); continue?"
+msgstr ""
+"Редагування файла %s вже виконується (%s за допомогою %s, PID %d); "
+"продовжити?"
+
+#: src/files.c:308
+#, c-format
+msgid "Error writing lock file: Directory '%s' doesn't exist"
+msgstr ""
+"Помилка під час спроби записати файл блокування: каталогу «%s» не існує"
+
+#: src/files.c:339
 #, c-format
 msgid "Can't insert file from outside of %s"
-msgstr "�� ���� �������� ���� ���� %s"
+msgstr "Не можу вставити файл поза %s"
 
-#: src/files.c:234
-#, fuzzy
+#: src/files.c:467
 msgid "No more open file buffers"
-msgstr "���� ���� צ������� ���̦�"
+msgstr "Більше немає відкритих файлових буферів"
 
-#: src/files.c:250
+#: src/files.c:484
 #, c-format
 msgid "Switched to %s"
-msgstr "���������� �� %s"
+msgstr "Перемкнуто до %s"
 
-#: src/files.c:251 src/global.c:469 src/winio.c:2168
+#: src/files.c:485 src/global.c:953 src/winio.c:2161
 msgid "New Buffer"
-msgstr "����� �����"
+msgstr "Новий Буфер"
 
-#: src/files.c:633
-#, fuzzy, c-format
+#: src/files.c:874
+#, 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 ����� (����������� � ������� Mac)"
-msgstr[1] "��������� %d ����� (������������ � ������� Mac)"
-msgstr[2] "��������� %d ���˦� (������������ � ������� Mac)"
+msgstr[0] "Прочитано %lu рядок (перетворено з формату DOS та Mac)"
+msgstr[1] "Прочитано %lu рядки (перетворено з формату DOS та Mac)"
+msgstr[2] "Прочитано %lu рядків (перетворено з формату DOS та Mac)"
 
-#: src/files.c:638
-#, fuzzy, c-format
+#: src/files.c:879
+#, 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 ����� (����������� � ������� Mac)"
-msgstr[1] "��������� %d ����� (������������ � ������� Mac)"
-msgstr[2] "��������� %d ���˦� (������������ � ������� Mac)"
+msgstr[0] ""
+"Прочитано %lu рядок (перетворено з формату Mac та DOS; попередження: немає "
+"доступу на запис)"
+msgstr[1] ""
+"Прочитано %lu рядка (перетворено з формату Mac та DOS; попередження: немає "
+"доступу на запис)"
+msgstr[2] ""
+"Прочитано %lu рядків (перетворено з формату Mac та DOS; попередження: немає "
+"доступу на запис)"
 
-#: src/files.c:644
-#, fuzzy, c-format
+#: src/files.c:885
+#, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
-msgstr[0] "��������� %d ����� (����������� � ������� Mac)"
-msgstr[1] "��������� %d ����� (������������ � ������� Mac)"
-msgstr[2] "��������� %d ���˦� (������������ � ������� Mac)"
+msgstr[0] "Прочитано %lu рядок (перетворено з формату Mac)"
+msgstr[1] "Прочитано %lu рядки (перетворено з формату Mac)"
+msgstr[2] "Прочитано %lu рядків (перетворено з формату Mac)"
 
-#: src/files.c:648
-#, fuzzy, c-format
+#: src/files.c:889
+#, 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 ����� (����������� � ������� Mac)"
-msgstr[1] "��������� %d ����� (������������ � ������� Mac)"
-msgstr[2] "��������� %d ���˦� (������������ � ������� Mac)"
+msgstr[0] ""
+"Прочитано %lu рядок (перетворено з формату Mac; попередження: немає доступу "
+"на запис)"
+msgstr[1] ""
+"Прочитано %lu рядка (перетворено з формату Mac; попередження: немає доступу "
+"на запис)"
+msgstr[2] ""
+"Прочитано %lu рядків (перетворено з формату Mac; попередження: немає доступу "
+"на запис)"
 
-#: src/files.c:654
-#, fuzzy, c-format
+#: src/files.c:895
+#, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
-msgstr[0] "��������� %d ����� (����������� � ������� DOS)"
-msgstr[1] "��������� %d ����� (������������ � ������� DOS)"
-msgstr[2] "��������� %d ���˦� (������������ � ������� DOS)"
+msgstr[0] "Прочитано %lu рядок (перетворено з формату DOS)"
+msgstr[1] "Прочитано %lu рядки (перетворено з формату DOS)"
+msgstr[2] "Прочитано %lu рядків (перетворено з формату DOS)"
 
-#: src/files.c:658
-#, fuzzy, c-format
+#: src/files.c:899
+#, 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 ����� (����������� � ������� DOS)"
-msgstr[1] "��������� %d ����� (������������ � ������� DOS)"
-msgstr[2] "��������� %d ���˦� (������������ � ������� DOS)"
+msgstr[0] ""
+"Прочитано %lu рядок (перетворено з формату DOS; попередження: немає доступу "
+"на запис)"
+msgstr[1] ""
+"Прочитано %lu рядка (перетворено з формату DOS; попередження: немає доступу "
+"на запис)"
+msgstr[2] ""
+"Прочитано %lu рядків (перетворено з формату DOS; попередження: немає доступу "
+"на запис)"
 
-#: src/files.c:664
-#, fuzzy, c-format
+#: src/files.c:905
+#, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
-msgstr[0] "��������� %d �����"
-msgstr[1] "��������� %d �����"
-msgstr[2] "��������� %d ���˦�"
+msgstr[0] "Прочитано %lu рядок"
+msgstr[1] "Прочитано %lu рядки"
+msgstr[2] "Прочитано %lu рядків"
 
-#: src/files.c:667
+#: src/files.c:908
 #, 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[0] "Прочитано %lu рядок (попередження: немає доступу на запис)"
+msgstr[1] "Прочитані %lu рядки (попередження: немає доступу на запис)"
+msgstr[2] "Прочитано %lu рядків (попередження: немає доступу на запис)"
 
-#: src/files.c:700 src/files.c:736
+#: src/files.c:943 src/files.c:980
 msgid "Reading File"
-msgstr "������� ����.."
+msgstr "Читаємо файл.."
 
-#: src/files.c:706
+#: src/files.c:950
 msgid "New File"
-msgstr "����� ����"
+msgstr "Новий файл"
 
-#: src/files.c:709
+#: src/files.c:953
 #, c-format
 msgid "\"%s\" not found"
-msgstr "\"%s\" �� ��������"
+msgstr "\"%s\" не знайдено"
 
-#: src/files.c:717 src/rcfile.c:559 src/rcfile.c:1154 src/rcfile.c:1195
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
-msgstr "���� \"%s\" � �������Ҧ��"
+msgstr "«%s» є каталогом"
 
-#: src/files.c:718 src/rcfile.c:560 src/rcfile.c:1155 src/rcfile.c:1196
-#, fuzzy, c-format
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
+#, c-format
 msgid "\"%s\" is a device file"
-msgstr "���� \"%s\" � ������ ��������"
+msgstr "«%s» є файлом пристрою"
 
-#: src/files.c:817
-#, fuzzy, c-format
+#: src/files.c:1060
+#, c-format
 msgid "Command to execute in new buffer [from %s] "
-msgstr "���� �� ������� (� ����� �����) [צ� %s] "
+msgstr "Команда, яку слід виконати у новому буфері [з %s] "
 
-#: src/files.c:819
-#, fuzzy, c-format
+#: src/files.c:1062
+#, c-format
 msgid "Command to execute [from %s] "
-msgstr "������� �� ��������� "
+msgstr "Команда, яку слід виконати [з %s] "
 
-#: src/files.c:825
+#: src/files.c:1069
 #, c-format
 msgid "File to insert into new buffer [from %s] "
-msgstr "���� �� ������� (� ����� �����) [צ� %s] "
+msgstr "Файл до вставки (в новий буфер) [від %s] "
 
-#: src/files.c:827
+#: src/files.c:1071
 #, c-format
 msgid "File to insert [from %s] "
-msgstr "���� �� ������� [צ� %s] "
+msgstr "Файл до вставки [від %s] "
 
-#: src/files.c:1077
-#, fuzzy
+#: src/files.c:1320
 msgid "Key invalid in non-multibuffer mode"
-msgstr "��צ��� ������ � ��-��������������� ����ͦ"
+msgstr "Клавіша недійсна у не мультибуферному режимі"
 
-#: src/files.c:1486
+#: src/files.c:1622
+msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+msgstr ""
+"Не вдалося записати дані до файла резервної копії, продовжити спробу "
+"зберегти дані? (Натисніть N, якщо не певні) "
+
+#: src/files.c:1746
 #, c-format
 msgid "Can't write outside of %s"
-msgstr "�� ���� �������� ���� %s"
+msgstr "Не можу записати поза %s"
 
-#: src/files.c:1501
+#: src/files.c:1761
 msgid "Cannot prepend or append to a symlink with --nofollow set"
 msgstr ""
+"Не можна дописувати на початку або наприкінці символічного посилання, якщо "
+"встановлено --nofollow"
 
-#: src/files.c:1581 src/files.c:1603 src/files.c:1621 src/files.c:1632
-#: src/files.c:1640 src/files.c:1667
+#: src/files.c:1843 src/files.c:1868 src/files.c:1886 src/files.c:1899
+#: src/files.c:1910 src/files.c:1939
 #, c-format
 msgid "Error writing backup file %s: %s"
-msgstr ""
+msgstr "Помилка під час спроби записати до файла резервної копії %s: %s"
 
-#: src/files.c:1582 src/nano.c:701
-#, fuzzy
+#: src/files.c:1844 src/nano.c:719
 msgid "Too many backup files?"
-msgstr ""
-"\n"
-"%s �� �������� (����� ������ ��������� ���̦�?)\n"
+msgstr "Забагато файлів резервних копій?"
 
-#: src/files.c:1687 src/files.c:1744 src/files.c:1763 src/files.c:1775
-#: src/files.c:1799 src/files.c:1817 src/files.c:1827 src/files.c:1863
-#: src/files.c:1868 src/files.c:2764 src/files.c:2773
-#, fuzzy, c-format
+#: src/files.c:1959 src/files.c:2016 src/files.c:2035 src/files.c:2047
+#: src/files.c:2071 src/files.c:2089 src/files.c:2099 src/files.c:2135
+#: src/files.c:2140 src/files.c:3101 src/files.c:3110 src/files.c:3133
+#: src/files.c:3145
+#, c-format
 msgid "Error writing %s: %s"
-msgstr "������� ����� ��������� %s: %s"
+msgstr "Помилка під час спроби записати %s: %s"
 
-#: src/files.c:1721 src/text.c:2929 src/text.c:2941
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
-msgstr ""
+msgstr "Помилка під час спроби записати до тимчасового файла: %s"
 
-#: src/files.c:1900
-#, fuzzy, c-format
+#: src/files.c:2173
+#, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
-msgstr[0] "�������� %d �����"
-msgstr[1] "�������� %d �����"
-msgstr[2] "�������� %d ���˦�"
+msgstr[0] "Записано %lu рядок"
+msgstr[1] "Записано %lu рядки"
+msgstr[2] "Записано %lu рядків"
 
-#: src/files.c:2004
+#: src/files.c:2278
 msgid " [DOS Format]"
-msgstr " [������ DOS]"
+msgstr " [формат DOS]"
 
-#: src/files.c:2005
+#: src/files.c:2279
 msgid " [Mac Format]"
-msgstr " [������ Mac]"
+msgstr " [формат Mac]"
 
-#: src/files.c:2007
+#: src/files.c:2281
 msgid " [Backup]"
-msgstr " [������]"
+msgstr " [Резерв]"
 
-#: src/files.c:2015
+#: src/files.c:2289
 msgid "Prepend Selection to File"
-msgstr "������ ��Ħ���� �� ����� (� ������� �����)"
+msgstr "Дописати позначене до файла на початку"
 
-#: src/files.c:2016
+#: src/files.c:2290
 msgid "Append Selection to File"
-msgstr "������ ��Ħ���� �� �����"
+msgstr "Дописати позначене до файла наприкінці"
 
-#: src/files.c:2017
+#: src/files.c:2291
 msgid "Write Selection to File"
-msgstr "�������� ��Ħ���� �� �����"
+msgstr "Записати позначене до файла"
 
-#: src/files.c:2020
+#: src/files.c:2294
 msgid "File Name to Prepend to"
-msgstr "��'� ����� ��� ���������"
+msgstr "Назва файла для дописування"
 
-#: src/files.c:2021
+#: src/files.c:2295
 msgid "File Name to Append to"
-msgstr "��'� ����� ��� ���������"
+msgstr "Назва файла для дописування"
 
-#: src/files.c:2022
+#: src/files.c:2296
 msgid "File Name to Write"
-msgstr "��'� ����� �� ������"
+msgstr "Назва файла для записування"
 
-#: src/files.c:2153
-#, fuzzy
+#: src/files.c:2427
 msgid "File exists, OVERWRITE ? "
-msgstr "���� ���դ, ���������� ?"
+msgstr "Файл існує, ПЕРЕЗАПИСАТИ? "
 
-#: src/files.c:2162
+#: src/files.c:2436
 msgid "Save file under DIFFERENT NAME ? "
-msgstr ""
+msgstr "Зберегти файл з іншою назвою? "
 
-#: src/files.c:2173
+#: src/files.c:2450
 msgid "File was modified since you opened it, continue saving ? "
 msgstr ""
+"З часу, коли було відкрито файл, до нього було внесено зміни. Продовжити "
+"спроби зберегти дані? "
 
-#: src/files.c:2611
+#: src/files.c:2882
 msgid "(more)"
-msgstr "(��̦)"
+msgstr "(далі)"
 
-#: src/files.c:2694 src/rcfile.c:1220
-#, fuzzy, c-format
+#: src/files.c:2974
+#, c-format
 msgid ""
 "\n"
-"Press Enter to continue starting nano.\n"
+"Press Enter to continue\n"
 msgstr ""
 "\n"
-"���ͦ�� Enter ��� ���������� ������������ nano\n"
-
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:415 src/prompt.c:1288
-msgid "Cancel"
-msgstr "���������"
+"Натисніть Enter, щоб продовжити\n"
 
-#: src/global.c:416
-msgid "Replace"
-msgstr "��ͦ��"
+#: src/files.c:2989
+#, c-format
+msgid ""
+"Unable to create directory %s: %s\n"
+"It is required for saving/loading search history or cursor positions.\n"
+msgstr ""
+"Не вдалося створити каталог %s: %s\n"
+"Цей каталог потрібен для зберігання та завантаження журналу пошуку або даних "
+"щодо позиції курсора.\n"
 
-#: src/global.c:417
-msgid "No Replace"
-msgstr "�� ��ͦ����"
+#: src/files.c:2995
+#, 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 ""
+"Адреса %s не є адресою каталогу, хоча має нею бути.\n"
+"Nano не зможе завантажувати або зберігати дані щодо журналу пошуку та "
+"позицій курсора.\n"
 
-#: src/global.c:420
-msgid "Case Sens"
-msgstr "��������"
+#: src/files.c:3012
+#, 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 ""
+"Виявлено застарілий файл журналу (%s). Виконано спробу перенести\n"
+"його до бажаного місця (%s), втім, сталася помилка: %s"
 
-#: src/global.c:421
-#, fuzzy
-msgid "Backwards"
-msgstr " [�����]"
+#: src/files.c:3016
+#, 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 ""
+"Виявлено застарілий файл журналу nano (%s), який перенесено до\n"
+"відповідного місця (%s)\n"
+"(див. «Поширені питання» щодо nano, щоб дізнатися більше про цю зміну)"
 
-#: src/global.c:425
-msgid "Regexp"
-msgstr "�������"
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
+#: src/global.c:477
+msgid "Exit"
+msgstr "Вихід"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:451
-#, fuzzy
-msgid "PrevHstory"
-msgstr "����Ҧ�"
+#: src/global.c:478
+msgid "Close"
+msgstr "Закрити"
 
-#: src/global.c:452
-#, fuzzy
-msgid "NextHstory"
-msgstr "����Ҧ�"
+#: src/global.c:479
+msgid "Uncut Text"
+msgstr "СкасВиріз"
 
-#: src/global.c:453
-#, fuzzy
-msgid "Go To Text"
-msgstr "�� �����"
+#: src/global.c:481
+msgid "Unjustify"
+msgstr "СкасВирівн"
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:455
-#, fuzzy
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:485
 msgid "WhereIs Next"
-msgstr "�����"
+msgstr "Знайти далі"
 
-#: src/global.c:457
-#, fuzzy
-msgid "First File"
-msgstr "������ �����"
-
-#: src/global.c:458
-#, fuzzy
-msgid "Last File"
-msgstr "������ �����"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:460
-msgid "To Files"
-msgstr "�� ���̦�"
-
-#: src/global.c:462
-msgid "DOS Format"
-msgstr "������ DOS"
-
-#: src/global.c:463
-msgid "Mac Format"
-msgstr "������ Mac"
-
-#: src/global.c:464
-msgid "Append"
-msgstr "������"
-
-#: src/global.c:465
-msgid "Prepend"
-msgstr "������(0)"
-
-#: src/global.c:466
-msgid "Backup File"
-msgstr "������� �������� ���"
-
-#: src/global.c:467
-msgid "Execute Command"
-msgstr "�������� �������"
-
-#: src/global.c:471
-msgid "Go To Dir"
-msgstr "�� �������Ҧ�"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:480
-msgid "Get Help"
-msgstr "��������"
-
-#: src/global.c:481
-msgid "Exit"
-msgstr "��Ȧ�"
-
-#: src/global.c:482
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:492
 msgid "Where Is"
-msgstr "�����"
+msgstr "Пошук"
 
-#: src/global.c:483
-msgid "Prev Page"
-msgstr "���.����."
-
-#: src/global.c:484
-msgid "Next Page"
-msgstr "����.����."
-
-#: src/global.c:485
-msgid "First Line"
-msgstr "������ �����"
+#: src/global.c:493
+msgid "Replace"
+msgstr "Заміна"
 
-#: src/global.c:486
-msgid "Last Line"
-msgstr "������ �����"
+#: src/global.c:494
+msgid "Go To Line"
+msgstr "До Рядка"
 
-#: src/global.c:487
-msgid "Suspend"
-msgstr "���������� -"
+#: src/global.c:495
+msgid "Prev Line"
+msgstr "ПопРядок"
 
-#: src/global.c:489
-msgid "Beg of Par"
-msgstr ""
+#: src/global.c:496
+msgid "Next Line"
+msgstr "НастРядок"
 
-#: src/global.c:490
-msgid "End of Par"
-msgstr ""
+#: src/global.c:497
+msgid "Read File"
+msgstr "Чит. файл"
 
-#: src/global.c:491
-#, fuzzy
+#: src/global.c:499
 msgid "FullJstify"
-msgstr "��Ҧ��������"
+msgstr "Вирівняти"
 
-#: src/global.c:493
+#: src/global.c:501
 msgid "Refresh"
-msgstr "������������"
-
-#: src/global.c:495
-#, fuzzy
-msgid "Insert File"
-msgstr "��������� ����"
-
-#: src/global.c:497
-msgid "Go To Line"
-msgstr "�� �����"
-
-#: src/global.c:500
-msgid "Justify the current paragraph"
-msgstr "��Ҧ����� �������� �����"
+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:505
+#: src/global.c:507
+msgid "Justify the current paragraph"
+msgstr "Вирівняти поточний абзац"
+
+#: src/global.c:509
 msgid "Cancel the current function"
-msgstr "��������� ������� ����æ�"
+msgstr "Скасувати поточну функцію"
 
-#: src/global.c:506
+#: src/global.c:510
 msgid "Display this help text"
-msgstr ""
+msgstr "Показати цю довідку"
 
-#: src/global.c:509
-#, fuzzy
+#: src/global.c:513
 msgid "Close the current file buffer / Exit from nano"
-msgstr "������� ������������ ����� ����/����� �� nano"
+msgstr "Закрити буфер поточного файла  / Вийти з nano"
 
-#: src/global.c:511
+#: src/global.c:515
 msgid "Exit from nano"
-msgstr "��Ȧ� � nano"
+msgstr "Вихід з nano"
 
-#: src/global.c:515
+#: src/global.c:519
 msgid "Write the current file to disk"
-msgstr "�������� �������� ���� �� ����"
+msgstr "Записати поточний файл на диск"
 
-#: src/global.c:517
+#: src/global.c:521
 msgid "Insert another file into the current one"
-msgstr "�������� ����� ���� �� ���������"
+msgstr "Вставити інший файл до поточного"
 
-#: src/global.c:519
-#, fuzzy
+#: src/global.c:523
 msgid "Search for a string or a regular expression"
-msgstr "�������Φ ������ (regexp)"
+msgstr "Шукати рядок або формальний вираз"
 
-#: src/global.c:520
-#, fuzzy
-msgid "Go to previous screen"
-msgstr "������� �� ������������ ������"
+#: src/global.c:526
+msgid "Search for a string"
+msgstr "Шукати рядок"
 
-#: src/global.c:521
-#, fuzzy
-msgid "Go to next screen"
-msgstr "������� �� ���������� ������"
+#: src/global.c:528
+msgid "Go one screenful up"
+msgstr "На один екран вгору"
 
-#: src/global.c:523
+#: src/global.c:529
+msgid "Go one screenful down"
+msgstr "На один екран вниз"
+
+#: src/global.c:531
 msgid "Cut the current line and store it in the cutbuffer"
-msgstr "��Ҧ���� �������� ����� �� ��ͦ����� ���� �� \"����Φ\""
+msgstr "Вирізати поточний рядок та помістити його до \"кишені\""
 
-#: src/global.c:525
+#: src/global.c:533
 msgid "Uncut from the cutbuffer into the current line"
-msgstr "��������� ��Ҧ����� �� �������� �ͦ�� \"����Φ\" �� ��������� �����"
+msgstr "Скасувати вирізання та вставити зміст \"кишені\" до поточного рядка"
 
-#: src/global.c:527
-#, fuzzy
+#: src/global.c:534
 msgid "Display the position of the cursor"
-msgstr "�������� ����æ� �������"
+msgstr "Показати розташування курсора"
 
-#: src/global.c:529
+#: src/global.c:536
 msgid "Invoke the spell checker, if available"
-msgstr "��������� �������� ������ ����������� ������� (���� �)"
+msgstr "Викликати програму пошуку друкарських помилок (якщо є)"
 
-#: src/global.c:531
-#, fuzzy
+#: src/global.c:538
 msgid "Replace a string or a regular expression"
-msgstr "�������Φ ������ (regexp)"
+msgstr "Замінити рядок або формальний вираз"
 
-#: src/global.c:532
-#, fuzzy
+#: src/global.c:539
 msgid "Go to line and column number"
-msgstr "������� �� ��������� �����"
+msgstr "Йти до рядка та номеру стовпчика"
 
-#: src/global.c:534
-#, fuzzy
-msgid "Mark text at the cursor position"
-msgstr "��ͦ���� ����� Ц� �������� ����æ�� �������"
+#: src/global.c:541
+msgid "Mark text starting from the cursor position"
+msgstr "Позначити текст, починаючи з поточної позиції курсора"
 
-#: src/global.c:535
-msgid "Repeat last search"
-msgstr ""
+#: src/global.c:542
+msgid "Repeat the last search"
+msgstr "Повторити останній пошук"
 
-#: src/global.c:537
-#, fuzzy
+#: src/global.c:544
 msgid "Copy the current line and store it in the cutbuffer"
-msgstr "��Ҧ���� �������� ����� �� ��ͦ����� ���� �� \"����Φ\""
+msgstr "Скопіювати поточний рядок та зберегти його до \"кишені\""
 
-#: src/global.c:538
-#, fuzzy
+#: src/global.c:545
 msgid "Indent the current line"
-msgstr "������ �� ��������� �����"
+msgstr "Додати відступ у поточному рядку"
 
-#: src/global.c:539
-#, fuzzy
+#: src/global.c:546
 msgid "Unindent the current line"
-msgstr "������ �� ��������� �����"
+msgstr "Вилучити відступ для поточного рядка"
 
-#: src/global.c:540
+#: src/global.c:547
 msgid "Undo the last operation"
-msgstr ""
+msgstr "Скасувати останню дію"
 
-#: src/global.c:541
+#: src/global.c:548
 msgid "Redo the last undone operation"
-msgstr ""
+msgstr "Відновити останню скасовану дію"
 
-#: src/global.c:543
-#, fuzzy
+#: src/global.c:550
 msgid "Go forward one character"
-msgstr "������ �� ���� ̦����"
+msgstr "Вперед на один символ"
 
-#: src/global.c:544
-#, fuzzy
+#: src/global.c:551
 msgid "Go back one character"
-msgstr "����� �� ���� ̦����"
+msgstr "Назад на один символ"
 
-#: src/global.c:546
-#, fuzzy
+#: src/global.c:553
 msgid "Go forward one word"
-msgstr "������ �� ���� �����"
+msgstr "Вперед на одне слово"
 
-#: src/global.c:547
-#, fuzzy
+#: src/global.c:554
 msgid "Go back one word"
-msgstr "����� �� ���� �����"
+msgstr "Назад на одне слово"
 
-#: src/global.c:549
-#, fuzzy
+#: src/global.c:556
 msgid "Go to previous line"
-msgstr "������� �� ������������ ������"
+msgstr "Повернутися до попереднього рядка"
 
-#: src/global.c:550
-#, fuzzy
+#: src/global.c:557
 msgid "Go to next line"
-msgstr "����ͦ������� �� ����� �����"
+msgstr "Перейти до наступного рядка"
 
-#: src/global.c:551
-#, fuzzy
+#: src/global.c:558
 msgid "Go to beginning of current line"
-msgstr "����ͦ������� �� ������� ��������� �����"
+msgstr "Перейти до початку рядка"
 
-#: src/global.c:552
-#, fuzzy
+#: src/global.c:559
 msgid "Go to end of current line"
-msgstr "����ͦ������� �� ˦���� ��������� �����"
+msgstr "Перейти до кінця рядка"
 
-#: src/global.c:555
+#: src/global.c:562
 msgid "Go to beginning of paragraph; then of previous paragraph"
-msgstr ""
+msgstr "На початок поточного абзацу; потім наступного абзацу"
 
-#: src/global.c:557
+#: src/global.c:564
 msgid "Go just beyond end of paragraph; then of next paragraph"
-msgstr ""
+msgstr "У кінець поточного абзацу; потім наступного абзацу"
 
-#: src/global.c:560
+#: src/global.c:566
 msgid "Go to the first line of the file"
-msgstr "����ͦ������� �� ������� ����� �����"
+msgstr "Перейти до першого рядка файла"
 
-#: src/global.c:562
+#: src/global.c:567
 msgid "Go to the last line of the file"
-msgstr "����ͦ������� �� ���������� ����� �����"
+msgstr "Перейти до останнього рядка файла"
 
-#: src/global.c:564
-#, fuzzy
+#: src/global.c:569
 msgid "Go to the matching bracket"
-msgstr "���� צ���צ��ϧ �����"
+msgstr "Перейти до відповідної дужки"
 
-#: src/global.c:566
+#: src/global.c:571
 msgid "Scroll up one line without scrolling the cursor"
-msgstr ""
+msgstr "Гортати на один рядок вгору без переміщення курсора"
 
-#: src/global.c:568
+#: src/global.c:573
 msgid "Scroll down one line without scrolling the cursor"
-msgstr ""
+msgstr "Гортати на один рядок вниз без переміщення курсора"
 
-#: src/global.c:572
-#, fuzzy
+#: src/global.c:576
 msgid "Switch to the previous file buffer"
-msgstr "������� �� ������������ ������"
+msgstr "Перемкнутися на попередній файловий буфер"
 
-#: src/global.c:574
+#: src/global.c:577
 msgid "Switch to the next file buffer"
-msgstr ""
+msgstr "Перемкнутися на наступний файловий буфер"
 
-#: src/global.c:577
+#: src/global.c:579
 msgid "Insert the next keystroke verbatim"
-msgstr ""
+msgstr "Вставити наступну комбінацію клавіш як є"
 
-#: src/global.c:579
-#, fuzzy
+#: src/global.c:580
 msgid "Insert a tab at the cursor position"
-msgstr "�������� ������ CR (���������� ��̦���) � ���. �������"
+msgstr "Вставити знак табуляції в місце розташування курсора"
 
 #: src/global.c:581
-#, fuzzy
 msgid "Insert a newline at the cursor position"
-msgstr "�������� ������ CR (���������� ��̦���) � ���. �������"
+msgstr "Вставити новий рядок у місці розташування курсора"
 
-#: src/global.c:583
+#: src/global.c:582
 msgid "Delete the character under the cursor"
-msgstr "�������� ̦���� Ц� ��������"
+msgstr "Видалити літеру під курсором"
 
-#: src/global.c:585
+#: src/global.c:584
 msgid "Delete the character to the left of the cursor"
-msgstr "�������� ̦���� �̦�� צ� �������"
+msgstr "Видалити літеру зліва від курсора"
 
-#: src/global.c:588
-#, fuzzy
+#: src/global.c:587
 msgid "Cut from the cursor position to the end of the file"
-msgstr "��������� ��Ҧ����� �� �������� �ͦ�� \"����Φ\" �� ��������� �����"
+msgstr "Вирізати від позиції курсора до кінця файла"
 
-#: src/global.c:591
-#, fuzzy
+#: src/global.c:590
 msgid "Justify the entire file"
-msgstr "��Ҧ����� �������� �����"
+msgstr "Вирівняти цілий файл"
 
-#: src/global.c:595
+#: src/global.c:594
 msgid "Count the number of words, lines, and characters"
-msgstr ""
+msgstr "Підрахувати кількість слів, рядків та символів"
 
-#: src/global.c:598
+#: src/global.c:597
 msgid "Refresh (redraw) the current screen"
-msgstr "������������ �������� �����"
+msgstr "Перемалювати поточний екран"
 
-#: src/global.c:600
+#: src/global.c:599
 msgid "Suspend the editor (if suspend is enabled)"
-msgstr ""
+msgstr "Призупинити редактор (якщо увімкнено)"
 
-#: src/global.c:603
-#, fuzzy
+#: src/global.c:602
 msgid "Toggle the case sensitivity of the search"
-msgstr "���������������� �����"
+msgstr "Увімкнути/вимкнути чутливість пошуку до регістру"
 
-#: src/global.c:605
-#, fuzzy
+#: src/global.c:604
 msgid "Reverse the direction of the search"
-msgstr "�������� ����æ� �������"
+msgstr "Змінити напрямок пошуку на протилежний"
 
-#: src/global.c:609
-#, fuzzy
+#: src/global.c:608
 msgid "Toggle the use of regular expressions"
-msgstr "�������Φ ������ (regexp)"
+msgstr "Увімкнути/вимкнути використання формальних виразів"
 
-#: src/global.c:613
-#, fuzzy
+#: src/global.c:612
 msgid "Recall the previous search/replace string"
-msgstr "���������� �������Φ� ����� ������/��ͦ��"
+msgstr "Згадати попередній рядок пошуку/заміни"
 
-#: src/global.c:615
-#, fuzzy
+#: src/global.c:614
 msgid "Recall the next search/replace string"
-msgstr "���������� �������Φ� ����� ������/��ͦ��"
+msgstr "Згадати наступний рядок пошуку/заміни"
 
-#: src/global.c:618
+#: src/global.c:617
 msgid "Go to file browser"
-msgstr "�� ����������� ���̦�"
+msgstr "До переглядача файлів"
 
-#: src/global.c:621
-#, fuzzy
+#: src/global.c:620
 msgid "Toggle the use of DOS format"
-msgstr "����� ����� � �����Ԧ DOS"
+msgstr "Увімкнути/вимкнути використання формату DOS"
 
-#: src/global.c:622
-#, fuzzy
+#: src/global.c:621
 msgid "Toggle the use of Mac format"
-msgstr "����� ����� � �����Ԧ Mac"
+msgstr "Увімкнути/вимкнути використання формату Mac"
 
-#: src/global.c:624
+#: src/global.c:622
 msgid "Toggle appending"
-msgstr ""
+msgstr "Увімкнути/вимкнути додавання до кінця"
 
-#: src/global.c:625
+#: src/global.c:623
 msgid "Toggle prepending"
-msgstr ""
+msgstr "Увімкнути/вимкнути додавання до початку"
 
-#: src/global.c:628
+#: src/global.c:624
 msgid "Toggle backing up of the original file"
-msgstr ""
+msgstr "Увімкнути/вимкнути резервне копіювання початкового файла"
 
-#: src/global.c:629
+#: src/global.c:625
 msgid "Execute external command"
-msgstr "�������� ������ �������"
+msgstr "Виконати зовнішню команду"
 
-#: src/global.c:633
-#, fuzzy
+#: src/global.c:628
 msgid "Toggle the use of a new buffer"
-msgstr "����������� ����� ������� � ����� �����"
+msgstr "Увімкнути/вимкнути використання нового буферу"
 
-#: src/global.c:636
-#, fuzzy
+#: src/global.c:631
 msgid "Exit from the file browser"
-msgstr "�� ����������� ���̦�"
+msgstr "Вийти з переглядача файлів"
 
-#: src/global.c:638
-#, fuzzy
+#: src/global.c:632
 msgid "Go to the first file in the list"
-msgstr "����ͦ������� �� ������� ����� �����"
+msgstr "Перейти до першого файла у списку"
 
-#: src/global.c:640
-#, fuzzy
+#: src/global.c:633
 msgid "Go to the last file in the list"
-msgstr "����ͦ������� �� ���������� ����� �����"
+msgstr "Перейти до останнього файла у списку"
 
-#: src/global.c:641
-#, fuzzy
+#: src/global.c:634
+msgid "Go to the previous file in the list"
+msgstr "Перейти до попереднього файла у списку"
+
+#: src/global.c:635
 msgid "Go to the next file in the list"
-msgstr "����ͦ������� �� ���������� ����� �����"
+msgstr "Перейти до наступного файла у списку"
+
+#: src/global.c:636
+msgid "Go to directory"
+msgstr "До каталогу"
+
+#: src/global.c:639
+msgid "Invoke the linter, if available"
+msgstr "Викликати linter, якщо доступний"
+
+#: src/global.c:640
+msgid "Go to previous linter msg"
+msgstr "До попереднього пов. linter"
+
+#: src/global.c:641
+msgid "Go to next linter msg"
+msgstr "Перейти до наступного повідомлення linter"
 
 #: src/global.c:642
-#, fuzzy
-msgid "Go to the previous file in the list"
-msgstr "����ͦ������� �� ������� ����� �����"
+msgid "Invoke formatter, if available"
+msgstr "Викликати formatter, якщо доступний"
 
-#: src/global.c:643
-msgid "Go to directory"
-msgstr "�� �������Ҧ�"
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:662
+msgid "Get Help"
+msgstr "Довідка"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:670
-msgid "Close"
-msgstr "�������"
+#: src/global.c:665 src/prompt.c:1084
+msgid "Cancel"
+msgstr "Скасувати"
+
+#: src/global.c:678
+msgid "Write Out"
+msgstr "Виписати"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:679
-msgid "WriteOut"
-msgstr "��������"
+#: src/global.c:704
+msgid "Go To Dir"
+msgstr "До каталогу"
+
+#: src/global.c:719
+msgid "Cut Text"
+msgstr "Вирізати"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:728
 msgid "Justify"
-msgstr "��Ҧ��������"
+msgstr "Вирівняти"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:696
-msgid "Read File"
-msgstr "���. ����"
+#: src/global.c:733
+msgid "To Spell"
+msgstr "Правопис"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:713
-msgid "Cut Text"
-msgstr "��Ҧ����"
+#: src/global.c:738
+msgid "To Linter"
+msgstr "До linter"
+
+#: src/global.c:740
+msgid "Formatter"
+msgstr "Formatter"
+
+#: src/global.c:745
+msgid "Case Sens"
+msgstr "РегЗалеж"
+
+#: src/global.c:750
+msgid "Regexp"
+msgstr "ФормВир"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:718
-msgid "UnJustify"
-msgstr "������Ҧ��"
+#: src/global.c:755
+msgid "Backwards"
+msgstr "Назад"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:723
-#, fuzzy
-msgid "UnCut Text"
-msgstr "������Ҧ�"
+#: src/global.c:762
+msgid "No Replace"
+msgstr "Не Заміщати"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:728 src/global.c:755
+#: src/global.c:770
 msgid "Cur Pos"
-msgstr "����æ�"
+msgstr "Позиція"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:737
-msgid "To Spell"
-msgstr "��������"
+#: src/global.c:780
+msgid "Prev Page"
+msgstr "Поп.Стор."
+
+#: src/global.c:782
+msgid "Next Page"
+msgstr "Наст.Стор."
+
+#: src/global.c:785
+msgid "First Line"
+msgstr "Перший Рядок"
+
+#: src/global.c:787
+msgid "Last Line"
+msgstr "Останній Рядок"
+
+#: src/global.c:794
+msgid "To Bracket"
+msgstr "До дужки"
 
-#: src/global.c:771
+#: src/global.c:797
 msgid "Mark Text"
-msgstr "��ͦ����"
+msgstr "Помітити"
 
-#: src/global.c:777
-#, fuzzy
+#: src/global.c:800
 msgid "Copy Text"
-msgstr "��Ҧ����"
+msgstr "Скопіювати текст"
 
-#: src/global.c:780
-#, fuzzy
+#: src/global.c:803
 msgid "Indent Text"
-msgstr "��Ҧ����"
+msgstr "Відступ"
 
-#: src/global.c:783
-#, fuzzy
+#: src/global.c:805
 msgid "Unindent Text"
-msgstr "������Ҧ�"
+msgstr "СкасВідст"
 
-#: src/global.c:787
+#: src/global.c:808
 msgid "Undo"
-msgstr ""
+msgstr "Скасувати"
 
-#: src/global.c:790
+#: src/global.c:810
 msgid "Redo"
-msgstr ""
-
-#: src/global.c:796 src/global.c:800
-msgid "Forward"
-msgstr "������"
+msgstr "Повторити"
 
-#: src/global.c:806 src/global.c:810
+#: src/global.c:814 src/global.c:820
 msgid "Back"
-msgstr "�����"
+msgstr "Назад"
 
-#: src/global.c:817
-msgid "Next Word"
-msgstr "���������"
+#: src/global.c:816 src/global.c:822
+msgid "Forward"
+msgstr "Вперед"
 
-#: src/global.c:820
+#: src/global.c:827
 msgid "Prev Word"
-msgstr "��������"
+msgstr "ПопСлово"
 
-#: src/global.c:824
-#, fuzzy
-msgid "Prev Line"
-msgstr "���.����."
-
-#: src/global.c:827
-#, fuzzy
-msgid "Next Line"
-msgstr "��������� ����"
+#: src/global.c:829
+msgid "Next Word"
+msgstr "НастСлово"
 
-#: src/global.c:830
+#: src/global.c:833
 msgid "Home"
-msgstr "�������"
+msgstr "Початок"
 
-#: src/global.c:833
+#: src/global.c:835
 msgid "End"
-msgstr "�����"
+msgstr "Кінець"
 
-#: src/global.c:845
-msgid "Find Other Bracket"
-msgstr "������ ����� �����"
+#: src/global.c:844
+msgid "Beg of Par"
+msgstr "Поч.абзацу"
 
-#: src/global.c:848
-msgid "Scroll Up"
-msgstr ""
+#: src/global.c:846
+msgid "End of Par"
+msgstr "Кін.абзацу"
 
 #: src/global.c:851
-msgid "Scroll Down"
-msgstr ""
+msgid "Scroll Up"
+msgstr "Гортати вгору"
 
-#: src/global.c:856
-msgid "Previous File"
-msgstr "�������� ����"
+#: src/global.c:853
+msgid "Scroll Down"
+msgstr "Гортати вниз"
 
 #: src/global.c:858
+msgid "Prev File"
+msgstr "Поп. файл"
+
+#: src/global.c:860
 msgid "Next File"
-msgstr "��������� ����"
+msgstr "Наступний файл"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:862 src/text.c:3045
-msgid "Verbatim Input"
-msgstr ""
+#: src/global.c:869
+msgid "Verbatim"
+msgstr "Буквально"
 
-#: src/global.c:867
+#: src/global.c:872
 msgid "Tab"
-msgstr "������æ�"
+msgstr "Tab"
 
-#: src/global.c:870
+#: src/global.c:874
 msgid "Enter"
-msgstr "����"
+msgstr "Enter"
 
-#: src/global.c:873
+#: src/global.c:876
 msgid "Delete"
-msgstr "��������"
+msgstr "Delete"
 
-#: src/global.c:876
+#: src/global.c:878
 msgid "Backspace"
-msgstr "��¦�"
+msgstr "Backspace"
 
-#: src/global.c:893
+#: src/global.c:888
 msgid "CutTillEnd"
-msgstr ""
+msgstr "ВирДоКінця"
 
-#: src/global.c:906
+#: src/global.c:898
 msgid "Word Count"
-msgstr ""
+msgstr "Кількість слів"
+
+#: src/global.c:905
+msgid "Suspend"
+msgstr "Призупинка -"
+
+#: src/global.c:910
+msgid "PrevHstory"
+msgstr "ПопЖурнал"
+
+#: src/global.c:913
+msgid "NextHstory"
+msgstr "НастЖурнал"
+
+#: src/global.c:917
+msgid "Go To Text"
+msgstr "До тексту"
+
+#: src/global.c:928
+msgid "DOS Format"
+msgstr "формат DOS"
+
+#: src/global.c:931
+msgid "Mac Format"
+msgstr "формат Mac"
+
+#: src/global.c:934
+msgid "Append"
+msgstr "Додати"
+
+#: src/global.c:936
+msgid "Prepend"
+msgstr "Додати(0)"
+
+#: src/global.c:939
+msgid "Backup File"
+msgstr "Зробити резервну копію"
 
-#: src/global.c:1367
+#: src/global.c:946
+msgid "Execute Command"
+msgstr "Виконати команду"
+
+#: src/global.c:961
+msgid "To Files"
+msgstr "До Файлів"
+
+#: src/global.c:964
+msgid "First File"
+msgstr "Перший файл"
+
+#: src/global.c:966
+msgid "Last File"
+msgstr "Ост. файл"
+
+#: src/global.c:977
+msgid "Prev Lint Msg"
+msgstr "Поп. пов. lint"
+
+#: src/global.c:979
+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:1227
 msgid "Help mode"
-msgstr "����� ��������"
+msgstr "Режим довідки"
 
-#: src/global.c:1369
-#, fuzzy
+#: src/global.c:1229
 msgid "Constant cursor position display"
-msgstr "���Ԧ��� ����æ� �������"
+msgstr "Постійно показувати місце розташування курсора"
 
-#: src/global.c:1371
+#: src/global.c:1231
 msgid "Use of one more line for editing"
-msgstr ""
+msgstr "Використання додаткового рядка для редагування"
 
-#: src/global.c:1373
+#: src/global.c:1233
 msgid "Smooth scrolling"
-msgstr "������ ���������"
+msgstr "Плавна прокрутка"
 
-#: src/global.c:1375
+#: src/global.c:1235
+msgid "Soft wrapping of overlong lines"
+msgstr "М’яке перенесення надто довгих рядків"
+
+#: src/global.c:1237
 msgid "Whitespace display"
-msgstr ""
+msgstr "Показ пробілів"
 
-#: src/global.c:1377
+#: src/global.c:1239
 msgid "Color syntax highlighting"
-msgstr "���צ������� ���������� ��������"
+msgstr "Підсвічування синтаксису кольором"
 
-#: src/global.c:1379
+#: src/global.c:1241
 msgid "Smart home key"
-msgstr ""
+msgstr "Розумна клавіша Home"
 
-#: src/global.c:1381
+#: src/global.c:1243
 msgid "Auto indent"
-msgstr "����-��Ҧ��������"
+msgstr "Автовідступ"
 
-#: src/global.c:1383
+#: src/global.c:1245
 msgid "Cut to end"
-msgstr "��Ҧ���� �� ˦���"
+msgstr "Вирізати до кінця"
 
-#: src/global.c:1385
-msgid "Long line wrapping"
-msgstr ""
+#: src/global.c:1247
+msgid "Hard wrapping of overlong lines"
+msgstr "Жорстке перенесення надзвичайно довгих рядків"
 
-#: src/global.c:1387
+#: src/global.c:1249
 msgid "Conversion of typed tabs to spaces"
-msgstr ""
+msgstr "Перетворення знаків табуляції на пробіли"
 
-#: src/global.c:1389
-#, fuzzy
+#: src/global.c:1251
 msgid "Backup files"
-msgstr "������� �������� ���"
+msgstr "Резервні копії"
 
-#: src/global.c:1391
+#: src/global.c:1253
 msgid "Multiple file buffers"
-msgstr "��˦���� �������� ����Ҧ�"
+msgstr "Декілька файлових буферів"
 
-#: src/global.c:1393
+#: src/global.c:1255
 msgid "Mouse support"
-msgstr "�������� ��ۦ"
+msgstr "Підтримка миші"
 
-#: src/global.c:1395
+#: src/global.c:1257
 msgid "No conversion from DOS/Mac format"
-msgstr "���� �������������� �� DOS/Mac �������"
+msgstr "Нема перетворювання із DOS/Mac формату"
 
-#: src/global.c:1397
-#, fuzzy
+#: src/global.c:1259
 msgid "Suspension"
-msgstr "���������� -"
+msgstr "Призупинення"
 
-#: src/global.c:1399
-msgid "Soft line wrapping"
-msgstr ""
-
-#: src/help.c:236
-#, fuzzy
+#: src/help.c:205
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1042,20 +1103,17 @@ msgid ""
 "prompt.  Hitting Enter without entering any text will perform the previous "
 "search.  "
 msgstr ""
-"����� �������� ������� ������\n"
-"\n"
-" ���Ħ�� ����� ��� ̦���� �˦ �� �������, �� �����Φ�� Enter. ���� ��� "
-"������ϧ ���� ����� ���������� צ���צ���� �¦�, ����� ����ͦ������� � "
-"��������� ������� ����� �¦��.\n"
-"\n"
-" ��������� ����� �¦�� �'������� � ���������� ������ Ц��� ���������� "
-"\"�����:\". ���������� Enter ��� ����������� ����-����� ������ �������� �� "
-"������ ���������ϧ ����� �¦��.\n"
+"Довідка про команди пошуку\n"
 "\n"
-" ������Φ ����æ�����Φ ���צۦ ����Φ � ����ͦ ������:\n"
+" Введіть слова чи символи для пошуку та натисніть Enter. Якщо введений вами "
+"текст буде знайдено, ви перейдете до місце найближчого збігу з шуканим "
+"рядком. \n"
 "\n"
+" Попередній потрібний вам рядок буде показано в дужках після пропозиції "
+"пошуку. Якщо ви натиснете Enter не ввівши жодного тексту, буде здійснено "
+"пошук попереднього шуканого рядка.  "
 
-#: src/help.c:245
+#: src/help.c:214
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1063,8 +1121,13 @@ msgid ""
 " The following function keys are available in Search mode:\n"
 "\n"
 msgstr ""
+"Якщо ви позначили текст та виконали пошук з заміною, то відбудеться заміна "
+"тільки тих збігів, що є у позначеному тексті. \n"
+"\n"
+" У режимі пошуку доступні такі функціональні клавіші:\n"
+"\n"
 
-#: src/help.c:251
+#: src/help.c:220
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1075,17 +1138,16 @@ msgid ""
 " The following function keys are available in Go To Line mode:\n"
 "\n"
 msgstr ""
-"����� �������� ������ ��_�����\n"
+"Текст довідки режиму До_рядка\n"
 "\n"
-" ���Ħ�� ����� ����� �� ����� �� ������� Ħ������� �� �����Φ�� Enter. ���� "
-"˦��˦��� ���˦� � ���̦ ����� �� ����� ��� �� �����, �� �������� �� "
-"������ ����� �����.\n"
+" Введіть номер рядка, до якого ви хочете перейти і натисніть Enter. Якщо "
+"кількість рядків у файлі менша за число, яке ви ввели, ви перейдете до "
+"останнього рядка файла.\n"
 "\n"
-" ������Φ ����æ�����Φ ���צۦ ����Φ � ����ͦ ��_�����:\n"
+" У режимі До_рядка можна скористатися такими функціональними клавішами:\n"
 "\n"
 
-#: src/help.c:260
-#, fuzzy
+#: src/help.c:229
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1097,25 +1159,16 @@ 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 ""
-"����� �������� ������ �������� ����\n"
+"Довідка по командах пошуку\n"
 "\n"
-" ���Ħ�� ��'� ����� �� ������� � �������� �������� ����� � ������� ����æ� "
-"�������.\n"
-"\n"
-" ���� ��� nano ڦ������ �� Ц�������� ��˦����� �������� ����Ҧ�, �� �� "
-"�����צ��� �צ������ ����� ��æ� ���������� ����� -F ��� --multibuffer, ��� "
-"����� ���¦��æ� Meta-F, ��� �� ��������� ����� nanorc, ���� ���������� � "
-"������� �������� ����� (������������ Meta-< �� > ��� ������������ ͦ� "
-"��������).\n"
-"\n"
-" ���� ��� ���Ҧ��� ������� ������ �����, ������ �ͦ�� Enter � ����� "
-"���������� ��� ���������� ���Φ �����, ��� ���ۦ�� ��'� �Ŧ�������� ����� �� "
-"������� Enter.\n"
-"\n"
-" ������Φ ����æ�����Φ ���צۦ ����Φ � ����ͦ �������� ����:\n"
+" Введіть слова або символи, які Ви збираєтеся шукати, потім натисніть Enter. "
+"Якщо для введеного Вами знайдеться збіг, екран переміститься до найближчого "
+"збігу.\n"
 "\n"
+" Попередній рядок пошуку буде показано у дужках після запрошення 'Пошук:'. "
+"Натиснення Enter без редагування тексту продовжить попередній пошук.  "
 
-#: src/help.c:269
+#: src/help.c:238
 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"
@@ -1123,9 +1176,14 @@ msgid ""
 " The following function keys are available in Insert File mode:\n"
 "\n"
 msgstr ""
+"Якщо вам потрібен ще один порожній буфер, не вводьте жодної назви файла або "
+"вкажіть файл, якого не існує, потім натисніть Enter.\n"
+"\n"
+" У режимі «Вставка файла» можна скористатися такими функціональними "
+"клавішами:\n"
+"\n"
 
-#: src/help.c:275
-#, fuzzy
+#: src/help.c:244
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1140,20 +1198,21 @@ msgid ""
 " The following function keys are available in Write File mode:\n"
 "\n"
 msgstr ""
-"����� �������� ������ �������� ����\n"
+"Довідка до режиму «Запис файла»\n"
 "\n"
-" ���Ħ�� ��'� Ц� ���� �� ������� �������� �������� ���� �� �����Φ�� "
-"Enter.\n"
+" Наберіть назву, яку слід використати для поточного файла і натисніть Enter, "
+"щоб зберегти його.\n"
 "\n"
-" ���� �� ������դ���� ����� צ�ͦ��� �� Ctrl-^ �� ��ͦ���� ������ �����, "
-"�'������� ����� �� �������, �� �������� ������� ���� � ������� ����. ��� "
-"�������� ����� ���������� ��������� ����� ���� �������� ����� �����, ��'� "
-"��������� ����� �� ���� ��'�� �� ���������� � ����� ����ͦ.\n"
+" Якщо у файлі є позначений текст, вам запропонують зберегти лише позначений "
+"текст до окремого файла. Щоб зменшити ймовірність перезапису поточного файла "
+"лише його частиною, у цьому режимі поточна назва файла не є його типовою "
+"назвою.\n"
 "\n"
-" ������Φ ����æ�����Φ ���צۦ ����Φ � ����ͦ �������� ����\n"
+" У режимі «Запис файла» можна скористатися такими функціональними "
+"клавішами:\n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:258
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1166,20 +1225,20 @@ msgid ""
 " The following function keys are available in the file browser:\n"
 "\n"
 msgstr ""
-"����� �������� ������ ���������� ���̦�\n"
+"Текст довідки режиму «Перегляд файлів»\n"
 "\n"
-" ���������� ���̦� ����������դ���� ��� צ��������� ��������� �ͦ��� "
-"�������Ҧ� �� �������� ���Ҧ����� ����� ��� ������ ��� �������. �� ����� "
-"������������� ���צ���� ��������� �������� �� PageUp/PageDown ��� "
-"����������� �Ҧ�� �����, �� ������� ���Ҧ���� ���� ��� ������� �� �����ϧ "
-"�������Ҧ� ���צ��� S ��� Enter. ��� ����ͦ������� �� �������Ҧ� ����, "
-"���Ҧ�� �������Ҧ� \"..\" � ������� ������ ���̦�.\n"
+" Переглядач файлів використовується для візуального перегляду вмісту "
+"каталогу та вибору потрібного файла для запису або читання. Ви маєте "
+"користуватись клавішами керування курсором та PageUp/PageDown для "
+"пересування крізь файли, та обирати потрібний файл або входити до вибраного "
+"каталогу клавішею S або Enter. Щоб перейти на каталог вище, виберіть каталог "
+"«..» на початку списку файлів.\n"
 "\n"
-" ������Φ ����æ�����Φ ���צۦ ����Φ � ����ͦ ���������� ���̦�:\n"
+" У режимі перегляду файлів можна скористатися такими функціональними "
+"клавішами:\n"
 "\n"
 
-#: src/help.c:302
-#, fuzzy
+#: src/help.c:271
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1192,27 +1251,25 @@ msgid ""
 "search.\n"
 "\n"
 msgstr ""
-"����� �������� ������� ������\n"
-"\n"
-" ���Ħ�� ����� ��� ̦���� �˦ �� �������, �� �����Φ�� Enter. ���� ��� "
-"������ϧ ���� ����� ���������� צ���צ���� �¦�, ����� ����ͦ������� � "
-"��������� ������� ����� �¦��.\n"
+"Довідка до режиму пошуку\n"
 "\n"
-" ��������� ����� �¦�� �'������� � ���������� ������ Ц��� ���������� "
-"\"�����:\". ���������� Enter ��� ����������� ����-����� ������ �������� �� "
-"������ ���������ϧ ����� �¦��.\n"
+" Введіть слова або символи, які ви збираєтеся шукати, потім натисніть Enter. "
+"Якщо для введеного вами знайдеться збіг, екран переміститься у місце поблизу "
+"від знайденого збігу.\n"
 "\n"
-" ������Φ ����æ�����Φ ���צۦ ����Φ � ����ͦ ������:\n"
+" Попередній рядок пошуку буде показано у дужках після запрошення «Пошук:». "
+"Натиснення Enter без редагування тексту продовжить попередній пошук.\n"
 "\n"
 
-#: src/help.c:311
+#: src/help.c:280
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
 msgstr ""
+" В режимі пошуку можна скористатися такими функціональними клавішами:\n"
+"\n"
 
-#: src/help.c:315
-#, fuzzy
+#: src/help.c:284
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1224,19 +1281,18 @@ msgid ""
 " The following function keys are available in Browser Go To Directory mode:\n"
 "\n"
 msgstr ""
-"����� �������� ������ ����������� ���̦� ��_�������Ҧ�\n"
+"Довідка щодо режиму «До каталогу»\n"
 "\n"
-" ���Ħ�� ��'� �������Ҧ�, ��� �� ������� �����������.\n"
+" Введіть назву каталогу, до якого слід перейти.\n"
 "\n"
-" ���� tab-���������� �� ����������, �� ������ ������������� ���צ��� TAB ��� "
-"(������) ������������� ���������� ����� �������Ҧ�.\n"
+" Якщо доповнення за Tab не було вимкнено, ви можете скористатися клавішею "
+"Tab [спроби] автоматичного доповнення назви каталогу.\n"
 "\n"
-" ������Φ ����æ�����Φ ���צۦ ����Φ � ����ͦ ����������� ���̦� "
-"��_�������Ҧ�:\n"
+" У режимі переходу до каталогу можна скористатися такими функціональними "
+"клавішами:\n"
 "\n"
 
-#: src/help.c:328
-#, fuzzy
+#: src/help.c:297
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1249,18 +1305,18 @@ msgid ""
 " The following function keys are available in Spell Check mode:\n"
 "\n"
 msgstr ""
-"����� �������� ������ ��������\n"
+"Текст довідки перевірки правопису\n"
 "\n"
-" �������� ����צ��� ��������� ����צ�Ѥ �������Ʀ� ������ ������ � ��������� "
-"���̦. ���� ����Ҧ������� ��������� �����, ���� ��Ħ�Ѥ���� �� �'���Ѥ���� "
-"�����צ��� צ����������� ����������� ��ͦ��. ��Ԧ� �'������� ����� �� ��ͦ�� "
-"������� ��������� ����� ����������� ����� � ��������� ���̦.\n"
+" Програма перевірки правопису перевіряє орфографію усього тексту поточного "
+"файла. Якщо знайдено невідоме слово, воно підсвічується та з’являється "
+"редагована заміна цьому слову. Потім буде з’являтися запрошення для заміни "
+"кожного входження даного помилково написаного слова у поточному файлі.\n"
 "\n"
-" ������Φ ��ۦ ����æ� ����Φ � ����ͦ ��������:\n"
+" У режимі перевірки правопису можна скористатися такими функціональними "
+"клавішами:\n"
 "\n"
 
-#: src/help.c:343
-#, fuzzy
+#: src/help.c:312
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1271,16 +1327,17 @@ msgid ""
 " The following function keys are available in Execute Command mode:\n"
 "\n"
 msgstr ""
-"����� �������� ������ ������ �������\n"
+"Текст довідки режиму Зовнішня Команда\n"
 "\n"
-" �� ���� ������Ѥ ��� �������� ��צ� �������, �� ���������������� � "
-"������æ, � �������� ����� (��� � ����� ����� � ������-��������� ����ͦ).\n"
+" Це меню дозволяє вам вставити вивід команди, виконаної у командному "
+"інтерпретаторі, у поточний файловий буфер (або у новий буфер у "
+"мультибуферному режимі). Якщо вам потрібен інший порожній буфер, не вводьте "
+"ніякої команди взагалі.\n"
 "\n"
-" ������Φ ���צۦ ����Φ � ����� ����ͦ:\n"
+" Наступні функціональні клавіші доступні у режимі Зовнішня Команда:\n"
 "\n"
 
-#: src/help.c:356
-#, fuzzy
+#: src/help.c:325
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1291,25 +1348,16 @@ msgid ""
 "showing the file being edited.  The status line is the third line from the "
 "bottom and shows important messages.  "
 msgstr ""
-" ����� �������� nano\n"
-"\n"
-" ��������  nano  ����������  ���  �����æ�  ����æ��������Ԧ  ��  �������� "
-"������������ ���������  UW Pico.  �������� ��Ħ�Ѥ���� �� 4 �����Φ ���æ�: "
-"����Φ� ����� ͦ����� ���Ӧ� ��������, ��'� ��������� �����, �� �����դ����, "
-"�� �������æ� ��� ��, �� ������� ����-�˦ �ͦ�� �� �����. �������� ���æ� - "
-"�� ������� צ��� �����������, � ����� (���� ������ �����������) ����� "
-"�������� �ͦ�� ��������� �����. ����� ������� � 3-� ����� ������ �� ͦ����� "
-"�����צ ��צ��������. �����Φ ��� ����� ͦ����� ���¦��� ������Φ ���¦��æ� "
-"���צ� ���������.\n"
-"\n"
-"  ������� �� ���¦��æ�: ���¦��æ� � ���צ��� Control ������Φ �� �������� "
-"'^' ��  ���������  �  ����������  ���צ���  Control (Ctrl).   Esc-���¦��æ� "
-"������Φ �������� 'M' �� ��������� � ������������� ���צۦ Esc, Alt ��� Meta "
-"� ��������Ԧ צ�  ���ϧ ���צ�����. ������Φ ���¦��æ� ������Φ � ��������� "
-"צ�Φ �����������. �������צ ���¦��æ� ������Φ � ������:\n"
+"Текст довідки nano\n"
 "\n"
+" Редактор nano розроблено для емуляції функціональності та простоти "
+"використання оригінального редактора UW Pico.  Редактор розбито на 4 основні "
+"частини: верхній рядок містить версію програми, назву поточного файла, який  "
+"редагується, та чи було внесено зміни у поточний файл. Друга частина — це "
+"головне вікно редагування, у якому  показано редагований файл. Рядок стану — "
+"3 рядок знизу — містить різні важливі повідомлення.  "
 
-#: src/help.c:366
+#: src/help.c:335
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1319,8 +1367,15 @@ msgid ""
 "notated with the Meta (M-) symbol and can be entered using either the Esc, "
 "Alt, or Meta key depending on your keyboard setup.  "
 msgstr ""
+"Два рядки знизу показують найчастіше використовувані комбінації клавіш.\n"
+"\n"
+" Система позначень комбінацій клавіш наступна: комбінації з Control "
+"позначено символом (^), їх можна ввести за допомогою натискання клавіші "
+"Control (Ctrl) або подвійного натискання клавіші Escape (Esc); Комбінації з "
+"Esc позначено символом Meta (M), їх можна ввести за допомогою клавіш Esc, "
+"Alt або Meta, залежно від моделі використаної клавіатури.  "
 
-#: src/help.c:375
+#: src/help.c:344
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1328,484 +1383,494 @@ msgid ""
 "keys are shown in parentheses:\n"
 "\n"
 msgstr ""
+"Також, за допомогою подвійного натискання Esc та введення тризначного числа "
+"від 000 до 255 можна ввести символ з відповідним номером у коді. У основному "
+"вікні редагування можна скористатися вказаними нижче комбінаціями клавіш. "
+"Альтернативні комбінації наведено у дужках:\n"
+"\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:376 src/help.c:448
 msgid "enable/disable"
-msgstr "���������/����������"
+msgstr "дозволити/заборонити"
 
-#: src/nano.c:587
-#, fuzzy
+#: src/nano.c:601
 msgid "Key invalid in view mode"
-msgstr "��צ��� ������ � ����ͦ VIEW"
+msgstr "Некоректна клавіша у режимі перегляду"
 
-#: src/nano.c:695
+#: src/nano.c:713
 #, c-format
 msgid ""
 "\n"
 "Buffer written to %s\n"
 msgstr ""
 "\n"
-"����� �������� �� %s\n"
+"Буфер записано до %s\n"
 
-#: src/nano.c:697
-#, fuzzy, c-format
+#: src/nano.c:715
+#, c-format
 msgid ""
 "\n"
 "Buffer not written to %s: %s\n"
 msgstr ""
 "\n"
-"����� �������� �� %s\n"
+"Буфер не записано до %s: %s\n"
 
-#: src/nano.c:700
-#, fuzzy, c-format
+#: src/nano.c:718
+#, c-format
 msgid ""
 "\n"
 "Buffer not written: %s\n"
 msgstr ""
 "\n"
-"����� �������� �� %s\n"
+"Буфер не записано: %s\n"
 
-#: src/nano.c:723
+#: src/nano.c:743
 msgid "Window size is too small for nano...\n"
-msgstr "���ͦ� צ��� ������� ��� Nano...\n"
+msgstr "Розмір вікна замалий для nano...\n"
 
-#: src/nano.c:816
+#: src/nano.c:836
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
 "\n"
 msgstr ""
+"Використання: nano [ПАРАМЕТРИ] [[+РЯДОК,СТОВПЧИК] ФАЙЛ]...\n"
+"\n"
 
-#: src/nano.c:819
-#, fuzzy, c-format
+#: src/nano.c:839
+#, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
-msgstr "��æ�\t\t���Ǧ ��æ�\t\t��������\n"
+msgstr "Параметр\t\tДовга форма\t\tПризначення\n"
 
-#: src/nano.c:821
+#: src/nano.c:841
 #, c-format
 msgid "Option\t\tMeaning\n"
-msgstr "��æ�\t\t��������\n"
-
-#: src/nano.c:824
-msgid "Show this message"
-msgstr "�������� �� ��צ��������"
+msgstr "Параметр\t\tПризначення\n"
 
-#: src/nano.c:825
+#: src/nano.c:844
 msgid "+LINE,COLUMN"
-msgstr ""
+msgstr "+РЯДОК,СТОВПЧИК"
 
-#: src/nano.c:826
-#, fuzzy
+#. TRANSLATORS: The next forty or so strings are option descriptions
+#. * for the --help output.  Try to keep them at most 40 characters.
+#: src/nano.c:847
 msgid "Start at line LINE, column COLUMN"
-msgstr "������ � ����� ����� �����"
+msgstr "Почати зі вказаного рядка та позиції"
 
-#: src/nano.c:828
-#, fuzzy
+#: src/nano.c:849
 msgid "Enable smart home key"
-msgstr "��������� ����"
+msgstr "Увімкнути розумну кнопку Home"
 
-#: src/nano.c:829
-#, fuzzy
+#: src/nano.c:850
 msgid "Save backups of existing files"
-msgstr "������ ������Φ ��Ц� �������� ���̦� ��� ������"
+msgstr "Зберігати резервні копії наявних файлів"
 
-#: src/nano.c:830
-#, fuzzy
+#: src/nano.c:851
 msgid "-C <dir>"
-msgstr "-o [���]"
+msgstr "-C <кат>"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "--backupdir=<dir>"
-msgstr ""
+msgstr "--backupdir=<dir>"
 
-#: src/nano.c:831
+#: src/nano.c:852
 msgid "Directory for saving unique backup files"
-msgstr ""
+msgstr "Каталог для зберігання унікальних резервних копій"
 
-#: src/nano.c:834
+#: src/nano.c:855
 msgid "Use bold instead of reverse video text"
-msgstr ""
+msgstr "Використовувати жирний шрифт замість звичайного"
 
-#: src/nano.c:837
+#: src/nano.c:858
 msgid "Convert typed tabs to spaces"
-msgstr ""
+msgstr "Перетворювати табуляції у пробіли"
 
-#: src/nano.c:840
+#: src/nano.c:861
 msgid "Enable multiple file buffers"
-msgstr "��������� ��˦���� �������� ����Ҧ�"
+msgstr "Дозволити декілька файлових буферів"
 
-#: src/nano.c:845
+#: src/nano.c:865
+msgid "Use (vim-style) lock files"
+msgstr "Використовувати файли блокування (як у vim)"
+
+#: src/nano.c:869
 msgid "Log & read search/replace string history"
-msgstr "����� ������ �� ������ ����Ҧ� ���� ������/��ͦ��"
+msgstr "Вести журнал та читати історію умов пошуку/заміни"
 
-#: src/nano.c:848
+#: src/nano.c:873
 msgid "Don't look at nanorc files"
-msgstr "�� �������� � nanorc �����"
+msgstr "Не використовувати файли nanorc"
 
-#: src/nano.c:851
+#: src/nano.c:876
 msgid "Fix numeric keypad key confusion problem"
-msgstr ""
+msgstr "Виправляти проблему малої клавіатури"
 
-#: src/nano.c:853
+#: src/nano.c:878
 msgid "Don't add newlines to the ends of files"
-msgstr ""
+msgstr "Не додавати порожні рядки у кінці файла"
 
-#: src/nano.c:856
+#: src/nano.c:881
 msgid "Don't convert files from DOS/Mac format"
-msgstr "���� �������������� �� DOS/Mac �������"
+msgstr "Не перетворювати файли з формату DOS/Mac"
 
-#: src/nano.c:858
+#: src/nano.c:883
 msgid "Use one more line for editing"
-msgstr ""
+msgstr "Використовувати додатковий рядок для редагування"
 
-#: src/nano.c:860
-#, fuzzy
+#: src/nano.c:886
+msgid "Log & read location of cursor position"
+msgstr "Записувати до журналу і читати позицію курсора"
+
+#: src/nano.c:889
 msgid "-Q <str>"
-msgstr "-Q [�����]"
+msgstr "-Q <ряд>"
 
-#: src/nano.c:860
-#, fuzzy
+#: src/nano.c:889
 msgid "--quotestr=<str>"
-msgstr "--quotestr=[�����]"
+msgstr "--quotestr=<ряд>"
 
-#: src/nano.c:861
-#, fuzzy
+#: src/nano.c:890
 msgid "Quoting string"
-msgstr "����� ���������, �� ���������� \"> \""
+msgstr "Рядок цитування"
 
-#: src/nano.c:863
+#: src/nano.c:892
 msgid "Restricted mode"
-msgstr ""
+msgstr "Обмежений режим"
 
-#: src/nano.c:866
+#: src/nano.c:895
 msgid "Scroll by line instead of half-screen"
-msgstr ""
+msgstr "Гортати на рядок, а не на пів екрана"
 
-#: src/nano.c:868
-#, fuzzy
+#: src/nano.c:897
 msgid "-T <#cols>"
-msgstr "-r [#�����]"
+msgstr "-T <#число>"
 
-#: src/nano.c:868
-#, fuzzy
+#: src/nano.c:897
 msgid "--tabsize=<#cols>"
-msgstr "--tabsize=[���]"
+msgstr "--tabsize=<#число>"
 
-#: src/nano.c:869
-#, fuzzy
+#: src/nano.c:898
 msgid "Set width of a tab to #cols columns"
-msgstr "���������� ���ͦ� ������æ� =���"
+msgstr "Встановити ширину табуляції у #число позицій"
 
-#: src/nano.c:871
+#: src/nano.c:900
 msgid "Do quick statusbar blanking"
-msgstr ""
+msgstr "Використовувати швидке очищування рядка стану"
 
-#: src/nano.c:874
+#: src/nano.c:903
 msgid "Print version information and exit"
-msgstr "�������� ���Ӧ� �� �����"
+msgstr "Показати версію та вийти"
 
-#: src/nano.c:877
+#: src/nano.c:906
 msgid "Detect word boundaries more accurately"
-msgstr ""
+msgstr "Використовувати більш точне визначення меж слів"
 
-#: src/nano.c:880
-#, fuzzy
+#: src/nano.c:909
 msgid "-Y <str>"
-msgstr "-Y [�����]"
+msgstr "-Y <ряд>"
 
-#: src/nano.c:880
-#, fuzzy
+#: src/nano.c:909
 msgid "--syntax=<str>"
-msgstr "--syntax [�����]"
+msgstr "--syntax=<ряд>"
 
-#: src/nano.c:881
-#, fuzzy
+#: src/nano.c:910
 msgid "Syntax definition to use for coloring"
-msgstr "���������� ���������� �� ������������"
+msgstr "Опис синтаксису, який слід використовувати для розфарбування"
 
-#: src/nano.c:883
+#: src/nano.c:912
 msgid "Constantly show cursor position"
-msgstr "���Ԧ��� ���������� ����æ� �������"
+msgstr "Постійно показувати позицію курсора"
 
-#: src/nano.c:885
+#: src/nano.c:914
 msgid "Fix Backspace/Delete confusion problem"
-msgstr ""
+msgstr "Виправити проблему Backspace/Delete"
+
+#: src/nano.c:915
+msgid "Show this help text"
+msgstr "Показати цю довідку"
 
-#: src/nano.c:888
+#: src/nano.c:918
 msgid "Automatically indent new lines"
-msgstr "����������� ��Ҧ������� ��צ �����"
+msgstr "Автоматично вирівнювати нові рядки"
 
-#: src/nano.c:889
-#, fuzzy
+#: src/nano.c:919
 msgid "Cut from cursor to end of line"
-msgstr "��������� ^K ��Ҧ���� צ� ������� �� ˦��� �����"
+msgstr "Вирізати від курсора до кінця рядка"
 
-#: src/nano.c:892
+#: src/nano.c:922
 msgid "Don't follow symbolic links, overwrite"
-msgstr "�� ��� �� Ӧ�̦�����, ��� ������������"
+msgstr "Не переходити за символічним посиланнями, перезаписувати"
 
-#: src/nano.c:894
-#, fuzzy
+#: src/nano.c:924
 msgid "Enable the use of the mouse"
-msgstr "��������� ����"
+msgstr "Дозволити використання миші"
 
-#: src/nano.c:897
-#, fuzzy
+#: src/nano.c:926
+msgid "Do not read the file (only write it)"
+msgstr "Не читати файл (лише записувати до нього)"
+
+#: src/nano.c:928
 msgid "-o <dir>"
-msgstr "-o [���]"
+msgstr "-o <кат>"
 
-#: src/nano.c:897
-#, fuzzy
+#: src/nano.c:928
 msgid "--operatingdir=<dir>"
-msgstr "--operatingdir=[���]"
+msgstr "--operatingdir=<кат>"
 
-#: src/nano.c:898
+#: src/nano.c:929
 msgid "Set operating directory"
-msgstr "���������� ������� �������"
+msgstr "Встановити робочий каталог"
 
-#: src/nano.c:901
+#: src/nano.c:932
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
-msgstr "�������� ���צ�� XON (^Q) �� XOFF (^S)"
+msgstr "Зберегти клавіші XON (^Q) та XOFF (^S)"
 
-#: src/nano.c:903
+#: src/nano.c:935
 msgid "Silently ignore startup issues like rc file errors"
-msgstr ""
+msgstr "Мовчки ігнорувати помилки запуску, наприклад rc-файла"
 
-#: src/nano.c:905
-#, fuzzy
+#: src/nano.c:938
 msgid "-r <#cols>"
-msgstr "-r [#�����]"
+msgstr "-r <#поз>"
 
-#: src/nano.c:905
-#, fuzzy
+#: src/nano.c:938
 msgid "--fill=<#cols>"
-msgstr "--fill=[#�����]"
+msgstr "--fill=<#поз>"
 
-#: src/nano.c:906
-msgid "Set wrapping point at column #cols"
-msgstr ""
+#: src/nano.c:939
+msgid "Set hard-wrapping point at column #cols"
+msgstr "Встановити значення позиції жорсткого перенесення #поз"
 
-#: src/nano.c:909
-#, fuzzy
+#: src/nano.c:942
 msgid "-s <prog>"
-msgstr "-s [����]"
+msgstr "-s <програма>"
 
-#: src/nano.c:909
-#, fuzzy
+#: src/nano.c:942
 msgid "--speller=<prog>"
-msgstr "--speller=[����]"
+msgstr "--speller=<програма>"
 
-#: src/nano.c:910
+#: src/nano.c:943
 msgid "Enable alternate speller"
-msgstr "������������� �������� ����צ��� ���������"
+msgstr "Альтернативна програма перевірки правопису"
 
-#: src/nano.c:913
+#: src/nano.c:946
 msgid "Auto save on exit, don't prompt"
-msgstr "��������� ��� ����Ħ, ��� ��������"
+msgstr "Автоматичне збереження при виході, без запитань"
 
-#: src/nano.c:915
-msgid "Allow generic undo [EXPERIMENTAL]"
-msgstr ""
-
-#: src/nano.c:918
-#, fuzzy
+#: src/nano.c:947
 msgid "View mode (read-only)"
-msgstr "����� ������������ (Ԧ���� �������)"
+msgstr "Режим перегляду (лише читання)"
 
-#: src/nano.c:920
-msgid "Don't wrap long lines"
-msgstr "�� ��������� ���Ǧ �����"
+#: src/nano.c:949
+msgid "Don't hard-wrap long lines"
+msgstr "Не переносити надто довгі рядки жорстко"
 
-#: src/nano.c:922
-#, fuzzy
+#: src/nano.c:951
 msgid "Don't show the two help lines"
-msgstr "�� ���������� צ��� ��������"
+msgstr "Не показувати два рядка довідки внизу"
 
-#: src/nano.c:923
-#, fuzzy
+#: src/nano.c:952
 msgid "Enable suspension"
-msgstr "��������� ����������"
+msgstr "Дозволити призупинення"
 
-#: src/nano.c:924
+#: src/nano.c:954
 msgid "Enable soft line wrapping"
-msgstr ""
-
-#: src/nano.c:928
-msgid "(ignored, for Pico compatibility)"
-msgstr "(����������, ��� ��ͦ����Ԧ �� Pico)"
+msgstr "Увімкнути м’яке перенесення рядків"
 
-#: src/nano.c:938
+#: src/nano.c:963
 #, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
-msgstr " GNU nano ���Ӧ� %s (ڦ����� %s, %s)\n"
+msgid " GNU nano, version %s\n"
+msgstr " GNU nano версії %s\n"
 
-#: src/nano.c:943
+#: src/nano.c:966
 #, 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"
+msgstr " Ел. пошта: nano@nano-editor.org\tІнтернет: http://www.nano-editor.org"
 
-#: src/nano.c:944
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
 " Compiled options:"
 msgstr ""
 "\n"
-" ������� � ����:"
+" Зібрано з таким параметрами:"
 
-#: src/nano.c:1022
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
-msgstr "�������, Ц������� æ�� ����æ� ���� ����������"
+msgstr "Вибачте, підтримку цієї функції вимкнено"
 
-#: src/nano.c:1044
+#: src/nano.c:1125
+msgid "No file name"
+msgstr "Немає назви файла"
+
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
-msgstr "�������� �ͦ����� ����� (�����צ�� \"�\" ������ �� �����) ? "
+msgstr "Зберегти змінений буфер (Відповідь «Ні» СКАСУЄ ВСІ ЗМІНИ)? "
 
-#: src/nano.c:1088
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
-msgstr ""
+msgstr "Не вдалося повторно відкрити стандартний ввід з клавіатури\n"
 
-#: src/nano.c:1114
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
-msgstr ""
+msgstr "Читання зі стандартного вводу. ^C для переривання\n"
 
-#: src/nano.c:1182
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
-msgstr "�������� SIGHUP ��� SIGTERM\n"
+msgstr "Прийнято SIGHUP або SIGTERM\n"
 
-#: src/nano.c:1204
-#, fuzzy, c-format
+#: src/nano.c:1301
+#, c-format
 msgid "Use \"fg\" to return to nano.\n"
-msgstr "������������ �������� \"fg\" ��� ����, ��� ����������� �� nano"
+msgstr "Використовуйте «fg» для повернення у nano\n"
 
-#: src/nano.c:1386
+#: src/nano.c:1481
 msgid "enabled"
-msgstr "���������"
+msgstr "дозволено"
 
-#: src/nano.c:1387
+#: src/nano.c:1481
 msgid "disabled"
-msgstr "����������"
+msgstr "заборонено"
 
-#: src/nano.c:1548 src/winio.c:1256
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
-msgstr ""
+msgstr "Невідома команда"
 
-#: src/nano.c:1674
-#, fuzzy
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
-msgstr "XON ����������, ���-���-���"
+msgstr "XON проігноровано, мр-бр-бр"
 
-#: src/nano.c:1679
-#, fuzzy
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
-msgstr "XOFF ����������, ����-�-�"
+msgstr "XOFF проігноровано, мр-бр-бр"
 
-#: src/nano.c:2209 src/rcfile.c:1100
-#, fuzzy, c-format
+#: src/nano.c:2310 src/rcfile.c:1325
+#, c-format
 msgid "Requested tab size \"%s\" is invalid"
-msgstr "���������� ���ͦ� ������æ� %d � �����������"
+msgstr "Запитаний розмір табуляції «%s» не підходить"
 
-#: src/nano.c:2268 src/rcfile.c:1025
-#, fuzzy, c-format
+#: src/nano.c:2374 src/rcfile.c:1250
+#, c-format
 msgid "Requested fill size \"%s\" is invalid"
-msgstr "��������� ���ͦ� ���������� %d � �����������"
+msgstr "Запитаний некоректний розмір заповнення \"%s\""
+
+#: src/nano.c:2415
+#, c-format
+msgid "Type '%s -h' for a list of available options.\n"
+msgstr "Введіть команду «%s -h», щоб отримати список доступних параметрів.\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:1259
+#: src/prompt.c:1055
 msgid "Yy"
-msgstr "Yy��"
+msgstr "YyТт"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1056
 msgid "Nn"
-msgstr "Nn��"
+msgstr "NnНн"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1057
 msgid "Aa"
-msgstr "Aa��"
+msgstr "AaВв"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1071
 msgid "Yes"
-msgstr "���"
+msgstr "Так"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1076
 msgid "All"
-msgstr "���"
+msgstr "Все"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1081
 msgid "No"
-msgstr "�"
+msgstr "Ні"
 
-#: src/rcfile.c:130
-#, fuzzy, c-format
+#: src/rcfile.c:137
+#, c-format
 msgid "Error in %s on line %lu: "
-msgstr "������� � %s � ����� %d: "
+msgstr "Помилка в %s на рядку %lu: "
 
-#: src/rcfile.c:185
-#, fuzzy, c-format
+#: src/rcfile.c:196
+#, c-format
 msgid "Argument '%s' has an unterminated \""
-msgstr "�������� %s ��� ��˦��������� �� \""
+msgstr "Аргумент %s має незакриту \""
 
-#: src/rcfile.c:212 src/rcfile.c:264 src/rcfile.c:711 src/rcfile.c:768
-#: src/rcfile.c:821
-#, fuzzy
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
 msgstr ""
-"����� ���������� ����ڦ� �����Φ ���������� �� ��˦��������� �������� '\"'\n"
+"Рядки регулярних виразів повинні починатися та закінчуватися лапками (\")"
 
-#: src/rcfile.c:238 src/search.c:62
+#: src/rcfile.c:249 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
-msgstr "�� צ���� ���������� ����� \"%s\": %s"
+msgstr "Не вірний регулярний вираз \"%s\": %s"
 
-#: src/rcfile.c:258
+#: src/rcfile.c:269
 msgid "Missing syntax name"
-msgstr "�������� ����� ����������"
+msgstr "Відсутня назва синтаксису"
 
-#: src/rcfile.c:316
+#: src/rcfile.c:340
 msgid "The \"none\" syntax is reserved"
-msgstr ""
+msgstr "Синтаксис «none» зарезервовано"
 
-#: src/rcfile.c:323
+#: src/rcfile.c:347
 msgid "The \"default\" syntax must take no extensions"
-msgstr ""
+msgstr "Синтаксис \"default\" не може мати розширень"
 
-#: src/rcfile.c:386 src/rcfile.c:483
-#, fuzzy
+#: src/rcfile.c:433
 msgid "Missing key name"
-msgstr "�������� ����� ����������"
+msgstr "Відсутня назва клавіші"
 
-#: src/rcfile.c:398 src/rcfile.c:499
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
-msgstr ""
+#: src/rcfile.c:442 src/rcfile.c:453
+msgid "Key name is too short"
+msgstr "Назва клавіші є надто короткою"
 
-#: src/rcfile.c:407
-msgid "Must specify function to bind key to"
-msgstr ""
+#: src/rcfile.c:463
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
+msgstr "Назва клавіші має починатися з «^», «M» або «F»"
+
+#: src/rcfile.c:472
+msgid "Must specify a function to bind the key to"
+msgstr "Для прив’язування клавіші слід вказати функцію"
 
-#: src/rcfile.c:418 src/rcfile.c:510
-msgid "Must specify menu to bind key to (or \"all\")"
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:482
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
+"Слід вказати меню (або «all»), до якого слід прив’язати клавішу або "
+"відв’язати її"
 
-#: src/rcfile.c:426
-#, fuzzy, c-format
-msgid "Could not map name \"%s\" to a function"
-msgstr "�� ���� צ������ %s ��� ������: %s"
+#: src/rcfile.c:489
+#, c-format
+msgid "Cannot map name \"%s\" to a function"
+msgstr "Не можна пов’язати назву «%s» з функцією"
 
-#: src/rcfile.c:432 src/rcfile.c:517
-#, fuzzy, c-format
-msgid "Could not map name \"%s\" to a menu"
-msgstr "�� ���� �������� \"%s\""
+#: src/rcfile.c:496
+#, c-format
+msgid "Cannot map name \"%s\" to a menu"
+msgstr "Неможливо пов’язати назву «%s» з меню"
 
-#: src/rcfile.c:454
+#: src/rcfile.c:528
 #, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
-msgstr ""
+msgid "Function '%s' does not exist in menu '%s'"
+msgstr "У меню «%2$s» немає пункту «%1$s»"
+
+#: src/rcfile.c:543
+#, c-format
+msgid "Sorry, keystroke \"%s\" may not be rebound"
+msgstr "Вибачте, призначення «%s» змінювати не можна"
+
+#: src/rcfile.c:629
+#, c-format
+msgid "Error expanding %s: %s"
+msgstr "Помилка під час розгортання %s: %s"
 
-#: src/rcfile.c:625
-#, fuzzy, c-format
+#: src/rcfile.c:672
+#, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
 "Valid colors are \"green\", \"red\", \"blue\",\n"
@@ -1813,907 +1878,492 @@ msgid ""
 "\"black\", with the optional prefix \"bright\"\n"
 "for foreground colors."
 msgstr ""
-"��̦� %s �� �����ͦ���.\n"
-"����Φ ������� - \"green\", \"red\", \"blue\", \n"
-"\"white\", \"yellow\", \"cyan\", \"magenta\" �� \n"
-"\"black\", � ��æ�������� ���Ʀ���� \"bright\".\n"
+"Колір «%s» не зовсім зрозумілий.\n"
+"Дозволені кольори - «green», «red», «blue»,\n"
+"«white», «yellow», «cyan», «magenta» та\n"
+"«black», з необов’язковим  префіксом «bright»\n"
+"для кольору тла."
 
-#: src/rcfile.c:647
-#, fuzzy
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
-msgstr "�� ���� ������ ������� ������� ��� ����� ����������"
+msgstr "Не вдається додати команду кольору без команди синтаксису"
 
-#: src/rcfile.c:652
+#: src/rcfile.c:699
 msgid "Missing color name"
-msgstr "�������� ����� �������"
+msgstr "Відсутня назва кольору"
 
-#: src/rcfile.c:672
+#: src/rcfile.c:709 src/rcfile.c:870
+msgid "Missing regex string"
+msgstr "Не вказано регулярний вираз"
+
+#: src/rcfile.c:785
+msgid "\"start=\" requires a corresponding \"end=\""
+msgstr "\"start=\" потребує відповідного \"end=\""
+
+#: src/rcfile.c:837
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
-msgstr ""
+msgstr "Колір тла \"%s\" не може бути світлим"
 
-#: src/rcfile.c:690 src/rcfile.c:809
-msgid "Missing regex string"
+#: src/rcfile.c:865
+msgid "Cannot add a header regex without a syntax command"
+msgstr "Не вдається додати рег. вираз заголовку без команди синтаксису"
+
+#: src/rcfile.c:921
+msgid "Cannot add a magic string regex without a syntax command"
 msgstr ""
+"Не вдалося додати формальний вираз контрольного рядка без команди синтаксису"
 
-#: src/rcfile.c:762
-msgid "\"start=\" requires a corresponding \"end=\""
-msgstr "\"start=\" ������դ צ���צ����� \"end=\""
+#: src/rcfile.c:926
+msgid "Missing magic string name"
+msgstr "Не вистачає назви контрольного рядка"
 
-#: src/rcfile.c:804
-#, fuzzy
-msgid "Cannot add a header regex without a syntax command"
-msgstr "�� ���� ������ ������� ������� ��� ����� ����������"
+#: src/rcfile.c:985
+msgid "Cannot add a linter without a syntax command"
+msgstr "Не можна додавати linter без команди синтаксису"
+
+#: src/rcfile.c:990
+msgid "Missing linter command"
+msgstr "Не вистачає програми linter"
 
-#: src/rcfile.c:874
+#: src/rcfile.c:1010
+msgid "Cannot add formatter without a syntax command"
+msgstr "Не можна додавати formatter без команди синтаксису"
+
+#: src/rcfile.c:1015
+msgid "Missing formatter command"
+msgstr "Не вистачає програми formatter"
+
+#: src/rcfile.c:1045
 #, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
-msgstr ""
+msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
+msgstr "Критична помилка: з функцією «%s» не пов’язано клавіш. Виходимо.\n"
 
-#: src/rcfile.c:876
+#: src/rcfile.c:1047
+#, c-format
 msgid ""
-"Exiting.  Please use nano with the -I option if needed to adjust your nanorc "
-"settings\n"
+"If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
+"Якщо потрібно, скористайтеся nano з параметром -I, щоб скоригувати параметри "
+"у nanorc.\n"
+
+#: src/rcfile.c:1108
+#, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "Не вдалося знайти синтаксичну конструкцію «%s» для розширення"
 
-#: src/rcfile.c:926 src/rcfile.c:935 src/rcfile.c:945
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
-msgstr ""
+msgstr "Команда \"%s\" не дозволена у включеному файлі"
 
-#: src/rcfile.c:951 src/rcfile.c:1128
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
-msgstr ""
+msgstr "Синтаксис \"%s\" не має колірних команд"
 
-#: src/rcfile.c:966
-#, fuzzy, c-format
+#: src/rcfile.c:1171
+#, c-format
 msgid "Command \"%s\" not understood"
-msgstr "������� %s �� �����ͦ��"
+msgstr "Не зрозуміла команда \"%s\""
 
-#: src/rcfile.c:972
-#, fuzzy
-msgid "Missing flag"
-msgstr "�������� ����� �������"
+#: src/rcfile.c:1186
+msgid "Missing option"
+msgstr "Пропущено параметр"
 
-#: src/rcfile.c:994
-#, fuzzy, c-format
+#: src/rcfile.c:1208
+#, c-format
 msgid "Option \"%s\" requires an argument"
-msgstr "��æ� %s ������դ ���������"
+msgstr "Опція \"%s\" вимагає аргумент"
 
-#: src/rcfile.c:1012
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
-msgstr ""
+msgstr "Опція не є припустимим багатобайтовим рядком"
 
-#: src/rcfile.c:1038 src/rcfile.c:1066 src/rcfile.c:1075
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
-msgstr ""
+msgstr "Вимагається непорожній символ"
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
-msgstr ""
+msgstr "Вимагається два одинарних символи"
 
-#: src/rcfile.c:1114
-#, fuzzy, c-format
-msgid "Cannot unset flag \"%s\""
-msgstr "������� ���� %d!\n"
+#: src/rcfile.c:1339
+#, c-format
+msgid "Cannot unset option \"%s\""
+msgstr "Неможливо скасувати визначення параметра «%s»"
 
-#: src/rcfile.c:1123
+#: src/rcfile.c:1345
 #, c-format
-msgid "Unknown flag \"%s\""
-msgstr ""
+msgid "Unknown option \"%s\""
+msgstr "Невідомий параметр «%s»"
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
-msgstr "� �� ���� ������ ���� ��ͦ���! ���!"
+msgstr "Я не можу знайти свою домівку! Жах!"
+
+#: src/rcfile.c:1442
+#, c-format
+msgid ""
+"\n"
+"Press Enter to continue starting nano.\n"
+msgstr ""
+"\n"
+"Натисніть Enter, щоб продовжити завантаження nano.\n"
 
 #: src/search.c:96
-#, fuzzy, c-format
+#, c-format
 msgid "\"%.*s%s\" not found"
-msgstr "\"%s\" �� ��������"
+msgstr "\"%.*s%s\" не знайдено"
+
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/search.c:184
+msgid " [Case Sensitive]"
+msgstr " [РегЗалеж]"
 
-#: src/search.c:205
-#, fuzzy
+#: src/search.c:188
+msgid " [Regexp]"
+msgstr " [ФормВир]"
+
+#: src/search.c:192
+msgid " [Backwards]"
+msgstr " [Назад]"
+
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:197
 msgid " (to replace) in selection"
-msgstr " (�� ��ͦ��)"
+msgstr " (що змінювати) у позначеному"
 
-#: src/search.c:207
+#: src/search.c:199
 msgid " (to replace)"
-msgstr " (�� ��ͦ��)"
+msgstr " (до заміни)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:769
 msgid "Replace this instance?"
-msgstr "��ͦ���� ��� ���ͦ����?"
+msgstr "Замінити цей примірник?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:945
 msgid "Replace with"
-msgstr "��ͦ���� ��"
+msgstr "Замінити на"
 
-#: src/search.c:1004
-#, fuzzy, c-format
+#: src/search.c:986
+#, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
-msgstr[0] "��ͦ���� %d ���������"
-msgstr[1] "��ͦ��Φ %d ���������"
-msgstr[2] "��ͦ���� %d ��������"
+msgstr[0] "Замінено %lu збіг"
+msgstr[1] "Замінено %lu збіги"
+msgstr[2] "Замінено %lu збігів"
 
-#: src/search.c:1034
-#, fuzzy
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1027
 msgid "Enter line number, column number"
-msgstr "���Ħ�� ����� �����"
+msgstr "Введіть номер рядка, номер ряду"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
-msgstr ""
+msgstr "Неправильний номер рядка або стовпчика"
 
-#: src/search.c:1214
+#: src/search.c:1207
 msgid "Not a bracket"
-msgstr "�� �����"
+msgstr "Не дужка"
 
-#: src/search.c:1281
+#: src/search.c:1274
 msgid "No matching bracket"
-msgstr "���� צ���צ��ϧ �����"
+msgstr "Нема відповідної дужки"
 
 #: src/text.c:54
 msgid "Mark Set"
-msgstr "����� �����������"
+msgstr "Мітку встановлено"
 
 #: src/text.c:58
-#, fuzzy
 msgid "Mark Unset"
-msgstr "����� �����"
+msgstr "Мітку знято"
 
-#: src/text.c:443
+#: src/text.c:439
 msgid "Nothing in undo buffer!"
-msgstr ""
+msgstr "Буфер скасування дій порожній!"
 
-#: src/text.c:455 src/text.c:593
+#: src/text.c:445 src/text.c:590
 #, c-format
-msgid "Internal error: can't match line %d.  Please save your work"
+msgid "Internal error: can't match line %d.  Please save your work."
 msgstr ""
+"Внутрішня помилка: не вдалося встановити відповідність рядка %d. Збережіть "
+"результати вашої роботи."
 
-#: src/text.c:466 src/text.c:603
+#: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
-msgstr ""
+msgstr "додавання тексту"
 
-#: src/text.c:475 src/text.c:613
-#, fuzzy
+#: src/text.c:467 src/text.c:612
 msgid "text delete"
-msgstr "��������� ����"
+msgstr "вилучення тексту"
 
-#: src/text.c:489 src/text.c:628
-msgid "line wrap"
-msgstr ""
-
-#: src/text.c:503 src/text.c:636
+#: src/text.c:491 src/text.c:641
 msgid "line join"
-msgstr ""
+msgstr "об’єднання рядків"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:505 src/text.c:657
 msgid "text cut"
-msgstr ""
+msgstr "обрізка тексту"
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:510 src/text.c:661
 msgid "text uncut"
-msgstr ""
+msgstr "скасування обрізки тексту"
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:515 src/text.c:623
 msgid "line break"
-msgstr ""
+msgstr "розрив рядка"
 
-#: src/text.c:532 src/text.c:665
-#, fuzzy
+#: src/text.c:528 src/text.c:672
 msgid "text insert"
-msgstr "��������� ����"
+msgstr "вставка тексту"
 
-#: src/text.c:550 src/text.c:659
-#, fuzzy
+#: src/text.c:549 src/text.c:665
 msgid "text replace"
-msgstr " (�� ��ͦ��)"
+msgstr "заміна тексту"
 
-#: src/text.c:557 src/text.c:671
-msgid "Internal error: unknown type.  Please save your work"
-msgstr ""
+#: src/text.c:556 src/text.c:679 src/text.c:983
+msgid "Internal error: unknown type.  Please save your work."
+msgstr "Внутрішня помилка: невідомий тип. Збережіть свою роботу"
 
-#: src/text.c:563
+#: src/text.c:561
 #, c-format
 msgid "Undid action (%s)"
-msgstr ""
+msgstr "Скасована дія (%s)"
 
-#: src/text.c:578
+#: src/text.c:580
 msgid "Nothing to re-do!"
-msgstr ""
+msgstr "Немає чого повторювати!"
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
+#: src/text.c:584
+msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
+"Внутрішня помилка: не вдалося налаштувати повторення дії. Збережіть "
+"результати вашої роботи."
 
-#: src/text.c:676
+#: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
-msgstr ""
+msgstr "Повторена дія (%s)"
 
-#: src/text.c:766
-msgid "Could not pipe"
-msgstr "�� ���� ��������� �� ������� (pipe)"
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
+msgid "Could not create pipe"
+msgstr "Не можу створити канал (pipe)"
 
-#: src/text.c:793 src/text.c:2636 src/text.c:2788
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
-msgstr "�� ���� ������� fork()"
+msgstr "Не можу зробити fork()"
 
-#: src/text.c:941
-msgid "Internal error: can't setup uncut.  Please save your work."
+#: src/text.c:969
+msgid "Internal error: cannot set up uncut.  Please save your work."
 msgstr ""
+"Внутрішня помилка: не вдалося налаштувати скасування відступів. Збережіть "
+"результати вашої роботи."
 
-#: src/text.c:950
-msgid "Internal error: unknown type.  Please save your work."
-msgstr ""
-
-#: src/text.c:1870
+#: src/text.c:1806
 #, c-format
 msgid "Bad quote string %s: %s"
-msgstr "������� ����� ��������� %s: %s"
+msgstr "Поганий рядок цитування %s: %s"
 
-#: src/text.c:2267
+#: src/text.c:2207
 msgid "Can now UnJustify!"
-msgstr "���� ����� �� ������Ҧ��������!"
+msgstr "Можу зараз же СкасВирівнювання!"
 
-#: src/text.c:2462
+#: src/text.c:2404
 msgid "Edit a replacement"
-msgstr "���������� ��ͦ��"
-
-#: src/text.c:2548
-msgid "Could not create pipe"
-msgstr "�� ���� �������� ����� (pipe)"
+msgstr "Редагувати заміну"
 
-#: src/text.c:2550
+#: src/text.c:2492
 msgid "Creating misspelled word list, please wait..."
-msgstr "������� ����̦� �������Ʀ���� �������, ���Ħ�� �-�����..."
+msgstr "Створюємо перелік орфографічних помилок, зачекайте..."
 
-#: src/text.c:2642
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
-msgstr "�� ���� �������� ���ͦ� ������ ������"
+msgstr "Не можу отримати розмір буферу каналу"
 
-#: src/text.c:2693
+#: src/text.c:2635
 msgid "Error invoking \"spell\""
-msgstr "������� ��������� \"spell\""
+msgstr "Помилка виконання \"spell\""
 
-#: src/text.c:2696
+#: src/text.c:2638
 msgid "Error invoking \"sort -f\""
-msgstr "������� ��������� \"sort -f\""
+msgstr "Помилка виконання \"sort -f\""
 
-#: src/text.c:2699
+#: src/text.c:2641
 msgid "Error invoking \"uniq\""
-msgstr "������� ��������� \"uniq\""
+msgstr "Помилка виконання \"uniq\""
 
-#: src/text.c:2756 src/text.c:2965
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
-msgstr "����צ��� �������Ʀ� ���������"
+msgstr "Перевірку орфографії завершено"
 
-#: src/text.c:2815
-#, fuzzy, c-format
+#: src/text.c:2759 src/text.c:3340
+#, c-format
 msgid "Error invoking \"%s\""
-msgstr "������� ��������� \"spell\""
+msgstr "Помилка виконання \"%s\""
+
+#: src/text.c:2885
+msgid "Invoking spell checker, please wait"
+msgstr "Викликаємо програму для пошуку друкарських помилок, зачекайте"
 
-#: src/text.c:2960
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
-msgstr "����צ��� �������Ʀ� �� �������: %s"
+msgstr "Перевірка орфографії не вдалася: %s"
 
-#: src/text.c:2962
-#, fuzzy, c-format
+#: src/text.c:2904
+#, c-format
 msgid "Spell checking failed: %s: %s"
-msgstr "����צ��� �������Ʀ� �� �������: %s"
+msgstr "Не вдалось перевірити орфографію: %s: %s"
+
+#: src/text.c:2937
+msgid "No linter defined for this type of file!"
+msgstr "Для цього типу файлів не визначено обробника!"
+
+#: src/text.c:2947
+msgid "Save modified buffer before linting?"
+msgstr "Зберегти змінений буфер перед обробкою?"
 
-#: src/text.c:3030
+#: src/text.c:2969
+msgid "Invoking linter, please wait"
+msgstr "Викликаємо linter, зачекайте"
+
+#: src/text.c:3125
 #, c-format
-msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
+msgid "Got 0 parsable lines from command: %s"
+msgstr "Від команди отримано 0 придатних рядків: %s"
+
+#: src/text.c:3159
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
+"Це повідомлення пов’язано із невідкритим файлом %s. Відкрити його у новому "
+"буфері?"
+
+#: src/text.c:3205
+msgid "At last message"
+msgstr "На останньому повідомленні"
+
+#: src/text.c:3210
+msgid "At first message"
+msgstr "На першому повідомленні"
+
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr "Помилка: не визначено formatter"
+
+#: src/text.c:3275
+msgid "Finished"
+msgstr "Завершено"
 
-#: src/text.c:3031
-#, fuzzy
+#: src/text.c:3280
+msgid "Invoking formatter, please wait"
+msgstr "Викликаємо formatter, зачекайте"
+
+#: src/text.c:3360
+msgid "Finished formatting"
+msgstr "Форматування завершено"
+
+#: src/text.c:3438
+#, c-format
+msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
+msgstr "%sСлів: %lu Рядків: %ld  Символів: %lu"
+
+#: src/text.c:3439
 msgid "In Selection:  "
-msgstr "������ ��Ħ���� �� �����"
+msgstr "У позначеному:  "
 
-#: src/utils.c:405 src/utils.c:417
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3453
+msgid "Verbatim Input"
+msgstr "Буквальний ввід"
+
+#: src/utils.c:410 src/utils.c:422
 msgid "nano is out of memory!"
-msgstr "���������� צ���ϧ ���'�Ԧ ��� nano!"
+msgstr "не вистачає вільної пам'яті для nano!"
 
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
-#: src/winio.c:1557
+#: src/winio.c:1583
 msgid "Unicode Input"
-msgstr ""
+msgstr "Ввід юнікод"
 
-#: src/winio.c:2149 src/winio.c:2153
-#, fuzzy
+#: src/winio.c:2142 src/winio.c:2146
 msgid "Modified"
-msgstr " �ͦ���� "
+msgstr "Змінено"
 
-#: src/winio.c:2150
-#, fuzzy
+#: src/winio.c:2143
 msgid "View"
-msgstr " �������� "
+msgstr "Вигляд"
 
-#: src/winio.c:2164
-#, fuzzy
+#: src/winio.c:2157
 msgid "DIR:"
-msgstr " ���: "
+msgstr "Кат.:"
 
-#: src/winio.c:2171
-#, fuzzy
+#: src/winio.c:2164
 msgid "File:"
-msgstr "����: "
+msgstr "Файл:"
+
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2261
+msgid ""
+"Warning: Modifying a file which is not locked, check directory permission?"
+msgstr ""
+"Попередження: вносимо зміни до файла, який не заблоковано, — перевірити "
+"права доступу до каталогу?"
 
-#: src/winio.c:3360
-#, fuzzy, c-format
+#: src/winio.c:3377
+#, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
-msgstr "����� %ld/%ld (%d%%), �������� %lu/%lu (%d%%, ̦���� %lu/%ld (%d%%)"
+msgstr "рядок %ld/%ld (%d%%), стовпчик %lu/%lu (%d%%), символ %lu/%lu (%d%%)"
 
-#: src/winio.c:3492
+#: src/winio.c:3507
 msgid "The nano text editor"
-msgstr "��������� �������� nano"
+msgstr "Текстовий редактор nano"
 
-#: src/winio.c:3493
-#, fuzzy
+#: src/winio.c:3508
 msgid "version"
-msgstr "���Ӧ� "
+msgstr "версія"
 
-#: src/winio.c:3494
+#: src/winio.c:3509
 msgid "Brought to you by:"
-msgstr "�������� ��� ���:"
+msgstr "Створено для Вас:"
 
-#: src/winio.c:3495
+#: src/winio.c:3510
 msgid "Special thanks to:"
-msgstr "�������� ������:"
+msgstr "Особлива подяка:"
 
-#: src/winio.c:3496
+#: src/winio.c:3511
 msgid "The Free Software Foundation"
-msgstr "The Free Software Foundation (���� �������� ����������� ������������)"
+msgstr "The Free Software Foundation (Фонд Вільного Програмного забезпечення)"
+
+#: src/winio.c:3512
+msgid "the many translators and the TP"
+msgstr "багатьом перекладачам та TP"
 
-#: src/winio.c:3497
+#: src/winio.c:3513
 msgid "For ncurses:"
-msgstr "��� ncurses:"
+msgstr "За ncurses:"
 
-#: src/winio.c:3498
+#: src/winio.c:3514
 msgid "and anyone else we forgot..."
-msgstr "�� ����� ���� �� ������..."
+msgstr "та іншим, кого ми забули..."
 
-#: src/winio.c:3499
-#, fuzzy
+#: src/winio.c:3515
 msgid "Thank you for using nano!"
-msgstr "���դ�� ��� �� ��, �� ������ nano!\n"
-
-#~ msgid "add_to_cutbuffer() called with inptr->data = %s\n"
-#~ msgstr "add_to_cutbuffer() ��������� � inptr->data = %s\n"
-
-#~ msgid "Blew away cutbuffer =)\n"
-#~ msgstr "\"������\" (cutbuffer) ����� צ���� =)\n"
-
-#~ msgid "File to insert into new buffer [from ./] "
-#~ msgstr "���� �� ������� (� ����� �����) [צ� ./] "
-
-#~ msgid "File to insert [from ./] "
-#~ msgstr "���� �� ������� [צ� ./] "
-
-#~ msgid "filename is %s\n"
-#~ msgstr "��'� �����: %s\n"
-
-#~ msgid "%s: free'd a node, YAY!\n"
-#~ msgstr "%s: ���.. ����� �צ������!\n"
-
-#~ msgid "%s: free'd last node.\n"
-#~ msgstr "%s: �צ������ ���������� �����.\n"
-
-#~ msgid "Could not read %s for backup: %s"
-#~ msgstr "�� ���� ��������� %s ��� ������������: %s"
-
-#~ msgid "Couldn't write backup: %s"
-#~ msgstr "�� ���� �������� ������: %s"
-
-#~ msgid "Backing up %s to %s\n"
-#~ msgstr "����� �������� ��� ����� %s, ��������� ����: %s\n"
-
-#~ msgid "Could not set permissions %o on backup %s: %s"
-#~ msgstr "�� ���� ���������� ����� %o �� ��������� ���� %s: %s"
-
-#~ msgid "Could not set owner %d/group %d on backup %s: %s"
-#~ msgstr "�� ���� ���������� �������� %d/����� %d �� ��������� ���� %s: %s"
-
-#~ msgid "Could not set access/modification time on backup %s: %s"
-#~ msgstr ""
-#~ "�� ���� ���������� ��� ������ϧ �ͦ��/��������� �� ��������� ���� %s: %s"
-
-#~ msgid "Could not open file for writing: %s"
-#~ msgstr "�� ���� צ������ ���� ��� ������: %s"
-
-#~ msgid "Wrote >%s\n"
-#~ msgstr "�������� >%s\n"
-
-#~ msgid "Could not close %s: %s"
-#~ msgstr "�� ���� �������� %s: %s"
-
-#~ msgid "Could not reopen %s: %s"
-#~ msgstr "�� �������� ����צ������ %s: %s"
-
-#~ msgid "Could not open %s for prepend: %s"
-#~ msgstr "�� ���� צ������ %s ��� ������: %s"
-
-#~ msgid "Could not set permissions %o on %s: %s"
-#~ msgstr "�� ���� ���������� ����� %o �� %s: %s"
-
-#~ msgid "Can't open \"%s\": %s"
-#~ msgstr "�� ���� צ������ \"%s\": %s"
-
-#~ msgid "Goto Cancelled"
-#~ msgstr "���������"
-
-#~ msgid "Unable to open ~/.nano_history file, %s"
-#~ msgstr "�� ���� צ������ ���� ~/.nano_history, %s"
-
-#~ msgid "Unable to write ~/.nano_history file, %s"
-#~ msgstr "�� �������� �������� ���� ~/.nano_history, %s"
-
-#~ msgid "Writing file in DOS format"
-#~ msgstr "����� ����� � �����Ԧ DOS"
-
-#~ msgid "Writing file in Mac format"
-#~ msgstr "����� ����� � �����Ԧ Mac"
-
-#~ msgid "Backing up file"
-#~ msgstr "������ �������� ��� �����"
-
-#~ msgid "Auto wrap"
-#~ msgstr "���� ����������"
-
-#~ msgid "Invoke the help menu"
-#~ msgstr "��������� ���� ��������"
-
-#~ msgid "Unjustify after a justify"
-#~ msgstr "��������� �����Τ ��Ҧ��������"
-
-#~ msgid "Replace text within the editor"
-#~ msgstr "��ͦ���� ����� � ����� ���������"
-
-#~ msgid "Search for text within the editor"
-#~ msgstr "������ ����� � ����� ���������"
-
-#~ msgid "Move up one line"
-#~ msgstr "�������� ����� �� ���� �����"
-
-#~ msgid "Insert a tab character"
-#~ msgstr "�������� ������ ������æ�"
-
-#~ msgid "Make the current search or replace case (in)sensitive"
-#~ msgstr "������� �������� ����� ��� ��ͦ�� (��)�������� צ� ��Ǧ���� ̦���"
-
-#~ msgid "Prepend to the current file"
-#~ msgstr "������ �� ��������� ����� (� ������� �����)"
-
-#~ msgid "Search backwards"
-#~ msgstr "������ �����"
-
-#~ msgid "Write file out in DOS format"
-#~ msgstr "����� ����� � �����Ԧ DOS"
-
-#~ msgid "Write file out in Mac format"
-#~ msgstr "����� ����� � �����Ԧ Mac"
-
-#~ msgid "Back up original file when saving"
-#~ msgstr "������� �������� ��Ц� ����� ��� ���Ҧ���Φ"
-
-#~ msgid "Find other bracket"
-#~ msgstr "������ ����� �����"
-
-#~ msgid "Open previously loaded file"
-#~ msgstr "�������� �������� ����"
-
-#~ msgid "Open next loaded file"
-#~ msgstr "�������� ��������� ����"
-
-#~ msgid "Up"
-#~ msgstr "�����"
-
-#~ msgid "Down"
-#~ msgstr "����"
-
-#~ msgid "Direction"
-#~ msgstr "��������"
-
-#~ msgid "Space"
-#~ msgstr "���¦�"
-
-#~ msgid ""
-#~ "Usage: nano [+LINE] [GNU long option] [option] [file]\n"
-#~ "\n"
-#~ msgstr ""
-#~ "������������: nano [+�����] [���Ǧ ��æ� GNU] [��æ�] [����]\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "Usage: nano [+LINE] [option] [file]\n"
-#~ "\n"
-#~ msgstr ""
-#~ "������������: nano [+�����] [��æ�] [����]\n"
-#~ "\n"
-
-#~ msgid "+LINE"
-#~ msgstr "+�����"
-
-#~ msgid "Use alternate keypad routines"
-#~ msgstr "������� �����������Φ Ц��������� ��� keypad"
-
-#~ msgid "Do regular expression searches"
-#~ msgstr "����� �� ����������� ������ (regexp)"
-
-#~ msgid "-T [num]"
-#~ msgstr "-T [���]"
-
-#~ msgid "Set fill cols to (wrap lines at) #cols"
-#~ msgstr "���������� ���������� ���˦� � ����æ� #�����"
-
-#~ msgid "current->data now = \"%s\"\n"
-#~ msgstr "current->data ����� = \"%s\"\n"
-
-#~ msgid "After, data = \"%s\"\n"
-#~ msgstr "����, ��Φ = \"%s\"\n"
-
-#~ msgid "Could not create a temporary filename: %s"
-#~ msgstr "�� ���� �������� ��������� ����� ��� �����: %s"
-
-#~ msgid "Spell checking failed: unable to write temp file!"
-#~ msgstr ""
-#~ "����צ��� �������Ʀ� �� �������: ��������� �������� ���������� ����!"
-
-#~ msgid "Cannot resize top win"
-#~ msgstr "�� ���� �ͦ���� ���ͦ� ��������� צ���"
-
-#~ msgid "Cannot move top win"
-#~ msgstr "�� ���� ����ͦ����� ��������� צ���"
-
-#~ msgid "Cannot resize edit win"
-#~ msgstr "�� ���� �ͦ���� ���ͦ� צ��� �����������"
-
-#~ msgid "Cannot move edit win"
-#~ msgstr "�� ���� ����ͦ����� צ��� �����������"
-
-#~ msgid "Cannot resize bottom win"
-#~ msgstr "�� ���� �ͦ���� ���ͦ� �������� צ���"
-
-#~ msgid "Cannot move bottom win"
-#~ msgstr "�� ���� ����ͦ����� ���Τ צ���"
-
-#~ msgid "NumLock glitch detected.  Keypad will malfunction with NumLock off"
-#~ msgstr "��ͦ���� ���� NumLock'�. ��������� ���צ����� ���� �� ���������"
-
-#~ msgid "Tab size is too small for nano...\n"
-#~ msgstr "���ͦ� ������æ� ������� ��� nano...\n"
-
-#~ msgid "Main: set up windows\n"
-#~ msgstr "Main: ���������� צ���\n"
-
-#~ msgid "Main: bottom win\n"
-#~ msgstr "Main: ���Τ צ���\n"
-
-#~ msgid "Main: open file\n"
-#~ msgstr "Main: צ������ ����\n"
-
-#~ msgid "AHA!  %c (%d)\n"
-#~ msgstr "���! %c (%d)\n"
-
-#~ msgid "I got Alt-O-%c! (%d)\n"
-#~ msgstr "� ���� Alt-O-%c! (%d)\n"
-
-#~ msgid "I got Alt-[-1-%c! (%d)\n"
-#~ msgstr "� ���� Alt-[-1-%c! (%d)\n"
-
-#~ msgid "I got Alt-[-2-%c! (%d)\n"
-#~ msgstr "� ���� Alt-[-2-%c! (%d)\n"
-
-#~ msgid "I got Alt-[-%c! (%d)\n"
-#~ msgstr "� ���� Alt-[-%c! (%d)\n"
-
-#~ msgid "I got Alt-%c! (%d)\n"
-#~ msgstr "� ���� Alt-%c! (%d)\n"
-
-#~ msgid "I got %c (%d)!\n"
-#~ msgstr "� ���� %c (%d)!\n"
-
-#~ msgid "Adding new syntax after 1st\n"
-#~ msgstr "������� ����� ������� ��� �������\n"
-
-#~ msgid "Starting a new syntax type\n"
-#~ msgstr "��������� ����� ��� ��������\n"
-
-#~ msgid "Starting a new colorstring for fg %d bg %d\n"
-#~ msgstr "��������� ����� ����� ������� ��� ������� %d �� ��Φ %d\n"
-
-#~ msgid "Adding new entry for fg %d bg %d\n"
-#~ msgstr "������� ����� ����� ��� ������� %d �� ��Φ %d\n"
+msgstr "Дякуємо за використання nano!"
 
-#~ msgid "%s: Read a comment\n"
-#~ msgstr "%s: ������� ��������\n"
-
-#~ msgid "%s: Parsing option %s\n"
-#~ msgstr "%s: ��ڦ������ ��æ� %s\n"
-
-#~ msgid "set flag %d!\n"
-#~ msgstr "���������� ���� %d!\n"
-
-#~ msgid "Errors found in .nanorc file"
-#~ msgstr "�������� ������� � ���̦ .nanorc"
-
-#~ msgid "Unable to open ~/.nanorc file, %s"
-#~ msgstr "�� ���� צ������ ���� ~/.nanorc, %s"
-
-#~ msgid "\"%s...\" not found"
-#~ msgstr "\"%s...\" �� ��������"
-
-#~ msgid "Invalid regex \"%s\""
-#~ msgstr "��צ���� ���������� ����� \"%s\""
-
-#~ msgid "Search Cancelled"
-#~ msgstr "����� ���������"
-
-#~ msgid "Replace Cancelled"
-#~ msgstr "��ͦ�� ���������"
-
-#~ msgid "Replace failed: unknown subexpression!"
-#~ msgstr "��ͦ�� �������: ���������� Ц������!"
-
-#~ msgid "Aborted"
-#~ msgstr "��������"
-
-#~ msgid "Come on, be reasonable"
-#~ msgstr "���, ������ ����������Φ"
-
-#~ msgid "actual_x for xplus=%d returns %d\n"
-#~ msgstr "actual_x ��� xplus=%d �������� %d\n"
-
-#~ msgid "Aha! '%c' (%d)\n"
-#~ msgstr "���! '%c' (%d)\n"
-
-#~ msgid "input '%c' (%d)\n"
-#~ msgstr "�Ȧ� '%c' (%d)\n"
-
-#~ msgid "  File: ..."
-#~ msgstr "  ����: ..."
-
-#~ msgid "   DIR: ..."
-#~ msgstr "   ���: ..."
-
-#~ msgid "Refusing 0 length regex match"
-#~ msgstr "���������� �Ц���Ħ��� ����������� ������ �������� 0"
-
-#~ msgid "Moved to (%d, %d) in edit buffer\n"
-#~ msgstr "����ͦ���� �� (%d,%d) � ����Ҧ �����������\n"
-
-#~ msgid "I got \"%s\"\n"
-#~ msgstr "� ���� \"%s\"\n"
-
-#~ msgid "Dumping file buffer to stderr...\n"
-#~ msgstr "�������� ������ ����� �� stderr...\n"
-
-#~ msgid "Dumping cutbuffer to stderr...\n"
-#~ msgstr "�������� �ͦ��� \"����Φ\" �� stderr...\n"
-
-#~ msgid "Dumping a buffer to stderr...\n"
-#~ msgstr "�������� ������ �� stderr...\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "The -p flag now invokes the Pico \"preserve\" flag.\n"
-#~ "The Pico compatibility flag has been removed as nano\n"
-#~ "now fully Pico compatible.  Please see the nano FAQ\n"
-#~ "for more info on this change...\n"
-#~ "\n"
-#~ "Press return to continue\n"
+#~ msgid "Internal error: can't match line %ld.  Please save your work."
 #~ msgstr ""
-#~ "\n"
-#~ "��æ� -p ����� �������� ��æ� \"preserve\" ��������� Pico.\n"
-#~ "��æ� ��ͦ����Ԧ �� Pico ���� ��������, ��˦���� nano ����� ���Φ���\n"
-#~ "��ͦ���� �� Pico. ���� ����� �������� FAQ ��� ¦��� ����ϧ ��צ���\n"
-#~ "���� æ�� �ͦ��.\n"
-#~ "\n"
-#~ "������� ����-����� Enter\n"
-
-#~ msgid "Generic error"
-#~ msgstr "�������� �������"
-
-#~ msgid "delete_opennode(): free'd a node, YAY!\n"
-#~ msgstr "delete_opennode(): O�.. ����� �צ������!\n"
-
-#~ msgid "delete_opennode(): free'd last node.\n"
-#~ msgstr "delete_opennode(): �צ������ ���������� �����.\n"
-
-#~ msgid "Can't visit parent in restricted mode"
-#~ msgstr "�� ���� צ�צ���� ������ (cd ./..) � ���������� ����ͦ"
-
-#~ msgid "-p"
-#~ msgstr "-p"
-
-#~ msgid "--preserve"
-#~ msgstr "--preserve"
-
-#~ msgid ""
-#~ "\n"
-#~ "The -p flag now invokes the Pico \"preserve\" flag.  The Pico\n"
-#~ msgstr ""
-#~ "\n"
-#~ "��æ� -p ����� �������� ��æ� \"preserve\" ��������� Pico. ��æ�\n"
-
-#~ msgid "compatibility flag has been removed as nano is now fully Pico\n"
-#~ msgstr "��ͦ����Ԧ �� Pico ���� ��������, ��˦���� nano ����� ���Φ���\n"
-
-#~ msgid ""
-#~ "compatible.  Please see the nano FAQ for more info on this change...\n"
-#~ "\n"
-#~ msgstr ""
-#~ "��ͦ���� �� Pico. ���� ����� �������� FAQ ��� ¦��� ����ϧ ��צ���\n"
-#~ "���� æ�� �ͦ��.\n"
-
-#~ msgid "Press return to continue\n"
-#~ msgstr "������� Enter ��� ����������\n"
-
-#~ msgid "string val=%s\n"
-#~ msgstr "����� val=%s\n"
-
-#~ msgid "For end part, beginning = \"%s\"\n"
-#~ msgstr "��� ˦����ϧ �������, ������� = \"%s\"\n"
-
-#~ msgid "current->data = \"%s\"\n"
-#~ msgstr "(winio.c) current->data = \"%s\"\n"
-
-#~ msgid "do_cursorpos: linepct = %f, bytepct = %f\n"
-#~ msgstr "do_cursorpos: linepct = %f, bytepct = %f\n"
-
-#~ msgid "read_line: not on first line and prev is NULL"
-#~ msgstr "read_line: �� �� ������� �����, �� �� � �������� � NULL"
-
-#~ msgid "Pico mode"
-#~ msgstr "����� Pico"
-
-#~ msgid "Emulate Pico as closely as possible"
-#~ msgstr "��������� Pico ���˦���� �������"
-
-#~ msgid "'\")}]>"
-#~ msgstr "'\")}]>"
-
-#~ msgid ".?!"
-#~ msgstr ".?!"
-
-#~ msgid "Replaced 1 occurrence"
-#~ msgstr "��ͦ���� 1 ���������"
-
-#~ msgid "Replace with [%s]"
-#~ msgstr "��ͦ���� �� [%s]"
-
-#~ msgid "nano: realloc: out of memory!"
-#~ msgstr "nano: realloc: ����� צ���ϧ ���'�Ԧ!"
-
-#~ msgid "Backwards search"
-#~ msgstr "����� �����"
-
-#~ msgid "Goto"
-#~ msgstr "�� �����"
-
-#~ msgid "check_wrap called with inptr->data=\"%s\"\n"
-#~ msgstr "check_wrap ������� � inptr->data=\"%s\"\n"
-
-#~ msgid "nano: calloc: out of memory!"
-#~ msgstr "nano: calloc: ����� צ���ϧ ���'�Ԧ!"
-
-#~ msgid " -D \t\t--dos\t\t\tWrite file in DOS format\n"
-#~ msgstr " -D \t\t--dos\t\t\t����� ����� � �����Ԧ DOS\n"
-
-#~ msgid " -F \t\t--multibuffer\t\tEnable multiple file buffers\n"
-#~ msgstr " -F \t\t--multibuffer\t\t��������� ��˦���� �������� ����Ҧ�\n"
-
-#~ msgid " -K \t\t--keypad\t\tUse alternate keypad routines\n"
-#~ msgstr " -K \t\t--keypad\t\t������� �����������Φ Ц��������� keypad\n"
-
-#~ msgid " -M \t\t--mac\t\t\tWrite file in Mac format\n"
-#~ msgstr " -M \t\t--mac\t\t\t����� ����� � �����Ԧ Mac\n"
-
-#~ msgid " -N \t\t--noconvert\t\tDon't convert files from DOS/Mac format\n"
-#~ msgstr " -N \t\t--noconvert\t\t�� �������� ����� �� �����Ԧ� DOS/Mac\n"
-
-#~ msgid " -Q [str]\t--quotestr [str]\tQuoting string, default \"> \"\n"
-#~ msgstr ""
-#~ " -Q [str]\t--quotestr [str]\t����� ���������, �� ���������� \"> \"\n"
-
-#~ msgid " -S\t\t--smooth\t\tSmooth scrolling\n"
-#~ msgstr " -S\t\t--smooth\t\t������ ���������\n"
-
-#~ msgid " -T [num]\t--tabsize=[num]\t\tSet width of a tab to num\n"
-#~ msgstr " -T [���]\t--tabsize=[���]\t\t���������� ���ͦ� ������æ� �� ���\n"
-
-#~ msgid " -V \t\t--version\t\tPrint version information and exit\n"
-#~ msgstr " -V \t\t--version\t\t����������� ���Ӧ� �� �����\n"
-
-#~ msgid " -c \t\t--const\t\t\tConstantly show cursor position\n"
-#~ msgstr " -c \t\t--const\t\t\t���Ԧ��� ���������� ����æ� �������\n"
-
-#~ msgid " -h \t\t--help\t\t\tShow this message\n"
-#~ msgstr " -h \t\t--help\t\t\t�������� �� ��צ��������\n"
-
-#~ msgid " -i \t\t--autoindent\t\tAutomatically indent new lines\n"
-#~ msgstr " -i \t\t--autoindent\t\t����������� ��Ҧ������� ��צ �����\n"
-
-#~ msgid " -k \t\t--cut\t\t\tLet ^K cut from cursor to end of line\n"
-#~ msgstr ""
-#~ " -k \t\t--cut\t\t\t��������� ��Ҧ���� צ� ������� �� ˦���\n"
-#~ "\t\t\t\t\t����� �� ��������� ^K\n"
-
-#~ msgid " -l \t\t--nofollow\t\tDon't follow symbolic links, overwrite\n"
-#~ msgstr " -l \t\t--nofollow\t\t�� ��� �� Ӧ�̦�����, ��� ������������\n"
-
-#~ msgid " -m \t\t--mouse\t\t\tEnable mouse\n"
-#~ msgstr " -m \t\t--mouse\t\t\t��������� ����\n"
-
-#~ msgid " -o [dir] \t--operatingdir=[dir]\tSet operating directory\n"
-#~ msgstr " -o [dir] \t--operatingdir=[dir]\t���������� ������� �������\n"
-
-#~ msgid " -p \t\t--pico\t\t\tEmulate Pico as closely as possible\n"
-#~ msgstr " -p\t \t--pico\t\t\t��������� Pico ���˦���� �� �������\n"
-
-#~ msgid ""
-#~ " -r [#cols] \t--fill=[#cols]\t\tSet fill cols to (wrap lines at) #cols\n"
-#~ msgstr ""
-#~ " -r [#�����]\t--fill=[#�����]\t\t��������� ����� � ����æ� ������� "
-#~ "#�����\n"
-
-#~ msgid " -s [prog] \t--speller=[prog]\tEnable alternate speller\n"
-#~ msgstr ""
-#~ " -s [����] \t--speller=[����]\t�������. �������� ����צ��� ���������\n"
-
-#~ msgid " -t \t\t--tempfile\t\tAuto save on exit, don't prompt\n"
-#~ msgstr " -t \t\t--tempfile\t\t��������� ��� ����Ħ, ��� ��������\n"
-
-#~ msgid " -v \t\t--view\t\t\tView (read only) mode\n"
-#~ msgstr " -v \t\t--view\t\t\t����� ������������ (Ԧ���� �������)\n"
-
-#~ msgid " -w \t\t--nowrap\t\tDon't wrap long lines\n"
-#~ msgstr " -w \t\t--nowrap\t\t�� ��������� ���Ǧ �����\n"
-
-#~ msgid " -x \t\t--nohelp\t\tDon't show help window\n"
-#~ msgstr " -x \t\t--nohelp\t\t�� ���������� צ��� ��������\n"
-
-#~ msgid " -z \t\t--suspend\t\tEnable suspend\n"
-#~ msgstr " -z \t\t--suspend\t\t��������� ����������\n"
-
-#~ msgid " +LINE\t\t\t\t\tStart at line number LINE\n"
-#~ msgstr " +�����\t\t\t\t\t������ � ����� ����� �����\n"
-
-#~ msgid " -D \t\tWrite file in DOS format\n"
-#~ msgstr " -D \t\t����� ����� � �����Ԧ DOS\n"
-
-#~ msgid " -M \t\tWrite file in Mac format\n"
-#~ msgstr " -M \t\t����� ����� � �����Ԧ Mac\n"
-
-#~ msgid " -R\t\tUse regular expressions for search\n"
-#~ msgstr " -R\t\t������������� ����������� �������� ��� ������\n"
-
-#~ msgid " -S\t\tSmooth scrolling\n"
-#~ msgstr " -S\t\t������ ���������\n"
-
-#~ msgid "Pavel Curtis, Zeyd Ben-Halim and Eric S. Raymond for ncurses"
-#~ msgstr "����� ���Ԧ�, ���� ���-��̦�� �� �Ҧ� �. ������� �� ncurses"
-
-#~ msgid "File already loaded"
-#~ msgstr "���� ��� �����������"
-
-#~ msgid " -R\t\t--regexp\t\tUse regular expressions for search\n"
-#~ msgstr " -R\t\t--regexp\t\t������ ������������ ����������� ��������\n"
-
-#~ msgid "Write"
-#~ msgstr "��������"
-
-#~ msgid "Case Sensitive Regexp Search%s%s"
-#~ msgstr "���������������� ����� ����������� ������%s%s"
+#~ "Внутрішня помилка: не вдалося встановити відповідність рядка %ld. "
+#~ "Збережіть результати вашої роботи."
 
-#~ msgid "Regexp Search%s%s"
-#~ msgstr "����� ����������� ������%s%s"
+#~ msgid "line wrap"
+#~ msgstr "перенесення рядка"
 
-#~ msgid "Only %d lines available, skipping to last line"
-#~ msgstr "������ %d ���˦� � �������Ԧ, �������� �� ���������� �����"
+#~ msgid "Allow generic undo [EXPERIMENTAL]"
+#~ msgstr "Дозволити функцію скасування дій [ЕКСПЕРИМЕНТАЛЬНА]"
diff --git a/po/vi.gmo b/po/vi.gmo
index 487a4ca..747c9f8 100644
--- a/po/vi.gmo
+++ b/po/vi.gmo
diff --git a/po/vi.po b/po/vi.po
index fb2db9a..4408378 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -1,122 +1,151 @@
 # Vietnamese translation for Nano.
-# Copyright © 2010 Free Software Foundation, Inc.
+# Bản dịch tiếng Việt dành cho nano.
+# Copyright © 2015 Free Software Foundation, Inc.
 # This file is distributed under the same license as the nano package.
 # Phan Vinh Thinh <teppi82@gmail.com>, 2005, 2006.
 # Clytie Siddall <clytie@riverland.net.au>, 2007-2010.
+# Trần Ngọc Quân <vnwildman@gmail.com>, 2012-2014, 2015.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 2.2.4pre2\n"
+"Project-Id-Version: nano 2.3.99pre4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-22 06:34-0500\n"
-"PO-Revision-Date: 2010-04-07 17:07+0930\n"
-"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
-"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
+"PO-Revision-Date: 2015-03-19 07:56+0700\n"
+"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
+"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
+"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LocFactoryEditor 1.8\n"
+"X-Language-Team-Website: <http://translationproject.org/team/vi.html>\n"
 
-#: src/browser.c:220
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:203
 msgid "Go To Directory"
 msgstr "Đi tới thư mục"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:860 src/files.c:2048
-#: src/nano.c:1060 src/search.c:220 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
-msgstr "Bị thôi"
+msgstr "Bị hủy bỏ"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:246 src/browser.c:293
 #, c-format
 msgid "Can't go outside of %s in restricted mode"
 msgstr "Không đi ra được bên ngoài của %s trong chế độ hạn chế"
 
-#: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:722
-#: src/files.c:731 src/files.c:1540 src/files.c:1659 src/files.c:1711
-#: src/files.c:1732 src/files.c:1855 src/files.c:2691 src/rcfile.c:568
-#: src/rcfile.c:1204
+#: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
+#: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
+#: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
-msgstr "Lỗi đọc %s: %s"
+msgstr "Gặp lỗi khi đọc %s: %s"
 
-#: src/browser.c:303
+#: src/browser.c:283
 msgid "Can't move up a directory"
-msgstr "Không thể nâng lên một thư mục"
+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:665 src/browser.c:674
+#: src/browser.c:626 src/browser.c:635
 msgid "(dir)"
-msgstr "(thư mục)"
+msgstr "(thmục)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:632
 msgid "(parent dir)"
-msgstr "(thư mục cha)"
+msgstr "(thmục cha)"
 
-#: src/browser.c:801 src/search.c:185
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "Tìm kiếm"
 
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:805 src/search.c:189
-msgid " [Case Sensitive]"
-msgstr " [Tính đến kiểu chữ]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:811 src/search.c:195
-msgid " [Regexp]"
-msgstr " [Biểu thức chính quy]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:817 src/search.c:201
-msgid " [Backwards]"
-msgstr " [Ngược lại]"
-
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
-msgstr "Tìm (cuộn lại)"
+msgstr "Tìm Toàn bộ"
 
-#: src/browser.c:1006 src/browser.c:1039 src/search.c:514 src/search.c:517
-#: src/search.c:574 src/search.c:577
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
-msgstr "Đây là tương ứng duy nhất"
+msgstr "Đây là lần xảy ra duy nhất"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
-msgstr "Không có mẫu tìm kiếm hiện thời"
+msgstr "Không có mẫu tìm kiếm hiện tại"
+
+#: src/files.c:139
+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:145
+#, 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:165 src/files.c:175 src/files.c:212 src/files.c:222
+#, 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:237
+#, 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:125
+#: src/files.c:272
+#, 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:282
+#, 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 đủ"
+
+#. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
+#: src/files.c:297
+#, 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:308
+#, c-format
+msgid "Error writing lock file: Directory '%s' doesn't exist"
+msgstr "Gặp lỗi khi ghi tập tin khóa: Thư mục “%s” không tồn tại"
+
+#: src/files.c:339
 #, 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:234
+#: src/files.c:467
 msgid "No more open file buffers"
 msgstr "Không còn bộ đệm mở tập tin nữa"
 
-#: src/files.c:250
+#: src/files.c:484
 #, c-format
 msgid "Switched to %s"
 msgstr "Đã chuyển tới %s"
 
-#: src/files.c:251 src/global.c:469 src/winio.c:2168
+#: src/files.c:485 src/global.c:953 src/winio.c:2161
 msgid "New Buffer"
-msgstr "Bộ đệm mới"
+msgstr "Bộ nhớ đệm mới"
 
-#: src/files.c:633
+#: src/files.c:874
 #, 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 (Đã chuyển đổi từ định dạng DOS và Mac)"
+msgstr[0] "Đọc %lu dòng (Được chuyển đổi từ định dạng DOS và Mac)"
 
-#: src/files.c:638
+#: src/files.c:879
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
@@ -125,508 +154,471 @@ 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ó "
+"Đọ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:644
+#: src/files.c:885
 #, 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:648
+#: src/files.c:889
 #, 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)"
+"Đọ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:654
+#: src/files.c:895
 #, 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:658
+#: src/files.c:899
 #, 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)"
+"Đọ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:664
+#: src/files.c:905
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "Đọc %lu dòng"
 
-#: src/files.c:667
+#: src/files.c:908
 #, 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)"
+msgstr[0] "Đọc %lu dòng (Cảnh báo: Không có quyền ghi)"
 
-#: src/files.c:700 src/files.c:736
+#: src/files.c:943 src/files.c:980
 msgid "Reading File"
 msgstr "Đang đọc tập tin"
 
-#: src/files.c:706
+#: src/files.c:950
 msgid "New File"
 msgstr "Tập tin mới"
 
-#: src/files.c:709
+#: src/files.c:953
 #, c-format
 msgid "\"%s\" not found"
-msgstr "Không tìm thấy « %s »"
+msgstr "Không tìm thấy “%s”"
 
-#: src/files.c:717 src/rcfile.c:559 src/rcfile.c:1154 src/rcfile.c:1195
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
-msgstr "« %s » là một thư mục"
+msgstr "“%s” là một thư mục"
 
-#: src/files.c:718 src/rcfile.c:560 src/rcfile.c:1155 src/rcfile.c:1196
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
-msgstr "« %s » là một tập tin thiết bị"
+msgstr "“%s” là một tập tin thiết bị"
 
-#: src/files.c:817
+#: src/files.c:1060
 #, 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:819
+#: src/files.c:1062
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Câu lệnh để thực hiện [từ %s] "
 
-#: src/files.c:825
+#: src/files.c:1069
 #, 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:827
+#: src/files.c:1071
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Tập tin để chèn [từ %s] "
 
-#: src/files.c:1077
+#: src/files.c:1320
 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:1486
+#: src/files.c:1622
+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:1746
 #, 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:1501
+#: src/files.c:1761
 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 --"
 "nofollow"
 
-#: src/files.c:1581 src/files.c:1603 src/files.c:1621 src/files.c:1632
-#: src/files.c:1640 src/files.c:1667
+#: src/files.c:1843 src/files.c:1868 src/files.c:1886 src/files.c:1899
+#: src/files.c:1910 src/files.c:1939
 #, 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:1582 src/nano.c:701
+#: src/files.c:1844 src/nano.c:719
 msgid "Too many backup files?"
-msgstr "Quá nhiều tập tin lưu trữ?"
+msgstr "Quá nhiều tập tin sao lưu dự phòng?"
 
-#: src/files.c:1687 src/files.c:1744 src/files.c:1763 src/files.c:1775
-#: src/files.c:1799 src/files.c:1817 src/files.c:1827 src/files.c:1863
-#: src/files.c:1868 src/files.c:2764 src/files.c:2773
+#: src/files.c:1959 src/files.c:2016 src/files.c:2035 src/files.c:2047
+#: src/files.c:2071 src/files.c:2089 src/files.c:2099 src/files.c:2135
+#: src/files.c:2140 src/files.c:3101 src/files.c:3110 src/files.c:3133
+#: src/files.c:3145
 #, c-format
 msgid "Error writing %s: %s"
-msgstr "Lỗi ghi nhớ %s: %s"
+msgstr "Gặp lỗi khi ghi %s: %s"
 
-#: src/files.c:1721 src/text.c:2929 src/text.c:2941
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
-msgstr "Lỗi ghi nhớ tập tin tạm thời: %s"
+msgstr "Gặp lỗi khi ghi tập tin tạm thời: %s"
 
-#: src/files.c:1900
+#: src/files.c:2173
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "Đã ghi %lu dòng"
 
-#: src/files.c:2004
+#: src/files.c:2278
 msgid " [DOS Format]"
 msgstr " [Định dạng DOS]"
 
-#: src/files.c:2005
+#: src/files.c:2279
 msgid " [Mac Format]"
 msgstr " [Định dạng Mac]"
 
-#: src/files.c:2007
+#: src/files.c:2281
 msgid " [Backup]"
-msgstr " [Lưu trữ]"
+msgstr " [Sao lưu dự phòng]"
 
-#: src/files.c:2015
+#: src/files.c:2289
 msgid "Prepend Selection to File"
 msgstr "Thêm lựa chọn vào trước Tập tin"
 
-#: src/files.c:2016
+#: src/files.c:2290
 msgid "Append Selection to File"
 msgstr "Thêm lựa chọn vào sau Tập tin"
 
-#: src/files.c:2017
+#: src/files.c:2291
 msgid "Write Selection to File"
-msgstr "Ghi nhớ lựa chọn vào một tập tin"
+msgstr "Lưu lựa chọn vào một tập tin"
 
-#: src/files.c:2020
+#: src/files.c:2294
 msgid "File Name to Prepend to"
 msgstr "Tên tập tin để thêm vào trước"
 
-#: src/files.c:2021
+#: src/files.c:2295
 msgid "File Name to Append to"
 msgstr "Tên tập tin để thêm vào sau"
 
-#: src/files.c:2022
+#: src/files.c:2296
 msgid "File Name to Write"
-msgstr "Tên tập tin để ghi nhớ"
+msgstr "Tên tập tin dùng để ghi vào"
 
-#: src/files.c:2153
+#: src/files.c:2427
 msgid "File exists, OVERWRITE ? "
-msgstr "Tập tin đã tồn tại, GHI ĐÈ LÊN ? "
+msgstr "Tập tin đã có sẵn, GHI ĐÈ LÊN ? "
 
-#: src/files.c:2162
+#: src/files.c:2436
 msgid "Save file under DIFFERENT NAME ? "
-msgstr "Ghi nhớ tập tin dưới TÊN KHÁC ? "
+msgstr "Ghi tập tin bằng TÊN MỚI ? "
 
-#: src/files.c:2173
+#: src/files.c:2450
 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ó nên tiếp tục lưu không?"
+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:2611
+#: src/files.c:2882
 msgid "(more)"
 msgstr "(còn nữa)"
 
-#: src/files.c:2694 src/rcfile.c:1220
+#: src/files.c:2974
 #, c-format
 msgid ""
 "\n"
-"Press Enter to continue starting nano.\n"
+"Press Enter to continue\n"
 msgstr ""
 "\n"
-"Nhấn Enter để tiếp tục khởi chạy nano.\n"
+"Hãy nhấn RETURN để tiếp tục\n"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:415 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Thôi"
-
-#: src/global.c:416
-msgid "Replace"
-msgstr "Thay thế"
+#: src/files.c:2989
+#, c-format
+msgid ""
+"Unable to create directory %s: %s\n"
+"It is required for saving/loading search history or cursor positions.\n"
+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/global.c:417
-msgid "No Replace"
-msgstr "Không thay thế"
+#: src/files.c:2995
+#, 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 ""
+"Đườ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/global.c:420
-msgid "Case Sens"
-msgstr "Tính đến kiểu chữ"
+#: src/files.c:3012
+#, 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 ""
+"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/global.c:421
-msgid "Backwards"
-msgstr "Ngược lại"
+#: src/files.c:3016
+#, 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 ""
+"Tìm thấy tập tin lịch sử cũ của nano (%s) cái mà Tôi đã di chuyển\n"
+"tới vị trí ưu tiên (%s)\n"
+"(xem FAQ của nano để có thông tin về thay đổi này)"
 
-#: src/global.c:425
-msgid "Regexp"
-msgstr "Biểu thức chính quy"
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
+#: src/global.c:477
+msgid "Exit"
+msgstr "Thoát"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:451
-msgid "PrevHstory"
-msgstr "Lịch sử lùi"
+#: src/global.c:478
+msgid "Close"
+msgstr "Đóng"
 
-#: src/global.c:452
-msgid "NextHstory"
-msgstr "Lịch sử kế"
+#: src/global.c:479
+msgid "Uncut Text"
+msgstr "Dán chữ"
 
-#: src/global.c:453
-msgid "Go To Text"
-msgstr "Tới văn bản"
+#: src/global.c:481
+msgid "Unjustify"
+msgstr "BỏCănHàng"
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:455
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:485
 msgid "WhereIs Next"
-msgstr "Tiếp theo ở đâu"
-
-#: src/global.c:457
-msgid "First File"
-msgstr "Tập tin đầu"
-
-#: src/global.c:458
-msgid "Last File"
-msgstr "Tập tin cuối"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:460
-msgid "To Files"
-msgstr "Tới tập tin"
-
-#: src/global.c:462
-msgid "DOS Format"
-msgstr "Định dạng DOS"
-
-#: src/global.c:463
-msgid "Mac Format"
-msgstr "Định dạng Mac"
-
-#: src/global.c:464
-msgid "Append"
-msgstr "Phụ thêm"
-
-#: src/global.c:465
-msgid "Prepend"
-msgstr "Thêm vào trước"
-
-#: src/global.c:466
-msgid "Backup File"
-msgstr "Lưu trữ tập tin"
-
-#: src/global.c:467
-msgid "Execute Command"
-msgstr "Thực hiện lệnh"
-
-#: src/global.c:471
-msgid "Go To Dir"
-msgstr "Tới thư mục"
+msgstr "Tiếp là đâu"
 
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:480
-msgid "Get Help"
-msgstr "Trợ giúp"
-
-#: src/global.c:481
-msgid "Exit"
-msgstr "Thoát"
-
-#: src/global.c:482
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:492
 msgid "Where Is"
-msgstr "Ở đâu"
-
-#: src/global.c:483
-msgid "Prev Page"
-msgstr "Trang trước"
-
-#: src/global.c:484
-msgid "Next Page"
-msgstr "Trang kế"
+msgstr "Tìm kiếm"
 
-#: src/global.c:485
-msgid "First Line"
-msgstr "Dòng đầu"
+#: src/global.c:493
+msgid "Replace"
+msgstr "Thay thế"
 
-#: src/global.c:486
-msgid "Last Line"
-msgstr "Dòng cuối"
+#: src/global.c:494
+msgid "Go To Line"
+msgstr "Tới dòng"
 
-#: src/global.c:487
-msgid "Suspend"
-msgstr "Ngưng"
+#: src/global.c:495
+msgid "Prev Line"
+msgstr "Dòng trước"
 
-#: src/global.c:489
-msgid "Beg of Par"
-msgstr "Đầu đoạn văn"
+#: src/global.c:496
+msgid "Next Line"
+msgstr "Dòng kế"
 
-#: src/global.c:490
-msgid "End of Par"
-msgstr "Cuối đoạn văn"
+#: src/global.c:497
+msgid "Read File"
+msgstr "Đọc T.tin"
 
-#: src/global.c:491
+#: src/global.c:499
 msgid "FullJstify"
 msgstr "Sắp hàng đầy đủ"
 
-#: src/global.c:493
+#: src/global.c:501
 msgid "Refresh"
 msgstr "Cập nhật"
 
-#: src/global.c:495
-msgid "Insert File"
-msgstr "Chèn tập tin"
-
-#: src/global.c:497
-msgid "Go To Line"
-msgstr "Tới dòng"
-
-#: src/global.c:500
-msgid "Justify the current paragraph"
-msgstr "Sắp chữ đúng hàng cho đoạn văn hiện thời"
-
 #. 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:505
+#: src/global.c:507
+msgid "Justify the current paragraph"
+msgstr "Sắp chữ đúng hàng cho đoạn văn hiện tại"
+
+#: src/global.c:509
 msgid "Cancel the current function"
-msgstr "Dừng hàm hiện thời"
+msgstr "Hủy hàm hiện tại"
 
-#: src/global.c:506
+#: src/global.c:510
 msgid "Display this help text"
 msgstr "Hiển thị trợ giúp này"
 
-#: src/global.c:509
+#: src/global.c:513
 msgid "Close the current file buffer / Exit from nano"
-msgstr "Đóng bộ đệm tập tin hiện thời/Thoát nano"
+msgstr "Đóng bộ đệm tập tin hiện tại / Thoát từ nano"
 
-#: src/global.c:511
+#: src/global.c:515
 msgid "Exit from nano"
 msgstr "Thoát khỏi nano"
 
-#: src/global.c:515
+#: src/global.c:519
 msgid "Write the current file to disk"
-msgstr "Ghi nhớ tập tin hiện thời lên đĩa"
+msgstr "Ghi tập tin hiện tại lên đĩa"
 
-#: src/global.c:517
+#: src/global.c:521
 msgid "Insert another file into the current one"
-msgstr "Chèn tập tin khác vào tập tin hiện thời"
+msgstr "Chèn tập tin khác vào tập tin hiện tại"
 
-#: src/global.c:519
+#: src/global.c:523
 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:520
-msgid "Go to previous screen"
-msgstr "Về màn hình trước"
+#: src/global.c:526
+msgid "Search for a string"
+msgstr "Tìm một chuỗi nào đó"
 
-#: src/global.c:521
-msgid "Go to next screen"
-msgstr "Tới màn hình kế"
+#: src/global.c:528
+msgid "Go one screenful up"
+msgstr "Đi lên một màn hình"
 
-#: src/global.c:523
+#: src/global.c:529
+msgid "Go one screenful down"
+msgstr "Đi xuống một màn hình"
+
+#: src/global.c:531
 msgid "Cut the current line and store it in the cutbuffer"
-msgstr "Cắt dòng hiện thời và ghi nhớ nó vào bộ đệm cắt"
+msgstr "Cắt dòng hiện tại và ghi nó vào bộ đệm cắt"
 
-#: src/global.c:525
+#: src/global.c:533
 msgid "Uncut from the cutbuffer into the current line"
-msgstr "Hủy cắt từ bộ đệm cắt vào dòng hiện thời"
+msgstr "Dán từ bộ đệm cắt vào dòng hiện tại"
 
-#: src/global.c:527
+#: src/global.c:534
 msgid "Display the position of the cursor"
 msgstr "Hiển thị vị trí con trỏ"
 
-#: src/global.c:529
+#: src/global.c:536
 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:531
+#: src/global.c:538
 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:532
+#: src/global.c:539
 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:534
-msgid "Mark text at the cursor position"
-msgstr "Đặt nhãn cho văn bản tại vị trí con trỏ"
+#: src/global.c:541
+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:535
-msgid "Repeat last search"
-msgstr "Lặp lại tìm kiếm cuối cùng"
+#: src/global.c:542
+msgid "Repeat the last search"
+msgstr "Lặp lại tìm kiếm cuối"
 
-#: src/global.c:537
+#: src/global.c:544
 msgid "Copy the current line and store it in the cutbuffer"
-msgstr "Sao chép dòng hiện thời và ghi nhớ nó vào bộ đệm cắt"
+msgstr "Sao chép dòng hiện tại và ghi nó vào bộ đệm cắt"
 
-#: src/global.c:538
+#: src/global.c:545
 msgid "Indent the current line"
 msgstr "Thụt lề dòng hiện tại"
 
-#: src/global.c:539
+#: src/global.c:546
 msgid "Unindent the current line"
 msgstr "Hủy thụt lề dòng hiện tại"
 
-#: src/global.c:540
+#: src/global.c:547
 msgid "Undo the last operation"
 msgstr "Hủy bước vừa mới làm"
 
-#: src/global.c:541
+#: src/global.c:548
 msgid "Redo the last undone operation"
 msgstr "Làm lại bước vừa mới được hủy"
 
-#: src/global.c:543
+#: src/global.c:550
 msgid "Go forward one character"
 msgstr "Tiếp tới một ký tự"
 
-#: src/global.c:544
+#: src/global.c:551
 msgid "Go back one character"
 msgstr "Lùi lại một ký tự"
 
-#: src/global.c:546
+#: src/global.c:553
 msgid "Go forward one word"
 msgstr "Tiếp tới một từ"
 
-#: src/global.c:547
+#: src/global.c:554
 msgid "Go back one word"
 msgstr "Lùi lại một từ"
 
-#: src/global.c:549
+#: src/global.c:556
 msgid "Go to previous line"
 msgstr "Về dòng trước"
 
-#: src/global.c:550
+#: src/global.c:557
 msgid "Go to next line"
 msgstr "Tới dòng kế"
 
-#: src/global.c:551
+#: src/global.c:558
 msgid "Go to beginning of current line"
 msgstr "Về đầu của dòng hiện tại"
 
-#: src/global.c:552
+#: src/global.c:559
 msgid "Go to end of current line"
 msgstr "Tới cuối của dòng hiện tại"
 
-#: src/global.c:555
+#: src/global.c:562
 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:557
+#: src/global.c:564
 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:560
+#: src/global.c:566
 msgid "Go to the first line of the file"
 msgstr "Về dòng đầu của tập tin"
 
-#: src/global.c:562
+#: src/global.c:567
 msgid "Go to the last line of the file"
 msgstr "Tới dòng cuối của tập tin"
 
-#: src/global.c:564
+#: src/global.c:569
 msgid "Go to the matching bracket"
 msgstr "Tới dấu ngoặc tương ứng"
 
-#: src/global.c:566
+#: src/global.c:571
 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:568
+#: src/global.c:573
 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:572
+#: src/global.c:576
 msgid "Switch to the previous file buffer"
 msgstr "Chuyển tới bộ đệm tập tin trước"
 
-#: src/global.c:574
+#: src/global.c:577
 msgid "Switch to the next file buffer"
 msgstr "Chuyển tới bộ đệm tập tin tiếp theo"
 
-#: src/global.c:577
+#: src/global.c:579
 msgid "Insert the next keystroke verbatim"
 msgstr "Chèn ký tự kế tiếp đúng nguyên văn"
 
-#: src/global.c:579
+#: src/global.c:580
 msgid "Insert a tab at the cursor position"
 msgstr "Chèn một ký tự tab tại vị trí con trỏ"
 
@@ -634,330 +626,434 @@ msgstr "Chèn một ký tự tab tại vị trí con trỏ"
 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:583
+#: src/global.c:582
 msgid "Delete the character under the cursor"
 msgstr "Xóa ký tự nằm dưới con trỏ"
 
-#: src/global.c:585
+#: src/global.c:584
 msgid "Delete the character to the left of the cursor"
 msgstr "Xóa ký tự ở bên trái con trỏ"
 
-#: src/global.c:588
+#: src/global.c:587
 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:591
+#: src/global.c:590
 msgid "Justify the entire file"
 msgstr "Sắp chữ đúng hàng cho cả tập tin"
 
-#: src/global.c:595
+#: src/global.c:594
 msgid "Count the number of words, lines, and characters"
 msgstr "Đếm số từ, số dòng và số ký tự"
 
-#: src/global.c:598
+#: src/global.c:597
 msgid "Refresh (redraw) the current screen"
-msgstr "Cập nhật (vẽ lại) màn hình hiện thời"
+msgstr "Cập nhật (vẽ lại) màn hình hiện tại"
 
-#: src/global.c:600
+#: src/global.c:599
 msgid "Suspend the editor (if suspend 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:603
+#: src/global.c:602
 msgid "Toggle the case sensitivity of the search"
-msgstr "Bật/tắt khả năng phân biệt chữ hoa/thường của việc tìm"
+msgstr "Bật/tắt phân biệt chữ HOA/thường khi tìm kiếm"
 
-#: src/global.c:605
+#: src/global.c:604
 msgid "Reverse the direction of the search"
 msgstr "Đảo ngược hướng tìm"
 
-#: src/global.c:609
+#: src/global.c:608
 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:613
+#: src/global.c:612
 msgid "Recall the previous search/replace string"
 msgstr "Xem lại chuỗi tìm kiếm/thay thế trước"
 
-#: src/global.c:615
+#: src/global.c:614
 msgid "Recall the next search/replace string"
 msgstr "Xem lại chuỗi tìm kiếm/thay thế kế"
 
-#: src/global.c:618
+#: src/global.c:617
 msgid "Go to file browser"
 msgstr "Đi tới trình duyệt tập tin"
 
-#: src/global.c:621
+#: src/global.c:620
 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:622
+#: src/global.c:621
 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:624
+#: src/global.c:622
 msgid "Toggle appending"
 msgstr "Bật/tắt khả năng phụ thêm"
 
-#: src/global.c:625
+#: src/global.c:623
 msgid "Toggle prepending"
 msgstr "Bật/tắt khả năng thêm vào trước"
 
-#: src/global.c:628
+#: src/global.c:624
 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:629
+#: src/global.c:625
 msgid "Execute external command"
 msgstr "Thực hiện câu lệnh ngoại trú"
 
-#: src/global.c:633
+#: src/global.c:628
 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:636
+#: src/global.c:631
 msgid "Exit from the file browser"
 msgstr "Thoát khỏi trình duyệt tập tin"
 
-#: src/global.c:638
+#: src/global.c:632
 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:640
+#: src/global.c:633
 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:641
-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:642
+#: src/global.c:634
 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:643
+#: src/global.c:635
+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:636
 msgid "Go to directory"
 msgstr "Đi tới thư mục"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:670
-msgid "Close"
-msgstr "Đóng"
+#: src/global.c:639
+msgid "Invoke the linter, if available"
+msgstr "Gọi trình lint, nếu có thể"
+
+#: src/global.c:640
+msgid "Go to previous linter msg"
+msgstr "Đến lời nhắn lint kế trước"
+
+#: src/global.c:641
+msgid "Go to next linter msg"
+msgstr "Đến lời nhắn lint kế"
+
+#: src/global.c:642
+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:662
+msgid "Get Help"
+msgstr "Trợ giúp"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:679
-msgid "WriteOut"
-msgstr "Ghi"
+#: src/global.c:665 src/prompt.c:1084
+msgid "Cancel"
+msgstr "Hủy bỏ"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:678
+msgid "Write Out"
+msgstr "Ghi lại"
+
+#: src/global.c:704
+msgid "Go To Dir"
+msgstr "Tới ThMục"
+
+#: src/global.c:719
+msgid "Cut Text"
+msgstr "Cắt chữ"
+
+#: src/global.c:728
 msgid "Justify"
 msgstr "Sắp chữ"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:696
-msgid "Read File"
-msgstr "Đọc tập tin"
+#: src/global.c:733
+msgid "To Spell"
+msgstr "Chính tả"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:713
-msgid "Cut Text"
-msgstr "Cắt văn bản"
+#: src/global.c:738
+msgid "To Linter"
+msgstr "Lint"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:718
-msgid "UnJustify"
-msgstr "Hủy sắp chữ"
+#: src/global.c:740
+msgid "Formatter"
+msgstr "Bộ định dạng"
+
+#: src/global.c:745
+msgid "Case Sens"
+msgstr "Tính đến kiểu chữ"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:723
-msgid "UnCut Text"
-msgstr "Hủy cắt văn bản"
+#: src/global.c:750
+msgid "Regexp"
+msgstr "BTCQ"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:728 src/global.c:755
+#: src/global.c:755
+msgid "Backwards"
+msgstr "Ngược lại"
+
+#: src/global.c:762
+msgid "No Replace"
+msgstr "Không thay thế"
+
+#: src/global.c:770
 msgid "Cur Pos"
-msgstr "Vị trí con trỏ"
+msgstr "Vị trí"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:737
-msgid "To Spell"
-msgstr "Chính tả"
+#: src/global.c:780
+msgid "Prev Page"
+msgstr "TrangTrước"
+
+#: src/global.c:782
+msgid "Next Page"
+msgstr "Trang kế"
+
+#: src/global.c:785
+msgid "First Line"
+msgstr "Dòng đầu"
+
+#: src/global.c:787
+msgid "Last Line"
+msgstr "Dòng cuối"
+
+#: src/global.c:794
+msgid "To Bracket"
+msgstr "Đặt Ngoặc"
 
-#: src/global.c:771
+#: src/global.c:797
 msgid "Mark Text"
 msgstr "Đánh dấu văn bản"
 
-#: src/global.c:777
+#: src/global.c:800
 msgid "Copy Text"
-msgstr "Chép văn bản"
+msgstr "Chép VBản"
 
-#: src/global.c:780
+#: src/global.c:803
 msgid "Indent Text"
-msgstr "Thụt lề văn bản"
+msgstr "Thụt VBản"
 
-#: src/global.c:783
+#: src/global.c:805
 msgid "Unindent Text"
 msgstr "Hủy thụt lề văn bản"
 
-#: src/global.c:787
+#: src/global.c:808
 msgid "Undo"
 msgstr "Hủy bước"
 
-#: src/global.c:790
+#: src/global.c:810
 msgid "Redo"
 msgstr "Hoàn lại"
 
-#: src/global.c:796 src/global.c:800
-msgid "Forward"
-msgstr "Tiếp"
-
-#: src/global.c:806 src/global.c:810
+#: src/global.c:814 src/global.c:820
 msgid "Back"
 msgstr "Lùi"
 
-#: src/global.c:817
-msgid "Next Word"
-msgstr "Từ kế"
+#: src/global.c:816 src/global.c:822
+msgid "Forward"
+msgstr "Kế tiếp"
 
-#: src/global.c:820
+#: src/global.c:827
 msgid "Prev Word"
 msgstr "Từ trước"
 
-#: src/global.c:824
-msgid "Prev Line"
-msgstr "Dòng trước"
-
-#: src/global.c:827
-msgid "Next Line"
-msgstr "Dòng kế"
+#: src/global.c:829
+msgid "Next Word"
+msgstr "Từ kế"
 
-#: src/global.c:830
+#: src/global.c:833
 msgid "Home"
 msgstr "Nhà"
 
-#: src/global.c:833
+#: src/global.c:835
 msgid "End"
 msgstr "Cuối"
 
-#: src/global.c:845
-msgid "Find Other Bracket"
-msgstr "Tìm ngoặc đơn khác"
+#: src/global.c:844
+msgid "Beg of Par"
+msgstr "Đầu đoạn văn"
 
-#: src/global.c:848
-msgid "Scroll Up"
-msgstr "Đưa lên"
+#: src/global.c:846
+msgid "End of Par"
+msgstr "Cuối đoạn văn"
 
 #: src/global.c:851
-msgid "Scroll Down"
-msgstr "Đưa xuống"
+msgid "Scroll Up"
+msgstr "Cuộn lên"
 
-#: src/global.c:856
-msgid "Previous File"
-msgstr "Tập tin trước"
+#: src/global.c:853
+msgid "Scroll Down"
+msgstr "Cuộn xuống"
 
 #: src/global.c:858
+msgid "Prev File"
+msgstr "Tập tin Trước"
+
+#: src/global.c:860
 msgid "Next File"
-msgstr "Tập tin kế"
+msgstr "Tập tin Sau"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:862 src/text.c:3045
-msgid "Verbatim Input"
-msgstr "Dữ liệu nhập nguyên bản"
+#: src/global.c:869
+msgid "Verbatim"
+msgstr "Đúng nguyên văn"
 
-#: src/global.c:867
+#: src/global.c:872
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:870
+#: src/global.c:874
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:873
+#: src/global.c:876
 msgid "Delete"
-msgstr "Xoá"
+msgstr "Xóa"
 
-#: src/global.c:876
+#: src/global.c:878
 msgid "Backspace"
-msgstr "Xoá lùi"
+msgstr "Xóa lùi"
 
-#: src/global.c:893
+#: src/global.c:888
 msgid "CutTillEnd"
-msgstr "Cắt đến cuối"
+msgstr "CắtĐếnCuối"
 
-#: src/global.c:906
+#: src/global.c:898
 msgid "Word Count"
 msgstr "Đếm từ"
 
-#: src/global.c:1367
+#: src/global.c:905
+msgid "Suspend"
+msgstr "Ngưng"
+
+#: src/global.c:910
+msgid "PrevHstory"
+msgstr "LịchSửTrước"
+
+#: src/global.c:913
+msgid "NextHstory"
+msgstr "LịchSửKế"
+
+#: src/global.c:917
+msgid "Go To Text"
+msgstr "Tới văn bản"
+
+#: src/global.c:928
+msgid "DOS Format"
+msgstr "Định dạng DOS"
+
+#: src/global.c:931
+msgid "Mac Format"
+msgstr "Định dạng Mac"
+
+#: src/global.c:934
+msgid "Append"
+msgstr "Phụ thêm"
+
+#: src/global.c:936
+msgid "Prepend"
+msgstr "Thêm vào trước"
+
+#: src/global.c:939
+msgid "Backup File"
+msgstr "Tập tin Sao lưu dự phòng"
+
+#: src/global.c:946
+msgid "Execute Command"
+msgstr "Thực hiện lệnh"
+
+#: src/global.c:961
+msgid "To Files"
+msgstr "Tới tập tin"
+
+#: src/global.c:964
+msgid "First File"
+msgstr "Tập tin đầu"
+
+#: src/global.c:966
+msgid "Last File"
+msgstr "Tập tin cuối"
+
+#: src/global.c:977
+msgid "Prev Lint Msg"
+msgstr "LNhắn Lint tr"
+
+#: src/global.c:979
+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:1227
 msgid "Help mode"
 msgstr "Chế độ Trợ giúp"
 
-#: src/global.c:1369
+#: src/global.c:1229
 msgid "Constant cursor position display"
 msgstr "Hiển thị ví trí cố định của con trỏ"
 
-#: src/global.c:1371
+#: src/global.c:1231
 msgid "Use of one more line for editing"
-msgstr "Sử dụng dòng thêm để soạn thảo"
+msgstr "Sử dụng nhiều dòng hơn dành cho việc soạn thảo"
 
-#: src/global.c:1373
+#: src/global.c:1233
 msgid "Smooth scrolling"
 msgstr "Cuộn trơn mượt"
 
-#: src/global.c:1375
+#: src/global.c:1235
+msgid "Soft wrapping of overlong lines"
+msgstr "Ngắt mềm những dòng dài"
+
+#: src/global.c:1237
 msgid "Whitespace display"
 msgstr "Hiển thị khoảng trắng"
 
-#: src/global.c:1377
+#: src/global.c:1239
 msgid "Color syntax highlighting"
-msgstr "Chiếu sáng cú pháp"
+msgstr "Tô sáng cú pháp"
 
-#: src/global.c:1379
+#: src/global.c:1241
 msgid "Smart home key"
 msgstr "Phím home khéo"
 
-#: src/global.c:1381
+#: src/global.c:1243
 msgid "Auto indent"
 msgstr "Tự động thụt lề"
 
-#: src/global.c:1383
+#: src/global.c:1245
 msgid "Cut to end"
 msgstr "Cắt tới cuối"
 
-#: src/global.c:1385
-msgid "Long line wrapping"
-msgstr "Ngắt dòng dài"
+#: src/global.c:1247
+msgid "Hard wrapping of overlong lines"
+msgstr "Ngắt cứng những dòng dài"
 
-#: src/global.c:1387
+#: src/global.c:1249
 msgid "Conversion of typed tabs to spaces"
 msgstr "Chuyển các tab thành dấu cách"
 
-#: src/global.c:1389
+#: src/global.c:1251
 msgid "Backup files"
-msgstr "Lưu trữ tập tin"
+msgstr "Tập tin sao lưu dự phòng"
 
-#: src/global.c:1391
+#: src/global.c:1253
 msgid "Multiple file buffers"
 msgstr "Bộ đệm đa tập tin"
 
-#: src/global.c:1393
+#: src/global.c:1255
 msgid "Mouse support"
 msgstr "Hỗ trợ chuột"
 
-#: src/global.c:1395
+#: src/global.c:1257
 msgid "No conversion from DOS/Mac format"
 msgstr "Không chuyển đổi từ định dạng DOS/Mac"
 
-#: src/global.c:1397
+#: src/global.c:1259
 msgid "Suspension"
 msgstr "Tạm dừng"
 
-#: src/global.c:1399
-msgid "Soft line wrapping"
-msgstr "Ngắt dòng mềm"
-
-#: src/help.c:236
+#: src/help.c:205
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -979,7 +1075,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:245
+#: src/help.c:214
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -993,7 +1089,7 @@ msgstr ""
 " Những phím chức năng sau có trong chế độ Tìm kiếm:\n"
 "\n"
 
-#: src/help.c:251
+#: src/help.c:220
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1012,7 +1108,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:260
+#: src/help.c:229
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1026,7 +1122,7 @@ msgid ""
 msgstr ""
 "Văn bản của Trợ giúp cho Chèn tập tin\n"
 "\n"
-" Hãy gõ tên của tập tin bạn muốn chèn vào bộ đệm hiện thời tại vị trí con "
+" Hãy gõ tên của tập tin bạn muốn chèn vào bộ đệm hiện tại tại vị trí con "
 "trỏ.\n"
 "\n"
 " Nếu bạn đã biên dịch nano với sự hỗ trợ đa bộ đệm, và bật sự hỗ trợ này "
@@ -1035,7 +1131,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:269
+#: src/help.c:238
 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"
@@ -1049,7 +1145,7 @@ msgstr ""
 " Có những phím chức năng sau trong chế độ Chèn Tập tin:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:244
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1064,20 +1160,20 @@ msgid ""
 " The following function keys are available in Write File mode:\n"
 "\n"
 msgstr ""
-"Văn bản của Trợ giúp cho Ghi nhớ tập tin\n"
+"Văn bản của Trợ giúp cho việc lưu tập tin\n"
 "\n"
-" Hãy gõ tên bạn muốn ghi nhớ cho tập tin hiện thời và gõ Enter để hoàn thành "
-"ghi nhớ.\n"
+" Hãy gõ tên bạn muốn lưu cho tập tin hiện tại và gõ Enter để hoàn thành "
+"lưu.\n"
 "\n"
 " Nếu đã lựa chọn một đoạn văn bản nào đó (bằng dấu hiệu), thì chương trình "
-"sẽ nhắc ghi nhớ đoạn văn bản đã lựa chọn đó vào một tập tin riêng rẽ.  Để "
-"giảm khả năng ghi một phần đè lên cả tập tin hiện thời, thì tên tập tin hiện "
-"thời không phải là mặc định trong chế độ này.\n"
+"sẽ nhắc lưu đoạn văn bản đã lựa chọn đó vào một tập tin riêng rẽ.  Để giảm "
+"khả năng ghi một phần đè lên cả tập tin hiện tại, thì tên tập tin hiện tại "
+"không phải là mặc định trong chế độ này.\n"
 "\n"
-" Có thể dùng các phím chức năng sau trong chế độ Ghi nhớ Tập tin:\n"
+" 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:289
+#: src/help.c:258
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1095,13 +1191,13 @@ msgstr ""
 " Trình duyệt tập tin sử dụng cho việc xem cấu trúc thư mục và chọn một tập "
 "tin để đọc hay soạn thảo.  Bạn có thể sử dụng các phím mũi tên hoặc Page Up/"
 "Down để di chuyển qua các tập tin, và S hoặc Enter để chọn tập tin hay thư "
-"mục đánh dấu.  Để di chuyển lên trên một bậc, hãy chọn thư mục có tên \"..\" "
+"mục đánh dấu.  Để di chuyển lên trên một bậc, hãy chọn thư mục có tên “..” "
 "trên đầu danh sách.\n"
 "\n"
 " Có thể dùng các phím chức năng sau trong trình duyệt:\n"
 "\n"
 
-#: src/help.c:302
+#: src/help.c:271
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1125,7 +1221,7 @@ msgstr ""
 "này.\n"
 "\n"
 
-#: src/help.c:311
+#: src/help.c:280
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1133,7 +1229,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:315
+#: src/help.c:284
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1156,7 +1252,7 @@ msgstr ""
 "mục:\n"
 "\n"
 
-#: src/help.c:328
+#: src/help.c:297
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1172,14 +1268,14 @@ msgstr ""
 "Văn bản của Trợ giúp cho Kiểm tra chính tả\n"
 "\n"
 " Trình kiểm tra chính tả sẽ kiểm tra chính tả của tất cả văn bản trong tập "
-"tin hiện thời.  Khi tìm thấy một từ không biết, nó sẽ chiếu sáng và có thể "
+"tin hiện tại.  Khi tìm thấy một từ không biết, nó sẽ chiếu sáng và có thể "
 "soạn thảo một thay thế.  Sau đó nó sẽ nhắc thay thế mọi từ sai lỗi chính tả "
-"này trong tập tin hiện thời, hoặc, trong đoạn văn bản đã đánh dấu, nếu có.\n"
+"này trong tập tin hiện tại, hoặc, trong đoạn văn bản đã đánh dấu, nếu có.\n"
 "\n"
 " Có các chức năng sau trong chế độ Kiểm tra chính tả:\n"
 "\n"
 
-#: src/help.c:343
+#: src/help.c:312
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1193,13 +1289,13 @@ msgstr ""
 "Văn bản của Trợ giúp cho Thực hiện Câu lệnh\n"
 "\n"
 " Chế độ này cho phép bạn chèn kết quả của một câu lệnh chạy bằng trình bao "
-"vào bộ đệm hiện thời (hoặc vào một bộ đệm mới ở chế độ đa bộ đệm). Nếu cần "
+"vào bộ đệm hiện tại (hoặc vào một bộ đệm mới ở chế độ đa bộ đệm). Nếu cần "
 "một bộ đệm trống khác, thì đừng nhập câu lệnh.\n"
 "\n"
 " Có thể dùng các phím sau trong chế độ Thực hiện Câu lệnh:\n"
 "\n"
 
-#: src/help.c:356
+#: src/help.c:325
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1210,7 +1306,7 @@ msgid ""
 "showing the file being edited.  The status line is the third line from the "
 "bottom and shows important messages.  "
 msgstr ""
-"Văn bản Trợ giúp Chính của nano\n"
+"Trợ giúp Chính dạng văn bản của nano\n"
 "\n"
 " Trình soạn thảo nano được thiết kế để nâng cao tính năng suất và sự dễ sử "
 "dụng của trình soạn thảo UW Pico.  Nano gồm bốn phần chính. Dòng trên cùng "
@@ -1219,7 +1315,7 @@ 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:366
+#: src/help.c:335
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1237,7 +1333,7 @@ msgstr ""
 "ký hiệu bằng ký tự Meta (M) và nhập vào bằng (một trong) các phím Esc, Alt "
 "hay Meta tùy thuộc vào cấu hình bàn phím.  "
 
-#: src/help.c:375
+#: src/help.c:344
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1250,456 +1346,486 @@ msgstr ""
 "sổ soạn thảo chính.  Các phím tương đương đặt trong dấu ngoặc đơn:\n"
 "\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:376 src/help.c:448
 msgid "enable/disable"
 msgstr "bật/tắt"
 
-#: src/nano.c:587
+#: src/nano.c:601
 msgid "Key invalid in view mode"
 msgstr "Phím không hợp lệ trong chế độ xem"
 
-#: src/nano.c:695
+#: src/nano.c:713
 #, c-format
 msgid ""
 "\n"
 "Buffer written to %s\n"
 msgstr ""
 "\n"
-"Ghi nhớ bộ đệm vào %s\n"
+"Bộ nhớ đệm ghi vào %s\n"
 
-#: src/nano.c:697
+#: src/nano.c:715
 #, c-format
 msgid ""
 "\n"
 "Buffer not written to %s: %s\n"
 msgstr ""
 "\n"
-"Chưa ghi nhớ bộ đệm vào %s: %s\n"
+"Bộ nhớ đệm chưa được ghi vào %s: %s\n"
 
-#: src/nano.c:700
+#: src/nano.c:718
 #, c-format
 msgid ""
 "\n"
 "Buffer not written: %s\n"
 msgstr ""
 "\n"
-"Chưa ghi nhớ bộ đệm: %s\n"
+"Bộ nhớ đệm chưa được ghi lại: %s\n"
 
-#: src/nano.c:723
+#: src/nano.c:743
 msgid "Window size is too small for nano...\n"
-msgstr "Kích thước cửa sổ quá nhỏ cho nano...\n"
+msgstr "Kích thước cửa sổ quá nhỏ cho nano…\n"
 
-#: src/nano.c:816
+#: src/nano.c:836
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
 "\n"
 msgstr ""
-"Sử dụng: nano [TÙY_CHỌN] [[+DÒNG,CỘT] TẬP_TIN]...\n"
+"Cách dùng: nano [TÙY_CHỌN] [[+DÒNG,CỘT] TẬP_TIN]…\n"
 "\n"
 
-#: src/nano.c:819
+#: src/nano.c:839
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
-msgstr "Tùy chọn\t\tTùy chọn GNU dài\t\tÝ nghĩa\n"
+msgstr "Tùy chọn\tTùy chọn GNU dài\tÝ nghĩa\n"
 
-#: src/nano.c:821
+#: src/nano.c:841
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Tùy chọn\t\tÝ nghĩa\n"
 
-#: src/nano.c:824
-msgid "Show this message"
-msgstr "Hiển thị thông báo này"
-
-#: src/nano.c:825
+#: src/nano.c:844
 msgid "+LINE,COLUMN"
 msgstr "+DÒNG,CỘT"
 
-#: src/nano.c:826
+#. TRANSLATORS: The next forty or so strings are option descriptions
+#. * for the --help output.  Try to keep them at most 40 characters.
+#: src/nano.c:847
 msgid "Start at line LINE, column COLUMN"
-msgstr "Bắt đầu trên dòng DÒNG, cột CỘT"
+msgstr "Bắt đầu tại dòng DÒNG, cột CỘT"
 
-#: src/nano.c:828
+#: src/nano.c:849
 msgid "Enable smart home key"
 msgstr "Bật dùng phím home khéo"
 
-#: src/nano.c:829
+#: src/nano.c:850
 msgid "Save backups of existing files"
 msgstr "Lưu trữ các tập tin đã có"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "-C <dir>"
-msgstr "-C <thư mục>"
+msgstr "-C <thư_mục>"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "--backupdir=<dir>"
-msgstr "--backupdir=<thư mục>"
+msgstr "--backupdir=<thư_mục>"
 
-#: src/nano.c:831
+#: src/nano.c:852
 msgid "Directory for saving unique backup files"
-msgstr "Thư mục để ghi nhớ tập tin lưu trữ duy nhất"
+msgstr "Thư mục để lưu tập tin lưu trữ duy nhất"
 
-#: src/nano.c:834
+#: src/nano.c:855
 msgid "Use bold instead of reverse video text"
 msgstr "Hiển thị chữ in đậm thay cho chữ ảnh động đảo ngược"
 
-#: src/nano.c:837
+#: src/nano.c:858
 msgid "Convert typed tabs to spaces"
 msgstr "Chuyển tab thành dấu cách"
 
-#: src/nano.c:840
+#: src/nano.c:861
 msgid "Enable multiple file buffers"
 msgstr "Bật dùng bộ đệm đa tập tin"
 
-#: src/nano.c:845
+#: src/nano.c:865
+msgid "Use (vim-style) lock files"
+msgstr "Dùng các tập tin khóa (kiểu-vim)"
+
+#: src/nano.c:869
 msgid "Log & read search/replace string history"
 msgstr "Ghi lại và đọc lịch sử các chuỗi tìm kiếm/thay thế"
 
-#: src/nano.c:848
+#: src/nano.c:873
 msgid "Don't look at nanorc files"
 msgstr "Đừng nhìn vào các tập tin nanorc"
 
-#: src/nano.c:851
+#: src/nano.c:876
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Giải quyết vấn đề nhầm lẫn trên bàn phím số"
 
-#: src/nano.c:853
+#: src/nano.c:878
 msgid "Don't add newlines to the ends of files"
 msgstr "Đừng thêm dòng mới vào cuối tập tin"
 
-#: src/nano.c:856
+#: src/nano.c:881
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Đừng chuyển đổi tập tin từ định dạng DOS/Mac"
 
-#: src/nano.c:858
+#: src/nano.c:883
 msgid "Use one more line for editing"
 msgstr "Sử dụng một dòng thêm để soạn thảo"
 
-#: src/nano.c:860
+#: src/nano.c:886
+msgid "Log & read location of cursor position"
+msgstr "Ghi nhật ký & đọc vị trí tại vị trí con trỏ"
+
+#: src/nano.c:889
 msgid "-Q <str>"
 msgstr "-Q <chuỗi>"
 
-#: src/nano.c:860
+#: src/nano.c:889
 msgid "--quotestr=<str>"
 msgstr "--quotestr=<chuỗi>"
 
-#: src/nano.c:861
+#: src/nano.c:890
 msgid "Quoting string"
 msgstr "Chuỗi dùng để trích dẫn"
 
-#: src/nano.c:863
+#: src/nano.c:892
 msgid "Restricted mode"
 msgstr "Chế độ hạn chế"
 
-#: src/nano.c:866
+#: src/nano.c:895
 msgid "Scroll by line instead of half-screen"
 msgstr "Cuộn theo dòng thay vào theo nửa màn hình"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "-T <#cols>"
-msgstr "-T <số_cột>"
+msgstr "-T <#số_cột>"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "--tabsize=<#cols>"
-msgstr "--tabsize=<số_cột>"
+msgstr "--tabsize=<#số_cột>"
 
-#: src/nano.c:869
+#: src/nano.c:898
 msgid "Set width of a tab to #cols columns"
 msgstr "Đặt độ rộng của tab tính theo cột tới số cột này"
 
-#: src/nano.c:871
+#: src/nano.c:900
 msgid "Do quick statusbar blanking"
 msgstr "Xóa nhanh dòng trạng thái"
 
-#: src/nano.c:874
+#: src/nano.c:903
 msgid "Print version information and exit"
 msgstr "In ra thông tin phiên bản và thoát"
 
-#: src/nano.c:877
+#: src/nano.c:906
 msgid "Detect word boundaries more accurately"
 msgstr "Nhận dạng ranh giới của từ cẩn thận hơn"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "-Y <str>"
 msgstr "-Y <chuỗi>"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "--syntax=<str>"
 msgstr "--syntax=<chuỗi>"
 
-#: src/nano.c:881
+#: src/nano.c:910
 msgid "Syntax definition to use for coloring"
 msgstr "Định nghĩa cú pháp để sử dụng khi tô màu"
 
-#: src/nano.c:883
+#: src/nano.c:912
 msgid "Constantly show cursor position"
 msgstr "Luôn luôn hiển thị vị trí con trỏ"
 
-#: src/nano.c:885
+#: src/nano.c:914
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Giải quyết vấn đề nhầm lẫn Backspace/Delete"
 
-#: src/nano.c:888
+#: src/nano.c:915
+msgid "Show this help text"
+msgstr "Hiển thị trợ giúp này"
+
+#: src/nano.c:918
 msgid "Automatically indent new lines"
 msgstr "Tự động thụt các dòng mới"
 
-#: src/nano.c:889
+#: src/nano.c:919
 msgid "Cut from cursor to end of line"
 msgstr "Cắt từ vị trí con trỏ tới cuối dòng"
 
-#: src/nano.c:892
+#: src/nano.c:922
 msgid "Don't follow symbolic links, overwrite"
 msgstr "Đừng đi theo liên kết mềm, hãy ghi đè"
 
-#: src/nano.c:894
+#: src/nano.c:924
 msgid "Enable the use of the mouse"
-msgstr "Hỗ trợ chuột"
+msgstr "Hỗ trợ việc dùng chuột"
 
-#: src/nano.c:897
+#: src/nano.c:926
+msgid "Do not read the file (only write it)"
+msgstr "Không thể đọc tập tin (chỉ có thể ghi nó)"
+
+#: src/nano.c:928
 msgid "-o <dir>"
-msgstr "-o <thư mục>"
+msgstr "-o <thư_mục>"
 
-#: src/nano.c:897
+#: src/nano.c:928
 msgid "--operatingdir=<dir>"
-msgstr "--operatingdir=<thư mục>"
+msgstr "--operatingdir=<thư_mục>"
 
-#: src/nano.c:898
+#: src/nano.c:929
 msgid "Set operating directory"
 msgstr "Đặt thư mục thao tác"
 
-#: src/nano.c:901
+#: src/nano.c:932
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
-msgstr "Giữ gìn các phím XON (^Q) và XOFF (^S)"
+msgstr "Cấm các phím XON (^Q) và XOFF (^S)"
 
-#: src/nano.c:903
+#: src/nano.c:935
 msgid "Silently ignore startup issues like rc file errors"
-msgstr ""
-"Bỏ qua im (không xuất thông điệp) các vấn đề khởi chạy, v.d. lỗi tập tin rc"
+msgstr "Không xuất các lời nhắn về các vấn đề khởi chạy như là lỗi tập tin rc"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "-r <#cols>"
-msgstr "-r <số_cột>"
+msgstr "-r <#số_cột>"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "--fill=<#cols>"
-msgstr "--fill=<số_cột>"
+msgstr "--fill=<#số_cột>"
 
-#: src/nano.c:906
-msgid "Set wrapping point at column #cols"
-msgstr "Đặt điểm ngắt dòng tính theo cột tới số cột này"
+#: src/nano.c:939
+msgid "Set hard-wrapping point at column #cols"
+msgstr "Đặt điểm ngắt dòng cứng tính tại #cột này"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "-s <prog>"
 msgstr "-s <chương trình>"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "--speller=<prog>"
-msgstr "--speller=<chương trình>"
+msgstr "--speller=<ch_trình>"
 
-#: src/nano.c:910
+#: src/nano.c:943
 msgid "Enable alternate speller"
 msgstr "Dùng chương trình kiểm tra chính tả khác"
 
-#: src/nano.c:913
+#: src/nano.c:946
 msgid "Auto save on exit, don't prompt"
-msgstr "Tự động ghi nhớ khi thoát, đừng hỏi lại"
+msgstr "Tự động lưu khi thoát, đừng hỏi lại"
 
-#: src/nano.c:915
-msgid "Allow generic undo [EXPERIMENTAL]"
-msgstr "Cho phép hủy bước giống loài [VẪN THỰC NGHIỆM]"
-
-#: src/nano.c:918
+#: src/nano.c:947
 msgid "View mode (read-only)"
 msgstr "Chế độ Xem (chỉ đọc)"
 
-#: src/nano.c:920
-msgid "Don't wrap long lines"
+#: src/nano.c:949
+msgid "Don't hard-wrap long lines"
 msgstr "Đừng ngắt những dòng dài"
 
-#: src/nano.c:922
+#: src/nano.c:951
 msgid "Don't show the two help lines"
 msgstr "Đừng hiển thị hai dòng trợ giúp"
 
-#: src/nano.c:923
+#: src/nano.c:952
 msgid "Enable suspension"
-msgstr "Bật dùng sự Tạm hoãn"
+msgstr "Bật tạm ngưng"
 
-#: src/nano.c:924
+#: src/nano.c:954
 msgid "Enable soft line wrapping"
 msgstr "Bật ngắt dòng mềm"
 
-#: src/nano.c:928
-msgid "(ignored, for Pico compatibility)"
-msgstr "(bị lờ đi, để tương thích với Pico)"
-
-#: src/nano.c:938
+#: src/nano.c:963
 #, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
-msgstr " GNU nano phiên bản %s (biên dịch %s, %s)\n"
+msgid " GNU nano, version %s\n"
+msgstr " GNU nano, phiên bản %s\n"
 
-#: src/nano.c:943
+#: src/nano.c:966
 #, 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/"
+msgstr " Địa chỉ thư: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 
-#: src/nano.c:944
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
 " Compiled options:"
 msgstr ""
 "\n"
-" Tùy chọn được biên dịch:"
+" Tùy chọn biên dịch:"
 
-#: src/nano.c:1022
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
-msgstr "Rất tiếc, hỗ trợ cho chức năng này bị tắt"
+msgstr "Rất tiếc, hỗ trợ cho chức năng này đã bị tắt"
 
-#: src/nano.c:1044
+#: src/nano.c:1125
+msgid "No file name"
+msgstr "Không có tên tập tin"
+
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
-msgstr "Ghi bộ đệm đã sửa đổi (TRẢ LỜI \"K\" SẼ BỎ MỌI THAY ĐỔI) (C/K) ? "
+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:1088
+#: src/nano.c:1189
 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:1114
+#: src/nano.c:1213
 #, 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"
+msgstr "Đang đọc từ đầu vào tiêu chuẩn, bấm ^C để hủy bỏ\n"
 
-#: src/nano.c:1182
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Nhận được tín hiệu SIGHUP hoặc SIGTERM\n"
 
-#: src/nano.c:1204
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
-msgstr "Sử dụng \"fg\" để quay lại nano.\n"
+msgstr "Dùng “fg” để quay lại nano.\n"
 
-#: src/nano.c:1386
+#: src/nano.c:1481
 msgid "enabled"
-msgstr "đã bật"
+msgstr "được bật"
 
-#: src/nano.c:1387
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "bị tắt"
 
-#: src/nano.c:1548 src/winio.c:1256
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr "Lệnh không rõ"
 
-#: src/nano.c:1674
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "XON bị lờ đi."
 
-#: src/nano.c:1679
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF bị lờ đi."
 
-#: src/nano.c:2209 src/rcfile.c:1100
+#: src/nano.c:2310 src/rcfile.c:1325
 #, 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ệ"
+msgstr "Yêu cầu một kích thước tab “%s” không hợp lệ"
 
-#: src/nano.c:2268 src/rcfile.c:1025
+#: src/nano.c:2374 src/rcfile.c:1250
 #, 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ệ"
+msgstr "Yêu cầu một kích thước tô đầy “%s” không hợp lệ"
+
+#: src/nano.c:2415
+#, 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"
 
 #. 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:1259
+#: src/prompt.c:1055
 msgid "Yy"
 msgstr "Cc"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1056
 msgid "Nn"
 msgstr "Kk"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1057
 msgid "Aa"
 msgstr "Tt"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1071
 msgid "Yes"
 msgstr "Có"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1076
 msgid "All"
 msgstr "Tất cả"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1081
 msgid "No"
 msgstr "Không"
 
-#: src/rcfile.c:130
+#: src/rcfile.c:137
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Lỗi trong %s trên dòng %lu: "
 
-#: src/rcfile.c:185
+#: src/rcfile.c:196
 #, c-format
 msgid "Argument '%s' has an unterminated \""
-msgstr "Đối số « %s » không kết thúc \""
+msgstr "Đối số “%s” chưa được \" kết thúc"
 
-#: src/rcfile.c:212 src/rcfile.c:264 src/rcfile.c:711 src/rcfile.c:768
-#: src/rcfile.c:821
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 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:238 src/search.c:62
+#: src/rcfile.c:249 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
-msgstr "Biểu thức chính quy xấu \"%s\": %s"
+msgstr "Biểu thức chính sai “%s”: %s"
 
-#: src/rcfile.c:258
+#: src/rcfile.c:269
 msgid "Missing syntax name"
 msgstr "Thiếu tên cú pháp"
 
-#: src/rcfile.c:316
+#: src/rcfile.c:340
 msgid "The \"none\" syntax is reserved"
-msgstr "Cú pháp \"none\" bị hạn chế"
+msgstr "Cú pháp “none” là được để dành dùng trong tương lai"
 
-#: src/rcfile.c:323
+#: src/rcfile.c:347
 msgid "The \"default\" syntax must take no extensions"
-msgstr "Cú pháp \"default\" không chấp nhận phần mở rộng"
+msgstr "Cú pháp “default” không chấp nhận phần mở rộng"
 
-#: src/rcfile.c:386 src/rcfile.c:483
+#: src/rcfile.c:433
 msgid "Missing key name"
-msgstr "Thiếu tên khoá"
+msgstr "Thiếu tên khóa"
 
-#: src/rcfile.c:398 src/rcfile.c:499
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
-msgstr "tổ hợp phím phải bắt đầu với « ^ », « M » hoặc « F »"
+#: src/rcfile.c:442 src/rcfile.c:453
+msgid "Key name is too short"
+msgstr "Tên khóa quá ngắn"
 
-#: src/rcfile.c:407
-msgid "Must specify function to bind key to"
-msgstr "Phải ghi rõ chức năng với đó cần tổ hợp phím"
+#: src/rcfile.c:463
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
+msgstr "Nên phím phải bắt đầu với “^”, “M” hoặc “F”"
 
-#: src/rcfile.c:418 src/rcfile.c:510
-msgid "Must specify menu to bind key to (or \"all\")"
+#: src/rcfile.c:472
+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:482
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
-"Phải ghi rõ trình đơn với đó cần tổ hợp phím (hoặc đặt « all » (tất cả))"
+"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:489
+#, 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:426
+#: src/rcfile.c:496
 #, c-format
-msgid "Could not map name \"%s\" to a function"
-msgstr "Không thể ánh xạ tên « %s » tới một chức năng"
+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:432 src/rcfile.c:517
+#: src/rcfile.c:528
 #, c-format
-msgid "Could not map name \"%s\" to a menu"
-msgstr "Không thể ánh xạ tên « %s » tới một trình đơn"
+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:454
+#: src/rcfile.c:543
 #, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
-msgstr "Tiếc là không cho phép dùng tổ hợp phím « %s »"
+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:625
+#: src/rcfile.c:629
+#, c-format
+msgid "Error expanding %s: %s"
+msgstr "Gặp lỗi khi khải triển %s: %s"
+
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1709,150 +1835,206 @@ msgid ""
 "for foreground colors."
 msgstr ""
 "Không hiểu màu %s.\n"
-"Có thể dùng các màu :\n"
-" • green\tlục\n"
-" • red\tđỏ\n"
-" • blue\txanh\n"
-" • white\ttrắng\n"
-" • yellow\tvàng\n"
-" • cyan\txanh lá mạ\n"
-" • magenta\tđỏ tươi\n"
-" • black\tđên\n"
+"Có thể dùng các màu:\n"
+" * green\tlục\n"
+" * red\tđỏ\n"
+" * blue\txanh\n"
+" * white\ttrắng\n"
+" * yellow\tvàng\n"
+" * cyan\txanh lá mạ\n"
+" * magenta\tđỏ tươi\n"
+" * black\tđen\n"
 "với tiền tố không bắt buộc:\n"
-" • bright\tsáng\n"
+" * bright\tsáng\n"
 "cho màu của văn bản."
 
-#: src/rcfile.c:647
+#: src/rcfile.c:694
 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:652
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "Thiếu tên màu"
 
-#: src/rcfile.c:672
-#, 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:690 src/rcfile.c:809
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr "Thiếu các chuỗi biểu thức chính quy"
 
-#: src/rcfile.c:762
+#: src/rcfile.c:785
 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"
+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:804
+#: src/rcfile.c:837
+#, 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:865
 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:874
+#: src/rcfile.c:921
+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:926
+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 linter đầu mà không có câu lệnh cú pháp"
+
+#: src/rcfile.c:990
+msgid "Missing linter command"
+msgstr "Thiếu lệnh linter"
+
+#: src/rcfile.c:1010
+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:1015
+msgid "Missing formatter command"
+msgstr "Thiếu lệnh trình định dạng"
+
+#: src/rcfile.c:1045
 #, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
-msgstr "Lỗi nghiêm trọng: chưa ánh xạ phím với chức năng « %s »"
+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:876
+#: src/rcfile.c:1047
+#, c-format
 msgid ""
-"Exiting.  Please use nano with the -I option if needed to adjust your nanorc "
-"settings\n"
+"If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
-"Đang thoát... Hãy sử dụng trình soạn thảo nano với tùy chọn « -l » nếu cần "
-"thiết, để điều chỉnh thiết lập nanorc của bạn\n"
+"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:926 src/rcfile.c:935 src/rcfile.c:945
+#: src/rcfile.c:1108
+#, 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:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, 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"
+msgstr "Lệnh “%s” không được phép trong tập tin đã bao gồm"
 
-#: src/rcfile.c:951 src/rcfile.c:1128
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
-msgstr "Cú pháp « %s » không có câu lệnh màu"
+msgstr "Cú pháp “%s” không có câu lệnh màu"
 
-#: src/rcfile.c:966
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
-msgstr "Không hiểu câu lệnh « %s »"
+msgstr "Không hiểu câu lệnh “%s”"
 
-#: src/rcfile.c:972
-msgid "Missing flag"
-msgstr "Thiếu cờ"
+#: src/rcfile.c:1186
+msgid "Missing option"
+msgstr "Thiếu tùy chọn"
 
-#: src/rcfile.c:994
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
-msgstr "Tùy chọn « %s » cần một tham số"
+msgstr "Tùy chọn “%s” cần một tham số"
 
-#: src/rcfile.c:1012
+#: src/rcfile.c:1226
 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:1038 src/rcfile.c:1066 src/rcfile.c:1075
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 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:1048
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr "Yêu cầu hai ký tự một cột"
 
-#: src/rcfile.c:1114
+#: src/rcfile.c:1339
 #, c-format
-msgid "Cannot unset flag \"%s\""
-msgstr "Không bỏ đặt được cờ « %s »"
+msgid "Cannot unset option \"%s\""
+msgstr "Không thể bỏ đặt tùy chọn “%s”"
 
-#: src/rcfile.c:1123
+#: src/rcfile.c:1345
 #, c-format
-msgid "Unknown flag \"%s\""
-msgstr "Cờ không rõ « %s »"
+msgid "Unknown option \"%s\""
+msgstr "Không hiểu tùy chọn “%s”"
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1404
 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:1442
+#, c-format
+msgid ""
+"\n"
+"Press Enter to continue starting nano.\n"
+msgstr ""
+"\n"
+"Nhấn Enter để tiếp tục khởi chạy nano.\n"
+
 #: src/search.c:96
 #, c-format
 msgid "\"%.*s%s\" not found"
-msgstr "Không tìm thấy \"%.*s%s\""
+msgstr "Không tìm thấy “%.*s%s”"
 
-#: src/search.c:205
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/search.c:184
+msgid " [Case Sensitive]"
+msgstr " [Phân biệt HOA/thường]"
+
+#: src/search.c:188
+msgid " [Regexp]"
+msgstr " [BTCQ]"
+
+#: src/search.c:192
+msgid " [Backwards]"
+msgstr " [Ngược lại]"
+
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:197
 msgid " (to replace) in selection"
 msgstr " (thay thế) trong lựa chọn"
 
-#: src/search.c:207
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (thay thế)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:769
 msgid "Replace this instance?"
-msgstr "Thay thế tương ứng này?"
+msgstr "Thay thế minh dụ này?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:945
 msgid "Replace with"
-msgstr "Thay thế bởi"
+msgstr "Thay thế bằng"
 
-#: src/search.c:1004
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
 msgstr[0] "Đã thay thế %lu lần"
 
-#: src/search.c:1034
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr "Nhập số thứ tự dòng, cột"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
 msgstr "Sai số thứ tự dòng hoặc cột"
 
-#: src/search.c:1214
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "Không phải ngoặc đơn"
 
-#: src/search.c:1281
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "Không có ngoặc đơn tương ứng"
 
@@ -1864,217 +2046,320 @@ msgstr "Đánh dấu văn bản"
 msgid "Mark Unset"
 msgstr "Hủy dấu văn bản"
 
-#: src/text.c:443
+#: src/text.c:439
 msgid "Nothing in undo buffer!"
-msgstr "Không có gì trong vùng đệm hủy bước !"
+msgstr "Không có gì trong vùng đệm hủy bước!"
 
-#: src/text.c:455 src/text.c:593
+#: src/text.c:445 src/text.c:590
 #, 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 tập tin"
+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."
 
-#: src/text.c:466 src/text.c:603
+#: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
 msgstr "thêm văn bản"
 
-#: src/text.c:475 src/text.c:613
+#: src/text.c:467 src/text.c:612
 msgid "text delete"
-msgstr "xoá văn bản"
-
-#: src/text.c:489 src/text.c:628
-msgid "line wrap"
-msgstr "ngắt dòng"
+msgstr "xóa văn bản"
 
-#: src/text.c:503 src/text.c:636
+#: src/text.c:491 src/text.c:641
 msgid "line join"
 msgstr "nối dòng"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:505 src/text.c:657
 msgid "text cut"
 msgstr "văn bản cắt"
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:510 src/text.c:661
 msgid "text uncut"
-msgstr "văn bản không cắt"
+msgstr "văn bản dán"
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:515 src/text.c:623
 msgid "line break"
-msgstr "chia dòng"
+msgstr "ngắt dòng"
 
-#: src/text.c:532 src/text.c:665
+#: src/text.c:528 src/text.c:672
 msgid "text insert"
 msgstr "chèn văn bản"
 
-#: src/text.c:550 src/text.c:659
+#: src/text.c:549 src/text.c:665
 msgid "text replace"
 msgstr "thay thế văn bản"
 
-#: src/text.c:557 src/text.c:671
-msgid "Internal error: unknown type.  Please save your work"
-msgstr "Lỗi nội bộ : kiểu không rõ. Hãy lưu tập tin"
+#: src/text.c:556 src/text.c:679 src/text.c:983
+msgid "Internal error: unknown type.  Please save your work."
+msgstr "Lỗi nội bộ: kiểu không rõ. Hãy lưu công việc của bạn lại."
 
-#: src/text.c:563
+#: src/text.c:561
 #, c-format
 msgid "Undid action (%s)"
 msgstr "Bước được hủy (%s)"
 
-#: src/text.c:578
+#: src/text.c:580
 msgid "Nothing to re-do!"
-msgstr "Không có gì cần hoàn lại !"
+msgstr "Không có gì cần hoàn lại!"
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
-msgstr "Lỗi nội bộ : không thiết lập được việc hoàn lại. Hãy lưu tập tin"
+#: src/text.c:584
+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:676
+#: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Bước được hoàn lại (%s)"
 
-#: src/text.c:766
-msgid "Could not pipe"
-msgstr "Không thể gửi qua đường ống"
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
+msgid "Could not create pipe"
+msgstr "Không thể tạo đường ống"
 
-#: src/text.c:793 src/text.c:2636 src/text.c:2788
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "Không thể tạo tiến trình con"
 
-#: src/text.c:941
-msgid "Internal error: can't setup uncut.  Please save your work."
-msgstr "Lỗi nội bộ : không thể thiết lập mà không cắt. Hãy lưu tập tin."
-
-#: src/text.c:950
-msgid "Internal error: unknown type.  Please save your work."
-msgstr "Lỗi nội bộ : kiểu không rõ. Hãy lưu tập tin."
+#: src/text.c:969
+msgid "Internal error: cannot set up uncut.  Please save your work."
+msgstr ""
+"Lỗi nội bộ: không thể cài đặt uncut (dán). Hãy lưu công việc của bạn lại."
 
-#: src/text.c:1870
+#: src/text.c:1806
 #, c-format
 msgid "Bad quote string %s: %s"
-msgstr "Chuỗi trích dẫn xấu %s: %s"
+msgstr "Chuỗi trích dẫn sai %s: %s"
 
-#: src/text.c:2267
+#: src/text.c:2207
 msgid "Can now UnJustify!"
 msgstr "Bây giờ có thể Bỏ sắp chữ!"
 
-#: src/text.c:2462
+#: src/text.c:2404
 msgid "Edit a replacement"
 msgstr "Sửa chuỗi thay thế"
 
-#: src/text.c:2548
-msgid "Could not create pipe"
-msgstr "Không thể tạo đường ống"
-
-#: src/text.c:2550
+#: src/text.c:2492
 msgid "Creating misspelled word list, please wait..."
-msgstr "Đang tạo danh sách từ sai chính tả, xin hãy chờ..."
+msgstr "Đang tạo danh sách từ sai chính tả, xin hãy chờ…"
 
-#: src/text.c:2642
+#: src/text.c:2584 src/text.c:3022
 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:2693
+#: src/text.c:2635
 msgid "Error invoking \"spell\""
-msgstr "Lỗi gọi \"spell\""
+msgstr "Gặp lỗi khi gọi “spell”"
 
-#: src/text.c:2696
+#: src/text.c:2638
 msgid "Error invoking \"sort -f\""
-msgstr "Lỗi gọi \"sort -f\""
+msgstr "Gặp lỗi khi gọi “sort -f”"
 
-#: src/text.c:2699
+#: src/text.c:2641
 msgid "Error invoking \"uniq\""
-msgstr "Lỗi gọi \"uniq\""
+msgstr "Gặp lỗi khi gọi “uniq”"
 
-#: src/text.c:2756 src/text.c:2965
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "Hoàn thành việc kiểm tra chính tả"
 
-#: src/text.c:2815
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
-msgstr "Lỗi gọi \"%s\""
+msgstr "Lỗi gọi “%s”"
 
-#: src/text.c:2960
+#: src/text.c:2885
+msgid "Invoking spell checker, please wait"
+msgstr "Gọi trình kiểm tra chính tả, vui lòng chờ"
+
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Kiểm tra chính tả không thành công: %s"
 
-#: src/text.c:2962
+#: src/text.c:2904
 #, 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:3030
+#: src/text.c:2937
+msgid "No linter defined for this type of file!"
+msgstr "Không có lint cho kiểu này của tập tin!"
+
+#: src/text.c:2947
+msgid "Save modified buffer before linting?"
+msgstr "Ghi lại bộ đệm đã sửa trước khi lint?"
+
+#: src/text.c:2969
+msgid "Invoking linter, please wait"
+msgstr "Đang gọi bộ lint, vui lòng chờ"
+
+#: src/text.c:3125
+#, 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:3159
+#, 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:3205
+msgid "At last message"
+msgstr "Tại thông báo cuối"
+
+#: src/text.c:3210
+msgid "At first message"
+msgstr "Tại thông báo đầu"
+
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr "Lỗi: chưa định nghĩa bộ định dạng"
+
+#: src/text.c:3275
+msgid "Finished"
+msgstr "Đã xong"
+
+#: src/text.c:3280
+msgid "Invoking formatter, please wait"
+msgstr "Đang gọi bộ định dạng, vui lòng chờ"
+
+#: src/text.c:3360
+msgid "Finished formatting"
+msgstr "Hoàn tất định dạng"
+
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sTừ: %lu  Dòng: %ld  Ký tự: %lu"
 
-#: src/text.c:3031
+#: src/text.c:3439
 msgid "In Selection:  "
 msgstr "Trong lựa chọn:  "
 
-#: src/utils.c:405 src/utils.c:417
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3453
+msgid "Verbatim Input"
+msgstr "Dữ liệu nhập nguyên bản"
+
+#: src/utils.c:410 src/utils.c:422
 msgid "nano is out of memory!"
 msgstr "nano làm tràn bộ nhớ!"
 
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
-#: src/winio.c:1557
+#: src/winio.c:1583
 msgid "Unicode Input"
 msgstr "Dữ liệu nhập Unicode"
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2142 src/winio.c:2146
 msgid "Modified"
 msgstr "Đã sửa đổi"
 
-#: src/winio.c:2150
+#: src/winio.c:2143
 msgid "View"
-msgstr "Xem"
+msgstr "Trình bày"
 
-#: src/winio.c:2164
+#: src/winio.c:2157
 msgid "DIR:"
-msgstr "THƯ MỤC:"
+msgstr "TMỤC:"
 
-#: src/winio.c:2171
+#: src/winio.c:2164
 msgid "File:"
 msgstr "Tập tin:"
 
-#: src/winio.c:3360
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2261
+msgid ""
+"Warning: Modifying a file which is not locked, check directory permission?"
+msgstr ""
+"Cảnh báo: Sửa một tập tin mà nó không được khóa, hãy kiểm tra quyền đối với "
+"thư mục?"
+
+#: src/winio.c:3377
 #, 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:3492
+#: src/winio.c:3507
 msgid "The nano text editor"
 msgstr "Trình soạn thảo văn bản nano"
 
-#: src/winio.c:3493
+#: src/winio.c:3508
 msgid "version"
 msgstr "phiên bản"
 
-#: src/winio.c:3494
+#: src/winio.c:3509
 msgid "Brought to you by:"
 msgstr "Được đem tới bởi:"
 
-#: src/winio.c:3495
+#: src/winio.c:3510
 msgid "Special thanks to:"
 msgstr "Đặc biệt cảm ơn:"
 
-#: src/winio.c:3496
+#: src/winio.c:3511
 msgid "The Free Software Foundation"
 msgstr "Tổ chức Phần mềm Tự do (FSF)"
 
-#: src/winio.c:3497
+#: src/winio.c:3512
+msgid "the many translators and the TP"
+msgstr "nhiều người dịch thuật và TP"
+
+#: src/winio.c:3513
 msgid "For ncurses:"
-msgstr "Cho ncurses:"
+msgstr "Dành cho ncurses:"
 
-#: src/winio.c:3498
+#: src/winio.c:3514
 msgid "and anyone else we forgot..."
-msgstr "và những người khác mà chúng tôi quên..."
+msgstr "và những người khác mà chúng tôi quên…"
 
-#: src/winio.c:3499
+#: src/winio.c:3515
 msgid "Thank you for using nano!"
 msgstr "Cảm ơn bạn đã dùng nano!"
 
+#~ msgid "Internal error: can't match line %ld.  Please save your work."
+#~ msgstr "Lỗi nội bộ: không thể khớp dòng %ld. Hãy lưu công việc của bạn lại."
+
+#~ msgid "line wrap"
+#~ msgstr "ngắt dòng"
+
+#~ msgid "Allow generic undo [EXPERIMENTAL]"
+#~ msgstr "Cho phép hủy bước chung [VẪN THỰC NGHIỆM]"
+
+#~ msgid "Insert File"
+#~ msgstr "Chèn tập tin"
+
+#~ msgid "Go to previous screen"
+#~ msgstr "Về màn hình trước"
+
+#~ msgid "Find Other Bracket"
+#~ msgstr "Tìm ngoặc đơn khác"
+
+#~ msgid "Long line wrapping"
+#~ msgstr "Ngắt dòng dài"
+
+#~ msgid "Soft line wrapping"
+#~ msgstr "Ngắt dòng mềm"
+
+#~ msgid "(ignored, for Pico compatibility)"
+#~ msgstr "(bị lờ đi, để tương thích với Pico)"
+
+#~ msgid "Must specify menu to bind key to (or \"all\")"
+#~ msgstr ""
+#~ "Phải ghi rõ trình đơn với đó cần tổ hợp phím (hoặc đặt “all” (tất cả))"
+
+#~ msgid "Missing flag"
+#~ msgstr "Thiếu cờ"
+
+#~ msgid "Internal error: unknown type.  Please save your work"
+#~ msgstr "Lỗi nội bộ: kiểu không rõ. Hãy lưu tập tin"
+
+#~ msgid "Internal error: Redo setup failed.  Please save your work"
+#~ msgstr "Lỗi nội bộ: không cài đặt được việc hoàn lại. Hãy lưu tập tin"
+
+#~ msgid "Could not pipe"
+#~ msgstr "Không thể gửi qua đường ống"
+
 #~ msgid "Error writing backup file %s: File owner mismatch"
 #~ msgstr ""
-#~ "Gặp lỗi khi ghi tập tin sao lưu %s: chủ sở hữu tập tin không tương ứng"
+#~ "Gặp lỗi khi ghi tập tin sao lưu %s: Chủ sở hữu tập tin không tương ứng"
diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo
index 8488fd4..3c0cd92 100644
--- a/po/zh_CN.gmo
+++ b/po/zh_CN.gmo
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 9488e7c..5853c7c 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,121 +1,146 @@
 # Simplified Chinese Messages for the nano editor
-# Copyright (C) 2004, 2005, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2005, 2009, 2010, 2011 Free Software Foundation, Inc.
 # This file is distributed under the same license as the nano package.
-# LI Daobing <lidaobing@gmail.com>, 2007, 2008, 2009.
-# Aron Xu <happyaron.xu@gmail.com>, 2009, 2010.
 #
+# LI Daobing <lidaobing@gmail.com>, 2007, 2008, 2009.
+# Aron Xu <happyaron.xu@gmail.com>, 2009, 2010, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 2.2.4pre2\n"
+"Project-Id-Version: nano 2.3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-22 06:34-0500\n"
-"PO-Revision-Date: 2010-04-07 17:10+0800\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
+"PO-Revision-Date: 2011-03-08 03:15+0800\n"
 "Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/browser.c:220
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:203
 msgid "Go To Directory"
 msgstr "跳至目录"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:860 src/files.c:2048
-#: src/nano.c:1060 src/search.c:220 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "已取消"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:246 src/browser.c:293
 #, c-format
 msgid "Can't go outside of %s in restricted mode"
 msgstr "在限制模式中无法跳至%s 外部"
 
-#: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:722
-#: src/files.c:731 src/files.c:1540 src/files.c:1659 src/files.c:1711
-#: src/files.c:1732 src/files.c:1855 src/files.c:2691 src/rcfile.c:568
-#: src/rcfile.c:1204
+#: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
+#: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
+#: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "读取%s 出错：%s"
 
-#: src/browser.c:303
+#: src/browser.c:283
 msgid "Can't move up a directory"
 msgstr "无法上移一个目录"
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:665 src/browser.c:674
+#: src/browser.c:626 src/browser.c:635
 msgid "(dir)"
 msgstr "(目录)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:632
 msgid "(parent dir)"
 msgstr "(父目录)"
 
-#: src/browser.c:801 src/search.c:185
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "搜索"
 
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:805 src/search.c:189
-msgid " [Case Sensitive]"
-msgstr " [区分大小写]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:811 src/search.c:195
-msgid " [Regexp]"
-msgstr " [正则表示式]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:817 src/search.c:201
-msgid " [Backwards]"
-msgstr " [向后搜索]"
-
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "已从头搜索"
 
-#: src/browser.c:1006 src/browser.c:1039 src/search.c:514 src/search.c:517
-#: src/search.c:574 src/search.c:577
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "这是惟一出现之处"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr "没有当前搜索模式"
 
-#: src/files.c:125
+#: src/files.c:139
+msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
+msgstr ""
+
+#: src/files.c:145
+#, c-format
+msgid "Couldn't determine hostname for lock file: %s"
+msgstr ""
+
+#: src/files.c:165 src/files.c:175 src/files.c:212 src/files.c:222
+#, fuzzy, c-format
+msgid "Error writing lock file %s: %s"
+msgstr "写入备份文件%s 出错：%s"
+
+#: src/files.c:237
+#, fuzzy, c-format
+msgid "Error deleting lock file %s: %s"
+msgstr "写入备份文件%s 出错：%s"
+
+#: src/files.c:272
+#, fuzzy, c-format
+msgid "Error opening lock file %s: %s"
+msgstr "写入备份文件%s 出错：%s"
+
+#: src/files.c:282
+#, 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:297
+#, c-format
+msgid "File %s is being edited (by %s with %s, PID %d); continue?"
+msgstr ""
+
+#: src/files.c:308
+#, fuzzy, c-format
+msgid "Error writing lock file: Directory '%s' doesn't exist"
+msgstr "写入备份文件%s 出错：文件所有者不匹配"
+
+#: src/files.c:339
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "无法插入%s 外部的文件"
 
-#: src/files.c:234
+#: src/files.c:467
 msgid "No more open file buffers"
 msgstr "无多余文件缓冲区可启用"
 
-#: src/files.c:250
+#: src/files.c:484
 #, c-format
 msgid "Switched to %s"
 msgstr "切换至%s"
 
-#: src/files.c:251 src/global.c:469 src/winio.c:2168
+#: src/files.c:485 src/global.c:953 src/winio.c:2161
 msgid "New Buffer"
 msgstr "新缓冲区"
 
-#: src/files.c:633
+#: src/files.c:874
 #, 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:638
+#: src/files.c:879
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
@@ -125,13 +150,13 @@ msgid_plural ""
 "permission)"
 msgstr[0] "已读取%lu 行(转换自DOS 与Mac 格式- 警告：无写入权限)"
 
-#: src/files.c:644
+#: src/files.c:885
 #, 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:648
+#: src/files.c:889
 #, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
@@ -139,13 +164,13 @@ msgid_plural ""
 "Read %lu lines (Converted from Mac format - Warning: No write permission)"
 msgstr[0] "已读取%lu 行 (转换自Mac 格式- 警告：无写入权限)"
 
-#: src/files.c:654
+#: src/files.c:895
 #, 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:658
+#: src/files.c:899
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
@@ -153,471 +178,439 @@ msgid_plural ""
 "Read %lu lines (Converted from DOS format - Warning: No write permission)"
 msgstr[0] "已读取%lu 行 (转换自DOS 格式- 警告：无写入权限)"
 
-#: src/files.c:664
+#: src/files.c:905
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "已读取%lu 行"
 
-#: src/files.c:667
+#: src/files.c:908
 #, 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:700 src/files.c:736
+#: src/files.c:943 src/files.c:980
 msgid "Reading File"
 msgstr "正在读取文件"
 
-#: src/files.c:706
+#: src/files.c:950
 msgid "New File"
 msgstr "新文件"
 
-#: src/files.c:709
+#: src/files.c:953
 #, c-format
 msgid "\"%s\" not found"
 msgstr "找不到\"%s\""
 
-#: src/files.c:717 src/rcfile.c:559 src/rcfile.c:1154 src/rcfile.c:1195
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" 是一个目录"
 
-#: src/files.c:718 src/rcfile.c:560 src/rcfile.c:1155 src/rcfile.c:1196
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" 是一个设备文件"
 
-#: src/files.c:817
+#: src/files.c:1060
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "在新缓冲区中执行的命令 [从%s] "
 
-#: src/files.c:819
+#: src/files.c:1062
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "执行的命令 [从%s] "
 
-#: src/files.c:825
+#: src/files.c:1069
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "要插入新缓冲区的文件 [从%s] "
 
-#: src/files.c:827
+#: src/files.c:1071
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "要插入的文件 [从%s] "
 
-#: src/files.c:1077
+#: src/files.c:1320
 msgid "Key invalid in non-multibuffer mode"
 msgstr "非多重缓冲区模式中此按键无效"
 
-#: src/files.c:1486
+#: src/files.c:1622
+msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+msgstr "写入备份文件失败，继续保存吗？(如果不确定请输入N)"
+
+#: src/files.c:1746
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "无法写入%s 外部"
 
-#: src/files.c:1501
+#: src/files.c:1761
 msgid "Cannot prepend or append to a symlink with --nofollow set"
 msgstr "--nofollow 设定下，无法前引或附加至符号连结档"
 
-#: src/files.c:1581 src/files.c:1603 src/files.c:1621 src/files.c:1632
-#: src/files.c:1640 src/files.c:1667
+#: src/files.c:1843 src/files.c:1868 src/files.c:1886 src/files.c:1899
+#: src/files.c:1910 src/files.c:1939
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "写入备份文件%s 出错：%s"
 
-#: src/files.c:1582 src/nano.c:701
+#: src/files.c:1844 src/nano.c:719
 msgid "Too many backup files?"
 msgstr "太多备份文件？"
 
-#: src/files.c:1687 src/files.c:1744 src/files.c:1763 src/files.c:1775
-#: src/files.c:1799 src/files.c:1817 src/files.c:1827 src/files.c:1863
-#: src/files.c:1868 src/files.c:2764 src/files.c:2773
+#: src/files.c:1959 src/files.c:2016 src/files.c:2035 src/files.c:2047
+#: src/files.c:2071 src/files.c:2089 src/files.c:2099 src/files.c:2135
+#: src/files.c:2140 src/files.c:3101 src/files.c:3110 src/files.c:3133
+#: src/files.c:3145
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "写入%s 出错：%s"
 
-#: src/files.c:1721 src/text.c:2929 src/text.c:2941
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "写入临时文件%s 出错"
 
-#: src/files.c:1900
+#: src/files.c:2173
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "已写入%lu 行"
 
-#: src/files.c:2004
+#: src/files.c:2278
 msgid " [DOS Format]"
 msgstr " [DOS 格式]"
 
-#: src/files.c:2005
+#: src/files.c:2279
 msgid " [Mac Format]"
 msgstr " [Mac 格式]"
 
-#: src/files.c:2007
+#: src/files.c:2281
 msgid " [Backup]"
 msgstr " [备份]"
 
-#: src/files.c:2015
+#: src/files.c:2289
 msgid "Prepend Selection to File"
 msgstr "前引选择部份于文件"
 
-#: src/files.c:2016
+#: src/files.c:2290
 msgid "Append Selection to File"
 msgstr "附加选择部份至文件"
 
-#: src/files.c:2017
+#: src/files.c:2291
 msgid "Write Selection to File"
 msgstr "写入选择部份至文件"
 
-#: src/files.c:2020
+#: src/files.c:2294
 msgid "File Name to Prepend to"
 msgstr "要前引于的文件名"
 
-#: src/files.c:2021
+#: src/files.c:2295
 msgid "File Name to Append to"
 msgstr "要附加至的文件名"
 
-#: src/files.c:2022
+#: src/files.c:2296
 msgid "File Name to Write"
 msgstr "要写入的文件名"
 
-#: src/files.c:2153
+#: src/files.c:2427
 msgid "File exists, OVERWRITE ? "
 msgstr "文件已存在，要覆盖吗？"
 
-#: src/files.c:2162
+#: src/files.c:2436
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "以不同的名称存档？"
 
-#: src/files.c:2173
+#: src/files.c:2450
 msgid "File was modified since you opened it, continue saving ? "
 msgstr "在您打开文件后文件已被改变，是否继续保存？"
 
-#: src/files.c:2611
+#: src/files.c:2882
 msgid "(more)"
 msgstr "(更多)"
 
-#: src/files.c:2694 src/rcfile.c:1220
+#: src/files.c:2974
 #, c-format
 msgid ""
 "\n"
-"Press Enter to continue starting nano.\n"
+"Press Enter to continue\n"
 msgstr ""
 "\n"
-"按下回车键继续启动 nano\n"
+"按下回车键继续\n"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:415 src/prompt.c:1288
-msgid "Cancel"
-msgstr "取消"
-
-#: src/global.c:416
-msgid "Replace"
-msgstr "替换"
+#: src/files.c:2989
+#, fuzzy, c-format
+msgid ""
+"Unable to create directory %s: %s\n"
+"It is required for saving/loading search history or cursor positions.\n"
+msgstr ""
+"无法创建目录 %s：%s\n"
+"然而保存和载入搜索历史或光标位置需要它。\n"
 
-#: src/global.c:417
-msgid "No Replace"
-msgstr "不替换"
+#: src/files.c:2995
+#, fuzzy, 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 ""
+"路径%s 应为一个目录，但现在不是。\n"
+"Nano 将无法载入或保存搜索历史或光标位置\n"
 
-#: src/global.c:420
-msgid "Case Sens"
-msgstr "区分大小写"
+#: src/files.c:3012
+#, 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 ""
+"检测到了旧版的Nano 历史文件(%s)并试图移动到默认位置(%s)。\n"
+"此操作出现错误：%s"
 
-#: src/global.c:421
-msgid "Backwards"
-msgstr "向后搜索"
+#: src/files.c:3016
+#, 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 ""
+"检测到了旧版的Nano 历史文件(%s)并已移动到默认位置(%s)。\n"
+"(关于这个变更请参阅Nano 常见问题解答)"
 
-#: src/global.c:425
-msgid "Regexp"
-msgstr "正则表达式"
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
+#: src/global.c:477
+msgid "Exit"
+msgstr "离开"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:451
-msgid "PrevHstory"
-msgstr "前一记录"
+#: src/global.c:478
+msgid "Close"
+msgstr "关闭"
 
-#: src/global.c:452
-msgid "NextHstory"
-msgstr "后一记录"
+#: src/global.c:479
+#, fuzzy
+msgid "Uncut Text"
+msgstr "还原剪切"
 
-#: src/global.c:453
-msgid "Go To Text"
-msgstr "跳至文字"
+#: src/global.c:481
+#, fuzzy
+msgid "Unjustify"
+msgstr "还原对齐"
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:455
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:485
 msgid "WhereIs Next"
 msgstr "何处是下一个"
 
-#: src/global.c:457
-msgid "First File"
-msgstr "首文件"
-
-#: src/global.c:458
-msgid "Last File"
-msgstr "末文件"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:460
-msgid "To Files"
-msgstr "文件选单"
-
-#: src/global.c:462
-msgid "DOS Format"
-msgstr "DOS 格式"
-
-#: src/global.c:463
-msgid "Mac Format"
-msgstr "Mac 格式"
-
-#: src/global.c:464
-msgid "Append"
-msgstr "附加"
-
-#: src/global.c:465
-msgid "Prepend"
-msgstr "前引"
-
-#: src/global.c:466
-msgid "Backup File"
-msgstr "备份文件"
-
-#: src/global.c:467
-msgid "Execute Command"
-msgstr "执行命令"
-
-#: src/global.c:471
-msgid "Go To Dir"
-msgstr "跳至目录"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:480
-msgid "Get Help"
-msgstr "求助"
-
-#: src/global.c:481
-msgid "Exit"
-msgstr "离开"
-
-#: src/global.c:482
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:492
 msgid "Where Is"
 msgstr "搜索"
 
-#: src/global.c:483
-msgid "Prev Page"
-msgstr "上页"
-
-#: src/global.c:484
-msgid "Next Page"
-msgstr "下页"
-
-#: src/global.c:485
-msgid "First Line"
-msgstr "首行"
+#: src/global.c:493
+msgid "Replace"
+msgstr "替换"
 
-#: src/global.c:486
-msgid "Last Line"
-msgstr "尾行"
+#: src/global.c:494
+msgid "Go To Line"
+msgstr "跳行"
 
-#: src/global.c:487
-msgid "Suspend"
-msgstr "暂停"
+#: src/global.c:495
+msgid "Prev Line"
+msgstr "上行"
 
-#: src/global.c:489
-msgid "Beg of Par"
-msgstr "段落开头"
+#: src/global.c:496
+msgid "Next Line"
+msgstr "下行"
 
-#: src/global.c:490
-msgid "End of Par"
-msgstr "段落结尾"
+#: src/global.c:497
+msgid "Read File"
+msgstr "读档"
 
-#: src/global.c:491
+#: src/global.c:499
 msgid "FullJstify"
 msgstr "全部对齐"
 
-#: src/global.c:493
+#: src/global.c:501
 msgid "Refresh"
 msgstr "刷新"
 
-#: src/global.c:495
-msgid "Insert File"
-msgstr "插入文件"
-
-#: src/global.c:497
-msgid "Go To Line"
-msgstr "跳行"
-
-#: src/global.c:500
+#. 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:507
 msgid "Justify the current paragraph"
 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:505
+#: src/global.c:509
 msgid "Cancel the current function"
 msgstr "取消当前功能"
 
-#: src/global.c:506
+#: src/global.c:510
 msgid "Display this help text"
 msgstr "显示帮助"
 
-#: src/global.c:509
+#: src/global.c:513
 msgid "Close the current file buffer / Exit from nano"
 msgstr "关闭当前文件缓冲区 / 离开 nano"
 
-#: src/global.c:511
+#: src/global.c:515
 msgid "Exit from nano"
 msgstr "离开 nano"
 
-#: src/global.c:515
+#: src/global.c:519
 msgid "Write the current file to disk"
 msgstr "写入当前文件至磁盘"
 
-#: src/global.c:517
+#: src/global.c:521
 msgid "Insert another file into the current one"
 msgstr "插入其他文件至当前文件"
 
-#: src/global.c:519
+#: src/global.c:523
 msgid "Search for a string or a regular expression"
 msgstr "查找字符串或正则表示式"
 
-#: src/global.c:520
-msgid "Go to previous screen"
-msgstr "跳至前一屏"
+#: src/global.c:526
+#, fuzzy
+msgid "Search for a string"
+msgstr "查找字符串或正则表示式"
 
-#: src/global.c:521
-msgid "Go to next screen"
+#: src/global.c:528
+#, fuzzy
+msgid "Go one screenful up"
 msgstr "跳至后一屏"
 
-#: src/global.c:523
+#: src/global.c:529
+#, fuzzy
+msgid "Go one screenful down"
+msgstr "跳至后一屏"
+
+#: src/global.c:531
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "剪切当前这行并存至剪贴板"
 
-#: src/global.c:525
+#: src/global.c:533
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "从剪贴板粘贴至当前行"
 
-#: src/global.c:527
+#: src/global.c:534
 msgid "Display the position of the cursor"
 msgstr "显示光标位置"
 
-#: src/global.c:529
+#: src/global.c:536
 msgid "Invoke the spell checker, if available"
 msgstr "尝试运行拼写检查"
 
-#: src/global.c:531
+#: src/global.c:538
 msgid "Replace a string or a regular expression"
 msgstr "替换字符串或正则表示式"
 
-#: src/global.c:532
+#: src/global.c:539
 msgid "Go to line and column number"
 msgstr "跳至指定行与列位置"
 
-#: src/global.c:534
-msgid "Mark text at the cursor position"
+#: src/global.c:541
+#, fuzzy
+msgid "Mark text starting from the cursor position"
 msgstr "标记游标所在文字"
 
-#: src/global.c:535
-msgid "Repeat last search"
+#: src/global.c:542
+#, fuzzy
+msgid "Repeat the last search"
 msgstr "重复上次搜索"
 
-#: src/global.c:537
+#: src/global.c:544
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "拷贝当前行至剪贴板"
 
-#: src/global.c:538
+#: src/global.c:545
 msgid "Indent the current line"
 msgstr "缩进当前行"
 
-#: src/global.c:539
+#: src/global.c:546
 msgid "Unindent the current line"
 msgstr "取消缩进当前行"
 
-#: src/global.c:540
+#: src/global.c:547
 msgid "Undo the last operation"
 msgstr "撤销上次操作"
 
-#: src/global.c:541
+#: src/global.c:548
 msgid "Redo the last undone operation"
 msgstr "重做撤销的操作"
 
-#: src/global.c:543
+#: src/global.c:550
 msgid "Go forward one character"
 msgstr "向前跳一字符"
 
-#: src/global.c:544
+#: src/global.c:551
 msgid "Go back one character"
 msgstr "向后跳一字符"
 
-#: src/global.c:546
+#: src/global.c:553
 msgid "Go forward one word"
 msgstr "向前跳一个词"
 
-#: src/global.c:547
+#: src/global.c:554
 msgid "Go back one word"
 msgstr "向后跳一个词"
 
-#: src/global.c:549
+#: src/global.c:556
 msgid "Go to previous line"
 msgstr "跳至前一行"
 
-#: src/global.c:550
+#: src/global.c:557
 msgid "Go to next line"
 msgstr "跳至后一行"
 
-#: src/global.c:551
+#: src/global.c:558
 msgid "Go to beginning of current line"
 msgstr "跳至当前行首"
 
-#: src/global.c:552
+#: src/global.c:559
 msgid "Go to end of current line"
 msgstr "跳至当前行尾"
 
-#: src/global.c:555
+#: src/global.c:562
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "跳至当前段落开头，如已在段落开头，则调至上一段落起始处"
 
-#: src/global.c:557
+#: src/global.c:564
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr "跳至当前段落结尾，如已在段落结尾，则调至下一段落结尾"
 
-#: src/global.c:560
+#: src/global.c:566
 msgid "Go to the first line of the file"
 msgstr "跳至文件第一行"
 
-#: src/global.c:562
+#: src/global.c:567
 msgid "Go to the last line of the file"
 msgstr "跳至文件最后一行"
 
-#: src/global.c:564
+#: src/global.c:569
 msgid "Go to the matching bracket"
 msgstr "移动至对应括号"
 
-#: src/global.c:566
+#: src/global.c:571
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "向上卷动一行但不卷动游标"
 
-#: src/global.c:568
+#: src/global.c:573
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "向下卷动一行但不卷动游标"
 
-#: src/global.c:572
+#: src/global.c:576
 msgid "Switch to the previous file buffer"
 msgstr "切换至上个文件缓冲区"
 
-#: src/global.c:574
+#: src/global.c:577
 msgid "Switch to the next file buffer"
 msgstr "切换至下个文件缓冲区"
 
-#: src/global.c:577
+#: src/global.c:579
 msgid "Insert the next keystroke verbatim"
 msgstr "插入下一按键原型"
 
-#: src/global.c:579
+#: src/global.c:580
 msgid "Insert a tab at the cursor position"
 msgstr "插入制表符于游标位置"
 
@@ -625,330 +618,448 @@ msgstr "插入制表符于游标位置"
 msgid "Insert a newline at the cursor position"
 msgstr "插入新行于游标位置"
 
-#: src/global.c:583
+#: src/global.c:582
 msgid "Delete the character under the cursor"
 msgstr "删除游标之下的字符"
 
-#: src/global.c:585
+#: src/global.c:584
 msgid "Delete the character to the left of the cursor"
 msgstr "删除游标左侧的字符"
 
-#: src/global.c:588
+#: src/global.c:587
 msgid "Cut from the cursor position to the end of the file"
 msgstr "从游标位置剪切至文件结尾"
 
-#: src/global.c:591
+#: src/global.c:590
 msgid "Justify the entire file"
 msgstr "对齐整个文件"
 
-#: src/global.c:595
+#: src/global.c:594
 msgid "Count the number of words, lines, and characters"
 msgstr "计算字数、行数与字符数"
 
-#: src/global.c:598
+#: src/global.c:597
 msgid "Refresh (redraw) the current screen"
 msgstr "重新显示当前画面"
 
-#: src/global.c:600
+#: src/global.c:599
 msgid "Suspend the editor (if suspend is enabled)"
 msgstr "暂停编辑器(如果启用了暂停)"
 
-#: src/global.c:603
+#: src/global.c:602
 msgid "Toggle the case sensitivity of the search"
 msgstr "切换查找的区分大小写选项"
 
-#: src/global.c:605
+#: src/global.c:604
 msgid "Reverse the direction of the search"
 msgstr "反转搜索方向"
 
-#: src/global.c:609
+#: src/global.c:608
 msgid "Toggle the use of regular expressions"
 msgstr "切换使用正则表示式"
 
-#: src/global.c:613
+#: src/global.c:612
 msgid "Recall the previous search/replace string"
 msgstr "编辑前次搜索/替换字符串"
 
-#: src/global.c:615
+#: src/global.c:614
 msgid "Recall the next search/replace string"
 msgstr "编辑下次搜索/替换字符串"
 
-#: src/global.c:618
+#: src/global.c:617
 msgid "Go to file browser"
 msgstr "打开文件选单"
 
-#: src/global.c:621
+#: src/global.c:620
 msgid "Toggle the use of DOS format"
 msgstr "切换使用DOS 格式"
 
-#: src/global.c:622
+#: src/global.c:621
 msgid "Toggle the use of Mac format"
 msgstr "切换使用Mac 格式"
 
-#: src/global.c:624
+#: src/global.c:622
 msgid "Toggle appending"
 msgstr "切换追加"
 
-#: src/global.c:625
+#: src/global.c:623
 msgid "Toggle prepending"
 msgstr "切换前置插入"
 
-#: src/global.c:628
+#: src/global.c:624
 msgid "Toggle backing up of the original file"
 msgstr "切换储存既有文件的备份"
 
-#: src/global.c:629
+#: src/global.c:625
 msgid "Execute external command"
 msgstr "执行外部命令"
 
-#: src/global.c:633
+#: src/global.c:628
 msgid "Toggle the use of a new buffer"
 msgstr "切换使用新缓冲区"
 
-#: src/global.c:636
+#: src/global.c:631
 msgid "Exit from the file browser"
 msgstr "从文件选单离开"
 
-#: src/global.c:638
+#: src/global.c:632
 msgid "Go to the first file in the list"
 msgstr "跳至文件第一列"
 
-#: src/global.c:640
+#: src/global.c:633
 msgid "Go to the last file in the list"
 msgstr "跳至文件最后一列"
 
-#: src/global.c:641
-msgid "Go to the next file in the list"
-msgstr "跳至列表中的下一个文件"
-
-#: src/global.c:642
+#: src/global.c:634
 msgid "Go to the previous file in the list"
 msgstr "跳至列表中的前一个文件"
 
-#: src/global.c:643
+#: src/global.c:635
+msgid "Go to the next file in the list"
+msgstr "跳至列表中的下一个文件"
+
+#: src/global.c:636
 msgid "Go to directory"
 msgstr "跳至目录"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:670
-msgid "Close"
-msgstr "关闭"
+#: src/global.c:639
+#, fuzzy
+msgid "Invoke the linter, if available"
+msgstr "尝试运行拼写检查"
+
+#: src/global.c:640
+#, fuzzy
+msgid "Go to previous linter msg"
+msgstr "跳至前一行"
+
+#: src/global.c:641
+#, fuzzy
+msgid "Go to next linter msg"
+msgstr "跳至后一行"
+
+#: src/global.c:642
+#, fuzzy
+msgid "Invoke formatter, if available"
+msgstr "尝试运行拼写检查"
+
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:662
+msgid "Get Help"
+msgstr "求助"
+
+#: src/global.c:665 src/prompt.c:1084
+msgid "Cancel"
+msgstr "取消"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:679
-msgid "WriteOut"
+#: src/global.c:678
+#, fuzzy
+msgid "Write Out"
 msgstr "写入"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:704
+msgid "Go To Dir"
+msgstr "跳至目录"
+
+#: src/global.c:719
+msgid "Cut Text"
+msgstr "剪切文字"
+
+#: src/global.c:728
 msgid "Justify"
 msgstr "对齐"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:696
-msgid "Read File"
-msgstr "读档"
+#: src/global.c:733
+msgid "To Spell"
+msgstr "拼写检查"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:713
-msgid "Cut Text"
-msgstr "剪切文字"
+#: src/global.c:738
+#, fuzzy
+msgid "To Linter"
+msgstr "跳行"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:718
-msgid "UnJustify"
-msgstr "还原对齐"
+#: src/global.c:740
+#, fuzzy
+msgid "Formatter"
+msgstr "DOS 格式"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:723
-msgid "UnCut Text"
-msgstr "还原剪切"
+#: src/global.c:745
+msgid "Case Sens"
+msgstr "区分大小写"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:728 src/global.c:755
+#: src/global.c:750
+msgid "Regexp"
+msgstr "正则表达式"
+
+#: src/global.c:755
+msgid "Backwards"
+msgstr "向后搜索"
+
+#: src/global.c:762
+msgid "No Replace"
+msgstr "不替换"
+
+#: src/global.c:770
 msgid "Cur Pos"
 msgstr "游标位置"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:737
-msgid "To Spell"
-msgstr "拼写检查"
+#: src/global.c:780
+msgid "Prev Page"
+msgstr "上页"
+
+#: src/global.c:782
+msgid "Next Page"
+msgstr "下页"
+
+#: src/global.c:785
+msgid "First Line"
+msgstr "首行"
+
+#: src/global.c:787
+msgid "Last Line"
+msgstr "尾行"
+
+#: src/global.c:794
+#, fuzzy
+msgid "To Bracket"
+msgstr "并非一个括号"
 
-#: src/global.c:771
+#: src/global.c:797
 msgid "Mark Text"
 msgstr "标记文字"
 
-#: src/global.c:777
+#: src/global.c:800
 msgid "Copy Text"
 msgstr "复制文字"
 
-#: src/global.c:780
+#: src/global.c:803
 msgid "Indent Text"
 msgstr "缩进文字"
 
-#: src/global.c:783
+#: src/global.c:805
 msgid "Unindent Text"
 msgstr "取消缩进"
 
-#: src/global.c:787
+#: src/global.c:808
 msgid "Undo"
 msgstr "撤销"
 
-#: src/global.c:790
+#: src/global.c:810
 msgid "Redo"
 msgstr "重做"
 
-#: src/global.c:796 src/global.c:800
-msgid "Forward"
-msgstr "向前"
-
-#: src/global.c:806 src/global.c:810
+#: src/global.c:814 src/global.c:820
 msgid "Back"
 msgstr "向后"
 
-#: src/global.c:817
-msgid "Next Word"
-msgstr "后一个字"
+#: src/global.c:816 src/global.c:822
+msgid "Forward"
+msgstr "向前"
 
-#: src/global.c:820
+#: src/global.c:827
 msgid "Prev Word"
 msgstr "前一个字"
 
-#: src/global.c:824
-msgid "Prev Line"
-msgstr "上行"
-
-#: src/global.c:827
-msgid "Next Line"
-msgstr "下行"
+#: src/global.c:829
+msgid "Next Word"
+msgstr "后一个字"
 
-#: src/global.c:830
+#: src/global.c:833
 msgid "Home"
 msgstr "顶端"
 
-#: src/global.c:833
+#: src/global.c:835
 msgid "End"
 msgstr "尾端"
 
-#: src/global.c:845
-msgid "Find Other Bracket"
-msgstr "寻找其他括号"
+#: src/global.c:844
+msgid "Beg of Par"
+msgstr "段落开头"
+
+#: src/global.c:846
+msgid "End of Par"
+msgstr "段落结尾"
 
-#: src/global.c:848
+#: src/global.c:851
 msgid "Scroll Up"
 msgstr "向上卷动"
 
-#: src/global.c:851
+#: src/global.c:853
 msgid "Scroll Down"
 msgstr "向下卷动"
 
-#: src/global.c:856
-msgid "Previous File"
+#: src/global.c:858
+#, fuzzy
+msgid "Prev File"
 msgstr "上个文件"
 
-#: src/global.c:858
+#: src/global.c:860
 msgid "Next File"
 msgstr "下个文件"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:862 src/text.c:3045
-msgid "Verbatim Input"
+#: src/global.c:869
+#, fuzzy
+msgid "Verbatim"
 msgstr "原形输入"
 
-#: src/global.c:867
+#: src/global.c:872
 msgid "Tab"
 msgstr "制表符"
 
-#: src/global.c:870
+#: src/global.c:874
 msgid "Enter"
 msgstr "回车"
 
-#: src/global.c:873
+#: src/global.c:876
 msgid "Delete"
 msgstr "删除"
 
-#: src/global.c:876
+#: src/global.c:878
 msgid "Backspace"
 msgstr "退格"
 
-#: src/global.c:893
+#: src/global.c:888
 msgid "CutTillEnd"
 msgstr "删至末端"
 
-#: src/global.c:906
+#: src/global.c:898
 msgid "Word Count"
 msgstr "字数统计"
 
-#: src/global.c:1367
+#: src/global.c:905
+msgid "Suspend"
+msgstr "暂停"
+
+#: src/global.c:910
+msgid "PrevHstory"
+msgstr "前一记录"
+
+#: src/global.c:913
+msgid "NextHstory"
+msgstr "后一记录"
+
+#: src/global.c:917
+msgid "Go To Text"
+msgstr "跳至文字"
+
+#: src/global.c:928
+msgid "DOS Format"
+msgstr "DOS 格式"
+
+#: src/global.c:931
+msgid "Mac Format"
+msgstr "Mac 格式"
+
+#: src/global.c:934
+msgid "Append"
+msgstr "附加"
+
+#: src/global.c:936
+msgid "Prepend"
+msgstr "前引"
+
+#: src/global.c:939
+msgid "Backup File"
+msgstr "备份文件"
+
+#: src/global.c:946
+msgid "Execute Command"
+msgstr "执行命令"
+
+#: src/global.c:961
+msgid "To Files"
+msgstr "文件选单"
+
+#: src/global.c:964
+msgid "First File"
+msgstr "首文件"
+
+#: src/global.c:966
+msgid "Last File"
+msgstr "末文件"
+
+#: src/global.c:977
+#, fuzzy
+msgid "Prev Lint Msg"
+msgstr "上行"
+
+#: src/global.c:979
+#, 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:1227
 msgid "Help mode"
 msgstr "辅助模式"
 
-#: src/global.c:1369
+#: src/global.c:1229
 msgid "Constant cursor position display"
 msgstr "持续显示游标位置"
 
-#: src/global.c:1371
+#: src/global.c:1231
 msgid "Use of one more line for editing"
 msgstr "编辑时使用多一行"
 
-#: src/global.c:1373
+#: src/global.c:1233
 msgid "Smooth scrolling"
 msgstr "平滑式卷动画面"
 
-#: src/global.c:1375
+#: src/global.c:1235
+#, fuzzy
+msgid "Soft wrapping of overlong lines"
+msgstr "不要自动换行"
+
+#: src/global.c:1237
 msgid "Whitespace display"
 msgstr "显示空格"
 
-#: src/global.c:1377
+#: src/global.c:1239
 msgid "Color syntax highlighting"
 msgstr "语法色彩高亮"
 
-#: src/global.c:1379
+#: src/global.c:1241
 msgid "Smart home key"
 msgstr "智能HOME 键"
 
-#: src/global.c:1381
+#: src/global.c:1243
 msgid "Auto indent"
 msgstr "自动缩进"
 
-#: src/global.c:1383
+#: src/global.c:1245
 msgid "Cut to end"
 msgstr "剪切至行尾"
 
-#: src/global.c:1385
-msgid "Long line wrapping"
-msgstr "长行转换"
+#: src/global.c:1247
+#, fuzzy
+msgid "Hard wrapping of overlong lines"
+msgstr "不要自动换行"
 
-#: src/global.c:1387
+#: src/global.c:1249
 msgid "Conversion of typed tabs to spaces"
 msgstr "已输入制表符至空白的转换"
 
-#: src/global.c:1389
+#: src/global.c:1251
 msgid "Backup files"
 msgstr "备份文件"
 
-#: src/global.c:1391
+#: src/global.c:1253
 msgid "Multiple file buffers"
 msgstr "多重文件缓冲区"
 
-#: src/global.c:1393
+#: src/global.c:1255
 msgid "Mouse support"
 msgstr "鼠标支持"
 
-#: src/global.c:1395
+#: src/global.c:1257
 msgid "No conversion from DOS/Mac format"
 msgstr "不从 DOS/Mac 格式转换"
 
-#: src/global.c:1397
+#: src/global.c:1259
 msgid "Suspension"
 msgstr "暂停"
 
-#: src/global.c:1399
-msgid "Soft line wrapping"
-msgstr "软换行"
-
-#: src/help.c:236
+#: src/help.c:205
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -968,7 +1079,7 @@ msgstr ""
 "最近一次搜索的字符串将会显示在搜索提示符后的括号中。不输入任何文字而直接按下"
 "回车键则会重复使用最近一次的搜索条件。"
 
-#: src/help.c:245
+#: src/help.c:214
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -982,7 +1093,7 @@ msgstr ""
 " 以下的功能键可用于搜索模式：\n"
 "\n"
 
-#: src/help.c:251
+#: src/help.c:220
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1001,7 +1112,7 @@ msgstr ""
 " 以下的功能键可用于跳行模式：\n"
 "\n"
 
-#: src/help.c:260
+#: src/help.c:229
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1021,7 +1132,7 @@ msgstr ""
 "multibuffer、Meta-F 开关，或者 nanorc 文件来启动的话，所插入的文件 将会被载入"
 "另外的缓冲区中 (利用 Meta-< 和 > 在文件缓冲区间切换)。 "
 
-#: src/help.c:269
+#: src/help.c:238
 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"
@@ -1035,7 +1146,7 @@ msgstr ""
 " 以下的功能键可用于插入文件模式：\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:244
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1061,7 +1172,7 @@ msgstr ""
 " 以下的功能键可用于写入文件模式：\n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:258
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1083,7 +1194,7 @@ msgstr ""
 " 以下的功能键可用于文件选单：\n"
 "\n"
 
-#: src/help.c:302
+#: src/help.c:271
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1105,7 +1216,7 @@ msgstr ""
 "按下回车键则会重复最近一次的搜索条件。\n"
 "\n"
 
-#: src/help.c:311
+#: src/help.c:280
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1113,7 +1224,7 @@ msgstr ""
 "在搜索模式可使用如下的功能键：\n"
 "\n"
 
-#: src/help.c:315
+#: src/help.c:284
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1134,7 +1245,7 @@ msgstr ""
 " 以下的功能键可用于跳至目录模式：\n"
 "\n"
 
-#: src/help.c:328
+#: src/help.c:297
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1156,7 +1267,7 @@ msgstr ""
 " 以下的功能键可用于拼写检查模式：\n"
 "\n"
 
-#: src/help.c:343
+#: src/help.c:312
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1175,7 +1286,7 @@ msgstr ""
 " 以下的功能键可用于执行命令模式：\n"
 "\n"
 
-#: src/help.c:356
+#: src/help.c:325
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1195,7 +1306,7 @@ msgstr ""
 "\n"
 " "
 
-#: src/help.c:366
+#: src/help.c:335
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1210,7 +1321,7 @@ msgstr ""
 "是以\"中介\" (Meta, M) 符号表示，它可以依照您的键盘设定，利用Esc，Alt 或Meta "
 "来输入。"
 
-#: src/help.c:375
+#: src/help.c:344
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1222,15 +1333,15 @@ msgstr ""
 "的字符。下列按键组合可用于主要编辑区，替代按键则显示于括号内“\n"
 "\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:376 src/help.c:448
 msgid "enable/disable"
 msgstr "启用/关闭"
 
-#: src/nano.c:587
+#: src/nano.c:601
 msgid "Key invalid in view mode"
 msgstr "观看模式中此按键无效"
 
-#: src/nano.c:695
+#: src/nano.c:713
 #, c-format
 msgid ""
 "\n"
@@ -1239,7 +1350,7 @@ msgstr ""
 "\n"
 "缓冲内容已写入 %s\n"
 
-#: src/nano.c:697
+#: src/nano.c:715
 #, c-format
 msgid ""
 "\n"
@@ -1248,7 +1359,7 @@ msgstr ""
 "\n"
 "缓冲内容未写入至 %s：%s\n"
 
-#: src/nano.c:700
+#: src/nano.c:718
 #, c-format
 msgid ""
 "\n"
@@ -1257,11 +1368,11 @@ msgstr ""
 "\n"
 "缓冲区未写入：%s\n"
 
-#: src/nano.c:723
+#: src/nano.c:743
 msgid "Window size is too small for nano...\n"
 msgstr "窗口尺寸对 nano 来说太小了...\n"
 
-#: src/nano.c:816
+#: src/nano.c:836
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
@@ -1270,251 +1381,260 @@ msgstr ""
 "用法: nano [选项] [[+行,列] 文件名]...\n"
 "\n"
 
-#: src/nano.c:819
+#: src/nano.c:839
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "选项\t\tGNU 长选项\t\t意义\n"
 
-#: src/nano.c:821
+#: src/nano.c:841
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "选项\t\t意义\n"
 
-#: src/nano.c:824
-msgid "Show this message"
-msgstr "显示此信息"
-
-#: src/nano.c:825
+#: src/nano.c:844
 msgid "+LINE,COLUMN"
 msgstr "+行,列"
 
-#: src/nano.c:826
+#. TRANSLATORS: The next forty or so strings are option descriptions
+#. * for the --help output.  Try to keep them at most 40 characters.
+#: src/nano.c:847
 msgid "Start at line LINE, column COLUMN"
 msgstr "从所指列数与行数开始"
 
-#: src/nano.c:828
+#: src/nano.c:849
 msgid "Enable smart home key"
 msgstr "启用智能 HOME 键"
 
-#: src/nano.c:829
+#: src/nano.c:850
 msgid "Save backups of existing files"
 msgstr "储存既有文件的备份"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "-C <dir>"
 msgstr "-C <目录>"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<目录>"
 
-#: src/nano.c:831
+#: src/nano.c:852
 msgid "Directory for saving unique backup files"
 msgstr "用以储存独一备份文件的目录"
 
-#: src/nano.c:834
+#: src/nano.c:855
 msgid "Use bold instead of reverse video text"
 msgstr "用粗体替代颜色反转"
 
-#: src/nano.c:837
+#: src/nano.c:858
 msgid "Convert typed tabs to spaces"
 msgstr "将已输入的制表符转换为空白"
 
-#: src/nano.c:840
+#: src/nano.c:861
 msgid "Enable multiple file buffers"
 msgstr "启用多重文件缓冲区功能"
 
-#: src/nano.c:845
+#: src/nano.c:865
+msgid "Use (vim-style) lock files"
+msgstr ""
+
+#: src/nano.c:869
 msgid "Log & read search/replace string history"
 msgstr "记录与读取搜索/替换的历史字符串"
 
-#: src/nano.c:848
+#: src/nano.c:873
 msgid "Don't look at nanorc files"
 msgstr "不要参考nanorc 文件"
 
-#: src/nano.c:851
+#: src/nano.c:876
 msgid "Fix numeric keypad key confusion problem"
 msgstr "修正数字键区按键混淆问题"
 
-#: src/nano.c:853
+#: src/nano.c:878
 msgid "Don't add newlines to the ends of files"
 msgstr "不要将换行加到文件末端"
 
-#: src/nano.c:856
+#: src/nano.c:881
 msgid "Don't convert files from DOS/Mac format"
 msgstr "不要从 DOS/Mac 格式转换"
 
-#: src/nano.c:858
+#: src/nano.c:883
 msgid "Use one more line for editing"
 msgstr "编辑时多使用一行"
 
-#: src/nano.c:860
+#: src/nano.c:886
+msgid "Log & read location of cursor position"
+msgstr "记录并读取光标位置"
+
+#: src/nano.c:889
 msgid "-Q <str>"
 msgstr "-Q <字符串>"
 
-#: src/nano.c:860
+#: src/nano.c:889
 msgid "--quotestr=<str>"
 msgstr "--quotestr=<字符串>"
 
-#: src/nano.c:861
+#: src/nano.c:890
 msgid "Quoting string"
 msgstr "引用代表字符串"
 
-#: src/nano.c:863
+#: src/nano.c:892
 msgid "Restricted mode"
 msgstr "限制模式"
 
-#: src/nano.c:866
+#: src/nano.c:895
 msgid "Scroll by line instead of half-screen"
 msgstr "按行滚动而不是半屏"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "-T <#cols>"
 msgstr "-T <#列数>"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#列数>"
 
-#: src/nano.c:869
+#: src/nano.c:898
 msgid "Set width of a tab to #cols columns"
 msgstr "设定制表符宽度为 #列数"
 
-#: src/nano.c:871
+#: src/nano.c:900
 msgid "Do quick statusbar blanking"
 msgstr "状态行快速闪动"
 
-#: src/nano.c:874
+#: src/nano.c:903
 msgid "Print version information and exit"
 msgstr "显示版本资讯并离开"
 
-#: src/nano.c:877
+#: src/nano.c:906
 msgid "Detect word boundaries more accurately"
 msgstr "更正确地侦测单字边界"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "-Y <str>"
 msgstr "-Y <字符串>"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "--syntax=<str>"
 msgstr "--syntax=<字符串>"
 
-#: src/nano.c:881
+#: src/nano.c:910
 msgid "Syntax definition to use for coloring"
 msgstr "用于加亮的语法定义"
 
-#: src/nano.c:883
+#: src/nano.c:912
 msgid "Constantly show cursor position"
 msgstr "持续显示游标位置"
 
-#: src/nano.c:885
+#: src/nano.c:914
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "修正退格键/删除键混淆问题"
 
-#: src/nano.c:888
+#: src/nano.c:915
+#, fuzzy
+msgid "Show this help text"
+msgstr "显示帮助"
+
+#: src/nano.c:918
 msgid "Automatically indent new lines"
 msgstr "自动缩进新行"
 
-#: src/nano.c:889
+#: src/nano.c:919
 msgid "Cut from cursor to end of line"
 msgstr "从游标剪切至行尾"
 
-#: src/nano.c:892
+#: src/nano.c:922
 msgid "Don't follow symbolic links, overwrite"
 msgstr "不要依照符号连结，而是覆盖"
 
-#: src/nano.c:894
+#: src/nano.c:924
 msgid "Enable the use of the mouse"
 msgstr "启用鼠标功能"
 
-#: src/nano.c:897
+#: src/nano.c:926
+msgid "Do not read the file (only write it)"
+msgstr ""
+
+#: src/nano.c:928
 msgid "-o <dir>"
 msgstr "-o <目录>"
 
-#: src/nano.c:897
+#: src/nano.c:928
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<目录>"
 
-#: src/nano.c:898
+#: src/nano.c:929
 msgid "Set operating directory"
 msgstr "设定操作目录"
 
-#: src/nano.c:901
+#: src/nano.c:932
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "保留XON (^Q) 和XOFF (^S) 按键"
 
-#: src/nano.c:903
+#: src/nano.c:935
 msgid "Silently ignore startup issues like rc file errors"
 msgstr "沉默忽略启动问题, 比如rc 文件错误"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "-r <#cols>"
 msgstr "-r <#列数>"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "--fill=<#cols>"
 msgstr "--fill=<#列数>"
 
-#: src/nano.c:906
-msgid "Set wrapping point at column #cols"
+#: src/nano.c:939
+#, fuzzy
+msgid "Set hard-wrapping point at column #cols"
 msgstr "设定折行宽度为 #列数"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "-s <prog>"
 msgstr "-s <程序>"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "--speller=<prog>"
 msgstr "--speller=<程序>"
 
-#: src/nano.c:910
+#: src/nano.c:943
 msgid "Enable alternate speller"
 msgstr "启用替代的拼写检查程序"
 
-#: src/nano.c:913
+#: src/nano.c:946
 msgid "Auto save on exit, don't prompt"
 msgstr "离开时自动储存，不要提示"
 
-#: src/nano.c:915
-msgid "Allow generic undo [EXPERIMENTAL]"
-msgstr "允许通用撤销[试验性特性]"
-
-#: src/nano.c:918
+#: src/nano.c:947
 msgid "View mode (read-only)"
 msgstr "查看(只读)模式"
 
-#: src/nano.c:920
-msgid "Don't wrap long lines"
+#: src/nano.c:949
+#, fuzzy
+msgid "Don't hard-wrap long lines"
 msgstr "不要自动换行"
 
-#: src/nano.c:922
+#: src/nano.c:951
 msgid "Don't show the two help lines"
 msgstr "不要显示辅助区"
 
-#: src/nano.c:923
+#: src/nano.c:952
 msgid "Enable suspension"
 msgstr "启用暂停功能"
 
-#: src/nano.c:924
+#: src/nano.c:954
 msgid "Enable soft line wrapping"
 msgstr "启用软换行"
 
-#: src/nano.c:928
-msgid "(ignored, for Pico compatibility)"
-msgstr "(忽略，为与Pico 相容)"
-
-#: src/nano.c:938
-#, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
+#: src/nano.c:963
+#, fuzzy, c-format
+msgid " GNU nano, version %s\n"
 msgstr " GNU nano 版本%s (编译于%s, %s)\n"
 
-#: src/nano.c:943
+#: src/nano.c:966
 #, 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:944
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1523,153 +1643,179 @@ msgstr ""
 "\n"
 " 编译选项："
 
-#: src/nano.c:1022
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr "对不起，此功能的支持以禁用"
 
-#: src/nano.c:1044
+#: src/nano.c:1125
+msgid "No file name"
+msgstr ""
+
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "储存更动过的缓冲区吗(回答 \"No\" 会撤销修改)？"
 
-#: src/nano.c:1088
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "对不起，无法从键盘设备重新打开标准输入\n"
 
-#: src/nano.c:1114
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "正在从标准输入读入，可用 ^C 中断\n"
 
-#: src/nano.c:1182
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "接收到SIGHUP 或SIGTERM\n"
 
-#: src/nano.c:1204
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "使用\"fg\" 返回nano\n"
 
-#: src/nano.c:1386
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "已启用"
 
-#: src/nano.c:1387
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "已禁用"
 
-#: src/nano.c:1548 src/winio.c:1256
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr "未知命令"
 
-#: src/nano.c:1674
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "忽略XON，嗯嗯。"
 
-#: src/nano.c:1679
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "忽略XOFF，嗯嗯。"
 
-#: src/nano.c:2209 src/rcfile.c:1100
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "所要求的制表符宽度%s 无效"
 
-#: src/nano.c:2268 src/rcfile.c:1025
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "所要求的填满行数\"%s\" 无效"
 
+#: src/nano.c:2415
+#, c-format
+msgid "Type '%s -h' for a list of available options.\n"
+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:1259
+#: src/prompt.c:1055
 msgid "Yy"
 msgstr "Yy"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1056
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1057
 msgid "Aa"
 msgstr "Aa"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1071
 msgid "Yes"
 msgstr "是"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1076
 msgid "All"
 msgstr "全部"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1081
 msgid "No"
 msgstr "否"
 
-#: src/rcfile.c:130
+#: src/rcfile.c:137
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "在%s(第%lu 行)中发生错误："
 
-#: src/rcfile.c:185
+#: src/rcfile.c:196
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "参数%s 有未封闭的 \""
 
-#: src/rcfile.c:212 src/rcfile.c:264 src/rcfile.c:711 src/rcfile.c:768
-#: src/rcfile.c:821
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
 msgstr "正则表示式字符串必须以 \" 字符开始及结束"
 
-#: src/rcfile.c:238 src/search.c:62
+#: src/rcfile.c:249 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "非法的正则表示式 \"%s\": %s"
 
-#: src/rcfile.c:258
+#: src/rcfile.c:269
 msgid "Missing syntax name"
 msgstr "缺少语法名称"
 
-#: src/rcfile.c:316
+#: src/rcfile.c:340
 msgid "The \"none\" syntax is reserved"
 msgstr "\"none\" 语法已被保留"
 
-#: src/rcfile.c:323
+#: src/rcfile.c:347
 msgid "The \"default\" syntax must take no extensions"
 msgstr "\"default\" 语法必须不含任何副文件名"
 
-#: src/rcfile.c:386 src/rcfile.c:483
+#: src/rcfile.c:433
 msgid "Missing key name"
 msgstr "缺少键名称"
 
-#: src/rcfile.c:398 src/rcfile.c:499
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
+#: src/rcfile.c:442 src/rcfile.c:453
+msgid "Key name is too short"
+msgstr ""
+
+#: src/rcfile.c:463
+#, fuzzy
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr "键绑定必须以\"^\", \"M\" 或 \"F\" 开始"
 
-#: src/rcfile.c:407
-msgid "Must specify function to bind key to"
+#: src/rcfile.c:472
+#, fuzzy
+msgid "Must specify a function to bind the key to"
 msgstr "必须指定键绑定到的函数"
 
-#: src/rcfile.c:418 src/rcfile.c:510
-msgid "Must specify menu to bind key to (or \"all\")"
-msgstr "必须指定键绑定到的菜单(或 \"all\")"
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:482
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
+msgstr ""
 
-#: src/rcfile.c:426
-#, c-format
-msgid "Could not map name \"%s\" to a function"
+#: src/rcfile.c:489
+#, fuzzy, c-format
+msgid "Cannot map name \"%s\" to a function"
 msgstr "无法映射名字\"%s\" 到一个函数"
 
-#: src/rcfile.c:432 src/rcfile.c:517
-#, c-format
-msgid "Could not map name \"%s\" to a menu"
+#: src/rcfile.c:496
+#, fuzzy, c-format
+msgid "Cannot map name \"%s\" to a menu"
 msgstr "无法映射名字\"%s\" 到一个菜单"
 
-#: src/rcfile.c:454
+#: src/rcfile.c:528
 #, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
+msgid "Function '%s' does not exist in menu '%s'"
+msgstr ""
+
+#: src/rcfile.c:543
+#, fuzzy, c-format
+msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "对不起，键\"%s\" 属非法绑定"
 
-#: src/rcfile.c:625
+#: src/rcfile.c:629
+#, fuzzy, c-format
+msgid "Error expanding %s: %s"
+msgstr "读取%s 出错：%s"
+
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1684,132 +1830,191 @@ msgstr ""
 "\"black\"(黑)，选择性的前置字 \"bright\"(明亮) \n"
 "可用于前景色。"
 
-#: src/rcfile.c:647
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
 msgstr "无法直接增加颜色而没有语法行"
 
-#: src/rcfile.c:652
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "缺少颜色名称"
 
-#: src/rcfile.c:672
-#, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr "背景色%s 不可为明亮"
-
-#: src/rcfile.c:690 src/rcfile.c:809
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr "缺少正则表示式字符串"
 
-#: src/rcfile.c:762
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\" 要求对应的\"end=\""
 
-#: src/rcfile.c:804
+#: src/rcfile.c:837
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr "背景色%s 不可为明亮"
+
+#: src/rcfile.c:865
 msgid "Cannot add a header regex without a syntax command"
 msgstr "无法直接增加头部正则表达式而没有语法行"
 
-#: src/rcfile.c:874
-#, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
+#: src/rcfile.c:921
+msgid "Cannot add a magic string regex without a syntax command"
+msgstr "无法在没有语法命令的情况下添加魔字符串"
+
+#: src/rcfile.c:926
+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:1010
+#, fuzzy
+msgid "Cannot add formatter without a syntax command"
+msgstr "无法直接增加颜色而没有语法行"
+
+#: src/rcfile.c:1015
+msgid "Missing formatter command"
+msgstr ""
+
+#: src/rcfile.c:1045
+#, fuzzy, c-format
+msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr "严重错误; 没有键映射到函数 \"%s\""
 
-#: src/rcfile.c:876
+#: src/rcfile.c:1047
+#, fuzzy, c-format
 msgid ""
-"Exiting.  Please use nano with the -I option if needed to adjust your nanorc "
-"settings\n"
+"If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr "正在退出。如果您想调整您的nanorc 设置，请使用nano 的-I 选项。\n"
 
-#: src/rcfile.c:926 src/rcfile.c:935 src/rcfile.c:945
+#: src/rcfile.c:1108
+#, fuzzy, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "无法映射名字\"%s\" 到一个菜单"
+
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "命令\"%s\" 被禁止在包含文件中使用"
 
-#: src/rcfile.c:951 src/rcfile.c:1128
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "语法\"%s\" 没有color 命令"
 
-#: src/rcfile.c:966
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "无法识别\"%s\" 命令"
 
-#: src/rcfile.c:972
-msgid "Missing flag"
-msgstr "缺少旗标"
+#: src/rcfile.c:1186
+#, fuzzy
+msgid "Missing option"
+msgstr "缺少颜色名称"
 
-#: src/rcfile.c:994
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "选项%s 需要参数"
 
-#: src/rcfile.c:1012
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr "选项并非正确的多字节字符串"
 
-#: src/rcfile.c:1038 src/rcfile.c:1066 src/rcfile.c:1075
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr "需要非空格字符"
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr "需要两个单行字符"
 
-#: src/rcfile.c:1114
-#, c-format
-msgid "Cannot unset flag \"%s\""
+#: src/rcfile.c:1339
+#, fuzzy, c-format
+msgid "Cannot unset option \"%s\""
 msgstr "无法解除旗标 %s 设定"
 
-#: src/rcfile.c:1123
-#, c-format
-msgid "Unknown flag \"%s\""
+#: src/rcfile.c:1345
+#, fuzzy, c-format
+msgid "Unknown option \"%s\""
 msgstr "未知旗标 %s"
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr "我找不到我的家目录！哇！"
 
+#: src/rcfile.c:1442
+#, c-format
+msgid ""
+"\n"
+"Press Enter to continue starting nano.\n"
+msgstr ""
+"\n"
+"按下回车键继续启动 nano\n"
+
 #: src/search.c:96
 #, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "找不到 \"%.*s%s\""
 
-#: src/search.c:205
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/search.c:184
+msgid " [Case Sensitive]"
+msgstr " [区分大小写]"
+
+#: src/search.c:188
+msgid " [Regexp]"
+msgstr " [正则表示式]"
+
+#: src/search.c:192
+msgid " [Backwards]"
+msgstr " [向后搜索]"
+
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:197
 msgid " (to replace) in selection"
 msgstr " 在标记中(替换)"
 
-#: src/search.c:207
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (替换)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "替换这个？"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:945
 msgid "Replace with"
 msgstr "替换我"
 
-#: src/search.c:1004
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
 msgstr[0] "已替换%lu 处"
 
-#: src/search.c:1034
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr "输入列号，行号"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
 msgstr "无效的列号或行号"
 
-#: src/search.c:1214
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "并非一个括号"
 
-#: src/search.c:1281
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "无对应括号"
 
@@ -1821,219 +2026,316 @@ msgstr "标记设定"
 msgid "Mark Unset"
 msgstr "标记解除"
 
-#: src/text.c:443
+#: src/text.c:439
 msgid "Nothing in undo buffer!"
 msgstr "没有可撤销的操作！"
 
-#: src/text.c:455 src/text.c:593
-#, c-format
-msgid "Internal error: can't match line %d.  Please save your work"
+#: src/text.c:445 src/text.c:590
+#, fuzzy, c-format
+msgid "Internal error: can't match line %d.  Please save your work."
 msgstr "内部错误：无法匹配行 %d。请保存您的工作"
 
-#: src/text.c:466 src/text.c:603
+#: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
 msgstr "文字增加"
 
-#: src/text.c:475 src/text.c:613
+#: src/text.c:467 src/text.c:612
 msgid "text delete"
 msgstr "文本删除"
 
-#: src/text.c:489 src/text.c:628
-msgid "line wrap"
-msgstr "自动换行"
-
-#: src/text.c:503 src/text.c:636
+#: src/text.c:491 src/text.c:641
 msgid "line join"
 msgstr "行合并"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:505 src/text.c:657
 msgid "text cut"
 msgstr "文字剪切"
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:510 src/text.c:661
 msgid "text uncut"
 msgstr "取消剪切"
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:515 src/text.c:623
 msgid "line break"
 msgstr "换行符"
 
-#: src/text.c:532 src/text.c:665
+#: src/text.c:528 src/text.c:672
 msgid "text insert"
 msgstr "文本插入"
 
-#: src/text.c:550 src/text.c:659
+#: src/text.c:549 src/text.c:665
 msgid "text replace"
 msgstr "文本替换"
 
-#: src/text.c:557 src/text.c:671
-msgid "Internal error: unknown type.  Please save your work"
-msgstr "内部错误：未知类型。请保存您的工作"
+#: src/text.c:556 src/text.c:679 src/text.c:983
+msgid "Internal error: unknown type.  Please save your work."
+msgstr "内部错误：未知类型。请保存您的工作。"
 
-#: src/text.c:563
+#: src/text.c:561
 #, c-format
 msgid "Undid action (%s)"
 msgstr "已撤销操作(%s)"
 
-#: src/text.c:578
+#: src/text.c:580
 msgid "Nothing to re-do!"
 msgstr "没有可重做的操作！"
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
-msgstr "内部错误：重做设置失败。请保存您的工作"
+#: src/text.c:584
+#, fuzzy
+msgid "Internal error: cannot set up redo.  Please save your work."
+msgstr "内部错误：无法配置取消剪切。请保存您的工作"
 
-#: src/text.c:676
+#: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr "已重做操作(%s)"
 
-#: src/text.c:766
-msgid "Could not pipe"
-msgstr "管线功能无效"
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
+msgid "Could not create pipe"
+msgstr "无法建立管线功能"
 
-#: src/text.c:793 src/text.c:2636 src/text.c:2788
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "执行功能无效"
 
-#: src/text.c:941
-msgid "Internal error: can't setup uncut.  Please save your work."
+#: src/text.c:969
+#, fuzzy
+msgid "Internal error: cannot set up uncut.  Please save your work."
 msgstr "内部错误：无法配置取消剪切。请保存您的工作"
 
-#: src/text.c:950
-msgid "Internal error: unknown type.  Please save your work."
-msgstr "内部错误：未知类型。请保存您的工作。"
-
-#: src/text.c:1870
+#: src/text.c:1806
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "不良引用字符串%s：%s"
 
-#: src/text.c:2267
+#: src/text.c:2207
 msgid "Can now UnJustify!"
 msgstr "现在可以还原对齐！"
 
-#: src/text.c:2462
+#: src/text.c:2404
 msgid "Edit a replacement"
 msgstr "编辑替代文字"
 
-#: src/text.c:2548
-msgid "Could not create pipe"
-msgstr "无法建立管线功能"
-
-#: src/text.c:2550
+#: src/text.c:2492
 msgid "Creating misspelled word list, please wait..."
 msgstr "正在建立错字列表，请稍待..."
 
-#: src/text.c:2642
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
 msgstr "无法得知管线缓冲区大小"
 
-#: src/text.c:2693
+#: src/text.c:2635
 msgid "Error invoking \"spell\""
 msgstr "运行 \"spell\" 错误"
 
-#: src/text.c:2696
+#: src/text.c:2638
 msgid "Error invoking \"sort -f\""
 msgstr "运行 \"sort -f\" 错误"
 
-#: src/text.c:2699
+#: src/text.c:2641
 msgid "Error invoking \"uniq\""
 msgstr "运行 \"uniq\" 错误"
 
-#: src/text.c:2756 src/text.c:2965
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "拼写检查结束"
 
-#: src/text.c:2815
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "运行 \"%s\" 错误"
 
-#: src/text.c:2960
+#: src/text.c:2885
+#, fuzzy
+msgid "Invoking spell checker, please wait"
+msgstr "尝试运行拼写检查"
+
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "拼写检查失败：%s"
 
-#: src/text.c:2962
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "拼写检查失败：%s：%s"
 
-#: src/text.c:3030
+#: src/text.c:2937
+#, fuzzy
+msgid "No linter defined for this type of file!"
+msgstr "不要将换行加到文件末端"
+
+#: src/text.c:2947
+msgid "Save modified buffer before linting?"
+msgstr ""
+
+#: src/text.c:2969
+msgid "Invoking linter, please wait"
+msgstr ""
+
+#: src/text.c:3125
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr ""
+
+#: src/text.c:3159
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr ""
+
+#: src/text.c:3205
+#, fuzzy
+msgid "At last message"
+msgstr "显示此信息"
+
+#: src/text.c:3210
+#, fuzzy
+msgid "At first message"
+msgstr "显示此信息"
+
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr ""
+
+#: src/text.c:3275
+msgid "Finished"
+msgstr ""
+
+#: src/text.c:3280
+msgid "Invoking formatter, please wait"
+msgstr ""
+
+#: src/text.c:3360
+msgid "Finished formatting"
+msgstr ""
+
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%s字数: %lu  行数: %ld  字符数: %lu"
 
-#: src/text.c:3031
+#: src/text.c:3439
 msgid "In Selection:  "
 msgstr "于选择部份："
 
-#: src/utils.c:405 src/utils.c:417
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3453
+msgid "Verbatim Input"
+msgstr "原形输入"
+
+#: src/utils.c:410 src/utils.c:422
 msgid "nano is out of memory!"
 msgstr "nano 已耗尽内存！"
 
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
-#: src/winio.c:1557
+#: src/winio.c:1583
 msgid "Unicode Input"
 msgstr "Unicode 输入"
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2142 src/winio.c:2146
 msgid "Modified"
 msgstr "已更改"
 
-#: src/winio.c:2150
+#: src/winio.c:2143
 msgid "View"
 msgstr "查看"
 
-#: src/winio.c:2164
+#: src/winio.c:2157
 msgid "DIR:"
 msgstr "目录："
 
-#: src/winio.c:2171
+#: src/winio.c:2164
 msgid "File:"
 msgstr "文件："
 
-#: src/winio.c:3360
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2261
+msgid ""
+"Warning: Modifying a file which is not locked, check directory permission?"
+msgstr ""
+
+#: src/winio.c:3377
 #, 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:3492
+#: src/winio.c:3507
 msgid "The nano text editor"
 msgstr "nano 文本编辑器"
 
-#: src/winio.c:3493
+#: src/winio.c:3508
 msgid "version"
 msgstr "版本"
 
-#: src/winio.c:3494
+#: src/winio.c:3509
 msgid "Brought to you by:"
 msgstr "来自于:"
 
-#: src/winio.c:3495
+#: src/winio.c:3510
 msgid "Special thanks to:"
 msgstr "特别感谢:"
 
-#: src/winio.c:3496
+#: src/winio.c:3511
 msgid "The Free Software Foundation"
 msgstr "自由软体基金会"
 
-#: src/winio.c:3497
+#: src/winio.c:3512
+msgid "the many translators and the TP"
+msgstr ""
+
+#: src/winio.c:3513
 msgid "For ncurses:"
 msgstr "ncurses 部份:"
 
-#: src/winio.c:3498
+#: src/winio.c:3514
 msgid "and anyone else we forgot..."
 msgstr "以及其他我们不记得的人..."
 
-#: src/winio.c:3499
+#: src/winio.c:3515
 msgid "Thank you for using nano!"
 msgstr "谢谢您使用 nano！"
 
-#~ msgid "Error writing backup file %s: File owner mismatch"
-#~ msgstr "写入备份文件%s 出错：文件所有者不匹配"
+#~ msgid "Insert File"
+#~ msgstr "插入文件"
+
+#~ msgid "Go to previous screen"
+#~ msgstr "跳至前一屏"
+
+#~ msgid "Find Other Bracket"
+#~ msgstr "寻找其他括号"
+
+#~ msgid "Long line wrapping"
+#~ msgstr "长行转换"
+
+#~ msgid "Soft line wrapping"
+#~ msgstr "软换行"
+
+#~ msgid "Allow generic undo [EXPERIMENTAL]"
+#~ msgstr "允许通用撤销[试验性特性]"
+
+#~ msgid "(ignored, for Pico compatibility)"
+#~ msgstr "(忽略，为与Pico 相容)"
+
+#~ msgid "Must specify menu to bind key to (or \"all\")"
+#~ msgstr "必须指定键绑定到的菜单(或 \"all\")"
+
+#~ msgid "Missing flag"
+#~ msgstr "缺少旗标"
+
+#~ msgid "line wrap"
+#~ msgstr "自动换行"
+
+#~ msgid "Internal error: unknown type.  Please save your work"
+#~ msgstr "内部错误：未知类型。请保存您的工作"
+
+#~ msgid "Internal error: Redo setup failed.  Please save your work"
+#~ msgstr "内部错误：重做设置失败。请保存您的工作"
+
+#~ msgid "Could not pipe"
+#~ msgstr "管线功能无效"
 
 #~ msgid "line split"
 #~ msgstr "行分割"
diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo
index e766811..5c79d78 100644
--- a/po/zh_TW.gmo
+++ b/po/zh_TW.gmo
diff --git a/po/zh_TW.po b/po/zh_TW.po
index ff4f42e..bc5f34c 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1,1002 +1,1065 @@
-# Traditional Chinese Messages for the nano editor
+# Traditional Chinese Messages for the nano editor.
 # Copyright (C) 2004, 05 Free Software Foundation, Inc.
 # This file is distributed under the same license as the nano package.
-# Wei-Lun Chao <chaoweilun@pcmail.com.tw>, 2004, 05
 #
+# Wei-Lun Chao <bluebat@member.fsf.org>, 2004, 2005, 2013.
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 1.3.10pre2\n"
+"Project-Id-Version: nano 2.3.2pre4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-22 06:34-0500\n"
-"PO-Revision-Date: 2005-12-13 09:33+0800\n"
-"Last-Translator: Wei-Lun Chao <chaoweilun@pcmail.com.tw>\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\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"
+"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/browser.c:220
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:203
 msgid "Go To Directory"
 msgstr "跳至目錄"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:860 src/files.c:2048
-#: src/nano.c:1060 src/search.c:220 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "已取消"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:246 src/browser.c:293
 #, c-format
 msgid "Can't go outside of %s in restricted mode"
 msgstr "在限制模式中無法至 %s 外部"
 
-#: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:722
-#: src/files.c:731 src/files.c:1540 src/files.c:1659 src/files.c:1711
-#: src/files.c:1732 src/files.c:1855 src/files.c:2691 src/rcfile.c:568
-#: src/rcfile.c:1204
+#: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
+#: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
+#: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "讀取 %s 時發生錯誤: %s"
 
-#: src/browser.c:303
+#: src/browser.c:283
 msgid "Can't move up a directory"
 msgstr "無法上移一個目錄"
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:665 src/browser.c:674
+#: src/browser.c:626 src/browser.c:635
 msgid "(dir)"
 msgstr "(目錄)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:632
 msgid "(parent dir)"
-msgstr ""
+msgstr "(上層目錄)"
 
-#: src/browser.c:801 src/search.c:185
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "搜尋"
 
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:805 src/search.c:189
-msgid " [Case Sensitive]"
-msgstr " [符合大小寫]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:811 src/search.c:195
-msgid " [Regexp]"
-msgstr " [正規表示式]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:817 src/search.c:201
-msgid " [Backwards]"
-msgstr " [向後搜尋]"
-
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "已從頭搜尋"
 
-#: src/browser.c:1006 src/browser.c:1039 src/search.c:514 src/search.c:517
-#: src/search.c:574 src/search.c:577
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "這是惟一出現之處"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr "沒有符合目前搜尋形式者"
 
-#: src/files.c:125
+#: src/files.c:139
+msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
+msgstr "無法確認我的身分以用於鎖定檔案 (getpwuid() 失敗)"
+
+#: src/files.c:145
+#, fuzzy, c-format
+msgid "Couldn't determine hostname for lock file: %s"
+msgstr "無法確認主機名稱以用於鎖定檔案：%s"
+
+#: src/files.c:165 src/files.c:175 src/files.c:212 src/files.c:222
+#, c-format
+msgid "Error writing lock file %s: %s"
+msgstr "寫入鎖定檔案 %s 時發生錯誤：%s"
+
+#: src/files.c:237
+#, c-format
+msgid "Error deleting lock file %s: %s"
+msgstr "刪除鎖定檔案 %s 時發生錯誤：%s"
+
+#: src/files.c:272
+#, fuzzy, c-format
+msgid "Error opening lock file %s: %s"
+msgstr "開啟鎖定檔案 %s 時發生錯誤：%s"
+
+#: src/files.c:282
+#, 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:297
+#, c-format
+msgid "File %s is being edited (by %s with %s, PID %d); continue?"
+msgstr ""
+
+#: src/files.c:308
+#, fuzzy, c-format
+msgid "Error writing lock file: Directory '%s' doesn't exist"
+msgstr "寫入鎖定檔案 %s 時發生錯誤：%s"
+
+#: src/files.c:339
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "無法插入 %s 外部的檔案"
 
-#: src/files.c:234
+#: src/files.c:467
 msgid "No more open file buffers"
 msgstr "無多餘檔案緩衝區可開啟"
 
-#: src/files.c:250
+#: src/files.c:484
 #, c-format
 msgid "Switched to %s"
 msgstr "切換至 %s"
 
-#: src/files.c:251 src/global.c:469 src/winio.c:2168
+#: src/files.c:485 src/global.c:953 src/winio.c:2161
 msgid "New Buffer"
 msgstr "新緩衝區"
 
-#: src/files.c:633
+#: src/files.c:874
 #, 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:638
-#, fuzzy, c-format
+#: src/files.c:879
+#, 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[0] "已讀取 %lu 列 (轉檔自 DOS 與 Mac 格式 - 警告：沒有寫入權限)"
 
-#: src/files.c:644
+#: src/files.c:885
 #, 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:648
-#, fuzzy, c-format
+#: src/files.c:889
+#, 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[0] "已讀取 %lu 列 (轉檔自 Mac 格式 - 警告：沒有寫入權限)"
 
-#: src/files.c:654
+#: src/files.c:895
 #, 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:658
-#, fuzzy, c-format
+#: src/files.c:899
+#, 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[0] "已讀取 %lu 列 (轉檔自 DOS 格式 - 警告：沒有寫入權限)"
 
-#: src/files.c:664
+#: src/files.c:905
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "已讀取 %lu 列"
 
-#: src/files.c:667
+#: src/files.c:908
 #, c-format
 msgid "Read %lu line ( Warning: No write permission)"
 msgid_plural "Read %lu lines (Warning: No write permission)"
-msgstr[0] ""
+msgstr[0] "已讀取 %lu 列 (警告：沒有寫入權限)"
 
-#: src/files.c:700 src/files.c:736
+#: src/files.c:943 src/files.c:980
 msgid "Reading File"
 msgstr "正在讀取檔案"
 
-#: src/files.c:706
+#: src/files.c:950
 msgid "New File"
 msgstr "新檔案"
 
-#: src/files.c:709
+#: src/files.c:953
 #, c-format
 msgid "\"%s\" not found"
 msgstr "找不到 \"%s\""
 
-#: src/files.c:717 src/rcfile.c:559 src/rcfile.c:1154 src/rcfile.c:1195
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" 是一個目錄"
 
-#: src/files.c:718 src/rcfile.c:560 src/rcfile.c:1155 src/rcfile.c:1196
-#, fuzzy, c-format
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
+#, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" 是一個裝置檔案"
 
-#: src/files.c:817
+#: src/files.c:1060
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "在新緩衝區中執行的命令 [從 %s] "
 
-#: src/files.c:819
+#: src/files.c:1062
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "執行的命令 [從 %s] "
 
-#: src/files.c:825
+#: src/files.c:1069
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "所要插入新緩衝區的檔案 [從 %s] "
 
-#: src/files.c:827
+#: src/files.c:1071
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "所要插入的檔案 [從 %s] "
 
-#: src/files.c:1077
-#, fuzzy
+#: src/files.c:1320
 msgid "Key invalid in non-multibuffer mode"
 msgstr "非多重緩衝區模式中此按鍵無效"
 
-#: src/files.c:1486
+#: src/files.c:1622
+msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+msgstr "寫入備份檔案時失敗，要繼續儲存？(如果不確定就以 N 表示) "
+
+#: src/files.c:1746
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "無法寫入 %s 外部"
 
-#: src/files.c:1501
+#: src/files.c:1761
 msgid "Cannot prepend or append to a symlink with --nofollow set"
 msgstr "--nofollow 設定下，無法前引或附加至符號連結檔"
 
-#: src/files.c:1581 src/files.c:1603 src/files.c:1621 src/files.c:1632
-#: src/files.c:1640 src/files.c:1667
-#, fuzzy, c-format
+#: src/files.c:1843 src/files.c:1868 src/files.c:1886 src/files.c:1899
+#: src/files.c:1910 src/files.c:1939
+#, c-format
 msgid "Error writing backup file %s: %s"
-msgstr "寫入暫存檔案 %s 時發生錯誤"
+msgstr "寫入暫存檔案 %s 時發生錯誤：%s"
 
-#: src/files.c:1582 src/nano.c:701
+#: src/files.c:1844 src/nano.c:719
 msgid "Too many backup files?"
 msgstr "太多備份檔案？"
 
-#: src/files.c:1687 src/files.c:1744 src/files.c:1763 src/files.c:1775
-#: src/files.c:1799 src/files.c:1817 src/files.c:1827 src/files.c:1863
-#: src/files.c:1868 src/files.c:2764 src/files.c:2773
+#: src/files.c:1959 src/files.c:2016 src/files.c:2035 src/files.c:2047
+#: src/files.c:2071 src/files.c:2089 src/files.c:2099 src/files.c:2135
+#: src/files.c:2140 src/files.c:3101 src/files.c:3110 src/files.c:3133
+#: src/files.c:3145
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "寫入 %s 時發生錯誤: %s"
 
-#: src/files.c:1721 src/text.c:2929 src/text.c:2941
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "寫入暫存檔案 %s 時發生錯誤"
 
-#: src/files.c:1900
+#: src/files.c:2173
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "已寫入 %lu 列"
 
-#: src/files.c:2004
+#: src/files.c:2278
 msgid " [DOS Format]"
 msgstr " [DOS 格式]"
 
-#: src/files.c:2005
+#: src/files.c:2279
 msgid " [Mac Format]"
 msgstr " [Mac 格式]"
 
-#: src/files.c:2007
+#: src/files.c:2281
 msgid " [Backup]"
 msgstr " [備份]"
 
-#: src/files.c:2015
+#: src/files.c:2289
 msgid "Prepend Selection to File"
-msgstr "前引選擇部份於檔案"
+msgstr "前引選擇部分於檔案"
 
-#: src/files.c:2016
+#: src/files.c:2290
 msgid "Append Selection to File"
-msgstr "附加選擇部份至檔案"
+msgstr "附加選擇部分至檔案"
 
-#: src/files.c:2017
+#: src/files.c:2291
 msgid "Write Selection to File"
-msgstr "寫入選擇部份至檔案"
+msgstr "寫入選擇部分至檔案"
 
-#: src/files.c:2020
+#: src/files.c:2294
 msgid "File Name to Prepend to"
 msgstr "要前引於的檔案名稱"
 
-#: src/files.c:2021
+#: src/files.c:2295
 msgid "File Name to Append to"
 msgstr "要附加至的檔案名稱"
 
-#: src/files.c:2022
+#: src/files.c:2296
 msgid "File Name to Write"
 msgstr "要寫入的檔案名稱"
 
-#: src/files.c:2153
+#: src/files.c:2427
 msgid "File exists, OVERWRITE ? "
 msgstr "檔案已存在，要覆寫嗎？"
 
-#: src/files.c:2162
+#: src/files.c:2436
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "以不同的名稱存檔？"
 
-#: src/files.c:2173
+#: src/files.c:2450
 msgid "File was modified since you opened it, continue saving ? "
-msgstr ""
+msgstr "檔案從您開啟它後已被修改，要繼續儲存？"
 
-#: src/files.c:2611
+#: src/files.c:2882
 msgid "(more)"
 msgstr "(更多)"
 
-#: src/files.c:2694 src/rcfile.c:1220
-#, fuzzy, c-format
+#: src/files.c:2974
+#, c-format
 msgid ""
 "\n"
-"Press Enter to continue starting nano.\n"
+"Press Enter to continue\n"
 msgstr ""
 "\n"
-"按下輸入鍵繼續啟動 nano\n"
+"按下輸入鍵以繼續\n"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:415 src/prompt.c:1288
-msgid "Cancel"
-msgstr "取消"
+#: src/files.c:2989
+#, fuzzy, c-format
+msgid ""
+"Unable to create directory %s: %s\n"
+"It is required for saving/loading search history or cursor positions.\n"
+msgstr ""
+"無法建立目錄 %s：%s\n"
+"對於儲存/載入搜尋歷史或游標位置而言，它是必要的\n"
 
-#: src/global.c:416
-msgid "Replace"
-msgstr "置換"
+#: src/files.c:2995
+#, fuzzy, 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 ""
+"路徑 %s 並非卻必須是個目錄。\n"
+"Nano 將無法載入或儲存搜尋或游標位置歷史\n"
 
-#: src/global.c:417
-msgid "No Replace"
-msgstr "不置換"
+#: src/files.c:3012
+#, 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 ""
+"偵測到舊的 nano 歷史檔案 (%s)，我已嘗試將它移動\n"
+"到偏好的位置 (%s) 但是遇到了錯誤：%s"
 
-#: src/global.c:420
-msgid "Case Sens"
-msgstr "依大小寫"
+#: src/files.c:3016
+#, 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 ""
+"偵測到舊的 nano 歷史檔案 (%s)，我已將它移動\n"
+"到偏好的位置 (%s)\n"
+"(參看關於這個變更的 nano FAQ)"
 
-#: src/global.c:421
-msgid "Backwards"
-msgstr "向後搜尋"
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
+#: src/global.c:477
+msgid "Exit"
+msgstr "離開"
 
-#: src/global.c:425
-msgid "Regexp"
-msgstr "正規表示"
+#: src/global.c:478
+msgid "Close"
+msgstr "關閉"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:451
+#: src/global.c:479
 #, fuzzy
-msgid "PrevHstory"
-msgstr "歷史記錄"
+msgid "Uncut Text"
+msgstr "還原剪下文字"
 
-#: src/global.c:452
+#: src/global.c:481
 #, fuzzy
-msgid "NextHstory"
-msgstr "歷史記錄"
-
-#: src/global.c:453
-msgid "Go To Text"
-msgstr "跳至文字"
+msgid "Unjustify"
+msgstr "還原對齊"
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:455
-#, fuzzy
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:485
 msgid "WhereIs Next"
-msgstr "何處是下一個"
+msgstr "下一個位置"
 
-#: src/global.c:457
-#, fuzzy
-msgid "First File"
-msgstr "首列"
-
-#: src/global.c:458
-#, fuzzy
-msgid "Last File"
-msgstr "尾列"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:460
-msgid "To Files"
-msgstr "檔案選單"
-
-#: src/global.c:462
-msgid "DOS Format"
-msgstr "DOS 格式"
-
-#: src/global.c:463
-msgid "Mac Format"
-msgstr "Mac 格式"
-
-#: src/global.c:464
-msgid "Append"
-msgstr "附加"
-
-#: src/global.c:465
-msgid "Prepend"
-msgstr "前引"
-
-#: src/global.c:466
-msgid "Backup File"
-msgstr "備份檔案"
-
-#: src/global.c:467
-msgid "Execute Command"
-msgstr "執行命令"
-
-#: src/global.c:471
-msgid "Go To Dir"
-msgstr "跳至目錄"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:480
-msgid "Get Help"
-msgstr "求助"
-
-#: src/global.c:481
-msgid "Exit"
-msgstr "離開"
-
-#: src/global.c:482
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:492
 msgid "Where Is"
 msgstr "搜尋"
 
-#: src/global.c:483
-msgid "Prev Page"
-msgstr "上頁"
-
-#: src/global.c:484
-msgid "Next Page"
-msgstr "下頁"
-
-#: src/global.c:485
-msgid "First Line"
-msgstr "首列"
+#: src/global.c:493
+msgid "Replace"
+msgstr "置換"
 
-#: src/global.c:486
-msgid "Last Line"
-msgstr "尾列"
+#: src/global.c:494
+msgid "Go To Line"
+msgstr "跳列"
 
-#: src/global.c:487
-msgid "Suspend"
-msgstr "暫停"
+#: src/global.c:495
+msgid "Prev Line"
+msgstr "上列"
 
-#: src/global.c:489
-msgid "Beg of Par"
-msgstr "段落開頭"
+#: src/global.c:496
+msgid "Next Line"
+msgstr "下列"
 
-#: src/global.c:490
-msgid "End of Par"
-msgstr "段落結尾"
+#: src/global.c:497
+msgid "Read File"
+msgstr "讀檔"
 
-#: src/global.c:491
+#: src/global.c:499
 msgid "FullJstify"
 msgstr "全部對齊"
 
-#: src/global.c:493
+#: src/global.c:501
 msgid "Refresh"
 msgstr "重新顯示"
 
-#: src/global.c:495
-msgid "Insert File"
-msgstr "插入檔案"
-
-#: src/global.c:497
-msgid "Go To Line"
-msgstr "跳列"
-
-#: src/global.c:500
+#. 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:507
 msgid "Justify the current paragraph"
 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:505
+#: src/global.c:509
 msgid "Cancel the current function"
 msgstr "取消目前功能"
 
-#: src/global.c:506
+#: src/global.c:510
 msgid "Display this help text"
-msgstr ""
+msgstr "顯示這份說明文字"
 
-#: src/global.c:509
-#, fuzzy
+#: src/global.c:513
 msgid "Close the current file buffer / Exit from nano"
-msgstr "關閉目前檔案緩衝區並離開 nano"
+msgstr "關閉目前檔案緩衝區 / 離開 nano"
 
-#: src/global.c:511
+#: src/global.c:515
 msgid "Exit from nano"
 msgstr "離開 nano"
 
-#: src/global.c:515
+#: src/global.c:519
 msgid "Write the current file to disk"
 msgstr "寫入目前檔案至磁碟"
 
-#: src/global.c:517
+#: src/global.c:521
 msgid "Insert another file into the current one"
 msgstr "插入它檔至目前檔案"
 
-#: src/global.c:519
-#, fuzzy
+#: src/global.c:523
 msgid "Search for a string or a regular expression"
-msgstr "使用正規表示式"
+msgstr "使用字串或正規表示式來搜尋"
 
-#: src/global.c:520
+#: src/global.c:526
 #, fuzzy
-msgid "Go to previous screen"
-msgstr "跳至前一畫面"
+msgid "Search for a string"
+msgstr "使用字串或正規表示式來搜尋"
 
-#: src/global.c:521
+#: src/global.c:528
 #, fuzzy
-msgid "Go to next screen"
+msgid "Go one screenful up"
 msgstr "跳至後一畫面"
 
-#: src/global.c:523
+#: src/global.c:529
+#, fuzzy
+msgid "Go one screenful down"
+msgstr "跳至後一畫面"
+
+#: src/global.c:531
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "剪下目前這列並存至剪貼簿"
 
-#: src/global.c:525
+#: src/global.c:533
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "從剪貼簿還原至目前這列"
 
-#: src/global.c:527
-#, fuzzy
+#: src/global.c:534
 msgid "Display the position of the cursor"
 msgstr "顯示游標位置"
 
-#: src/global.c:529
+#: src/global.c:536
 msgid "Invoke the spell checker, if available"
 msgstr "嘗試呼叫拼字檢查"
 
-#: src/global.c:531
-#, fuzzy
+#: src/global.c:538
 msgid "Replace a string or a regular expression"
-msgstr "使用正規表示式"
+msgstr "置換字串或正規表示式"
 
-#: src/global.c:532
+#: src/global.c:539
 msgid "Go to line and column number"
 msgstr "跳至指定列與行位置"
 
-#: src/global.c:534
-msgid "Mark text at the cursor position"
+#: src/global.c:541
+#, fuzzy
+msgid "Mark text starting from the cursor position"
 msgstr "標記游標所在文字"
 
-#: src/global.c:535
-msgid "Repeat last search"
+#: src/global.c:542
+#, fuzzy
+msgid "Repeat the last search"
 msgstr "重覆上次搜尋"
 
-#: src/global.c:537
-#, fuzzy
+#: src/global.c:544
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "剪下目前這列並存至剪貼簿"
 
-#: src/global.c:538
-#, fuzzy
+#: src/global.c:545
 msgid "Indent the current line"
-msgstr "附加至目前檔案"
+msgstr "縮排目前這列"
 
-#: src/global.c:539
-#, fuzzy
+#: src/global.c:546
 msgid "Unindent the current line"
-msgstr "附加至目前檔案"
+msgstr "取消目前這列的縮排"
 
-#: src/global.c:540
+#: src/global.c:547
 msgid "Undo the last operation"
-msgstr ""
+msgstr "復原上次的動作"
 
-#: src/global.c:541
+#: src/global.c:548
 msgid "Redo the last undone operation"
-msgstr ""
+msgstr "重做最後一筆已復原作業"
 
-#: src/global.c:543
-#, fuzzy
+#: src/global.c:550
 msgid "Go forward one character"
 msgstr "向前跳一字元"
 
-#: src/global.c:544
-#, fuzzy
+#: src/global.c:551
 msgid "Go back one character"
 msgstr "向後跳一字元"
 
-#: src/global.c:546
-#, fuzzy
+#: src/global.c:553
 msgid "Go forward one word"
-msgstr "向前跳一個字"
+msgstr "向前跳一字詞"
 
-#: src/global.c:547
-#, fuzzy
+#: src/global.c:554
 msgid "Go back one word"
-msgstr "向後跳一個字"
+msgstr "向後跳一字詞"
 
-#: src/global.c:549
-#, fuzzy
+#: src/global.c:556
 msgid "Go to previous line"
 msgstr "跳至前一列"
 
-#: src/global.c:550
-#, fuzzy
+#: src/global.c:557
 msgid "Go to next line"
 msgstr "跳至後一列"
 
-#: src/global.c:551
-#, fuzzy
+#: src/global.c:558
 msgid "Go to beginning of current line"
 msgstr "跳至目前列首"
 
-#: src/global.c:552
-#, fuzzy
+#: src/global.c:559
 msgid "Go to end of current line"
 msgstr "跳至目前列尾"
 
-#: src/global.c:555
-#, fuzzy
+#: src/global.c:562
 msgid "Go to beginning of paragraph; then of previous paragraph"
-msgstr "跳至目前段落開頭"
+msgstr "跳至目前段落開頭；然後是前一段落的開頭"
 
-#: src/global.c:557
-#, fuzzy
+#: src/global.c:564
 msgid "Go just beyond end of paragraph; then of next paragraph"
-msgstr "跳至目前段落結尾"
+msgstr "跳至目前段落結尾；然後是後一段落的結尾"
 
-#: src/global.c:560
+#: src/global.c:566
 msgid "Go to the first line of the file"
 msgstr "跳至檔案第一列"
 
-#: src/global.c:562
+#: src/global.c:567
 msgid "Go to the last line of the file"
 msgstr "跳至檔案最後一列"
 
-#: src/global.c:564
-#, fuzzy
+#: src/global.c:569
 msgid "Go to the matching bracket"
-msgstr "無對應括號"
+msgstr "跳至對應的括號"
 
-#: src/global.c:566
+#: src/global.c:571
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "向上捲動一列但不捲動游標"
 
-#: src/global.c:568
+#: src/global.c:573
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "向下捲動一列但不捲動游標"
 
-#: src/global.c:572
+#: src/global.c:576
 msgid "Switch to the previous file buffer"
 msgstr "切換至上個檔案緩衝區"
 
-#: src/global.c:574
+#: src/global.c:577
 msgid "Switch to the next file buffer"
 msgstr "切換至下個檔案緩衝區"
 
-#: src/global.c:577
-#, fuzzy
+#: src/global.c:579
 msgid "Insert the next keystroke verbatim"
-msgstr "插入字元原形"
+msgstr "插入下個按鍵的原形"
 
-#: src/global.c:579
-#, fuzzy
+#: src/global.c:580
 msgid "Insert a tab at the cursor position"
 msgstr "插入跳格字元於游標位置"
 
 #: src/global.c:581
-#, fuzzy
 msgid "Insert a newline at the cursor position"
 msgstr "插入換列字元於游標位置"
 
-#: src/global.c:583
+#: src/global.c:582
 msgid "Delete the character under the cursor"
 msgstr "刪除游標之下的字元"
 
-#: src/global.c:585
+#: src/global.c:584
 msgid "Delete the character to the left of the cursor"
 msgstr "刪除游標左側的字元"
 
-#: src/global.c:588
+#: src/global.c:587
 msgid "Cut from the cursor position to the end of the file"
 msgstr "從游標位置剪下至檔案結尾"
 
-#: src/global.c:591
+#: src/global.c:590
 msgid "Justify the entire file"
 msgstr "對齊整個檔案"
 
-#: src/global.c:595
+#: src/global.c:594
 msgid "Count the number of words, lines, and characters"
 msgstr "計算字數、列數與字元數"
 
-#: src/global.c:598
+#: src/global.c:597
 msgid "Refresh (redraw) the current screen"
 msgstr "重新顯示目前畫面"
 
-#: src/global.c:600
+#: src/global.c:599
 msgid "Suspend the editor (if suspend is enabled)"
-msgstr ""
+msgstr "懸置編輯器 (如果懸置已啟用)"
 
-#: src/global.c:603
+#: src/global.c:602
 msgid "Toggle the case sensitivity of the search"
-msgstr ""
+msgstr "切換搜尋的大小寫符合"
 
-#: src/global.c:605
-#, fuzzy
+#: src/global.c:604
 msgid "Reverse the direction of the search"
-msgstr "顯示游標位置"
+msgstr "倒轉搜尋方向"
 
-#: src/global.c:609
-#, fuzzy
+#: src/global.c:608
 msgid "Toggle the use of regular expressions"
-msgstr "使用正規表示式"
+msgstr "切換使用正規表示式"
 
-#: src/global.c:613
-#, fuzzy
+#: src/global.c:612
 msgid "Recall the previous search/replace string"
-msgstr "編輯前次搜尋/置換字串"
+msgstr "重用上次搜尋/置換字串"
 
-#: src/global.c:615
-#, fuzzy
+#: src/global.c:614
 msgid "Recall the next search/replace string"
-msgstr "編輯前次搜尋/置換字串"
+msgstr "重用下次搜尋/置換字串"
 
-#: src/global.c:618
+#: src/global.c:617
 msgid "Go to file browser"
 msgstr "呼叫檔案選單"
 
-#: src/global.c:621
-#, fuzzy
+#: src/global.c:620
 msgid "Toggle the use of DOS format"
-msgstr "以 DOS 格式寫入檔案"
+msgstr "切換使用 DOS 格式"
 
-#: src/global.c:622
-#, fuzzy
+#: src/global.c:621
 msgid "Toggle the use of Mac format"
-msgstr "以 Mac 格式寫入檔案"
+msgstr "切換使用 Mac 格式"
 
-#: src/global.c:624
-#, fuzzy
+#: src/global.c:622
 msgid "Toggle appending"
-msgstr "長列轉換"
+msgstr "切換附加"
 
-#: src/global.c:625
+#: src/global.c:623
 msgid "Toggle prepending"
-msgstr ""
+msgstr "切換前置"
 
-#: src/global.c:628
-#, fuzzy
+#: src/global.c:624
 msgid "Toggle backing up of the original file"
-msgstr "儲存既有檔案的備份"
+msgstr "切換備份既有檔案"
 
-#: src/global.c:629
+#: src/global.c:625
 msgid "Execute external command"
 msgstr "執行外部命令"
 
-#: src/global.c:633
-#, fuzzy
+#: src/global.c:628
 msgid "Toggle the use of a new buffer"
-msgstr "無法得知管線緩衝區大小"
+msgstr "切換使用新緩衝區"
 
-#: src/global.c:636
+#: src/global.c:631
 msgid "Exit from the file browser"
 msgstr "從檔案選單離開"
 
-#: src/global.c:638
-#, fuzzy
+#: src/global.c:632
 msgid "Go to the first file in the list"
-msgstr "跳至檔案第一列"
+msgstr "跳至列表中的第一個檔案"
+
+#: src/global.c:633
+msgid "Go to the last file in the list"
+msgstr "跳至列表中的最後一個檔案"
+
+#: src/global.c:634
+msgid "Go to the previous file in the list"
+msgstr "跳至列表中的上一個檔案"
+
+#: src/global.c:635
+msgid "Go to the next file in the list"
+msgstr "跳至列表中的下一個檔案"
+
+#: src/global.c:636
+msgid "Go to directory"
+msgstr "跳至目錄"
+
+#: src/global.c:639
+#, fuzzy
+msgid "Invoke the linter, if available"
+msgstr "嘗試呼叫拼字檢查"
 
 #: src/global.c:640
 #, fuzzy
-msgid "Go to the last file in the list"
-msgstr "跳至檔案最後一列"
+msgid "Go to previous linter msg"
+msgstr "跳至前一列"
 
 #: src/global.c:641
 #, fuzzy
-msgid "Go to the next file in the list"
+msgid "Go to next linter msg"
 msgstr "跳至後一列"
 
 #: src/global.c:642
 #, fuzzy
-msgid "Go to the previous file in the list"
-msgstr "跳至前一列"
+msgid "Invoke formatter, if available"
+msgstr "嘗試呼叫拼字檢查"
 
-#: src/global.c:643
-msgid "Go to directory"
-msgstr "跳至目錄"
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:662
+msgid "Get Help"
+msgstr "求助"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:670
-msgid "Close"
-msgstr "關閉"
+#: src/global.c:665 src/prompt.c:1084
+msgid "Cancel"
+msgstr "取消"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:679
-msgid "WriteOut"
+#: src/global.c:678
+#, fuzzy
+msgid "Write Out"
 msgstr "寫入"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
-msgid "Justify"
-msgstr "對齊"
-
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:696
-msgid "Read File"
-msgstr "讀檔"
+#: src/global.c:704
+msgid "Go To Dir"
+msgstr "跳至目錄"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:713
+#: src/global.c:719
 msgid "Cut Text"
 msgstr "剪下文字"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:718
-msgid "UnJustify"
-msgstr "還原對齊"
+#: src/global.c:728
+msgid "Justify"
+msgstr "對齊"
+
+#: src/global.c:733
+msgid "To Spell"
+msgstr "拼字檢查"
+
+#: src/global.c:738
+#, fuzzy
+msgid "To Linter"
+msgstr "跳列"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:723
+#: src/global.c:740
 #, fuzzy
-msgid "UnCut Text"
-msgstr "還原剪下"
+msgid "Formatter"
+msgstr "DOS 格式"
+
+#: src/global.c:745
+msgid "Case Sens"
+msgstr "依大小寫"
+
+#: src/global.c:750
+msgid "Regexp"
+msgstr "正規表示式"
+
+#: src/global.c:755
+msgid "Backwards"
+msgstr "向後搜尋"
+
+#: src/global.c:762
+msgid "No Replace"
+msgstr "不置換"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:728 src/global.c:755
+#: src/global.c:770
 msgid "Cur Pos"
 msgstr "游標位置"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:737
-msgid "To Spell"
-msgstr "拼字檢查"
+#: src/global.c:780
+msgid "Prev Page"
+msgstr "上頁"
+
+#: src/global.c:782
+msgid "Next Page"
+msgstr "下頁"
+
+#: src/global.c:785
+msgid "First Line"
+msgstr "首列"
+
+#: src/global.c:787
+msgid "Last Line"
+msgstr "尾列"
+
+#: src/global.c:794
+#, fuzzy
+msgid "To Bracket"
+msgstr "並非一個括號"
 
-#: src/global.c:771
+#: src/global.c:797
 msgid "Mark Text"
 msgstr "標記文字"
 
-#: src/global.c:777
-#, fuzzy
+#: src/global.c:800
 msgid "Copy Text"
-msgstr "剪下文字"
+msgstr "複製文字"
 
-#: src/global.c:780
-#, fuzzy
+#: src/global.c:803
 msgid "Indent Text"
-msgstr "剪下文字"
+msgstr "縮排文字"
 
-#: src/global.c:783
-#, fuzzy
+#: src/global.c:805
 msgid "Unindent Text"
-msgstr "還原剪下"
+msgstr "取消縮排文字"
 
-#: src/global.c:787
+#: src/global.c:808
 msgid "Undo"
-msgstr ""
+msgstr "復原"
 
-#: src/global.c:790
+#: src/global.c:810
 msgid "Redo"
-msgstr ""
+msgstr "重做"
 
-#: src/global.c:796 src/global.c:800
-msgid "Forward"
-msgstr "向前"
-
-#: src/global.c:806 src/global.c:810
+#: src/global.c:814 src/global.c:820
 msgid "Back"
 msgstr "向後"
 
-#: src/global.c:817
-msgid "Next Word"
-msgstr "後一個字"
+#: src/global.c:816 src/global.c:822
+msgid "Forward"
+msgstr "向前"
 
-#: src/global.c:820
+#: src/global.c:827
 msgid "Prev Word"
 msgstr "前一個字"
 
-#: src/global.c:824
-msgid "Prev Line"
-msgstr "上列"
-
-#: src/global.c:827
-msgid "Next Line"
-msgstr "下列"
+#: src/global.c:829
+msgid "Next Word"
+msgstr "後一個字"
 
-#: src/global.c:830
+#: src/global.c:833
 msgid "Home"
 msgstr "頂端"
 
-#: src/global.c:833
+#: src/global.c:835
 msgid "End"
 msgstr "尾端"
 
-#: src/global.c:845
-msgid "Find Other Bracket"
-msgstr "尋找其他括號"
+#: src/global.c:844
+msgid "Beg of Par"
+msgstr "段落開頭"
 
-#: src/global.c:848
+#: src/global.c:846
+msgid "End of Par"
+msgstr "段落結尾"
+
+#: src/global.c:851
 msgid "Scroll Up"
 msgstr "向上捲動"
 
-#: src/global.c:851
+#: src/global.c:853
 msgid "Scroll Down"
 msgstr "向下捲動"
 
-#: src/global.c:856
-msgid "Previous File"
+#: src/global.c:858
+#, fuzzy
+msgid "Prev File"
 msgstr "上個檔案"
 
-#: src/global.c:858
+#: src/global.c:860
 msgid "Next File"
 msgstr "下個檔案"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:862 src/text.c:3045
-msgid "Verbatim Input"
+#: src/global.c:869
+#, fuzzy
+msgid "Verbatim"
 msgstr "原形輸入"
 
-#: src/global.c:867
+#: src/global.c:872
 msgid "Tab"
 msgstr "跳格鍵"
 
-#: src/global.c:870
+#: src/global.c:874
 msgid "Enter"
 msgstr "輸入鍵"
 
-#: src/global.c:873
+#: src/global.c:876
 msgid "Delete"
 msgstr "刪除鍵"
 
-#: src/global.c:876
+#: src/global.c:878
 msgid "Backspace"
 msgstr "退格鍵"
 
-#: src/global.c:893
+#: src/global.c:888
 msgid "CutTillEnd"
 msgstr "刪至末端"
 
-#: src/global.c:906
+#: src/global.c:898
 msgid "Word Count"
 msgstr "計算字數"
 
-#: src/global.c:1367
+#: src/global.c:905
+msgid "Suspend"
+msgstr "懸置"
+
+#: src/global.c:910
+msgid "PrevHstory"
+msgstr "上一筆記錄"
+
+#: src/global.c:913
+msgid "NextHstory"
+msgstr "下一筆記錄"
+
+#: src/global.c:917
+msgid "Go To Text"
+msgstr "跳至文字"
+
+#: src/global.c:928
+msgid "DOS Format"
+msgstr "DOS 格式"
+
+#: src/global.c:931
+msgid "Mac Format"
+msgstr "Mac 格式"
+
+#: src/global.c:934
+msgid "Append"
+msgstr "附加"
+
+#: src/global.c:936
+msgid "Prepend"
+msgstr "前引"
+
+#: src/global.c:939
+msgid "Backup File"
+msgstr "備份檔案"
+
+#: src/global.c:946
+msgid "Execute Command"
+msgstr "執行命令"
+
+#: src/global.c:961
+msgid "To Files"
+msgstr "檔案選單"
+
+#: src/global.c:964
+msgid "First File"
+msgstr "第一個檔案"
+
+#: src/global.c:966
+msgid "Last File"
+msgstr "最後的檔案"
+
+#: src/global.c:977
+#, fuzzy
+msgid "Prev Lint Msg"
+msgstr "上列"
+
+#: src/global.c:979
+#, 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:1227
 msgid "Help mode"
 msgstr "輔助模式"
 
-#: src/global.c:1369
+#: src/global.c:1229
 msgid "Constant cursor position display"
 msgstr "持續顯示游標位置"
 
-#: src/global.c:1371
-#, fuzzy
+#: src/global.c:1231
 msgid "Use of one more line for editing"
-msgstr "編輯時使用更多空間"
+msgstr "編輯時多使用一列"
 
-#: src/global.c:1373
+#: src/global.c:1233
 msgid "Smooth scrolling"
 msgstr "平滑式捲動畫面"
 
-#: src/global.c:1375
+#: src/global.c:1235
+#, fuzzy
+msgid "Soft wrapping of overlong lines"
+msgstr "不要自動換列"
+
+#: src/global.c:1237
 msgid "Whitespace display"
 msgstr "顯示空格"
 
-#: src/global.c:1377
+#: src/global.c:1239
 msgid "Color syntax highlighting"
 msgstr "語法色彩標示"
 
-#: src/global.c:1379
+#: src/global.c:1241
 msgid "Smart home key"
 msgstr "智慧型 HOME 按鍵"
 
-#: src/global.c:1381
+#: src/global.c:1243
 msgid "Auto indent"
 msgstr "自動縮排"
 
-#: src/global.c:1383
+#: src/global.c:1245
 msgid "Cut to end"
 msgstr "剪下至列尾"
 
-#: src/global.c:1385
-msgid "Long line wrapping"
-msgstr "長列轉換"
+#: src/global.c:1247
+#, fuzzy
+msgid "Hard wrapping of overlong lines"
+msgstr "不要自動換列"
 
-#: src/global.c:1387
+#: src/global.c:1249
 msgid "Conversion of typed tabs to spaces"
 msgstr "已輸入跳格符號至空白的轉換"
 
-#: src/global.c:1389
+#: src/global.c:1251
 msgid "Backup files"
 msgstr "備份檔案"
 
-#: src/global.c:1391
+#: src/global.c:1253
 msgid "Multiple file buffers"
 msgstr "多重檔案緩衝區"
 
-#: src/global.c:1393
+#: src/global.c:1255
 msgid "Mouse support"
 msgstr "滑鼠支援"
 
-#: src/global.c:1395
+#: src/global.c:1257
 msgid "No conversion from DOS/Mac format"
 msgstr "不從 DOS/Mac 格式轉檔"
 
-#: src/global.c:1397
-#, fuzzy
+#: src/global.c:1259
 msgid "Suspension"
-msgstr "暫停"
-
-#: src/global.c:1399
-#, fuzzy
-msgid "Soft line wrapping"
-msgstr "長列轉換"
+msgstr "懸置"
 
-#: src/help.c:236
+#: src/help.c:205
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1016,7 +1079,7 @@ msgstr ""
 " 前次搜尋的字串將會顯示在 搜尋: 提示符號後面的括號中。不輸入任何文字 而直接按"
 "下輸入鍵則會履行前次的搜尋。"
 
-#: src/help.c:245
+#: src/help.c:214
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1030,7 +1093,7 @@ msgstr ""
 " 以下的功能鍵可用於搜尋模式:\n"
 "\n"
 
-#: src/help.c:251
+#: src/help.c:220
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1049,7 +1112,7 @@ msgstr ""
 " 以下的功能鍵可用於跳列模式: \n"
 "\n"
 
-#: src/help.c:260
+#: src/help.c:229
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1069,7 +1132,7 @@ msgstr ""
 "multibuffer、Meta-F 開關，或者 nanorc 檔案來啟動的話，所插入的檔案 將會被載入"
 "另外的緩衝區中 (利用 Meta-< 和 > 在檔案緩衝區間切換)。 "
 
-#: src/help.c:269
+#: src/help.c:238
 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"
@@ -1083,7 +1146,7 @@ msgstr ""
 " 以下的功能鍵可用於插入檔案模式:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:244
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1102,14 +1165,14 @@ msgstr ""
 "\n"
 " 先鍵入您想要以此來儲存目前檔案的名稱，並按下輸入鍵來儲存檔案。\n"
 "\n"
-" 如果已經用標記選擇了文字，那麼您將會被提示，只儲存標記部份到另外的檔 案。為"
-"了降低目前檔案只被其中部份覆寫的機會，在此模式下，目前的檔名不會 成為預設"
+" 如果已經用標記選擇了文字，那麼您將會被提示，只儲存標記部分到另外的檔 案。為"
+"了降低目前檔案只被其中部分覆寫的機會，在此模式下，目前的檔名不會 成為預設"
 "值。\n"
 "\n"
 " 以下的功能鍵可用於寫入檔案模式: \n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:258
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1131,8 +1194,7 @@ msgstr ""
 " 以下的功能鍵可用於檔案選單: \n"
 "\n"
 
-#: src/help.c:302
-#, fuzzy
+#: src/help.c:271
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1151,15 +1213,18 @@ msgstr ""
 "輸入的文字，畫面就會更新到最合乎搜尋字串的位置。\n"
 "\n"
 " 前次搜尋的字串將會顯示在 搜尋: 提示符號後面的括號中。不輸入任何文字 而直接按"
-"下輸入鍵則會履行前次的搜尋。"
+"下輸入鍵則會履行前次的搜尋。\n"
+"\n"
 
-#: src/help.c:311
+#: src/help.c:280
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
 msgstr ""
+" 下列功能鍵可用於瀏覽器搜尋模式：\n"
+"\n"
 
-#: src/help.c:315
+#: src/help.c:284
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1181,8 +1246,7 @@ msgstr ""
 " 以下的功能鍵可用於跳至目錄模式: \n"
 "\n"
 
-#: src/help.c:328
-#, fuzzy
+#: src/help.c:297
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1204,8 +1268,7 @@ msgstr ""
 " 以下的功能鍵可用於拼字檢查模式: \n"
 "\n"
 
-#: src/help.c:343
-#, fuzzy
+#: src/help.c:312
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1224,8 +1287,7 @@ msgstr ""
 " 以下的功能鍵可用於執行命令模式: \n"
 "\n"
 
-#: src/help.c:356
-#, fuzzy
+#: src/help.c:325
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1239,14 +1301,13 @@ msgstr ""
 "nano 輔助說明\n"
 "\n"
 " nano 編輯器是設計來在功能性及易用性方面，模仿華盛頓大學的 Pico 文字 編輯器。"
-"它含有四個主要部份:頂列顯示程式版本、目前被編輯的檔案名稱， 以及是否這檔案已"
+"它含有四個主要部分:頂列顯示程式版本、目前被編輯的檔案名稱， 以及是否這檔案已"
 "經更動過。接著是主要編輯區，顯示正在編輯的檔案。狀態 列位於倒數第三列，用來顯"
-"示重要的訊息。底部的兩列則顯示編輯器中最常用 到的快捷鍵。\n"
+"示重要的訊息。\n"
 "\n"
 " "
 
-#: src/help.c:366
-#, fuzzy
+#: src/help.c:335
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1256,12 +1317,13 @@ msgid ""
 "notated with the Meta (M-) symbol and can be entered using either the Esc, "
 "Alt, or Meta key depending on your keyboard setup.  "
 msgstr ""
+"底部的兩列顯示編輯器中最常用 到的快捷鍵。\n"
 "快捷鍵的記號定義如下：控制鍵組 (Control-key) 序列是以一個 \"帽子\" (caret, "
 "^) 符號來表示，它可以藉由控制鍵 (Ctrl) 或是按兩次脫離鍵 (Esc) 來輸入。脫離鍵"
 "組 (Escape-key) 序列是以 \"中介\" (Meta, M) 符號表示，它 可以依照您的鍵盤設"
 "定，利用 Esc，Alt 或 Meta 來輸入。"
 
-#: src/help.c:375
+#: src/help.c:344
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1273,16 +1335,15 @@ msgstr ""
 "對應的字 元。下列按鍵組合可用於主要編輯區，替代按鍵則顯示於括弧內:\n"
 "\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:376 src/help.c:448
 msgid "enable/disable"
 msgstr "開啟/關閉"
 
-#: src/nano.c:587
-#, fuzzy
+#: src/nano.c:601
 msgid "Key invalid in view mode"
 msgstr "觀看模式中此按鍵無效"
 
-#: src/nano.c:695
+#: src/nano.c:713
 #, c-format
 msgid ""
 "\n"
@@ -1291,7 +1352,7 @@ msgstr ""
 "\n"
 "緩衝區已寫入 %s\n"
 
-#: src/nano.c:697
+#: src/nano.c:715
 #, c-format
 msgid ""
 "\n"
@@ -1300,7 +1361,7 @@ msgstr ""
 "\n"
 "緩衝區未寫入至 %s: %s\n"
 
-#: src/nano.c:700
+#: src/nano.c:718
 #, c-format
 msgid ""
 "\n"
@@ -1309,287 +1370,273 @@ msgstr ""
 "\n"
 "緩衝區未寫入: %s\n"
 
-#: src/nano.c:723
+#: src/nano.c:743
 msgid "Window size is too small for nano...\n"
-msgstr "視窗尺寸對 nano 來說太小了...\n"
+msgstr "視窗尺寸對 nano 來說太小了…\n"
 
-#: src/nano.c:816
-#, fuzzy, c-format
+#: src/nano.c:836
+#, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
 "\n"
 msgstr ""
-"用法: nano [+列數,行數] [選項] [檔案名稱]\n"
+"用法: nano [選項] [[+列數,行數] 檔案名稱]…\n"
 "\n"
 
-#: src/nano.c:819
-#, fuzzy, c-format
+#: src/nano.c:839
+#, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "選項\t\tGNU 長選項\t\t意義\n"
 
-#: src/nano.c:821
+#: src/nano.c:841
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "選項\t\t意義\n"
 
-#: src/nano.c:824
-msgid "Show this message"
-msgstr "顯示此訊息"
-
-#: src/nano.c:825
+#: src/nano.c:844
 msgid "+LINE,COLUMN"
 msgstr "+列數,行數"
 
-#: src/nano.c:826
+#. TRANSLATORS: The next forty or so strings are option descriptions
+#. * for the --help output.  Try to keep them at most 40 characters.
+#: src/nano.c:847
 msgid "Start at line LINE, column COLUMN"
 msgstr "從所指列數與行數開始"
 
-#: src/nano.c:828
+#: src/nano.c:849
 msgid "Enable smart home key"
 msgstr "開啟智慧型 HOME 按鍵功能"
 
-#: src/nano.c:829
+#: src/nano.c:850
 msgid "Save backups of existing files"
 msgstr "儲存既有檔案的備份"
 
-#: src/nano.c:830
-#, fuzzy
+#: src/nano.c:851
 msgid "-C <dir>"
-msgstr "-C [目錄]"
+msgstr "-C <目錄>"
 
-#: src/nano.c:830
-#, fuzzy
+#: src/nano.c:851
 msgid "--backupdir=<dir>"
-msgstr "--backupdir=[目錄]"
+msgstr "--backupdir=<目錄>"
 
-#: src/nano.c:831
+#: src/nano.c:852
 msgid "Directory for saving unique backup files"
 msgstr "用以儲存獨一備份檔案的目錄"
 
-#: src/nano.c:834
+#: src/nano.c:855
 msgid "Use bold instead of reverse video text"
-msgstr ""
+msgstr "使用粗體以代替反白顯示文字"
 
-#: src/nano.c:837
+#: src/nano.c:858
 msgid "Convert typed tabs to spaces"
 msgstr "將已輸入的跳格符號轉換為空白"
 
-#: src/nano.c:840
+#: src/nano.c:861
 msgid "Enable multiple file buffers"
 msgstr "開啟多重檔案緩衝區功能"
 
-#: src/nano.c:845
+#: src/nano.c:865
+msgid "Use (vim-style) lock files"
+msgstr "使用 (vim 形式) 鎖定檔案"
+
+#: src/nano.c:869
 msgid "Log & read search/replace string history"
 msgstr "記錄與讀取 搜尋/置換 的歷史字串"
 
-#: src/nano.c:848
+#: src/nano.c:873
 msgid "Don't look at nanorc files"
 msgstr "不要參考 nanorc 檔案"
 
-#: src/nano.c:851
+#: src/nano.c:876
 msgid "Fix numeric keypad key confusion problem"
 msgstr "修正數字鍵區按鍵混淆問題"
 
-#: src/nano.c:853
+#: src/nano.c:878
 msgid "Don't add newlines to the ends of files"
 msgstr "不要將換列加到檔案末端"
 
-#: src/nano.c:856
+#: src/nano.c:881
 msgid "Don't convert files from DOS/Mac format"
 msgstr "不要從 DOS/Mac 格式轉檔"
 
-#: src/nano.c:858
-#, fuzzy
+#: src/nano.c:883
 msgid "Use one more line for editing"
-msgstr "編輯時使用更多空間"
+msgstr "編輯時多使用一列"
 
-#: src/nano.c:860
-#, fuzzy
+#: src/nano.c:886
+msgid "Log & read location of cursor position"
+msgstr "記錄 & 讀取游標所在位置"
+
+#: src/nano.c:889
 msgid "-Q <str>"
-msgstr "-Q [字串]"
+msgstr "-Q <字串>"
 
-#: src/nano.c:860
-#, fuzzy
+#: src/nano.c:889
 msgid "--quotestr=<str>"
-msgstr "--quotestr=[字串]"
+msgstr "--quotestr=<字串>"
 
-#: src/nano.c:861
+#: src/nano.c:890
 msgid "Quoting string"
 msgstr "引用代表字串"
 
-#: src/nano.c:863
+#: src/nano.c:892
 msgid "Restricted mode"
 msgstr "限制模式"
 
-#: src/nano.c:866
+#: src/nano.c:895
 msgid "Scroll by line instead of half-screen"
-msgstr ""
+msgstr "逐列捲動以代替半個畫面"
 
-#: src/nano.c:868
-#, fuzzy
+#: src/nano.c:897
 msgid "-T <#cols>"
-msgstr "-T [#行數]"
+msgstr "-T <#行數>"
 
-#: src/nano.c:868
-#, fuzzy
+#: src/nano.c:897
 msgid "--tabsize=<#cols>"
-msgstr "--tabsize=[#行數]"
+msgstr "--tabsize=<#行數>"
 
-#: src/nano.c:869
-#, fuzzy
+#: src/nano.c:898
 msgid "Set width of a tab to #cols columns"
 msgstr "設定跳格寬度為 #行數"
 
-#: src/nano.c:871
+#: src/nano.c:900
 msgid "Do quick statusbar blanking"
 msgstr "狀態列快速閃動"
 
-#: src/nano.c:874
+#: src/nano.c:903
 msgid "Print version information and exit"
 msgstr "顯示版本資訊並離開"
 
-#: src/nano.c:877
+#: src/nano.c:906
 msgid "Detect word boundaries more accurately"
 msgstr "更正確地偵測單字邊界"
 
-#: src/nano.c:880
-#, fuzzy
+#: src/nano.c:909
 msgid "-Y <str>"
-msgstr "-Y [字串]"
+msgstr "-Y <字串>"
 
-#: src/nano.c:880
-#, fuzzy
+#: src/nano.c:909
 msgid "--syntax=<str>"
-msgstr "--syntax=[字串]"
+msgstr "--syntax=<字串>"
 
-#: src/nano.c:881
-#, fuzzy
+#: src/nano.c:910
 msgid "Syntax definition to use for coloring"
-msgstr "字串做為語法定義"
+msgstr "用於顏色的語法定義"
 
-#: src/nano.c:883
+#: src/nano.c:912
 msgid "Constantly show cursor position"
 msgstr "持續顯示游標位置"
 
-#: src/nano.c:885
+#: src/nano.c:914
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "修正 退格鍵/刪除鍵 混淆問題"
 
-#: src/nano.c:888
+#: src/nano.c:915
+#, fuzzy
+msgid "Show this help text"
+msgstr "顯示這份說明文字"
+
+#: src/nano.c:918
 msgid "Automatically indent new lines"
 msgstr "自動縮排新列"
 
-#: src/nano.c:889
+#: src/nano.c:919
 msgid "Cut from cursor to end of line"
 msgstr "從游標剪下至列尾"
 
-#: src/nano.c:892
+#: src/nano.c:922
 msgid "Don't follow symbolic links, overwrite"
 msgstr "不要依照符號連結，而是覆寫"
 
-#: src/nano.c:894
-#, fuzzy
+#: src/nano.c:924
 msgid "Enable the use of the mouse"
 msgstr "開啟滑鼠功能"
 
-#: src/nano.c:897
-#, fuzzy
+#: src/nano.c:926
+msgid "Do not read the file (only write it)"
+msgstr ""
+
+#: src/nano.c:928
 msgid "-o <dir>"
-msgstr "-o [目錄]"
+msgstr "-o <目錄>"
 
-#: src/nano.c:897
-#, fuzzy
+#: src/nano.c:928
 msgid "--operatingdir=<dir>"
-msgstr "--operatingdir=[目錄]"
+msgstr "--operatingdir=<目錄>"
 
-#: src/nano.c:898
+#: src/nano.c:929
 msgid "Set operating directory"
 msgstr "設定操作目錄"
 
-#: src/nano.c:901
+#: src/nano.c:932
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "保留 XON (^Q) 和 XOFF (^S) 按鍵"
 
-#: src/nano.c:903
+#: src/nano.c:935
 msgid "Silently ignore startup issues like rc file errors"
-msgstr ""
+msgstr "默默地忽略像是 rc 檔案錯誤之類的啟動問題"
 
-#: src/nano.c:905
-#, fuzzy
+#: src/nano.c:938
 msgid "-r <#cols>"
-msgstr "-r [#行數]"
+msgstr "-r <#行數>"
 
-#: src/nano.c:905
-#, fuzzy
+#: src/nano.c:938
 msgid "--fill=<#cols>"
-msgstr "--fill=[#行數]    "
+msgstr "--fill=<#行數>"
 
-#: src/nano.c:906
+#: src/nano.c:939
 #, fuzzy
-msgid "Set wrapping point at column #cols"
-msgstr "設定跳格寬度為 #行數"
+msgid "Set hard-wrapping point at column #cols"
+msgstr "設定換列點為 #行數"
 
-#: src/nano.c:909
-#, fuzzy
+#: src/nano.c:942
 msgid "-s <prog>"
-msgstr "-s [程式]"
+msgstr "-s <程式>"
 
-#: src/nano.c:909
-#, fuzzy
+#: src/nano.c:942
 msgid "--speller=<prog>"
-msgstr "--speller=[程式]"
+msgstr "--speller=<程式>"
 
-#: src/nano.c:910
+#: src/nano.c:943
 msgid "Enable alternate speller"
 msgstr "啟用替代的拼字檢查程式"
 
-#: src/nano.c:913
+#: src/nano.c:946
 msgid "Auto save on exit, don't prompt"
 msgstr "離開時自動儲存，不要提示"
 
-#: src/nano.c:915
-msgid "Allow generic undo [EXPERIMENTAL]"
-msgstr ""
-
-#: src/nano.c:918
-#, fuzzy
+#: src/nano.c:947
 msgid "View mode (read-only)"
-msgstr "觀看 (唯讀) 模式"
+msgstr "觀看模式 (唯讀)"
 
-#: src/nano.c:920
-msgid "Don't wrap long lines"
+#: src/nano.c:949
+#, fuzzy
+msgid "Don't hard-wrap long lines"
 msgstr "不要自動換列"
 
-#: src/nano.c:922
-#, fuzzy
+#: src/nano.c:951
 msgid "Don't show the two help lines"
-msgstr "不要顯示輔助區"
+msgstr "不要顯示兩說明列"
 
-#: src/nano.c:923
-#, fuzzy
+#: src/nano.c:952
 msgid "Enable suspension"
-msgstr "開啟暫停功能"
+msgstr "開啟懸置功能"
 
-#: src/nano.c:924
-#, fuzzy
+#: src/nano.c:954
 msgid "Enable soft line wrapping"
-msgstr "長列轉換"
-
-#: src/nano.c:928
-msgid "(ignored, for Pico compatibility)"
-msgstr "(忽略，為了與 Pico 相容)"
+msgstr "開啟長列換列"
 
-#: src/nano.c:938
-#, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
+#: src/nano.c:963
+#, fuzzy, c-format
+msgid " GNU nano, version %s\n"
 msgstr " GNU nano 版本 %s (編譯於 %s, %s)\n"
 
-#: src/nano.c:943
+#: src/nano.c:966
 #, 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:944
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1598,158 +1645,180 @@ msgstr ""
 "\n"
 " 編譯選項:"
 
-#: src/nano.c:1022
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr "抱歉，已經關閉此功能的支援"
 
-#: src/nano.c:1044
+#: src/nano.c:1125
+msgid "No file name"
+msgstr ""
+
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "儲存更動過的緩衝區嗎 (回答 \"No\" 會撤銷修改)？"
 
-#: src/nano.c:1088
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
-msgstr ""
+msgstr "無法重新開啟來自鍵盤的標準輸入，抱歉\n"
 
-#: src/nano.c:1114
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
-msgstr ""
+msgstr "讀取自標準輸入，^C 以放棄\n"
 
-#: src/nano.c:1182
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "接收到 SIGHUP 或 SIGTERM\n"
 
-#: src/nano.c:1204
-#, fuzzy, c-format
+#: src/nano.c:1301
+#, c-format
 msgid "Use \"fg\" to return to nano.\n"
-msgstr "利用 \"fg\" 來回到 nano"
+msgstr "利用 \"fg\" 來回到 nano。\n"
 
-#: src/nano.c:1386
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "開啟"
 
-#: src/nano.c:1387
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "關閉"
 
-#: src/nano.c:1548 src/winio.c:1256
-#, fuzzy
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
-msgstr "旗標 %s 無法辨識"
+msgstr "不明的命令"
 
-#: src/nano.c:1674
-#, fuzzy
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "忽略 XON，嗯嗯。"
 
-#: src/nano.c:1679
-#, fuzzy
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "忽略 XOFF，嗯嗯。"
 
-#: src/nano.c:2209 src/rcfile.c:1100
-#, fuzzy, c-format
+#: src/nano.c:2310 src/rcfile.c:1325
+#, c-format
 msgid "Requested tab size \"%s\" is invalid"
-msgstr "所要求的跳格寬度 %s 無效"
+msgstr "所要求的跳格寬度 \"%s\" 無效"
 
-#: src/nano.c:2268 src/rcfile.c:1025
-#, fuzzy, c-format
+#: src/nano.c:2374 src/rcfile.c:1250
+#, c-format
 msgid "Requested fill size \"%s\" is invalid"
-msgstr "所要求的填滿行數 %s 無效"
+msgstr "所要求的填滿行數 \"%s\" 無效"
+
+#: src/nano.c:2415
+#, c-format
+msgid "Type '%s -h' for a list of available options.\n"
+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:1259
+#: src/prompt.c:1055
 msgid "Yy"
 msgstr "Yy"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1056
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1057
 msgid "Aa"
 msgstr "Aa"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1071
 msgid "Yes"
 msgstr "是"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1076
 msgid "All"
 msgstr "全部"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1081
 msgid "No"
 msgstr "否"
 
-#: src/rcfile.c:130
+#: src/rcfile.c:137
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "在 %s (位於第 %lu 列) 中發生錯誤: "
 
-#: src/rcfile.c:185
-#, fuzzy, c-format
+#: src/rcfile.c:196
+#, c-format
 msgid "Argument '%s' has an unterminated \""
-msgstr "引數 %s 有未封閉的 \""
+msgstr "引數 '%s' 有未封閉的 \""
 
-#: src/rcfile.c:212 src/rcfile.c:264 src/rcfile.c:711 src/rcfile.c:768
-#: src/rcfile.c:821
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
 msgstr "正規表示式字串必須以 \" 字元開始及結束"
 
-#: src/rcfile.c:238 src/search.c:62
+#: src/rcfile.c:249 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "不良的正規表示式 \"%s\": %s"
 
-#: src/rcfile.c:258
+#: src/rcfile.c:269
 msgid "Missing syntax name"
 msgstr "缺少語法名稱"
 
-#: src/rcfile.c:316
+#: src/rcfile.c:340
 msgid "The \"none\" syntax is reserved"
 msgstr "\"none\" 語法已被保留"
 
-#: src/rcfile.c:323
+#: src/rcfile.c:347
 msgid "The \"default\" syntax must take no extensions"
 msgstr "\"default\" 語法必須不含任何副檔名"
 
-#: src/rcfile.c:386 src/rcfile.c:483
-#, fuzzy
+#: src/rcfile.c:433
 msgid "Missing key name"
 msgstr "缺少語法名稱"
 
-#: src/rcfile.c:398 src/rcfile.c:499
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
+#: src/rcfile.c:442 src/rcfile.c:453
+msgid "Key name is too short"
 msgstr ""
 
-#: src/rcfile.c:407
-msgid "Must specify function to bind key to"
-msgstr ""
+#: src/rcfile.c:463
+#, fuzzy
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
+msgstr "按鍵繫結必須以 \"^\", \"M\", 或 \"F\" 開始"
 
-#: src/rcfile.c:418 src/rcfile.c:510
-msgid "Must specify menu to bind key to (or \"all\")"
-msgstr ""
+#: src/rcfile.c:472
+#, fuzzy
+msgid "Must specify a function to bind the key to"
+msgstr "必須指定按鍵所繫結的功能"
 
-#: src/rcfile.c:426
-#, c-format
-msgid "Could not map name \"%s\" to a function"
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:482
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
 
-#: src/rcfile.c:432 src/rcfile.c:517
-#, c-format
-msgid "Could not map name \"%s\" to a menu"
-msgstr ""
+#: src/rcfile.c:489
+#, fuzzy, c-format
+msgid "Cannot map name \"%s\" to a function"
+msgstr "無法映射名稱「%s」到某一功能"
+
+#: src/rcfile.c:496
+#, fuzzy, c-format
+msgid "Cannot map name \"%s\" to a menu"
+msgstr "無法映射名稱「%s」到某一選單"
 
-#: src/rcfile.c:454
+#: src/rcfile.c:528
 #, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
+msgid "Function '%s' does not exist in menu '%s'"
 msgstr ""
 
-#: src/rcfile.c:625
+#: src/rcfile.c:543
+#, fuzzy, c-format
+msgid "Sorry, keystroke \"%s\" may not be rebound"
+msgstr "抱歉，按鍵字串「%s」是不合法的繫結"
+
+#: src/rcfile.c:629
 #, fuzzy, c-format
+msgid "Error expanding %s: %s"
+msgstr "讀取 %s 時發生錯誤: %s"
+
+#: src/rcfile.c:672
+#, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
 "Valid colors are \"green\", \"red\", \"blue\",\n"
@@ -1757,141 +1826,197 @@ msgid ""
 "\"black\", with the optional prefix \"bright\"\n"
 "for foreground colors."
 msgstr ""
-"顏色 %s 無法辨識。\n"
+"顏色 \"%s\" 無法辨識。\n"
 "有效的顏色是 \"green\"(綠)、\"red\"(紅)、\"blue\"(藍)、\n"
 "\"white\"(白)、\"yellow\"(黃)、\"cyan\"(青)、\"magenta\"(瑰) 和 \n"
-"\"black\"(黑)，選擇性的前置字 \"bright\"(明亮) \n"
+"\"black\"(黑)，加上選擇性的前置字 \"bright\"(明亮) \n"
 "可用於前景色。"
 
-#: src/rcfile.c:647
-#, fuzzy
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
-msgstr "無法直接增加顏色而沒有語法列"
+msgstr "無法增加顏色命令而沒有語法命令"
 
-#: src/rcfile.c:652
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "缺少顏色名稱"
 
-#: src/rcfile.c:672
-#, fuzzy, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr "背景色 %s 不可為明亮"
-
-#: src/rcfile.c:690 src/rcfile.c:809
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr "缺少正規表示式字串"
 
-#: src/rcfile.c:762
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\" 要求對應的 \"end=\""
 
-#: src/rcfile.c:804
-#, fuzzy
+#: src/rcfile.c:837
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr "背景色 \"%s\" 不可為明亮"
+
+#: src/rcfile.c:865
 msgid "Cannot add a header regex without a syntax command"
-msgstr "無法直接增加顏色而沒有語法列"
+msgstr "無法增加標頭正規表示式而沒有語法命令"
 
-#: src/rcfile.c:874
-#, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
+#: src/rcfile.c:921
+msgid "Cannot add a magic string regex without a syntax command"
+msgstr "無法增加魔法正規表示式而沒有語法命令"
+
+#: src/rcfile.c:926
+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:1010
+#, fuzzy
+msgid "Cannot add formatter without a syntax command"
+msgstr "無法增加顏色命令而沒有語法命令"
+
+#: src/rcfile.c:1015
+msgid "Missing formatter command"
 msgstr ""
 
-#: src/rcfile.c:876
+#: src/rcfile.c:1045
+#, fuzzy, c-format
+msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
+msgstr "嚴重錯誤：沒有按鍵映射至功能「%s」"
+
+#: src/rcfile.c:1047
+#, fuzzy, c-format
 msgid ""
-"Exiting.  Please use nano with the -I option if needed to adjust your nanorc "
-"settings\n"
-msgstr ""
+"If needed, use nano with the -I option to adjust your nanorc settings.\n"
+msgstr "離開中。 如果需要調整您的 nanorc 設定值，請使用 nano 與 -I 選項\n"
 
-#: src/rcfile.c:926 src/rcfile.c:935 src/rcfile.c:945
+#: src/rcfile.c:1108
+#, fuzzy, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "無法映射名稱「%s」到某一選單"
+
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
-msgstr ""
+msgstr "命令「%s」在包含的檔案中不允許"
 
-#: src/rcfile.c:951 src/rcfile.c:1128
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
-msgstr ""
+msgstr "語法「%s」沒有任何顏色命令"
 
-#: src/rcfile.c:966
-#, fuzzy, c-format
+#: src/rcfile.c:1171
+#, c-format
 msgid "Command \"%s\" not understood"
-msgstr "無法辨識 %s 命令"
+msgstr "無法辨識 \"%s\" 命令"
 
-#: src/rcfile.c:972
-msgid "Missing flag"
-msgstr "缺少旗標"
+#: src/rcfile.c:1186
+#, fuzzy
+msgid "Missing option"
+msgstr "缺少顏色名稱"
 
-#: src/rcfile.c:994
-#, fuzzy, c-format
+#: src/rcfile.c:1208
+#, c-format
 msgid "Option \"%s\" requires an argument"
-msgstr "選項 %s 要求引數"
+msgstr "選項 \"%s\" 要求引數"
 
-#: src/rcfile.c:1012
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr "選項並非正確的多位元字串"
 
-#: src/rcfile.c:1038 src/rcfile.c:1066 src/rcfile.c:1075
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr "需要非空格字元"
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr "需要兩個單行字元"
 
-#: src/rcfile.c:1114
+#: src/rcfile.c:1339
 #, fuzzy, c-format
-msgid "Cannot unset flag \"%s\""
-msgstr "無法解除旗標 %s 設定"
+msgid "Cannot unset option \"%s\""
+msgstr "無法解除旗標 \"%s\" 設定"
 
-#: src/rcfile.c:1123
+#: src/rcfile.c:1345
 #, fuzzy, c-format
-msgid "Unknown flag \"%s\""
-msgstr "旗標 %s 無法辨識"
+msgid "Unknown option \"%s\""
+msgstr "旗標 \"%s\" 無法辨識"
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr "我找不到我的家目錄！哇！"
 
+#: src/rcfile.c:1442
+#, c-format
+msgid ""
+"\n"
+"Press Enter to continue starting nano.\n"
+msgstr ""
+"\n"
+"按下輸入鍵以繼續啟動 nano。\n"
+
 #: src/search.c:96
 #, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "找不到 \"%.*s%s\""
 
-#: src/search.c:205
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/search.c:184
+msgid " [Case Sensitive]"
+msgstr " [符合大小寫]"
+
+#: src/search.c:188
+msgid " [Regexp]"
+msgstr " [正規表示式]"
+
+#: src/search.c:192
+msgid " [Backwards]"
+msgstr " [向後搜尋]"
+
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:197
 msgid " (to replace) in selection"
 msgstr " 在標記中(置換)"
 
-#: src/search.c:207
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (置換)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "置換這個？"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:945
 msgid "Replace with"
 msgstr "以此置換"
 
-#: src/search.c:1004
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
 msgstr[0] "已置換 %lu 處"
 
-#: src/search.c:1034
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr "輸入列號，行號"
 
-#: src/search.c:1061
-#, fuzzy
+#: src/search.c:1054
 msgid "Invalid line or column number"
-msgstr "輸入列號，行號"
+msgstr "無效的列號或行號"
 
-#: src/search.c:1214
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "並非一個括號"
 
-#: src/search.c:1281
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "無對應括號"
 
@@ -1900,279 +2025,316 @@ msgid "Mark Set"
 msgstr "標記設定"
 
 #: src/text.c:58
-#, fuzzy
 msgid "Mark Unset"
 msgstr "標記解除"
 
-#: src/text.c:443
+#: src/text.c:439
 msgid "Nothing in undo buffer!"
-msgstr ""
+msgstr "復原緩衝區中沒有任何東西！"
 
-#: src/text.c:455 src/text.c:593
-#, c-format
-msgid "Internal error: can't match line %d.  Please save your work"
-msgstr ""
+#: src/text.c:445 src/text.c:590
+#, fuzzy, c-format
+msgid "Internal error: can't match line %d.  Please save your work."
+msgstr "內部錯誤：無法匹配第 %d 列。 請儲存您的工作"
 
-#: src/text.c:466 src/text.c:603
+#: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
-msgstr ""
+msgstr "文字加入"
 
-#: src/text.c:475 src/text.c:613
-#, fuzzy
+#: src/text.c:467 src/text.c:612
 msgid "text delete"
-msgstr "下個檔案"
+msgstr "文字刪除"
 
-#: src/text.c:489 src/text.c:628
-#, fuzzy
-msgid "line wrap"
-msgstr "長列轉換"
-
-#: src/text.c:503 src/text.c:636
+#: src/text.c:491 src/text.c:641
 msgid "line join"
-msgstr ""
+msgstr "列聯結"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:505 src/text.c:657
 msgid "text cut"
-msgstr ""
+msgstr "文字剪下"
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:510 src/text.c:661
 msgid "text uncut"
-msgstr ""
+msgstr "文字取消剪下"
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:515 src/text.c:623
 msgid "line break"
-msgstr ""
+msgstr "分列符號"
 
-#: src/text.c:532 src/text.c:665
-#, fuzzy
+#: src/text.c:528 src/text.c:672
 msgid "text insert"
-msgstr "下列"
+msgstr "文字插入"
 
-#: src/text.c:550 src/text.c:659
-#, fuzzy
+#: src/text.c:549 src/text.c:665
 msgid "text replace"
-msgstr " (置換)"
+msgstr "文字置換"
 
-#: src/text.c:557 src/text.c:671
-msgid "Internal error: unknown type.  Please save your work"
-msgstr ""
+#: src/text.c:556 src/text.c:679 src/text.c:983
+msgid "Internal error: unknown type.  Please save your work."
+msgstr "內部錯誤：不明型態。 請儲存您的工作。"
 
-#: src/text.c:563
+#: src/text.c:561
 #, c-format
 msgid "Undid action (%s)"
-msgstr ""
+msgstr "已復原動作 (%s)"
 
-#: src/text.c:578
+#: src/text.c:580
 msgid "Nothing to re-do!"
-msgstr ""
+msgstr "沒有任何東西可重做！"
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
-msgstr ""
+#: src/text.c:584
+#, fuzzy
+msgid "Internal error: cannot set up redo.  Please save your work."
+msgstr "內部錯誤：無法設定取消剪下。 請儲存您的工作。"
 
-#: src/text.c:676
+#: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
-msgstr ""
+msgstr "已重做動作 (%s)"
 
-#: src/text.c:766
-msgid "Could not pipe"
-msgstr "管線功能無效"
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
+msgid "Could not create pipe"
+msgstr "無法建立管線功能"
 
-#: src/text.c:793 src/text.c:2636 src/text.c:2788
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "執行功能無效"
 
-#: src/text.c:941
-msgid "Internal error: can't setup uncut.  Please save your work."
-msgstr ""
-
-#: src/text.c:950
-msgid "Internal error: unknown type.  Please save your work."
-msgstr ""
+#: src/text.c:969
+#, fuzzy
+msgid "Internal error: cannot set up uncut.  Please save your work."
+msgstr "內部錯誤：無法設定取消剪下。 請儲存您的工作。"
 
-#: src/text.c:1870
+#: src/text.c:1806
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "不良引用字串 %s: %s"
 
-#: src/text.c:2267
+#: src/text.c:2207
 msgid "Can now UnJustify!"
 msgstr "現在可以還原對齊！"
 
-#: src/text.c:2462
+#: src/text.c:2404
 msgid "Edit a replacement"
 msgstr "編輯替代文字"
 
-#: src/text.c:2548
-msgid "Could not create pipe"
-msgstr "無法建立管線功能"
-
-#: src/text.c:2550
+#: src/text.c:2492
 msgid "Creating misspelled word list, please wait..."
-msgstr "正在建立錯字列表，請稍待..."
+msgstr "正在建立錯字列表，請稍待…"
 
-#: src/text.c:2642
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
 msgstr "無法得知管線緩衝區大小"
 
-#: src/text.c:2693
+#: src/text.c:2635
 msgid "Error invoking \"spell\""
 msgstr "呼叫 \"spell\" 錯誤"
 
-#: src/text.c:2696
+#: src/text.c:2638
 msgid "Error invoking \"sort -f\""
 msgstr "呼叫 \"sort -f\" 錯誤"
 
-#: src/text.c:2699
+#: src/text.c:2641
 msgid "Error invoking \"uniq\""
 msgstr "呼叫 \"uniq\" 錯誤"
 
-#: src/text.c:2756 src/text.c:2965
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "拼字檢查結束"
 
-#: src/text.c:2815
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "呼叫 \"%s\" 錯誤"
 
-#: src/text.c:2960
+#: src/text.c:2885
+#, fuzzy
+msgid "Invoking spell checker, please wait"
+msgstr "嘗試呼叫拼字檢查"
+
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "拼字檢查失敗: %s"
 
-#: src/text.c:2962
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "拼字檢查失敗: %s: %s"
 
-#: src/text.c:3030
+#: src/text.c:2937
+#, fuzzy
+msgid "No linter defined for this type of file!"
+msgstr "不要將換列加到檔案末端"
+
+#: src/text.c:2947
+msgid "Save modified buffer before linting?"
+msgstr ""
+
+#: src/text.c:2969
+msgid "Invoking linter, please wait"
+msgstr ""
+
+#: src/text.c:3125
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr ""
+
+#: src/text.c:3159
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr ""
+
+#: src/text.c:3205
+#, fuzzy
+msgid "At last message"
+msgstr "顯示此訊息"
+
+#: src/text.c:3210
+#, fuzzy
+msgid "At first message"
+msgstr "顯示此訊息"
+
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr ""
+
+#: src/text.c:3275
+msgid "Finished"
+msgstr ""
+
+#: src/text.c:3280
+msgid "Invoking formatter, please wait"
+msgstr ""
+
+#: src/text.c:3360
+msgid "Finished formatting"
+msgstr ""
+
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%s字數: %lu  列數: %ld  字元數: %lu"
 
-#: src/text.c:3031
+#: src/text.c:3439
 msgid "In Selection:  "
-msgstr "於選擇部份: "
+msgstr "於選擇部分: "
 
-#: src/utils.c:405 src/utils.c:417
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3453
+msgid "Verbatim Input"
+msgstr "原形輸入"
+
+#: src/utils.c:410 src/utils.c:422
 msgid "nano is out of memory!"
 msgstr "nano 已耗盡記憶體！"
 
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
-#: src/winio.c:1557
+#: src/winio.c:1583
 msgid "Unicode Input"
-msgstr ""
+msgstr "萬國碼輸入"
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2142 src/winio.c:2146
 msgid "Modified"
 msgstr "已更動"
 
-#: src/winio.c:2150
+#: src/winio.c:2143
 msgid "View"
 msgstr "觀看"
 
-#: src/winio.c:2164
+#: src/winio.c:2157
 msgid "DIR:"
 msgstr "目錄:"
 
-#: src/winio.c:2171
+#: src/winio.c:2164
 msgid "File:"
 msgstr "檔案:"
 
-#: src/winio.c:3360
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2261
+msgid ""
+"Warning: Modifying a file which is not locked, check directory permission?"
+msgstr "警告：正在變更一個未鎖定的檔案，要檢查一下目錄權限嗎？"
+
+#: src/winio.c:3377
 #, 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:3492
+#: src/winio.c:3507
 msgid "The nano text editor"
 msgstr "nano 文字編輯器"
 
-#: src/winio.c:3493
+#: src/winio.c:3508
 msgid "version"
 msgstr "版本"
 
-#: src/winio.c:3494
+#: src/winio.c:3509
 msgid "Brought to you by:"
 msgstr "來自於:"
 
-#: src/winio.c:3495
+#: src/winio.c:3510
 msgid "Special thanks to:"
 msgstr "特別感謝:"
 
-#: src/winio.c:3496
+#: src/winio.c:3511
 msgid "The Free Software Foundation"
 msgstr "自由軟體基金會"
 
-#: src/winio.c:3497
+#: src/winio.c:3512
+msgid "the many translators and the TP"
+msgstr ""
+
+#: src/winio.c:3513
 msgid "For ncurses:"
-msgstr "ncurses 部份:"
+msgstr "ncurses 部分:"
 
-#: src/winio.c:3498
+#: src/winio.c:3514
 msgid "and anyone else we forgot..."
-msgstr "以及其他我們不記得的人..."
+msgstr "以及其他我們不記得的人…"
 
-#: src/winio.c:3499
+#: src/winio.c:3515
 msgid "Thank you for using nano!"
 msgstr "謝謝您使用 nano﹗"
 
-#~ msgid "Prepending to %s failed: %s"
-#~ msgstr "前引於 %s 時失敗: %s"
-
-#~ msgid "Invoke the help menu"
-#~ msgstr "呼叫輔助說明"
-
-#~ msgid "Search for text within the editor"
-#~ msgstr "搜尋編輯器中文字"
-
-#~ msgid "Replace text within the editor"
-#~ msgstr "置換編輯器中文字"
-
-#~ msgid "Find matching bracket"
-#~ msgstr "尋找對應括號"
-
-#~ msgid "Make the current search/replace case (in)sensitive"
-#~ msgstr "使目前搜尋與置換(不)區分大小寫"
+#~ msgid "Insert File"
+#~ msgstr "插入檔案"
 
-#~ msgid "Make the current search/replace go backwards"
-#~ msgstr "使目前搜尋與置換向後進行"
+#~ msgid "Go to previous screen"
+#~ msgstr "跳至前一畫面"
 
-#~ msgid "Prepend to the current file"
-#~ msgstr "前引於目前檔案"
+#~ msgid "Find Other Bracket"
+#~ msgstr "尋找其他括號"
 
-#~ msgid "Back up original file when saving"
-#~ msgstr "存檔時備份原始檔案"
+#~ msgid "Long line wrapping"
+#~ msgstr "長列轉換"
 
-#~ msgid "Insert into new buffer"
-#~ msgstr "插入新的緩衝區"
+#~ msgid "Soft line wrapping"
+#~ msgstr "長列換列"
 
-#~ msgid "Space"
-#~ msgstr "Space"
+#~ msgid "Allow generic undo [EXPERIMENTAL]"
+#~ msgstr "允許一般的復原 [實驗性質]"
 
-#~ msgid ""
-#~ "Usage: nano [+LINE,COLUMN] [GNU long option] [option] [file]\n"
-#~ "\n"
-#~ msgstr ""
-#~ "用法: nano [+列數,行數] [GNU 長選項] [選項] [檔案名稱]\n"
-#~ "\n"
+#~ msgid "(ignored, for Pico compatibility)"
+#~ msgstr "(忽略，為了與 Pico 相容)"
 
-#~ msgid "Use more space for editing"
-#~ msgstr "編輯時使用更多空間"
+#~ msgid "Must specify menu to bind key to (or \"all\")"
+#~ msgstr "必須指定按鍵所繫結的選單 (或是 \"all\")"
 
-#~ msgid "Set fill cols to (wrap lines at) #cols"
-#~ msgstr "設定行數填滿 (換列) 於 #行數"
+#~ msgid "Missing flag"
+#~ msgstr "缺少旗標"
 
-#~ msgid "Duplicate syntax name %s"
-#~ msgstr "重覆的語法名稱 %s"
+#~ msgid "line wrap"
+#~ msgstr "長列換列"
 
-#~ msgid "Come on, be reasonable"
-#~ msgstr "別這樣，理性一點"
+#~ msgid "Internal error: unknown type.  Please save your work"
+#~ msgstr "內部錯誤：不明型態。 請儲存您的工作"
 
-#~ msgid "Could not create temp file: %s"
-#~ msgstr "無法建立暫存檔案: %s"
+#~ msgid "Internal error: Redo setup failed.  Please save your work"
+#~ msgstr "內部錯誤：重做設定失敗。 請儲存您的工作"
 
-#~ msgid "Refusing zero-length regex match"
-#~ msgstr "拒絕符合長度為零的正規表示式"
+#~ msgid "Could not pipe"
+#~ msgstr "管線功能無效"